From d9b7886ef953584b9e5ce2dbfdb05c257a17942c Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 28 Feb 2013 18:47:38 +0100 Subject: [PATCH 01/12] Fix: try to fix regression, stored the last id created in a session variable in order to be used to find out information in the "ref_ext" in order to differentiate automatic actions. --- .../core/triggers/interface_50_modAgenda_ActionsAuto.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php index 600f09468ab..19fc4a618ff 100755 --- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php +++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php @@ -583,6 +583,7 @@ class InterfaceActionsAuto $ret=$actioncomm->add($user); // User qui saisit l'action if ($ret > 0) { + $_SESSION['LAST_ACTION_CREATED'] = $ret; return 1; } else From 16ad99f8c5f4fecf855e38b7c32dbb694a86b9c9 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 28 Feb 2013 19:41:44 +0100 Subject: [PATCH 02/12] Fix: to force id field name --- htdocs/core/class/commonobject.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 34a68f58fc4..1b1466a664c 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -722,9 +722,10 @@ abstract class CommonObject * @param string $table To force other table element or element line * @param int $id To force other object id * @param string $format Data format ('text' by default, 'date') + * @param string $id_field To force rowid field name * @return int <0 if KO, >0 if OK */ - function setValueFrom($field, $value, $table='', $id='', $format='text') + function setValueFrom($field, $value, $table='', $id='', $format='text', $id_field='rowid') { global $conf; @@ -736,7 +737,7 @@ abstract class CommonObject $sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET "; if ($format == 'text') $sql.= $field." = '".$this->db->escape($value)."'"; else if ($format == 'date') $sql.= $field." = '".$this->db->idate($value)."'"; - $sql.= " WHERE rowid = ".$id; + $sql.= " WHERE ".$id_field." = ".$id; dol_syslog(get_class($this)."::setValueFrom sql=".$sql, LOG_DEBUG); $resql = $this->db->query($sql); From dcf76d7bcb3c0d155fa93af3b2fbc55348ed6ae7 Mon Sep 17 00:00:00 2001 From: fhenry Date: Thu, 28 Feb 2013 21:13:25 +0100 Subject: [PATCH 03/12] Fix [ bug #736 ] --- htdocs/install/mysql/migration/3.2.0-3.3.0.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql index dacb7519f28..7f23d8e2509 100755 --- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql +++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql @@ -925,3 +925,5 @@ UPDATE llx_c_action_trigger SET code='FICHINTER_VALIDATE' WHERE code='FICHEINTER UPDATE llx_c_departements SET ncc='ALAVA', nom='Álava' WHERE code_departement='01' AND fk_region=419; ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur; + +ALTER TABLE llx_c_chargesociales ADD COLUMN accountancy_code varchar(15) AFTER code; From 7952a1f1a50452af57d3e80e192eb4a1804b7ff9 Mon Sep 17 00:00:00 2001 From: fhenry Date: Thu, 28 Feb 2013 21:15:45 +0100 Subject: [PATCH 04/12] rool back changes --- htdocs/install/mysql/migration/3.2.0-3.3.0.sql | 2 -- 1 file changed, 2 deletions(-) diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql index 7f23d8e2509..dacb7519f28 100755 --- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql +++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql @@ -925,5 +925,3 @@ UPDATE llx_c_action_trigger SET code='FICHINTER_VALIDATE' WHERE code='FICHEINTER UPDATE llx_c_departements SET ncc='ALAVA', nom='Álava' WHERE code_departement='01' AND fk_region=419; ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur; - -ALTER TABLE llx_c_chargesociales ADD COLUMN accountancy_code varchar(15) AFTER code; From 0d0c1e8c148545049ac3d150da781a2c7b2ccf3f Mon Sep 17 00:00:00 2001 From: fhenry Date: Thu, 28 Feb 2013 21:18:52 +0100 Subject: [PATCH 05/12] Fix [ bug #736 ] --- htdocs/install/mysql/migration/3.2.0-3.3.0.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql index dacb7519f28..7053bd6e4ef 100755 --- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql +++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql @@ -311,7 +311,7 @@ UPDATE llx_c_tva set localtax1 = 1, localtax1_type = '4', localtax2 = 0.4, local ALTER TABLE llx_c_tva DROP COLUMN accountancy_code; ALTER TABLE llx_c_tva ADD COLUMN accountancy_code_sell varchar(15) DEFAULT NULL AFTER active; ALTER TABLE llx_c_tva ADD COLUMN accountancy_code_buy varchar(15) DEFAULT NULL AFTER accountancy_code_sell; -ALTER TABLE llx_c_chargessociales ADD COLUMN accountancy_code varchar(15) DEFAULT NULL AFTER code; +ALTER TABLE llx_c_chargesociales ADD COLUMN accountancy_code varchar(15) DEFAULT NULL AFTER code; -- Tables for accountancy expert DROP TABLE llx_accountingaccount; From 9106a74426975fb37aa698721b25f33286805fec Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 1 Mar 2013 09:48:03 +0100 Subject: [PATCH 06/12] Fix: Package for launchpad --- build/debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/debian/changelog b/build/debian/changelog index 3e7f7fa5e91..f2a3f5ac417 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -4,6 +4,6 @@ dolibarr (3.3.0+nmu1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Dolibarr team Mon, 10 Aug 2011 12:00:00 +0100 + -- Dolibarr team Wed, 27 Feb 2013 12:00:00 +0100 -# For a changelog file dedicated to end users, see /usr/share/doc/dolibarr/ChangeLog.gz \ No newline at end of file +# For a changelog file dedicated to end users, see /usr/share/doc/dolibarr/ChangeLog.gz \ No newline at end of file From 0cb5b3f50c9d6ccda1e9cf9ce80dc2f2140bb5f3 Mon Sep 17 00:00:00 2001 From: simnandez Date: Fri, 1 Mar 2013 20:32:49 +0100 Subject: [PATCH 07/12] Fix: Localtax2 for Spain must be based into buyer --- htdocs/core/lib/functions.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 32615202cc1..300db957b16 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2687,10 +2687,10 @@ function get_localtax($tva, $local, $thirdparty_buyer="", $thirdparty_seller="") dol_syslog("get_localtax tva=".$tva." local=".$local." thirdparty_buyer id=".(is_object($thirdparty_buyer)?$thirdparty_buyer->id:'')." thirdparty_seller id=".$thirdparty_seller->id); // Some test to guess with no need to make database access - if ($mysoc->country_code == 'ES') // For spain and localtaxes 1, tax is qualified if buyer use local taxe + if ($mysoc->country_code == 'ES') // For spain localtaxes 1 and 2, tax is qualified if buyer use local taxe { if ($local == 1 && ! $thirdparty_buyer->localtax1_assuj) return 0; - if ($local == 2 && ! $thirdparty_seller->localtax2_assuj) return 0; + if ($local == 2 && ! $thirdparty_buyer->localtax2_assuj) return 0; } else { From b2763bab15f971c03bd1ea50bf8b02f8800a74ea Mon Sep 17 00:00:00 2001 From: simnandez Date: Fri, 1 Mar 2013 20:38:08 +0100 Subject: [PATCH 08/12] Fix: Localtax2 for Spain must be based into buyer --- ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index d5b181f8990..57774b2ece4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,12 @@ English Dolibarr ChangeLog -------------------------------------------------------------- + +***** ChangeLog for 3.3.1 compared to 3.3 ***** +- Fix: Localtax2 for Spain must be based into buyer + + + ***** ChangeLog for 3.3 compared to 3.2.3 ***** For users: - New: Add holiday module, to declare and follow holidays of your employees. From b16b8f9ff3d64ed48787753bc3494fb77b296464 Mon Sep 17 00:00:00 2001 From: simnandez Date: Fri, 1 Mar 2013 22:13:38 +0100 Subject: [PATCH 09/12] Update ChangeLog for 3.3.1 --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 57774b2ece4..3e0961118f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.3.1 compared to 3.3 ***** + +- Fix: [ bug #733 ] Mass emailing tools do not support