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

Fix on shipping module

Browse Source
This commit is contained in:
Laurent Destailleur 2010-06-17 20:24:11 +00:00
parent 303007ae9e
commit a4f95ead07
12 changed files with 161 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/commande/class/commande.class.php
View File

@ -1239,6 +1239,7 @@ class Commande extends CommonObject
$line->ref = $objp->product_ref;
$line->libelle = $objp->label;
$line->product_label = $objp->label;
$line->product_desc = $objp->product_desc; // Description produit
$line->fk_product_type = $objp->fk_product_type; // Produit ou service

78
htdocs/expedition/class/expedition.class.php
View File

@ -363,6 +363,8 @@ class Expedition extends CommonObject
$this->db->begin();
$error = 0;
// Define new ref
$num = "EXP".$this->id;
@ -385,51 +387,49 @@ class Expedition extends CommonObject
$error++;
}
if (! $error)
// If stock increment is done on sending (recommanded choice)
if (! $error && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_SHIPMENT)
{
// If stock increment is done on sending (recommanded choice)
if ($result >= 0 && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_SHIPMENT)
require_once DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php";
// 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, ed.qty, ed.fk_entrepot";
$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
$sql.= ", ".MAIN_DB_PREFIX."expeditiondet as ed";
$sql.= " WHERE ed.fk_expedition = ".$this->id;
$sql.= " AND cd.rowid = ed.fk_origin_line";
dol_syslog("Expedition::valid select details sql=".$sql);
$resql=$this->db->query($sql);
if ($resql)
{
require_once DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php";
// 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, ed.qty, ed.fk_entrepot";
$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
$sql.= ", ".MAIN_DB_PREFIX."expeditiondet as ed";
$sql.= " WHERE ed.fk_expedition = ".$this->id;
$sql.= " AND cd.rowid = ed.fk_origin_line";
dol_syslog("Expedition::valid select details sql=".$sql);
$resql=$this->db->query($sql);
if ($resql)
$num = $this->db->num_rows($resql);
$i=0;
while($i < $num)
{
$num = $this->db->num_rows($resql);
$i=0;
while($i < $num)
dol_syslog("Expedition::valid movment index ".$i);
$obj = $this->db->fetch_object($resql);
if ($this->lignes[$i]->fk_product > 0 && $this->lignes[$i]->product_type == 0)
{
dol_syslog("Expedition::valid movment index ".$i);
$obj = $this->db->fetch_object($resql);
if ($this->lignes[$i]->fk_product > 0 && $this->lignes[$i]->product_type == 0)
{
$mouvS = new MouvementStock($this->db);
// We decrement stock of product (and sub-products)
$entrepot_id = "1"; // TODO ajouter possibilite de choisir l'entrepot
$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, $obj->subprice);
if ($result < 0) { $error++; }
}
$i++;
//var_dump($this->lignes[$i]);
$mouvS = new MouvementStock($this->db);
// We decrement stock of product (and sub-products)
// We use warehouse selected for each line
$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, $obj->subprice);
if ($result < 0) { $error++; break; }
}
$i++;
}
else
{
$this->db->rollback();
$this->error=$this->db->error();
dol_syslog("Expedition::valid ".$this->error, LOG_ERR);
return -2;
}
}
else
{
$this->db->rollback();
$this->error=$this->db->error();
dol_syslog("Expedition::valid ".$this->error, LOG_ERR);
return -2;
}
}

147
htdocs/expedition/fiche.php
View File

