From 50548601ce74fdbf09a20f477d7d81d46939a09a Mon Sep 17 00:00:00 2001 From: simnandez Date: Sat, 6 Apr 2013 08:20:57 +0200 Subject: [PATCH 1/5] Resolve conflicts --- htdocs/fichinter/fiche.php | 2 +- htdocs/install/mysql/data/llx_c_action_trigger.sql | 3 ++- htdocs/install/mysql/migration/3.3.0-3.4.0.sql | 1 + htdocs/langs/ca_ES/other.lang | 1 + htdocs/langs/en_US/other.lang | 1 + htdocs/langs/es_ES/other.lang | 1 + htdocs/langs/fr_FR/other.lang | 1 + 7 files changed, 8 insertions(+), 2 deletions(-) diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index fe8d9879065..e355ebd0c96 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -672,7 +672,7 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA { if (strlen(GETPOST('subject','alphs'))) $subject = GETPOST('subject','alpha'); else $subject = $langs->transnoentities('Intervention').' '.$object->ref; - $actiontypecode='AC_FICH'; + $actiontypecode='AC_OTH_AUTO'; $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n"; if ($message) { diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index c963cd74d8e..64f21465797 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -5,7 +5,7 @@ -- Copyright (C) 2004 Guillaume Delecourt -- Copyright (C) 2005-2011 Regis Houssin -- Copyright (C) 2007 Patrick Raguin --- Copyright (C) 2010 Juanjo Menent +-- Copyright (C) 2010-2013 Juanjo Menent -- Copyright (C) 2013 Cedric Gross -- -- This program is free software; you can redistribute it and/or modify @@ -56,3 +56,4 @@ insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (26,'MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',24); insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (27,'MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',25); insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (28,'BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10); +insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (29,'FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',29); diff --git a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql index 348698972e9..f1bbc743e2b 100755 --- a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql +++ b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql @@ -227,3 +227,4 @@ ALTER TABLE llx_socpeople ADD COLUMN ref_ext varchar(128) after entity; ALTER TABLE llx_socpeople ADD COLUMN note_public text after note; ALTER TABLE llx_societe ADD COLUMN note_public text after note; +INSERT INTO llx_c_action_trigger (rowid,code,label,description,elementtype,rang) VALUES (29,'FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',29); diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang index ae3011ed7f5..1733844ab4a 100644 --- a/htdocs/langs/ca_ES/other.lang +++ b/htdocs/langs/ca_ES/other.lang @@ -11,6 +11,7 @@ DateToBirth=Data de naiximent BirthdayAlertOn=alerta aniversari activada BirthdayAlertOff=alerta aniversari desactivada Notify_FICHINTER_VALIDATE=Validació fitxa intervenció +Notify_FICHINTER_SENTBYMAIL=Enviament fitxa intervenció per e-mail Notify_BILL_VALIDATE=Validació factura Notify_BILL_UNVALIDATE=Devalidació factura a client Notify_ORDER_SUPPLIER_APPROVE=Aprovació comanda a proveïdor diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index b7885a8ca09..6a350078731 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -11,6 +11,7 @@ DateToBirth=Date to birth BirthdayAlertOn= birthday alert active BirthdayAlertOff= birthday alert inactive Notify_FICHINTER_VALIDATE=Intervention validated +Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Customer invoice validated Notify_BILL_UNVALIDATE=Customer invoice unvalidated Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang index 6c590d73f68..60af821e8c1 100644 --- a/htdocs/langs/es_ES/other.lang +++ b/htdocs/langs/es_ES/other.lang @@ -11,6 +11,7 @@ DateToBirth=Fecha de nacimiento BirthdayAlertOn=alerta aniversario activada BirthdayAlertOff=alerta aniversario desactivada Notify_FICHINTER_VALIDATE=Validación ficha intervención +Notify_FICHINTER_SENTBYMAIL=Envío ficha de intervención por e-mail Notify_BILL_VALIDATE=Validación factura Notify_BILL_UNVALIDATE=Devalidación factura a cliente Notify_ORDER_SUPPLIER_APPROVE=Aprobación pedido a proveedor diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang index e448feaa3b4..de941e850a6 100644 --- a/htdocs/langs/fr_FR/other.lang +++ b/htdocs/langs/fr_FR/other.lang @@ -11,6 +11,7 @@ DateToBirth=Date de naissance BirthdayAlertOn= alerte anniversaire active BirthdayAlertOff= alerte anniversaire inactive Notify_FICHINTER_VALIDATE=Validation fiche intervention +Notify_FICHINTER_SENTBYMAIL=Envoye fiche intervention par email Notify_BILL_VALIDATE=Validation facture client Notify_BILL_UNVALIDATE=Dévalidation facture client Notify_ORDER_SUPPLIER_APPROVE=Approbation commande fournisseur From ec7a6433f6191a92470d5c26093bc11a88400cee Mon Sep 17 00:00:00 2001 From: simnandez Date: Sat, 6 Apr 2013 08:56:47 +0200 Subject: [PATCH 2/5] Update Changelog --- ChangeLog | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9d014f14e97..aae6d3cec36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,7 @@ English Dolibarr ChangeLog -------------------------------------------------------------- -***** ChangeLog for 3.4 compared to 3.3 ***** +***** ChangeLog for 3.4 compared to 3.3.2 ***** For users: - New: Support revenue stamp onto invoices. - New: Add a tab "consumption" on thirdparties to list products bought/sells. @@ -63,6 +63,14 @@ WARNING: If you used external modules, some of them may need to be upgraded due +***** ChangeLog for 3.3.2 compared to 3.3.1 ***** + +-Fix: Ducth (nl_NL) translation +-Fix: [ bug #790 ] Spanish localtax RE not being correctly calculated +-Generalize fix: file with a specific mask not found, again + + + ***** ChangeLog for 3.3.1 compared to 3.3 ***** - Fix: [ bug #733 ] Mass emailing tools do not support