@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | $optioncss = GETPOST('optioncss', 'alpha'); |
69 | 69 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'projectlist'; |
70 | 70 | $mode = GETPOST('mode', 'alpha'); |
71 | -$groupby = GETPOST('groupby', 'aZ09'); // Example: $groupby = 'p.fk_opp_status' or $groupby = 'p.fk_statut'. Must be a field into $object->fields |
|
71 | +$groupby = GETPOST('groupby', 'aZ09'); // Example: $groupby = 'p.fk_opp_status' or $groupby = 'p.fk_statut'. Must be a field into $object->fields |
|
72 | 72 | |
73 | 73 | $title = $langs->trans("Projects"); |
74 | 74 | |
@@ -159,38 +159,38 @@ discard block |
||
159 | 159 | $search_date_start_startmonth = GETPOSTINT('search_date_start_startmonth'); |
160 | 160 | $search_date_start_startyear = GETPOSTINT('search_date_start_startyear'); |
161 | 161 | $search_date_start_startday = GETPOSTINT('search_date_start_startday'); |
162 | -$search_date_start_start = GETPOSTDATE('search_date_start_start'); // Use tzserver |
|
162 | +$search_date_start_start = GETPOSTDATE('search_date_start_start'); // Use tzserver |
|
163 | 163 | $search_date_start_endmonth = GETPOSTINT('search_date_start_endmonth'); |
164 | 164 | $search_date_start_endyear = GETPOSTINT('search_date_start_endyear'); |
165 | 165 | $search_date_start_endday = GETPOSTINT('search_date_start_endday'); |
166 | -$search_date_start_end = GETPOSTDATE('search_date_start_end', 'end'); // Use tzserver |
|
166 | +$search_date_start_end = GETPOSTDATE('search_date_start_end', 'end'); // Use tzserver |
|
167 | 167 | |
168 | 168 | $search_date_end_startmonth = GETPOSTINT('search_date_end_startmonth'); |
169 | 169 | $search_date_end_startyear = GETPOSTINT('search_date_end_startyear'); |
170 | 170 | $search_date_end_startday = GETPOSTINT('search_date_end_startday'); |
171 | -$search_date_end_start = GETPOSTDATE('search_date_end_start'); // Use tzserver |
|
171 | +$search_date_end_start = GETPOSTDATE('search_date_end_start'); // Use tzserver |
|
172 | 172 | $search_date_end_endmonth = GETPOSTINT('search_date_end_endmonth'); |
173 | 173 | $search_date_end_endyear = GETPOSTINT('search_date_end_endyear'); |
174 | 174 | $search_date_end_endday = GETPOSTINT('search_date_end_endday'); |
175 | -$search_date_end_end = GETPOSTDATE('search_date_end_end', 'end'); ; // Use tzserver |
|
175 | +$search_date_end_end = GETPOSTDATE('search_date_end_end', 'end'); ; // Use tzserver |
|
176 | 176 | |
177 | 177 | $search_date_creation_startmonth = GETPOSTINT('search_date_creation_startmonth'); |
178 | 178 | $search_date_creation_startyear = GETPOSTINT('search_date_creation_startyear'); |
179 | 179 | $search_date_creation_startday = GETPOSTINT('search_date_creation_startday'); |
180 | -$search_date_creation_start = GETPOSTDATE('search_date_creation_start'); // Use tzserver |
|
180 | +$search_date_creation_start = GETPOSTDATE('search_date_creation_start'); // Use tzserver |
|
181 | 181 | $search_date_creation_endmonth = GETPOSTINT('search_date_creation_endmonth'); |
182 | 182 | $search_date_creation_endyear = GETPOSTINT('search_date_creation_endyear'); |
183 | 183 | $search_date_creation_endday = GETPOSTINT('search_date_creation_endday'); |
184 | -$search_date_creation_end = GETPOSTDATE('search_date_creation_end', 'end'); // Use tzserver |
|
184 | +$search_date_creation_end = GETPOSTDATE('search_date_creation_end', 'end'); // Use tzserver |
|
185 | 185 | |
186 | 186 | $search_date_modif_startmonth = GETPOSTINT('search_date_modif_startmonth'); |
187 | 187 | $search_date_modif_startyear = GETPOSTINT('search_date_modif_startyear'); |
188 | 188 | $search_date_modif_startday = GETPOSTINT('search_date_modif_startday'); |
189 | -$search_date_modif_start = GETPOSTDATE('search_date_modif_start'); // Use tzserver |
|
189 | +$search_date_modif_start = GETPOSTDATE('search_date_modif_start'); // Use tzserver |
|
190 | 190 | $search_date_modif_endmonth = GETPOSTINT('search_date_modif_endmonth'); |
191 | 191 | $search_date_modif_endyear = GETPOSTINT('search_date_modif_endyear'); |
192 | 192 | $search_date_modif_endday = GETPOSTINT('search_date_modif_endday'); |
193 | -$search_date_modif_end = GETPOSTDATE('search_date_modif_end', 'end'); // Use tzserver |
|
193 | +$search_date_modif_end = GETPOSTDATE('search_date_modif_end', 'end'); // Use tzserver |
|
194 | 194 | |
195 | 195 | $search_category_array = array(); |
196 | 196 | |
@@ -328,7 +328,7 @@ discard block |
||
328 | 328 | $sql .= " WHERE active = 1"; |
329 | 329 | //$sql .= " AND cls.code <> 'LOST'"; |
330 | 330 | //$sql .= " AND cls.code <> 'WON'"; |
331 | - $sql .= $db->order('cls.position,cls.rowid', 'ASC'); // Must use the same order key than the key in $groupby |
|
331 | + $sql .= $db->order('cls.position,cls.rowid', 'ASC'); // Must use the same order key than the key in $groupby |
|
332 | 332 | $resql = $db->query($sql); |
333 | 333 | if ($resql) { |
334 | 334 | $num = $db->num_rows($resql); |
@@ -791,7 +791,7 @@ discard block |
||
791 | 791 | if ($searchCategoryProjectOperator == 0) { |
792 | 792 | $searchCategoryProjectSqlList[] = " EXISTS (SELECT ck.fk_project FROM ".MAIN_DB_PREFIX."categorie_project as ck WHERE p.rowid = ck.fk_project AND ck.fk_categorie = ".((int) $searchCategoryProject).")"; |
793 | 793 | } else { |
794 | - $listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProject); |
|
794 | + $listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProject); |
|
795 | 795 | } |
796 | 796 | } |
797 | 797 | } |
@@ -1001,7 +1001,7 @@ discard block |
||
1001 | 1001 | $param .= '&search_date_end_endday='.urlencode((string) ($search_date_end_endday)); |
1002 | 1002 | } |
1003 | 1003 | if ($search_date_end_end) { |
1004 | - $param .= '&search_date_end_end=' . urlencode($search_date_end_end); |
|
1004 | + $param .= '&search_date_end_end='.urlencode($search_date_end_end); |
|
1005 | 1005 | } |
1006 | 1006 | if ($search_date_creation_startmonth) { |
1007 | 1007 | $param .= '&search_date_creation_startmonth='.urlencode((string) ($search_date_creation_startmonth)); |
@@ -1049,7 +1049,7 @@ discard block |
||
1049 | 1049 | $param .= '&search_date_modif_endday='.urlencode((string) ($search_date_modif_endday)); |
1050 | 1050 | } |
1051 | 1051 | if ($search_date_modif_end) { |
1052 | - $param .= '&search_date_modif_end=' . urlencode($search_date_modif_end); |
|
1052 | + $param .= '&search_date_modif_end='.urlencode($search_date_modif_end); |
|
1053 | 1053 | } |
1054 | 1054 | if (!empty($search_category_array)) { |
1055 | 1055 | foreach ($search_category_array as $tmpval) { |
@@ -1284,7 +1284,7 @@ discard block |
||
1284 | 1284 | } |
1285 | 1285 | |
1286 | 1286 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
1287 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
1287 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
1288 | 1288 | $selectedfields = (($mode != 'kanban' && $mode != 'kanbangroupby') ? $htmlofselectarray : ''); |
1289 | 1289 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
1290 | 1290 | |
@@ -1757,7 +1757,7 @@ discard block |
||
1757 | 1757 | //var_dump("groupby=$groupby groupbyvalue=$groupbyvalue groupbyfield=$groupbyfield"); |
1758 | 1758 | |
1759 | 1759 | if (is_null($groupbyold)) { |
1760 | - print '<div class="box-flex-container-columns kanban">'; // Start div for all kanban columns |
|
1760 | + print '<div class="box-flex-container-columns kanban">'; // Start div for all kanban columns |
|
1761 | 1761 | } |
1762 | 1762 | // Start kanban column |
1763 | 1763 | if (is_null($obj->$groupbyfield)) { |
@@ -1770,7 +1770,7 @@ discard block |
||
1770 | 1770 | |
1771 | 1771 | if ($groupbyold !== $groupbyvalue) { // We found a break on a new column |
1772 | 1772 | if (!is_null($groupbyold)) { |
1773 | - print '</div>'; // We need a new kanban column - end box-flex-container |
|
1773 | + print '</div>'; // We need a new kanban column - end box-flex-container |
|
1774 | 1774 | } |
1775 | 1775 | |
1776 | 1776 | $indexofgroupbyvalue = null; |
@@ -1812,10 +1812,10 @@ discard block |
||
1812 | 1812 | } |
1813 | 1813 | print '" data-groupbyid="'.preg_replace('/[^a-z0-9]/', '', $tmpgroupbyvalue['id']).'" data-groupbyfield="'.$groupbyfield.'">'; |
1814 | 1814 | print '<div class="kanbanlabel">'.$langs->trans($tmpgroupbyvalue['label']).'</div>'; |
1815 | - print '</div>'; // Start and end the new column |
|
1815 | + print '</div>'; // Start and end the new column |
|
1816 | 1816 | } |
1817 | 1817 | |
1818 | - print '<!-- start column for value --><div class="box-flex-container-column kanban column" data-groupbyid="'.preg_replace('/[^a-z0-9]/i', '', $groupbyvalue).'" data-groupbyfield="'.$groupbyfield.'">'; // Start new column |
|
1818 | + print '<!-- start column for value --><div class="box-flex-container-column kanban column" data-groupbyid="'.preg_replace('/[^a-z0-9]/i', '', $groupbyvalue).'" data-groupbyfield="'.$groupbyfield.'">'; // Start new column |
|
1819 | 1819 | print '<div class="kanbanlabel">'.$langs->trans((is_null($indexofgroupbyvalue) || empty($groupbyvalues[$indexofgroupbyvalue]['label'])) ? 'Undefined' : $groupbyvalues[$indexofgroupbyvalue]['label']).'</div>'; |
1820 | 1820 | } |
1821 | 1821 | $groupbyold = $groupbyvalue; |
@@ -1839,7 +1839,7 @@ discard block |
||
1839 | 1839 | if ($i == ($imaxinloop - 1)) { |
1840 | 1840 | // Close kanban column |
1841 | 1841 | if (!empty($groupby)) { |
1842 | - print '</div>'; // end box-flex-container |
|
1842 | + print '</div>'; // end box-flex-container |
|
1843 | 1843 | |
1844 | 1844 | // We show column that we must show after the last current record |
1845 | 1845 | //var_dump("groupbyold=".$groupbyold.", current record to show has group value groupbyvalue=".$groupbyvalue); |
@@ -1876,11 +1876,11 @@ discard block |
||
1876 | 1876 | } |
1877 | 1877 | print '" data-groupbyid="'.preg_replace('/[^a-z0-9]/', '', $tmpgroupbyvalue['id']).'" data-groupbyfield="'.$groupbyfield.'">'; |
1878 | 1878 | print '<div class="kanbanlabel">'.$langs->trans(empty($tmpgroupbyvalue['label']) ? 'Undefined' : $tmpgroupbyvalue['label']).'</div>'; |
1879 | - print '</div>'; // Start and end the new column |
|
1879 | + print '</div>'; // Start and end the new column |
|
1880 | 1880 | } |
1881 | - print '</div>'; // end box-flex-container-columns |
|
1881 | + print '</div>'; // end box-flex-container-columns |
|
1882 | 1882 | } else { |
1883 | - print '</div>'; // end box-flex-container |
|
1883 | + print '</div>'; // end box-flex-container |
|
1884 | 1884 | } |
1885 | 1885 | |
1886 | 1886 | print '</td></tr>'; |
@@ -392,7 +392,7 @@ discard block |
||
392 | 392 | /** |
393 | 393 | * Shipment on process |
394 | 394 | */ |
395 | - const STATUS_SHIPMENTONPROCESS = 2; // We set this status when a shipment is validated |
|
395 | + const STATUS_SHIPMENTONPROCESS = 2; // We set this status when a shipment is validated |
|
396 | 396 | |
397 | 397 | /** |
398 | 398 | * For backward compatibility. Use key STATUS_SHIPMENTONPROCESS instead. |
@@ -408,12 +408,12 @@ discard block |
||
408 | 408 | /* |
409 | 409 | * No signature |
410 | 410 | */ |
411 | - const STATUS_NO_SIGNATURE = 0; |
|
411 | + const STATUS_NO_SIGNATURE = 0; |
|
412 | 412 | |
413 | 413 | /* |
414 | 414 | * Signed by sender |
415 | 415 | */ |
416 | - const STATUS_SIGNED_SENDER = 1; |
|
416 | + const STATUS_SIGNED_SENDER = 1; |
|
417 | 417 | |
418 | 418 | /* |
419 | 419 | * Signed by receiver |
@@ -423,7 +423,7 @@ discard block |
||
423 | 423 | /* |
424 | 424 | * Signed by all |
425 | 425 | */ |
426 | - const STATUS_SIGNED_ALL = 9; // To handle future kind of signature (ex: tripartite contract) |
|
426 | + const STATUS_SIGNED_ALL = 9; // To handle future kind of signature (ex: tripartite contract) |
|
427 | 427 | |
428 | 428 | |
429 | 429 | /** |
@@ -456,7 +456,7 @@ discard block |
||
456 | 456 | if (getDolGlobalString('COMMANDE_ADDON')) { |
457 | 457 | $mybool = false; |
458 | 458 | |
459 | - $file = getDolGlobalString('COMMANDE_ADDON') . ".php"; |
|
459 | + $file = getDolGlobalString('COMMANDE_ADDON').".php"; |
|
460 | 460 | $classname = getDolGlobalString('COMMANDE_ADDON'); |
461 | 461 | |
462 | 462 | // Include file with class |
@@ -642,7 +642,7 @@ discard block |
||
642 | 642 | // Set new ref and current status |
643 | 643 | if (!$error) { |
644 | 644 | $this->ref = $num; |
645 | - $this->statut = self::STATUS_VALIDATED; // deprecated |
|
645 | + $this->statut = self::STATUS_VALIDATED; // deprecated |
|
646 | 646 | $this->status = self::STATUS_VALIDATED; |
647 | 647 | } |
648 | 648 | |
@@ -728,7 +728,7 @@ discard block |
||
728 | 728 | } |
729 | 729 | |
730 | 730 | if (!$error) { |
731 | - $this->statut = self::STATUS_DRAFT; // deprecated |
|
731 | + $this->statut = self::STATUS_DRAFT; // deprecated |
|
732 | 732 | $this->status = self::STATUS_DRAFT; |
733 | 733 | $this->db->commit(); |
734 | 734 | return 1; |
@@ -785,7 +785,7 @@ discard block |
||
785 | 785 | } |
786 | 786 | |
787 | 787 | if (!$error) { |
788 | - $this->statut = self::STATUS_VALIDATED; // deprecated |
|
788 | + $this->statut = self::STATUS_VALIDATED; // deprecated |
|
789 | 789 | $this->status = self::STATUS_VALIDATED; |
790 | 790 | $this->billed = 0; |
791 | 791 | |
@@ -841,7 +841,7 @@ discard block |
||
841 | 841 | } |
842 | 842 | |
843 | 843 | if (!$error) { |
844 | - $this->statut = self::STATUS_CLOSED; // deprecated |
|
844 | + $this->statut = self::STATUS_CLOSED; // deprecated |
|
845 | 845 | $this->status = self::STATUS_CLOSED; |
846 | 846 | |
847 | 847 | $this->db->commit(); |
@@ -931,7 +931,7 @@ discard block |
||
931 | 931 | } |
932 | 932 | |
933 | 933 | if (!$error) { |
934 | - $this->statut = self::STATUS_CANCELED; // deprecated |
|
934 | + $this->statut = self::STATUS_CANCELED; // deprecated |
|
935 | 935 | $this->status = self::STATUS_CANCELED; |
936 | 936 | $this->db->commit(); |
937 | 937 | return 1; |
@@ -1047,7 +1047,7 @@ discard block |
||
1047 | 1047 | $sql .= ", '".$this->db->escape($this->location_incoterms)."'"; |
1048 | 1048 | $sql .= ", ".(int) $this->entity; |
1049 | 1049 | $sql .= ", ".($this->module_source ? "'".$this->db->escape($this->module_source)."'" : "null"); |
1050 | - $sql .= ", ".((!is_null($this->pos_source) && $this->pos_source != '') ? "'".$this->db->escape($this->pos_source)."'" : "null"); // Can be null, '', '0', '1' |
|
1050 | + $sql .= ", ".((!is_null($this->pos_source) && $this->pos_source != '') ? "'".$this->db->escape($this->pos_source)."'" : "null"); // Can be null, '', '0', '1' |
|
1051 | 1051 | $sql .= ", ".(int) $this->fk_multicurrency; |
1052 | 1052 | $sql .= ", '".$this->db->escape($this->multicurrency_code)."'"; |
1053 | 1053 | $sql .= ", ".(float) $this->multicurrency_tx; |
@@ -1286,7 +1286,7 @@ discard block |
||
1286 | 1286 | if ($objsoc->fetch($socid) > 0) { |
1287 | 1287 | $this->socid = $objsoc->id; |
1288 | 1288 | $this->cond_reglement_id = (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0); |
1289 | - $this->deposit_percent = (!empty($objsoc->deposit_percent) ? $objsoc->deposit_percent : 0); |
|
1289 | + $this->deposit_percent = (!empty($objsoc->deposit_percent) ? $objsoc->deposit_percent : 0); |
|
1290 | 1290 | $this->mode_reglement_id = (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0); |
1291 | 1291 | $this->fk_project = 0; |
1292 | 1292 | $this->fk_delivery_address = 0; |
@@ -1297,7 +1297,7 @@ discard block |
||
1297 | 1297 | |
1298 | 1298 | $this->id = 0; |
1299 | 1299 | $this->ref = ''; |
1300 | - $this->statut = self::STATUS_DRAFT; // deprecated |
|
1300 | + $this->statut = self::STATUS_DRAFT; // deprecated |
|
1301 | 1301 | $this->status = self::STATUS_DRAFT; |
1302 | 1302 | |
1303 | 1303 | // Clear fields |
@@ -1378,8 +1378,8 @@ discard block |
||
1378 | 1378 | { |
1379 | 1379 | global $conf, $hookmanager; |
1380 | 1380 | |
1381 | - require_once DOL_DOCUMENT_ROOT . '/multicurrency/class/multicurrency.class.php'; |
|
1382 | - require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php'; |
|
1381 | + require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php'; |
|
1382 | + require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; |
|
1383 | 1383 | |
1384 | 1384 | $error = 0; |
1385 | 1385 | |
@@ -1411,7 +1411,7 @@ discard block |
||
1411 | 1411 | $line->fk_parent_line = $object->lines[$i]->fk_parent_line; |
1412 | 1412 | $line->fk_unit = $object->lines[$i]->fk_unit; |
1413 | 1413 | |
1414 | - $line->date_start = $object->lines[$i]->date_start; |
|
1414 | + $line->date_start = $object->lines[$i]->date_start; |
|
1415 | 1415 | $line->date_end = $object->lines[$i]->date_end; |
1416 | 1416 | |
1417 | 1417 | $line->fk_fournprice = $object->lines[$i]->fk_fournprice; |
@@ -1793,7 +1793,7 @@ discard block |
||
1793 | 1793 | $this->line->date_end = $date_end; |
1794 | 1794 | |
1795 | 1795 | $this->line->fk_fournprice = $fk_fournprice; |
1796 | - $this->line->pa_ht = $pa_ht; // Can be '' when not defined or 0 if defined to 0 or a price value |
|
1796 | + $this->line->pa_ht = $pa_ht; // Can be '' when not defined or 0 if defined to 0 or a price value |
|
1797 | 1797 | |
1798 | 1798 | // Multicurrency |
1799 | 1799 | $this->line->fk_multicurrency = $this->fk_multicurrency; |
@@ -2025,7 +2025,7 @@ discard block |
||
2025 | 2025 | $this->fk_project = $obj->fk_project; |
2026 | 2026 | $this->project = null; // Clear if another value was already set by fetch_projet |
2027 | 2027 | |
2028 | - $this->statut = $obj->status; // deprecated |
|
2028 | + $this->statut = $obj->status; // deprecated |
|
2029 | 2029 | $this->status = $obj->status; |
2030 | 2030 | |
2031 | 2031 | $this->user_author_id = $obj->fk_user_author; |
@@ -2275,7 +2275,7 @@ discard block |
||
2275 | 2275 | $line->weight_units = $objp->weight_units; |
2276 | 2276 | $line->volume = $objp->volume; |
2277 | 2277 | $line->volume_units = $objp->volume_units; |
2278 | - $line->packaging = $objp->packaging; |
|
2278 | + $line->packaging = $objp->packaging; |
|
2279 | 2279 | |
2280 | 2280 | $line->date_start = $this->db->jdate($objp->date_start); |
2281 | 2281 | $line->date_end = $this->db->jdate($objp->date_end); |
@@ -3636,15 +3636,15 @@ discard block |
||
3636 | 3636 | //$sql.= " AND c.fk_statut IN (1,2,3) AND c.facture = 0"; |
3637 | 3637 | if ($mode == 'toship') { |
3638 | 3638 | // An order to ship is an open order (validated or in progress) |
3639 | - $sql .= " AND c.fk_statut IN (" . self::STATUS_VALIDATED . "," . self::STATUS_SHIPMENTONPROCESS . ")"; |
|
3639 | + $sql .= " AND c.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_SHIPMENTONPROCESS.")"; |
|
3640 | 3640 | } |
3641 | 3641 | if ($mode == 'tobill') { |
3642 | 3642 | // An order to bill is an order not already billed |
3643 | - $sql .= " AND c.fk_statut IN (" . self::STATUS_VALIDATED . "," . self::STATUS_SHIPMENTONPROCESS . ", " . self::STATUS_CLOSED . ") AND c.facture = 0"; |
|
3643 | + $sql .= " AND c.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_SHIPMENTONPROCESS.", ".self::STATUS_CLOSED.") AND c.facture = 0"; |
|
3644 | 3644 | } |
3645 | 3645 | if ($mode == 'shippedtobill') { |
3646 | 3646 | // An order shipped and to bill is a delivered order not already billed |
3647 | - $sql .= " AND c.fk_statut IN (" . self::STATUS_CLOSED . ") AND c.facture = 0"; |
|
3647 | + $sql .= " AND c.fk_statut IN (".self::STATUS_CLOSED.") AND c.facture = 0"; |
|
3648 | 3648 | } |
3649 | 3649 | if ($user->socid) { |
3650 | 3650 | $sql .= " AND c.fk_soc = ".((int) $user->socid); |
@@ -3973,7 +3973,7 @@ discard block |
||
3973 | 3973 | } |
3974 | 3974 | |
3975 | 3975 | global $action; |
3976 | - $hookmanager->initHooks(array($this->element . 'dao')); |
|
3976 | + $hookmanager->initHooks(array($this->element.'dao')); |
|
3977 | 3977 | $parameters = array('id' => $this->id, 'getnomurl' => &$result); |
3978 | 3978 | $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks |
3979 | 3979 | if ($reshook > 0) { |
@@ -4081,7 +4081,7 @@ discard block |
||
4081 | 4081 | $this->status = $this::STATUS_DRAFT; |
4082 | 4082 | |
4083 | 4083 | // Lines |
4084 | - $nbp = min(1000, GETPOSTINT('nblines') ? GETPOSTINT('nblines') : 5); // We can force the nb of lines to test from command line (but not more than 1000) |
|
4084 | + $nbp = min(1000, GETPOSTINT('nblines') ? GETPOSTINT('nblines') : 5); // We can force the nb of lines to test from command line (but not more than 1000) |
|
4085 | 4085 | $xnbp = 0; |
4086 | 4086 | |
4087 | 4087 | while ($xnbp < $nbp) { |
@@ -603,7 +603,7 @@ discard block |
||
603 | 603 | |
604 | 604 | $moreHtmlRight = ''; |
605 | 605 | if ($action == 'create') { |
606 | - $urlToggleDisplayMod = $_SERVER["PHP_SELF"].'?facid='.((int) $facid).'&action='.urlencode($action).'&accountid='.((int) $accountid).'&display-all-invoices=' . (intval(!$displayAllInvoices)); |
|
606 | + $urlToggleDisplayMod = $_SERVER["PHP_SELF"].'?facid='.((int) $facid).'&action='.urlencode($action).'&accountid='.((int) $accountid).'&display-all-invoices='.(intval(!$displayAllInvoices)); |
|
607 | 607 | |
608 | 608 | if (empty($displayAllInvoices)) { |
609 | 609 | $btnTitle = $langs->trans('DisplayOtherInvoicesToo'); |
@@ -618,20 +618,20 @@ discard block |
||
618 | 618 | } |
619 | 619 | |
620 | 620 | $btnIcon = empty($displayAllInvoices) ? 'fa fa-eye' : 'fa fa-eye-slash'; |
621 | - $moreHtmlRight.= dolGetButtonTitle($btnTitle, '', $btnIcon, $urlToggleDisplayMod); |
|
621 | + $moreHtmlRight .= dolGetButtonTitle($btnTitle, '', $btnIcon, $urlToggleDisplayMod); |
|
622 | 622 | } |
623 | 623 | |
624 | 624 | print_barre_liste($langs->trans('Invoices'), 0, $_SERVER["PHP_SELF"], '', '', '', '', $num, $totalnboflines, 'bill', 0, $moreHtmlRight, '', 0, 0, 0, 1); |
625 | 625 | |
626 | 626 | |
627 | 627 | print '<div class="div-table-responsive-no-min">'; |
628 | - print '<table id="fourn-invoices-paiments-list" data-display-all-invoices="' . (int) $displayAllInvoices . '" class="tagtable liste" >'."\n"; |
|
628 | + print '<table id="fourn-invoices-paiments-list" data-display-all-invoices="'.(int) $displayAllInvoices.'" class="tagtable liste" >'."\n"; |
|
629 | 629 | print '<thead>'; |
630 | 630 | print '<tr class="liste_titre">'; |
631 | 631 | print '<th>'.$langs->trans('Invoice').'</th>'; |
632 | 632 | print '<th>'.$langs->trans('RefSupplier').'</th>'; |
633 | 633 | if ($displayAllInvoices) { |
634 | - print '<th class="center">' . $langs->trans('Type') . '</th>'; |
|
634 | + print '<th class="center">'.$langs->trans('Type').'</th>'; |
|
635 | 635 | } |
636 | 636 | print '<th class="center">'.$langs->trans('Date').'</th>'; |
637 | 637 | print '<th class="center">'.$langs->trans('DateMaxPayment').'</th>'; |
@@ -652,8 +652,8 @@ discard block |
||
652 | 652 | $total = 0; |
653 | 653 | $total_ttc = 0; |
654 | 654 | $totalrecu = 0; |
655 | - $totalrecucreditnote = 0; // PHP Warning: Undefined variable $totalrecucreditnote |
|
656 | - $totalrecudeposits = 0; // PHP Warning: Undefined variable $totalrecudeposits |
|
655 | + $totalrecucreditnote = 0; // PHP Warning: Undefined variable $totalrecucreditnote |
|
656 | + $totalrecudeposits = 0; // PHP Warning: Undefined variable $totalrecudeposits |
|
657 | 657 | while ($i < $num) { |
658 | 658 | $objp = $db->fetch_object($resql); |
659 | 659 | |
@@ -706,7 +706,7 @@ discard block |
||
706 | 706 | FactureFournisseur::TYPE_DEPOSIT => $langs->trans("InvoiceDeposit"), |
707 | 707 | ]; |
708 | 708 | // Primary Secondary Success Danger Warning Info Light Dark status0 status1 status2 status3 status4 status5 status6 status7 status8 status9 |
709 | - print '<td class="center nowraponall">' . $typearray[$objp->type] . '</td>'; |
|
709 | + print '<td class="center nowraponall">'.$typearray[$objp->type].'</td>'; |
|
710 | 710 | } |
711 | 711 | |
712 | 712 | // Date |