@@ -64,10 +64,10 @@ discard block |
||
| 64 | 64 | */ |
| 65 | 65 | public $picto = 'inventory'; |
| 66 | 66 | |
| 67 | - const STATUS_DRAFT = 0; // Draft |
|
| 68 | - const STATUS_VALIDATED = 1; // Inventory is in process |
|
| 69 | - const STATUS_RECORDED = 2; // Inventory is finisged. Stock movement has been recorded. |
|
| 70 | - const STATUS_CANCELED = 9; // Canceled |
|
| 67 | + const STATUS_DRAFT = 0; // Draft |
|
| 68 | + const STATUS_VALIDATED = 1; // Inventory is in process |
|
| 69 | + const STATUS_RECORDED = 2; // Inventory is finisged. Stock movement has been recorded. |
|
| 70 | + const STATUS_CANCELED = 9; // Canceled |
|
| 71 | 71 | |
| 72 | 72 | /** |
| 73 | 73 | * 'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password') |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | 'fk_warehouse' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Warehouse', 'visible' => 1, 'enabled' => 1, 'position' => 30, 'index' => 1, 'help' => 'InventoryForASpecificWarehouse', 'picto' => 'stock', 'css' => 'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist' => 'tdoverflowmax150'), |
| 108 | 108 | 'fk_product' => array('type' => 'integer:Product:product/class/product.class.php', 'label' => 'Product', 'get_name_url_params' => '0::0:-1:0::1', 'visible' => 1, 'enabled' => 1, 'position' => 32, 'index' => 1, 'help' => 'InventoryForASpecificProduct', 'picto' => 'product', 'css' => 'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist' => 'tdoverflowmax150'), |
| 109 | 109 | 'categories_product' => array('type' => 'chkbxlst:categorie:label:rowid::type=0:0:', 'label' => 'OrProductsWithCategories', 'visible' => 3, 'enabled' => 1, 'position' => 33, 'help' => '', 'picto' => 'category', 'css' => 'minwidth300 maxwidth500 widthcentpercentminusx'), |
| 110 | - 'date_inventory' => array('type' => 'date', 'label' => 'DateValue', 'visible' => 1, 'enabled' => '$conf->global->STOCK_INVENTORY_ADD_A_VALUE_DATE', 'position' => 35, 'csslist' => 'nowraponall'), // This date is not used so disabled by default. |
|
| 110 | + 'date_inventory' => array('type' => 'date', 'label' => 'DateValue', 'visible' => 1, 'enabled' => '$conf->global->STOCK_INVENTORY_ADD_A_VALUE_DATE', 'position' => 35, 'csslist' => 'nowraponall'), // This date is not used so disabled by default. |
|
| 111 | 111 | 'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 500, 'csslist' => 'nowraponall'), |
| 112 | 112 | 'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 501, 'csslist' => 'nowraponall'), |
| 113 | 113 | 'date_validation' => array('type' => 'datetime', 'label' => 'DateValidation', 'visible' => -2, 'enabled' => 1, 'position' => 502, 'csslist' => 'nowraponall'), |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | $refalreadyexists = 0; |
| 99 | 99 | |
| 100 | 100 | // Get parameters |
| 101 | -$id = GETPOSTINT('id'); |
|
| 101 | +$id = GETPOSTINT('id'); |
|
| 102 | 102 | if (getDolGlobalString('MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS')) { |
| 103 | 103 | $ref = (GETPOSTISSET('ref') ? GETPOST('ref', 'nohtml') : null); |
| 104 | 104 | } else { |
@@ -771,7 +771,7 @@ discard block |
||
| 771 | 771 | $object->status_batch = GETPOST('status_batch', 'aZ09'); |
| 772 | 772 | $object->sell_or_eat_by_mandatory = GETPOSTINT('sell_or_eat_by_mandatory'); |
| 773 | 773 | $object->batch_mask = GETPOST('batch_mask', 'alpha'); |
| 774 | - $object->fk_default_warehouse = GETPOSTINT('fk_default_warehouse'); |
|
| 774 | + $object->fk_default_warehouse = GETPOSTINT('fk_default_warehouse'); |
|
| 775 | 775 | $object->fk_default_workstation = GETPOSTINT('fk_default_workstation'); |
| 776 | 776 | // removed from update view so GETPOST always empty |
| 777 | 777 | /* |
@@ -871,7 +871,7 @@ discard block |
||
| 871 | 871 | $object->accountancy_code_buy_export = $accountancy_code_buy_export; |
| 872 | 872 | } |
| 873 | 873 | if ($object->isService()) { |
| 874 | - $object->mandatory_period = (!empty($checkmandatory)) ? 1 : 0 ; |
|
| 874 | + $object->mandatory_period = (!empty($checkmandatory)) ? 1 : 0; |
|
| 875 | 875 | } |
| 876 | 876 | |
| 877 | 877 | |
@@ -47,8 +47,8 @@ discard block |
||
| 47 | 47 | $socid = GETPOSTINT('socid'); |
| 48 | 48 | $type = GETPOSTINT('type'); |
| 49 | 49 | $mode = GETPOSTINT('mode'); |
| 50 | -$status = ((GETPOSTINT('status') >= 0) ? GETPOSTINT('status') : - 1); // status buy when mode = customer , status purchase when mode = supplier |
|
| 51 | -$status_purchase = ((GETPOSTINT('status_purchase') >= 0) ? GETPOSTINT('status_purchase') : - 1); // status purchase when mode = customer |
|
| 50 | +$status = ((GETPOSTINT('status') >= 0) ? GETPOSTINT('status') : - 1); // status buy when mode = customer , status purchase when mode = supplier |
|
| 51 | +$status_purchase = ((GETPOSTINT('status_purchase') >= 0) ? GETPOSTINT('status_purchase') : - 1); // status purchase when mode = customer |
|
| 52 | 52 | $outjson = (GETPOSTINT('outjson') ? GETPOSTINT('outjson') : 0); |
| 53 | 53 | $price_level = GETPOSTINT('price_level'); |
| 54 | 54 | $action = GETPOST('action', 'aZ09'); |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | // Multiprice (1 price per level) |
| 163 | 163 | if (!$found && isset($price_level) && $price_level >= 1 && (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'))) { // If we need a particular price level (from 1 to 6) |
| 164 | 164 | $sql = "SELECT price, price_ttc, price_base_type,"; |
| 165 | - $sql .= " tva_tx, default_vat_code"; // Vat rate and code will be used if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on. |
|
| 165 | + $sql .= " tva_tx, default_vat_code"; // Vat rate and code will be used if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on. |
|
| 166 | 166 | $sql .= " FROM " . MAIN_DB_PREFIX . "product_price "; |
| 167 | 167 | $sql .= " WHERE fk_product = " . ((int) $id); |
| 168 | 168 | $sql .= " AND entity IN (" . getEntity('productprice') . ")"; |
@@ -175,12 +175,12 @@ discard block |
||
| 175 | 175 | $objp = $db->fetch_object($result); |
| 176 | 176 | if ($objp) { |
| 177 | 177 | $found = true; |
| 178 | - $outprice_ht = price($objp->price); // formatted for language user because is inserted into input field |
|
| 179 | - $outprice_ttc = price($objp->price_ttc); // formatted for language user because is inserted into input field |
|
| 178 | + $outprice_ht = price($objp->price); // formatted for language user because is inserted into input field |
|
| 179 | + $outprice_ttc = price($objp->price_ttc); // formatted for language user because is inserted into input field |
|
| 180 | 180 | $outpricebasetype = $objp->price_base_type; |
| 181 | 181 | if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) { |
| 182 | 182 | $outtva_tx_formated = price($objp->tva_tx); // formatted for language user because is inserted into input field |
| 183 | - $outtva_tx = price2num($objp->tva_tx); // international numeric |
|
| 183 | + $outtva_tx = price2num($objp->tva_tx); // international numeric |
|
| 184 | 184 | $outdefault_vat_code = $objp->default_vat_code; |
| 185 | 185 | } else { |
| 186 | 186 | // The common and default behaviour. |
@@ -224,8 +224,8 @@ discard block |
||
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | // VAT to use and default VAT for product are set to same value by default |
| 227 | - $product_outtva_tx_formated = $outtva_tx_formated; |
|
| 228 | - $product_outtva_tx = $outtva_tx; |
|
| 227 | + $product_outtva_tx_formated = $outtva_tx_formated; |
|
| 228 | + $product_outtva_tx = $outtva_tx; |
|
| 229 | 229 | $product_outdefault_vat_code = $outdefault_vat_code; |
| 230 | 230 | |
| 231 | 231 | // If we ask the price according to buyer, we change it. |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | $match = preg_grep('/(' . preg_quote($htmlname, '/') . '[0-9]+)/', array_keys($_GET)); |
| 294 | 294 | sort($match); |
| 295 | 295 | |
| 296 | - $idprod = (empty($match[0]) ? '' : $match[0]); // Take first key found into GET array with matching $htmlname123 |
|
| 296 | + $idprod = (empty($match[0]) ? '' : $match[0]); // Take first key found into GET array with matching $htmlname123 |
|
| 297 | 297 | |
| 298 | 298 | if (GETPOST($htmlname, 'alpha') == '' && (!$idprod || !GETPOST($idprod, 'alpha'))) { |
| 299 | 299 | print json_encode(array()); |
@@ -444,7 +444,7 @@ |
||
| 444 | 444 | |
| 445 | 445 | $unitline = price2num(($fourn_unitprice * (1 - ($fourn_remise_percent / 100)) - $fourn_remise), 'MU'); |
| 446 | 446 | $totalline = price2num($value['nb'] * ($fourn_unitprice * (1 - ($fourn_remise_percent / 100)) - $fourn_remise), 'MT'); |
| 447 | - $total += $totalline; |
|
| 447 | + $total += $totalline; |
|
| 448 | 448 | |
| 449 | 449 | print '<td class="right nowraponall">'; |
| 450 | 450 | print($notdefined ? '' : ($value['nb'] > 1 ? $value['nb'] . 'x ' : '') . '<span class="amount">' . price($unitline, 0, '', 0, 0, -1, $conf->currency)) . '</span>'; |
@@ -448,7 +448,7 @@ discard block |
||
| 448 | 448 | //'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"), |
| 449 | 449 | ); |
| 450 | 450 | //if ($user->rights->stock->supprimer) $arrayofmassactions['predelete']=img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete"); |
| 451 | -if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) { |
|
| 451 | +if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) { |
|
| 452 | 452 | $arrayofmassactions = array(); |
| 453 | 453 | } |
| 454 | 454 | if (isModEnabled('category') && $user->hasRight('stock', 'creer')) { |
@@ -641,7 +641,7 @@ discard block |
||
| 641 | 641 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
| 642 | 642 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
| 643 | 643 | } |
| 644 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
| 644 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
| 645 | 645 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
| 646 | 646 | print getTitleFieldOfList($arrayfields['t.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 't.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist'])) . "\n"; |
| 647 | 647 | $totalarray['nbfield']++; |
@@ -118,7 +118,7 @@ |
||
| 118 | 118 | $object = new MouvementStock($db); |
| 119 | 119 | $extrafields = new ExtraFields($db); |
| 120 | 120 | $diroutputmassaction = $conf->stock->dir_output . '/temp/massgeneration/' . $user->id; |
| 121 | -$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
| 121 | +$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
| 122 | 122 | |
| 123 | 123 | $formfile = new FormFile($db); |
| 124 | 124 | |
@@ -40,8 +40,8 @@ |
||
| 40 | 40 | |
| 41 | 41 | $id = GETPOSTINT('id'); |
| 42 | 42 | $ref = GETPOST('ref', 'alpha'); |
| 43 | -$batch = GETPOST('batch', 'alpha'); |
|
| 44 | -$objectid = GETPOSTINT('productid'); |
|
| 43 | +$batch = GETPOST('batch', 'alpha'); |
|
| 44 | +$objectid = GETPOSTINT('productid'); |
|
| 45 | 45 | |
| 46 | 46 | // Security check |
| 47 | 47 | $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : '')); |
@@ -569,7 +569,7 @@ |
||
| 569 | 569 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
| 570 | 570 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
| 571 | 571 | } |
| 572 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
| 572 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
| 573 | 573 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
| 574 | 574 | print getTitleFieldOfList($arrayfields['t.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 't.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : '')) . "\n"; |
| 575 | 575 | $totalarray['nbfield']++; |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | |
| 154 | 154 | $backurlforlist = dol_buildpath('/product/stock/productlot_list.php', 1); |
| 155 | 155 | |
| 156 | - if ($action == 'seteatby' && $user->hasRight('stock', 'creer') && ! GETPOST('cancel', 'alpha')) { |
|
| 156 | + if ($action == 'seteatby' && $user->hasRight('stock', 'creer') && !GETPOST('cancel', 'alpha')) { |
|
| 157 | 157 | $newvalue = dol_mktime(12, 0, 0, GETPOSTINT('eatbymonth'), GETPOSTINT('eatbyday'), GETPOSTINT('eatbyyear')); |
| 158 | 158 | |
| 159 | 159 | // check parameters |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | } |
| 179 | 179 | } |
| 180 | 180 | |
| 181 | - if ($action == 'setsellby' && $user->hasRight('stock', 'creer') && ! GETPOST('cancel', 'alpha')) { |
|
| 181 | + if ($action == 'setsellby' && $user->hasRight('stock', 'creer') && !GETPOST('cancel', 'alpha')) { |
|
| 182 | 182 | $newvalue = dol_mktime(12, 0, 0, GETPOSTINT('sellbymonth'), GETPOSTINT('sellbyday'), GETPOSTINT('sellbyyear')); |
| 183 | 183 | |
| 184 | 184 | // check parameters |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | } |
| 204 | 204 | } |
| 205 | 205 | |
| 206 | - if ($action == 'seteol_date' && $user->hasRight('stock', 'creer') && ! GETPOST('cancel', 'alpha')) { |
|
| 206 | + if ($action == 'seteol_date' && $user->hasRight('stock', 'creer') && !GETPOST('cancel', 'alpha')) { |
|
| 207 | 207 | $newvalue = dol_mktime(12, 0, 0, GETPOSTINT('eol_datemonth'), GETPOSTINT('eol_dateday'), GETPOSTINT('eol_dateyear')); |
| 208 | 208 | $result = $object->setValueFrom('eol_date', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY'); |
| 209 | 209 | if ($result < 0) { |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | } |
| 215 | 215 | } |
| 216 | 216 | |
| 217 | - if ($action == 'setmanufacturing_date' && $user->hasRight('stock', 'creer') && ! GETPOST('cancel', 'alpha')) { |
|
| 217 | + if ($action == 'setmanufacturing_date' && $user->hasRight('stock', 'creer') && !GETPOST('cancel', 'alpha')) { |
|
| 218 | 218 | $newvalue = dol_mktime(12, 0, 0, GETPOSTINT('manufacturing_datemonth'), GETPOSTINT('manufacturing_dateday'), GETPOSTINT('manufacturing_dateyear')); |
| 219 | 219 | $result = $object->setValueFrom('manufacturing_date', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY'); |
| 220 | 220 | if ($result < 0) { |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | } |
| 226 | 226 | } |
| 227 | 227 | |
| 228 | - if ($action == 'setscrapping_date' && $user->hasRight('stock', 'creer') && ! GETPOST('cancel', 'alpha')) { |
|
| 228 | + if ($action == 'setscrapping_date' && $user->hasRight('stock', 'creer') && !GETPOST('cancel', 'alpha')) { |
|
| 229 | 229 | $newvalue = dol_mktime(12, 0, 0, GETPOSTINT('scrapping_datemonth'), GETPOSTINT('scrapping_dateday'), GETPOSTINT('scrapping_dateyear')); |
| 230 | 230 | $result = $object->setValueFrom('scrapping_date', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY'); |
| 231 | 231 | if ($result < 0) { |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | } |
| 248 | 248 | } */ |
| 249 | 249 | |
| 250 | - if ($action == 'setqc_frequency' && $user->hasRight('stock', 'creer') && ! GETPOST('cancel', 'alpha')) { |
|
| 250 | + if ($action == 'setqc_frequency' && $user->hasRight('stock', 'creer') && !GETPOST('cancel', 'alpha')) { |
|
| 251 | 251 | $result = $object->setValueFrom('qc_frequency', GETPOST('qc_frequency'), '', null, 'int', '', $user, 'PRODUCT_MODIFY'); |
| 252 | 252 | if ($result < 0) { // Prévoir un test de format de durée |
| 253 | 253 | setEventMessages($object->error, null, 'errors'); |