lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some translation problems

Browse Source
This commit is contained in:
Marcos García 2013-06-08 21:57:57 +02:00
parent cf6bfcc9c4
commit 3b28de0a07
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/core/class/html.form.class.php
View File

@ -701,13 +701,13 @@ class Form
$selected_input_value=$product->ref; $selected_input_value=$product->ref;
} }
======= =======
if ($selected && empty($selected_input_value)) if ($selected && empty($selected_input_value))
{ {
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
$product = new Product($this->db); $product = new Product($this->db);
$product->fetch($selected); $product->fetch($selected);
$selected_input_value=$product->ref; $selected_input_value=$product->ref;
} }
>>>>>>> refs/remotes/origin/3.3 >>>>>>> refs/remotes/origin/3.3
// mode=1 means customers products // mode=1 means customers products
$ajaxoptions=array(); $ajaxoptions=array();
@ -1657,8 +1657,8 @@ class Form
{ {
$opt.= price($objp->fprice).' '.$currencytext."/".$objp->quantity; $opt.= price($objp->fprice).' '.$currencytext."/".$objp->quantity;
$outval.= price($objp->fprice).' '.$currencytextnoent."/".$objp->quantity; $outval.= price($objp->fprice).' '.$currencytextnoent."/".$objp->quantity;
$opt.= $langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding $opt.= ' '.$langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding
$outval.=$langs->transnoentities("Units"); $outval.= ' '.$langs->transnoentities("Units");
} }
if ($objp->quantity >= 1) if ($objp->quantity >= 1)

1
htdocs/ecm/docmine.php
View File

@ -132,6 +132,7 @@ if ($action == 'confirm_deletedir' && $confirm == 'yes')
} }
else else
{ {
$langs->load('errors');
setEventMessage($langs->trans($ecmdir->error,$ecmdir->label), 'errors'); setEventMessage($langs->trans($ecmdir->error,$ecmdir->label), 'errors');
} }
} }

2
htdocs/fourn/commande/fiche.php
View File

@ -1109,7 +1109,7 @@ elseif (! empty($object->id))
//'text' => $langs->trans("ConfirmClone"), //'text' => $langs->trans("ConfirmClone"),
//array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1), //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' => '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))
); );
} }