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

New: Can add a comment on stock dispatching to be saved into the stock movement.

Browse Source
This commit is contained in:
Laurent Destailleur 2010-08-26 15:46:39 +00:00
parent 76a7e8f424
commit 81c2b485c8
5 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -17,6 +17,7 @@ For users:
- New: Support NPR in customer product prices. - New: Support NPR in customer product prices.
- New: Add more volume units (ounce, gallon, inch, feet, ...) - New: Add more volume units (ounce, gallon, inch, feet, ...)
- New: Delivery date accepts hours and minutes. - New: Delivery date accepts hours and minutes.
- New: Can add a comment on stock dispatching to be save into stock movements.
- Perf: Avoid reading database to determine country code after each - Perf: Avoid reading database to determine country code after each
page call. page call.
- Fix: Better Postgresql compatibility. - Fix: Better Postgresql compatibility.

4
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -124,7 +124,7 @@ class CommandeFournisseur extends Commande
$this->note_public = $obj->note_public; $this->note_public = $obj->note_public;
$this->modelpdf = $obj->model_pdf; $this->modelpdf = $obj->model_pdf;
$this->db->free(); $this->db->free($resql);
if ($this->statut == 0) $this->brouillon = 1; if ($this->statut == 0) $this->brouillon = 1;
@ -968,7 +968,7 @@ class CommandeFournisseur extends Commande
if (!$error && $entrepot > 0 && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) if (!$error && $entrepot > 0 && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)
{ {
$mouv = new MouvementStock($this->db); $mouv = new MouvementStock($this->db);
$result=$mouv->reception($user, $product, $entrepot, $qty, $price); $result=$mouv->reception($user, $product, $entrepot, $qty, $price, $comment);
if ($result < 0) if ($result < 0)
{ {
$this->error=$mouv->error; $this->error=$mouv->error;

8
htdocs/fourn/commande/dispatch.php
View File

@ -76,7 +76,7 @@ if ($_POST["action"] == 'dispatch' && $user->rights->fournisseur->commande->rece
$pu = "pu_".$reg[1]; $pu = "pu_".$reg[1];
if ($_POST[$ent] > 0) if ($_POST[$ent] > 0)
{ {
$result = $commande->DispatchProduct($user, $_POST[$prod], $_POST[$qty], $_POST[$ent], $_POST[$pu], $_POST["label"]); $result = $commande->DispatchProduct($user, $_POST[$prod], $_POST[$qty], $_POST[$ent], $_POST[$pu], $_POST["comment"]);
} }
else else
{ {
@ -307,6 +307,12 @@ if ($id > 0 || ! empty($ref))
if ($nbproduct) if ($nbproduct)
{ {
print $langs->trans("Comment").' : ';
print '<input type="text" size="60" maxlength="128" name="comment" value="';
print $_POST["comment"]?$_POST["comment"]:$langs->trans("DispatchSupplierOrder",$commande->ref);
// print ' / '.$commande->ref_supplier; // Not yet available
print '" class="flat">';
print '<center><input type="submit" class="button" value="'.$langs->trans("DispatchVerb").'"'; print '<center><input type="submit" class="button" value="'.$langs->trans("DispatchVerb").'"';
if (sizeof($listwarehouses) <= 0) print ' disabled="true"'; if (sizeof($listwarehouses) <= 0) print ' disabled="true"';
print '></center>'; print '></center>';

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

@ -104,6 +104,7 @@ UserWithApproveOrderGrant=Users granted with "approve orders" permission.
PaymentOrderRef=Payment of order %s PaymentOrderRef=Payment of order %s
CloneOrder=Clone order CloneOrder=Clone order
ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b> ? ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b> ?
DispatchSupplierOrder=Receiving supplier order %s
##### Types de contacts ##### ##### Types de contacts #####
TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
TypeContact_commande_internal_SHIPPING=Representative following-up shipping TypeContact_commande_internal_SHIPPING=Representative following-up shipping
@ -132,7 +133,6 @@ OrderSource6=Store
QtyOrdered=Qty ordered QtyOrdered=Qty ordered
AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order
# Documents models # Documents models
PDFEinsteinDescription=A complete order model (logo...) PDFEinsteinDescription=A complete order model (logo...)
PDFEdisonDescription=A simple order model PDFEdisonDescription=A simple order model

1
htdocs/langs/fr_FR/orders.lang
View File

@ -104,6 +104,7 @@ UserWithApproveOrderGrant=Utilisateurs habilités à approuver les commandes
PaymentOrderRef=Paiement commande %s PaymentOrderRef=Paiement commande %s
CloneOrder=Cloner commande CloneOrder=Cloner commande
ConfirmCloneOrder=Êtes-vous sûr de vouloir cloner cette commande <b>%s</b> ? ConfirmCloneOrder=Êtes-vous sûr de vouloir cloner cette commande <b>%s</b> ?
DispatchSupplierOrder=Réception de la commande fournisseur %s
##### Types de contacts ##### ##### Types de contacts #####
TypeContact_commande_internal_SALESREPFOLL=Reponsable suivi commande client TypeContact_commande_internal_SALESREPFOLL=Reponsable suivi commande client
TypeContact_commande_internal_SHIPPING=Reponsable envoi commande client TypeContact_commande_internal_SHIPPING=Reponsable envoi commande client