diff --git a/htdocs/core/lib/reception.lib.php b/htdocs/core/lib/reception.lib.php
index e697908e8cb..16e036991f9 100644
--- a/htdocs/core/lib/reception.lib.php
+++ b/htdocs/core/lib/reception.lib.php
@@ -46,6 +46,13 @@ function reception_prepare_head(Reception $object)
$head[$h][2] = 'reception';
$h++;
+ if ($object->statut == Reception::STATUS_DRAFT) {
+ $head[$h][0] = DOL_URL_ROOT."/reception/dispatch.php?id=".$object->id;
+ $head[$h][1] = $langs->trans("DispatchCard");
+ $head[$h][2] = 'dispatch';
+ $h++;
+ }
+
if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
$objectsrc = $object;
if ($object->origin == 'supplier_order' && $object->origin_id > 0) {
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 22acc6258cc..51946f6f278 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2110,9 +2110,10 @@ class CommandeFournisseur extends CommonOrder
* @param string $batch Lot number
* @param int $fk_commandefourndet Id of supplier order line
* @param int $notrigger 1 = notrigger
+ * @param int $fk_reception Id of reception to link
* @return int <0 if KO, >0 if OK
*/
- public function dispatchProduct($user, $product, $qty, $entrepot, $price = 0, $comment = '', $eatby = '', $sellby = '', $batch = '', $fk_commandefourndet = 0, $notrigger = 0)
+ public function dispatchProduct($user, $product, $qty, $entrepot, $price = 0, $comment = '', $eatby = '', $sellby = '', $batch = '', $fk_commandefourndet = 0, $notrigger = 0, $fk_reception = 0)
{
global $conf, $langs;
@@ -2142,9 +2143,9 @@ class CommandeFournisseur extends CommonOrder
$this->db->begin();
$sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseur_dispatch";
- $sql .= " (fk_commande, fk_product, qty, fk_entrepot, fk_user, datec, fk_commandefourndet, status, comment, eatby, sellby, batch) VALUES";
+ $sql .= " (fk_commande, fk_product, qty, fk_entrepot, fk_user, datec, fk_commandefourndet, status, comment, eatby, sellby, batch, fk_reception) VALUES";
$sql .= " ('".$this->id."','".$product."','".$qty."',".($entrepot > 0 ? "'".$entrepot."'" : "null").",'".$user->id."','".$this->db->idate($now)."','".$fk_commandefourndet."', ".$dispatchstatus.", '".$this->db->escape($comment)."', ";
- $sql .= ($eatby ? "'".$this->db->idate($eatby)."'" : "null").", ".($sellby ? "'".$this->db->idate($sellby)."'" : "null").", ".($batch ? "'".$this->db->escape($batch)."'" : "null");
+ $sql .= ($eatby ? "'".$this->db->idate($eatby)."'" : "null").", ".($sellby ? "'".$this->db->idate($sellby)."'" : "null").", ".($batch ? "'".$this->db->escape($batch)."'" : "null").", ".($fk_reception > 0 ? "'".$this->db->escape($fk_reception)."'" : "null");
$sql .= ")";
dol_syslog(get_class($this)."::dispatchProduct", LOG_DEBUG);
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index a3f9e8e234e..a9049301bdb 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -134,7 +134,7 @@ if ($id > 0 || !empty($ref)) {
// Security check
$isdraft = (isset($object->statut) && ($object->statut == $object::STATUS_DRAFT) ? 1 : 0);
-$result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande', 'fk_soc', 'rowid', $isdraft);
+$result = restrictedArea($user, 'fournisseur', $object, 'commande_fournisseur', 'commande', 'fk_soc', 'rowid', $isdraft);
// Common permissions
$usercanread = ($user->rights->fournisseur->commande->lire || $user->rights->supplier_order->lire);
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 7083897e25a..25fb890698a 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -94,7 +94,7 @@ if (empty($conf->reception->enabled)) {
}
// $id is id of a purchase order.
-$result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
+$result = restrictedArea($user, 'fournisseur', $object, 'commande_fournisseur', 'commande');
if (!isModEnabled('stock')) {
accessforbidden();
@@ -978,7 +978,8 @@ if ($id > 0 || !empty($ref)) {
// Qty to dispatch
print '
';
- print ' ';
+ print ''.img_picto($langs->trans("Reset"), 'eraser', 'class="pictofixedwidth opacitymedium"').' ';
+ print ' ';
print ' ';
print '';
@@ -1115,14 +1116,30 @@ if ($id > 0 || !empty($ref)) {
$("select[name^=entrepot_]").val(fk_default_warehouse).change();
});
- jQuery("#autoreset").click(function() {';
- $i = 0;
- while ($i < $nbproduct) {
- print ' jQuery("#qty_0_'.$i.'").val("");';
- $i++;
- }
- print '
+ $("#autoreset").click(function() {
+ $(".qtydispatchinput").each(function(){
+ id = $(this).attr("id");
+ idtab = id.split("_");
+ if(idtab[1] == 0){
+ console.log(idtab);
+ $(this).val("");
+ $("#qty_dispatched_0_"+idtab[2]).val("0");
+ } else {
+ obj = $(this).parent().parent();
+ nameobj = obj.attr("name");
+ nametab = nameobj.split("_");
+ obj.remove();
+ $("tr[name^=\'"+nametab[0]+"_\'][name$=\'_"+nametab[2]+"\']:last .splitbutton").show();
+ }
+ });
});
+
+ $(".resetline").click(function(){
+ id = $(this).attr("id");
+ id = id.split("reset_");
+ console.log("Reset trigger for id = qty_"+id[1]);
+ $("#qty_"+id[1]).val("");
+ });
});
';
diff --git a/htdocs/fourn/js/lib_dispatch.js.php b/htdocs/fourn/js/lib_dispatch.js.php
index 6bd2d39ce21..f1b70fa0ceb 100644
--- a/htdocs/fourn/js/lib_dispatch.js.php
+++ b/htdocs/fourn/js/lib_dispatch.js.php
@@ -65,8 +65,7 @@ if (empty($dolibarr_nocache)) {
* @param type string type of dispatch (batch = batch dispatch, dispatch = non batch dispatch)
* @param mode string 'qtymissing' will create new line with qty missing, 'lessone' will keep 1 in old line and the rest in new one
*/
-function addDispatchLine(index, type, mode)
-{
+function addDispatchLine(index, type, mode) {
mode = mode || 'qtymissing'
var $row0 = $("tr[name='"+type+'_0_'+index+"']");
@@ -80,20 +79,18 @@ function addDispatchLine(index, type, mode)
var qtyDispatched;
- if (mode === 'lessone')
- {
- qtyDispatched = parseFloat($("#qty_dispatched_0_"+index).val()) + 1;
+ if (mode === 'lessone') {
+ qtyDispatched = parseFloat($("#qty_dispatched_0_" + index).val()) + 1;
}
- else
- {
- qtyDispatched = parseFloat($("#qty_dispatched_0_"+index).val()) + qty;
+ else {
+ qtyDispatched = parseFloat($("#qty_dispatched_0_" + index).val()) + qty;
// If user did not reduced the qty to dispatch on old line, we keep only 1 on old line and the rest on new line
if (qtyDispatched == qtyOrdered && qtyDispatched > 1) {
- qtyDispatched = parseFloat($("#qty_dispatched_0_"+index).val()) + 1;
+ qtyDispatched = parseFloat($("#qty_dispatched_0_" + index).val()) + 1;
mode = 'lessone';
}
}
- console.log("qtyDispatched="+qtyDispatched+" qtyOrdered="+qtyOrdered);
+ console.log("qtyDispatched=" + qtyDispatched + " qtyOrdered=" + qtyOrdered);
if (qty <= 1) {
window.alert("Remain quantity to dispatch is too low to be split");
@@ -107,7 +104,7 @@ function addDispatchLine(index, type, mode)
}
//replace tr suffix nbr
- $row.html($row.html().replace(/_0_/g,"_"+nbrTrs+"_"));
+ $row.html($row.html().replace(/_0_/g, "_" + nbrTrs + "_"));
// jquery's deep clone is incompatible with date pickers (the clone shares data with the original)
// so we destroy and rebuild the new date pickers
@@ -121,27 +118,42 @@ function addDispatchLine(index, type, mode)
}, 0);
//create new select2 to avoid duplicate id of cloned one
- $row.find("select[name='"+'entrepot_'+nbrTrs+'_'+index+"']").select2();
+ $row.find("select[name='" + 'entrepot_' + nbrTrs + '_' + index + "']").select2();
// TODO find solution to copy selected option to new select
// TODO find solution to keep new tr's after page refresh
//clear value
$row.find("input[name^='qty']").val('');
//change name of new row
- $row.attr('name',type+'_'+nbrTrs+'_'+index);
+ $row.attr('name', type + '_' + nbrTrs + '_' + index);
//insert new row before last row
- $("tr[name^='"+type+"_'][name$='_"+index+"']:last").after($row);
+ $("tr[name^='" + type + "_'][name$='_" + index + "']:last").after($row);
//remove cloned select2 with duplicate id.
- $("#s2id_entrepot_"+nbrTrs+'_'+index).detach(); // old way to find duplicated select2 component
- $(".csswarehouse_"+nbrTrs+"_"+index+":first-child").parent("span.selection").parent(".select2").detach();
+ $("#s2id_entrepot_" + nbrTrs + '_' + index).detach(); // old way to find duplicated select2 component
+ $(".csswarehouse_" + nbrTrs + "_" + index + ":first-child").parent("span.selection").parent(".select2").detach();
/* Suffix of lines are: _ trs.length _ index */
$("#qty_"+nbrTrs+"_"+index).focus();
$("#qty_dispatched_0_"+index).val(oldlineqty);
//hide all buttons then show only the last one
- $("tr[name^='"+type+"_'][name$='_"+index+"'] .splitbutton").hide();
- $("tr[name^='"+type+"_'][name$='_"+index+"']:last .splitbutton").show();
+ $("tr[name^='" + type + "_'][name$='_" + index + "'] .splitbutton").hide();
+ $("tr[name^='" + type + "_'][name$='_" + index + "']:last .splitbutton").show();
+
+ $("#reset_" + (nbrTrs) + "_" + index).click(function () {
+ id = $(this).attr("id");
+ id = id.split("reset_");
+ idrow = id[1];
+ idlast = $("tr[name^='" + type + "_'][name$='_" + index + "']:last .qtydispatchinput").attr("id");
+ if (idlast == $("#qty_" + idrow).attr("id")) {
+ console.log("Remove trigger for tr name = " + type + "_" + idrow);
+ $('tr[name="' + type + '_' + idrow + '"').remove();
+ $("tr[name^='" + type + "_'][name$='_" + index + "']:last .splitbutton").show();
+ } else {
+ console.log("Reset trigger for id = #qty_" + idrow);
+ $("#qty_" + idrow).val("");
+ }
+ });
if (mode === 'lessone')
{
@@ -150,13 +162,19 @@ function addDispatchLine(index, type, mode)
}
$("#qty_"+nbrTrs+"_"+index).val(newlineqty);
// Store arbitrary data for dispatch qty input field change event
- $("#qty_"+(nbrTrs-1)+"_"+index).data('qty', qty);
- $("#qty_"+(nbrTrs-1)+"_"+index).data('type', type);
- $("#qty_"+(nbrTrs-1)+"_"+index).data('index', index);
+ $("#qty_" + (nbrTrs - 1) + "_" + index).data('qty', qty);
+ $("#qty_" + (nbrTrs - 1) + "_" + index).data('type', type);
+ $("#qty_" + (nbrTrs - 1) + "_" + index).data('index', index);
// Update dispatched qty when value dispatch qty input field changed
- $("#qty_"+(nbrTrs-1)+"_"+index).change(this.onChangeDispatchLineQty);
+ //$("#qty_" + (nbrTrs - 1) + "_" + index).change(this.onChangeDispatchLineQty);
//set focus on lot of new line (if it exists)
- $("#lot_number_"+(nbrTrs)+"_"+index).focus();
+ $("#lot_number_" + (nbrTrs) + "_" + index).focus();
+ //Clean bad values
+ $("tr[name^='" + type + "_'][name$='_" + index + "']:last").data("remove", "remove");
+ $("#lot_number_" + (nbrTrs) + "_" + index).val("")
+ $("#idline_" + (nbrTrs) + "_" + index).val("-1")
+ $("#qty_" + (nbrTrs) + "_" + index).data('expected', "0");
+ $("#lot_number_" + (nbrTrs) + "_" + index).removeAttr("disabled");
}
}
@@ -170,26 +188,28 @@ function addDispatchLine(index, type, mode)
* element requires arbitrary data qty (value before change), type (type of dispatch) and index (index of product line)
*/
-function onChangeDispatchLineQty() {
- var index = $(this).data('index'),
- type = $(this).data('type'),
- qty = parseFloat($(this).data('qty')),
+function onChangeDispatchLineQty(element) {
+ var type = $(element).data('type'),
+ qty = parseFloat($(element).data('expected')),
changedQty, nbrTrs, dispatchingQty, qtyOrdered, qtyDispatched;
+ id = $(element).attr("id");
+ id = id.split("_");
+ index = id[2];
if (index >= 0 && type && qty >= 0) {
- nbrTrs = $("tr[name^='"+type+"_'][name$='_"+index+"']").length;
- qtyChanged = parseFloat($(this).val()) - qty; // qty changed
- qtyDispatching = parseFloat($("#qty_"+(nbrTrs-1)+"_"+index).val()); // qty currently being dispatched
- qtyOrdered = parseFloat($("#qty_ordered_0_"+index).val()); // qty ordered
- qtyDispatched = parseFloat($("#qty_dispatched_0_"+index).val()); // qty already dispatched
+ nbrTrs = $("tr[name^='" + type + "_'][name$='_" + index + "']").length;
+ qtyChanged = parseFloat($(element).val()) - qty; // qty changed
+ qtyDispatching = parseFloat($(element).val()); // qty currently being dispatched
+ qtyOrdered = parseFloat($("#qty_ordered_0_" + index).val()); // qty ordered
+ qtyDispatched = parseFloat($("#qty_dispatched_0_" + index).val()); // qty already dispatched
- console.log("onChangeDispatchLineQty qtyChanged: " + qtyChanged + " qtyDispatching: " + qtyDispatching + " qtyOrdered: " + qtyOrdered + " qtyDispatched: "+ qtyDispatched);
+ console.log("onChangeDispatchLineQty qtyChanged: " + qtyChanged + " qtyDispatching: " + qtyDispatching + " qtyOrdered: " + qtyOrdered + " qtyDispatched: " + qtyDispatched);
if ((qtyChanged) <= (qtyOrdered - (qtyDispatched + qtyDispatching))) {
- $("#qty_dispatched_0_"+index).val(qtyDispatched + qtyChanged);
+ $("#qty_dispatched_0_" + index).val(qtyDispatched + qtyChanged);
} else {
- $(this).val($(this).data('qty'));
+ $(element).val($(element).data('expected'));
}
- $(this).data('qty', $(this).val());
+ $(element).data('expected', $(element).val());
}
}
diff --git a/htdocs/langs/en_US/receptions.lang b/htdocs/langs/en_US/receptions.lang
index 7324f14f2e0..cd4c860e82f 100644
--- a/htdocs/langs/en_US/receptions.lang
+++ b/htdocs/langs/en_US/receptions.lang
@@ -51,4 +51,7 @@ NoMorePredefinedProductToDispatch=No more predefined products to dispatch
ReceptionExist=A reception exists
ReceptionBackToDraftInDolibarr=Reception %s back to draft
ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
-ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
\ No newline at end of file
+ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
+ResetQtyToDispatch=Reset all quantities to dispatch
+ReceptionUpdated=Reception sucessfully updated
+DispatchCard=Dispatch card
\ No newline at end of file
diff --git a/htdocs/reception/dispatch.php b/htdocs/reception/dispatch.php
new file mode 100644
index 00000000000..a9c6c91d675
--- /dev/null
+++ b/htdocs/reception/dispatch.php
@@ -0,0 +1,1135 @@
+
+ * Copyright (C) 2004-2016 Laurent Destailleur
+ * Copyright (C) 2005 Eric Seigne
+ * Copyright (C) 2005-2009 Regis Houssin
+ * Copyright (C) 2010-2021 Juanjo Menent
+ * Copyright (C) 2014 Cedric Gross
+ * Copyright (C) 2016 Florian Henry
+ * Copyright (C) 2017-2022 Ferran Marcet
+ * Copyright (C) 2018-2022 Frédéric France
+ * Copyright (C) 2019-2020 Christophe Battarel
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+/**
+ * \file htdocs/fourn/commande/dispatch.php
+ * \ingroup commande
+ * \brief Page to dispatch receiving
+ */
+
+// Load Dolibarr environment
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/reception.lib.php';
+
+
+if (isModEnabled('project')) {
+ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+}
+
+// Load translation files required by the page
+$langs->loadLangs(array("bills", "orders", "sendings", "companies", "deliveries", "products", "stocks", "receptions"));
+
+if (isModEnabled('productbatch')) {
+ $langs->load('productbatch');
+}
+
+ // Security check
+$id = GETPOST("id", 'int');
+$ref = GETPOST('ref');
+$lineid = GETPOST('lineid', 'int');
+$action = GETPOST('action', 'aZ09');
+$fk_default_warehouse = GETPOST('fk_default_warehouse', 'int');
+$cancel = GETPOST('cancel', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
+
+if ($user->socid) {
+ $socid = $user->socid;
+}
+
+$hookmanager->initHooks(array('ordersupplierdispatch'));
+
+// Recuperation de l'id de projet
+$projectid = 0;
+if (GETPOSTISSET("projectid")) {
+ $projectid = GETPOST("projectid", 'int');
+}
+
+$object = new Reception($db);
+
+if ($id > 0 || !empty($ref)) {
+ $result = $object->fetch($id, $ref);
+ if ($result < 0) {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
+ $result = $object->fetch_thirdparty();
+ if ($result < 0) {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
+ if (!empty($object->origin)) {
+ $origin = $object->origin;
+
+ $object->fetch_origin();
+ $typeobject = $object->origin;
+ }
+ if ($origin == 'order_supplier' && $object->$typeobject->id && (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || isModEnabled("supplier_order"))) {
+ $origin_id = $object->$typeobject->id;
+ $objectsrc = new CommandeFournisseur($db);
+ $objectsrc->fetch($object->$typeobject->id);
+ }
+}
+
+if (empty($conf->reception->enabled)) {
+ $permissiontoreceive = $user->rights->fournisseur->commande->receptionner;
+ $permissiontocontrol = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande->receptionner)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande_advance->check)));
+} else {
+ $permissiontoreceive = $user->rights->reception->creer;
+ $permissiontocontrol = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate)));
+}
+
+// $id is id of a purchase order.
+$result = restrictedArea($user, 'fournisseur', $object, 'reception');
+
+if (!isModEnabled('stock')) {
+ accessforbidden();
+}
+
+$usercancreate = $user->rights->reception->creer;
+$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php
+
+
+/*
+ * Actions
+ */
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+ setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+// Update a dispatched line
+if ($action == 'updatelines' && $permissiontoreceive) {
+ $db->begin();
+ $error = 0;
+
+ $supplierorderdispatch = new CommandeFournisseurDispatch($db);
+ $pos = 0;
+
+ foreach ($_POST as $key => $value) {
+ // without batch module enabled
+ $reg = array();
+ if (preg_match('/^product_.*([0-9]+)_([0-9]+)$/i', $key, $reg)) {
+ $pos++;
+ if (preg_match('/^product_([0-9]+)_([0-9]+)$/i', $key, $reg)) {
+ $modebatch = "barcode";
+ } elseif (preg_match('/^product_batch_([0-9]+)_([0-9]+)$/i', $key, $reg)) { // With batchmode enabled
+ $modebatch = "batch";
+ }
+
+ $numline = $pos;
+ if ($modebatch == "barcode") {
+ $prod = "product_".$reg[1].'_'.$reg[2];
+ } else {
+ $prod = 'product_batch_'.$reg[1].'_'.$reg[2];
+ }
+ $qty = "qty_".$reg[1].'_'.$reg[2];
+ $ent = "entrepot_".$reg[1].'_'.$reg[2];
+ $pu = "pu_".$reg[1].'_'.$reg[2]; // This is unit price including discount
+ $fk_commandefourndet = "fk_commandefourndet_".$reg[1].'_'.$reg[2];
+ $idline = GETPOST("idline_".$reg[1].'_'.$reg[2]);
+ $lot = '';
+ $dDLUO = '';
+ $dDLC = '';
+ if ($modebatch == "batch") {
+ $lot = GETPOST('lot_number_'.$reg[1].'_'.$reg[2]);
+ $dDLUO = dol_mktime(12, 0, 0, GETPOST('dluo_'.$reg[1].'_'.$reg[2].'month', 'int'), GETPOST('dluo_'.$reg[1].'_'.$reg[2].'day', 'int'), GETPOST('dluo_'.$reg[1].'_'.$reg[2].'year', 'int'));
+ $dDLC = dol_mktime(12, 0, 0, GETPOST('dlc_'.$reg[1].'_'.$reg[2].'month', 'int'), GETPOST('dlc_'.$reg[1].'_'.$reg[2].'day', 'int'), GETPOST('dlc_'.$reg[1].'_'.$reg[2].'year', 'int'));
+ }
+
+ if (!empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
+ if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
+ $dto = GETPOST("dto_".$reg[1].'_'.$reg[2], 'int');
+ if (!empty($dto)) {
+ $unit_price = price2num(GETPOST("pu_".$reg[1]) * (100 - $dto) / 100, 'MU');
+ }
+ $saveprice = "saveprice_".$reg[1].'_'.$reg[2];
+ }
+ }
+
+ // We ask to move a qty
+ if (($modebatch == "batch" && GETPOST($qty) > 0) || ($modebatch == "barcode" && GETPOST($qty) != 0)) {
+ if (!(GETPOST($ent, 'int') > 0)) {
+ dol_syslog('No dispatch for line '.$key.' as no warehouse was chosen.');
+ $text = $langs->transnoentities('Warehouse').', '.$langs->transnoentities('Line').' '.($numline);
+ setEventMessages($langs->trans('ErrorFieldRequired', $text), null, 'errors');
+ $error++;
+ }
+
+ if (!$error) {
+ if ($idline > 0) {
+ $result = $supplierorderdispatch->fetch($idline);
+ if ($result < 0) {
+ setEventMessages($supplierorderdispatch->error, $supplierorderdispatch->errors, 'errors');
+ $error++;
+ } else {
+ $qtystart = $supplierorderdispatch->qty;
+ $supplierorderdispatch->qty = GETPOST($qty);
+ $supplierorderdispatch->fk_entrepot = GETPOST($ent, 'int');
+ if ($modebatch == "batch") {
+ $supplierorderdispatch->eatby = $dDLUO;
+ $supplierorderdispatch->sellby = $dDLC;
+ }
+
+ $result = $supplierorderdispatch->update($user);
+ if ($result < 0) {
+ setEventMessages($supplierorderdispatch->error, $supplierorderdispatch->errors, 'errors');
+ $error++;
+ }
+
+ // If module stock is enabled and the stock increase is done on purchase order dispatching
+ if (!$error && GETPOST($ent, 'int') > 0 && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
+ $mouv = new MouvementStock($db);
+ $product = GETPOST($prod, 'int');
+ $entrepot = GETPOST($ent, 'int');
+ $qtymouv = GETPOST($qty) - $qtystart;
+ $price = GETPOST($pu);
+ $comment = GETPOST('comment');
+ $inventorycode = dol_print_date(dol_now(), 'dayhourlog');
+ $now = dol_now();
+ $eatby = '';
+ $sellby = '';
+ $batch = '';
+ if ($modebatch == "batch") {
+ $eatby = $dDLUO;
+ $sellby = $dDLC;
+ $batch = $supplierorderdispatch->batch;
+ }
+ if ($product > 0) {
+ // $price should take into account discount (except if option STOCK_EXCLUDE_DISCOUNT_FOR_PMP is on)
+ $mouv->origin = $objectsrc;
+ $mouv->setOrigin($objectsrc->element, $objectsrc->id);
+
+ // Method change if qty < 0
+ if (!empty($conf->global->SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN) && $qtymouv < 0) {
+ $result = $mouv->livraison($user, $product, $entrepot, $qtymouv*(-1), $price, $comment, $now, $eatby, $sellby, $batch, 0, $inventorycode);
+ } else {
+ $result = $mouv->reception($user, $product, $entrepot, $qtymouv, $price, $comment, $eatby, $sellby, $batch, '', 0, $inventorycode);
+ }
+
+ if ($result < 0) {
+ setEventMessages($mouv->error, $mouv->errors, 'errors');
+ $error++;
+ }
+ }
+ }
+ }
+ } else {
+ $result = $objectsrc->dispatchProduct($user, GETPOST($prod, 'int'), GETPOST($qty), GETPOST($ent, 'int'), GETPOST($pu), GETPOST('comment'), $dDLUO, $dDLC, $lot, GETPOST($fk_commandefourndet, 'int'), 0, $object->id);
+ if ($result < 0) {
+ setEventMessages($objectsrc->error, $objectsrc->errors, 'errors');
+ $error++;
+ }
+ }
+
+ if (!$error && !empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
+ if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
+ $dto = price2num(GETPOST("dto_".$reg[1].'_'.$reg[2], 'int'), '');
+ if (empty($dto)) {
+ $dto = 0;
+ }
+
+ //update supplier price
+ if (GETPOSTISSET($saveprice)) {
+ // TODO Use class
+ $sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price";
+ $sql .= " SET unitprice='".price2num(GETPOST($pu), 'MU')."'";
+ $sql .= ", price=".price2num(GETPOST($pu), 'MU')."*quantity";
+ $sql .= ", remise_percent = ".((float) $dto);
+ $sql .= " WHERE fk_soc=".((int) $object->socid);
+ $sql .= " AND fk_product=".((int) GETPOST($prod, 'int'));
+
+ $resql = $db->query($sql);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ if ($error > 0) {
+ $db->rollback();
+ setEventMessages($error, $errors, 'errors');
+ } else {
+ $db->commit();
+ setEventMessages($langs->trans("ReceptionUpdated"), null);
+ }
+}
+
+
+/*
+ * View
+ */
+
+$now = dol_now();
+
+$form = new Form($db);
+$formproduct = new FormProduct($db);
+$warehouse_static = new Entrepot($db);
+$supplierorderdispatch = new CommandeFournisseurDispatch($db);
+
+$title = $object->ref." - ".$langs->trans('OrderDispatch');
+$help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
+$morejs = array('/fourn/js/lib_dispatch.js.php');
+
+llxHeader('', $title, $help_url, '', 0, 0, $morejs);
+
+if ($id > 0 || !empty($ref)) {
+ if (!empty($object->origin) && $object->origin_id > 0) {
+ $object->origin = 'CommandeFournisseur';
+ $typeobject = $object->origin;
+ $origin = $object->origin;
+ $origin_id = $object->origin_id;
+ $object->fetch_origin(); // Load property $object->commande, $object->propal, ...
+ }
+ $soc = new Societe($db);
+ $soc->fetch($object->socid);
+
+ $author = new User($db);
+ $author->fetch($object->user_author_id);
+
+ $head = reception_prepare_head($object);
+
+ $title = $langs->trans("SupplierOrder");
+ print dol_get_fiche_head($head, 'dispatch', $langs->trans("Reception"), -1, 'dollyrevert');
+
+
+ $formconfirm = '';
+
+ // Confirmation to delete line
+ if ($action == 'ask_deleteline') {
+ $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
+ }
+
+ // Call Hook formConfirm
+ $parameters = array('lineid' => $lineid);
+ // Note that $action and $object may be modified by hook
+ $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action);
+ if (empty($reshook)) {
+ $formconfirm .= $hookmanager->resPrint;
+ } elseif ($reshook > 0) {
+ $formconfirm = $hookmanager->resPrint;
+ }
+
+ // Print form confirm
+ print $formconfirm;
+
+ // Reception card
+ $linkback = ''.$langs->trans("BackToList").' ';
+ $morehtmlref = '';
+ // Ref customer reception
+
+ $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1);
+ $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
+
+ // Thirdparty
+ $morehtmlref .= '
'.$object->thirdparty->getNomUrl(1);
+ // Project
+ if (!empty($conf->project->enabled)) {
+ $langs->load("projects");
+ $morehtmlref .= '
';
+ if (0) { // Do not change on reception
+ $morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');
+ if ($action != 'classify' && $permissiontoadd) {
+ $morehtmlref .= '
'.img_edit($langs->transnoentitiesnoconv('SetProject')).' ';
+ }
+ $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+ } else {
+ if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
+ $proj = new Project($db);
+ $proj->fetch($objectsrc->fk_project);
+ $morehtmlref .= $proj->getNomUrl(1);
+ if ($proj->title) {
+ $morehtmlref .= '
- '.dol_escape_htmltag($proj->title).' ';
+ }
+ }
+ }
+ }
+ $morehtmlref .= '
';
+
+ dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+
+ print '';
+ print '
';
+
+ print '
';
+
+ // Linked documents
+ if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
+ print '';
+ print $langs->trans("RefOrder").' ';
+ print '';
+ print $objectsrc->getNomUrl(1, 'commande');
+ print " \n";
+ print ' ';
+ }
+ if ($typeobject == 'propal' && $object->$typeobject->id && isModEnabled("propal")) {
+ print '';
+ print $langs->trans("RefProposal").' ';
+ print '';
+ print $objectsrc->getNomUrl(1, 'reception');
+ print " \n";
+ print ' ';
+ }
+ if ($typeobject == 'CommandeFournisseur' && $object->$typeobject->id && isModEnabled("propal")) {
+ print '';
+ print $langs->trans("SupplierOrder").' ';
+ print '';
+ print $objectsrc->getNomUrl(1, 'reception');
+ print " \n";
+ print ' ';
+ }
+
+ // Date creation
+ print ''.$langs->trans("DateCreation").' ';
+ print ''.dol_print_date($object->date_creation, "dayhour", "tzuserrel")." \n";
+ print ' ';
+
+ // Delivery date planned
+ print '';
+ print '';
+ print $langs->trans('DateDeliveryPlanned');
+ print ' ';
+ print '
';
+ print ' ';
+ print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : ' ';
+ print ' ';
+ print ' ';
+ print '
';
+ print '
';
+ print ''.img_picto("", 'eraser', 'class="pictofixedwidth"').$langs->trans("ResetQtyToDispatch").' ';
+ print ''.img_picto("", 'eraser', 'class="pictofixedwidth"').$langs->trans("Reset").' ';
+ print '';
+
+ print ' ';
+ $disabled = 0; // This is used to disable or not the bulk selection of target warehouse. No reason to have it disabled so forced to 0.
+
+ if ($object->statut == Reception::STATUS_DRAFT) {
+ require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+ $formproduct = new FormProduct($db);
+ $formproduct->loadWarehouses();
+ $entrepot = new Entrepot($db);
+ $listwarehouses = $entrepot->list_array(1);
+
+
+ print '';
+ }
+
+ print dol_get_fiche_end();
+
+ // traitement entrepot par défaut
+ print '';
+}
+
+// End of page
+llxFooter();
+$db->close();