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

Merge remote-tracking branch 'origin/4.0' into develop

Browse Source 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
This commit is contained in:
Laurent Destailleur 2016-09-09 18:35:26 +02:00
commit 4d9abbd710
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,6 +127,7 @@ class CommandeFournisseur extends CommonOrder
public $multicurrency_total_tva; public $multicurrency_total_tva;
public $multicurrency_total_ttc; public $multicurrency_total_ttc;
/** /**
* Constructor * Constructor
* *
@ -619,7 +620,7 @@ class CommandeFournisseur extends CommonOrder
* Returns the following order reference not used depending on the numbering model activated * Returns the following order reference not used depending on the numbering model activated
* defined within COMMANDE_SUPPLIER_ADDON_NUMBER * defined within COMMANDE_SUPPLIER_ADDON_NUMBER
* *
* @param Societe $soc company object * @param Company $soc company object
* @return string free reference for the invoice * @return string free reference for the invoice
*/ */
public function getNextNumRef($soc) public function getNextNumRef($soc)
@ -2748,13 +2749,15 @@ class CommandeFournisseur extends CommonOrder
return $text; return $text;
} }
/** /**
* Calc status regarding dispatch stock * Calc status regarding dispatch stock
* *
* @param User $user User action * @param User $user User action
* @return int <0 si ko, >0 si ok * @return int <0 if KO, 0 if not applicable, >0 if OK
*/ */
public function calcAndSetStatusDispatch(User $user) { public function calcAndSetStatusDispatch(User $user)
{
global $conf; global $conf;
if (! empty($conf->commande->enabled) && ! empty($conf->fournisseur->enabled)) if (! empty($conf->commande->enabled) && ! empty($conf->fournisseur->enabled))
@ -2766,15 +2769,19 @@ class CommandeFournisseur extends CommonOrder
$supplierorderdispatch = new CommandeFournisseurDispatch($this->db); $supplierorderdispatch = new CommandeFournisseurDispatch($this->db);
$filter=array('t.fk_commande'=>$this->id); $filter=array('t.fk_commande'=>$this->id);
if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) { if (! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) {
$filter['t.status']=1; $filter['t.status']=1;
} }
$ret=$supplierorderdispatch->fetchAll('','',0,0,$filter); $ret=$supplierorderdispatch->fetchAll('','',0,0,$filter);
if ($ret<0) { if ($ret<0)
{
$this->error=$supplierorderdispatch->error; $this->errors=$supplierorderdispatch->errors; $this->error=$supplierorderdispatch->error; $this->errors=$supplierorderdispatch->errors;
return $ret; return $ret;
} else { }
if (is_array($supplierorderdispatch->lines) && count($supplierorderdispatch->lines)>0) { else
{
if (is_array($supplierorderdispatch->lines) && count($supplierorderdispatch->lines)>0)
{
//Build array with quantity deliverd by product //Build array with quantity deliverd by product
foreach($supplierorderdispatch->lines as $line) { foreach($supplierorderdispatch->lines as $line) {
$qtydelivered[$line->fk_product]+=$line->qty; $qtydelivered[$line->fk_product]+=$line->qty;
@ -2784,25 +2791,29 @@ class CommandeFournisseur extends CommonOrder
} }
//Compare array //Compare array
$diff_array=array_diff_assoc($qtydelivered,$qtywished); $diff_array=array_diff_assoc($qtydelivered,$qtywished);
if (count($diff_array)==0) { if (count($diff_array)==0)
{
//No diff => mean everythings is received //No diff => mean everythings is received
$ret=$this->setStatus($user,5); $ret=$this->setStatus($user,5);
if ($ret<0) { if ($ret<0) {
$this->error=$object->error; $this->errors=$object->errors; $this->error=$object->error; $this->errors=$object->errors;
} }
} else { return 5;
}
else
{
//Diff => received partially //Diff => received partially
$ret=$this->setStatus($user,4); $ret=$this->setStatus($user,4);
if ($ret<0) { if ($ret<0) {
$this->error=$object->error; $this->errors=$object->errors; $this->error=$object->error; $this->errors=$object->errors;
} }
return 4;
} }
} }
return 1;
} }
return 1;
} }
return 0;
} }
} }