@ -98,12 +98,13 @@ if ($_POST["action"] == 'add')
for ($i = 0 ; $i < sizeof($object->lignes) ; $i++)
{
$ent = "entl".$i;
$idl = "idl".$i;
$qty = "qtyl".$i;
$entrepot_id = $_POST[$ent]?$_POST[$ent]:$_POST["entrepot_id"];
if ($_POST[$qty] > 0)
{
$ent = "entl".$i;
$idl = "idl".$i;
$entrepot_id = isset($_POST[$ent])?$_POST[$ent]:$_POST["entrepot_id"];
$expedition->addline($entrepot_id,$_POST[$idl],$_POST[$qty]);
}
}
@ -326,8 +327,10 @@ if ($_GET["action"] == 'create')
$object = new $classname($db);
if ($object->fetch($origin_id))
if ($object->fetch($origin_id)) // This include the fetch_lines
{
//var_dump($object);
$soc = new Societe($db);
$soc->fetch($object->socid);
@ -461,21 +464,16 @@ if ($_GET["action"] == 'create')
print '<td>'.$langs->trans("Description").'</td>';
print '<td align="center">'.$langs->trans("QtyOrdered").'</td>';
print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
print '<td align="center">'.$langs->trans("QtyToShip").'</td>';
print '<td align="left">'.$langs->trans("QtyToShip").'</td>';
if ($conf->stock->enabled)
{
if ($_GET["entrepot_id"])
{
print '<td align="right">'.$langs->trans("Stock").'</td>';
}
else
{
print '<td align="left">'.$langs->trans("Warehouse").'</td>';
}
print '<td align="left">'.$langs->trans("Warehouse").' / '.$langs->trans("Stock").'</td>';
}
print "</tr>\n";
}
$product_static = new Product($db);
$var=true;
$indiceAsked = 0;
while ($indiceAsked < $numAsked)
@ -484,37 +482,63 @@ if ($_GET["action"] == 'create')
$line = $object->lines[$indiceAsked];
$var=!$var;
// Show product and description
$type=$line->product_type?$line->product_type:$line->fk_product_type;
// Try to enhance type detection using date_start and date_end for free lines where type
// was not saved.
if (! empty($line->date_start)) $type=1;
if (! empty($line->date_end)) $type=1;
print "<tr ".$bc[$var].">\n";
// Desc
// Product label
if ($line->fk_product > 0)
{
$product->fetch($line->fk_product);
$product->load_stock();
print '<td>';
print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$line->fk_product.'">';
if ($line->product_type == 1)
print '<a name="'.$line->rowid.'"></a>'; // ancre pour retourner sur la ligne
// Show product and description
$product_static->type=$line->fk_product_type;
$product_static->id=$line->fk_product;
$product_static->ref=$line->ref;
$product_static->libelle=$line->product_label;
$text=$product_static->getNomUrl(1);
$text.= ' - '.$line->product_label;
$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($line->desc));
print $html->textwithtooltip($text,$description,3,'','',$i);
// Show range
print_date_range($db->jdate($line->date_start),$db->jdate($line->date_end));
// Add description in form
if ($conf->global->PRODUIT_DESC_IN_FORM)
{
print img_object($langs->trans("ShowService"),"service");
print ($line->desc && $line->desc!=$line->product_label)?'<br>'.dol_htmlentitiesbr($line->desc):'';
}
else
{
print img_object($langs->trans("ShowProduct"),"product");
}
print ' '.$product->ref.'</a> - '.$product->libelle;
if ($line->desc) print '<br>'.dol_nl2br(dol_htmlcleanlastbr($line->desc),1);
print '</td>';
}
else
{ //var_dump($ligne);
print "<td>".nl2br($line->desc)."</td>\n";
{
print "<td>";
if ($type==1) $text = img_object($langs->trans('Service'),'service');
else $text = img_object($langs->trans('Product'),'product');
print $text.' '.nl2br($line->desc);
// Show range
print_date_range($db->jdate($line->date_start),$db->jdate($line->date_end));
print "</td>\n";
}
// Qty
print '<td align="center">'.$line->qty.'</td>';
$qtyProdCom=$line->qty;
// Sendings
// Qty already sent
print '<td align="center">';
$quantityDelivered = $object->expeditions[$line->id];
print $quantityDelivered;
@ -523,81 +547,58 @@ if ($_GET["action"] == 'create')
$quantityAsked = $line->qty;
$quantityToBeDelivered = $quantityAsked - $quantityDelivered;
if ($conf->stock->enabled && $line->product_type == 0)
if ($conf->stock->enabled
//&& $line->product_type == 0
)
{
$defaultqty=0;
if ($_GET["entrepot_id"])
if ($_REQUEST["entrepot_id"])
{
$stock = $product->stock_entrepot[$_GET["entrepot_id"]];
//var_dump($product);
$stock = $product->stock_entrepot[$_REQUEST["entrepot_id"]];
$stock+=0; // Convertit en numerique
$defaultqty=min($quantityToBeDelivered, $stock);
if ($defaultqty < 0) $defaultqty=0;
if ($line->product_type == 1 || $defaultqty < 0) $defaultqty=0;
}
// Quantity
print '<td align="center">';
print '<td align="left">';
print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
print '<input name="qtyl'.$indiceAsked.'" type="text" size="6" value="'.$defaultqty.'">';
print '<input name="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$defaultqty.'">';
if ($line->product_type == 1) print ' ('.$langs->trans("Service").')';
print '</td>';
// Stock
if ($_GET["entrepot_id"])
if ($conf->stock->enabled)
{
print '<td align="right">';
print $stock;
if ($stock < $quantityToBeDelivered)
if ($_REQUEST["entrepot_id"])
{
print ' '.img_warning($langs->trans("StockTooLow"));
}
print '</td>';
}
else
{
$array=array();
$sql = "SELECT e.rowid, e.label, ps.reel";
$sql.= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
$sql.= ", ".MAIN_DB_PREFIX."entrepot as e";
$sql.= " WHERE ps.fk_entrepot = e.rowid";
$sql.= " AND fk_product = '".$product->id."'";
$result = $db->query($sql) ;
if ($result)
{
$num = $db->num_rows($result);
$i=0;
if ($num > 0)
print '<td align="left">';
$formproduct->selectWarehouses($_REQUEST["entrepot_id"],'entl'.$indiceAsked,'',1,0,$line->fk_product);
//print $stock;
if ($stock < $quantityToBeDelivered)
{
while ($i < $num)
{
$obj = $db->fetch_object($result);
$array[$obj->rowid] = $obj->label.' ('.$obj->reel.')';
$i++;
}
print ' '.img_warning($langs->trans("StockTooLow"));
}
$db->free($result);
print '</td>';
}
else
{
$this->error=$db->error();
return -1;
print '<td align="left">';
$formproduct->selectWarehouses('','entl'.$indiceAsked,'',1,0,$line->fk_product);
print '</td>';
}
print '<td align="left">';
$html->select_array('entl'.$i,$array,'',1,0,0);
print '</td>';
}
}
else
/*else
{
// Quantity
print '<td align="center" '.$colspan.'>';
print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
print '<input name="qtyl'.$indiceAsked.'" type="text" size="6" value="'.$quantityToBeDelivered.'">';
print '<input name="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$quantityToBeDelivered.'">';
print '</td>';
if ($line->product_type == 1) print '<td>&nbsp;</td>';
}
}*/
print "</tr>\n";

22
htdocs/expedition/shipment.php
View File

@ -438,6 +438,8 @@ if ($id > 0 || ! empty($ref))
if (! empty($objp->date_end)) $type=1;
print "<tr ".$bc[$var].">";
// Product label
if ($objp->fk_product > 0)
{
print '<td>';
@ -603,7 +605,7 @@ if ($id > 0 || ! empty($ref))
// Bouton expedier avec gestion des stocks
if ($conf->stock->enabled && $commande->statut > 0 && $commande->statut < 3)
if ($commande->statut > 0 && $commande->statut < 3)
{
if ($user->rights->expedition->creer)
{
@ -616,18 +618,22 @@ if ($id > 0 || ! empty($ref))
print '<input type="hidden" name="origin_id" value="'.$commande->id.'">';
print '<table class="border" width="100%">';
$entrepot = new Entrepot($db);
$langs->load("stocks");
print '<tr>';
print '<td>'.$langs->trans("WarehouseSource").'</td>';
print '<td>';
$result=$formproduct->selectWarehouses(-1,'entrepot_id','',1);
if ($result <= 0)
if ($conf->stock->enabled)
{
print ' &nbsp; No warehouse defined, <a href="'.DOL_URL_ROOT.'/product/stock/fiche.php?action=create">add one</a>';
print '<td>'.$langs->trans("WarehouseSource").'</td>';
print '<td>';
$result=$formproduct->selectWarehouses(-1,'entrepot_id','',1);
if ($result <= 0)
{
print ' &nbsp; No warehouse defined, <a href="'.DOL_URL_ROOT.'/product/stock/fiche.php?action=create">add one</a>';
}
print '</td>';
}
print '</td><td align="center">';
print '<td align="center">';
print '<input type="submit" class="button" named="save" value="'.$langs->trans("NewSending").'">';
if ($reste_a_livrer_total <= 0)
{

2
htdocs/langs/ca_ES/stocks.lang
View File

@ -45,7 +45,7 @@ RuleForStockManagementDecrease=Regla de gestió de decrements d'estoc
RuleForStockManagementIncrease=Regla de gestió d'increments d'estoc
DeStockOnBill=Decrementar els estocs físics sobre les factures/abonaments a clients (atenció, en aquesta versió, encara es fa l'ajustament sobre el magatzem número 1)
DeStockOnValidateOrder=Decrementar els estocs físics sobre les comandes de clients (atenció, en aquesta versió, encara es fa l'ajustament sobre el magatzem número 1)
DeStockOnShipment=Decrementar els estocs físics sobre els enviaments (recomanat)
DeStockOnShipment=Decrementar els estocs físics sobre els enviaments
ReStockOnBill=Incrementar els estocs físics sobre les factures/abonaments de proveïdors (atenció, en aquesta versió, encara es fa l'ajustament sobre el magatzem número 1)
ReStockOnValidateOrder=Incrementar els estocs físics sobre les comandes a proveïdors (atenció, en aquesta versió, encara es fa l'ajustament sobre el magatzem número 1)
ReStockOnDispatchOrder=Incrementa els estocs físics en el desglossament manual de la recepció de les comandes a proveïdors en els magatzems

2
htdocs/langs/en_US/stocks.lang
View File

@ -45,7 +45,7 @@ RuleForStockManagementDecrease=Rule for stock management decrease
RuleForStockManagementIncrease=Rule for stock management increase
DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation (warning, in this version, it's only in warehouse number 1 that stock is modified)
DeStockOnValidateOrder=Decrease real stocks on customers orders validation (warning, in this version, it's only in warehouse number 1 that stock is modified)
DeStockOnShipment=Decrease real stocks on shipment validation (recommended)
DeStockOnShipment=Decrease real stocks on shipment validation
ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation (warning, in this version, it's only in warehouse number 1 that stock is modified)
ReStockOnValidateOrder=Increase real stocks on suppliers orders approbation (warning, in this version, it's only in warehouse number 1 that stock is modified)
ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receiving

2
htdocs/langs/es_ES/stocks.lang
View File

@ -45,7 +45,7 @@ RuleForStockManagementDecrease=Regla de gestión de decrementos de stock
RuleForStockManagementIncrease=Regla de gestión de incrementos de stock
DeStockOnBill=Decrementar los stocks físicos sobre las facturas/abonos a clientes (atención, en esta versión, todavía se realiza el ajuste sobre el almacén número 1)
DeStockOnValidateOrder=Decrementar los stocks físicos sobre los pedidos de clientes (atención, en esta versión, todavía se realiza el ajuste sobre el almacén número 1)
DeStockOnShipment=Decrementar los stocks físicos sobre los envíos (recomendado)
DeStockOnShipment=Decrementar los stocks físicos sobre los envíos
ReStockOnBill=Incrementar los stocks físicos sobre las facturas/abonos de proveedores (atención, en esta versión, todavía se realiza el ajuste sobre el almacén número 1)
ReStockOnValidateOrder=Incrementar los stocks físicos sobre los pedidos a proveedores (atención, en esta versión, todavía se realiza el ajuste sobre el almacén número 1)
ReStockOnDispatchOrder=Incrementa los stocks físicos en el desglose manual de la recepción de los pedidos a proveedores en los almacenes

2
htdocs/langs/fr_FR/stocks.lang
View File

@ -45,7 +45,7 @@ RuleForStockManagementDecrease=Règle de gestion des décrémentations de stock
RuleForStockManagementIncrease=Règle de gestion des incrémentations de stock
DeStockOnBill=Décrémente les stocks physiques sur validation des factures/avoirs clients (attention, dans cette version, c'est toujours dans le premier entrepôt que se fait l'ajustement)
DeStockOnValidateOrder=Décrémente les stocks physiques sur validation des commandes clients (attention, dans cette version, c'est toujours dans le premier entrepôt que se fait l'ajustement)
DeStockOnShipment=Décrémente les stocks physiques sur validation des expéditions (recommandé)
DeStockOnShipment=Décrémente les stocks physiques sur validation des expéditions
ReStockOnBill=Incrémente les stocks physiques sur validation des factures/avoirs fournisseurs (attention, dans cette version, c'est toujours dans le premier entrepôt que se fait l'ajustement)
ReStockOnValidateOrder=Incrémente les stocks physiques sur approbations des commandes fournisseurs (attention, dans cette version, c'est toujours dans le premier entrepôt que se fait l'ajustement)
ReStockOnDispatchOrder=Incrémente les stocks physiques sur ventilation manuelle de la réception des commandes fournisseurs dans les entrepôts

13
htdocs/livraison/class/livraison.class.php
View File

@ -374,7 +374,7 @@ class Livraison extends CommonObject
if ($resql)
{
// Si module stock gere et que expedition faite depuis un entrepot
if (!$conf->expedition->enabled && $conf->stock->enabled && $this->entrepot_id && $conf->global->STOCK_CALCULATE_ON_SHIPMENT == 1)
if ($conf->stock->enabled && $this->entrepot_id && $conf->global->STOCK_CALCULATE_ON_RECEIVING == 1)
{
//Enregistrement d'un mouvement de stock pour chaque produit de l'expedition
@ -399,14 +399,9 @@ class Livraison extends CommonObject
$obj = $this->db->fetch_object($resql);
$mouvS = new MouvementStock($this->db);
$result=$mouvS->livraison($user, $obj->fk_product, $this->entrepot_id, $obj->qty, $obj->subprice);
if ($result < 0)
{
$this->db->rollback();
$this->error=$this->db->error()." - sql=$sql";
dol_syslog("livraison.class.php::valid ".$this->error, LOG_ERR);
return -3;
}
$entrepot_id = "1"; // TODO ajouter possibilite de choisir l'entrepot
$result=$mouvS->livraison($user, $obj->fk_product, $entrepot_id, $obj->qty, $obj->subprice);
if ($result < 0) { $error++; break; }
$i++;
}

4
htdocs/livraison/fiche.php
View File

@ -297,13 +297,15 @@ if ($_GET["action"] == 'create')
$var=true;
while ($i < $num)
{
$product = new Product($db);
$ligne = $commande->lignes[$i];
$var=!$var;
print "<tr $bc[$var]>\n";
if ($ligne->fk_product > 0)
{
$product = new Product($db);
$product->fetch($ligne->fk_product);
$product->load_stock();
print '<td>';
print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$ligne->fk_product.'">'.img_object($langs->trans("ShowProduct"),"product").' '.$product->ref.'</a> - '.$product->libelle;

30
htdocs/product/class/html.formproduct.class.php
View File

@ -54,17 +54,26 @@ class FormProduct
/**
* \brief Load in cache array list of warehouses
* \return int Nb of loaded lines, 0 if already loaded, <0 if KO
* \param fk_product Add quantity of stock in label for product with id fk_product. Nothing if 0.
* \return int Nb of loaded lines, 0 if already loaded, <0 if KO
* \remarks If fk_product is not 0, we do not use cache
*/
function loadWarehouses()
function loadWarehouses($fk_product=0)
{
global $langs;
if (sizeof($this->cache_warehouses)) return 0; // Cache already loaded
if (empty($fk_product) && sizeof($this->cache_warehouses)) return 0; // Cache already loaded and we do not want a list with information specific to a product
$sql = "SELECT e.rowid, e.label FROM ".MAIN_DB_PREFIX."entrepot as e";
$sql .= " WHERE statut = 1";
$sql .= " ORDER BY e.label";
$sql = "SELECT e.rowid, e.label";
if ($fk_product) $sql.= ", ps.reel";
$sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
if ($fk_product)
{
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.fk_entrepot = e.rowid";
$sql.= " AND ps.fk_product = '".$fk_product."'";
}
$sql.= " WHERE statut = 1";
$sql.= " ORDER BY e.label";
dol_syslog('FormProduct::loadWarehouses sql='.$sql,LOG_DEBUG);
$resql = $this->db->query($sql);
@ -78,6 +87,7 @@ class FormProduct
$this->cache_warehouses[$obj->rowid]['id'] =$obj->rowid;
$this->cache_warehouses[$obj->rowid]['label']=$obj->label;
if ($fk_product) $this->cache_warehouses[$obj->rowid]['stock']=$obj->reel;
$i++;
}
return $num;
@ -96,15 +106,16 @@ class FormProduct
* \param filtertype For filtre
* \param empty 1=Can be empty, 0 if not
* \param disabled 1=Select is disabled
* \param fk_product Add quantity of stock in label for product with id fk_product. Nothing if 0.
* \return int <0 if KO, Nb of product in list if OK
*/
function selectWarehouses($selected='',$htmlname='idwarehouse',$filtertype='',$empty=0,$disabled=0)
function selectWarehouses($selected='',$htmlname='idwarehouse',$filtertype='',$empty=0,$disabled=0,$fk_product=0)
{
global $langs,$user;
dol_syslog("Form::selectWarehouses $selected, $htmlname, $filtertype, $format",LOG_DEBUG);
dol_syslog("Form::selectWarehouses $selected, $htmlname, $filtertype, $empty, $disabled, $fk_product",LOG_DEBUG);
$this->loadWarehouses();
$this->loadWarehouses($fk_product);
print '<select class="flat"'.($disabled?' disabled="true"':'').' name="'.($htmlname.($disabled?'_disabled':'')).'">';
if ($empty) print '<option value="">&nbsp;</option>';
@ -115,6 +126,7 @@ class FormProduct
if ($selected == $id) print ' selected="true"';
print '>';
print $arraytypes['label'];
if ($fk_product) print ' ('.$langs->trans("Stock").': '.($arraytypes['stock']>0?$arraytypes['stock']:'?').')';
print '</option>';
}
print '</select>';

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

@ -2348,7 +2348,7 @@ class Product extends CommonObject
$i=0;
if ($num > 0)
{
while ($i < $num )
while ($i < $num)
{
$row = $this->db->fetch_row($result);
$this->stock_entrepot[$row[1]] = $row[0];