@@ -49,7 +49,7 @@ |
||
49 | 49 | $socid = $user->socid; |
50 | 50 | } |
51 | 51 | $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture'); |
52 | -$hookmanager->initHooks(array('invoicesuppliercardcontact','invoicesuppliercontactcard', 'globalcard')); |
|
52 | +$hookmanager->initHooks(array('invoicesuppliercardcontact', 'invoicesuppliercontactcard', 'globalcard')); |
|
53 | 53 | |
54 | 54 | $object = new FactureFournisseur($db); |
55 | 55 |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | $search_date_endday = GETPOSTINT('search_date_endday'); |
85 | 85 | $search_date_endmonth = GETPOSTINT('search_date_endmonth'); |
86 | 86 | $search_date_endyear = GETPOSTINT('search_date_endyear'); |
87 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
87 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
88 | 88 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
89 | 89 | $search_date_when_startday = GETPOSTINT('search_date_when_startday'); |
90 | 90 | $search_date_when_startmonth = GETPOSTINT('search_date_when_startmonth'); |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | $search_date_when_endday = GETPOSTINT('search_date_when_endday'); |
93 | 93 | $search_date_when_endmonth = GETPOSTINT('search_date_when_endmonth'); |
94 | 94 | $search_date_when_endyear = GETPOSTINT('search_date_when_endyear'); |
95 | -$search_date_when_start = dol_mktime(0, 0, 0, $search_date_when_startmonth, $search_date_when_startday, $search_date_when_startyear); // Use tzserver |
|
95 | +$search_date_when_start = dol_mktime(0, 0, 0, $search_date_when_startmonth, $search_date_when_startday, $search_date_when_startyear); // Use tzserver |
|
96 | 96 | $search_date_when_end = dol_mktime(23, 59, 59, $search_date_when_endmonth, $search_date_when_endday, $search_date_when_endyear); |
97 | 97 | $search_recurring = GETPOST('search_recurring', 'intcomma'); |
98 | 98 | $search_frequency = GETPOST('search_frequency', 'alpha'); |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | |
164 | 164 | $object->fields = dol_sort_array($object->fields, 'position'); |
165 | 165 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
166 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
166 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
167 | 167 | |
168 | 168 | if ($socid > 0) { |
169 | 169 | $tmpthirdparty = new Societe($db); |
@@ -538,7 +538,7 @@ discard block |
||
538 | 538 | $massactionbutton = $form->selectMassAction('', $massaction == 'presend' ? array() : array('presend' => $langs->trans("SendByMail"), 'builddoc' => $langs->trans("PDFMerge"))); |
539 | 539 | |
540 | 540 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
541 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
541 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
542 | 542 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
543 | 543 | //$selectedfields.=$form->showCheckAddButtons('checkforselect', 1); |
544 | 544 |
@@ -312,14 +312,14 @@ discard block |
||
312 | 312 | |
313 | 313 | // Creation of payment line |
314 | 314 | $paiement = new PaiementFourn($db); |
315 | - $paiement->datepaye = $datepaye; |
|
315 | + $paiement->datepaye = $datepaye; |
|
316 | 316 | |
317 | 317 | $correctedAmounts = []; |
318 | 318 | foreach ($amounts as $key => $value) { |
319 | 319 | $correctedAmounts[$key] = (float) $value; |
320 | 320 | } |
321 | 321 | |
322 | - $paiement->amounts = $correctedAmounts; // Array of amounts |
|
322 | + $paiement->amounts = $correctedAmounts; // Array of amounts |
|
323 | 323 | $paiement->multicurrency_amounts = $multicurrency_amounts; |
324 | 324 | $paiement->multicurrency_code = $multicurrency_code; // Array with all currency of payments dispatching |
325 | 325 | $paiement->multicurrency_tx = $multicurrency_tx; // Array with all currency tx of payments dispatching |
@@ -610,8 +610,8 @@ discard block |
||
610 | 610 | $total = 0; |
611 | 611 | $total_ttc = 0; |
612 | 612 | $totalrecu = 0; |
613 | - $totalrecucreditnote = 0; // PHP Warning: Undefined variable $totalrecucreditnote |
|
614 | - $totalrecudeposits = 0; // PHP Warning: Undefined variable $totalrecudeposits |
|
613 | + $totalrecucreditnote = 0; // PHP Warning: Undefined variable $totalrecucreditnote |
|
614 | + $totalrecudeposits = 0; // PHP Warning: Undefined variable $totalrecudeposits |
|
615 | 615 | while ($i < $num) { |
616 | 616 | $objp = $db->fetch_object($resql); |
617 | 617 |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | $search_multicurrency_montant_ht = GETPOST('search_multicurrency_montant_ht', 'alpha'); |
87 | 87 | $search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat', 'alpha'); |
88 | 88 | $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha'); |
89 | -$search_status = GETPOST('search_status', 'intcomma'); // Can be '' or a numeric |
|
89 | +$search_status = GETPOST('search_status', 'intcomma'); // Can be '' or a numeric |
|
90 | 90 | $search_paymentmode = GETPOST('search_paymentmode', 'intcomma'); |
91 | 91 | $search_paymentcond = GETPOST('search_paymentcond', 'intcomma'); |
92 | 92 | $search_town = GETPOST('search_town', 'alpha'); |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | |
219 | 219 | $object->fields = dol_sort_array($object->fields, 'position'); |
220 | 220 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
221 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
221 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
222 | 222 | |
223 | 223 | if (!isModEnabled('supplier_invoice')) { |
224 | 224 | accessforbidden(); |
@@ -1075,7 +1075,7 @@ discard block |
||
1075 | 1075 | } |
1076 | 1076 | |
1077 | 1077 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
1078 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
1078 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
1079 | 1079 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
1080 | 1080 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
1081 | 1081 | |
@@ -1929,7 +1929,7 @@ discard block |
||
1929 | 1929 | $totalarray['pos'][$totalarray['nbfield']] = 'totalam'; |
1930 | 1930 | } |
1931 | 1931 | if (empty($totalarray['val']['totalam'])) { |
1932 | - $totalarray['val']['totalam'] = 0; // avoid PHP Warning: Undefined array key "totalam" on line 1891 |
|
1932 | + $totalarray['val']['totalam'] = 0; // avoid PHP Warning: Undefined array key "totalam" on line 1891 |
|
1933 | 1933 | } |
1934 | 1934 | $totalarray['val']['totalam'] += $totalpay; |
1935 | 1935 | } |
@@ -87,10 +87,10 @@ discard block |
||
87 | 87 | $page = 0; |
88 | 88 | } // If $page is not defined, or '' or -1 |
89 | 89 | $offset = $limit * $page; |
90 | -if (! $sortorder) { |
|
90 | +if (!$sortorder) { |
|
91 | 91 | $sortorder = 'DESC'; |
92 | 92 | } |
93 | -if (! $sortfield) { |
|
93 | +if (!$sortfield) { |
|
94 | 94 | $sortfield = 'f.titre'; |
95 | 95 | } |
96 | 96 | $pageprev = $page - 1; |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | $object = new FactureFournisseurRec($db); |
100 | 100 | if (($id > 0 || $title) && $action != 'create' && $action != 'add') { |
101 | 101 | $ret = $object->fetch($id, $title); |
102 | - if (! $ret) { |
|
102 | + if (!$ret) { |
|
103 | 103 | setEventMessages($langs->trans("ErrorRecordNotFound"), null, 'errors'); |
104 | 104 | } |
105 | 105 | } |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | $action = 'list'; |
144 | 144 | $massaction = ''; |
145 | 145 | } |
146 | -if (! GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { |
|
146 | +if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { |
|
147 | 147 | $massaction = ''; |
148 | 148 | } |
149 | 149 | |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | |
171 | 171 | // Create predefined invoice |
172 | 172 | if ($action == 'add') { |
173 | - if (! GETPOST('title', 'alphanohtml')) { |
|
173 | + if (!GETPOST('title', 'alphanohtml')) { |
|
174 | 174 | setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->trans("Title")), null, 'errors'); |
175 | 175 | $action = "create"; |
176 | 176 | $error++; |
@@ -193,10 +193,10 @@ discard block |
||
193 | 193 | } |
194 | 194 | } |
195 | 195 | |
196 | - if (! $error) { |
|
196 | + if (!$error) { |
|
197 | 197 | $object->subtype = GETPOSTINT('subtype'); |
198 | 198 | $object->title = GETPOST('title', 'alphanohtml'); |
199 | - $object->libelle = GETPOST('libelle', 'alpha'); // deprecated |
|
199 | + $object->libelle = GETPOST('libelle', 'alpha'); // deprecated |
|
200 | 200 | $object->label = GETPOST('libelle', 'alpha'); |
201 | 201 | $object->fk_project = GETPOSTINT('projectid'); |
202 | 202 | $object->ref_supplier = GETPOST('ref_supplier', 'alphanohtml'); |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | $action = "create"; |
243 | 243 | } |
244 | 244 | |
245 | - if (! $error) { |
|
245 | + if (!$error) { |
|
246 | 246 | $db->commit(); |
247 | 247 | |
248 | 248 | header("Location: " . $_SERVER['PHP_SELF'] . '?facid=' . $object->id); |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | $result = $object->setValueFrom('titre', $title, '', null, 'text', '', $user); |
293 | 293 | |
294 | 294 | if ($result > 0) { |
295 | - $object->titre = $title; // deprecated |
|
295 | + $object->titre = $title; // deprecated |
|
296 | 296 | $object->title = $title; |
297 | 297 | $object->ref = $object->title; |
298 | 298 | } else { |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | $error++; |
340 | 340 | } |
341 | 341 | |
342 | - if (! $error) { |
|
342 | + if (!$error) { |
|
343 | 343 | $db->commit(); |
344 | 344 | } else { |
345 | 345 | $db->rollback(); |
@@ -356,7 +356,7 @@ discard block |
||
356 | 356 | $error++; |
357 | 357 | } |
358 | 358 | |
359 | - if (! $error) { |
|
359 | + if (!$error) { |
|
360 | 360 | $db->commit(); |
361 | 361 | } else { |
362 | 362 | $db->rollback(); |
@@ -415,7 +415,7 @@ discard block |
||
415 | 415 | $error++; |
416 | 416 | } |
417 | 417 | |
418 | - if (! $error) { |
|
418 | + if (!$error) { |
|
419 | 419 | $result = $object->insertExtraFields('BILLREC_MODIFY'); |
420 | 420 | if ($result < 0) { |
421 | 421 | setEventMessages($object->error, $object->errors, 'errors'); |
@@ -466,7 +466,7 @@ discard block |
||
466 | 466 | setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors'); |
467 | 467 | $error++; |
468 | 468 | } |
469 | - if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && (! ($price_ht >= 0) || $price_ht == '')) { // Unit price can be 0 but not '' |
|
469 | + if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && (!($price_ht >= 0) || $price_ht == '')) { // Unit price can be 0 but not '' |
|
470 | 470 | setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors'); |
471 | 471 | $error++; |
472 | 472 | } |
@@ -515,7 +515,7 @@ discard block |
||
515 | 515 | } |
516 | 516 | } |
517 | 517 | |
518 | - if (! $error && ($qty >= 0) && (!empty($product_desc) || (!empty($idprod) && $idprod > 0))) { |
|
518 | + if (!$error && ($qty >= 0) && (!empty($product_desc) || (!empty($idprod) && $idprod > 0))) { |
|
519 | 519 | $ret = $object->fetch($id); |
520 | 520 | if ($ret < 0) { |
521 | 521 | dol_print_error($db, $object->error); |
@@ -731,8 +731,8 @@ discard block |
||
731 | 731 | $action = ''; |
732 | 732 | } |
733 | 733 | } |
734 | - } elseif ($action == 'updateline' && $usercancreate && ! GETPOST('cancel', 'alpha')) { |
|
735 | - if (! $object->fetch($id) > 0) { |
|
734 | + } elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha')) { |
|
735 | + if (!$object->fetch($id) > 0) { |
|
736 | 736 | dol_print_error($db); |
737 | 737 | } |
738 | 738 | $object->fetch_thirdparty(); |
@@ -783,7 +783,7 @@ discard block |
||
783 | 783 | |
784 | 784 | // Define special_code for special lines |
785 | 785 | $special_code = GETPOSTINT('special_code'); |
786 | - if (! GETPOST('qty', 'alpha')) { |
|
786 | + if (!GETPOST('qty', 'alpha')) { |
|
787 | 787 | $special_code = 3; |
788 | 788 | } |
789 | 789 | |
@@ -829,7 +829,7 @@ discard block |
||
829 | 829 | $date_end_fill = !empty(GETPOSTINT('date_end_fill')) ? GETPOSTINT('date_end_fill') : 'NULL'; |
830 | 830 | |
831 | 831 | // Update line |
832 | - if (! $error) { |
|
832 | + if (!$error) { |
|
833 | 833 | $result = $object->updateline(GETPOSTINT('lineid'), GETPOSTINT('productid'), $ref_fourn, $label, $description, $pu_ht, $qty, $remise_percent, $vat_rate, $localtax1_rate, $localtax1_rate, 'HT', $type, $date_start_fill, $date_end_fill, $info_bits, $special_code, -1); |
834 | 834 | if ($result >= 0) { |
835 | 835 | $object->fetch($object->id); // Reload lines |
@@ -1488,8 +1488,8 @@ discard block |
||
1488 | 1488 | print $form->editfieldval($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $usercancreate, 'day', $object->date_when, null, '', '', 0, 'strikeIfMaxNbGenReached'); |
1489 | 1489 | } |
1490 | 1490 | //var_dump(dol_print_date($object->date_when+60, 'dayhour').' - '.dol_print_date($now, 'dayhour')); |
1491 | - if (! $object->isMaxNbGenReached()) { |
|
1492 | - if (! $object->suspended && $action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) { |
|
1491 | + if (!$object->isMaxNbGenReached()) { |
|
1492 | + if (!$object->suspended && $action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) { |
|
1493 | 1493 | print img_warning($langs->trans("Late")); |
1494 | 1494 | } |
1495 | 1495 | } else { |
@@ -55,7 +55,7 @@ |
||
55 | 55 | // Load object |
56 | 56 | include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once. |
57 | 57 | |
58 | -$result = restrictedArea($user, $object->element, $object->id, 'paiementfourn', ''); // This also test permission on read invoice |
|
58 | +$result = restrictedArea($user, $object->element, $object->id, 'paiementfourn', ''); // This also test permission on read invoice |
|
59 | 59 | |
60 | 60 | // Security check |
61 | 61 | if ($user->socid) { |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | $search_date_endday = GETPOSTINT('search_date_endday'); |
63 | 63 | $search_date_endmonth = GETPOSTINT('search_date_endmonth'); |
64 | 64 | $search_date_endyear = GETPOSTINT('search_date_endyear'); |
65 | -$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
65 | +$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver |
|
66 | 66 | $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear); |
67 | 67 | $search_company = GETPOST('search_company', 'alpha'); |
68 | 68 | $search_payment_type = GETPOST('search_payment_type', 'alpha'); |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | 'p.amount' => array('label' => "Amount", 'checked' => 1, 'position' => 70), |
111 | 111 | ); |
112 | 112 | $arrayfields = dol_sort_array($arrayfields, 'position'); |
113 | -'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
113 | +'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan |
|
114 | 114 | |
115 | 115 | // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context |
116 | 116 | $hookmanager->initHooks(array('paymentsupplierlist')); |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'facture_fourn AS f ON f.rowid = pf.fk_facturefourn'; |
208 | 208 | $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe AS s ON s.rowid = f.fk_soc'; |
209 | 209 | |
210 | -$sql .= ' WHERE f.entity IN (' . getEntity('supplier_invoice') . ')'; // TODO We should use p.entity that does not exists yet in this table |
|
210 | +$sql .= ' WHERE f.entity IN (' . getEntity('supplier_invoice') . ')'; // TODO We should use p.entity that does not exists yet in this table |
|
211 | 211 | if ($socid > 0) { |
212 | 212 | $sql .= " AND EXISTS (SELECT f.fk_soc FROM " . MAIN_DB_PREFIX . "facture_fourn as f, " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as pf"; |
213 | 213 | $sql .= " WHERE p.rowid = pf.fk_paiementfourn AND pf.fk_facturefourn = f.rowid AND f.fk_soc = " . ((int) $socid) . ")"; |
@@ -446,7 +446,7 @@ discard block |
||
446 | 446 | $idprod = GETPOSTINT('idprod'); |
447 | 447 | } |
448 | 448 | |
449 | - $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); // Can be '1.2' or '1.2 (CODE)' |
|
449 | + $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); // Can be '1.2' or '1.2 (CODE)' |
|
450 | 450 | |
451 | 451 | $price_ht = price2num(GETPOST('price_ht'), 'MU', 2); |
452 | 452 | $price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU', 2); |
@@ -1249,7 +1249,7 @@ discard block |
||
1249 | 1249 | $object->mode_reglement_id = GETPOSTINT('mode_reglement_id'); |
1250 | 1250 | $object->fk_account = GETPOSTINT('fk_account'); |
1251 | 1251 | $object->note_private = GETPOST('note_private', 'restricthtml'); |
1252 | - $object->note_public = GETPOST('note_public', 'restricthtml'); |
|
1252 | + $object->note_public = GETPOST('note_public', 'restricthtml'); |
|
1253 | 1253 | $object->delivery_date = $datelivraison; |
1254 | 1254 | $object->fk_incoterms = GETPOSTINT('incoterm_id'); |
1255 | 1255 | $object->location_incoterms = GETPOST('location_incoterms', 'alpha'); |
@@ -1685,7 +1685,7 @@ discard block |
||
1685 | 1685 | $demand_reason_id = (!empty($objectsrc->demand_reason_id) ? $objectsrc->demand_reason_id : (!empty($soc->demand_reason_id) ? $soc->demand_reason_id : 0)); |
1686 | 1686 | //$remise_percent = (!empty($objectsrc->remise_percent) ? $objectsrc->remise_percent : (!empty($soc->remise_supplier_percent) ? $soc->remise_supplier_percent : 0)); |
1687 | 1687 | //$remise_absolue = (!empty($objectsrc->remise_absolue) ? $objectsrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0)); |
1688 | - $dateinvoice = !getDolGlobalString('MAIN_AUTOFILL_DATE') ? -1 : ''; |
|
1688 | + $dateinvoice = !getDolGlobalString('MAIN_AUTOFILL_DATE') ? -1 : ''; |
|
1689 | 1689 | |
1690 | 1690 | $datedelivery = (!empty($objectsrc->delivery_date) ? $objectsrc->delivery_date : ''); |
1691 | 1691 | |
@@ -1801,7 +1801,7 @@ discard block |
||
1801 | 1801 | // Payment term |
1802 | 1802 | print '<tr><td class="nowrap">' . $langs->trans('PaymentConditionsShort') . '</td><td>'; |
1803 | 1803 | print img_picto('', 'payment', 'class="pictofixedwidth"'); |
1804 | - print $form->getSelectConditionsPaiements((GETPOSTISSET('cond_reglement_id') && GETPOST('cond_reglement_id') != 0) ? GETPOST('cond_reglement_id') : $cond_reglement_id, 'cond_reglement_id', -1, 1); |
|
1804 | + print $form->getSelectConditionsPaiements((GETPOSTISSET('cond_reglement_id') && GETPOST('cond_reglement_id') != 0) ? GETPOST('cond_reglement_id') : $cond_reglement_id, 'cond_reglement_id', -1, 1); |
|
1805 | 1805 | print '</td></tr>'; |
1806 | 1806 | |
1807 | 1807 | // Payment mode |
@@ -2051,7 +2051,7 @@ discard block |
||
2051 | 2051 | 'morecss' => 'minwidth300' |
2052 | 2052 | ) |
2053 | 2053 | ); |
2054 | - $formconfirm = $form->formconfirm($_SERVER['PHP_SELF'] . "?id=$object->id", $langs->trans("DenyingThisOrder"), $langs->trans("ConfirmDenyingThisOrder", $object->ref), "confirm_refuse", $formquestion, 0, 1); |
|
2054 | + $formconfirm = $form->formconfirm($_SERVER['PHP_SELF'] . "?id=$object->id", $langs->trans("DenyingThisOrder"), $langs->trans("ConfirmDenyingThisOrder", $object->ref), "confirm_refuse", $formquestion, 0, 1); |
|
2055 | 2055 | } |
2056 | 2056 | |
2057 | 2057 | // Confirmation of cancellation |
@@ -102,8 +102,8 @@ discard block |
||
102 | 102 | accessforbidden(); |
103 | 103 | } |
104 | 104 | |
105 | -$usercancreate = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); |
|
106 | -$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php |
|
105 | +$usercancreate = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); |
|
106 | +$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php |
|
107 | 107 | |
108 | 108 | |
109 | 109 | /* |
@@ -629,7 +629,7 @@ discard block |
||
629 | 629 | if (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) { |
630 | 630 | $disabled = 0; |
631 | 631 | }*/ |
632 | - $disabled = 0; // This is used to disable or not the bulk selection of target warehouse. No reason to have it disabled so forced to 0. |
|
632 | + $disabled = 0; // This is used to disable or not the bulk selection of target warehouse. No reason to have it disabled so forced to 0. |
|
633 | 633 | |
634 | 634 | // Line of orders |
635 | 635 | if ($object->statut <= CommandeFournisseur::STATUS_ACCEPTED || $object->statut >= CommandeFournisseur::STATUS_CANCELED) { |