Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6

Browse Source
This commit is contained in:
Laurent Destailleur
2014-07-18 20:17:18 +02:00
parent e94ffceac9 a6a799c812
commit dbae31b982
3 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/langs/en_US/productbatch.lang
View File

@@ -16,3 +16,4 @@ printEatby= Eat-by: %s
printSellby= Sell-by: %s
printQty= Qty: %d
AddDispatchBatchLine=Add a line for Shelf Life dispatching
BatchDefaultNumber= Undefined

4
htdocs/langs/fr_FR/productbatch.lang
View File

@@ -14,4 +14,6 @@ DetailBatchFormat= C:%s UO: %s LOT: %s (Qté : %d)
printBatch= Lot: %s
printEatby= DLC: %s
printSellby= DLUO: %s
printQty= Qté: %d
printQty= Qté: %d
AddDispatchBatchLine=Ajouter une ligne de dispatch
BatchDefaultNumber= Indéfini

34
htdocs/product/class/product.class.php
View File

@@ -589,6 +589,39 @@ class Product extends CommonObject
if ($result >= 0)
{
if (empty($this->oldcopy))
{
$org=new self($this->db);
$org->fetch($this->id);
$this->oldcopy=$org;
}
// test if batch management is activated on existing product
if ($this->hasbatch() && !$this->oldcopy->hasbatch())
{
$this->load_stock();
foreach ($this->stock_warehouse as $idW => $ObjW)
{
$qty_batch = 0;
foreach ($ObjW->detail_batch as $detail)
{
$qty_batch += $detail->qty;
}
// Quantities in batch details are not same same as stock quantity
// So we add a default batch record
if ($ObjW->real <> $qty_batch)
{
$ObjBatch = new Productbatch($this->db);
$ObjBatch->batch = $langs->trans('BatchDefaultNumber');
$ObjBatch->qty = $ObjW->real - $qty_batch;
$ObjBatch->fk_product_stock = $ObjW->id;
if ($ObjBatch->create($user,1) < 0)
{
$error++;
$this->errors=$ObjBatch->errors;
}
}
}
}
// For automatic creation
if ($this->barcode == -1) $this->barcode = $this->get_barcode($this,$this->barcode_type_code);
@@ -2918,6 +2951,7 @@ class Product extends CommonObject
$this->stock_warehouse[$row->fk_entrepot] = new stdClass();
$this->stock_warehouse[$row->fk_entrepot]->real = $row->reel;
$this->stock_warehouse[$row->fk_entrepot]->pmp = $row->pmp;
$this->stock_warehouse[$row->fk_entrepot]->id = $row->rowid;
if ($this->hasbatch()) $this->stock_warehouse[$row->fk_entrepot]->detail_batch=Productbatch::findAll($this->db,$row->rowid,1);
$this->stock_reel+=$row->reel;
$i++;