diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index bbefeb7eb4f..51f5e7382f6 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1559,9 +1559,9 @@ else
print '
'.$langs->trans("ServiceNb", $cursorline).' | ';
print ''.$langs->trans("VAT").' | ';
print ''.$langs->trans("PriceUHT").' | ';
- if (!empty($conf->multicurrency->enabled)) {
- print ''.$langs->trans("PriceUHTCurrency").' | ';
- }
+ //if (!empty($conf->multicurrency->enabled)) {
+ // print ''.$langs->trans("PriceUHTCurrency").' | ';
+ //}
print ''.$langs->trans("Qty").' | ';
if ($conf->global->PRODUCT_USE_UNITS) print ''.$langs->trans("Unit").' | ';
print ''.$langs->trans("ReductionShort").' | ';
@@ -1571,8 +1571,7 @@ else
$objp = $db->fetch_object($result);
- //
-
+ // Line in view mode
if ($action != 'editline' || GETPOST('rowid') != $objp->rowid)
{
print '';
@@ -1608,21 +1607,21 @@ else
{
print '| '.img_object($langs->trans("ShowProductOrService"), ($objp->product_type ? 'service' : 'product')).' '.dol_htmlentitiesbr($objp->description)." | \n";
}
- // TVA
+ // VAT
print '';
print vatrate($objp->tva_tx.($objp->vat_src_code?(' ('.$objp->vat_src_code.')'):''), '%', $objp->info_bits);
print ' | ';
// Price
print ''.($objp->subprice != '' ? price($objp->subprice) : '')." | \n";
// Price multicurrency
- if (!empty($conf->multicurrency->enabled)) {
+ /*if (!empty($conf->multicurrency->enabled)) {
print ''.price($objp->multicurrency_subprice).' | ';
- }
- // Quantite
+ }*/
+ // Quantity
print ''.$objp->qty.' | ';
// Unit
if($conf->global->PRODUCT_USE_UNITS) print ''.$langs->trans($object->lines[$cursorline-1]->getLabelOfUnit()).' | ';
- // Remise
+ // Discount
if ($objp->remise_percent > 0)
{
print ''.$objp->remise_percent."% | \n";
@@ -1711,7 +1710,7 @@ else
print $line->showOptionals($extrafields, 'view', array('style'=>'class="oddeven"', 'colspan'=>$colspan), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
}
}
- // Ligne en mode update
+ // Line in mode update
else
{
// Ligne carac
@@ -1741,18 +1740,34 @@ else
$doleditor->Create();
print '';
+
+ // VAT
print '';
print $form->load_tva("eltva_tx", $objp->tva_tx.($objp->vat_src_code?(' ('.$objp->vat_src_code.')'):''), $mysoc, $object->thirdparty, $objp->fk_product, $objp->info_bits, $objp->product_type, 0, 1);
print ' | ';
+
+ // Price
print ' | ';
+
+ // Price multicurrency
+ /*if (!empty($conf->multicurrency->enabled)) {
+ print ''.price($objp->multicurrency_subprice).' | ';
+ }*/
+
+ // Quantity
print ' | ';
+
+ // Unit
if ($conf->global->PRODUCT_USE_UNITS)
{
print '';
print $form->selectUnits($objp->fk_unit, "unit");
print ' | ';
}
+
+ // Discount
print '% | ';
+
if (! empty($usemargins))
{
print '';
@@ -2063,6 +2078,7 @@ else
if ($action != 'editline')
{
$forcetoshowtitlelines=1;
+ if (empty($object->multicurrency_code)) $object->multicurrency_code = $conf->currency; // TODO Remove this when multicurrency supported on contracts
// Add free products/services
$object->formAddObjectLine(1, $mysoc, $soc);
|