From 02d59cce5a25ba2ced2d01924088b111734c57ce Mon Sep 17 00:00:00 2001 From: Gauthier Date: Mon, 16 Feb 2015 16:06:50 +0100 Subject: [PATCH 1/3] NEW : Product stock and subproduct stock are independant --- htdocs/admin/stock.php | 25 +++++++++++++++++-- htdocs/langs/en_US/stocks.lang | 1 + .../stock/class/mouvementstock.class.php | 2 +- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php index 6b2c626da39..a5da8d7230f 100644 --- a/htdocs/admin/stock.php +++ b/htdocs/admin/stock.php @@ -87,6 +87,9 @@ if($action) if($action == 'STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT') { $res = dolibarr_set_const($db, "STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT", GETPOST('STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT','alpha'),'chaine',0,'',$conf->entity); } + if($action == 'INDEPENDANT_SUBPRODUCT_STOCK') { + $res = dolibarr_set_const($db, "INDEPENDANT_SUBPRODUCT_STOCK", GETPOST('INDEPENDANT_SUBPRODUCT_STOCK','alpha'),'chaine',0,'',$conf->entity); + } if (! $res > 0) $error++; @@ -339,9 +342,27 @@ print ''; print "\n"; print "\n"; print '
'; -print ''; -print '
'; +if($conf->global->PRODUIT_SOUSPRODUITS) { + + $var=!$var; + + print ""; + print ''.$langs->trans("IndependantSubProductStock").''; + + print ''; + print "
"; + print ''; + print ""; + print $form->selectyesno("INDEPENDANT_SUBPRODUCT_STOCK",$conf->global->INDEPENDANT_SUBPRODUCT_STOCK,1); + print ''; + print '
'; + print "\n"; + print "\n"; + +} + +print ''; llxFooter(); diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index 9c7a6f7acbd..275e8ba30a9 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Weighted average price PMPValueShort=WAP EnhancedValueOfWarehouses=Warehouses value UserWarehouseAutoCreate=Create a warehouse automatically when creating a user +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Quantity dispatched QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php index f175d75db6f..4cea2b7621c 100644 --- a/htdocs/product/stock/class/mouvementstock.class.php +++ b/htdocs/product/stock/class/mouvementstock.class.php @@ -292,7 +292,7 @@ class MouvementStock extends CommonObject } // Add movement for sub products (recursive call) - if (! $error && ! empty($conf->global->PRODUIT_SOUSPRODUITS)) + if (! $error && ! empty($conf->global->PRODUIT_SOUSPRODUITS) && empty($conf->global->INDEPENDANT_SUBPRODUCT_STOCK)) { $error = $this->_createSubProduct($user, $fk_product, $entrepot_id, $qty, $type, 0, $label, $inventorycode); // we use 0 as price, because pmp is not changed for subproduct } From 0c531215531b7b262034fbd30419021b2a758983 Mon Sep 17 00:00:00 2001 From: Alexis Algoud Date: Mon, 23 Feb 2015 12:19:19 +0100 Subject: [PATCH 2/3] - use incdec into virtual product definition. - improve screen of virtual product --- htdocs/langs/en_US/products.lang | 3 + htdocs/product/class/product.class.php | 49 +++++++++++- htdocs/product/composition/card.php | 75 +++++++++++++++---- .../stock/class/mouvementstock.class.php | 3 +- 4 files changed, 110 insertions(+), 20 deletions(-) diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index 30db4bf232f..3efd24778ad 100755 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -250,3 +250,6 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +ComposedProductDecreaseStock=Decrease Stock for sub-product +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 3f3786016e5..fe67938766d 100755 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2306,6 +2306,40 @@ class Product extends CommonObject } } + /** + * Modify composed product + * + * @param int $id_pere Id of master product + * @param int $id_fils Id of linked product + * @param int $qty Quantity + * @param int $incdec increase/descrease stock or not + * * @return int < 0 if KO, > 0 if OK + */ + function update_sousproduit($id_pere, $id_fils,$qty, $incdec=1) + { + // Clean parameters + if (! is_numeric($id_pere)) $id_pere=0; + if (! is_numeric($id_fils)) $id_fils=0; + if (! is_numeric($incdec)) $incdec=1; + if (! is_numeric($qty)) $qty=1; + + $sql = 'UPDATE '.MAIN_DB_PREFIX.'product_association SET '; + $sql.= 'qty='.$qty; + $sql.= ',incdec='.$incdec; + $sql .= ' WHERE fk_product_pere='.$id_pere.' AND fk_product_fils='.$id_fils; + + if (!$this->db->query($sql)) + { + dol_print_error($this->db); + return -1; + } + else + { + return 1; + } + + } + /** * Retire le lien entre un sousproduit et un produit/service * @@ -2633,6 +2667,8 @@ class Product extends CommonObject $nb=(! empty($desc_pere[1]) ? $desc_pere[1] :''); $type=(! empty($desc_pere[2]) ? $desc_pere[2] :''); $label=(! empty($desc_pere[3]) ? $desc_pere[3] :''); + $incdec=!empty($desc_pere[4]) ? $desc_pere[4] : 0; + if ($multiply < 1) $multiply=1; //print "XXX We add id=".$id." - label=".$label." - nb=".$nb." - multiply=".$multiply." fullpath=".$compl_path.$label."\n"; @@ -2649,7 +2685,8 @@ class Product extends CommonObject 'fullpath'=>$compl_path.$label, // Label 'type'=>$type, // Nb of units that compose parent product 'desiredstock'=>$this->desiredstock, - 'level'=>$level + 'level'=>$level, + 'incdec'=>$incdec ); // Recursive call if there is childs to child @@ -2798,7 +2835,7 @@ class Product extends CommonObject */ function getChildsArbo($id) { - $sql = "SELECT p.rowid, p.label as label, pa.qty as qty, pa.fk_product_fils as id, p.fk_product_type"; + $sql = "SELECT p.rowid, p.label as label, pa.qty as qty, pa.fk_product_fils as id, p.fk_product_type, pa.incdec"; $sql.= " FROM ".MAIN_DB_PREFIX."product as p"; $sql.= ", ".MAIN_DB_PREFIX."product_association as pa"; $sql.= " WHERE p.rowid = pa.fk_product_fils"; @@ -2812,7 +2849,13 @@ class Product extends CommonObject $prods = array(); while ($rec = $this->db->fetch_array($res)) { - $prods[$rec['rowid']]= array(0=>$rec['id'],1=>$rec['qty'],2=>$rec['fk_product_type'],3=>$this->db->escape($rec['label'])); + $prods[$rec['rowid']]= array( + 0=>$rec['id'], + 1=>$rec['qty'], + 2=>$rec['fk_product_type'], + 3=>$this->db->escape($rec['label']), + 4=>$rec['incdec'] + ); //$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty'],2=>$rec['fk_product_type']); //$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty']); $listofchilds=$this->getChildsArbo($rec['id']); diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php index 12553ada59a..b7c6ad45dc5 100644 --- a/htdocs/product/composition/card.php +++ b/htdocs/product/composition/card.php @@ -109,6 +109,19 @@ $cancel <> $langs->trans("Cancel") && exit; } } +else if($action==='save_composed_product') { + + $TProduct = GETPOST('TProduct', 'array'); + if(!empty($TProduct)) { + + foreach ($TProduct as $id_product => $row) { + $product->update_sousproduit($id, $id_product,$row['qty'], isset($row['incdec']) ? 1 : 0 ); + } + + } + + +} if ($cancel == $langs->trans("Cancel")) { @@ -215,7 +228,7 @@ if ($id > 0 || ! empty($ref)) { print ''; print ''.$langs->trans("ProductAssociationList").'
'; - print ''; + print ''; foreach($prods_arbo as $value) { $productstatic->id=$value['id']; @@ -246,7 +259,7 @@ if ($id > 0 || ! empty($ref)) print ''; - } - - // Number of parent virtual products - print ''; - - if (count($prodsfather) > 0) - { - print ''; - } - - print "
'; print ''.$langs->trans("ProductParentList").'
'; print ''; - foreach($prodsfather as $value) + foreach($prodnbsfather as $value) { $idprod= $value["id"]; $productstatic->id=$idprod;// $value["id"]; @@ -333,20 +346,43 @@ if ($id > 0 || ! empty($ref)) $atleastonenotdefined=0; print ''; } // Number of parent virtual products - print ''; diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php index 4cea2b7621c..39dd2ff5f67 100644 --- a/htdocs/product/stock/class/mouvementstock.class.php +++ b/htdocs/product/stock/class/mouvementstock.class.php @@ -341,8 +341,7 @@ class MouvementStock extends CommonObject $sql = "SELECT fk_product_pere, fk_product_fils, qty"; $sql.= " FROM ".MAIN_DB_PREFIX."product_association"; $sql.= " WHERE fk_product_pere = ".$idProduct; - // TODO Select only subproduct with incdec tag - //$sql.= " AND incdec = 1"; + $sql.= " AND incdec = 1"; dol_syslog(get_class($this)."::_createSubProduct", LOG_DEBUG); $resql=$this->db->query($sql); From 29e5b89352ee42dd2844175fd9032ac2c8604be1 Mon Sep 17 00:00:00 2001 From: Alexis Algoud Date: Mon, 23 Feb 2015 12:26:27 +0100 Subject: [PATCH 3/3] erase some comments --- htdocs/product/composition/card.php | 91 ----------------------------- 1 file changed, 91 deletions(-) diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php index b7c6ad45dc5..9efa7772cb0 100644 --- a/htdocs/product/composition/card.php +++ b/htdocs/product/composition/card.php @@ -188,97 +188,6 @@ dol_fiche_head($head, 'subproduct', $titre, 0, $picto); if ($id > 0 || ! empty($ref)) { -/* if ($result) - { - if ($action <> 'edit' && $action <> 'search' && $action <> 're-edit') - { - // mode visu - - print '
'; print $langs->trans("ProductAssociationList").'
'; - print ''; + + print ''; + print ''; + print ''; + + print '
'; + + print ''; + foreach($prods_arbo as $value) { $productstatic->id=$value['id']; $productstatic->type=$value['type']; - //print '
'.$productstatic->ref.'
'; - //print $productstatic->getNomUrl(1).'
'; - //var_dump($value); - print ''; + + $class=($class=='impair')?'pair':'impair'; + + print ''; if ($value['level'] <= 1) { $notdefined=0; $productstatic->ref=$value['fullpath']; - print ''; + $nb_of_subproduct = $value['nb']; + + print ''; + + if($user->rights->produit->creer || $user->rights->service->creer) { + print ''; + print ''; + + } + else{ + print ''; + print ''; + } + + + print ''; - print ''; + print ''; + print ''; + print ''; // Real stock } print ''; } - print ''; - print ''; + print ''; - print ''; + print ''; if (! empty($conf->stock->enabled)) print ''; print ''; print '
'.$langs->trans('ComposedProduct').''.$langs->trans('Qty').''.$langs->trans('ComposedProductDecreaseStock').''.$langs->trans('MinSupplierPrice').''.$langs->trans('Price').''.$langs->trans('Stock').'
'.$productstatic->getNomUrl(1,'composition').' ('.$value['nb'].')'.$productstatic->getNomUrl(1,'composition').''.$nb_of_subproduct.''.($value['incdec']==1?'x':'' ).''; if ($product_fourn->find_min_price_product_fournisseur($productstatic->id) > 0) { @@ -367,26 +403,35 @@ if ($id > 0 || ! empty($ref)) { print '     '; } - print $productstatic->getNomUrl(1,'composition').' ('.$value['nb'].')'; - print ''; + print $productstatic->getNomUrl(1,'composition').''.$value['nb'].'  '; + print ' '; if (! empty($conf->stock->enabled)) print '
'.$langs->trans("TotalBuyingPriceMin").': '; + print '
'.$langs->trans("TotalBuyingPriceMin").': '; if ($atleastonenotdefined) print $langs->trans("Unknown").' ('.$langs->trans("SomeSubProductHaveNoPrices").')'; print ''.($atleastonenotdefined?'':price($total,'','',0,0,-1,$conf->currency)).''.($atleastonenotdefined?'':price($total,'','',0,0,-1,$conf->currency)).' 
'; + + if($user->rights->produit->creer || $user->rights->service->creer) { + print '
'; + } + + print ''; + print '
'.$langs->trans("ParentProductsNumber").''; + print '
'.$langs->trans("ParentProductsNumber").''; print $form->textwithpicto(count($prodsfather), $langs->trans('IfZeroItIsNotUsedByVirtualProduct')); print '
'; - - print ""; - - $nblignes=6; - if ($product->isproduct() && ! empty($conf->stock->enabled)) $nblignes++; - if ($product->isservice()) $nblignes++; - - // Reference - print ''; - - // Libelle - print ''; - print ''; - - // Number of subproducts - $prodsfather = $product->getFather(); // Parent Products - $product->get_sousproduits_arbo(); - $prods_arbo=$product->get_arbo_each_prod(); - $nbofsubproducts=count($prods_arbo); - print ''; - - dol_fiche_end(); - - - // List of products into this virtual product - if (count($prods_arbo) > 0) - { - print ''; - //print ''; - print ''; - if (! empty($conf->stock->enabled)) print ''; - print ''; - } - print '
'.$langs->trans("Ref").''; - print $form->showrefnav($product,'ref','',1,'ref'); - print '
'.$langs->trans("Label").''.$product->libelle.'
'.$langs->trans("AssociatedProductsNumber").''; - print $form->textwithpicto($nbofsubproducts, $langs->trans('IfZeroItIsNotAVirtualProduct')); - print '
'; - print ''.$langs->trans("ProductAssociationList").'
'; - print ''; - foreach($prods_arbo as $value) - { - $productstatic->id=$value['id']; - $productstatic->type=$value['type']; - $productstatic->ref=$value['fullpath']; - if (! empty($conf->stock->enabled)) $productstatic->load_stock(); - //var_dump($value); - //print '
'.$productstatic->ref.'
'; - //print $productstatic->getNomUrl(1).'
'; - //print $value[0]; // This contains a tr line. - print '
'.$productstatic->getNomUrl(1,'composition').' ('.$value['nb'].($value['nb_total'] > $value['nb']?'->'.$value['nb_total']:'').')    '.$productstatic->getNomUrl(1,'composition').' ('.$value['nb'].')    '.$langs->trans("Stock").' : '.$productstatic->stock_reel.'
'; - print '
'.$langs->trans("ParentProductsNumber").''; - print $form->textwithpicto(count($prodsfather), $langs->trans('IfZeroItIsNotUsedByVirtualProduct')); - print '
'; - print ''.$langs->trans("ProductParentList").'
'; - print ''; - foreach($prodnbsfather as $value) - { - $idprod= $value["id"]; - $productstatic->id=$idprod;// $value["id"]; - $productstatic->type=$value["fk_product_type"]; - $productstatic->ref=$value['label']; - print ''; - print '';; - print ''; - } - print '
'.$productstatic->getNomUrl(1,'composition').'
'; - print '
\n"; - - dol_fiche_end(); - } - } -*/ /* * Fiche en mode edition */