'."\n";
print ' | ';
- if ($family == 'create') print $langs->trans("AutomaticCreation");
- elseif ($family == 'classify') print $langs->trans("AutomaticClassification");
- else print $langs->trans("Description");
+ if ($family == 'create')
+ {
+ print $langs->trans("AutomaticCreation");
+ }
+ elseif (preg_match('/classify_(.*)/', $family, $reg))
+ {
+ print $langs->trans("AutomaticClassification");
+ if ($reg[1] == 'proposal') print ' - '.$langs->trans('Proposal');
+ if ($reg[1] == 'order') print ' - '.$langs->trans('Order');
+ if ($reg[1] == 'supplier_proposal') print ' - '.$langs->trans('SupplierProposal');
+ if ($reg[1] == 'supplier_order') print ' - '.$langs->trans('SupplierOrder');
+ }
+ else
+ {
+ print $langs->trans("Description");
+ }
print ' | ';
print ' '.$langs->trans("Status").' | ';
print "
\n";
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index c25e1ae9ad7..3c9880ef4ec 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -167,7 +167,58 @@ class InterfaceWorkflowManager extends DolibarrTriggers
}
return $ret;
}
+ }
+ // classify billed order & billed propososal
+ if ($action == 'BILL_SUPPLIER_VALIDATE')
+ {
+ dol_syslog( "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id );
+
+ // First classify billed the order to allow the proposal classify process
+ if (! empty($conf->fournisseur->commande->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER))
+ {
+ $object->fetchObjectLinked('','order_supplier',$object->id,$object->element);
+ if (! empty($object->linkedObjects))
+ {
+ $totalonlinkedelements=0;
+ foreach($object->linkedObjects['order_supplier'] as $element)
+ {
+ if ($element->statut == CommandeFournisseur::STATUS_ACCEPTED || $element->statut == CommandeFournisseur::STATUS_ORDERSENT || $element->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY || $element->statut == CommandeFournisseur::STATUS_RECEIVED_COMPLETELY) $totalonlinkedelements += $element->total_ht;
+ }
+ dol_syslog( "Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
+ if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
+ {
+ foreach($object->linkedObjects['order_supplier'] as $element)
+ {
+ $ret=$element->classifyBilled($user);
+ }
+ }
+ }
+ return $ret;
+ }
+
+ // Second classify billed the proposal.
+ if (! empty($conf->supplier_proposal->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_SUPPLIER_PROPOSAL))
+ {
+ $object->fetchObjectLinked('','supplier_proposal',$object->id,$object->element);
+ if (! empty($object->linkedObjects))
+ {
+ $totalonlinkedelements=0;
+ foreach($object->linkedObjects['supplier_proposal'] as $element)
+ {
+ if ($element->statut == SupplierProposal::STATUS_SIGNED || $element->statut == SupplierProposal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
+ }
+ dol_syslog( "Amount of linked supplier proposals = ".$totalonlinkedelements.", of supplier invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
+ if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
+ {
+ foreach($object->linkedObjects['supplier_proposal'] as $element)
+ {
+ $ret=$element->classifyBilled($user);
+ }
+ }
+ }
+ return $ret;
+ }
}
// Invoice classify billed order
diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang
index a477790b01b..eba04cc44d1 100644
--- a/htdocs/langs/en_US/workflow.lang
+++ b/htdocs/langs/en_US/workflow.lang
@@ -7,11 +7,14 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after
descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
-# Autoclassify
+# Autoclassify customer proposal or order
descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify supplier order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
AutomaticCreation=Automatic creation
AutomaticClassification=Automatic classification
\ No newline at end of file