";
+ print '| '.$langs->trans("UseDispatchStatus").' | ';
+ print '';
+ if (! empty($conf->fournisseur->enabled))
+ {
+ print "\n";
+ }
+ else
+ {
+ print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module40Name"));
+ }
+ print " | \n
\n";
+}
$found++;
/*if (! $found)
@@ -446,13 +482,13 @@ print '";
print '| '.$langs->trans("IndependantSubProductStock").' | ';
-
+
print '';
print " |
\n";
$oldfamily = $family;
- }
-
+ }
+
$var = !$var;
print "\n";
print "| ".img_object('', $picto).$langs->trans('desc'.$key);
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index b0b4893d485..1da35108789 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -64,7 +64,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
$newobject->context['createfrompropal'] = 'createfrompropal';
$newobject->context['origin'] = $object->element;
$newobject->context['origin_id'] = $object->id;
-
+
$ret=$newobject->createFromProposal($object);
if ($ret < 0) { $this->error=$newobject->error; $this->errors[]=$newobject->error; }
return $ret;
@@ -83,7 +83,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
$newobject->context['createfromorder'] = 'createfromorder';
$newobject->context['origin'] = $object->element;
$newobject->context['origin_id'] = $object->id;
-
+
$ret=$newobject->createFromOrder($object);
if ($ret < 0) { $this->error=$newobject->error; $this->errors[]=$newobject->error; }
return $ret;
@@ -146,6 +146,59 @@ class InterfaceWorkflowManager extends DolibarrTriggers
}
}
+ // classify supplier order delivery status
+ if ($action == 'ORDER_SUPPLIER_DISPATCH')
+ {
+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
+ if (! empty($conf->commande->enabled) && ! empty($conf->fournisseur->enabled) && ! empty($conf->global->WORKFLOW_SUPPLIER_ORDER_CLASSIFY_RECEIPT_ORDER))
+ {
+ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class.php';
+
+ $qtydelivered=array();
+ $qtywished=array();
+
+ $supplierorderdispatch = new CommandeFournisseurDispatch($this->db);
+ $filter=array('t.fk_commande'=>$object->id);
+ if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) {
+ $filter['t.status']=1;
+ }
+ $ret=$supplierorderdispatch->fetchAll('','',0,0,$filter);
+ if ($ret<0) {
+ $this->error=$supplierorderdispatch->error; $this->errors=$supplierorderdispatch->errors;
+ return $ret;
+ } else {
+ if (is_array($supplierorderdispatch->lines) && count($supplierorderdispatch->lines)>0) {
+ //Build array with quantity deliverd by product
+ foreach($supplierorderdispatch->lines as $line) {
+ $qtydelivered[$line->fk_product]+=$line->qty;
+ }
+ foreach($object->lines as $line) {
+ $qtywished[$line->fk_product]+=$line->qty;
+ }
+ //Compare array
+ $diff_array=array_diff_assoc($qtydelivered,$qtywished);
+ if (count($diff_array)==0) {
+ //No diff => mean everythings is received
+ $ret=$object->setStatus($user,5);
+ if ($ret<0) {
+ $this->error=$object->error; $this->errors=$object->errors;
+ }
+ } else {
+ //Diff => received partially
+ $ret=$object->setStatus($user,4);
+ if ($ret<0) {
+ $this->error=$object->error; $this->errors=$object->errors;
+ }
+ }
+ }
+ }
+
+
+ return $ret;
+ }
+ }
+
return 0;
}
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index 4d6f75444b8..0464a9fb51f 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -34,27 +34,28 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
*/
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
+ public $db; //!< To store db handler
+ public $error; //!< To return error code (or message)
+ public $errors=array(); //!< To return several error codes (or messages)
+ public $element='commandefournisseurdispatch'; //!< Id that identify managed objects
+ public $table_element='commande_fournisseur_dispatch'; //!< Name of table without prefix where object is stored
+ public $lines=array();
- var $id;
+ public $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='';
+ public $fk_commande;
+ public $fk_product;
+ public $fk_commandefourndet;
+ public $qty;
+ public $fk_entrepot;
+ public $fk_user;
+ public $datec='';
+ public $comment;
+ public $status;
+ public $tms='';
+ public $batch;
+ public $eatby='';
+ public $sellby='';
@@ -539,4 +540,100 @@ class CommandeFournisseurDispatch extends CommonObject
}
+ /**
+ * Load object in memory from the database
+ *
+ * @param string $sortorder Sort Order
+ * @param string $sortfield Sort field
+ * @param int $limit offset limit
+ * @param int $offset offset limit
+ * @param array $filter filter array
+ * @param string $filtermode filter mode (AND or OR)
+ *
+ * @return int <0 if KO, >0 if OK
+ */
+ public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
+ {
+ dol_syslog(__METHOD__, LOG_DEBUG);
+
+ $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";
+
+ // Manage filter
+ $sqlwhere = array();
+ if (count($filter) > 0) {
+ foreach ($filter as $key => $value) {
+ if ($key=='t.comment') {
+ $sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+ } elseif ($key=='t.datec' || $key=='t.tms' || $key=='t.eatby' || $key=='t.sellby' || $key=='t.batch') {
+ $sqlwhere [] = $key . ' = \'' . $this->db->escape($value) . '\'';
+ } else {
+ $sqlwhere [] = $key . ' = ' . $this->db->escape($value);
+ }
+ }
+ }
+ if (count($sqlwhere) > 0) {
+ $sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
+ }
+
+ if (!empty($sortfield)) {
+ $sql .= $this->db->order($sortfield,$sortorder);
+ }
+ if (!empty($limit)) {
+ $sql .= ' ' . $this->db->plimit($limit + 1, $offset);
+ }
+ $this->lines = array();
+
+ $resql = $this->db->query($sql);
+ if ($resql) {
+ $num = $this->db->num_rows($resql);
+
+ while ($obj = $this->db->fetch_object($resql)) {
+ $line = new self($this->db);
+
+ $line->id = $obj->rowid;
+
+ $line->fk_commande = $obj->fk_commande;
+ $line->fk_product = $obj->fk_product;
+ $line->fk_commandefourndet = $obj->fk_commandefourndet;
+ $line->qty = $obj->qty;
+ $line->fk_entrepot = $obj->fk_entrepot;
+ $line->fk_user = $obj->fk_user;
+ $line->datec = $this->db->jdate($obj->datec);
+ $line->comment = $obj->comment;
+ $line->status = $obj->status;
+ $line->tms = $this->db->jdate($obj->tms);
+ $line->batch = $obj->batch;
+ $line->eatby = $this->db->jdate($obj->eatby);
+ $line->sellby = $this->db->jdate($obj->sellby);
+
+ $this->lines[$line->id] = $line;
+ }
+ $this->db->free($resql);
+
+ return $num;
+ } else {
+ $this->errors[] = 'Error ' . $this->db->lasterror();
+ dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+
+ return - 1;
+ }
+ }
+
}
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 8ea8ad609d1..10c463f71c4 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -132,3 +132,4 @@ OpenAll=Open for all actions
OpenInternal=Open for internal actions
OpenShipping=Open for shippings
OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang
index 1c59a3651ec..f0634d63841 100644
--- a/htdocs/langs/en_US/workflow.lang
+++ b/htdocs/langs/en_US/workflow.lang
@@ -9,3 +9,4 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_SUPPLIER_ORDER_CLASSIFY_RECEIPT_ORDER=Classify supplier order status to Partially or Totally delivered on manual stock dispatch
\ No newline at end of file
|