From 37033b04be80bbf09faf8f2b091bb797186e7db1 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Mon, 20 Dec 2021 07:04:12 +0100 Subject: [PATCH 1/4] FIX Accountancy - Separator problem with FEC/FEC2 export format --- .../accountancy/class/accountancyexport.class.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php index 07d28b7abdb..0d0d013a69f 100644 --- a/htdocs/accountancy/class/accountancyexport.class.php +++ b/htdocs/accountancy/class/accountancyexport.class.php @@ -915,7 +915,7 @@ class AccountancyExport print "Montantdevise".$separator; print "Idevise".$separator; print "DateLimitReglmt".$separator; - print "NumFacture".$separator; + print "NumFacture"; print $end_line; foreach ($objectLines as $line) { @@ -997,13 +997,13 @@ class AccountancyExport print $line->multicurrency_amount . $separator; // FEC:Idevise - print $line->multicurrency_code.$separator; + print $line->multicurrency_code . $separator; // FEC_suppl:DateLimitReglmt - print $date_limit_payment; + print $date_limit_payment . $separator; // FEC_suppl:NumFacture - print dol_trunc(self::toAnsi($refInvoice), 17, 'right', 'UTF-8', 1) . $separator; + print dol_trunc(self::toAnsi($refInvoice), 17, 'right', 'UTF-8', 1); print $end_line; } @@ -1042,7 +1042,7 @@ class AccountancyExport print "Montantdevise".$separator; print "Idevise".$separator; print "DateLimitReglmt".$separator; - print "NumFacture".$separator; + print "NumFacture"; print $end_line; foreach ($objectLines as $line) { @@ -1127,10 +1127,10 @@ class AccountancyExport print $line->multicurrency_code . $separator; // FEC_suppl:DateLimitReglmt - print $date_limit_payment; + print $date_limit_payment . $separator; // FEC_suppl:NumFacture - print dol_trunc(self::toAnsi($refInvoice), 17, 'right', 'UTF-8', 1) . $separator; + print dol_trunc(self::toAnsi($refInvoice), 17, 'right', 'UTF-8', 1); print $end_line; From 67b9244c6bbe12c143b0fb1ccc063586ac8b258b Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Mon, 20 Dec 2021 10:36:35 +0100 Subject: [PATCH 2/4] fix: Fatal error: Uncaught Error: Class 'AccountingAccount' not found in /home/httpd/vhosts/doliweb.com/httpdocs/expensereport/card.php on line 2099 --- htdocs/expensereport/card.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index db358964f16..1b82eb777b0 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -2096,6 +2096,7 @@ if ($action == 'create') { $titlealt = ''; if (!empty($conf->accounting->enabled)) { + require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php'; $accountingaccount = new AccountingAccount($db); $resaccountingaccount = $accountingaccount->fetch(0, $line->type_fees_accountancy_code, 1); //$titlealt .= ''; From 520c2966267d126aa501e2b74b925905fbfddbb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Mon, 20 Dec 2021 16:04:32 +0100 Subject: [PATCH 3/4] add url in receipt printer options --- htdocs/core/class/dolreceiptprinter.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php index 2062f1b351c..6ea3219ebb0 100644 --- a/htdocs/core/class/dolreceiptprinter.class.php +++ b/htdocs/core/class/dolreceiptprinter.class.php @@ -221,6 +221,7 @@ class dolReceiptPrinter extends Printer 'dol_value_mysoc_idprof6' => 'ProfId6', 'dol_value_mysoc_tva_intra' => 'VATIntra', 'dol_value_mysoc_capital' => 'Capital', + 'dol_value_mysoc_url' => 'Web', 'dol_value_vendor_lastname' => 'VendorLastname', 'dol_value_vendor_firstname' => 'VendorFirstname', 'dol_value_vendor_mail' => 'VendorEmail', @@ -607,6 +608,7 @@ class dolReceiptPrinter extends Printer $this->template = str_replace('{dol_value_mysoc_idprof6}', $mysoc->idprof6, $this->template); $this->template = str_replace('{dol_value_mysoc_tva_intra}', $mysoc->tva_intra, $this->template); $this->template = str_replace('{dol_value_mysoc_capital}', $mysoc->capital, $this->template); + $this->template = str_replace('{dol_value_mysoc_url}', $mysoc->url, $this->template); $this->template = str_replace('{dol_value_vendor_firstname}', $user->firstname, $this->template); $this->template = str_replace('{dol_value_vendor_lastname}', $user->lastname, $this->template); From 214feeb1f36405bc97375ba14b3c52ca48e67e42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 21 Dec 2021 10:05:06 +0100 Subject: [PATCH 4/4] Update dolreceiptprinter.class.php --- htdocs/core/class/dolreceiptprinter.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php index 6ea3219ebb0..e259627fe22 100644 --- a/htdocs/core/class/dolreceiptprinter.class.php +++ b/htdocs/core/class/dolreceiptprinter.class.php @@ -674,9 +674,9 @@ class dolReceiptPrinter extends Printer $vatarray[$line->tva_tx] += $line->total_tva; } foreach ($vatarray as $vatkey => $vatvalue) { - $spacestoadd = $nbcharactbyline - strlen($vatkey) - 12; - $spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0); - $this->printer->text($spaces.$vatkey.'% '.str_pad(price($vatvalue), 10, ' ', STR_PAD_LEFT)."\n"); + $spacestoadd = $nbcharactbyline - strlen($vatkey) - 12; + $spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0); + $this->printer->text($spaces.$vatkey.'% '.str_pad(price($vatvalue), 10, ' ', STR_PAD_LEFT)."\n"); } break; case 'DOL_PRINT_OBJECT_TAX1':