From eb4eededbd37a2689b438b85ae9774834e3409ef Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 24 Feb 2015 11:19:47 +0100
Subject: [PATCH] Add class to manage table commande_fournisseur_dispatch
---
.../fournisseur.commande.dispatch.class.php | 545 ++++++++++++++++++
htdocs/fourn/commande/dispatch.php | 23 +-
.../install/mysql/migration/3.6.0-3.7.0.sql | 2 +-
.../install/mysql/migration/3.7.0-3.8.0.sql | 2 +-
4 files changed, 562 insertions(+), 10 deletions(-)
create mode 100644 htdocs/fourn/class/fournisseur.commande.dispatch.class.php
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
new file mode 100644
index 00000000000..370b61de881
--- /dev/null
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -0,0 +1,545 @@
+<?php
+/* Copyright (C) 2015 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file dev/skeletons/commandefournisseurdispatch.class.php
+ * \ingroup fournisseur stock
+ * \brief This file is an example for a CRUD class file (Create/Read/Update/Delete)
+ * Initialy built by build_class_from_table on 2015-02-24 10:38
+ */
+
+// Put here all includes required by your class file
+require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
+//require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
+//require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
+
+
+/**
+ * Class to manage table commandefournisseurdispatch
+ */
+class CommandeFournisseurDispatch extends CommonObject
+{
+ var $db; //!< To store db handler
+ var $error; //!< To return error code (or message)
+ var $errors=array(); //!< To return several error codes (or messages)
+ var $element='commandefournisseurdispatch'; //!< Id that identify managed objects
+ var $table_element='commande_fournisseur_dispatch'; //!< Name of table without prefix where object is stored
+
+ var $id;
+
+ var $fk_commande;
+ var $fk_product;
+ var $fk_commandefourndet;
+ var $qty;
+ var $fk_entrepot;
+ var $fk_user;
+ var $datec='';
+ var $comment;
+ var $status;
+ var $tms='';
+ var $batch;
+ var $eatby='';
+ var $sellby='';
+
+
+
+
+ /**
+ * Constructor
+ *
+ * @param DoliDb $db Database handler
+ */
+ function __construct($db)
+ {
+ $this->db = $db;
+
+ // List of language codes for status
+ $this->statuts[0] = 'Received';
+ $this->statuts[1] = 'Approved';
+ $this->statuts[2] = 'Denied';
+ $this->statutshort[0] = 'Received';
+ $this->statutshort[1] = 'Approved';
+ $this->statutshort[2] = 'Denied';
+
+ return 1;
+ }
+
+
+ /**
+ * Create object into database
+ *
+ * @param User $user User that creates
+ * @param int $notrigger 0=launch triggers after, 1=disable triggers
+ * @return int <0 if KO, Id of created object if OK
+ */
+ function create($user, $notrigger=0)
+ {
+ global $conf, $langs;
+ $error=0;
+
+ // Clean parameters
+
+ if (isset($this->fk_commande)) $this->fk_commande=trim($this->fk_commande);
+ if (isset($this->fk_product)) $this->fk_product=trim($this->fk_product);
+ if (isset($this->fk_commandefourndet)) $this->fk_commandefourndet=trim($this->fk_commandefourndet);
+ if (isset($this->qty)) $this->qty=trim($this->qty);
+ if (isset($this->fk_entrepot)) $this->fk_entrepot=trim($this->fk_entrepot);
+ if (isset($this->fk_user)) $this->fk_user=trim($this->fk_user);
+ if (isset($this->comment)) $this->comment=trim($this->comment);
+ if (isset($this->status)) $this->status=trim($this->status);
+ if (isset($this->batch)) $this->batch=trim($this->batch);
+
+
+
+ // Check parameters
+ // Put here code to add control on parameters values
+
+ // Insert request
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element."(";
+
+ $sql.= "fk_commande,";
+ $sql.= "fk_product,";
+ $sql.= "fk_commandefourndet,";
+ $sql.= "qty,";
+ $sql.= "fk_entrepot,";
+ $sql.= "fk_user,";
+ $sql.= "datec,";
+ $sql.= "comment,";
+ $sql.= "status,";
+ $sql.= "batch,";
+ $sql.= "eatby,";
+ $sql.= "sellby";
+
+
+ $sql.= ") VALUES (";
+
+ $sql.= " ".(! isset($this->fk_commande)?'NULL':"'".$this->fk_commande."'").",";
+ $sql.= " ".(! isset($this->fk_product)?'NULL':"'".$this->fk_product."'").",";
+ $sql.= " ".(! isset($this->fk_commandefourndet)?'NULL':"'".$this->fk_commandefourndet."'").",";
+ $sql.= " ".(! isset($this->qty)?'NULL':"'".$this->qty."'").",";
+ $sql.= " ".(! isset($this->fk_entrepot)?'NULL':"'".$this->fk_entrepot."'").",";
+ $sql.= " ".(! isset($this->fk_user)?'NULL':"'".$this->fk_user."'").",";
+ $sql.= " ".(! isset($this->datec) || dol_strlen($this->datec)==0?'NULL':"'".$this->db->idate($this->datec)."'").",";
+ $sql.= " ".(! isset($this->comment)?'NULL':"'".$this->db->escape($this->comment)."'").",";
+ $sql.= " ".(! isset($this->status)?'NULL':"'".$this->status."'").",";
+ $sql.= " ".(! isset($this->batch)?'NULL':"'".$this->db->escape($this->batch)."'").",";
+ $sql.= " ".(! isset($this->eatby) || dol_strlen($this->eatby)==0?'NULL':"'".$this->db->idate($this->eatby)."'").",";
+ $sql.= " ".(! isset($this->sellby) || dol_strlen($this->sellby)==0?'NULL':"'".$this->db->idate($this->sellby)."'")."";
+
+
+ $sql.= ")";
+
+ $this->db->begin();
+
+ dol_syslog(__METHOD__, LOG_DEBUG);
+ $resql=$this->db->query($sql);
+ if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+ if (! $error)
+ {
+ $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+
+ if (! $notrigger)
+ {
+ // Uncomment this and change MYOBJECT to your own tag if you
+ // want this action calls a trigger.
+
+ //// Call triggers
+ //$result=$this->call_trigger('MYOBJECT_CREATE',$user);
+ //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+ //// End call triggers
+ }
+ }
+
+ // Commit or rollback
+ if ($error)
+ {
+ foreach($this->errors as $errmsg)
+ {
+ dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+ $this->error.=($this->error?', '.$errmsg:$errmsg);
+ }
+ $this->db->rollback();
+ return -1*$error;
+ }
+ else
+ {
+ $this->db->commit();
+ return $this->id;
+ }
+ }
+
+
+ /**
+ * Load object in memory from the database
+ *
+ * @param int $id Id object
+ * @param string $ref Ref
+ * @return int <0 if KO, >0 if OK
+ */
+ function fetch($id,$ref='')
+ {
+ global $langs;
+ $sql = "SELECT";
+ $sql.= " t.rowid,";
+
+ $sql.= " t.fk_commande,";
+ $sql.= " t.fk_product,";
+ $sql.= " t.fk_commandefourndet,";
+ $sql.= " t.qty,";
+ $sql.= " t.fk_entrepot,";
+ $sql.= " t.fk_user,";
+ $sql.= " t.datec,";
+ $sql.= " t.comment,";
+ $sql.= " t.status,";
+ $sql.= " t.tms,";
+ $sql.= " t.batch,";
+ $sql.= " t.eatby,";
+ $sql.= " t.sellby";
+
+
+ $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+ if ($ref) $sql.= " WHERE t.ref = '".$ref."'";
+ else $sql.= " WHERE t.rowid = ".$id;
+
+ dol_syslog(get_class($this)."::fetch");
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ if ($this->db->num_rows($resql))
+ {
+ $obj = $this->db->fetch_object($resql);
+
+ $this->id = $obj->rowid;
+
+ $this->fk_commande = $obj->fk_commande;
+ $this->fk_product = $obj->fk_product;
+ $this->fk_commandefourndet = $obj->fk_commandefourndet;
+ $this->qty = $obj->qty;
+ $this->fk_entrepot = $obj->fk_entrepot;
+ $this->fk_user = $obj->fk_user;
+ $this->datec = $this->db->jdate($obj->datec);
+ $this->comment = $obj->comment;
+ $this->status = $obj->status;
+ $this->tms = $this->db->jdate($obj->tms);
+ $this->batch = $obj->batch;
+ $this->eatby = $this->db->jdate($obj->eatby);
+ $this->sellby = $this->db->jdate($obj->sellby);
+
+
+ }
+ $this->db->free($resql);
+
+ return 1;
+ }
+ else
+ {
+ $this->error="Error ".$this->db->lasterror();
+ return -1;
+ }
+ }
+
+
+ /**
+ * Update object into database
+ *
+ * @param User $user User that modifies
+ * @param int $notrigger 0=launch triggers after, 1=disable triggers
+ * @return int <0 if KO, >0 if OK
+ */
+ function update($user, $notrigger=0)
+ {
+ global $conf, $langs;
+ $error=0;
+
+ // Clean parameters
+
+ if (isset($this->fk_commande)) $this->fk_commande=trim($this->fk_commande);
+ if (isset($this->fk_product)) $this->fk_product=trim($this->fk_product);
+ if (isset($this->fk_commandefourndet)) $this->fk_commandefourndet=trim($this->fk_commandefourndet);
+ if (isset($this->qty)) $this->qty=trim($this->qty);
+ if (isset($this->fk_entrepot)) $this->fk_entrepot=trim($this->fk_entrepot);
+ if (isset($this->fk_user)) $this->fk_user=trim($this->fk_user);
+ if (isset($this->comment)) $this->comment=trim($this->comment);
+ if (isset($this->status)) $this->status=trim($this->status);
+ if (isset($this->batch)) $this->batch=trim($this->batch);
+
+
+
+ // Check parameters
+ // Put here code to add a control on parameters values
+
+ // Update request
+ $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+
+ $sql.= " fk_commande=".(isset($this->fk_commande)?$this->fk_commande:"null").",";
+ $sql.= " fk_product=".(isset($this->fk_product)?$this->fk_product:"null").",";
+ $sql.= " fk_commandefourndet=".(isset($this->fk_commandefourndet)?$this->fk_commandefourndet:"null").",";
+ $sql.= " qty=".(isset($this->qty)?$this->qty:"null").",";
+ $sql.= " fk_entrepot=".(isset($this->fk_entrepot)?$this->fk_entrepot:"null").",";
+ $sql.= " fk_user=".(isset($this->fk_user)?$this->fk_user:"null").",";
+ $sql.= " datec=".(dol_strlen($this->datec)!=0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
+ $sql.= " comment=".(isset($this->comment)?"'".$this->db->escape($this->comment)."'":"null").",";
+ $sql.= " status=".(isset($this->status)?$this->status:"null").",";
+ $sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
+ $sql.= " batch=".(isset($this->batch)?"'".$this->db->escape($this->batch)."'":"null").",";
+ $sql.= " eatby=".(dol_strlen($this->eatby)!=0 ? "'".$this->db->idate($this->eatby)."'" : 'null').",";
+ $sql.= " sellby=".(dol_strlen($this->sellby)!=0 ? "'".$this->db->idate($this->sellby)."'" : 'null')."";
+
+
+ $sql.= " WHERE rowid=".$this->id;
+
+ $this->db->begin();
+
+ dol_syslog(__METHOD__);
+ $resql = $this->db->query($sql);
+ if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+ if (! $error)
+ {
+ if (! $notrigger)
+ {
+ // Uncomment this and change MYOBJECT to your own tag if you
+ // want this action calls a trigger.
+
+ //// Call triggers
+ //$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+ //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+ //// End call triggers
+ }
+ }
+
+ // Commit or rollback
+ if ($error)
+ {
+ foreach($this->errors as $errmsg)
+ {
+ dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+ $this->error.=($this->error?', '.$errmsg:$errmsg);
+ }
+ $this->db->rollback();
+ return -1*$error;
+ }
+ else
+ {
+ $this->db->commit();
+ return 1;
+ }
+ }
+
+
+ /**
+ * Delete object in database
+ *
+ * @param User $user User that deletes
+ * @param int $notrigger 0=launch triggers after, 1=disable triggers
+ * @return int <0 if KO, >0 if OK
+ */
+ function delete($user, $notrigger=0)
+ {
+ global $conf, $langs;
+ $error=0;
+
+ $this->db->begin();
+
+ if (! $error)
+ {
+ if (! $notrigger)
+ {
+ // Uncomment this and change MYOBJECT to your own tag if you
+ // want this action calls a trigger.
+
+ //// Call triggers
+ //$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+ //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+ //// End call triggers
+ }
+ }
+
+ if (! $error)
+ {
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+ $sql.= " WHERE rowid=".$this->id;
+
+ dol_syslog(__METHOD__);
+ $resql = $this->db->query($sql);
+ if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+ }
+
+ // Commit or rollback
+ if ($error)
+ {
+ foreach($this->errors as $errmsg)
+ {
+ dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+ $this->error.=($this->error?', '.$errmsg:$errmsg);
+ }
+ $this->db->rollback();
+ return -1*$error;
+ }
+ else
+ {
+ $this->db->commit();
+ return 1;
+ }
+ }
+
+
+
+ /**
+ * Load an object from its id and create a new one in database
+ *
+ * @param int $fromid Id of object to clone
+ * @return int New id of clone
+ */
+ function createFromClone($fromid)
+ {
+ global $user,$langs;
+
+ $error=0;
+
+ $object=new Commandefournisseurdispatch($this->db);
+
+ $this->db->begin();
+
+ // Load source object
+ $object->fetch($fromid);
+ $object->id=0;
+ $object->statut=0;
+
+ // Clear fields
+ // ...
+
+ // Create clone
+ $result=$object->create($user);
+
+ // Other options
+ if ($result < 0)
+ {
+ $this->error=$object->error;
+ $error++;
+ }
+
+ if (! $error)
+ {
+
+
+ }
+
+ // End
+ if (! $error)
+ {
+ $this->db->commit();
+ return $object->id;
+ }
+ else
+ {
+ $this->db->rollback();
+ return -1;
+ }
+ }
+
+
+
+ /**
+ * Return label of the status of object
+ *
+ * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto
+ * @return string Label
+ */
+ function getLibStatut($mode=0)
+ {
+ return $this->LibStatut($this->status,$mode);
+ }
+
+ /**
+ * Return label of a status
+ *
+ * @param int $statut Id statut
+ * @param int $mode 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
+ * @return string Label of status
+ */
+ function LibStatut($statut,$mode=0)
+ {
+ global $langs;
+ $langs->load('orders');
+
+ if ($mode == 0)
+ {
+ return $langs->trans($this->statuts[$statut]);
+ }
+ if ($mode == 1)
+ {
+ return $langs->trans($this->statutshort[$statut]);
+ }
+ if ($mode == 2)
+ {
+ return $langs->trans($this->statuts[$statut]);
+ }
+ if ($mode == 3)
+ {
+ if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
+ if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut1');
+ if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut3');
+ if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut5');
+ }
+ if ($mode == 4)
+ {
+ if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
+ if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]);
+ if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]);
+ if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut5').' '.$langs->trans($this->statuts[$statut]);
+ }
+ if ($mode == 5)
+ {
+ if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut0');
+ if ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut1');
+ if ($statut==2) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut3');
+ if ($statut==3) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]),'statut5');
+ }
+ }
+
+
+ /**
+ * Initialise object with example values
+ * Id must be 0 if object instance is a specimen
+ *
+ * @return void
+ */
+ function initAsSpecimen()
+ {
+ $this->id=0;
+
+ $this->fk_commande='';
+ $this->fk_product='';
+ $this->fk_commandefourndet='';
+ $this->qty='';
+ $this->fk_entrepot='';
+ $this->fk_user='';
+ $this->datec='';
+ $this->comment='';
+ $this->status='';
+ $this->tms='';
+ $this->batch='';
+ $this->eatby='';
+ $this->sellby='';
+
+
+ }
+
+}
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index b60914cb7d1..7f4237224b5 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefou
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';
if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
$langs->load('orders');
@@ -106,6 +107,7 @@ if ($_POST["action"] == 'dispatch' && $user->rights->fournisseur->commande->rece
$qty = "qty_".$reg[1]."_".$reg[2];
$ent = "entrepot_".$reg[1]."_".$reg[2];
$pu = "pu_".$reg[1]."_".$reg[2];
+ $fk_commandefourndet = "fk_commandefourndet_".$reg[1]."_".$reg[2];
$lot = "lot_number_".$reg[1]."_".$reg[2];
$dDLUO = dol_mktime(12, 0, 0, $_POST['dluo_'.$reg[1]."_".$reg[2].'month'], $_POST['dluo_'.$reg[1]."_".$reg[2].'day'], $_POST['dluo_'.$reg[1]."_".$reg[2].'year']);
$dDLC = dol_mktime(12, 0, 0, $_POST['dlc_'.$reg[1]."_".$reg[2].'month'], $_POST['dlc_'.$reg[1]."_".$reg[2].'day'], $_POST['dlc_'.$reg[1]."_".$reg[2].'year']);
@@ -129,7 +131,7 @@ if ($_POST["action"] == 'dispatch' && $user->rights->fournisseur->commande->rece
}
else
{
- $result = $commande->dispatchProduct($user, GETPOST($prod,'int'), GETPOST($qty), GETPOST($ent,'int'), GETPOST($pu), GETPOST("comment"), $dDLC, $dDLUO, GETPOST($lot));
+ $result = $commande->dispatchProduct($user, GETPOST($prod,'int'), GETPOST($qty), GETPOST($ent,'int'), GETPOST($pu), GETPOST("comment"), $dDLC, $dDLUO, GETPOST($lot, 'alpha'), GETPOST($fk_commandefourndet, 'int'));
if ($result < 0)
{
setEventMessages($commande->error, $commande->errors, 'errors');
@@ -173,6 +175,11 @@ if ($_POST["action"] == 'dispatch' && $user->rights->fournisseur->commande->rece
* View
*/
+$form = new Form($db);
+$warehouse_static = new Entrepot($db);
+$supplierorderdispatch = new CommandeFournisseurDispatch($db);
+
+
$help_url='EN:CommandeFournisseur';
if (!empty($conf->productbatch->enabled))
{
@@ -183,9 +190,6 @@ else
llxHeader('',$langs->trans("OrderCard"),$help_url);
}
-$form = new Form($db);
-$warehouse_static = new Entrepot($db);
-
$now=dol_now();
$id = GETPOST('id','int');
@@ -282,7 +286,7 @@ if ($id > 0 || ! empty($ref))
print '<input type="hidden" name="action" value="dispatch">';
print '<table class="noborder" width="100%">';
- // Set $products_dispatched with qty dispatech for each product id
+ // Set $products_dispatched with qty dispatched for each product id
$products_dispatched = array();
$sql = "SELECT l.rowid, cfd.fk_product, sum(cfd.qty) as qty";
$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";
@@ -421,6 +425,7 @@ if ($id > 0 || ! empty($ref))
print '<tr '.$bc[$var].' name="dluo'.$suffix.'">';
print '<td>';
+ print '<input name="fk_commandefourndet'.$suffix.'" type="hidden" value="'.$objp->rowid.'">';
print '<input name="product'.$suffix.'" type="hidden" value="'.$objp->fk_product.'">';
print '<input name="pu'.$suffix.'" type="hidden" value="'.$up_ht_disc.'"><!-- This is a up including discount -->';
print '</td>';
@@ -441,8 +446,8 @@ if ($id > 0 || ! empty($ref))
print '<td align="right">';
if (empty($conf->productbatch->enabled) || $objp->tobatch!=1)
{
- print '<input name="product'.$suffix.'" type="hidden" value="'.$objp->fk_product.'">';
print '<input name="fk_commandefourndet'.$suffix.'" type="hidden" value="'.$objp->rowid.'">';
+ print '<input name="product'.$suffix.'" type="hidden" value="'.$objp->fk_product.'">';
print '<input name="pu'.$suffix.'" type="hidden" value="'.$up_ht_disc.'"><!-- This is a up including discount -->';
}
print '<input id="qty'.$suffix.'" name="qty'.$suffix.'" type="text" size="8" value="'.($remaintodispatch).'">';
@@ -578,8 +583,10 @@ if ($id > 0 || ! empty($ref))
// Status
if (! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS))
{
- print '<td>';
- print $objp->status;
+ print '<td align="right">';
+ $supplierorderdispatch->status = (empty($objp->status)?0:$objp->status);
+ //print $supplierorderdispatch->status;
+ print $supplierorderdispatch->getLibStatut(5);
print '</td>';
}
diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
index dc912be4286..2efb6996993 100755
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -1161,4 +1161,4 @@ ALTER TABLE llx_product ADD CONSTRAINT fk_product_barcode_type FOREIGN KEY (fk_b
UPDATE llx_bank_url set url = REPLACE( url, 'fiche.php', 'card.php');
-- Add id commandefourndet in llx_commande_fournisseur_dispatch to correct /fourn/commande/dispatch.php display when several times same product in supplier order
-ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN fk_commandefourndet INT(11) NOT NULL DEFAULT '0' AFTER fk_product;
+ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN fk_commandefourndet INTEGER NOT NULL DEFAULT 0 AFTER fk_product;
diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
index fb644e5b9a7..289d9dae36b 100755
--- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
+++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
@@ -22,7 +22,7 @@
ALTER TABLE llx_commande_fournisseur MODIFY COLUMN date_livraison datetime;
-- Add id commandefourndet in llx_commande_fournisseur_dispatch to correct /fourn/commande/dispatch.php display when several times same product in supplier order
-ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN fk_commandefourndet INT(11) NOT NULL DEFAULT '0' AFTER fk_product;
+ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN fk_commandefourndet INTEGER NOT NULL DEFAULT 0 AFTER fk_product;
-- Remove menu entries of removed or renamed modules
--
GitLab