";
+print '| '.$langs->trans("DeStockOnShipmentClassifyBilled").' | ';
+print '';
+if (! empty($conf->expedition->enabled))
+{
+ print "\n";
+}
+else
+{
+ print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module80Name"));
+}
+print " | \n
\n";
+$found++;
+
/*if (! $found)
{
$var=!$var;
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index d26c5dea5dd..8894b40b9e3 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -471,7 +471,7 @@ if ($resql)
// stock order and stock order_supplier
$stock_order=0;
$stock_order_supplier=0;
- if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) // What about other options ?
+ if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLASSIFY_BILLED)) // What about other options ?
{
if (! empty($conf->commande->enabled))
{
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 0bd28092bff..4e5a64722e4 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -379,6 +379,7 @@ class Conf
$this->global->STOCK_CALCULATE_ON_BILL=0;
$this->global->STOCK_CALCULATE_ON_VALIDATE_ORDER=0;
$this->global->STOCK_CALCULATE_ON_SHIPMENT=1;
+ $this->global->STOCK_CALCULATE_ON_SHIPMENT_CLASSIFY_BILLED=0;
$this->global->STOCK_CALCULATE_ON_SUPPLIER_BILL=0;
$this->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER=0;
$this->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER=1;
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 373cb5f2666..9fd9448a955 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1779,6 +1779,87 @@ class Expedition extends CommonObject
//TODO: Option to set order billed if 100% of order is shipped
$this->statut=2;
$this->billed=1;
+
+
+ // If stock increment is done on sending (recommanded choice)
+ if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLASSIFY_BILLED))
+ {
+ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+
+ $langs->load("agenda");
+
+ // Loop on each product line to add a stock movement
+ // TODO possibilite d'expedier a partir d'une propale ou autre origine
+ $sql = "SELECT cd.fk_product, cd.subprice,";
+ $sql.= " ed.rowid, ed.qty, ed.fk_entrepot,";
+ $sql.= " edb.rowid as edbrowid, edb.eatby, edb.sellby, edb.batch, edb.qty as edbqty, edb.fk_origin_stock";
+ $sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd,";
+ $sql.= " ".MAIN_DB_PREFIX."expeditiondet as ed";
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expeditiondet_batch as edb on edb.fk_expeditiondet = ed.rowid";
+ $sql.= " WHERE ed.fk_expedition = ".$this->id;
+ $sql.= " AND cd.rowid = ed.fk_origin_line";
+
+ dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ $cpt = $this->db->num_rows($resql);
+ for ($i = 0; $i < $cpt; $i++)
+ {
+ $obj = $this->db->fetch_object($resql);
+ if (empty($obj->edbrowid))
+ {
+ $qty = $obj->qty;
+ }
+ else
+ {
+ $qty = $obj->edbqty;
+ }
+ if ($qty <= 0) continue;
+ dol_syslog(get_class($this)."::valid movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
+
+ //var_dump($this->lines[$i]);
+ $mouvS = new MouvementStock($this->db);
+ $mouvS->origin = &$this;
+
+ if (empty($obj->edbrowid))
+ {
+ // line without batch detail
+
+ // We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
+ $result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentValidatedInDolibarr",$numref));
+ if ($result < 0) {
+ $error++; break;
+ }
+ }
+ else
+ {
+ // line with batch detail
+
+ // We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
+ $result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentValidatedInDolibarr",$numref), '', $obj->eatby, $obj->sellby, $obj->batch);
+ if ($result < 0) {
+ $error++; break;
+ }
+
+ // We update content of table llx_product_batch (will be rename into llx_product_stock_batch inantoher version)
+ // We can set livraison_batch to deprecated and adapt livraison to handle batch too (mouvS->_create also calls mouvS->_create_batch)
+ if (! empty($conf->productbatch->enabled))
+ {
+ $result=$mouvS->livraison_batch($obj->fk_origin_stock, $qty); // ->fk_origin_stock = id into table llx_product_batch (will be rename into llx_product_stock_batch in another version)
+ if ($result < 0) { $error++; $this->errors[]=$mouvS->error; break; }
+ }
+ }
+ }
+ }
+ else
+ {
+ $this->db->rollback();
+ $this->error=$this->db->error();
+ return -2;
+ }
+ }
+
return 1;
}
else
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 1939299cf63..0b86747b614 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3401,7 +3401,7 @@ class Product extends CommonObject
}
// Stock decrease mode
- if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) {
+ if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLASSIFY_BILLED)) {
$this->stock_theorique=$this->stock_reel-$stock_commande_client+$stock_sending_client;
}
if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)) {
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 42fadf54923..eb5e8cdb3e3 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -483,7 +483,7 @@ if ($id > 0 || $ref)
// Real stock
$object->load_stock();
$text_stock_options = '';
- $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)?$langs->trans("DeStockOnShipment").'