From 66f9153490cdcd4a13bfc8cb40e071599692deba Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 18 Jul 2018 11:33:53 +0200 Subject: [PATCH 1/4] Fix css --- htdocs/accountancy/customer/list.php | 4 ++-- htdocs/accountancy/expensereport/list.php | 4 ++-- htdocs/accountancy/supplier/list.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index c2e6231e246..69396131b02 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -361,8 +361,8 @@ if ($result) { print ''; print ''; print ''; - if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; - print ''; + if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; + print ''; $formother->select_year($search_year,'search_year',1, 20, 5); print ''; print ''; diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php index 8f1a049240c..a20f88f1c30 100644 --- a/htdocs/accountancy/expensereport/list.php +++ b/htdocs/accountancy/expensereport/list.php @@ -308,8 +308,8 @@ if ($result) { print ''; print ''; print ''; - if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; - print ''; + if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; + print ''; $formother->select_year($search_year,'search_year',1, 20, 5); print ''; print ''; diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php index 5bf8f9279c9..57fdf0ace48 100644 --- a/htdocs/accountancy/supplier/list.php +++ b/htdocs/accountancy/supplier/list.php @@ -362,8 +362,8 @@ if ($result) { print ''; print ''; print ''; - if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; - print ''; + if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; + print ''; $formother->select_year($search_year,'search_year',1, 20, 5); print ''; print ''; From 6ad0cd37b0f0a611da7033055a1bebc0ee7931b7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 18 Jul 2018 11:57:49 +0200 Subject: [PATCH 2/4] Translation --- htdocs/langs/en_US/accountancy.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index 266b2fae483..5ff295e38db 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -204,7 +204,7 @@ TotalVente=Total turnover before tax TotalMarge=Total sales margin DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account -DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button "%s". If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "%s". +DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button "%s". If account was not set on product/service cards or if you still has some lines not bound to an account, you will have to make a manual binding from the menu "%s". DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account: @@ -296,7 +296,7 @@ BookeppingLineAlreayExists=Lines already existing into bookeeping NoJournalDefined=No journal defined Binded=Lines bound ToBind=Lines to bind -UseMenuToSetBindindManualy=Autodection not possible, use menu %s to make the binding manually +UseMenuToSetBindindManualy=Lines not yet bound, use menu %s to make the binding manually ## Import ImportAccountingEntries=Accounting entries From 4beca8d9893ed00eb36250a9be82e43ea0b9895f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 18 Jul 2018 13:00:38 +0200 Subject: [PATCH 3/4] Fix restore look and feel --- htdocs/comm/mailing/cibles.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index d3a627a1695..08ed54d2fc3 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -303,6 +303,8 @@ if ($object->fetch($id) >= 0) // Sort $modulenames sort($modulenames); + $var = true; + // Loop on each submodule foreach($modulenames as $modulename) { @@ -328,15 +330,16 @@ if ($object->fetch($id) >= 0) // Si le module mailing est qualifie if ($qualified) { + $var = ! $var; if ($allowaddtarget) { - print '
'; + print ''; print ''; } else { - print '
'; + print '
'; } print '
'; From 33d67ea3320cd3a9271e7eae22c1b3dea8f3b152 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 18 Jul 2018 14:09:44 +0200 Subject: [PATCH 4/4] Fix ref on list --- htdocs/product/stats/facture_fournisseur.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php index fbf75377694..6bd722220ba 100644 --- a/htdocs/product/stats/facture_fournisseur.php +++ b/htdocs/product/stats/facture_fournisseur.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2009 Laurent Destailleur + * Copyright (C) 2004-2018 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2013 Juanjo Menent * Copyright (C) 2014 Florian Henry @@ -225,7 +225,7 @@ if ($id > 0 || ! empty($ref)) $supplierinvoicestatic->total_ht = $objp->total_ht; $supplierinvoicestatic->total_ttc = $objp->total_ttc; $supplierinvoicestatic->total_tva = $objp->total_tva; - $supplierinvoicestatic->ref = $objp->facnumber; + $societestatic->fetch($objp->socid); print '';