Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix stickler

Browse Source
This commit is contained in:
Laurent Destailleur 2019-10-07 20:48:44 +02:00
parent 51ef2cd20a
commit 539f4355c3
4 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dev/namespacemig/aaa.class.php
View File

@ -2,10 +2,14 @@
namespace Dolibarr;
global $globalaaa;
$globalaaa = 'globalaaa';
/**
* faaa
*
* @return string
*/
function faaa()
{
return 'faaa';
@ -15,6 +19,10 @@ class Aaa
{
const AAA='aaa';
/**
* do
* @return void
*/
public function do()
{
echo 'doaaa'."\n";

12
dev/namespacemig/bbb.class.php
View File

@ -1,11 +1,12 @@
<?php
global $globalbbb;
$globalbbb = 'globalbbb';
/**
* fbbb
* @return string
*/
function fbbb()
{
return 'fbbb';
@ -14,6 +15,11 @@ function fbbb()
class Bbb
{
const BBB='bbb';
/**
* do
* @return void
*/
public function do()
{
global $globalaaa, $globalbbb;

6
htdocs/core/modules/modSyslog.class.php
View File

@ -84,6 +84,10 @@ class modSyslog extends DolibarrModules
$this->rights_class = 'syslog';
// Cronjobs
$comment = 'Compress and archive log files. The number of versions to keep is defined into the setup of module. ';
$comment.= 'Warning: Main application cron script must be run with same account than your web server to avoid to get log files with different owner than required by web server.';
$comment.= 'Another solution is to set web server Operating System group as the group of directory documents and set GROUP permission "rws" on this directory so log files will always have the group and permissions of the web server Operating System group.';
$this->cronjobs = array(
0 => array(
'label' => 'CompressSyslogs',
@ -92,7 +96,7 @@ class modSyslog extends DolibarrModules
'objectname' => 'Utils',
'method' => 'compressSyslogs',
'parameters' => '',
'comment' => 'Compress and archive log files. The number of versions to keep is defined into the setup of module. Warning: Main application cron script must be run with same account than your web server to avoid to get log files with different owner than required by web server. Another solution is to set web server Operating System group as the group of directory documents and set GROUP permission "rws" on this directory so log files will always have the group and permissions of the web server Operating System group',
'comment' => $comment,
'frequency' => 1,
'unitfrequency' => 3600 * 24,
'priority' => 50,

6
htdocs/core/tpl/objectline_create.tpl.php
View File

@ -853,9 +853,13 @@ function setforpredef() {
jQuery("#prod_entry_mode_predef").prop('checked',true).change();
<?php if (empty($conf->global->MAIN_EDIT_PREDEF_PRICEHT)) { ?>
jQuery("#price_ht").val('').hide();
jQuery("#multicurrency_price_ht").val('').hide();
<?php } else { ?>
jQuery("#price_ht").val('').show();
jQuery("#multicurrency_price_ht").val('').show();
<?php } ?>
jQuery("#price_ht").val('');
jQuery("#price_ht, #multicurrency_price_ht, #price_ttc, #fourn_ref, #tva_tx, #title_vat, #title_up_ht, #title_up_ht_currency, #title_up_ttc, #title_up_ttc_currency").hide();
jQuery("#price_ttc, #fourn_ref, #tva_tx, #title_vat, #title_up_ht, #title_up_ht_currency, #title_up_ttc, #title_up_ttc_currency").hide();
jQuery("#np_marginRate, #np_markRate, .np_marginRate, .np_markRate, #units, #title_units").hide();
jQuery("#buying_price").show();
jQuery('#trlinefordates, .divlinefordates').show();