From 63220eae180f77da23f728ec8e5ccc787d3ab90e Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 1 Aug 2016 04:40:56 +0200 Subject: [PATCH 1/7] Presentation --- htdocs/societe/rib.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index 436a979ab3f..ae119ef1f4d 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -247,7 +247,7 @@ if ($socid && $action != 'edit' && $action != "create") print '
'; print ''; - print ''; + print ''; print ''; print ''; @@ -424,7 +424,7 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer) print '
'; print '
'.$langs->trans("LabelRIB").'
'.$langs->trans("LabelRIB").''.$account->label.'
'.$langs->trans("BankName").'
'; - print ''; + print ''; print ''; print ''; @@ -487,12 +487,12 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer) if (empty($account->rum)) $account->rum = $prelevement->buildRumNumber($object->code_client, $account->datec, $account->id); // RUM - print ''; - print ''; + print ''; + print ''; // FRSTRECUR - print ''; - print ''; + print ''; + print ''; print '
'.$langs->trans("LabelRIB").'
'.$langs->trans("LabelRIB").'
'.$langs->trans("BankName").'
'.$langs->trans("RUM").''.$account->rum.'
'.$langs->trans("RUM").''.$account->rum.'
'.$langs->trans("WithdrawMode").'
'.$langs->trans("WithdrawMode").'
'; } From 30ec33f1522b8e3f891d23991805832942b65f68 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 1 Aug 2016 06:45:00 +0200 Subject: [PATCH 2/7] Missing key language --- htdocs/langs/en_US/main.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index e0b21059d4e..372eb5a7df0 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -701,6 +701,7 @@ RelatedObjects=Related Objects ClassifyBilled=Classify billed Progress=Progress ClickHere=Click here +View=View # Week day Monday=Monday Tuesday=Tuesday From 26f98a2ab74d31e4a536af468e9b646844ba693f Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 1 Aug 2016 06:45:29 +0200 Subject: [PATCH 3/7] Presentation --- htdocs/expensereport/document.php | 4 ++-- htdocs/holiday/card.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php index 249a85f4ef2..dd9a28a130c 100644 --- a/htdocs/expensereport/document.php +++ b/htdocs/expensereport/document.php @@ -81,7 +81,7 @@ include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php'; $form = new Form($db); -llxHeader("","",$langs->trans("TripCard")); +llxHeader("",$langs->trans("ExpenseReport")); if ($object->id) @@ -107,7 +107,7 @@ if ($object->id) $linkback = ''.$langs->trans("BackToList").''; // Ref - print ''.$langs->trans("Ref").''; + print ''.$langs->trans("Ref").''; print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', ''); print ''; diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index 9b3494c762f..4c6aeb99110 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -794,7 +794,7 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create // User print ''; - print ''.$langs->trans("User").''; + print ''.$langs->trans("User").''; print ''; if (empty($user->rights->holiday->write_all)) { From 3cdb2d45c203d7c2babd4c49d01f6abfa30c9a12 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 1 Aug 2016 07:10:42 +0200 Subject: [PATCH 4/7] Uniformize presentation customer invoice --- htdocs/compta/facture.php | 6 +++--- htdocs/compta/facture/contact.php | 11 ++++------- htdocs/compta/facture/document.php | 11 ++++------- htdocs/compta/facture/info.php | 2 +- htdocs/compta/facture/note.php | 11 ++++------- htdocs/compta/facture/prelevement.php | 16 ++++++++-------- 6 files changed, 24 insertions(+), 33 deletions(-) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 5af6240fa9e..d6d7e7f0ed8 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1887,7 +1887,7 @@ if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); } $now = dol_now(); -llxHeader('', $langs->trans('Bill'), 'EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes'); +llxHeader('', $langs->trans('InvoiceCustomer'), 'EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes'); // Mode creation @@ -2931,7 +2931,7 @@ else if ($id > 0 || ! empty($ref)) $linkback = '' . $langs->trans("BackToList") . ''; // Ref - print '' . $langs->trans('Ref') . ''; + print '' . $langs->trans('Ref') . ''; print ''; $morehtmlright = ''; $discount = new DiscountAbsolute($db); @@ -2946,7 +2946,7 @@ else if ($id > 0 || ! empty($ref)) print ''; // Ref customer - print ''; + print ''; print ''; diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php index c5a7cfcdab2..a7fa51ff5ae 100644 --- a/htdocs/compta/facture/contact.php +++ b/htdocs/compta/facture/contact.php @@ -114,7 +114,7 @@ else if ($action == 'deletecontact' && $user->rights->facture->creer) * View */ -llxHeader('', $langs->trans("Bill"), "Facture"); +llxHeader('', $langs->trans("InvoiceCustomer")); $form = new Form($db); $formcompany = new FormCompany($db); @@ -146,7 +146,7 @@ if ($id > 0 || ! empty($ref)) $linkback = ''.$langs->trans("BackToList").''; // Ref - print ''; + print ''; print ''; // Ref customer - print ''; - print ''; diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php index 9a2bf3fe433..b25d52c173b 100644 --- a/htdocs/compta/facture/document.php +++ b/htdocs/compta/facture/document.php @@ -82,7 +82,7 @@ include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php'; * View */ -llxHeader(); +llxHeader('', $langs->trans("InvoiceCustomer")); $form = new Form($db); @@ -113,7 +113,7 @@ if ($id > 0 || ! empty($ref)) $linkback = ''.$langs->trans("BackToList").''; // Ref - print ''; + print ''; print ''; // Ref customer - print ''; - print ''; diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php index 24164b5709a..250848319f3 100644 --- a/htdocs/compta/facture/info.php +++ b/htdocs/compta/facture/info.php @@ -35,7 +35,7 @@ $langs->load("bills"); * View */ -llxHeader(); +llxHeader('', $langs->trans("InvoiceCustomer")); $fac = new Facture($db); $fac->fetch($_GET["facid"]); diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php index 3562a235963..77d3817d911 100644 --- a/htdocs/compta/facture/note.php +++ b/htdocs/compta/facture/note.php @@ -60,7 +60,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, * View */ -llxHeader(); +llxHeader('', $langs->trans("InvoiceCustomer")); $form = new Form($db); @@ -81,7 +81,7 @@ if ($id > 0 || ! empty($ref)) $linkback = ''.$langs->trans("BackToList").''; // Ref - print ''; + print ''; print ''; // Ref customer - print ''; - print ''; diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index 0fa260bbe34..6cdb53953d1 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -106,7 +106,7 @@ if ($action == "delete") $now=dol_now(); -llxHeader('', $langs->trans("Bill")); +llxHeader('', $langs->trans("InvoiceCustomer")); $form = new Form($db); @@ -155,7 +155,7 @@ if ($object->id > 0) $linkback = ''.$langs->trans("BackToList").''; // Ref - print '"; // Ref customer - print ''; - print ''; // Third party print ''; - print ''; print ''; // Type - print ''; // Discounts - print ''; print ''; - print ''; From 4ee4de4a0009a34fca9249f9896ed76cb7591c24 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 1 Aug 2016 07:21:24 +0200 Subject: [PATCH 5/7] Uniformize presentation supplier invoice --- htdocs/fourn/facture/card.php | 2 +- htdocs/fourn/facture/contact.php | 4 ++-- htdocs/fourn/facture/document.php | 6 +++--- htdocs/fourn/facture/info.php | 2 +- htdocs/fourn/facture/note.php | 5 ++--- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 280664ea421..e1af265a0de 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -1656,7 +1656,7 @@ else $linkback = ''.$langs->trans("BackToList").''; // Ref - print ''; print "\n"; diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php index 664101848a6..fbcb907ec74 100644 --- a/htdocs/fourn/facture/contact.php +++ b/htdocs/fourn/facture/contact.php @@ -112,7 +112,7 @@ else if ($action == 'deletecontact' && $user->rights->fournisseur->facture->cree * View */ -llxHeader('', $langs->trans("Bill"), "Facture"); +llxHeader('',$langs->trans('SupplierInvoice')); $form = new Form($db); $formcompany = new FormCompany($db); @@ -144,7 +144,7 @@ if ($id > 0 || ! empty($ref)) $linkback = ''.$langs->trans("BackToList").''; // Reference du facture - print '"; diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php index 673d679b4b5..97e84d0cb6e 100644 --- a/htdocs/fourn/facture/document.php +++ b/htdocs/fourn/facture/document.php @@ -81,7 +81,7 @@ include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php'; $form = new Form($db); -llxHeader(); +llxHeader('',$langs->trans('SupplierInvoice')); if ($object->id > 0) { @@ -110,7 +110,7 @@ if ($object->id > 0) $linkback = ''.$langs->trans("BackToList").''; // Ref - print ''; print "\n"; @@ -197,7 +197,7 @@ if ($object->id > 0) print '
'; print $langs->trans('RefCustomer'); print '
'.$langs->trans('Ref').'
'.$langs->trans('Ref').''; $morehtmlref=''; $discount=new DiscountAbsolute($db); @@ -163,13 +163,10 @@ if ($id > 0 || ! empty($ref)) print '
'; - print ''; - print '
'; + print '
'; print $langs->trans('RefCustomer'); print '
'; - print '		'; + print ''; print $object->ref_client; print '
'.$langs->trans('Ref').'
'.$langs->trans('Ref').''; $morehtmlref=''; $discount=new DiscountAbsolute($db); @@ -130,13 +130,10 @@ if ($id > 0 || ! empty($ref)) print '
'; - print ''; - print '
'; + print '
'; print $langs->trans('RefCustomer'); print '
'; - print '		'; + print ''; print $object->ref_client; print '
'.$langs->trans('Ref').'
'.$langs->trans('Ref').''; $morehtmlref=''; $discount=new DiscountAbsolute($db); @@ -98,13 +98,10 @@ if ($id > 0 || ! empty($ref)) print '
'; - print ''; - print '
'; + print '
'; print $langs->trans('RefCustomer'); print '
'; - print '		'; + print ''; print $object->ref_client; print '
'.$langs->trans("Ref").''; + print '
'.$langs->trans("Ref").''; $morehtmlref=''; $discount=new DiscountAbsolute($db); $result=$discount->fetch(0,$object->id); @@ -171,24 +171,24 @@ if ($object->id > 0) print "
'; + print '
'; print ''; print '
'; print $langs->trans('RefCustomer'); print '
'; print '		'; + print ''; print $object->ref_client; print '
'.$langs->trans('Company').''.$object->thirdparty->getNomUrl(1,'compta'); + print ''.$object->thirdparty->getNomUrl(1,'compta'); print '   ('.$langs->trans('OtherBills').')
'.$langs->trans('Type').''; + print '
'.$langs->trans('Type').''; print $object->getLibType(); if ($object->type == Facture::TYPE_REPLACEMENT) { @@ -229,7 +229,7 @@ if ($object->id > 0) print '
'.$langs->trans('Discounts').''; + print '
'.$langs->trans('Discounts').''; if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$object->thirdparty->remise_percent); else print $langs->trans("CompanyHasNoRelativeDiscount"); print '. '; @@ -443,7 +443,7 @@ if ($object->id > 0) print '
'.$langs->trans('Status').''.($object->getLibStatut(4,$totalpaye)).'
'.$langs->trans("RIB").''; + print '
'.$langs->trans("RIB").''; print $object->thirdparty->display_rib(); print '
'.$langs->trans("Ref").''; + print '
'.$langs->trans("Ref").''; print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref'); print '
'.$langs->trans("Ref").''; + print '
'.$langs->trans("Ref").''; print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref); print "
'.$langs->trans("Ref").''; + print '
'.$langs->trans("Ref").''; print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref'); print '
'; // Nb of files - print ''; + print ''; print ''; diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php index 7033d555c0e..4dad6ea7f86 100644 --- a/htdocs/fourn/facture/info.php +++ b/htdocs/fourn/facture/info.php @@ -43,7 +43,7 @@ $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture'); * View */ -llxHeader(); +llxHeader('',$langs->trans('SupplierInvoice')); $object = new FactureFournisseur($db); $object->fetch($id); diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php index 3a4528d827e..1b8a4cd6bbc 100644 --- a/htdocs/fourn/facture/note.php +++ b/htdocs/fourn/facture/note.php @@ -67,7 +67,7 @@ if ($action == 'setlabel' && $user->rights->fournisseur->facture->creer) $form = new Form($db); -llxHeader(); +llxHeader('',$langs->trans('SupplierInvoice')); if ($object->id > 0) { @@ -83,7 +83,7 @@ if ($object->id > 0) $linkback = ''.$langs->trans("BackToList").''; // Ref - print ''; print "\n"; @@ -167,7 +167,6 @@ if ($object->id > 0) print '
'; - $colwidth=20; include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'; dol_fiche_end(); From 0b7a5a4af93bda0df9b4334cb0205ca299d7de6b Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 1 Aug 2016 07:34:55 +0200 Subject: [PATCH 6/7] Uniformize presentation donation --- htdocs/don/card.php | 8 ++++---- htdocs/don/document.php | 4 ++-- htdocs/don/info.php | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/don/card.php b/htdocs/don/card.php index 8614220e8c0..b4939a0b61a 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -283,7 +283,7 @@ if ($action == 'builddoc') * View */ -llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Donaciones'); +llxHeader('',$langs->trans("Donation"),'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Donaciones'); $form=new Form($db); $formfile = new FormFile($db); @@ -424,7 +424,7 @@ if (! empty($id) && $action == 'edit') print '
'.$langs->trans('NbOfAttachedFiles').''.count($filearray).'
'.$langs->trans('NbOfAttachedFiles').''.count($filearray).'
'.$langs->trans('TotalSizeOfAttachedFiles').''.$totalsize.' '.$langs->trans('bytes').'
'.$langs->trans("Ref").''; + print '
'.$langs->trans("Ref").''; print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref); print '
'; // Ref - print "".''; print ''; @@ -554,13 +554,13 @@ if (! empty($id) && $action != 'edit') if (! empty($conf->projet->enabled)) $nbrows++; // Ref - print "".''; print ''; // Date - print '"; diff --git a/htdocs/don/document.php b/htdocs/don/document.php index 706eb4b70f7..4992e5dbbc8 100644 --- a/htdocs/don/document.php +++ b/htdocs/don/document.php @@ -81,7 +81,7 @@ include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php'; $form = new Form($db); -llxHeader("","",$langs->trans("Donations")); +llxHeader("",$langs->trans("Donation")); if ($object->id) @@ -107,7 +107,7 @@ if ($object->id) $linkback = ''.$langs->trans("BackToList").''; // Ref - print ''; diff --git a/htdocs/don/info.php b/htdocs/don/info.php index 1c51a1fa9f8..6e7bce98b4c 100644 --- a/htdocs/don/info.php +++ b/htdocs/don/info.php @@ -38,7 +38,7 @@ $result = restrictedArea($user, 'don', $id, ''); * View */ -llxHeader(); +llxHeader("",$langs->trans("Donation")); if ($id) { From 8ce5fcd9800098885952e44464cd0a8da26b9233 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 1 Aug 2016 07:40:05 +0200 Subject: [PATCH 7/7] Uniformize presentation salary payment --- htdocs/compta/salaries/card.php | 8 ++++---- htdocs/compta/salaries/document.php | 6 +++--- htdocs/compta/salaries/info.php | 4 +--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php index 4a8dc21ca1b..f39fd0780ad 100644 --- a/htdocs/compta/salaries/card.php +++ b/htdocs/compta/salaries/card.php @@ -1,8 +1,8 @@ +/* Copyright (C) 2011-2016 Alexandre Spangaro * Copyright (C) 2014 Laurent Destailleur * Copyright (C) 2015 Jean-François Ferry - * Copyright (C) 2015 Charlie BENKE + * Copyright (C) 2015 Charlie BENKE * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -187,7 +187,7 @@ if ($action == 'delete') * View */ -llxHeader(); +llxHeader("",$langs->trans("SalaryPayment")); $form = new Form($db); @@ -339,7 +339,7 @@ if ($id) $linkback = ''.$langs->trans("BackToList").''; print ""; - print ''; diff --git a/htdocs/compta/salaries/document.php b/htdocs/compta/salaries/document.php index 7f0bf49dc6d..9e48533846a 100644 --- a/htdocs/compta/salaries/document.php +++ b/htdocs/compta/salaries/document.php @@ -6,7 +6,7 @@ * Copyright (C) 2005 Simon TOSSER * Copyright (C) 2011-2012 Juanjo Menent * Copyright (C) 2013 Cédric Salvador - * Copyright (C) 2015 Alexandre Spangaro + * Copyright (C) 2015-2016 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -81,7 +81,7 @@ include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php'; $form = new Form($db); -llxHeader("","",$langs->trans("SalaryPayment")); +llxHeader("",$langs->trans("SalaryPayment")); if ($object->id) @@ -107,7 +107,7 @@ if ($object->id) $linkback = ''.$langs->trans("BackToList").''; // Ref - print ''; diff --git a/htdocs/compta/salaries/info.php b/htdocs/compta/salaries/info.php index cbc0c1742ff..429efc27a33 100644 --- a/htdocs/compta/salaries/info.php +++ b/htdocs/compta/salaries/info.php @@ -44,9 +44,7 @@ $result = restrictedArea($user, 'salaries', '', '', ''); * View */ -$help_url='EN:Module_Salaries|FR:Module Fiche de paie|ES:Módulo Salarios'; -llxHeader("",$langs->trans("Salaries"),$help_url); - +llxHeader("",$langs->trans("SalaryPayment")); $salpayment = new PaymentSalary($db); $result = $salpayment->fetch($id);
'.$langs->trans("Ref").''; + print '
'.$langs->trans("Ref").''; print $object->getNomUrl(); print '
'.$langs->trans("Ref").''; + print '
'.$langs->trans("Ref").''; print $form->showrefnav($object, 'rowid', $linkback, 1, 'rowid', 'ref', ''); print '
'.$langs->trans("Date").''; + print '
'.$langs->trans("Date").''; print dol_print_date($object->date,"day"); print "
'.$langs->trans("Ref").''; + print '
'.$langs->trans("Ref").''; print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', ''); print '
'.$langs->trans("Ref").''; + print ''.$langs->trans("Ref").''; print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', ''); print '
'.$langs->trans("Ref").''; + print '
'.$langs->trans("Ref").''; print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', ''); print '