';
+ if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ {
+ $selected = 0;
+ if (in_array($obj->id, $arrayofselected)) $selected = 1;
+ print '';
+ }
+ print '
';
print "\n";
$i++;
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index c285f560678..b5000925672 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -1052,11 +1052,11 @@ class pdf_azur extends ModelePDFPropales
* Show total to pay
*
* @param PDF $pdf Object PDF
- * @param Facture $object Object invoice
- * @param int $deja_regle Montant deja regle
- * @param int $posy Position depart
+ * @param Propal $object Object propal
+ * @param int $deja_regle Amount already paid
+ * @param int $posy Start position
* @param Translate $outputlangs Objet langs
- * @return int Position pour suite
+ * @return int Position for continuation
*/
protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
{
@@ -1068,7 +1068,7 @@ class pdf_azur extends ModelePDFPropales
$tab2_hl = 4;
$pdf->SetFont('', '', $default_font_size - 1);
- // Tableau total
+ // Total table
$col1x = 120; $col2x = 170;
if ($this->page_largeur < 210) // To work with US executive format
{
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 999bde3fb32..a0501c3dd99 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -56,6 +56,7 @@ $search_ref_exp = GETPOST("search_ref_exp", 'alpha');
$search_ref_liv = GETPOST('search_ref_liv', 'alpha');
$search_ref_customer = GETPOST('search_ref_customer', 'alpha');
$search_company = GETPOST("search_company", 'alpha');
+$search_tracking = GETPOST("search_tracking", 'alpha');
$search_town = GETPOST('search_town', 'alpha');
$search_zip = GETPOST('search_zip', 'alpha');
$search_state = trim(GETPOST("search_state"));
@@ -106,6 +107,7 @@ $fieldstosearchall = array(
'e.ref'=>"Ref",
's.nom'=>"ThirdParty",
'e.note_public'=>'NotePublic',
+ 'e.tracking_number'=>"TrackingNumber",
);
if (empty($user->socid)) $fieldstosearchall["e.note_private"] = "NotePrivate";
@@ -120,6 +122,7 @@ $arrayfields = array(
'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers),
'e.date_delivery'=>array('label'=>$langs->trans("DateDeliveryPlanned"), 'checked'=>1),
+ 'e.tracking_number'=>array('label'=>$langs->trans("TrackingNumber"), 'checked'=>1),
'e.weight'=>array('label'=>$langs->trans("Weight"), 'checked'=>0),
'e.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
'e.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
@@ -172,6 +175,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
$search_state = "";
$search_type = '';
$search_country = '';
+ $search_tracking='';
$search_type_thirdparty = '';
$search_billed = '';
$search_datedelivery_start = '';
@@ -214,7 +218,7 @@ llxHeader('', $langs->trans('ListOfSendings'), $helpurl);
$sql = 'SELECT';
if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
-$sql .= " e.rowid, e.ref, e.ref_customer, e.date_expedition as date_expedition, e.weight, e.weight_units, e.date_delivery as date_livraison, l.date_delivery as date_reception, e.fk_statut, e.billed,";
+$sql .= " e.rowid, e.ref, e.ref_customer, e.date_expedition as date_expedition, e.weight, e.weight_units, e.date_delivery as date_livraison, l.date_delivery as date_reception, e.fk_statut, e.billed, e.tracking_number,";
$sql .= " s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, ";
$sql .= " typent.code as typent_code,";
$sql .= " state.code_departement as state_code, state.nom as state_name,";
@@ -273,6 +277,7 @@ if ($search_town) $sql .= natural_search('s.town', $search_town);
if ($search_zip) $sql .= natural_search("s.zip", $search_zip);
if ($search_state) $sql .= natural_search("state.nom", $search_state);
if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
+if ($search_tracking) $sql.= natural_search("e.tracking_number", $search_tracking);
if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
if ($search_sale > 0) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;
if ($search_ref_exp) $sql .= natural_search('e.ref', $search_ref_exp);
@@ -330,6 +335,7 @@ if ($resql)
if ($search_user > 0) $param .= '&search_user='.urlencode($search_user);
if ($search_sale > 0) $param .= '&search_sale='.urlencode($search_sale);
if ($search_company) $param .= "&search_company=".urlencode($search_company);
+ if ($search_tracking) $param.= "&search_tracking=".urlencode($search_tracking);
if ($search_town) $param .= '&search_town='.urlencode($search_town);
if ($search_zip) $param .= '&search_zip='.urlencode($search_zip);
@@ -507,6 +513,13 @@ if ($resql)
print '';
print '';
}
+ // Tracking number
+ if (! empty($arrayfields['e.tracking_number']['checked']))
+ {
+ print '
';
+ print '';
+ print '
';
+ }
if (!empty($arrayfields['l.ref']['checked']))
{
// Delivery ref
@@ -579,6 +592,7 @@ if ($resql)
if (!empty($arrayfields['typent.code']['checked'])) print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
if (!empty($arrayfields['e.weight']['checked'])) print_liste_field_titre($arrayfields['e.weight']['label'], $_SERVER["PHP_SELF"], "e.weight", "", $param, '', $sortfield, $sortorder, 'center ');
if (!empty($arrayfields['e.date_delivery']['checked'])) print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"], "e.date_delivery", "", $param, '', $sortfield, $sortorder, 'center ');
+ if (! empty($arrayfields['e.tracking_number']['checked'])) print_liste_field_titre($arrayfields['e.tracking_number']['label'], $_SERVER["PHP_SELF"], "e.tracking_number", "", $param, '', $sortfield, $sortorder, 'center ');
if (!empty($arrayfields['l.ref']['checked'])) print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"], "l.ref", "", $param, '', $sortfield, $sortorder);
if (!empty($arrayfields['l.date_delivery']['checked'])) print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"], "l.date_delivery", "", $param, '', $sortfield, $sortorder, 'center ');
// Extra fields
@@ -706,6 +720,12 @@ if ($resql)
}*/
print "\n";
}
+ // Tracking number
+ if (! empty($arrayfields['e.tracking_number']['checked']))
+ {
+ print '
'.$obj->tracking_number."
\n";
+ if (! $i) $totalarray['nbfield']++;
+ }
if (!empty($arrayfields['l.ref']['checked']) || !empty($arrayfields['l.date_delivery']['checked']))
{
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index d132a87233f..088cff61ee6 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -8,7 +8,7 @@
* Copyright (C) 2016 Florian Henry
* Copyright (C) 2017 Ferran Marcet
* Copyright (C) 2018 Frédéric France
- * Copyright (C) 2019 Christophe Battarel
+ * 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
@@ -38,6 +38,8 @@ 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';
+
if (!empty($conf->projet->enabled))
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
@@ -53,6 +55,8 @@ $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;
@@ -366,6 +370,126 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
}
}
+// Remove a dispatched line
+if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->fournisseur->commande->receptionner)
+{
+ $db->begin();
+
+ $supplierorderdispatch = new CommandeFournisseurDispatch($db);
+ $result = $supplierorderdispatch->fetch($lineid);
+ if ($result > 0)
+ {
+ $qty = $supplierorderdispatch->qty;
+ $entrepot = $supplierorderdispatch->fk_entrepot;
+ $product = $supplierorderdispatch->fk_product;
+ $price = GETPOST('price');
+ $comment = $supplierorderdispatch->comment;
+ $eatby = $supplierorderdispatch->fk_product;
+ $sellby = $supplierorderdispatch->sellby;
+ $batch = $supplierorderdispatch->batch;
+
+ $result = $supplierorderdispatch->delete($user);
+ }
+ if ($result < 0)
+ {
+ $errors = $object->errors;
+ $error++;
+ }
+ else
+ {
+ // If module stock is enabled and the stock increase is done on purchase order dispatching
+ if ($entrepot > 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
+ {
+ $mouv = new MouvementStock($db);
+ if ($product > 0)
+ {
+ $mouv->origin = &$object;
+ $result=$mouv->livraison($user, $product, $entrepot, $qty, $price, $comment, '', $eatby, $sellby, $batch);
+ if ($result < 0)
+ {
+ $errors=$mouv->errors;
+ $error++;
+ }
+ }
+ }
+ }
+ if ($error > 0)
+ {
+ $db->rollback();
+ setEventMessages($error, $errors, 'errors');
+ }
+ else
+ {
+ $db->commit();
+ }
+}
+
+// Update a dispatched line
+if ($action == 'updateline' && $user->rights->fournisseur->commande->receptionner)
+{
+ $db->begin();
+ $error = 0;
+
+ $supplierorderdispatch = new CommandeFournisseurDispatch($db);
+ $result = $supplierorderdispatch->fetch($lineid);
+ if ($result > 0)
+ {
+ $qty = $supplierorderdispatch->qty;
+ $entrepot = $supplierorderdispatch->fk_entrepot;
+ $product = $supplierorderdispatch->fk_product;
+ $price = GETPOST('price');
+ $comment = $supplierorderdispatch->comment;
+ $eatby = $supplierorderdispatch->fk_product;
+ $sellby = $supplierorderdispatch->sellby;
+ $batch = $supplierorderdispatch->batch;
+
+ $supplierorderdispatch->qty = GETPOST('qty', 'int');
+ $supplierorderdispatch->fk_entrepot = GETPOST('fk_entrepot');
+ $result = $supplierorderdispatch->update($user);
+ }
+ if ($result < 0)
+ {
+ $error++;
+ $errors=$supplierorderdispatch->errors;
+ }
+ else
+ {
+ // If module stock is enabled and the stock increase is done on purchase order dispatching
+ if ($entrepot > 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
+ {
+ $mouv = new MouvementStock($db);
+ if ($product > 0)
+ {
+ $mouv->origin = &$object;
+ $result=$mouv->livraison($user, $product, $entrepot, $qty, $price, $comment, '', $eatby, $sellby, $batch);
+ if ($result < 0)
+ {
+ $errors=$mouv->errors;
+ $error++;
+ }
+ else
+ {
+ $mouv->origin = &$object;
+ $result=$mouv->reception($user, $product, $supplierorderdispatch->fk_entrepot, $supplierorderdispatch->qty, $price, $comment, $eatby, $sellby, $batch);
+ if ($result < 0)
+ {
+ $errors=$mouv->errors;
+ $error++;
+ }
+ }
+ }
+ }
+ }
+ if ($error > 0)
+ {
+ $db->rollback();
+ setEventMessages($error, $errors, 'errors');
+ }
+ else
+ {
+ $db->commit();
+ }
+}
/*
* View
@@ -379,7 +503,7 @@ $warehouse_static = new Entrepot($db);
$supplierorderdispatch = new CommandeFournisseurDispatch($db);
$help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
-llxHeader('', $langs->trans("Order"), $help_url, '', 0, 0, array('/fourn/js/lib_dispatch.js.php'));
+llxHeader('', $langs->trans("OrderDispatch"), $help_url, '', 0, 0, array('/fourn/js/lib_dispatch.js.php'));
if ($id > 0 || !empty($ref)) {
$soc = new Societe($db);
@@ -393,6 +517,23 @@ if ($id > 0 || !empty($ref)) {
$title = $langs->trans("SupplierOrder");
dol_fiche_head($head, 'dispatch', $title, -1, 'order');
+ $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;
// Supplier order card
@@ -493,6 +634,9 @@ if ($id > 0 || !empty($ref)) {
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);
+
if (empty($conf->reception->enabled))print '