@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | $object = new MouvementStock($db); |
| 121 | 121 | $extrafields = new ExtraFields($db); |
| 122 | 122 | $diroutputmassaction = $conf->stock->dir_output . '/temp/massgeneration/' . $user->id; |
| 123 | -$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
| 123 | +$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
| 124 | 124 | |
| 125 | 125 | $formfile = new FormFile($db); |
| 126 | 126 | |
@@ -1151,7 +1151,7 @@ discard block |
||
| 1151 | 1151 | } |
| 1152 | 1152 | |
| 1153 | 1153 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
| 1154 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
| 1154 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
| 1155 | 1155 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
| 1156 | 1156 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
| 1157 | 1157 | |
@@ -115,7 +115,7 @@ |
||
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | - $prices[] = array("id" => 'pmpprice', "price" => price2num($price), "label" => $langs->trans("PMPValueShort") . ': ' . price($price, 0, $langs, 0, 0, -1, $conf->currency), "title" => $langs->trans("PMPValueShort") . ': ' . price($price, 0, $langs, 0, 0, -1, $conf->currency)); // For price field, we must use price2num(), for label or title, price() |
|
| 118 | + $prices[] = array("id" => 'pmpprice', "price" => price2num($price), "label" => $langs->trans("PMPValueShort") . ': ' . price($price, 0, $langs, 0, 0, -1, $conf->currency), "title" => $langs->trans("PMPValueShort") . ': ' . price($price, 0, $langs, 0, 0, -1, $conf->currency)); // For price field, we must use price2num(), for label or title, price() |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | // Add price for costprice (at end) |
@@ -309,7 +309,7 @@ |
||
| 309 | 309 | include DOL_DOCUMENT_ROOT . '/core/tpl/massactions_pre.tpl.php'; |
| 310 | 310 | |
| 311 | 311 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
| 312 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
| 312 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
| 313 | 313 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
| 314 | 314 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
| 315 | 315 | |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | // Action clone object |
| 193 | 193 | if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd) { |
| 194 | 194 | $objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone. We use native clone to keep this->db valid. |
| 195 | - '@phan-var-force FactureFournisseur $objectutil'; // Same object type for cloned object |
|
| 195 | + '@phan-var-force FactureFournisseur $objectutil'; // Same object type for cloned object |
|
| 196 | 196 | |
| 197 | 197 | if (GETPOST('newsupplierref', 'alphanohtml')) { |
| 198 | 198 | $objectutil->ref_supplier = GETPOST('newsupplierref', 'alphanohtml'); |
@@ -778,7 +778,7 @@ discard block |
||
| 778 | 778 | $db->begin(); |
| 779 | 779 | |
| 780 | 780 | $error = 0; |
| 781 | - $tmpproject = 0; // Ensure a value |
|
| 781 | + $tmpproject = 0; // Ensure a value |
|
| 782 | 782 | |
| 783 | 783 | // Fill array 'array_options' with data from add form |
| 784 | 784 | $ret = $extrafields->setOptionalsFromPost(null, $object); |
@@ -786,7 +786,7 @@ discard block |
||
| 786 | 786 | $error++; |
| 787 | 787 | } |
| 788 | 788 | |
| 789 | - $dateinvoice = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'), 'tzserver'); // If we enter the 02 january, we need to save the 02 january for server |
|
| 789 | + $dateinvoice = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'), 'tzserver'); // If we enter the 02 january, we need to save the 02 january for server |
|
| 790 | 790 | $datedue = dol_mktime(0, 0, 0, GETPOSTINT('echmonth'), GETPOSTINT('echday'), GETPOSTINT('echyear'), 'tzserver'); |
| 791 | 791 | //var_dump($dateinvoice.' '.dol_print_date($dateinvoice, 'dayhour')); |
| 792 | 792 | //var_dump(dol_now('tzuserrel').' '.dol_get_last_hour(dol_now('tzuserrel')).' '.dol_print_date(dol_now('tzuserrel'),'dayhour').' '.dol_print_date(dol_get_last_hour(dol_now('tzuserrel')), 'dayhour')); |
@@ -825,7 +825,7 @@ discard block |
||
| 825 | 825 | $object->ref_supplier = GETPOST('ref_supplier', 'alpha'); |
| 826 | 826 | $object->socid = GETPOSTINT('socid'); |
| 827 | 827 | $object->label = GETPOST('label', 'alphanohtml'); |
| 828 | - $object->libelle = $object->label; // deprecated |
|
| 828 | + $object->libelle = $object->label; // deprecated |
|
| 829 | 829 | $object->date = $dateinvoice; |
| 830 | 830 | $object->date_echeance = $datedue; |
| 831 | 831 | $object->note_public = GETPOST('note_public', 'restricthtml'); |
@@ -899,7 +899,7 @@ discard block |
||
| 899 | 899 | $object->subtype = GETPOST('subtype', 'alphanohtml'); |
| 900 | 900 | $object->socid = GETPOSTINT('socid'); |
| 901 | 901 | $object->label = GETPOST('label', 'alphanohtml'); |
| 902 | - $object->libelle = $object->label; // Deprecated |
|
| 902 | + $object->libelle = $object->label; // Deprecated |
|
| 903 | 903 | $object->date = $dateinvoice; |
| 904 | 904 | $object->date_echeance = $datedue; |
| 905 | 905 | $object->note_public = GETPOST('note_public', 'restricthtml'); |
@@ -1009,7 +1009,7 @@ discard block |
||
| 1009 | 1009 | $object->cond_reglement_id = (GETPOSTINT('type') == 3 ? 1 : GETPOST('cond_reglement_id')); |
| 1010 | 1010 | $object->mode_reglement_id = GETPOSTINT('mode_reglement_id'); |
| 1011 | 1011 | $object->fk_account = GETPOSTINT('fk_account'); |
| 1012 | - $object->amount = (float) price2num(GETPOST('amount')); // FIXME: FactureFournisseur::$amount is deprecated and not used? |
|
| 1012 | + $object->amount = (float) price2num(GETPOST('amount')); // FIXME: FactureFournisseur::$amount is deprecated and not used? |
|
| 1013 | 1013 | //$object->remise_absolue = price2num(GETPOST('remise_absolue'), 'MU'); |
| 1014 | 1014 | //$object->remise_percent = price2num(GETPOST('remise_percent'), '', 2); |
| 1015 | 1015 | $object->fk_incoterms = GETPOSTINT('incoterm_id'); |
@@ -1069,7 +1069,7 @@ discard block |
||
| 1069 | 1069 | $object->ref_supplier = GETPOST('ref_supplier', 'alphanohtml'); |
| 1070 | 1070 | $object->socid = GETPOSTINT('socid'); |
| 1071 | 1071 | $object->label = GETPOST('label', 'alphanohtml'); |
| 1072 | - $object->libelle = $object->label; // deprecated |
|
| 1072 | + $object->libelle = $object->label; // deprecated |
|
| 1073 | 1073 | $object->date = $dateinvoice; |
| 1074 | 1074 | $object->date_echeance = $datedue; |
| 1075 | 1075 | $object->note_public = GETPOST('note_public', 'restricthtml'); |
@@ -1295,7 +1295,7 @@ discard block |
||
| 1295 | 1295 | 0, |
| 1296 | 1296 | $object->lines[0]->date_start, |
| 1297 | 1297 | $object->lines[0]->date_end, |
| 1298 | - array(), // array_options |
|
| 1298 | + array(), // array_options |
|
| 1299 | 1299 | 0, |
| 1300 | 1300 | 0, |
| 1301 | 1301 | '', |
@@ -1427,7 +1427,7 @@ discard block |
||
| 1427 | 1427 | // Edit line |
| 1428 | 1428 | $db->begin(); |
| 1429 | 1429 | |
| 1430 | - if (! $object->fetch($id) > 0) { |
|
| 1430 | + if (!$object->fetch($id) > 0) { |
|
| 1431 | 1431 | dol_print_error($db); |
| 1432 | 1432 | } |
| 1433 | 1433 | $object->fetch_thirdparty(); |
@@ -1580,7 +1580,7 @@ discard block |
||
| 1580 | 1580 | $idprod = GETPOSTINT('idprod'); |
| 1581 | 1581 | } |
| 1582 | 1582 | |
| 1583 | - $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); // Can be '1.2' or '1.2 (CODE)' |
|
| 1583 | + $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); // Can be '1.2' or '1.2 (CODE)' |
|
| 1584 | 1584 | |
| 1585 | 1585 | $price_ht = price2num(GETPOST('price_ht'), 'MU', 2); |
| 1586 | 1586 | $price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU', 2); |
@@ -2078,7 +2078,7 @@ discard block |
||
| 2078 | 2078 | // Mode creation |
| 2079 | 2079 | if ($action == 'create') { |
| 2080 | 2080 | $facturestatic = new FactureFournisseur($db); |
| 2081 | - $selectedLines = array(); // Ensure initialised |
|
| 2081 | + $selectedLines = array(); // Ensure initialised |
|
| 2082 | 2082 | |
| 2083 | 2083 | print load_fiche_titre($langs->trans('NewSupplierInvoice'), '', 'supplier_invoice'); |
| 2084 | 2084 | |
@@ -2273,7 +2273,7 @@ discard block |
||
| 2273 | 2273 | print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="post">'; |
| 2274 | 2274 | print '<input type="hidden" name="token" value="' . newToken() . '">'; |
| 2275 | 2275 | print '<input type="hidden" name="action" value="add">'; |
| 2276 | - print '<input type="hidden" name="changecompany" value="0">'; // will be set to 1 by javascript so we know post is done after a company change |
|
| 2276 | + print '<input type="hidden" name="changecompany" value="0">'; // will be set to 1 by javascript so we know post is done after a company change |
|
| 2277 | 2277 | |
| 2278 | 2278 | if (!empty($societe->id) && $societe->id > 0) { |
| 2279 | 2279 | print '<input type="hidden" name="socid" value="' . $societe->id . '">' . "\n"; |
@@ -4170,7 +4170,7 @@ discard block |
||
| 4170 | 4170 | } |
| 4171 | 4171 | |
| 4172 | 4172 | // Clone as predefined / Create template |
| 4173 | - if (($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_DEPOSIT) && $object->status == 0 && $usercancreate) { |
|
| 4173 | + if (($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_DEPOSIT) && $object->status == 0 && $usercancreate) { |
|
| 4174 | 4174 | if (!$objectidnext && count($object->lines) > 0) { |
| 4175 | 4175 | print '<a class="butAction" href="' . constant('BASE_URL') . '/fourn/facture/card-rec.php?facid=' . $object->id . '&action=create">' . $langs->trans("ChangeIntoRepeatableInvoice") . '</a>'; |
| 4176 | 4176 | } |
@@ -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 { |