diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index 0cef5254d90..5060aa86a81 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -26,9 +26,6 @@ // Load Dolibarr environment require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; - /** * @var Conf $conf * @var DoliDB $db @@ -36,6 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; * @var Translate $langs * @var User $user */ +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; // Load translation files required by the page $langs->loadLangs(array('companies', 'orders', 'bills')); @@ -166,28 +165,17 @@ print '
'; print load_fiche_titre($langs->trans("NewRelativeDiscount"), '', ''); -print '
'; -/*if (! ($isCustomer && $isSupplier)) -{ - if ($isCustomer && ! $isSupplier) { - print ''; - } - if (! $isCustomer && $isSupplier) { - print ''; - } -}*/ - -print ''; +print '
'; if ($isCustomer || $isSupplier) { // Discount type - print ''; +print $langs->trans("NewValue").''; // Motif/Note -print ''; print "
'.$langs->trans('DiscountType').''; + print '
'.$langs->trans('DiscountType').''; if ($isCustomer) { print ' '; } if ($isCustomer && $isSupplier) { - print '   '; + print '     '; } if ($isSupplier) { print ' '; @@ -197,10 +185,10 @@ if ($isCustomer || $isSupplier) { // New value print '
'; -print $langs->trans("NewValue").'%
%
'; +print '
'; print $langs->trans("NoteReason").'
"; diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index e4cde4ac777..e68a945edec 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -5715,7 +5715,7 @@ if ($action == 'create') { // Amount HT print '' . $langs->trans('AmountHT') . ''; print '' . price($sign * $object->total_ht, 0, $langs, 0, -1, -1, $conf->currency) . ''; - if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) { + if (isModEnabled("multicurrency") && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) { // Multicurrency Amount HT print '' . price($sign * $object->multicurrency_total_ht, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ''; } @@ -5725,7 +5725,7 @@ if ($action == 'create') { // Amount VAT print '' . $langs->trans('AmountVAT') . ''; print '' . price($sign * $object->total_tva, 0, $langs, 0, -1, -1, $conf->currency) . ''; - if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) { + if (isModEnabled("multicurrency") && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) { // Multicurrency Amount VAT print '' . price($sign * $object->multicurrency_total_tva, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ''; } @@ -5736,7 +5736,7 @@ if ($action == 'create') { print ''; print '' . $langs->transcountry("AmountLT1", $mysoc->country_code) . ''; print '' . price($sign * $object->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency) . ''; - if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) { + if (isModEnabled("multicurrency") && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) { $object->multicurrency_total_localtax1 = (float) price2num($object->total_localtax1 * $object->multicurrency_tx, 'MT'); print '' . price($sign * $object->multicurrency_total_localtax1, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ''; @@ -5748,7 +5748,7 @@ if ($action == 'create') { print ''; print '' . $langs->transcountry("AmountLT2", $mysoc->country_code) . ''; print '' . price($sign * $object->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency) . ''; - if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) { + if (isModEnabled("multicurrency") && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) { $object->multicurrency_total_localtax2 = (float) price2num($object->total_localtax2 * $object->multicurrency_tx, 'MT'); print '' . price($sign * $object->multicurrency_total_localtax2, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ''; @@ -5813,7 +5813,7 @@ if ($action == 'create') { // Amount TTC print '' . $langs->trans('AmountTTC') . ''; print '' . price($sign * $object->total_ttc, 0, $langs, 0, -1, -1, $conf->currency) . ''; - if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) { + if (isModEnabled("multicurrency") && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) { // Multicurrency Amount TTC print '' . price($sign * $object->multicurrency_total_ttc, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ''; } @@ -6227,7 +6227,7 @@ if ($action == 'create') { print ''.price($resteapayeraffiche).' '; // Remainder to pay Multicurrency - if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) { + if (isModEnabled('multicurrency') && $object->multicurrency_code && ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1)) { print ''; print ''; print $langs->trans('RemainderToPayMulticurrency'); diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index 61ee39a88d5..1922b52627e 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -92,7 +92,7 @@ if (empty($inputalsopricewithtax)) { } // Define colspan for the button 'Add' $colspan = 3; // Columns: total ht + col edit + col delete -if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) { +if (isModEnabled("multicurrency") && $this->multicurrency_code && $this->multicurrency_code != $conf->currency) { $colspan++; //Add column for Total (currency) if required } if (in_array($object->element, array('propal', 'commande', 'order', 'facture', 'facturerec', 'invoice', 'supplier_proposal', 'order_supplier', 'invoice_supplier', 'invoice_supplier_rec'))) { @@ -145,13 +145,13 @@ if ($nolinesbefore) { } ?> trans('VAT'); ?> trans('PriceUHT'); ?> - multicurrency_code != $conf->currency) { ?> + multicurrency_code && $this->multicurrency_code != $conf->currency) { ?> trans('PriceUHT').' ('.$langs->getCurrencySymbol($this->multicurrency_code).')'; ?> trans('PriceUTTC'); ?> - multicurrency_code != $conf->currency && !empty($inputalsopricewithtax) && !getDolGlobalInt('MAIN_NO_INPUT_PRICE_WITH_TAX')) { ?> + multicurrency_code && $this->multicurrency_code != $conf->currency && !empty($inputalsopricewithtax) && !getDolGlobalInt('MAIN_NO_INPUT_PRICE_WITH_TAX')) { ?> trans('PriceUTTC').' ('.$langs->getCurrencySymbol($this->multicurrency_code).')'; ?> trans('Qty'); ?> @@ -497,7 +497,7 @@ if ($nolinesbefore) { multicurrency_code != $conf->currency) { + if (isModEnabled("multicurrency") && $this->multicurrency_code && $this->multicurrency_code != $conf->currency) { $coldisplay++; ?> "> @@ -511,7 +511,7 @@ if ($nolinesbefore) { multicurrency_code != $conf->currency && !empty($inputalsopricewithtax) && !getDolGlobalInt('MAIN_NO_INPUT_PRICE_WITH_TAX')) { + if (isModEnabled("multicurrency") && $this->multicurrency_code && $this->multicurrency_code != $conf->currency && !empty($inputalsopricewithtax) && !getDolGlobalInt('MAIN_NO_INPUT_PRICE_WITH_TAX')) { $coldisplay++; ?> "> diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php index cd22005ff18..5cbf447e8dc 100644 --- a/htdocs/core/tpl/objectline_edit.tpl.php +++ b/htdocs/core/tpl/objectline_edit.tpl.php @@ -102,7 +102,7 @@ if (!empty($inputalsopricewithtax)) { if (in_array($object->element, array('propal', 'supplier_proposal', 'facture', 'facturerec', 'invoice', 'commande', 'order', 'order_supplier', 'invoice_supplier', 'invoice_supplier_rec'))) { $colspan++; // With this, there is a column move button } -if (isModEnabled("multicurrency") && $object->multicurrency_code != $conf->currency) { +if (isModEnabled("multicurrency") && $this->multicurrency_code && $object->multicurrency_code != $conf->currency) { $colspan += 2; } if (isModEnabled('asset') && $object->element == 'invoice_supplier') { @@ -260,7 +260,7 @@ $coldisplay++; } print '>'; - if (isModEnabled("multicurrency") && $object->multicurrency_code != $conf->currency) { + if (isModEnabled("multicurrency") && $this->multicurrency_code && $object->multicurrency_code != $conf->currency) { $coldisplay++; print ''; } @@ -278,7 +278,7 @@ $coldisplay++; print '>'; } - if (isModEnabled("multicurrency") && $object->multicurrency_code != $conf->currency && !empty($inputalsopricewithtax) && !getDolGlobalInt('MAIN_NO_INPUT_PRICE_WITH_TAX')) { + if (isModEnabled("multicurrency") && $this->multicurrency_code && $object->multicurrency_code != $conf->currency && !empty($inputalsopricewithtax) && !getDolGlobalInt('MAIN_NO_INPUT_PRICE_WITH_TAX')) { $coldisplay++; $multicurrency_upinctax = $line->multicurrency_subprice_ttc ? $line->multicurrency_subprice_ttc : null; if (!$multicurrency_upinctax) { diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php index 9de14ea85e5..fff2656659b 100644 --- a/htdocs/core/tpl/objectline_title.tpl.php +++ b/htdocs/core/tpl/objectline_title.tpl.php @@ -115,7 +115,7 @@ print ''; print ''.$langs->trans('PriceUHT').''; // Multicurrency HT / excl tax -if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) { +if (isModEnabled("multicurrency") && $this->multicurrency_code && $this->multicurrency_code != $conf->currency) { print ''.$langs->trans('PriceUHT'); print ' ('.$langs->getCurrencySymbol($this->multicurrency_code).')'; } @@ -126,7 +126,7 @@ if (!empty($inputalsopricewithtax) && !getDolGlobalInt('MAIN_NO_INPUT_PRICE_WITH } // Multicurrency TTC / incl tax -if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency && !empty($inputalsopricewithtax) && !getDolGlobalInt('MAIN_NO_INPUT_PRICE_WITH_TAX')) { +if (isModEnabled("multicurrency") && $this->multicurrency_code && $this->multicurrency_code != $conf->currency && !empty($inputalsopricewithtax) && !getDolGlobalInt('MAIN_NO_INPUT_PRICE_WITH_TAX')) { print ''.$langs->trans('PriceUTTC'); print ' ('.$langs->getCurrencySymbol($this->multicurrency_code).')'; } @@ -212,7 +212,7 @@ if ($usemargins && isModEnabled('margin') && empty($user->socid)) { print ''.$langs->trans('TotalHTShort').''; // Multicurrency -if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) { +if (isModEnabled("multicurrency") && $this->multicurrency_code && $this->multicurrency_code != $conf->currency) { print ''.$langs->trans('TotalHTShort'); print ' ('.$langs->getCurrencySymbol($this->multicurrency_code).')'; } diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index c61c9418b60..76022982c91 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -409,7 +409,7 @@ print $tooltiponpriceend; subprice); ?> -multicurrency_code != $conf->currency) { ?> +multicurrency_code && $this->multicurrency_code != $conf->currency) { ?> multicurrency_subprice); ?> multicurrency_code != $conf->currency && !empty($inputalsopricewithtax) && !getDolGlobalInt('MAIN_NO_INPUT_PRICE_WITH_TAX')) { ?> +if (isModEnabled("multicurrency") && $this->multicurrency_code && $this->multicurrency_code != $conf->currency && !empty($inputalsopricewithtax) && !getDolGlobalInt('MAIN_NO_INPUT_PRICE_WITH_TAX')) { ?> pu_ttc_devise) ? $line->pu_ttc_devise : null; if (!$multicurrency_upinctax) { @@ -517,7 +517,7 @@ if ($line->special_code == 3) { print price($sign * $line->total_ht); print $tooltiponpriceend; print ''; - if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) { + if (isModEnabled("multicurrency") && $this->multicurrency_code && $this->multicurrency_code != $conf->currency) { print ''; print $tooltiponpricemultiprice; print price($sign * $line->multicurrency_total_ht); diff --git a/htdocs/core/tpl/subtotal_view.tpl.php b/htdocs/core/tpl/subtotal_view.tpl.php index 3537069b7b6..4600e760bce 100644 --- a/htdocs/core/tpl/subtotal_view.tpl.php +++ b/htdocs/core/tpl/subtotal_view.tpl.php @@ -94,7 +94,7 @@ if ($line->qty > 0) { ?> multicurrency_code != $conf->currency) { + if (isModEnabled("multicurrency") && $this->multicurrency_code && $this->multicurrency_code != $conf->currency) { print ''; } // Handling colspan if MAIN_NO_INPUT_PRICE_WITH_TAX conf is enabled @@ -160,7 +160,7 @@ if ($line->qty > 0) { ?> } ?> - multicurrency_code != $conf->currency) { ?> + multicurrency_code && $this->multicurrency_code != $conf->currency) { ?> qty < 0) { diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php index ffdedc911e5..5a3d5684a73 100644 --- a/htdocs/mrp/mo_production.php +++ b/htdocs/mrp/mo_production.php @@ -816,9 +816,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea print '
'; print '
'.$langs->trans("ConfirmProductionDesc", $langs->transnoentitiesnoconv("Confirm")).'
'; - print ''.$langs->trans("InventoryCode").':   '; + print ''.$langs->trans("InventoryCode").':'; print ''; - print $langs->trans("MovementLabel").':

'; + print ''; + print '   '; + print ''; + print ''.$langs->trans("MovementLabel").':'; + print ''; + print '

'; print '
'; print ''; print '   ';