diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index a365146b5a2..8f2088a2bab 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -3568,6 +3568,7 @@ else if ($id > 0 || ! empty($ref)) print ' : 0)?' class="amountalreadypaid"':'').'>' . price($totalpaye) . ' '; $resteapayeraffiche = $resteapayer; + $cssforamountpaymentcomplete = 'amountpaymentcomplete'; // Loop on each credit note or deposit amount applied $creditnoteamount = 0; @@ -3611,6 +3612,7 @@ else if ($id > 0 || ! empty($ref)) print $form->textwithpicto($langs->trans("Discount") . ':', $langs->trans("HelpEscompte"), - 1); print '' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' '; $resteapayeraffiche = 0; + $cssforamountpaymentcomplete = ''; } // Paye partiellement ou Abandon 'badcustomer' if (($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED) && $object->close_code == 'badcustomer') { @@ -3618,6 +3620,7 @@ else if ($id > 0 || ! empty($ref)) print $form->textwithpicto($langs->trans("Abandoned") . ':', $langs->trans("HelpAbandonBadCustomer"), - 1); print '' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' '; // $resteapayeraffiche=0; + $cssforamountpaymentcomplete = ''; } // Paye partiellement ou Abandon 'product_returned' if (($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED) && $object->close_code == 'product_returned') { @@ -3625,6 +3628,7 @@ else if ($id > 0 || ! empty($ref)) print $form->textwithpicto($langs->trans("ProductReturned") . ':', $langs->trans("HelpAbandonProductReturned"), - 1); print '' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' '; $resteapayeraffiche = 0; + $cssforamountpaymentcomplete = ''; } // Paye partiellement ou Abandon 'abandon' if (($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED) && $object->close_code == 'abandon') { @@ -3635,6 +3639,7 @@ else if ($id > 0 || ! empty($ref)) print $form->textwithpicto($langs->trans("Abandoned") . ':', $text, - 1); print '' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' '; $resteapayeraffiche = 0; + $cssforamountpaymentcomplete = ''; } // Billed @@ -3647,7 +3652,7 @@ else if ($id > 0 || ! empty($ref)) else print $langs->trans('ExcessReceived'); print ' :'; - print '' . price($resteapayeraffiche) . ''; + print '' . price($resteapayeraffiche) . ''; print ' '; } else // Credit note diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index cee2b806d5c..6f17d7825bb 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -1,7 +1,7 @@ * Copyright (C) 2003 Eric Seigne - * Copyright (C) 2004-2014 Laurent Destailleur + * Copyright (C) 2004-2016 Laurent Destailleur * Copyright (C) 2005-2010 Regis Houssin * Copyright (C) 2010-2015 Juanjo Menent * Copyright (C) 2014 Jean Heimburger @@ -149,7 +149,7 @@ if ($object->id > 0) if ($object->fournisseur) { print ''; - print ''.$langs->trans("SupplierCode"). ''; + print ''.$langs->trans("SupplierCode"). ''; print $object->code_fournisseur; if ($object->check_codefournisseur() <> 0) print ' ('.$langs->trans("WrongSupplierCode").')'; print ''; @@ -159,7 +159,7 @@ if ($object->id > 0) print ''; print ''; print $form->editfieldkey("SupplierAccountancyCode",'supplieraccountancycode',$object->code_compta_fournisseur,$object,$user->rights->societe->creer); - print ''; + print ''; print $form->editfieldval("SupplierAccountancyCode",'supplieraccountancycode',$object->code_compta_fournisseur,$object,$user->rights->societe->creer); print ''; print ''; @@ -167,7 +167,7 @@ if ($object->id > 0) // Assujetti a TVA ou pas print ''; - print ''.$langs->trans('VATIsUsed').''; + print ''.$langs->trans('VATIsUsed').''; print yn($object->tva_assuj); print ''; print ''; @@ -175,19 +175,19 @@ if ($object->id > 0) // Local Taxes if ($mysoc->useLocalTax(1)) { - print ''.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).''; + print ''.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).''; print yn($object->localtax1_assuj); print ''; } if ($mysoc->useLocalTax(2)) { - print ''.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).''; + print ''.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).''; print yn($object->localtax2_assuj); print ''; } // TVA Intra - print ''.$langs->trans('VATIntra').''; + print ''.$langs->trans('VATIntra').''; print $object->tva_intra; print ''; @@ -200,7 +200,7 @@ if ($object->id > 0) print ''; if (($action != 'editconditions') && $user->rights->societe->creer) print 'id.'">'.img_edit($langs->trans('SetConditions'),1).''; print ''; - print ''; + print ''; if ($action == 'editconditions') { $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->cond_reglement_supplier_id,'cond_reglement_supplier_id',-1,1); @@ -219,7 +219,7 @@ if ($object->id > 0) print ''; if (($action != 'editmode') && $user->rights->societe->creer) print 'id.'">'.img_edit($langs->trans('SetMode'),1).''; print ''; - print ''; + print ''; if ($action == 'editmode') { $form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->mode_reglement_supplier_id,'mode_reglement_supplier_id'); @@ -236,7 +236,7 @@ if ($object->id > 0) { $langs->load("categories"); print '' . $langs->trans("SuppliersCategoriesShort") . ''; - print ''; + print ''; print $form->showCategories($object->id, 'supplier', 1); print ""; } @@ -255,8 +255,8 @@ if ($object->id > 0) { $langs->load("members"); $langs->load("users"); - print ''.$langs->trans("LinkedToDolibarrMember").''; - print ''; + print ''.$langs->trans("LinkedToDolibarrMember").''; + print ''; $adh=new Adherent($db); $result=$adh->fetch('','',$object->id); if ($result > 0) diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 686fd9f14c8..bd575e28bcf 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -214,7 +214,7 @@ if (empty($reshook)) if ($result > 0) { // Define output language - $outputlangs = $langs; + /*$outputlangs = $langs; $newlang = ''; if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id'); @@ -227,7 +227,7 @@ if (empty($reshook)) if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { $ret = $object->fetch($object->id); // Reload to get new records $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); - } + }*/ header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); exit; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index a4ce55658c2..562fbee0286 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -570,6 +570,8 @@ div.myavailability { margin-top: 25px !important; } .amountalreadypaid { +} +.amountpaymentcomplete { color: #008800; font-weight: bold; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 8b13e39428b..0708f6a13b6 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -568,6 +568,16 @@ div.myavailability { .tablelistofcalendars { margin-top: 25px !important; } +.amountalreadypaid { +} +.amountpaymentcomplete { + color: #008800; + font-weight: bold; +} +.amountremaintopay { + color: #880000; + font-weight: bold; +} .savingdocmask { margin-top: 6px; margin-bottom: 12px;