From 2aa04e7f9cc08abfa37d9735031e5e11ac52500c Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 16 Jan 2019 13:28:13 +0100 Subject: [PATCH 01/17] Clean code and fix translation file --- htdocs/fichinter/card-rec.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php index 456c27a4584..187b6fbc3da 100644 --- a/htdocs/fichinter/card-rec.php +++ b/htdocs/fichinter/card-rec.php @@ -399,7 +399,6 @@ if ($action == 'create') { print ''.$langs->trans("Duration").''; print "\n"; } - $var=true; while ($i < $num) { $objp = $db->fetch_object($result); print ''; @@ -543,9 +542,9 @@ if ($action == 'create') { print ''.$langs->trans("Description").''.nl2br($object->description).""; - // Contrat + // Contract if (! empty($conf->contrat->enabled)) { - $langs->load('contrat'); + $langs->load('contracts'); print ''; print ''; From 88e90f902005695a4a91fcc6dc3927e5676f4a41 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 16 Jan 2019 13:36:38 +0100 Subject: [PATCH 02/17] Clean and update code --- htdocs/reception/card.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php index 2f5f3a41a7e..2fc0ecfab97 100644 --- a/htdocs/reception/card.php +++ b/htdocs/reception/card.php @@ -1013,7 +1013,6 @@ if ($action == 'create') print "\n"; } - $var=true; $indiceAsked =1; while ($indiceAsked <= $numAsked) { @@ -1192,7 +1191,7 @@ if ($action == 'create') $line->fetch_optionals($object->id,$extralabelslines); $line->array_options = array_merge($line->array_options, $srcLine->array_options); print ''; - print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked); + print $line->showOptionals($extrafieldsline, 'edit', array('style'=>'class="oddeven"', 'colspan'=>$colspan),$indiceAsked); print ''; } From 64875b670cd43161c13f8fc4947cc461f886c350 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 16 Jan 2019 13:40:44 +0100 Subject: [PATCH 03/17] Clean code --- htdocs/reception/list.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php index edcd4513c40..9ef8e0da77c 100644 --- a/htdocs/reception/list.php +++ b/htdocs/reception/list.php @@ -791,7 +791,6 @@ if ($resql) print "\n"; $i=0; - $var=true; $totalarray=array(); while ($i < min($num,$limit)) { From 31a83701bae41a7b3f4d17c262b68d3aa8fdc98f Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 16 Jan 2019 13:44:49 +0100 Subject: [PATCH 04/17] Fix translation --- htdocs/fichinter/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 6158848ceed..507155dc54a 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1271,10 +1271,10 @@ else if ($id > 0 || ! empty($ref)) print ''; print ''; - // Contrat + // Contract if ($conf->contrat->enabled) { - $langs->load('contrat'); + $langs->load('contracts'); print ''; print ''; From ab23fe044a7f0b13da7b0c364a44f1bcb601cede Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 16 Jan 2019 17:34:36 +0100 Subject: [PATCH 05/17] update with html5 compliant code --- build/exe/doliwamp/index.php.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/exe/doliwamp/index.php.install b/build/exe/doliwamp/index.php.install index 1c657b35977..4060bd1b018 100644 --- a/build/exe/doliwamp/index.php.install +++ b/build/exe/doliwamp/index.php.install @@ -527,7 +527,7 @@ a:hover { -
+'; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php index a14509a2aee..173eb208bcf 100644 --- a/htdocs/accountancy/admin/importaccounts.php +++ b/htdocs/accountancy/admin/importaccounts.php @@ -142,11 +142,11 @@ if ($result) { $objp = $db->fetch_object($result); print ''; - print ''; - print ''; diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php index 246d3752f56..c71a866de61 100644 --- a/htdocs/accountancy/admin/productaccount.php +++ b/htdocs/accountancy/admin/productaccount.php @@ -396,12 +396,12 @@ if ($result) print $product_static->getNomUrl(1); print ''; - print ''; + print ''; if (! empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC)) { // TODO ADJUST DESCRIPTION SIZE - // print ''; + // print ''; // TODO: we shoul set a user defined value to adjust user square / wide screen size $trunclengh = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION; print ''; @@ -414,7 +414,7 @@ if ($result) print ''; // Current accounting account - print ''; } else { // Accounting account sell - print ''; - else print ''; + if ($num < $limit && empty($offset)) print ''; + else print ''; } elseif ($totalarray['totaldebitfield'] == $i) print ''; elseif ($totalarray['totalcreditfield'] == $i) print ''; diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php index ca75aaac15e..7b5e4c82953 100644 --- a/htdocs/accountancy/customer/index.php +++ b/htdocs/accountancy/customer/index.php @@ -203,7 +203,7 @@ if ($resql) { } else print length_accountg($row[0]); print ''; - print ''; - print ''; - print ''; - print ''; - print ''; diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php index d0ee7579f3b..384a58300bd 100644 --- a/htdocs/accountancy/supplier/index.php +++ b/htdocs/accountancy/supplier/index.php @@ -195,7 +195,7 @@ if ($resql) { } else print length_accountg($row[0]); print ''; - print ''; - print '
From 3168c76946a416fa4daf9766c0ec5148c04ac81e Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 16 Jan 2019 17:39:40 +0100 Subject: [PATCH 06/17] update with html5 compliant code --- htdocs/accountancy/admin/fiscalyear.php | 6 +++--- htdocs/accountancy/admin/importaccounts.php | 4 ++-- htdocs/accountancy/admin/productaccount.php | 10 +++++----- htdocs/accountancy/bookkeeping/list.php | 4 ++-- htdocs/accountancy/customer/index.php | 4 ++-- htdocs/accountancy/expensereport/index.php | 4 ++-- htdocs/accountancy/expensereport/lines.php | 2 +- htdocs/accountancy/supplier/index.php | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php index 1c5e036c78b..36bad3a96aa 100644 --- a/htdocs/accountancy/admin/fiscalyear.php +++ b/htdocs/accountancy/admin/fiscalyear.php @@ -144,9 +144,9 @@ if ($result) $fiscalyearstatic->id = $obj->rowid; print '
' . img_object($langs->trans("ShowFiscalYear"), "technic") . ' ' . $obj->rowid . '' . $obj->label . '' . dol_print_date($db->jdate($obj->date_start), 'day') . '' . dol_print_date($db->jdate($obj->date_end), 'day') . '' . $obj->label . '' . dol_print_date($db->jdate($obj->date_start), 'day') . '' . dol_print_date($db->jdate($obj->date_end), 'day') . '' . $object->getAccountancyEntriesByFiscalYear($obj->date_start, $obj->date_end) . '' . $object->getAccountancyMovementsByFiscalYear($obj->date_start, $obj->date_end) . '' . $fiscalyearstatic->LibStatut($obj->statut, 5) . '
'; + print ''; print $objp->accounting; print ''; + print ''; print ''; print ''.$obj->label.''.$obj->label.'' . $obj->description . '' . $obj->description . '' . nl2br(dol_trunc($obj->description, $trunclengh)) . ''.$product_static->getLibStatut(3, 1).''; + print ''; if ($accounting_product_mode == 'ACCOUNTANCY_BUY') { print length_accountg($obj->accountancy_code_buy); if ($obj->accountancy_code_buy && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount")); @@ -430,7 +430,7 @@ if ($result) $defaultvalue=''; if ($accounting_product_mode == 'ACCOUNTANCY_BUY') { // Accounting account buy - print ''; + print ''; //$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha'); This is id and we need a code if (empty($defaultvalue)) $defaultvalue=$compta_prodbuy; $codesell=length_accountg($obj->accountancy_code_buy); @@ -439,7 +439,7 @@ if ($result) print ''; + print ''; //$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha'); This is id and we need a code if (empty($defaultvalue)) $defaultvalue=$compta_prodsell; $codesell=length_accountg($obj->accountancy_code_sell); diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index c8df00f6cdc..6eb86bb78fa 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -751,8 +751,8 @@ if ($num > 0) $i++; if ($i == 1) { - if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.price($totalarray['totaldebit']).''.price($totalarray['totalcredit']).''; + print ''; if ($row[0] == 'tobind') { print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind")); @@ -280,7 +280,7 @@ if ($resql) { else print length_accountg($row[0]); print ''; + print ''; if ($row[0] == 'tobind') { print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind")); diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php index 837a8c36630..5a572df0b1d 100644 --- a/htdocs/accountancy/expensereport/index.php +++ b/htdocs/accountancy/expensereport/index.php @@ -195,7 +195,7 @@ if ($resql) { } else print length_accountg($row[0]); print ''; + print ''; if ($row[0] == 'tobind') { print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind")); @@ -268,7 +268,7 @@ if ($resql) { else print length_accountg($row[0]); print ''; + print ''; if ($row[0] == 'tobind') { print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind")); diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php index b328cf73455..f179aab48e2 100644 --- a/htdocs/accountancy/expensereport/lines.php +++ b/htdocs/accountancy/expensereport/lines.php @@ -325,7 +325,7 @@ if ($result) { print '' . $codeCompta . ''; + print ''; print img_edit(); print ''; + print ''; if ($row[0] == 'tobind') { print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind")); @@ -266,7 +266,7 @@ if ($resql) { } else print length_accountg($row[0]); print ''; + print ''; if ($row[0] == 'tobind') { print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind")); From dfceecc04f4958663ec100e2e551f1bdae4a54d6 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 16 Jan 2019 19:14:24 +0100 Subject: [PATCH 07/17] Update index.php.install --- build/exe/doliwamp/index.php.install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/exe/doliwamp/index.php.install b/build/exe/doliwamp/index.php.install index 4060bd1b018..c511d973393 100644 --- a/build/exe/doliwamp/index.php.install +++ b/build/exe/doliwamp/index.php.install @@ -527,7 +527,7 @@ a:hover { -
+'; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; print ''; print ''; From 27edf7c80364b74db253f03a6d42a75d936b1a3b Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 16 Jan 2019 19:18:36 +0100 Subject: [PATCH 09/17] Update importaccounts.php --- htdocs/accountancy/admin/importaccounts.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php index 173eb208bcf..d3a62b5a6ab 100644 --- a/htdocs/accountancy/admin/importaccounts.php +++ b/htdocs/accountancy/admin/importaccounts.php @@ -142,11 +142,11 @@ if ($result) { $objp = $db->fetch_object($result); print ''; - print ''; - print ''; From 6d266d78b11a1e5c25383932419abaec60fc3680 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 16 Jan 2019 19:19:14 +0100 Subject: [PATCH 10/17] Update productaccount.php --- htdocs/accountancy/admin/productaccount.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php index c71a866de61..fc64095de75 100644 --- a/htdocs/accountancy/admin/productaccount.php +++ b/htdocs/accountancy/admin/productaccount.php @@ -396,12 +396,12 @@ if ($result) print $product_static->getNomUrl(1); print ''; - print ''; + print ''; if (! empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC)) { // TODO ADJUST DESCRIPTION SIZE - // print ''; + // print ''; // TODO: we shoul set a user defined value to adjust user square / wide screen size $trunclengh = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION; print ''; From c9aa00c09faffa5352262f051735e51a66192af1 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 16 Jan 2019 19:19:54 +0100 Subject: [PATCH 11/17] Update productaccount.php --- htdocs/accountancy/admin/productaccount.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php index fc64095de75..ecc8e1c1e11 100644 --- a/htdocs/accountancy/admin/productaccount.php +++ b/htdocs/accountancy/admin/productaccount.php @@ -414,7 +414,7 @@ if ($result) print ''; // Current accounting account - print ''; } else { // Accounting account sell - print ''; - else print ''; + if ($num < $limit && empty($offset)) print ''; + else print ''; } elseif ($totalarray['totaldebitfield'] == $i) print ''; elseif ($totalarray['totalcreditfield'] == $i) print ''; From 13ea2d93dd181e18cd766f34427c697f05604b50 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 16 Jan 2019 19:22:29 +0100 Subject: [PATCH 14/17] Update index.php --- htdocs/accountancy/customer/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php index 7b5e4c82953..6995ab4d384 100644 --- a/htdocs/accountancy/customer/index.php +++ b/htdocs/accountancy/customer/index.php @@ -203,7 +203,7 @@ if ($resql) { } else print length_accountg($row[0]); print ''; - print ''; - print ''; - print ''; - print ''; - print ''; From 98ebc0a667b40b480c3ef72f99162f4e11923620 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 16 Jan 2019 19:24:15 +0100 Subject: [PATCH 17/17] Update index.php --- htdocs/accountancy/supplier/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php index 384a58300bd..5e993d43834 100644 --- a/htdocs/accountancy/supplier/index.php +++ b/htdocs/accountancy/supplier/index.php @@ -195,7 +195,7 @@ if ($resql) { } else print length_accountg($row[0]); print ''; - print ''; - print '
@@ -587,4 +587,4 @@ a:hover { EOPAGE; echo $pageContents; -?> \ No newline at end of file +?> From 9e699b59ad1614152ef23cff64270521cb0027ba Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 16 Jan 2019 19:17:53 +0100 Subject: [PATCH 08/17] Update fiscalyear.php --- htdocs/accountancy/admin/fiscalyear.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php index 36bad3a96aa..ca0de98875f 100644 --- a/htdocs/accountancy/admin/fiscalyear.php +++ b/htdocs/accountancy/admin/fiscalyear.php @@ -144,9 +144,9 @@ if ($result) $fiscalyearstatic->id = $obj->rowid; print '
' . img_object($langs->trans("ShowFiscalYear"), "technic") . ' ' . $obj->rowid . '' . $obj->label . '' . dol_print_date($db->jdate($obj->date_start), 'day') . '' . dol_print_date($db->jdate($obj->date_end), 'day') . '' . $obj->label . '' . dol_print_date($db->jdate($obj->date_start), 'day') . '' . dol_print_date($db->jdate($obj->date_end), 'day') . '' . $object->getAccountancyEntriesByFiscalYear($obj->date_start, $obj->date_end) . '' . $object->getAccountancyMovementsByFiscalYear($obj->date_start, $obj->date_end) . '' . $fiscalyearstatic->LibStatut($obj->statut, 5) . '
'; + print ''; print $objp->accounting; print ''; + print ''; print ''; print ''.$obj->label.''.$obj->label.'' . $obj->description . '' . $obj->description . '' . nl2br(dol_trunc($obj->description, $trunclengh)) . ''.$product_static->getLibStatut(3, 1).''; + print ''; if ($accounting_product_mode == 'ACCOUNTANCY_BUY') { print length_accountg($obj->accountancy_code_buy); if ($obj->accountancy_code_buy && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount")); @@ -430,7 +430,7 @@ if ($result) $defaultvalue=''; if ($accounting_product_mode == 'ACCOUNTANCY_BUY') { // Accounting account buy - print ''; + print ''; //$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha'); This is id and we need a code if (empty($defaultvalue)) $defaultvalue=$compta_prodbuy; $codesell=length_accountg($obj->accountancy_code_buy); From dff30f17a55992df4703e88bfc7dd1b1c096148f Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 16 Jan 2019 19:20:28 +0100 Subject: [PATCH 12/17] Update productaccount.php --- htdocs/accountancy/admin/productaccount.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php index ecc8e1c1e11..bce4f12e559 100644 --- a/htdocs/accountancy/admin/productaccount.php +++ b/htdocs/accountancy/admin/productaccount.php @@ -439,7 +439,7 @@ if ($result) print ''; + print ''; //$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha'); This is id and we need a code if (empty($defaultvalue)) $defaultvalue=$compta_prodsell; $codesell=length_accountg($obj->accountancy_code_sell); From 5810fa9acda8bbd9cddc98298b2d36bbbab96474 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 16 Jan 2019 19:21:19 +0100 Subject: [PATCH 13/17] Update list.php --- htdocs/accountancy/bookkeeping/list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index 6eb86bb78fa..4b0ab08d1b1 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -751,8 +751,8 @@ if ($num > 0) $i++; if ($i == 1) { - if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.price($totalarray['totaldebit']).''.price($totalarray['totalcredit']).''; + print ''; if ($row[0] == 'tobind') { print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind")); @@ -280,7 +280,7 @@ if ($resql) { else print length_accountg($row[0]); print ''; + print ''; if ($row[0] == 'tobind') { print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind")); From 3cc68aca21dfe6d72aa47d7395855a86a44c1618 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 16 Jan 2019 19:23:08 +0100 Subject: [PATCH 15/17] Update index.php --- htdocs/accountancy/expensereport/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php index 5a572df0b1d..b1187b9a480 100644 --- a/htdocs/accountancy/expensereport/index.php +++ b/htdocs/accountancy/expensereport/index.php @@ -195,7 +195,7 @@ if ($resql) { } else print length_accountg($row[0]); print ''; + print ''; if ($row[0] == 'tobind') { print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind")); @@ -268,7 +268,7 @@ if ($resql) { else print length_accountg($row[0]); print ''; + print ''; if ($row[0] == 'tobind') { print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind")); From 551a1a5e58b72380d451edcd60b525071f43a4e5 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 16 Jan 2019 19:23:41 +0100 Subject: [PATCH 16/17] Update lines.php --- htdocs/accountancy/expensereport/lines.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php index f179aab48e2..d8dd122150c 100644 --- a/htdocs/accountancy/expensereport/lines.php +++ b/htdocs/accountancy/expensereport/lines.php @@ -325,7 +325,7 @@ if ($result) { print '' . $codeCompta . ''; + print ''; print img_edit(); print ''; + print ''; if ($row[0] == 'tobind') { print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind")); @@ -266,7 +266,7 @@ if ($resql) { } else print length_accountg($row[0]); print ''; + print ''; if ($row[0] == 'tobind') { print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));