From 912ac8e3d644b9193ccd34f26ce6a43fba72c17a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 16 Oct 2016 21:29:12 +0200
Subject: [PATCH] Fix css
---
htdocs/compta/facture.php | 7 ++++++-
htdocs/fourn/card.php | 24 ++++++++++++------------
htdocs/fourn/facture/card.php | 4 ++--
htdocs/theme/eldy/style.css.php | 2 ++
htdocs/theme/md/style.css.php | 10 ++++++++++
5 files changed, 32 insertions(+), 15 deletions(-)
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 ' :</td><td align="right"'.(($totalpaye > 0)?' class="amountalreadypaid"':'').'>' . price($totalpaye) . '</td><td> </td></tr>';
$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 '</td><td align="right">' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . '</td><td> </td></tr>';
$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 '</td><td align="right">' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . '</td><td> </td></tr>';
// $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 '</td><td align="right">' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . '</td><td> </td></tr>';
$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 '</td><td align="right">' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . '</td><td> </td></tr>';
$resteapayeraffiche = 0;
+ $cssforamountpaymentcomplete = '';
}
// Billed
@@ -3647,7 +3652,7 @@ else if ($id > 0 || ! empty($ref))
else
print $langs->trans('ExcessReceived');
print ' :</td>';
- print '<td align="right"'.($resteapayeraffiche?' class="amountremaintopay"':'').'>' . price($resteapayeraffiche) . '</td>';
+ print '<td align="right"'.($resteapayeraffiche?' class="amountremaintopay"':$cssforamountpaymentcomplete).'>' . price($resteapayeraffiche) . '</td>';
print '<td class="nowrap"> </td></tr>';
}
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 @@
<?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Eric Seigne <erics@rycks.com>
- * Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2010 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2010-2015 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2014 Jean Heimburger <jean@tiaris.info>
@@ -149,7 +149,7 @@ if ($object->id > 0)
if ($object->fournisseur)
{
print '<tr>';
- print '<td class="nowrap">'.$langs->trans("SupplierCode"). '</td><td colspan="3">';
+ print '<td class="titlefield">'.$langs->trans("SupplierCode"). '</td><td>';
print $object->code_fournisseur;
if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
print '</td>';
@@ -159,7 +159,7 @@ if ($object->id > 0)
print '<tr>';
print '<td>';
print $form->editfieldkey("SupplierAccountancyCode",'supplieraccountancycode',$object->code_compta_fournisseur,$object,$user->rights->societe->creer);
- print '</td><td colspan="3">';
+ print '</td><td>';
print $form->editfieldval("SupplierAccountancyCode",'supplieraccountancycode',$object->code_compta_fournisseur,$object,$user->rights->societe->creer);
print '</td>';
print '</tr>';
@@ -167,7 +167,7 @@ if ($object->id > 0)
// Assujetti a TVA ou pas
print '<tr>';
- print '<td class="nowrap">'.$langs->trans('VATIsUsed').'</td><td colspan="3">';
+ print '<td class="titlefield">'.$langs->trans('VATIsUsed').'</td><td>';
print yn($object->tva_assuj);
print '</td>';
print '</tr>';
@@ -175,19 +175,19 @@ if ($object->id > 0)
// Local Taxes
if ($mysoc->useLocalTax(1))
{
- print '<tr><td class="nowrap">'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td colspan="3">';
+ print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
print yn($object->localtax1_assuj);
print '</td></tr>';
}
if ($mysoc->useLocalTax(2))
{
- print '<tr><td class="nowrap">'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td colspan="3">';
+ print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
print yn($object->localtax2_assuj);
print '</td></tr>';
}
// TVA Intra
- print '<tr><td class="nowrap">'.$langs->trans('VATIntra').'</td><td colspan="3">';
+ print '<tr><td class="nowrap">'.$langs->trans('VATIntra').'</td><td>';
print $object->tva_intra;
print '</td></tr>';
@@ -200,7 +200,7 @@ if ($object->id > 0)
print '<td>';
if (($action != 'editconditions') && $user->rights->societe->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&socid='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
print '</tr></table>';
- print '</td><td colspan="3">';
+ print '</td><td>';
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 '<td>';
if (($action != 'editmode') && $user->rights->societe->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&socid='.$object->id.'">'.img_edit($langs->trans('SetMode'),1).'</a></td>';
print '</tr></table>';
- print '</td><td colspan="3">';
+ print '</td><td>';
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 '<tr><td>' . $langs->trans("SuppliersCategoriesShort") . '</td>';
- print '<td colspan="3">';
+ print '<td>';
print $form->showCategories($object->id, 'supplier', 1);
print "</td></tr>";
}
@@ -255,8 +255,8 @@ if ($object->id > 0)
{
$langs->load("members");
$langs->load("users");
- print '<tr><td width="25%" valign="top">'.$langs->trans("LinkedToDolibarrMember").'</td>';
- print '<td colspan="3">';
+ print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
+ print '<td>';
$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;
--
GitLab