diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 45c557f68c9..47ad635977e 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -3735,7 +3735,7 @@ elseif ($id > 0 || ! empty($ref)) print $langs->trans('DateInvoice'); print ''; if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editinvoicedate' && ! empty($object->brouillon) && $usercancreate && empty($conf->global->FAC_FORCE_DATE_VALIDATION)) - print 'id . '">' . img_edit($langs->trans('SetDate'), 1) . ''; + print 'id . '">' . img_edit($langs->trans('SetDate'), 1) . ''; print ''; print ''; @@ -3759,7 +3759,7 @@ elseif ($id > 0 || ! empty($ref)) print ''; - print ''; + print ''; print '
'; print $langs->trans('DatePointOfTax'); print 'id . '">' . img_edit($langs->trans('SetDate'), 1) . 'id . '">' . img_edit($langs->trans('SetDate'), 1) . '
'; print ''; if ($action == 'editdate_pointoftax') { @@ -3776,7 +3776,7 @@ elseif ($id > 0 || ! empty($ref)) print $langs->trans('PaymentConditionsShort'); print ''; if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && $usercancreate) - print 'id . '">' . img_edit($langs->trans('SetConditions'), 1) . ''; + print 'id . '">' . img_edit($langs->trans('SetConditions'), 1) . ''; print ''; print ''; if ($object->type != Facture::TYPE_CREDIT_NOTE) @@ -3797,7 +3797,7 @@ elseif ($id > 0 || ! empty($ref)) print $langs->trans('DateMaxPayment'); print ''; if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editpaymentterm' && $usercancreate) - print 'id . '">' . img_edit($langs->trans('SetDate'), 1) . ''; + print 'id . '">' . img_edit($langs->trans('SetDate'), 1) . ''; print ''; print ''; if ($object->type != Facture::TYPE_CREDIT_NOTE) @@ -3821,7 +3821,7 @@ elseif ($id > 0 || ! empty($ref)) print $langs->trans('PaymentMode'); print ''; if ($action != 'editmode' && $usercancreate) - print 'id . '">' . img_edit($langs->trans('SetMode'), 1) . ''; + print 'id . '">' . img_edit($langs->trans('SetMode'), 1) . ''; print ''; print ''; if ($action == 'editmode') @@ -3844,7 +3844,7 @@ elseif ($id > 0 || ! empty($ref)) print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0); print ''; if ($usercancreate && $action != 'editmulticurrencycode' && ! empty($object->brouillon)) - print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ''; + print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ''; print ''; print ''; $htmlname = (($usercancreate && $action == 'editmulticurrencycode')?'multicurrency_code':'none'); @@ -3857,7 +3857,7 @@ elseif ($id > 0 || ! empty($ref)) print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0); print ''; if ($usercancreate && $action != 'editmulticurrencyrate' && ! empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) - print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ''; + print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . ''; print ''; print ''; if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') { @@ -3882,7 +3882,7 @@ elseif ($id > 0 || ! empty($ref)) print $langs->trans('BankAccount'); print ''; if (($action != 'editbankaccount') && $usercancreate) - print 'id.'">'.img_edit($langs->trans('SetBankAccount'), 1).''; + print 'id.'">'.img_edit($langs->trans('SetBankAccount'), 1).''; print ''; print ''; if ($action == 'editbankaccount') @@ -3902,7 +3902,7 @@ elseif ($id > 0 || ! empty($ref)) print ''; print '
'; print $langs->trans('IncotermLabel'); - print ''; + print ''; if ($usercancreate) print ''.img_edit().''; else print ' '; print '
'; @@ -3979,7 +3979,7 @@ elseif ($id > 0 || ! empty($ref)) print ''; if ($action != 'editrevenuestamp' && ! empty($object->brouillon) && $usercancreate) { - print 'id . '">' . img_edit($langs->trans('SetRevenuStamp'), 1) . ''; + print 'id . '">' . img_edit($langs->trans('SetRevenuStamp'), 1) . ''; } print ''; print ''; @@ -4062,9 +4062,9 @@ elseif ($id > 0 || ! empty($ref)) print '' . $langs->trans('ListOfSituationInvoices') . ''; print ''; print '' . $langs->trans('Situation') . ''; - if (! empty($conf->banque->enabled)) print ''; - print '' . $langs->trans('AmountHT') . ''; - print '' . $langs->trans('AmountTTC') . ''; + if (! empty($conf->banque->enabled)) print ''; + print '' . $langs->trans('AmountHT') . ''; + print '' . $langs->trans('AmountTTC') . ''; print ' '; print ''; @@ -4085,10 +4085,10 @@ elseif ($id > 0 || ! empty($ref)) print '' . $prev_invoice->getNomUrl(1) . ''; print ''; print ''.(($prev_invoice->type == Facture::TYPE_CREDIT_NOTE)?$langs->trans('situationInvoiceShortcode_AS'):$langs->trans('situationInvoiceShortcode_S')) . $prev_invoice->situation_counter.''; - if (! empty($conf->banque->enabled)) print ''; - print '' . price($prev_invoice->total_ht) . ''; - print '' . price($prev_invoice->total_ttc) . ''; - print '' . $prev_invoice->getLibStatut(3, $totalpaye) . ''; + if (! empty($conf->banque->enabled)) print ''; + print '' . price($prev_invoice->total_ht) . ''; + print '' . price($prev_invoice->total_ttc) . ''; + print '' . $prev_invoice->getLibStatut(3, $totalpaye) . ''; print ''; } } @@ -4103,15 +4103,15 @@ elseif ($id > 0 || ! empty($ref)) print '' . $object->getNomUrl(1) . ''; print ''; print ''.(($object->type == Facture::TYPE_CREDIT_NOTE)?$langs->trans('situationInvoiceShortcode_AS'):$langs->trans('situationInvoiceShortcode_S')) . $object->situation_counter.''; - if (! empty($conf->banque->enabled)) print ''; - print '' . price($object->total_ht) . ''; - print '' . price($object->total_ttc) . ''; - print '' . $object->getLibStatut(3, $object->getSommePaiement()) . ''; + if (! empty($conf->banque->enabled)) print ''; + print '' . price($object->total_ht) . ''; + print '' . price($object->total_ttc) . ''; + print '' . $object->getLibStatut(3, $object->getSommePaiement()) . ''; print ''; print ''; - print '' . $langs->trans('CurrentSituationTotal') . ''; + print '' . $langs->trans('CurrentSituationTotal') . ''; print ''; $i =0; foreach ($current_situation_counter as $sit) @@ -4124,8 +4124,8 @@ elseif ($id > 0 || ! empty($ref)) } print ''; if (! empty($conf->banque->enabled)) print ''; - print '' . price($total_global_ht) . ''; - print '' . price($total_global_ttc) . ''; + print '' . price($total_global_ht) . ''; + print '' . price($total_global_ttc) . ''; print ' '; print ''; @@ -4136,9 +4136,9 @@ elseif ($id > 0 || ! empty($ref)) print '' . $langs->trans('ListOfNextSituationInvoices') . ''; print ''; print ''; - if (! empty($conf->banque->enabled)) print ''; - print '' . $langs->trans('AmountHT') . ''; - print '' . $langs->trans('AmountTTC') . ''; + if (! empty($conf->banque->enabled)) print ''; + print '' . $langs->trans('AmountHT') . ''; + print '' . $langs->trans('AmountTTC') . ''; print ' '; print '';*/ @@ -4153,10 +4153,10 @@ elseif ($id > 0 || ! empty($ref)) print '' . $next_invoice->getNomUrl(1) . ''; print ''; print ''.(($next_invoice->type == Facture::TYPE_CREDIT_NOTE)?$langs->trans('situationInvoiceShortcode_AS'):$langs->trans('situationInvoiceShortcode_S')) . $next_invoice->situation_counter.''; - if (! empty($conf->banque->enabled)) print ''; - print '' . price($next_invoice->total_ht) . ''; - print '' . price($next_invoice->total_ttc) . ''; - print '' . $next_invoice->getLibStatut(3, $totalpaye) . ''; + if (! empty($conf->banque->enabled)) print ''; + print '' . price($next_invoice->total_ht) . ''; + print '' . price($next_invoice->total_ttc) . ''; + print '' . $next_invoice->getLibStatut(3, $totalpaye) . ''; print ''; } @@ -4164,10 +4164,10 @@ elseif ($id > 0 || ! empty($ref)) $total_global_ttc += $total_next_ttc; print ''; - print ''; - if (! empty($conf->banque->enabled)) print ''; - print '' . price($total_global_ht) . ''; - print '' . price($total_global_ttc) . ''; + print ''; + if (! empty($conf->banque->enabled)) print ''; + print '' . price($total_global_ht) . ''; + print '' . price($total_global_ttc) . ''; print ' '; print ''; } @@ -4186,9 +4186,9 @@ elseif ($id > 0 || ! empty($ref)) print '' . $langs->trans('Date') . ''; print '' . $langs->trans('Type') . ''; if (! empty($conf->banque->enabled)) { - print '' . $langs->trans('BankAccount') . ''; + print '' . $langs->trans('BankAccount') . ''; } - print '' . $langs->trans('Amount') . ''; + print '' . $langs->trans('Amount') . ''; print ' '; print ''; @@ -4243,12 +4243,12 @@ elseif ($id > 0 || ! empty($ref)) $bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1); } - print ''; + print ''; if ($bankaccountstatic->id) print $bankaccountstatic->getNomUrl(1, 'transactions'); print ''; } - print '' . price($sign * $objp->amount) . ''; + print '' . price($sign * $objp->amount) . ''; print ''; if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $user->societe_id == 0) { @@ -4272,12 +4272,12 @@ elseif ($id > 0 || ! empty($ref)) if ($object->type != Facture::TYPE_CREDIT_NOTE) { // Total already paid - print ''; + print ''; if ($object->type != Facture::TYPE_DEPOSIT) print $langs->trans('AlreadyPaidNoCreditNotesNoDeposits'); else print $langs->trans('AlreadyPaid'); - print ' : 0)?' class="amountalreadypaid"':'').'>' . price($totalpaye) . ' '; + print ' : 0)?' class="amountalreadypaid"':'').'>' . price($totalpaye) . ' '; $resteapayeraffiche = $resteapayer; $cssforamountpaymentcomplete = 'amountpaymentcomplete'; @@ -4297,15 +4297,15 @@ elseif ($id > 0 || ! empty($ref)) while ($i < $num) { $obj = $db->fetch_object($resql); $invoice->fetch($obj->fk_facture_source); - print ''; + print ''; if ($invoice->type == Facture::TYPE_CREDIT_NOTE) print $langs->trans("CreditNote") . ' '; if ($invoice->type == Facture::TYPE_DEPOSIT) print $langs->trans("Deposit") . ' '; print $invoice->getNomUrl(0); print ' :'; - print '' . price($obj->amount_ttc) . ''; - print ''; + print '' . price($obj->amount_ttc) . ''; + print ''; print 'rowid . '">' . img_delete() . ''; print ''; $i ++; @@ -4320,51 +4320,51 @@ elseif ($id > 0 || ! empty($ref)) // Paye partiellement 'escompte' if (($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED) && $object->close_code == 'discount_vat') { - print ''; + print ''; print $form->textwithpicto($langs->trans("Discount") . ':', $langs->trans("HelpEscompte"), - 1); - print '' . price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')) . ' '; + print '' . price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')) . ' '; $resteapayeraffiche = 0; $cssforamountpaymentcomplete = 'amountpaymentneutral'; } // Paye partiellement ou Abandon 'badcustomer' if (($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED) && $object->close_code == 'badcustomer') { - print ''; + print ''; print $form->textwithpicto($langs->trans("Abandoned") . ':', $langs->trans("HelpAbandonBadCustomer"), - 1); - print '' . price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')) . ' '; + print '' . price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')) . ' '; // $resteapayeraffiche=0; $cssforamountpaymentcomplete = 'amountpaymentneutral'; } // Paye partiellement ou Abandon 'product_returned' if (($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED) && $object->close_code == 'product_returned') { - print ''; + print ''; print $form->textwithpicto($langs->trans("ProductReturned") . ':', $langs->trans("HelpAbandonProductReturned"), - 1); - print '' . price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')) . ' '; + print '' . price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')) . ' '; $resteapayeraffiche = 0; $cssforamountpaymentcomplete = 'amountpaymentneutral'; } // Paye partiellement ou Abandon 'abandon' if (($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED) && $object->close_code == 'abandon') { - print ''; + print ''; $text = $langs->trans("HelpAbandonOther"); if ($object->close_note) $text .= '

