diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 0b0b394ace7..be079e32289 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -367,8 +367,8 @@ if ($object->id > 0) {
$morehtmlref = '
';
// Ref customer
if ($type == 'bank-transfer') {
- $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
- $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
+ $morehtmlref .= $form->editfieldkey("RefSupplierBill", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
+ $morehtmlref .= $form->editfieldval("RefSupplierBill", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
} else {
$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_customer, $object, 0, 'string', '', 0, 1);
$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_customer, $object, 0, 'string', '', null, null, '', 1);
@@ -659,39 +659,39 @@ if ($object->id > 0) {
// Amount
print '
| '.$langs->trans('AmountHT').' | ';
- print ''.price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency).' |
';
+ print '
'.price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency).' | ';
// Vat
- print '
| '.$langs->trans('AmountVAT').' | '.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency).' |
';
+ print '
| '.$langs->trans('AmountVAT').' | '.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency).' |
';
print '';
// Amount Local Taxes
if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) { // Localtax1
print '
| '.$langs->transcountry("AmountLT1", $mysoc->country_code).' | ';
- print ''.price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency).' |
';
+ print '
'.price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency).' | ';
}
if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) { // Localtax2
print '
| '.$langs->transcountry("AmountLT2", $mysoc->country_code).' | ';
- print ''.price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).' |
';
+ print '
'.price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).' | ';
}
// Revenue stamp
if ($selleruserevenustamp) { // Test company use revenue stamp
print '
';
- print '| ';
+ print '';
- print ' | ';
+ print ' | ';
print price($object->revenuestamp, 1, '', 1, - 1, - 1, $conf->currency);
print ' | ';
}
// Total with tax
- print '| '.$langs->trans('AmountTTC').' | '.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).' | ';
+ print '| '.$langs->trans('AmountTTC').' | '.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).' | ';
$resteapayer = price2num($object->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT');
@@ -706,7 +706,7 @@ if ($object->id > 0) {
}
// TODO Replace this by an include with same code to show already done payment visible in invoice card
- print '| '.$langs->trans('RemainderToPay').' | '.price($resteapayer, 1, '', 1, - 1, - 1, $conf->currency).' | ';
+ print '| '.$langs->trans('RemainderToPay').' | '.price($resteapayer, 1, '', 1, - 1, - 1, $conf->currency).' | ';
print ' ';
@@ -809,14 +809,14 @@ if ($object->id > 0) {
if ($type == 'bank-transfer') {
- print ''.$langs->trans("DoCreditTransferBeforePayments");
+ print ' '.$langs->trans("DoCreditTransferBeforePayments");
if (isModEnabled('stripe') && getDolGlobalString('STRIPE_SEPA_DIRECT_DEBIT')) {
print ' '.$langs->trans("DoStandingOrdersBeforePayments2");
}
print ' '.$langs->trans("DoStandingOrdersBeforePayments3");
print ' ';
} else {
- print ' '.$langs->trans("DoStandingOrdersBeforePayments");
+ print ' '.$langs->trans("DoStandingOrdersBeforePayments");
if (isModEnabled('stripe') && getDolGlobalString('STRIPE_SEPA_DIRECT_DEBIT')) {
print ' '.$langs->trans("DoStandingOrdersBeforePayments2");
}
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 551d04d31c8..a1091b18f7c 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -145,8 +145,8 @@ if ($id > 0 || !empty($ref)) {
$morehtmlref = ' ';
// Ref supplier
- $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
- $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
+ $morehtmlref .= $form->editfieldkey("RefSupplierBill", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
+ $morehtmlref .= $form->editfieldval("RefSupplierBill", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
// Thirdparty
$morehtmlref .= ' '.$object->thirdparty->getNomUrl(1);
if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 584f9c20303..f50e0a91212 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -109,8 +109,8 @@ if ($object->id > 0) {
$morehtmlref = ' ';
// Ref supplier
- $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
- $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
+ $morehtmlref .= $form->editfieldkey("RefSupplierBill", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
+ $morehtmlref .= $form->editfieldval("RefSupplierBill", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
// Thirdparty
$morehtmlref .= ' '.$object->thirdparty->getNomUrl(1);
if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index 1d7d168a6a6..ed6a3f97d25 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -75,8 +75,8 @@ $linkback = ' ';
// Ref supplier
-$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
-$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
+$morehtmlref .= $form->editfieldkey("RefSupplierBill", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
+$morehtmlref .= $form->editfieldval("RefSupplierBill", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
// Thirdparty
$morehtmlref .= ' '.$object->thirdparty->getNomUrl(1);
if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index 40e58ef7937..263cea27910 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -105,8 +105,8 @@ if ($object->id > 0) {
$morehtmlref = '';
// Ref supplier
- $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
- $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
+ $morehtmlref .= $form->editfieldkey("RefSupplierBill", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
+ $morehtmlref .= $form->editfieldval("RefSupplierBill", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
// Thirdparty
$morehtmlref .= ' '.$object->thirdparty->getNomUrl(1);
if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index aab37ab59a6..d83b9736677 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -554,6 +554,9 @@ td.rightborder {
td.amount, span.amount, div.amount, b.amount {
color: #006666;
}
+span.amount {
+ white-space: nowrap;
+}
td.actionbuttons a {
padding-left: 6px;
}
@@ -1583,25 +1586,30 @@ table.paymenttable td.amountpaymentcomplete, table.paymenttable td.amountremaint
padding-bottom: 0px;
}
.amountalreadypaid {
+ white-space: nowrap;
}
.amountpaymentcomplete {
color: var(--amountpaymentcomplete);
font-weight: bold;
font-size: 1.7em;
+ white-space: nowrap;
}
.amountremaintopay {
color: var(--amountremaintopaycolor);
font-weight: bold;
font-size: 1.7em;
+ white-space: nowrap;
}
.amountremaintopayback {
color: var(--amountremaintopaybackcolor);
font-weight: bold;
font-size: 1.7em;
+ white-space: nowrap;
}
.amountpaymentneutral {
font-weight: bold;
font-size: 1.7em;
+ white-space: nowrap;
}
.onlinepaymentbody .amountpaymentcomplete {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 6eafea0fcc2..feb3a24aeaa 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -751,6 +751,9 @@ td.rightborder {
td.amount, span.amount, div.amount, b.amount {
color: #006666;
}
+span.amount {
+ white-space: nowrap;
+}
td.actionbuttons a {
padding-left: 6px;
}
@@ -1755,22 +1758,27 @@ select.flat.selectlimit {
margin-top: 25px !important;
}
.amountalreadypaid {
+ white-space: nowrap;
}
.amountpaymentcomplete {
color: var(--amountpaymentcomplete);
font-weight: bold;
+ white-space: nowrap;
}
.amountremaintopay {
color: var(--amountremaintopaycolor);
font-weight: bold;
+ white-space: nowrap;
}
.amountremaintopayback {
font-weight: bold;
+ white-space: nowrap;
}
.amountpaymentneutral {
color: var(--amountremaintopaybackcolor);
font-weight: bold;
font-size: 1.4em;
+ white-space: nowrap;
}
.onlinepaymentbody .amountpaymentcomplete {
|