diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php index a4b7ad69d24..cb35f6c782a 100644 --- a/htdocs/comm/propal/stats/index.php +++ b/htdocs/comm/propal/stats/index.php @@ -53,7 +53,8 @@ $endyear=$year; $form=new Form($db); -$langs->load("propal"); +$langs->load('propal'); +$langs->load('other'); llxHeader(); diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index 07dfb674c74..85bbaae9ef2 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -51,7 +51,8 @@ $year = GETPOST('year')>0?GETPOST('year'):$nowyear; $startyear=$year-1; $endyear=$year; -$langs->load("orders"); +$langs->load('orders'); +$langs->load('other'); /* diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php index 895cadbf2d9..af45fb24ca7 100644 --- a/htdocs/compta/facture/stats/index.php +++ b/htdocs/compta/facture/stats/index.php @@ -54,8 +54,9 @@ $endyear=$year; * View */ -$langs->load("bills"); -$langs->load("companies"); +$langs->load('bills'); +$langs->load('companies'); +$langs->load('other'); $form=new Form($db); @@ -233,7 +234,7 @@ print '
'; print $form->select_company($socid,'socid',$filter,1); print ''; // User - print ''.$langs->trans("Author").''; + print ''.$langs->trans("CreatedBy").''; print $form->select_users($userid,'userid',1); print ''; // Year diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 000f14ee59f..cb8bc2ee872 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -701,13 +701,13 @@ class Form $selected_input_value=$product->ref; } ======= - if ($selected && empty($selected_input_value)) - { - require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; - $product = new Product($this->db); - $product->fetch($selected); - $selected_input_value=$product->ref; - } + if ($selected && empty($selected_input_value)) + { + require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; + $product = new Product($this->db); + $product->fetch($selected); + $selected_input_value=$product->ref; + } >>>>>>> refs/remotes/origin/3.3 // mode=1 means customers products $ajaxoptions=array(); @@ -1657,8 +1657,8 @@ class Form { $opt.= price($objp->fprice).' '.$currencytext."/".$objp->quantity; $outval.= price($objp->fprice).' '.$currencytextnoent."/".$objp->quantity; - $opt.= $langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding - $outval.=$langs->transnoentities("Units"); + $opt.= ' '.$langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding + $outval.= ' '.$langs->transnoentities("Units"); } if ($objp->quantity >= 1) diff --git a/htdocs/ecm/docmine.php b/htdocs/ecm/docmine.php index 23ac16e75fe..8ba84f6fc76 100644 --- a/htdocs/ecm/docmine.php +++ b/htdocs/ecm/docmine.php @@ -132,6 +132,7 @@ if ($action == 'confirm_deletedir' && $confirm == 'yes') } else { + $langs->load('errors'); setEventMessage($langs->trans($ecmdir->error,$ecmdir->label), 'errors'); } } diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 1bb3fa405af..8bdd44adcf3 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -1109,7 +1109,7 @@ elseif (! empty($object->id)) //'text' => $langs->trans("ConfirmClone"), //array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1), //array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1), - array('type' => 'other', 'name' => 'idwarehouse', 'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1)) + array('type' => 'other', 'name' => 'idwarehouse', 'label' => $langs->trans("SelectWarehouseForStockIncrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1)) ); } diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang index 66d64d3d4ff..fc9a1fb1d3c 100644 --- a/htdocs/langs/es_ES/products.lang +++ b/htdocs/langs/es_ES/products.lang @@ -84,14 +84,14 @@ ShowService=Mostrar servicio ProductsAndServicesArea=Área productos y servicios ProductsArea=Área Productos ServicesArea=Área Servicios -AddToMyProposals=Adjuntar a mis presupuestos -AddToOtherProposals=Adjuntar a otros presupuestos -AddToMyBills=Adjuntar a mis facturas -AddToOtherBills=Adjuntar a otras facturas +AddToMyProposals=Añadir a mis presupuestos +AddToOtherProposals=Añadir a otros presupuestos +AddToMyBills=Añadir a mis facturas +AddToOtherBills=Añadir a otras facturas CorrectStock=Corregir stock AddPhoto=Adjuntar una foto ListOfStockMovements=Listado de movimientos de stock -NoPhotoYet=No hay fotografía disponible por el momento +NoPhotoYet=No hay fotografías disponibles por el momento BuyingPrice=Precio de compra SupplierCard=Ficha proveedor CommercialCard=Ficha comercial @@ -114,6 +114,8 @@ AssociatedProductsAbility=Activar productos compuestos AssociatedProducts=Productos compuestos AssociatedProductsNumber=Nº de productos que componen este producto ParentProductsNumber=Nº de productos que este producto compone +IfZeroItIsNotAVirtualProduct=Si 0, este producto no es un producto virtual +IfZeroItIsNotUsedByVirtualProduct=Si 0, este producto no está siendo utilizado por ningún producto virtual EditAssociate=Componer Translation=Traducción KeywordFilter=Filtro por clave diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 0a8aed4634f..fa1f0fa5621 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -1417,7 +1417,7 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status) $langs->load("bills"); $html .= ''; - $html .= ''.$langs->trans("AddToOtherOrders").''; + $html .= ''.$langs->trans("AddToOtherBills").''; $html .= ''; $html .= '';