From 51d23d7c4838f0f6afd7b24d1906812898e9d8af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Mar 2013 16:17:12 +0100
Subject: [PATCH] Merge fix of 3.3

---
 ChangeLog                                              | 10 ++++++++++
 htdocs/core/class/commonobject.class.php               |  5 +++--
 htdocs/core/lib/functions.lib.php                      |  4 ++--
 .../interface_50_modAgenda_ActionsAuto.class.php       |  1 +
 htdocs/fourn/commande/fiche.php                        |  5 +++--
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 811660a00b0..677d1610a5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,16 @@ For translators:
 - Update language files.
 
 
+
+***** ChangeLog for 3.3.1 compared to 3.3 *****
+
+- Fix: [ bug #733 ] Mass emailing tools do not support <style HTML tag
+- Fix: Package for launchpad
+- Fix: [ bug #736 ] Missing column in llx_c_chargesociales  
+- 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.
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 764eb19b66e..7519b03446a 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);
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8992af9a78b..0d61259d49a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2720,10 +2720,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
 	{
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
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index 24ecd0690b0..1afb3fddb00 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -295,7 +295,9 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
         //print "xx".$tva_tx; exit;
         if ($result > 0)
         {
-            if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+            $ret=$object->fetch($object->id);    // Reload to get new records
+
+        	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
             {
             	// Define output language
             	$outputlangs = $langs;
@@ -307,7 +309,6 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
             		$outputlangs->setDefaultLang($newlang);
             	}
 
-                $ret=$object->fetch($object->id);    // Reload to get new records
                 supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
             }
             unset($_POST['qty']);