From d1940be71b8e458e0dd8b45aa117f4b1aff46ba2 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Thu, 10 Nov 2011 15:51:36 +0100 Subject: [PATCH 1/3] Trad: Fix missing translation --- htdocs/langs/ca_ES/stocks.lang | 1 + htdocs/langs/es_ES/stocks.lang | 1 + 2 files changed, 2 insertions(+) diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang index d589f6226c8..b973f34d205 100644 --- a/htdocs/langs/ca_ES/stocks.lang +++ b/htdocs/langs/ca_ES/stocks.lang @@ -3,6 +3,7 @@ CHARSET=UTF-8 WarehouseCard=Fitxa magatzem Warehouse=Magatzem NewWarehouse=Nou magatzem o zona d'emmagatzematge +WarehouseEdit=Edició magatzem MenuNewWarehouse=Nou magatzem WarehouseOpened=Magatzem obert WarehouseClosed=Magatzem tancat diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang index 08d9869c544..cfa4255d61a 100644 --- a/htdocs/langs/es_ES/stocks.lang +++ b/htdocs/langs/es_ES/stocks.lang @@ -3,6 +3,7 @@ CHARSET=UTF-8 WarehouseCard=Ficha almacén Warehouse=Almacén NewWarehouse=Nuevo almacén o zona de almacenaje +WarehouseEdit=Edición almacén MenuNewWarehouse=Nuevo almacén WarehouseOpened=almacén abierto WarehouseClosed=almacén cerrado From a35dcfeb07fa909bce855af41a007948d6d8269f Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Thu, 17 Nov 2011 09:21:30 +0100 Subject: [PATCH 2/3] Fix: [bug 235] Bad local tax control --- htdocs/fourn/commande/fiche.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index cd489412845..09935f1fe47 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -133,6 +133,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 @@ -145,11 +151,11 @@ if ($action == 'addline' && $user->rights->fournisseur->commande->creer) $idprod=$product->get_buyprice($_POST['idprodfournprice'], $qty); //$societe=''; - if ($object->socid) + /*if ($object->socid) { $societe=new Societe($db); $societe->fetch($object->socid); - } + }*/ if ($idprod > 0) { From 69f4fb81125886510f83889ed17efe9378f1cf54 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Thu, 17 Nov 2011 17:45:23 +0100 Subject: [PATCH 3/3] Fix: load file other.lang solve missing translations --- htdocs/core/photos_resize.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php index acce82ee3d7..8ac5f1fd484 100644 --- a/htdocs/core/photos_resize.php +++ b/htdocs/core/photos_resize.php @@ -33,6 +33,7 @@ require_once(DOL_DOCUMENT_ROOT."/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"]))