lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: Store and show estimated value of stock

Browse Source
This commit is contained in:
Laurent Destailleur 2009-07-09 22:01:30 +00:00
parent 40b860d624
commit 39b72a5fbe
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/product/stock/mouvementstock.class.php
View File

@ -116,16 +116,18 @@ class MouvementStock
} }
} }
// Calculate new PMP // Calculate new PMP. Price should always be >0 or 0. pmp should always be >0 or 0.
if (! $error) if (! $error)
{ {
$newpmp=0; $newpmp=0;
$newpmpwarehouse=0; $newpmpwarehouse=0;
if ($price > 0) if ($price > 0)
{ {
if ($oldqty > 0 && $oldpmp > 0) $newpmp=($oldqty * $oldpmp + $qty * $price) / ($oldqty + $qty); if (($oldqty + $qty) == 0) $newpmp=0;
else if ($oldpmp > 0) $newpmp=price2num((($oldqty * $oldpmp) + ($qty * $price)) / ($oldqty + $qty), 'MU');
else $newpmp=$price; else $newpmp=$price;
if ($oldqtywarehouse > 0 && $oldpmpwarehouse > 0) $newpmpwarehouse=($oldqtywarehouse * $oldpmpwarehouse + $qty * $price) / ($oldqtywarehouse + $qty); if (($oldqtywarehouse + $qty) == 0) $newpmpwarehouse=0;
else if ($oldpmpwarehouse > 0) $newpmpwarehouse=price2num((($oldqtywarehouse * $oldpmpwarehouse) + ($qty * $price)) / ($oldqtywarehouse + $qty), 'MU');
else $newpmpwarehouse=$price; else $newpmpwarehouse=$price;
} }
else else
@ -238,7 +240,7 @@ class MouvementStock
// Create movement for each subproduct // Create movement for each subproduct
foreach($pids as $key => $value) foreach($pids as $key => $value)
{ {
$this->_create($user, $pids[$key], $entrepot_id, ($qty * $pqtys[$key]), $type, $price); $this->_create($user, $pids[$key], $entrepot_id, ($qty * $pqtys[$key]), $type, 0);
} }
return $error; return $error;
@ -246,12 +248,12 @@ class MouvementStock
/** /**
* \brief Cr<EFBFBD>e un mouvement en base pour toutes les compositions de produits * \brief Cree un mouvement en base pour toutes les compositions de produits
* \return int <0 si ko, 0 si ok * \return int <0 si ko, 0 si ok
*/ */
function _createProductComposition($user, $fk_product, $entrepot_id, $qty, $type, $price=0) function _createProductComposition($user, $fk_product, $entrepot_id, $qty, $type, $price=0)
{ {
dol_syslog("MouvementStock::_createComposition $user->id, $fk_product, $entrepot_id, $qty, $type, $price"); dol_syslog("MouvementStock::_createProductComposition $user->id, $fk_product, $entrepot_id, $qty, $type, $price");
$products_compo = array(); $products_compo = array();
$sql = "SELECT fk_product_composition, qte, etat_stock"; $sql = "SELECT fk_product_composition, qte, etat_stock";
@ -270,13 +272,14 @@ class MouvementStock
} }
else else
{ {
dol_syslog("MouvementStock::_Create echec update ".$this->error, LOG_ERR); dol_syslog("MouvementStock::_createProductComposition echec update ".$this->error, LOG_ERR);
return -1; return -1;
} }
// Create movement for each subproduct
foreach($products_compo as $product) foreach($products_compo as $product)
{ {
$this->_create($user, $product->fk_product_composition, $entrepot_id, ($qty*$product->qte), $type, $price=0); $this->_create($user, $product->fk_product_composition, $entrepot_id, ($qty*$product->qte), $type, 0);
} }
return 0; return 0;
@ -287,9 +290,9 @@ class MouvementStock
* \brief Decrease stock for product and subproducts * \brief Decrease stock for product and subproducts
* \return int <0 if KO, >0 if OK * \return int <0 if KO, >0 if OK
*/ */
function livraison($user, $fk_product, $entrepot_id, $qty) function livraison($user, $fk_product, $entrepot_id, $qty, $price=0)
{ {
return $this->_create($user, $fk_product, $entrepot_id, (0 - $qty), 2); return $this->_create($user, $fk_product, $entrepot_id, (0 - $qty), 2, $price);
} }
@ -304,7 +307,7 @@ class MouvementStock
/** /**
* Return nb of subproducts for a product * Return nb of subproducts lines for a product
* *
* @param unknown_type $id * @param unknown_type $id
* @return unknown * @return unknown