@@ -1,10 +1,10 @@ |
||
1 | 1 | <?php // BEGIN PHP |
2 | -$websitekey=basename(__DIR__); |
|
3 | -if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded |
|
2 | +$websitekey = basename(__DIR__); |
|
3 | +if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded |
|
4 | 4 | require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php'; |
5 | 5 | require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php'; |
6 | 6 | ob_start(); |
7 | -if (! headers_sent()) { /* because file is included inline when in edit mode and we don't want warning */ |
|
7 | +if (!headers_sent()) { /* because file is included inline when in edit mode and we don't want warning */ |
|
8 | 8 | header('Cache-Control: max-age=3600, public, must-revalidate'); |
9 | 9 | header('Content-type: text/css'); |
10 | 10 | } |
@@ -1,7 +1,7 @@ |
||
1 | 1 | <?php |
2 | 2 | // File generated to link to the master file - DO NOT MODIFY - It is just an include |
3 | -if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { |
|
4 | - if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1); |
|
3 | +if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { |
|
4 | + if (!defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1); |
|
5 | 5 | require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php'; |
6 | 6 | } |
7 | 7 | ?> |
@@ -1,10 +1,10 @@ |
||
1 | 1 | <?php // BEGIN PHP |
2 | -$websitekey=basename(__DIR__); |
|
3 | -if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded |
|
2 | +$websitekey = basename(__DIR__); |
|
3 | +if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded |
|
4 | 4 | require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php'; |
5 | 5 | require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php'; |
6 | 6 | ob_start(); |
7 | -if (! headers_sent()) { /* because file is included inline when in edit mode and we don't want warning */ |
|
7 | +if (!headers_sent()) { /* because file is included inline when in edit mode and we don't want warning */ |
|
8 | 8 | header('Cache-Control: max-age=3600, public, must-revalidate'); |
9 | 9 | header('Content-type: text/css'); |
10 | 10 | } |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | // File generated to link to the master file - DO NOT MODIFY - It is just an include |
3 | -if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { |
|
4 | - if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1); |
|
3 | +if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { |
|
4 | + if (!defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1); |
|
5 | 5 | require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php'; |
6 | 6 | } |
@@ -93,10 +93,10 @@ discard block |
||
93 | 93 | $year = date('Y'); |
94 | 94 | $numberyears = getDolGlobalInt("MAIN_NB_OF_YEAR_IN_MEMBERSHIP_WIDGET_GRAPH"); |
95 | 95 | |
96 | - $boxgraph .='<div class="div-table-responsive-no-min">'; |
|
97 | - $boxgraph .='<table class="noborder nohover centpercent">'; |
|
98 | - $boxgraph .='<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").($numberyears ? ' ('.($year-$numberyears).' - '.$year.')' : '').'</th></tr>'; |
|
99 | - $boxgraph .='<tr><td class="center" colspan="2">'; |
|
96 | + $boxgraph .= '<div class="div-table-responsive-no-min">'; |
|
97 | + $boxgraph .= '<table class="noborder nohover centpercent">'; |
|
98 | + $boxgraph .= '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").($numberyears ? ' ('.($year - $numberyears).' - '.$year.')' : '').'</th></tr>'; |
|
99 | + $boxgraph .= '<tr><td class="center" colspan="2">'; |
|
100 | 100 | |
101 | 101 | require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherentstats.class.php'; |
102 | 102 | $stats = new AdherentStats($db, 0, $userid); |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | } |
116 | 116 | |
117 | 117 | $dataseries = array(); |
118 | - $dataseries[] = array($langs->transnoentitiesnoconv("MembersStatusToValid"), $sumMembers['total']['members_draft']); // Draft, not yet validated |
|
118 | + $dataseries[] = array($langs->transnoentitiesnoconv("MembersStatusToValid"), $sumMembers['total']['members_draft']); // Draft, not yet validated |
|
119 | 119 | $dataseries[] = array($langs->transnoentitiesnoconv("WaitingSubscription"), $sumMembers['total']['members_pending']); |
120 | 120 | $dataseries[] = array($langs->transnoentitiesnoconv("UpToDate"), $sumMembers['total']['members_uptodate']); |
121 | 121 | $dataseries[] = array($langs->transnoentitiesnoconv("OutOfDate"), $sumMembers['total']['members_expired']); |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | $dolgraph->SetType(array('pie')); |
134 | 134 | $dolgraph->setHeight('200'); |
135 | 135 | $dolgraph->draw('idgraphstatus'); |
136 | - $boxgraph .=$dolgraph->show($total ? 0 : 1); |
|
136 | + $boxgraph .= $dolgraph->show($total ? 0 : 1); |
|
137 | 137 | |
138 | 138 | $boxgraph .= '</td></tr>'; |
139 | 139 | $boxgraph .= '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'; |
@@ -56,16 +56,16 @@ |
||
56 | 56 | // Editing global variables not related to a specific theme |
57 | 57 | $constantes = array( |
58 | 58 | 'MEMBER_REMINDER_EMAIL'=>array('type'=>'yesno', 'label'=>$langs->trans('MEMBER_REMINDER_EMAIL', $langs->transnoentities("Module2300Name"))), |
59 | - 'ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION' =>array('type'=>'emailtemplate:member','label'=>''), |
|
60 | - 'ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER' =>array('type'=>'emailtemplate:member','label'=>''), |
|
61 | - 'ADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION' =>array('type'=>'emailtemplate:member','label'=>''), |
|
62 | - 'ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION' =>array('type'=>'emailtemplate:member','label'=>''), |
|
63 | - 'ADHERENT_EMAIL_TEMPLATE_CANCELATION' =>array('type'=>'emailtemplate:member','label'=>''), |
|
64 | - 'ADHERENT_EMAIL_TEMPLATE_EXCLUSION' =>array('type'=>'emailtemplate:member','label'=>''), |
|
65 | - 'ADHERENT_MAIL_FROM' =>array('type'=>'string','label'=>''), |
|
66 | - 'ADHERENT_CC_MAIL_FROM' =>array('type'=>'string','label'=>''), |
|
67 | - 'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT' =>array('type'=>'string','label'=>''), |
|
68 | - 'ADHERENT_AUTOREGISTER_NOTIF_MAIL' =>array('type'=>'html', 'tooltip'=>$helptext,'label'=>'') |
|
59 | + 'ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION' =>array('type'=>'emailtemplate:member', 'label'=>''), |
|
60 | + 'ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER' =>array('type'=>'emailtemplate:member', 'label'=>''), |
|
61 | + 'ADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION' =>array('type'=>'emailtemplate:member', 'label'=>''), |
|
62 | + 'ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION' =>array('type'=>'emailtemplate:member', 'label'=>''), |
|
63 | + 'ADHERENT_EMAIL_TEMPLATE_CANCELATION' =>array('type'=>'emailtemplate:member', 'label'=>''), |
|
64 | + 'ADHERENT_EMAIL_TEMPLATE_EXCLUSION' =>array('type'=>'emailtemplate:member', 'label'=>''), |
|
65 | + 'ADHERENT_MAIL_FROM' =>array('type'=>'string', 'label'=>''), |
|
66 | + 'ADHERENT_CC_MAIL_FROM' =>array('type'=>'string', 'label'=>''), |
|
67 | + 'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT' =>array('type'=>'string', 'label'=>''), |
|
68 | + 'ADHERENT_AUTOREGISTER_NOTIF_MAIL' =>array('type'=>'html', 'tooltip'=>$helptext, 'label'=>'') |
|
69 | 69 | ); |
70 | 70 | |
71 | 71 |
@@ -68,7 +68,7 @@ |
||
68 | 68 | public $active; |
69 | 69 | |
70 | 70 | |
71 | - public $fields=array( |
|
71 | + public $fields = array( |
|
72 | 72 | 'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10), |
73 | 73 | 'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>15, 'index'=>1), |
74 | 74 | 'code' =>array('type'=>'varchar(32)', 'label'=>'Code', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>20), |
@@ -802,7 +802,7 @@ discard block |
||
802 | 802 | |
803 | 803 | if (!empty($object->refuse_note)) { |
804 | 804 | $object->actionmsg .= '<br>'; |
805 | - $object->actionmsg .= $langs->trans("Reason") . ': '.$object->refuse_note; |
|
805 | + $object->actionmsg .= $langs->trans("Reason").': '.$object->refuse_note; |
|
806 | 806 | } |
807 | 807 | |
808 | 808 | $object->sendtoid = 0; |
@@ -823,7 +823,7 @@ discard block |
||
823 | 823 | |
824 | 824 | if (!empty($object->cancel_note)) { |
825 | 825 | $object->actionmsg .= '<br>'; |
826 | - $object->actionmsg .= $langs->trans("Reason") . ': '.$object->cancel_note; |
|
826 | + $object->actionmsg .= $langs->trans("Reason").': '.$object->cancel_note; |
|
827 | 827 | } |
828 | 828 | |
829 | 829 | $object->sendtoid = 0; |
@@ -844,7 +844,7 @@ discard block |
||
844 | 844 | |
845 | 845 | if (!empty($object->context['comments'])) { |
846 | 846 | $object->actionmsg .= '<br>'; |
847 | - $object->actionmsg .= $langs->trans("Comment") . ': '.$object->context['comments']; |
|
847 | + $object->actionmsg .= $langs->trans("Comment").': '.$object->context['comments']; |
|
848 | 848 | } |
849 | 849 | |
850 | 850 | $object->sendtoid = 0; |
@@ -1472,8 +1472,8 @@ discard block |
||
1472 | 1472 | $actioncomm = new ActionComm($this->db); |
1473 | 1473 | $actioncomm->type_code = $object->actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...) |
1474 | 1474 | $actioncomm->code = 'AC_'.$action; |
1475 | - $actioncomm->label = $object->actionmsg2; // Label of event |
|
1476 | - $actioncomm->note_private = $object->actionmsg; // Description |
|
1475 | + $actioncomm->label = $object->actionmsg2; // Label of event |
|
1476 | + $actioncomm->note_private = $object->actionmsg; // Description |
|
1477 | 1477 | $actioncomm->fk_project = $projectid; |
1478 | 1478 | $actioncomm->datep = $now; |
1479 | 1479 | $actioncomm->datef = $now; |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | |
121 | 121 | $head[$h][0] = DOL_URL_ROOT.'/compta/facture/agenda.php?id='.$object->id; |
122 | 122 | $head[$h][1] = $langs->trans("Events"); |
123 | - if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) { |
|
123 | + if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) { |
|
124 | 124 | $nbEvent = 0; |
125 | 125 | // Enable caching of thirdparty count actioncomm |
126 | 126 | require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php'; |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | } else { |
141 | 141 | dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR); |
142 | 142 | } |
143 | - dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
143 | + dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
144 | 144 | } |
145 | 145 | |
146 | 146 | $head[$h][1] .= '/'; |
@@ -255,14 +255,14 @@ discard block |
||
255 | 255 | $h = 0; |
256 | 256 | $head = array(); |
257 | 257 | |
258 | - $head[$h][0] = DOL_URL_ROOT . '/compta/facture/card-rec.php?id=' . $object->id; |
|
258 | + $head[$h][0] = DOL_URL_ROOT.'/compta/facture/card-rec.php?id='.$object->id; |
|
259 | 259 | $head[$h][1] = $langs->trans("RepeatableInvoice"); |
260 | 260 | $head[$h][2] = 'card'; |
261 | 261 | $h++; |
262 | 262 | |
263 | 263 | $head[$h][0] = DOL_URL_ROOT.'/compta/facture/agenda-rec.php?id='.$object->id; |
264 | 264 | $head[$h][1] = $langs->trans("Events"); |
265 | - if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) { |
|
265 | + if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) { |
|
266 | 266 | $nbEvent = 0; |
267 | 267 | // Enable caching of thirdparty count actioncomm |
268 | 268 | require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php'; |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | } else { |
283 | 283 | dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR); |
284 | 284 | } |
285 | - dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
285 | + dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
286 | 286 | } |
287 | 287 | |
288 | 288 | $head[$h][1] .= '/'; |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | $h = 0; |
319 | 319 | $head = array(); |
320 | 320 | |
321 | - $head[$h][0] = DOL_URL_ROOT . '/fourn/facture/card-rec.php?id=' . $object->id; |
|
321 | + $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/card-rec.php?id='.$object->id; |
|
322 | 322 | $head[$h][1] = $langs->trans("RepeatableSupplierInvoice"); |
323 | 323 | $head[$h][2] = 'card'; |
324 | 324 | $h++; |
@@ -401,7 +401,7 @@ discard block |
||
401 | 401 | ,array($langs->trans('InvoiceNotLate15Days'), $obj->nbnotlate15 - $obj->nbnotlate30) |
402 | 402 | ,array($langs->trans('InvoiceNotLate30Days'), $obj->nbnotlate30)); |
403 | 403 | */ |
404 | - $dataseries[$i]=array($langs->transnoentitiesnoconv('NbOfOpenInvoices'), $obj->nblate30, $obj->nblate15 - $obj->nblate30, $obj->nblatenow - $obj->nblate15, $obj->nbnotlatenow - $obj->nbnotlate15, $obj->nbnotlate15 - $obj->nbnotlate30, $obj->nbnotlate30); |
|
404 | + $dataseries[$i] = array($langs->transnoentitiesnoconv('NbOfOpenInvoices'), $obj->nblate30, $obj->nblate15 - $obj->nblate30, $obj->nblatenow - $obj->nblate15, $obj->nbnotlatenow - $obj->nbnotlate15, $obj->nbnotlate15 - $obj->nbnotlate30, $obj->nbnotlate30); |
|
405 | 405 | $i++; |
406 | 406 | } |
407 | 407 | if (!empty($dataseries[0])) { |
@@ -448,7 +448,7 @@ discard block |
||
448 | 448 | $dolgraph->setShowPercent(1); |
449 | 449 | $dolgraph->SetType(array('bars', 'bars', 'bars', 'bars', 'bars', 'bars')); |
450 | 450 | //$dolgraph->SetType(array('pie')); |
451 | - $dolgraph->setHeight('160'); /* 160 min is required to show the 6 lines of legend */ |
|
451 | + $dolgraph->setHeight('160'); /* 160 min is required to show the 6 lines of legend */ |
|
452 | 452 | $dolgraph->setWidth('450'); |
453 | 453 | $dolgraph->setHideXValues(true); |
454 | 454 | if ($mode == 'customers') { |