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

Trans

Browse Source
This commit is contained in:
Laurent Destailleur 2020-07-10 16:27:59 +02:00
parent a059154fdf
commit a155b20b2f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/en_US/products.lang
View File

@ -169,6 +169,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
CustomCode=Customs / Commodity / HS code CustomCode=Customs / Commodity / HS code
CountryOrigin=Origin country CountryOrigin=Origin country
Nature=Nature of product (material/finished) Nature=Nature of product (material/finished)
NatureOfProductShort=Nature of product
NatureOfProductDesc=Raw material or finished product
ShortLabel=Short label ShortLabel=Short label
Unit=Unit Unit=Unit
p=u. p=u.

6
htdocs/product/card.php
View File

@ -1054,7 +1054,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
if ($type != 1) // Nature, Weight and volume only applies to products and not to services if ($type != 1) // Nature, Weight and volume only applies to products and not to services
{ {
// Nature // Nature
print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="3">'; print '<tr><td>'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td colspan="3">';
$statutarray = array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial")); $statutarray = array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
print $form->selectarray('finished', $statutarray, GETPOST('finished', 'alpha'), 1); print $form->selectarray('finished', $statutarray, GETPOST('finished', 'alpha'), 1);
print '</td></tr>'; print '</td></tr>';
@ -1470,7 +1470,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
print '</td></tr>'; print '</td></tr>';
} else { } else {
// Nature // Nature
print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="3">'; print '<tr><td>'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td colspan="3">';
$statutarray = array('-1'=>'&nbsp;', '1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial")); $statutarray = array('-1'=>'&nbsp;', '1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
print $form->selectarray('finished', $statutarray, $object->finished); print $form->selectarray('finished', $statutarray, $object->finished);
print '</td></tr>'; print '</td></tr>';
@ -1946,7 +1946,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
print '</td></tr>'; print '</td></tr>';
} else { } else {
// Nature // Nature
print '<tr><td class="titlefield">'.$langs->trans("Nature").'</td><td colspan="2">'; print '<tr><td class="titlefield">'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td colspan="2">';
print $object->getLibFinished(); print $object->getLibFinished();
print '</td></tr>'; print '</td></tr>';