Debug v20
This commit is contained in:
parent
9da13e94e0
commit
27dcafc05e
7 changed files with 36 additions and 20 deletions
|
|
@ -367,8 +367,8 @@ if ($object->id > 0) {
|
|||
$morehtmlref = '<div class="refidno">';
|
||||
// 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 '<tr><td class="titlefield">'.$langs->trans('AmountHT').'</td>';
|
||||
print '<td class="nowrap">'.price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
|
||||
print '<td class="nowrap right">'.price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
|
||||
|
||||
// Vat
|
||||
print '<tr><td>'.$langs->trans('AmountVAT').'</td><td colspan="3" class="nowrap">'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
|
||||
print '<tr><td>'.$langs->trans('AmountVAT').'</td><td class="nowrap right">'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
|
||||
print '</tr>';
|
||||
|
||||
// Amount Local Taxes
|
||||
if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) { // Localtax1
|
||||
print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
|
||||
print '<td class="nowrap">'.price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
|
||||
print '<td class="nowrap right">'.price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
|
||||
}
|
||||
if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) { // Localtax2
|
||||
print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
|
||||
print '<td class=nowrap">'.price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
|
||||
print '<td class=nowrap right">'.price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
|
||||
}
|
||||
|
||||
// Revenue stamp
|
||||
if ($selleruserevenustamp) { // Test company use revenue stamp
|
||||
print '<tr><td>';
|
||||
print '<table class="nobordernopadding" width="100%"><tr><td>';
|
||||
print '<table class="nobordernopadding centpercent"><tr><td>';
|
||||
print $langs->trans('RevenueStamp');
|
||||
print '</td>';
|
||||
if ($action != 'editrevenuestamp' && $object->status == $object::STATUS_DRAFT && $user->hasRight('facture', 'creer')) {
|
||||
print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editrevenuestamp&token='.newToken().'&facid='.$object->id.'">'.img_edit($langs->trans('SetRevenuStamp'), 1).'</a></td>';
|
||||
}
|
||||
print '</tr></table>';
|
||||
print '</td><td>';
|
||||
print '</td><td class="nowrap right">';
|
||||
print price($object->revenuestamp, 1, '', 1, - 1, - 1, $conf->currency);
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
||||
// Total with tax
|
||||
print '<tr><td>'.$langs->trans('AmountTTC').'</td><td class="nowrap">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
|
||||
print '<tr><td>'.$langs->trans('AmountTTC').'</td><td class="nowrap right">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
|
||||
|
||||
$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 '<tr><td>'.$langs->trans('RemainderToPay').'</td><td class="nowrap">'.price($resteapayer, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
|
||||
print '<tr><td>'.$langs->trans('RemainderToPay').'</td><td class="nowrap right">'.price($resteapayer, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
|
||||
|
||||
print '</table>';
|
||||
|
||||
|
|
@ -809,14 +809,14 @@ if ($object->id > 0) {
|
|||
|
||||
|
||||
if ($type == 'bank-transfer') {
|
||||
print '<div class="opacitymedium">'.$langs->trans("DoCreditTransferBeforePayments");
|
||||
print '<div class="opacitymedium justify">'.$langs->trans("DoCreditTransferBeforePayments");
|
||||
if (isModEnabled('stripe') && getDolGlobalString('STRIPE_SEPA_DIRECT_DEBIT')) {
|
||||
print ' '.$langs->trans("DoStandingOrdersBeforePayments2");
|
||||
}
|
||||
print ' '.$langs->trans("DoStandingOrdersBeforePayments3");
|
||||
print '</div><br>';
|
||||
} else {
|
||||
print '<div class="opacitymedium">'.$langs->trans("DoStandingOrdersBeforePayments");
|
||||
print '<div class="opacitymedium justify">'.$langs->trans("DoStandingOrdersBeforePayments");
|
||||
if (isModEnabled('stripe') && getDolGlobalString('STRIPE_SEPA_DIRECT_DEBIT')) {
|
||||
print ' '.$langs->trans("DoStandingOrdersBeforePayments2");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -145,8 +145,8 @@ if ($id > 0 || !empty($ref)) {
|
|||
|
||||
$morehtmlref = '<div class="refidno">';
|
||||
// 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 .= '<br>'.$object->thirdparty->getNomUrl(1);
|
||||
if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
|
||||
|
|
|
|||
|
|
@ -109,8 +109,8 @@ if ($object->id > 0) {
|
|||
|
||||
$morehtmlref = '<div class="refidno">';
|
||||
// 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 .= '<br>'.$object->thirdparty->getNomUrl(1);
|
||||
if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
|
||||
|
|
|
|||
|
|
@ -75,8 +75,8 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?restore_lastsearch
|
|||
|
||||
$morehtmlref = '<div class="refidno">';
|
||||
// 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 .= '<br>'.$object->thirdparty->getNomUrl(1);
|
||||
if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
|
||||
|
|
|
|||
|
|
@ -105,8 +105,8 @@ if ($object->id > 0) {
|
|||
|
||||
$morehtmlref = '<div class="refidno">';
|
||||
// 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 .= '<br>'.$object->thirdparty->getNomUrl(1);
|
||||
if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
Loading…
Reference in a new issue