@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | $search_date_endday = GETPOSTINT('search_date_endday'); |
81 | 81 | $search_date_endmonth = GETPOSTINT('search_date_endmonth'); |
82 | 82 | $search_date_endyear = GETPOSTINT('search_date_endyear'); |
83 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
83 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
84 | 84 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
85 | 85 | $search_date_valid_startday = GETPOSTINT('search_date_valid_startday'); |
86 | 86 | $search_date_valid_startmonth = GETPOSTINT('search_date_valid_startmonth'); |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | $search_date_valid_endday = GETPOSTINT('search_date_valid_endday'); |
89 | 89 | $search_date_valid_endmonth = GETPOSTINT('search_date_valid_endmonth'); |
90 | 90 | $search_date_valid_endyear = GETPOSTINT('search_date_valid_endyear'); |
91 | -$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear); // Use tzserver |
|
91 | +$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear); // Use tzserver |
|
92 | 92 | $search_date_valid_end = dol_mktime(23, 59, 59, $search_date_valid_endmonth, $search_date_valid_endday, $search_date_valid_endyear); |
93 | 93 | $search_type_thirdparty = GETPOST("search_type_thirdparty", 'intcomma'); |
94 | 94 | $search_montant_ht = GETPOST('search_montant_ht', 'alpha'); |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | |
199 | 199 | $object->fields = dol_sort_array($object->fields, 'position'); |
200 | 200 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
201 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
201 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
202 | 202 | |
203 | 203 | if (!$user->hasRight('societe', 'client', 'voir')) { |
204 | 204 | $search_sale = $user->id; |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | public $total; |
165 | 165 | |
166 | 166 | public $cond_reglement_code; |
167 | - public $cond_reglement_doc; // label doc |
|
167 | + public $cond_reglement_doc; // label doc |
|
168 | 168 | |
169 | 169 | public $mode_reglement_code; |
170 | 170 | /** |
@@ -1251,7 +1251,7 @@ discard block |
||
1251 | 1251 | $this->status = (int) $obj->fk_statut; |
1252 | 1252 | $this->datec = $this->db->jdate($obj->datec); // TODO deprecated |
1253 | 1253 | $this->datev = $this->db->jdate($obj->datev); // TODO deprecated |
1254 | - $this->date_creation = $this->db->jdate($obj->datec); // Creation date |
|
1254 | + $this->date_creation = $this->db->jdate($obj->datec); // Creation date |
|
1255 | 1255 | $this->date = $this->date_creation; |
1256 | 1256 | $this->date_validation = $this->db->jdate($obj->datev); // Validation date |
1257 | 1257 | $this->delivery_date = $this->db->jdate($obj->delivery_date); |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | $object = new Mo($db); |
75 | 75 | $extrafields = new ExtraFields($db); |
76 | 76 | $diroutputmassaction = $conf->mrp->dir_output . '/temp/massgeneration/' . $user->id; |
77 | -$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
77 | +$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
78 | 78 | |
79 | 79 | // Fetch optionals attributes and labels |
80 | 80 | $extrafields->fetch_name_optionals_label($object->table_element); |
@@ -487,7 +487,7 @@ discard block |
||
487 | 487 | } |
488 | 488 | |
489 | 489 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
490 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
490 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
491 | 491 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
492 | 492 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
493 | 493 |
@@ -56,8 +56,8 @@ |
||
56 | 56 | |
57 | 57 | $msid = GETPOSTINT('msid'); |
58 | 58 | |
59 | -$year = GETPOST("year"); // TODO Rename into search_year |
|
60 | -$month = GETPOST("month"); // TODO Rename into search_month |
|
59 | +$year = GETPOST("year"); // TODO Rename into search_year |
|
60 | +$month = GETPOST("month"); // TODO Rename into search_month |
|
61 | 61 | |
62 | 62 | $search_ref = GETPOST('search_ref', 'alpha'); |
63 | 63 | $search_movement = GETPOST("search_movement", 'alpha'); |
@@ -960,7 +960,7 @@ discard block |
||
960 | 960 | |
961 | 961 | // Lines to consume |
962 | 962 | |
963 | - $bomcostupdated = 0; // We will recalculate the unitary cost to produce a product using the real "products to consume into MO" |
|
963 | + $bomcostupdated = 0; // We will recalculate the unitary cost to produce a product using the real "products to consume into MO" |
|
964 | 964 | |
965 | 965 | if (!empty($object->lines)) { |
966 | 966 | $nblinetoconsume = 0; |
@@ -1007,15 +1007,15 @@ discard block |
||
1007 | 1007 | } |
1008 | 1008 | |
1009 | 1009 | if ($qtyhourservice && $qtyhourforline) { |
1010 | - $linecost = price2num(($qtyhourforline / $qtyhourservice * $costprice) / $object->qty, 'MT'); // price for line for all quantities |
|
1011 | - $bomcostupdated += price2num(($qtyhourforline / $qtyhourservice * $costprice) / $object->qty, 'MU'); // same but with full accuracy |
|
1010 | + $linecost = price2num(($qtyhourforline / $qtyhourservice * $costprice) / $object->qty, 'MT'); // price for line for all quantities |
|
1011 | + $bomcostupdated += price2num(($qtyhourforline / $qtyhourservice * $costprice) / $object->qty, 'MU'); // same but with full accuracy |
|
1012 | 1012 | } else { |
1013 | - $linecost = price2num(($line->qty * $costprice) / $object->qty, 'MT'); // price for line for all quantities |
|
1014 | - $bomcostupdated += price2num(($line->qty * $costprice) / $object->qty, 'MU'); // same but with full accuracy |
|
1013 | + $linecost = price2num(($line->qty * $costprice) / $object->qty, 'MT'); // price for line for all quantities |
|
1014 | + $bomcostupdated += price2num(($line->qty * $costprice) / $object->qty, 'MU'); // same but with full accuracy |
|
1015 | 1015 | } |
1016 | 1016 | } else { |
1017 | - $linecost = price2num(($line->qty * $costprice) / $object->qty, 'MT'); // price for line for all quantities |
|
1018 | - $bomcostupdated += price2num(($line->qty * $costprice) / $object->qty, 'MU'); // same but with full accuracy |
|
1017 | + $linecost = price2num(($line->qty * $costprice) / $object->qty, 'MT'); // price for line for all quantities |
|
1018 | + $bomcostupdated += price2num(($line->qty * $costprice) / $object->qty, 'MU'); // same but with full accuracy |
|
1019 | 1019 | } |
1020 | 1020 | } |
1021 | 1021 |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | $backtopage = GETPOST('backtopage', 'alpha'); |
54 | 54 | $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); |
55 | 55 | $TBomLineId = GETPOST('bomlineid', 'array'); |
56 | -$lineid = GETPOSTINT('lineid'); |
|
56 | +$lineid = GETPOSTINT('lineid'); |
|
57 | 57 | $socid = GETPOSTINT("socid"); |
58 | 58 | |
59 | 59 | // Initialize technical objects |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | $objectbomchildline = new BOMLine($db); |
155 | 155 | |
156 | 156 | foreach ($TBomLineId as $id_bom_line) { |
157 | - $object = new Mo($db); // modified by the actions_addupdatedelete.inc.php |
|
157 | + $object = new Mo($db); // modified by the actions_addupdatedelete.inc.php |
|
158 | 158 | |
159 | 159 | $objectbomchildline->fetch($id_bom_line); |
160 | 160 |
@@ -377,7 +377,7 @@ discard block |
||
377 | 377 | |
378 | 378 | if (!empty($arraytoconsume) && !empty($arraytoproduce)) { |
379 | 379 | $pos = 0; |
380 | - $arrayofarrayname = array("arraytoconsume","arraytoproduce"); |
|
380 | + $arrayofarrayname = array("arraytoconsume", "arraytoproduce"); |
|
381 | 381 | foreach ($arrayofarrayname as $arrayname) { |
382 | 382 | foreach (${$arrayname} as $value) { |
383 | 383 | $tmpproduct = new Product($this->db); |
@@ -747,7 +747,7 @@ discard block |
||
747 | 747 | $this->db->begin(); |
748 | 748 | |
749 | 749 | $pos = 0; |
750 | - $arrayofarrayname = array("arraytoconsume","arraytoproduce"); |
|
750 | + $arrayofarrayname = array("arraytoconsume", "arraytoproduce"); |
|
751 | 751 | foreach ($arrayofarrayname as $arrayname) { |
752 | 752 | foreach (${$arrayname} as $value) { |
753 | 753 | if (empty($value["objectid"])) { |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | 'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 1000, 'notnull' => -1,), |
122 | 122 | 'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'visible' => 0, 'position' => 1010), |
123 | 123 | 'status' => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'visible' => 2, 'position' => 1000, 'default' => '0', 'notnull' => 1, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '2' => 'InProgress', '3' => 'StatusMOProduced', '9' => 'Canceled')), |
124 | - 'fk_parent_line' => array('type' => 'integer:MoLine:mrp/class/mo.class.php', 'label' => 'ParentMo', 'enabled' => 1, 'visible' => 0, 'position' => 1020, 'default' => '0', 'notnull' => 0, 'index' => 1,'showoncombobox' => 0), |
|
124 | + 'fk_parent_line' => array('type' => 'integer:MoLine:mrp/class/mo.class.php', 'label' => 'ParentMo', 'enabled' => 1, 'visible' => 0, 'position' => 1020, 'default' => '0', 'notnull' => 0, 'index' => 1, 'showoncombobox' => 0), |
|
125 | 125 | ); |
126 | 126 | public $rowid; |
127 | 127 | public $entity; |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | } |
331 | 331 | |
332 | 332 | if (!$error) { |
333 | - $result = $this->createProduction($user, $notrigger); // Insert lines from BOM |
|
333 | + $result = $this->createProduction($user, $notrigger); // Insert lines from BOM |
|
334 | 334 | if ($result <= 0) { |
335 | 335 | $error++; |
336 | 336 | } |
@@ -909,7 +909,7 @@ discard block |
||
909 | 909 | } |
910 | 910 | $productstatic = new Product($this->db); |
911 | 911 | |
912 | - $arrayoflines = $this->fetchLinesLinked('consumed', $idline); // Get lines consumed under the one to delete |
|
912 | + $arrayoflines = $this->fetchLinesLinked('consumed', $idline); // Get lines consumed under the one to delete |
|
913 | 913 | |
914 | 914 | $result = 0; |
915 | 915 | |
@@ -1796,7 +1796,7 @@ discard block |
||
1796 | 1796 | $this->tpl['disable_stock_change'] = $line->disable_stock_change; |
1797 | 1797 | $this->tpl['efficiency'] = $line->efficiency; |
1798 | 1798 | |
1799 | - global $conf; // used into template |
|
1799 | + global $conf; // used into template |
|
1800 | 1800 | $res = include DOL_DOCUMENT_ROOT . '/mrp/tpl/originproductline.tpl.php'; |
1801 | 1801 | } |
1802 | 1802 |
@@ -68,7 +68,7 @@ |
||
68 | 68 | // Parameters |
69 | 69 | $action = GETPOST('action', 'aZ09'); |
70 | 70 | $backtopage = GETPOST('backtopage', 'alpha'); |
71 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
71 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
72 | 72 | |
73 | 73 | $value = GETPOST('value', 'alpha'); |
74 | 74 | $label = GETPOST('label', 'alpha'); |