From 6ceb79cf5abfbae550dc7cb28272c8525c505a45 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 3 Nov 2016 20:55:55 +0100
Subject: [PATCH] Uniformise look and feel
---
htdocs/compta/index.php | 4 +-
htdocs/compta/sociales/index.php | 18 ++++---
htdocs/fourn/facture/card.php | 36 +++++++-------
htdocs/langs/en_US/orders.lang | 1 +
htdocs/supplier_proposal/card.php | 80 ++++++++-----------------------
5 files changed, 53 insertions(+), 86 deletions(-)
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 1dd1c46299a..40e3b80a510 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -577,7 +577,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
- print '<td>'.$langs->trans("ContributionsToPay").($num?' <span class="badge">'.$num.'</span>':'').'</td>';
+ print '<td>'.$langs->trans("ContributionsToPay").($num?' <a href="'.DOL_URL_ROOT.'/compta/sociales/index.php?status=0"><span class="badge">'.$num.'</span></a>':'').'</td>';
print '<td align="center">'.$langs->trans("DateDue").'</td>';
print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
print '<td align="right">'.$langs->trans("Paid").'</td>';
@@ -663,7 +663,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
$i = 0;
print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\">";
- print '<td colspan="2">'.$langs->trans("OrdersToBill").' <a href="'.DOL_URL_ROOT.'/commande/list.php?status=3&afacturer=1"><span class="badge">'.$num.'</span></a></td>';
+ print '<td colspan="2">'.$langs->trans("OrdersDeliveredToBill").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=3&billed=0"><span class="badge">'.$num.'</span></a></td>';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.$langs->trans("AmountHT").'</td>';
print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
print '<td align="right">'.$langs->trans("ToBill").'</td>';
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index fc106de2ad1..80364960406 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -40,6 +40,7 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
$search_ref = GETPOST('search_ref','int');
$search_label = GETPOST('search_label','alpha');
$search_amount = GETPOST('search_amount','alpha');
+$search_status = GETPOST('search_status','int');
$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
@@ -52,8 +53,8 @@ $pagenext = $page + 1;
if (! $sortfield) $sortfield="cs.date_ech";
if (! $sortorder) $sortorder="DESC";
-$year=$_GET["year"];
-$filtre=$_GET["filtre"];
+$year=GETPOST("year",'int');
+$filtre=GETPOST("filtre",'int');
if (empty($_REQUEST['typeid']))
{
@@ -88,7 +89,7 @@ $form = new Form($db);
$formsocialcontrib = new FormSocialContrib($db);
$chargesociale_static=new ChargeSociales($db);
-llxHeader();
+llxHeader('', $langs->trans("SocialContributions"));
$sql = "SELECT cs.rowid as id, cs.fk_type as type, ";
$sql.= " cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode,";
@@ -99,11 +100,11 @@ $sql.= " ".MAIN_DB_PREFIX."chargesociales as cs";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementcharge as pc ON pc.fk_charge = cs.rowid";
$sql.= " WHERE cs.fk_type = c.id";
$sql.= " AND cs.entity = ".$conf->entity;
-
// Search criteria
-if ($search_ref) $sql.=" AND cs.rowid=".$search_ref;
+if ($search_ref) $sql.=" AND cs.rowid=".$db->escape($search_ref);
if ($search_label) $sql.=natural_search("cs.libelle", $search_label);
if ($search_amount) $sql.=natural_search("cs.amount", price2num(trim($search_amount)), 1);
+if ($search_status != '') $sql.=" AND cs.paye = ".$db->escape($search_status);
if ($year > 0)
{
$sql .= " AND (";
@@ -118,7 +119,7 @@ if ($filtre) {
$sql .= " AND ".$filtre;
}
if ($typeid) {
- $sql .= " AND cs.fk_type=".$typeid;
+ $sql .= " AND cs.fk_type=".$db->escape($typeid);
}
$sql.= " GROUP BY cs.rowid, cs.fk_type, cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode, c.libelle";
$sql.= $db->order($sortfield,$sortorder);
@@ -204,7 +205,10 @@ if ($resql)
print '</td>';
print '<td class="liste_titre"> </td>';
// Status
- print '<td class="liste_titre"> </td>';
+ print '<td class="liste_titre maxwidthonsmartphone" align="right">';
+ $liststatus=array('0'=>$langs->trans("Unpaid"), '1'=>$langs->trans("Paid"));
+ print $form->selectarray('search_status', $liststatus, $search_status, 1);
+ print '</td>';
print '<td class="liste_titre" align="right">';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 113c698f7f4..103850509a5 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2252,6 +2252,24 @@ else
print '<table class="border centpercent">';
+ if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
+ {
+ // Multicurrency Amount HT
+ print '<tr><td class="titlefieldmiddle">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
+ print '<td class="nowrap">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+ print '</tr>';
+
+ // Multicurrency Amount VAT
+ print '<tr><td>' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
+ print '<td>' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+ print '</tr>';
+
+ // Multicurrency Amount TTC
+ print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
+ print '<td>' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+ print '</tr>';
+ }
+
// Amount
print '<tr><td>'.$langs->trans('AmountHT').'</td><td>'.price($object->total_ht,1,$langs,0,-1,-1,$conf->currency).'</td></tr>';
print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($object->total_tva,1,$langs,0,-1,-1,$conf->currency).'<div class="inline-block"> ';
@@ -2282,24 +2300,6 @@ else
}
print '<tr><td>'.$langs->trans('AmountTTC').'</td><td colspan="3">'.price($object->total_ttc,1,$langs,0,-1,-1,$conf->currency).'</td></tr>';
- if (!empty($conf->multicurrency->enabled))
- {
- // Multicurrency Amount HT
- print '<tr><td>' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
- print '<td class="nowrap">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
- print '</tr>';
-
- // Multicurrency Amount VAT
- print '<tr><td>' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
- print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
- print '</tr>';
-
- // Multicurrency Amount TTC
- print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
- print '<td class="nowrap" colspan="2">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
- print '</tr>';
- }
-
print '</table>';
/*
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index 45997ef6cb5..2f0579394eb 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -19,6 +19,7 @@ CustomerOrder=Customer order
CustomersOrders=Customer orders
CustomersOrdersRunning=Current customer orders
CustomersOrdersAndOrdersLines=Customer orders and order lines
+OrdersDeliveredToBill=Customer orders delivered to bill
OrdersToBill=Customer orders delivered
OrdersInProcess=Customer orders in process
OrdersToProcess=Customer orders to process
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 804c02cfa68..3ab1c159545 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1476,41 +1476,6 @@ if ($action == 'create')
}
print '</td></tr>';
- // Project
- /*
- if (! empty($conf->projet->enabled)) {
- $langs->load("projects");
- print '<tr><td>';
- print '<table class="nobordernopadding" width="100%"><tr><td>';
- print $langs->trans('Project') . '</td>';
- if ($user->rights->supplier_proposal->creer) {
- if ($action != 'classify')
- print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=classify&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a></td>';
- print '</tr></table>';
- print '</td><td colspan="3">';
- if ($action == 'classify') {
- $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid');
- } else {
- $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none');
- }
- print '</td></tr>';
- } else {
- print '</td></tr></table>';
- if (! empty($object->fk_project)) {
- print '<td colspan="3">';
- $proj = new Project($db);
- $proj->fetch($object->fk_project);
- print '<a href="../projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
- print $proj->ref;
- print '</a>';
- print '</td>';
- } else {
- print '<td colspan="3"> </td>';
- }
- }
- print '</tr>';
- }*/
-
// Multicurrency
if (! empty($conf->multicurrency->enabled))
{
@@ -1594,14 +1559,32 @@ if ($action == 'create')
print '<table class="border centpercent">';
+ if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
+ {
+ // Multicurrency Amount HT
+ print '<tr><td height="10" class="titlefieldmiddle">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
+ print '<td>' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+ print '</tr>';
+
+ // Multicurrency Amount VAT
+ print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
+ print '<td>' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+ print '</tr>';
+
+ // Multicurrency Amount TTC
+ print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
+ print '<td>' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
+ print '</tr>';
+ }
+
// Amount HT
- print '<tr><td class="titlefield">' . $langs->trans('AmountHT') . '</td>';
- print '<td class="nowrap"><b>' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . '</b></td>';
+ print '<tr><td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';
+ print '<td>' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
print '</tr>';
// Amount VAT
print '<tr><td>' . $langs->trans('AmountVAT') . '</td>';
- print '<td class="nowrap">' . price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
+ print '<td>' . price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
print '</tr>';
// Amount Local Taxes
@@ -1623,27 +1606,6 @@ if ($action == 'create')
print '<td class="nowrap">' . price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
print '</tr>';
- if (!empty($conf->multicurrency->enabled))
- {
- // Multicurrency Amount HT
- print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountHT','multicurrency_total_ht') . '</td>';
- print '<td class="nowrap">' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
- print '</tr>';
-
- // Multicurrency Amount VAT
- print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountVAT','multicurrency_total_tva') . '</td>';
- print '<td class="nowrap">' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
- print '</tr>';
-
- // Multicurrency Amount TTC
- print '<tr><td height="10">' . fieldLabel('MulticurrencyAmountTTC','multicurrency_total_ttc') . '</td>';
- print '<td class="nowrap">' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . '</td>';
- print '</tr>';
- }
-
- // Statut
- //print '<tr><td height="10">' . $langs->trans('Status') . '</td><td align="left">' . $object->getLibStatut(4) . '</td></tr>';
-
print '</table>';
// Margin Infos
--
GitLab