|
@@ -41,8 +41,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
|
|
|
require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
|
|
|
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
|
|
|
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
|
|
|
-if (!empty($conf->produit->enabled))
|
|
|
+if (!empty($conf->produit->enabled)) {
|
|
|
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
|
|
|
+}
|
|
|
if (!empty($conf->projet->enabled)) {
|
|
|
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
|
|
|
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
|
|
@@ -1979,7 +1980,7 @@ if ($action == 'create')
|
|
|
if (! empty($conf->multicurrency->enabled))
|
|
|
{
|
|
|
print '<tr>';
|
|
|
- print '<td>'.fieldLabel('Currency','multicurrency_code').'</td>';
|
|
|
+ print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
|
|
|
print '<td class="maxwidthonsmartphone">';
|
|
|
print $form->selectMultiCurrency($currency_code, 'multicurrency_code');
|
|
|
print '</td></tr>';
|
|
@@ -2508,7 +2509,7 @@ else
|
|
|
print '<tr>';
|
|
|
print '<td>';
|
|
|
print '<table class="nobordernopadding" width="100%"><tr><td>';
|
|
|
- print fieldLabel('Currency','multicurrency_code');
|
|
|
+ print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
|
|
|
print '</td>';
|
|
|
if ($action != 'editmulticurrencycode' && ! empty($object->brouillon))
|
|
|
print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencycode&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
|
|
@@ -2525,7 +2526,7 @@ else
|
|
|
print '<tr>';
|
|
|
print '<td>';
|
|
|
print '<table class="nobordernopadding" width="100%"><tr><td>';
|
|
|
- print fieldLabel('CurrencyRate','multicurrency_tx');
|
|
|
+ print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
|
|
|
print '</td>';
|
|
|
if ($action != 'editmulticurrencyrate' && ! empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency)
|
|
|
print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencyrate&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
|
|
@@ -2603,17 +2604,17 @@ else
|
|
|
if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
|
|
|
{
|
|
|
// Multicurrency Amount HT
|
|
|
- print '<tr><td class="titlefieldmiddle">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
|
|
|
+ print '<tr><td class="titlefieldmiddle">' . $form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0) . '</td>';
|
|
|
print '<td class="nowrap">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
|
|
|
print '</tr>';
|
|
|
|
|
|
// Multicurrency Amount VAT
|
|
|
- print '<tr><td>' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
|
|
|
+ print '<tr><td>' . $form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0) . '</td>';
|
|
|
print '<td>' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
|
|
|
print '</tr>';
|
|
|
|
|
|
// Multicurrency Amount TTC
|
|
|
- print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
|
|
|
+ print '<tr><td height="10">' . $form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0) . '</td>';
|
|
|
print '<td>' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
|
|
|
print '</tr>';
|
|
|
}
|