diff --git a/ChangeLog b/ChangeLog index 15b50425f45..00a99cef973 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ For users: - Fix: [bug #1022] correct margin calculation for credit notes. - New: Can choose contact on event (action com) creation, and filtred by thirdparty. - New: Add hidden option MAIN_FORCE_DEFAULT_STATE_ID. +- New: Add page to make mass stock movement. For translators: - Qual: Normalized sort order of all languages files with english reference files. diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index e2dc4db52af..de2e9e39692 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2329,7 +2329,7 @@ function print_liste_field_titre($name, $file="", $field="", $begin="", $morepar * Get title line of an array * * @param string $name Label of field - * @param int $thead For thead format (0 by default) + * @param int $thead 0=To use with standard table forat, 1=To use inside , 2=To use with
* @param string $file Url used when we click on sort picto * @param string $field Field to use for new sorting. Empty if this field is not sortable. * @param string $begin ("" by defaut) @@ -2347,10 +2347,13 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m $sortorder=strtoupper($sortorder); $out=''; + $tag='th'; + if ($thead==2) $tag='div'; + // If field is used as sort criteria we use a specific class // Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom") - if ($field && ($sortfield == $field || $sortfield == preg_replace("/^[^\.]+\./","",$field))) $out.= ''; - else $out.= ''; + if ($field && ($sortfield == $field || $sortfield == preg_replace("/^[^\.]+\./","",$field))) $out.= '<'.$tag.' class="liste_titre_sel" '. $moreattrib.'>'; + else $out.= '<'.$tag.' class="liste_titre" '. $moreattrib.'>'; if (! empty($conf->dol_optimize_smallscreen) && empty($thead) && $field) // If this is a sort field { @@ -2397,7 +2400,7 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m } } } - $out.=''; + $out.=''; return $out; } diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index 34afeaffb41..de9b4ebd623 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -34,8 +34,10 @@ LastMovements=Last movements Units=Units Unit=Unit StockCorrection=Correct stock +StockTransfer=Stock transfer StockMovement=Transfer StockMovements=Stock transfers +LabelMovement=Movement label NumberOfUnit=Number of units UnitPurchaseValue=Unit purchase price TotalStock=Total in stock @@ -106,5 +108,5 @@ Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) MassStockMovement=Mass stock movement -SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "Add". Once this is done for all required movements, click onto "Record Tranferts". +SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s". RecordMovement=Record transfert \ No newline at end of file diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang index 0630cab213e..b27213067a3 100644 --- a/htdocs/langs/fr_FR/stocks.lang +++ b/htdocs/langs/fr_FR/stocks.lang @@ -34,8 +34,10 @@ LastMovements=Derniers mouvements Units=Unités Unit=Unité StockCorrection=Corriger le stock +StockTransfer=Transfert de stock StockMovement=Transférer StockMovements=Mouvements de stock +LabelMovement=Libellé du mouvement NumberOfUnit=Nombre de pièces UnitPurchaseValue=Prix d'achat unitaire TotalStock=Total en stock @@ -106,5 +108,5 @@ Replenishments=Réapprovisionnement NbOfProductBeforePeriod=Quantité du produit %s en stock avant la période sélectionnée (< %s) NbOfProductAfterPeriod=Quantité du produit %s en stock après la période sélectionnée (> %s) MassStockMovement=Mouvement de stock en masse -SelectProductInAndOutWareHouse=Sélectionner un produit, une quantité à transférer, un entrepôt source et destination et cliquer sur ajouter. Une fois tous les mouvements enregistrés, cliquer sur "Enregistrer transferts". +SelectProductInAndOutWareHouse=Sélectionner un produit, une quantité à transférer, un entrepôt source et destination et cliquer sur "%s". Une fois tous les mouvements choisis, cliquer sur "%s". RecordMovement=Enregistrer transferts \ No newline at end of file diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index f1623650817..20a08f9b1bc 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -72,7 +72,7 @@ if (function_exists('get_magic_quotes_gpc')) // magic_quotes_* removed in PHP6 * * @param string $val Value * @param string $type 1=GET, 0=POST, 2=PHP_SELF - * @return boolean true if there is an injection + * @return int >0 if there is an injection */ function test_sql_and_script_inject($val, $type) { @@ -102,7 +102,7 @@ function test_sql_and_script_inject($val, $type) } // For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param) if ($type == 1) $sql_inj += preg_match('/"/i', $val); // We refused " in GET parameters value - if ($type == 2) $sql_inj += preg_match('/[\s;"]/', $val); // PHP_SELF is an url and must match url syntax + if ($type == 2) $sql_inj += preg_match('/[;"]/', $val); // PHP_SELF is a file system path. It can contains spaces. return $sql_inj; } @@ -111,7 +111,7 @@ function test_sql_and_script_inject($val, $type) * * @param string &$var Variable name * @param string $type 1=GET, 0=POST, 2=PHP_SELF - * @return boolean true if ther is an injection + * @return boolean true if there is an injection */ function analyse_sql_and_script(&$var, $type) { diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php index 234c4bb528e..4e9abfcbaeb 100644 --- a/htdocs/product/stock/massstockmove.php +++ b/htdocs/product/stock/massstockmove.php @@ -103,27 +103,114 @@ if ($action == 'addline') if (! $error) { - $id=count($listofdata); + if (count(array_keys($listofdata)) > 0) $id=max(array_keys($listofdata)) + 1; + else $id=1; $listofdata[$id]=array('id'=>$id, 'id_product'=>$id_product, 'qty'=>$qty, 'id_sw'=>$id_sw, 'id_tw'=>$id_tw); $_SESSION['massstockmove']=dol_json_encode($listofdata); + + unset($id_product); + //unset($id_sw); + //unset($id_tw); + unset($qty); } } if ($action == 'delline' && $idline != '') { if (! empty($listofdata[$idline])) unset($listofdata[$idline]); - var_dump($listofdata); - var_dump(dol_json_encode($listofdata)); exit; if (count($listofdata) > 0) $_SESSION['massstockmove']=dol_json_encode($listofdata); else unset($_SESSION['massstockmove']); } -if ($action == 'createmovement' && isset($_POST['valid'])) +if ($action == 'createmovements') { + $error=0; + + if (! GETPOST("label")) + { + $error++; + setEventMessage($langs->trans("ErrorFieldRequired"),$langs->transnoentitiesnoconv("LabelMovement")); + } + + $db->begin(); + + if (! $error) + { + $product = new Product($db); + foreach($listofdata as $key => $val) // Loop on each movement to do + { + $id=$val['id']; + $id_product=$val['id_product']; + $id_sw=$val['id_sw']; + $id_tw=$val['id_tw']; + $qty=price2num($val['qty']); + + if (! $error && $id_sw <> $id_tw && is_numeric($qty) && $id_product) + { + $result=$product->fetch($id_product); + $product->load_stock(); // Load array product->stock_warehouse + // Define value of products moved + $pricesrc=0; + if (isset($product->stock_warehouse[$id_sw]->pmp)) $pricesrc=$product->stock_warehouse[$id_sw]->pmp; + $pricedest=$pricesrc; + //print 'price src='.$pricesrc.', price dest='.$pricedest;exit; + + // Remove stock + $result1=$product->correct_stock( + $user, + $id_sw, + $qty, + 1, + GETPOST("label"), + $pricesrc + ); + if ($result1 < 0) + { + $error++; + setEventMessage($product->errors,'errors'); + } + + // Add stock + $result2=$product->correct_stock( + $user, + $id_tw, + $qty, + 0, + GETPOST("label"), + $pricedest + ); + if ($result2 < 0) + { + $error++; + setEventMessage($product->errors,'errors'); + } + } + else + { + dol_print_error('',"Bad value saved into sessions"); + $error++; + } + } + } + + if (! $error) + { + unset($_SESSION['massstockmove']); + + $db->commit(); + setEventMessage($langs->trans("StockMovementRecorded"),'mesgs'); + header("Location: ".DOL_URL_ROOT.'/product/stock/index.php'); // Redirect to avoid pb when using back + exit; + } + else + { + $db->rollback(); + setEventMessage($langs->trans("Error"),'errors'); + } } @@ -132,6 +219,8 @@ if ($action == 'createmovement' && isset($_POST['valid'])) * View */ +$now=dol_now(); + $form=new Form($db); $formproduct=new FormProduct($db); $productstatic = new Product($db); @@ -144,8 +233,14 @@ llxHeader('', $title, $helpurl, ''); print_fiche_titre($langs->trans("MassStockMovement")).'

'; -print $langs->trans("SelectProductInAndOutWareHouse").'
'; +$titletoadd=$langs->trans("Select"); +$titletoaddnoent=$langs->transnoentitiesnoconv("Select"); +$buttonrecord=$langs->trans("RecordMovement"); +$buttonrecordnoent=$langs->trans("RecordMovement"); +print $langs->trans("SelectProductInAndOutWareHouse",$titletoaddnoent,$buttonrecordnoent).'
'; +print '
'."\n"; +$var=true; // Form to add a line print '
'; @@ -153,56 +248,41 @@ print ''; print ''; print ''; +//print '
'; print '
'; -print_liste_field_titre($langs->trans('Product'),$_SERVER["PHP_SELF"],'',$param,'','',$sortfield,$sortorder); -print_liste_field_titre($langs->trans('Qty'),$_SERVER["PHP_SELF"],'',$param,'','align="center"',$sortfield,$sortorder); -print_liste_field_titre($langs->trans('WarehouseSource'),$_SERVER["PHP_SELF"],'',$param,'','align="center"',$sortfield,$sortorder); -print_liste_field_titre($langs->trans('WarehouseTarget'),$_SERVER["PHP_SELF"],'',$param,'','align="center"',$sortfield,$sortorder); -print_liste_field_titre(''); +print getTitleFieldOfList($langs->trans('ProductRef'),0,$_SERVER["PHP_SELF"],'',$param,'','class="tagtd"',$sortfield,$sortorder); +print getTitleFieldOfList($langs->trans('ProductLabel'),0,$_SERVER["PHP_SELF"],'',$param,'','class="tagtd"',$sortfield,$sortorder); +print getTitleFieldOfList($langs->trans('WarehouseSource'),0,$_SERVER["PHP_SELF"],'',$param,'','class="tagtd"',$sortfield,$sortorder); +print getTitleFieldOfList($langs->trans('WarehouseTarget'),0,$_SERVER["PHP_SELF"],'',$param,'','class="tagtd"',$sortfield,$sortorder); +print getTitleFieldOfList($langs->trans('Qty'),0,$_SERVER["PHP_SELF"],'',$param,'','align="center" class="tagtd"',$sortfield,$sortorder); +print getTitleFieldOfList('',0); print ''; -print ''; + +print ''; // Product -print ''; -// Qty -print ''; // In warehouse -print ''; // Out warehouse -print ''; +// Qty +print ''; // Button to add line -print ''; +print ''; print ''; -print '
'; +print ''; $filtertype=0; if (! empty($conf->global->STOCK_SUPPORTS_SERVICES)) $filtertype=''; print $form->select_produits($id_product,'productid',$filtertype); print ''; +print ''; print $formproduct->selectWarehouses($id_sw,'id_sw','',1); print ''; +print ''; print $formproduct->selectWarehouses($id_tw,'id_tw','',1); print '
'; -print '
'; -print '
'; - -// List movement prepared -print ''; - -// Lignes des titres -print ''; -print_liste_field_titre($langs->trans('ProductRef'),$_SERVER["PHP_SELF"],'p.ref',$param,'','',$sortfield,$sortorder); -print_liste_field_titre($langs->trans('ProductLabel'),$_SERVER["PHP_SELF"],'p.label',$param,'','',$sortfield,$sortorder); -print_liste_field_titre($langs->trans('Qty'),$_SERVER["PHP_SELF"],'',$param,'','align="right"',$sortfield,$sortorder); -print_liste_field_titre($langs->trans('WarehouseSource'),$_SERVER["PHP_SELF"],'',$param,'','align="right"',$sortfield,$sortorder); -print_liste_field_titre($langs->trans('WarehouseTarget'),$_SERVER["PHP_SELF"],'',$param,'','align="right"',$sortfield,$sortorder); -print_liste_field_titre(''); -print ''; - -$var=false; foreach($listofdata as $key => $val) { $var=!$var; @@ -219,24 +299,43 @@ foreach($listofdata as $key => $val) print $productstatic->getNomUrl(1); $productstatic->ref=$oldref; print ''; - print ''; - print ''; - print ''; + print ''; print ''; print ''; } print '
'.$val['qty'].''; + print ''; print $warehousestatics->getNomUrl(1); print ''; + print ''; print $warehousestatict->getNomUrl(1); print ''.$val['qty'].''.img_delete($langs->trans("Remove")).'
'; - -// Generate -$value=$langs->trans("RecordMovement"); -print '
'; +print ''; + + +print '
'; + + +print '
'; +print ''; +print ''; + +// Button to record mass movement +$labelmovement=GETPOST("label")?GETPOST('label'):$langs->trans("MassStockMovement").' '.dol_print_date($now,'%Y-%m-%d %H:%M'); + +print ''; + print ''; + print ''; + print ''; + print ''; +print '
'.$langs->trans("LabelMovement").''; + print ''; + print '
'; + +print '
'; print '
'; diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index 074d684b10e..eb9391c8698 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -414,7 +414,7 @@ if ($resql) print ""; //print_liste_field_titre($langs->trans("Id"),$_SERVER["PHP_SELF"], "m.rowid","",$param,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"], "m.datem","",$param,"",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"], "m.label","",$param,"",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("LabelMovement"),$_SERVER["PHP_SELF"], "m.label","",$param,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("ProductRef"),$_SERVER["PHP_SELF"], "p.ref","",$param,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("ProductLabel"),$_SERVER["PHP_SELF"], "p.ref","",$param,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Warehouse"),$_SERVER["PHP_SELF"], "","",$param,"",$sortfield,$sortorder); // We are on a specific warehouse card, no filter on other should be possible diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index bca6660e10a..10ada810276 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -429,7 +429,7 @@ if ($id > 0 || $ref) */ if ($action == "transfert") { - print_titre($langs->trans("Transfer")); + print_titre($langs->trans("StockTransfer")); print '
'."\n"; print ''; print ''; @@ -442,21 +442,21 @@ if ($id > 0 || $ref) print ''.$langs->trans("WarehouseTarget").''; print $formproduct->selectWarehouses(GETPOST('id_entrepot_destination'),'id_entrepot_destination','',1); print ''; - print ''.$langs->trans("NumberOfUnit").''; + print ''.$langs->trans("NumberOfUnit").''; print ''; // Label print ''; - print ''.$langs->trans("Label").''; + print ''.$langs->trans("LabelMovement").''; print ''; - print ''; + print ''; print ''; print ''; print ''; - print '
 '; - print '
'; + print '
 '; + print '
'; print '
'; } diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php index ca0ebf2d7fe..1fe899717d8 100644 --- a/htdocs/public/test/test_arrays.php +++ b/htdocs/public/test/test_arrays.php @@ -16,38 +16,41 @@ if (empty($conf->global->MAIN_FEATURES_LEVEL)) - + Login Dolibarr 3.4.0-alpha - - - - + + + + - - - + + + - +

This page is a sample of page using tables. To make test with
- css (edit page to change)
- jmobile (edit page to enable/disable)
-- dataTables.

+- dataTables.
+
+ +
-Example 1 : Table using tags: div+form
+Example 1 : Table using tags: div.tagtable+form+div or div.tagtable+div.tagtr+div.tagtd
snake
-
+
snagfdgfd gd fgf ke
@@ -55,12 +58,12 @@ Example 1 : Table using tags: div+form
-
+
snagfdgfd gd fgf ke
dfsdf
- +
@@ -69,7 +72,7 @@ Example 1 : Table using tags: div+form
-Example 2 : Table using tags: table/thead/tbdoy/tr/td + dataTable
+Example 2 : Table using tags: table/thead/tbody/tr/td + dataTable