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

Merge pull request #21354 from badre-agtaib/new2

Browse Source 
FIX #21204
This commit is contained in:
Laurent Destailleur 2022-07-04 15:30:33 +02:00 committed by GitHub
commit 1c2727e2a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
View File

@ -72,6 +72,11 @@ class InterfaceWorkflowManager extends DolibarrTriggers
if ($action == 'PROPAL_CLOSE_SIGNED') { if ($action == 'PROPAL_CLOSE_SIGNED') {
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
if (!empty($conf->commande->enabled) && !empty($conf->global->WORKFLOW_PROPAL_AUTOCREATE_ORDER)) { if (!empty($conf->commande->enabled) && !empty($conf->global->WORKFLOW_PROPAL_AUTOCREATE_ORDER)) {
$object->fetchObjectLinked();
if (!empty($object->linkedObjectsIds['commande'])) {
setEventMessages($langs->trans("OrderExists"), null, 'warnings');
return $ret;
} else {
include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
$newobject = new Commande($this->db); $newobject = new Commande($this->db);
@ -87,6 +92,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
return $ret; return $ret;
} }
} }
}
// Order to invoice // Order to invoice
if ($action == 'ORDER_CLOSE') { if ($action == 'ORDER_CLOSE') {

1
htdocs/langs/en_US/orders.lang
View File

@ -1,4 +1,5 @@
# Dolibarr language file - Source file is en_US - orders # Dolibarr language file - Source file is en_US - orders
OrderExists=An order was already open linked to this proposal, so no other order was created automatically
OrdersArea=Customers orders area OrdersArea=Customers orders area
SuppliersOrdersArea=Purchase orders area SuppliersOrdersArea=Purchase orders area
OrderCard=Order card OrderCard=Order card