' . $langs->trans("Reason") . ':' . $object->close_note; print $form->textwithpicto($langs->trans("Abandoned") . ':', $text, - 1); - print '' . price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')) . ' '; + print '' . price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')) . ' '; $resteapayeraffiche = 0; $cssforamountpaymentcomplete = 'amountpaymentneutral'; } // Billed - print '' . $langs->trans("Billed") . ' :' . price($object->total_ttc) . ' '; + print '' . $langs->trans("Billed") . ' :' . price($object->total_ttc) . ' '; // Remainder to pay - print ''; + print ''; if ($resteapayeraffiche >= 0) print $langs->trans('RemainderToPay'); else print $langs->trans('ExcessReceived'); print ' :'; - print '' . price($resteapayeraffiche) . ''; + print '' . price($resteapayeraffiche) . ''; print ' '; } else // Credit note @@ -4372,26 +4372,26 @@ elseif ($id > 0 || ! empty($ref)) $cssforamountpaymentcomplete='amountpaymentneutral'; // Total already paid back - print ''; + print ''; print $langs->trans('AlreadyPaidBack'); - print ' :' . price($sign * $totalpaye) . ' '; + print ' :' . price($sign * $totalpaye) . ' '; // Billed - print '' . $langs->trans("Billed") . ' :' . price($sign * $object->total_ttc) . ' '; + print '' . $langs->trans("Billed") . ' :' . price($sign * $object->total_ttc) . ' '; // Remainder to pay back - print ''; + print ''; if ($resteapayeraffiche <= 0) print $langs->trans('RemainderToPayBack'); else print $langs->trans('ExcessPaid'); print ' :'; - print '' . price($sign * $resteapayeraffiche) . ''; + print '' . price($sign * $resteapayeraffiche) . ''; print ' '; // Sold credit note - // print ''.$langs->trans('TotalTTC').' :'; - // print ''.price($sign * + // print ''.$langs->trans('TotalTTC').' :'; + // print ''.price($sign * // $object->total_ttc).' '; } @@ -4444,20 +4444,20 @@ elseif ($id > 0 || ! empty($ref)) print ' '; } print '' . $langs->trans('ModifyAllLines') . ''; - print ' '; - print ' '; - if ($inputalsopricewithtax) print ' '; - print ' '; - print ' '; - print '' . $langs->trans('Progress') . ''; + print ' '; + print ' '; + if ($inputalsopricewithtax) print ' '; + print ' '; + print ' '; + print '' . $langs->trans('Progress') . ''; if (! empty($conf->margin->enabled) && empty($user->societe_id)) { - print ' '; + print ' '; if ((! empty($conf->global->DISPLAY_MARGIN_RATES) || ! empty($conf->global->DISPLAY_MARK_RATES)) && $usercanreadallmargin) { - print ' '; + print ' '; } } - print ' '; + print ' '; print ' '; print ' '; print ' '; @@ -4473,8 +4473,8 @@ elseif ($id > 0 || ! empty($ref)) print ' '; print ' '; print ' '; - print '%'; - print ''; + print '%'; + print ''; print ''; print '';