@@ -90,7 +90,7 @@ |
||
90 | 90 | $this->db = $db; |
91 | 91 | $this->name = "cornas"; |
92 | 92 | $this->description = $langs->trans('SuppliersCommandModel'); |
93 | - $this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template |
|
93 | + $this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template |
|
94 | 94 | |
95 | 95 | // Page size for A4 format |
96 | 96 | $this->type = 'pdf'; |
@@ -57,7 +57,7 @@ |
||
57 | 57 | */ |
58 | 58 | public $name = 'Muguet'; |
59 | 59 | |
60 | - public $prefix = 'PO'; // PO for "Purchase Order" |
|
60 | + public $prefix = 'PO'; // PO for "Purchase Order" |
|
61 | 61 | |
62 | 62 | |
63 | 63 | /** |
@@ -100,7 +100,7 @@ |
||
100 | 100 | * @param string $password Password to validate for $username |
101 | 101 | * @return bool True if login ok, false if not |
102 | 102 | */ |
103 | - static function ($username, $password) { |
|
103 | + static function($username, $password) { |
|
104 | 104 | global $user, $conf; |
105 | 105 | global $dolibarr_main_authentication, $dolibarr_auto_user; |
106 | 106 |
@@ -145,38 +145,38 @@ |
||
145 | 145 | $search_date_start_startmonth = GETPOSTINT('search_date_start_startmonth'); |
146 | 146 | $search_date_start_startyear = GETPOSTINT('search_date_start_startyear'); |
147 | 147 | $search_date_start_startday = GETPOSTINT('search_date_start_startday'); |
148 | -$search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear); // Use tzserver |
|
148 | +$search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear); // Use tzserver |
|
149 | 149 | $search_date_start_endmonth = GETPOSTINT('search_date_start_endmonth'); |
150 | 150 | $search_date_start_endyear = GETPOSTINT('search_date_start_endyear'); |
151 | 151 | $search_date_start_endday = GETPOSTINT('search_date_start_endday'); |
152 | -$search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear); // Use tzserver |
|
152 | +$search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear); // Use tzserver |
|
153 | 153 | |
154 | 154 | $search_date_end_startmonth = GETPOSTINT('search_date_end_startmonth'); |
155 | 155 | $search_date_end_startyear = GETPOSTINT('search_date_end_startyear'); |
156 | 156 | $search_date_end_startday = GETPOSTINT('search_date_end_startday'); |
157 | -$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear); // Use tzserver |
|
157 | +$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear); // Use tzserver |
|
158 | 158 | $search_date_end_endmonth = GETPOSTINT('search_date_end_endmonth'); |
159 | 159 | $search_date_end_endyear = GETPOSTINT('search_date_end_endyear'); |
160 | 160 | $search_date_end_endday = GETPOSTINT('search_date_end_endday'); |
161 | -$search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear); // Use tzserver |
|
161 | +$search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear); // Use tzserver |
|
162 | 162 | |
163 | 163 | $search_date_creation_startmonth = GETPOSTINT('search_date_creation_startmonth'); |
164 | 164 | $search_date_creation_startyear = GETPOSTINT('search_date_creation_startyear'); |
165 | 165 | $search_date_creation_startday = GETPOSTINT('search_date_creation_startday'); |
166 | -$search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear); // Use tzserver |
|
166 | +$search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear); // Use tzserver |
|
167 | 167 | $search_date_creation_endmonth = GETPOSTINT('search_date_creation_endmonth'); |
168 | 168 | $search_date_creation_endyear = GETPOSTINT('search_date_creation_endyear'); |
169 | 169 | $search_date_creation_endday = GETPOSTINT('search_date_creation_endday'); |
170 | -$search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear); // Use tzserver |
|
170 | +$search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear); // Use tzserver |
|
171 | 171 | |
172 | 172 | $search_date_modif_startmonth = GETPOSTINT('search_date_modif_startmonth'); |
173 | 173 | $search_date_modif_startyear = GETPOSTINT('search_date_modif_startyear'); |
174 | 174 | $search_date_modif_startday = GETPOSTINT('search_date_modif_startday'); |
175 | -$search_date_modif_start = dol_mktime(0, 0, 0, $search_date_modif_startmonth, $search_date_modif_startday, $search_date_modif_startyear); // Use tzserver |
|
175 | +$search_date_modif_start = dol_mktime(0, 0, 0, $search_date_modif_startmonth, $search_date_modif_startday, $search_date_modif_startyear); // Use tzserver |
|
176 | 176 | $search_date_modif_endmonth = GETPOSTINT('search_date_modif_endmonth'); |
177 | 177 | $search_date_modif_endyear = GETPOSTINT('search_date_modif_endyear'); |
178 | 178 | $search_date_modif_endday = GETPOSTINT('search_date_modif_endday'); |
179 | -$search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear); // Use tzserver |
|
179 | +$search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear); // Use tzserver |
|
180 | 180 | |
181 | 181 | $search_category_array = array(); |
182 | 182 |
@@ -151,8 +151,8 @@ |
||
151 | 151 | $id = GETPOSTINT('id'); |
152 | 152 | $ref = GETPOST('ref', 'alpha'); |
153 | 153 | $action = GETPOST('action', 'aZ09'); |
154 | -$datesrfc = GETPOST('datesrfc'); // deprecated |
|
155 | -$dateerfc = GETPOST('dateerfc'); // deprecated |
|
154 | +$datesrfc = GETPOST('datesrfc'); // deprecated |
|
155 | +$dateerfc = GETPOST('dateerfc'); // deprecated |
|
156 | 156 | $dates = dol_mktime(0, 0, 0, GETPOST('datesmonth'), GETPOST('datesday'), GETPOST('datesyear')); |
157 | 157 | $datee = dol_mktime(23, 59, 59, GETPOST('dateemonth'), GETPOST('dateeday'), GETPOST('dateeyear')); |
158 | 158 | if (empty($dates) && !empty($datesrfc)) { // deprecated |
@@ -88,23 +88,23 @@ |
||
88 | 88 | $search_date_start_startmonth = GETPOSTINT('search_date_start_startmonth'); |
89 | 89 | $search_date_start_startyear = GETPOSTINT('search_date_start_startyear'); |
90 | 90 | $search_date_start_startday = GETPOSTINT('search_date_start_startday'); |
91 | -$search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear); // Use tzserver |
|
91 | +$search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear); // Use tzserver |
|
92 | 92 | $search_date_start_endmonth = GETPOSTINT('search_date_start_endmonth'); |
93 | 93 | $search_date_start_endyear = GETPOSTINT('search_date_start_endyear'); |
94 | 94 | $search_date_start_endday = GETPOSTINT('search_date_start_endday'); |
95 | -$search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear); // Use tzserver |
|
95 | +$search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear); // Use tzserver |
|
96 | 96 | |
97 | 97 | $search_date_end_startmonth = GETPOSTINT('search_date_end_startmonth'); |
98 | 98 | $search_date_end_startyear = GETPOSTINT('search_date_end_startyear'); |
99 | 99 | $search_date_end_startday = GETPOSTINT('search_date_end_startday'); |
100 | -$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear); // Use tzserver |
|
100 | +$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear); // Use tzserver |
|
101 | 101 | $search_date_end_endmonth = GETPOSTINT('search_date_end_endmonth'); |
102 | 102 | $search_date_end_endyear = GETPOSTINT('search_date_end_endyear'); |
103 | 103 | $search_date_end_endday = GETPOSTINT('search_date_end_endday'); |
104 | -$search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear); // Use tzserver |
|
104 | +$search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear); // Use tzserver |
|
105 | 105 | |
106 | 106 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'projecttasklist'; |
107 | -$optioncss = GETPOST('optioncss', 'aZ'); |
|
107 | +$optioncss = GETPOST('optioncss', 'aZ'); |
|
108 | 108 | //if (! $user->rights->projet->all->lire) $mine=1; // Special for projects |
109 | 109 | |
110 | 110 | $object = new Project($db); |
@@ -766,7 +766,7 @@ |
||
766 | 766 | if (empty($totalforeachday[$tmpday])) { |
767 | 767 | $totalforeachday[$tmpday] = empty($projectstatic->weekWorkLoad[$tmpday]) ? 0 : $projectstatic->weekWorkLoad[$tmpday]; |
768 | 768 | } else { |
769 | - $totalforeachday[$tmpday] += empty($projectstatic->weekWorkLoad[$tmpday]) ? 0 : $projectstatic->weekWorkLoad[$tmpday]; |
|
769 | + $totalforeachday[$tmpday] += empty($projectstatic->weekWorkLoad[$tmpday]) ? 0 : $projectstatic->weekWorkLoad[$tmpday]; |
|
770 | 770 | } |
771 | 771 | } |
772 | 772 | } |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | |
112 | 112 | $permissiontoadd = $user->hasRight('projet', 'creer'); |
113 | 113 | $permissiontodelete = $user->hasRight('projet', 'supprimer'); |
114 | -$permissiondellink = $user->hasRight('projet', 'creer'); // Used by the include of actions_dellink.inc.php |
|
114 | +$permissiondellink = $user->hasRight('projet', 'creer'); // Used by the include of actions_dellink.inc.php |
|
115 | 115 | |
116 | 116 | |
117 | 117 | /* |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | $action = ''; |
163 | 163 | } |
164 | 164 | |
165 | - include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; // Must be include, not include_once |
|
165 | + include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; // Must be include, not include_once |
|
166 | 166 | |
167 | 167 | // Action setdraft object |
168 | 168 | if ($action == 'confirm_setdraft' && $confirm == 'yes' && $permissiontoadd) { |
@@ -187,7 +187,7 @@ |
||
187 | 187 | } else { |
188 | 188 | $error++; |
189 | 189 | } |
190 | - } elseif (! ($contactid > 0)) { |
|
190 | + } elseif (!($contactid > 0)) { |
|
191 | 191 | $error++; |
192 | 192 | $langs->load("errors"); |
193 | 193 | setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Contact")), null, 'errors'); |