';
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 4abff5b63be..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);
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/composition/fiche.php b/htdocs/product/composition/fiche.php
index 71ce35c76e1..644c321b8bb 100644
--- a/htdocs/product/composition/fiche.php
+++ b/htdocs/product/composition/fiche.php
@@ -72,7 +72,6 @@ $cancel <> $langs->trans("Cancel") &&
$error=0;
for($i=0;$i<$_POST["max_prod"];$i++)
{
- print " : ".$_POST["prod_id_chk".$i];
if ($_POST["prod_id_chk".$i] > 0)
{
if($product->add_sousproduit($id, $_POST["prod_id_".$i],$_POST["prod_qty_".$i]) > 0)
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 .= '
';
diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php
index 5e93e32fe22..0700c784bae 100644
--- a/test/phpunit/NumberingModulesTest.php
+++ b/test/phpunit/NumberingModulesTest.php
@@ -212,9 +212,9 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
$this->assertEquals(1, $result); // Case 1 can be deleted (because there was a reset for case 2)
// Try an offset when an invoice already exists
- $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000+9990}';
- $conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000+9990}';
- $result=$numbering->getNextValue($mysoc, $localobject2);
+ $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000+9990}';
+ $conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000+9990}';
+ $result=$numbering->getNextValue($mysoc, $localobject2);
// Now we try with a different fiscal month (forced by mask)
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@6}';