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

Fix trad currency

Browse Source
This commit is contained in:
Florian HENRY 2014-10-02 15:21:49 +02:00
parent 2ae776e51b
commit 78ec4d595b
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -23,6 +23,7 @@ For users:
- Fix: Withdrawal total amount is double - Fix: Withdrawal total amount is double
- Fix: [ bug #1593 ] Spanish Localtax IRPF not being calculated since 3.6.0 in supplier invoices when adding a line - Fix: [ bug #1593 ] Spanish Localtax IRPF not being calculated since 3.6.0 in supplier invoices when adding a line
- Fix: Web service categorie WDSL declaration is correct - Fix: Web service categorie WDSL declaration is correct
- Fix: ErrorBadValueForParamNotAString was displayed in virtual product if no base price defined
***** ChangeLog for 3.6 compared to 3.5.* ***** ***** ChangeLog for 3.6 compared to 3.5.* *****
For users: For users:

12
htdocs/product/composition/fiche.php
View File

@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
$langs->load("bills"); $langs->load("bills");
$langs->load("products"); $langs->load("products");
$langs->load("main");
$id=GETPOST('id','int'); $id=GETPOST('id','int');
$ref=GETPOST('ref','alpha'); $ref=GETPOST('ref','alpha');
@ -292,13 +293,17 @@ if ($id > 0 || ! empty($ref))
{ {
// Price // Price
print '<tr><td>'.$langs->trans("SellingPrice").'</td><td>'; print '<tr><td>'.$langs->trans("SellingPrice").'</td><td>';
if ($object->price_base_type == 'TTC') if ($object->price_base_type == 'TTC')
{ {
print price($object->price_ttc).' '.$langs->trans($object->price_base_type); print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
} }
else else
{ {
print price($object->price).' '.$langs->trans($object->price_base_type); print price($object->price);
if (!empty($object->price_base_type)) {
print ' '.$langs->trans($object->price_base_type);
}
} }
print '</td></tr>'; print '</td></tr>';
@ -310,7 +315,10 @@ if ($id > 0 || ! empty($ref))
} }
else else
{ {
print price($object->price_min).' '.$langs->trans($object->price_base_type); print price($object->price_min);
if (!empty($object->price_base_type)) {
print ' '.$langs->trans($object->price_base_type);
}
} }
print '</td></tr>'; print '</td></tr>';
} }