From d7fce41b8a4ecf42a6b807782c8a713e450cb0d5 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Sun, 20 Nov 2011 10:17:14 +0100
Subject: [PATCH 1/2] Fix: [bug 235] Bad local tax control

Conflicts:
	htdocs/fourn/commande/fiche.php
---
 htdocs/fourn/commande/fiche.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index 43f91978f91..f4a76a7eeb3 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -132,6 +132,12 @@ if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
             dol_print_error($db,$object->error);
             exit;
         }
+        	
+		if ($object->socid)
+		{
+			$societe=new Societe($db);
+			$societe->fetch($object->socid);
+		}
 
         // Ecrase $pu par celui	du produit
         // Ecrase $desc	par	celui du produit
@@ -143,12 +149,12 @@ if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
             $productsupplier = new ProductFournisseur($db);
             $idprod=$productsupplier->get_buyprice($_POST['idprodfournprice'], $qty);
 
-            //$societe='';
-            if ($object->socid)
-            {
-                $societe=new Societe($db);
-                $societe->fetch($object->socid);
-            }
+			//$societe='';
+			/*if ($object->socid)
+			{
+				$societe=new Societe($db);
+				$societe->fetch($object->socid);
+			}*/
 
             if ($idprod > 0)
             {

From 75fa989e7916f2d0599e0c4f030286da98c18155 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Thu, 17 Nov 2011 17:45:23 +0100
Subject: [PATCH 2/2] Fix: load file other.lang solve missing translations

---
 htdocs/core/photos_resize.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index fbde981779c..02aee4ca100 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -39,6 +39,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 $langs->load("products");
+$langs->load("other");
 
 $modulepart=$_REQUEST['modulepart']?$_REQUEST['modulepart']:'produit|service';
 if (isset($_GET["id"]))
@@ -207,4 +208,4 @@ print '</fieldset>';
 
 
 llxFooter();
-?>
\ No newline at end of file
+?>