diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 17adfc778c9..f91ac34a19a 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -411,7 +411,7 @@ if ($_POST['action'] == 'send') $subject = $langs->trans('Order').' '.$commande->ref; } - $actiontypeid=3; + $actiontypeid=8; $actionmsg ='Mail envoyé par '.$from.' à '.$sendto.'.
'; if ($message) diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang index b983a92deba..f78817158f4 100644 --- a/htdocs/langs/en_US/commercial.lang +++ b/htdocs/langs/en_US/commercial.lang @@ -63,4 +63,5 @@ ActionAC_RDV=Rendez-vous ActionAC_FAC=Send billing ActionAC_REL=Send billing (reminder) ActionAC_CLO=Clôture -ActionAC_EMAILING=Send mass emailing \ No newline at end of file +ActionAC_EMAILING=Send mass emailing +ActionAC_COM=Envoi commande par mail \ No newline at end of file diff --git a/htdocs/langs/fr_FR/commercial.lang b/htdocs/langs/fr_FR/commercial.lang index 9424c0c3f06..8f9fcdd2205 100644 --- a/htdocs/langs/fr_FR/commercial.lang +++ b/htdocs/langs/fr_FR/commercial.lang @@ -64,3 +64,4 @@ ActionAC_FAC=Envoi facture par mail ActionAC_REL=Relance facture par mail ActionAC_CLO=Close ActionAC_EMAILING=Envoi mailing masse +ActionAC_COM=Envoi commande par mail diff --git a/mysql/data/data.sql b/mysql/data/data.sql index 4e49d60a34b..6dc88e27d51 100644 --- a/mysql/data/data.sql +++ b/mysql/data/data.sql @@ -314,6 +314,7 @@ insert into llx_c_actioncomm (id, code, type, libelle) values ( 2, 'AC_FAX', 's insert into llx_c_actioncomm (id, code, type, libelle) values ( 3, 'AC_PROP', 'system', 'Envoi Proposition'); insert into llx_c_actioncomm (id, code, type, libelle) values ( 4, 'AC_EMAIL','system', 'Envoi Email'); insert into llx_c_actioncomm (id, code, type, libelle) values ( 5, 'AC_RDV', 'system', 'Prendre rendez-vous'); +insert into llx_c_actioncomm (id, code, type, libelle) values ( 8, 'AC_COM', 'system', 'Envoi Commande'); insert into llx_c_actioncomm (id, code, type, libelle) values ( 9, 'AC_FAC', 'system', 'Envoi Facture'); insert into llx_c_actioncomm (id, code, type, libelle) values (10, 'AC_REL', 'system', 'Relance effectuée'); insert into llx_c_actioncomm (id, code, type, libelle) values (11, 'AC_CLO', 'system', 'Clôture'); diff --git a/mysql/migration/2.0.0-2.1.0.sql b/mysql/migration/2.0.0-2.1.0.sql index d50f7183fbc..e20f5c989ec 100644 --- a/mysql/migration/2.0.0-2.1.0.sql +++ b/mysql/migration/2.0.0-2.1.0.sql @@ -293,4 +293,5 @@ alter table llx_facture add column model_pdf varchar(50) after note_public; update llx_societe_remise_except set description='Remise sans description' where description is NULL or description =''; alter table llx_societe_remise_except modify description varchar(255) NOT NULL; -insert into llx_c_actioncomm (id, code, type, libelle) values ( 8, 'AC_COM', 'system', 'Envoi Commande'); \ No newline at end of file +insert into llx_c_actioncomm (id, code, type, libelle) values ( 8, 'AC_COM', 'system', 'Envoi Commande'); +update llx_actioncomm set fk_action = '8' where fk_action = '3' and label = 'Envoi commande par mail' \ No newline at end of file