@@ -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), |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search |
43 | 43 | $backtopage = GETPOST('backtopage', 'alpha'); |
44 | 44 | $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); |
45 | -$lineid = GETPOST('lineid', 'int'); |
|
45 | +$lineid = GETPOST('lineid', 'int'); |
|
46 | 46 | $dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09'); |
47 | 47 | |
48 | 48 | // Initialize technical objects |
@@ -74,10 +74,10 @@ discard block |
||
74 | 74 | include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. |
75 | 75 | |
76 | 76 | |
77 | -$permissiontoread = $user->hasRight('partnership', 'read'); |
|
78 | -$permissiontoadd = $user->hasRight('partnership', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php |
|
77 | +$permissiontoread = $user->hasRight('partnership', 'read'); |
|
78 | +$permissiontoadd = $user->hasRight('partnership', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php |
|
79 | 79 | $permissiontodelete = $user->hasRight('partnership', 'delete') || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT); |
80 | -$permissionnote = $user->hasRight('partnership', 'write'); // Used by the include of actions_setnotes.inc.php |
|
80 | +$permissionnote = $user->hasRight('partnership', 'write'); // Used by the include of actions_setnotes.inc.php |
|
81 | 81 | $permissiondellink = $user->hasRight('partnership', 'write'); // Used by the include of actions_dellink.inc.php |
82 | 82 | $upload_dir = $conf->partnership->multidir_output[isset($object->entity) ? $object->entity : 1]; |
83 | 83 | $managedfor = getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty'); |
@@ -122,8 +122,8 @@ discard block |
||
122 | 122 | } |
123 | 123 | } |
124 | 124 | |
125 | - $fk_partner = ($managedfor == 'member') ? GETPOST('fk_member', 'int') : GETPOST('fk_soc', 'int'); |
|
126 | - $obj_partner = ($managedfor == 'member') ? $object->fk_member : $object->fk_soc; |
|
125 | + $fk_partner = ($managedfor == 'member') ? GETPOST('fk_member', 'int') : GETPOST('fk_soc', 'int'); |
|
126 | + $obj_partner = ($managedfor == 'member') ? $object->fk_member : $object->fk_soc; |
|
127 | 127 | |
128 | 128 | $triggermodname = 'PARTNERSHIP_MODIFY'; // Name of trigger action code to execute when we modify record |
129 | 129 |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | if ($result > 0) { |
222 | 222 | $info = $object->_load_ldap_info(); |
223 | 223 | $dn = $object->_load_ldap_dn($info); |
224 | - $search = "(" . $object->_load_ldap_dn($info, 2) . ")"; |
|
224 | + $search = "(".$object->_load_ldap_dn($info, 2).")"; |
|
225 | 225 | $uAC = $ldap->getAttributeValues($search, "userAccountControl"); |
226 | 226 | if ($uAC["count"] == 1) { |
227 | 227 | $userAccountControl = intval($uAC[0]); |
@@ -235,11 +235,11 @@ discard block |
||
235 | 235 | $info['userAccountControl'] = $userAccountControl; |
236 | 236 | $resUpdate = $ldap->update($dn, $info, $user, $dn); |
237 | 237 | if ($resUpdate < 0) { |
238 | - $this->error = "ErrorLDAP " . $ldap->error; |
|
238 | + $this->error = "ErrorLDAP ".$ldap->error; |
|
239 | 239 | } |
240 | 240 | } |
241 | 241 | } else { |
242 | - $this->error = "ErrorLDAP " . $ldap->error; |
|
242 | + $this->error = "ErrorLDAP ".$ldap->error; |
|
243 | 243 | } |
244 | 244 | } |
245 | 245 | } elseif ($action == 'USER_DELETE') { |
@@ -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') { |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | // the default behaviour but there is no way to change keeping old saved date compatible. |
210 | 210 | $tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT'); |
211 | 211 | // Local time should be used to prevent users in time zones earlier than GMT from being one day earlier |
212 | - $prefix = ";VALUE=DATE"; |
|
212 | + $prefix = ";VALUE=DATE"; |
|
213 | 213 | if ($tzforfullday) { |
214 | 214 | $startdatef = dol_print_date($startdate, "dayxcard", 'gmt'); |
215 | 215 | } else { |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | $enddatef = dol_print_date($enddate, "dayhourxcard", 'gmt'); |
238 | 238 | |
239 | 239 | if ($fulldayevent) { |
240 | - $prefix = ";VALUE=DATE"; |
|
240 | + $prefix = ";VALUE=DATE"; |
|
241 | 241 | // We add 1 second so we reach the +1 day needed for full day event (DTEND must be next day after event) |
242 | 242 | // This is mention in https://datatracker.ietf.org/doc/html/rfc5545: |
243 | 243 | // "The "DTEND" property for a "VEVENT" calendar component specifies the non-inclusive end of the event." |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | |
123 | 123 | $head[$h][0] = DOL_URL_ROOT.'/fichinter/agenda.php?id='.$object->id; |
124 | 124 | $head[$h][1] = $langs->trans('Events'); |
125 | - if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) { |
|
125 | + if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) { |
|
126 | 126 | $nbEvent = 0; |
127 | 127 | // Enable caching of thirdparty count actioncomm |
128 | 128 | require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php'; |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | } else { |
143 | 143 | dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR); |
144 | 144 | } |
145 | - dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
145 | + dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
146 | 146 | } |
147 | 147 | |
148 | 148 | $head[$h][1] .= '/'; |