From e6af47e3d3275f3e9d684c9045434f673ece3bd8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 21 Dec 2010 01:35:08 +0000
Subject: [PATCH] Fix: Maxi debug for 3.0
---
htdocs/compta/paiement/cheque/fiche.php | 3 +-
htdocs/compta/paiement/cheque/liste.php | 2 +-
htdocs/includes/menus/init_menu_auguria.sql | 2 +-
htdocs/includes/menus/init_menu_iphone.sql | 2 +-
htdocs/includes/menus/standard/eldy.lib.php | 4 +-
.../modules/cheque/pdf/pdf_blochet.class.php | 83 ++++++++++---------
htdocs/langs/ar_AR/banks.lang | 1 -
htdocs/langs/da_DA/banks.lang | 1 -
htdocs/langs/en_US/banks.lang | 2 +-
htdocs/langs/fi_FI/banks.lang | 1 -
htdocs/langs/is_IS/banks.lang | 1 -
htdocs/langs/nl_BE/banks.lang | 1 -
htdocs/langs/pl_PL/banks.lang | 1 -
htdocs/langs/ro_RO/banks.lang | 1 -
htdocs/langs/ru_RU/banks.lang | 1 -
htdocs/langs/sv_SV/banks.lang | 1 -
htdocs/langs/tr_TR/banks.lang | 1 -
htdocs/langs/zh_CN/banks.lang | 1 -
htdocs/lib/pdf.lib.php | 57 ++++++++-----
19 files changed, 87 insertions(+), 79 deletions(-)
diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php
index ae009749eff..f39ba87e8a7 100644
--- a/htdocs/compta/paiement/cheque/fiche.php
+++ b/htdocs/compta/paiement/cheque/fiche.php
@@ -421,9 +421,10 @@ else
dol_print_error($db);
}
+ dol_fiche_end();
}
-if ($_GET['action'] == 'new') dol_fiche_end();
+
/*
diff --git a/htdocs/compta/paiement/cheque/liste.php b/htdocs/compta/paiement/cheque/liste.php
index 24cbe6ad5fd..f30f3a146f4 100644
--- a/htdocs/compta/paiement/cheque/liste.php
+++ b/htdocs/compta/paiement/cheque/liste.php
@@ -78,7 +78,7 @@ if ($resql)
$num = $db->num_rows($resql);
$i = 0;
- print_barre_liste($langs->trans("ChequesReceipts"), $page, "liste.php",$paramlist,$sortfield,$sortorder,'',$num);
+ print_barre_liste($langs->trans("MenuChequeDeposits"), $page, "liste.php",$paramlist,$sortfield,$sortorder,'',$num);
print '<form method="get" action="liste.php">';
print '<table class="liste" width="100%">';
diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql
index d609854f8fd..4996516c86e 100644
--- a/htdocs/includes/menus/init_menu_auguria.sql
+++ b/htdocs/includes/menus/init_menu_auguria.sql
@@ -225,7 +225,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk
-- Check deposit
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->facture->enabled && $conf->banque->enabled', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', '', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank', 'MenuChequeDeposits', 0, 'bills', '$user->rights->facture->lire', '', 2, 9, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->facture->enabled && $conf->banque->enabled && $leftmenu=="checks"', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new', 'NewCheckDeposit', 1, 'bills', '$user->rights->facture->lire', '', 2, 0, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->facture->enabled && $conf->banque->enabled && $leftmenu=="checks"', __HANDLER__, 'left', 1713__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/liste.php?leftmenu=checks', 'MenuChequesReceipts', 1, 'bills', '$user->rights->facture->lire', '', 2, 1, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->facture->enabled && $conf->banque->enabled && $leftmenu=="checks"', __HANDLER__, 'left', 1713__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/liste.php?leftmenu=checks', 'List', 1, 'bills', '$user->rights->facture->lire', '', 2, 1, __ENTITY__);
-- Withdrawal
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->prelevement->enabled', __HANDLER__, 'left', 2500__+MAX_llx_menu__, 'accountancy', '', 14__+MAX_llx_menu__, '/compta/prelevement/index.php?leftmenu=withdraw&mainmenu=bank', 'StandingOrders', 0, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 9, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2502__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/create.php?leftmenu=withdraw', 'NewStandingOrder', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 0, __ENTITY__);
diff --git a/htdocs/includes/menus/init_menu_iphone.sql b/htdocs/includes/menus/init_menu_iphone.sql
index 25cc22734a6..061670c6122 100644
--- a/htdocs/includes/menus/init_menu_iphone.sql
+++ b/htdocs/includes/menus/init_menu_iphone.sql
@@ -223,7 +223,7 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk
--- Check deposit
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->facture->enabled && $conf->banque->enabled', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', '', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank', 'MenuChequeDeposits', 0, 'bills', '$user->rights->facture->lire', '', 2, 9, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->facture->enabled && $conf->banque->enabled && $leftmenu=="checks"', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new', 'NewCheckDeposit', 1, 'bills', '$user->rights->facture->lire', '', 2, 0, __ENTITY__);
-insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->facture->enabled && $conf->banque->enabled && $leftmenu=="checks"', __HANDLER__, 'left', 1713__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/liste.php?leftmenu=checks', 'MenuChequesReceipts', 1, 'bills', '$user->rights->facture->lire', '', 2, 1, __ENTITY__);
+insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->facture->enabled && $conf->banque->enabled && $leftmenu=="checks"', __HANDLER__, 'left', 1713__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/liste.php?leftmenu=checks', 'List', 1, 'bills', '$user->rights->facture->lire', '', 2, 1, __ENTITY__);
-- Prelevement
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->prelevement->enabled', __HANDLER__, 'left', 2500__+MAX_llx_menu__, 'accountancy', '', 14__+MAX_llx_menu__, '/compta/prelevement/index.php?leftmenu=withdraw&mainmenu=bank', 'StandingOrders', 0, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 9, __ENTITY__);
insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$conf->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2502__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/create.php?leftmenu=withdraw', 'NewStandingOrder', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 0, __ENTITY__);
diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php
index 683ed729ede..0eea203585e 100644
--- a/htdocs/includes/menus/standard/eldy.lib.php
+++ b/htdocs/includes/menus/standard/eldy.lib.php
@@ -1067,7 +1067,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
{
$newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank",$langs->trans("MenuChequeDeposits"),0,$user->rights->banque->cheque);
if (preg_match("/checks/i",$leftmenu)) $newmenu->add("/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new&mainmenu=bank",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->cheque);
- if (preg_match("/checks/i",$leftmenu)) $newmenu->add("/compta/paiement/cheque/liste.php?leftmenu=checks&mainmenu=bank",$langs->trans("MenuChequesReceipts"),1,$user->rights->banque->cheque);
+ if (preg_match("/checks/i",$leftmenu)) $newmenu->add("/compta/paiement/cheque/liste.php?leftmenu=checks&mainmenu=bank",$langs->trans("List"),1,$user->rights->banque->cheque);
}
}
@@ -1383,7 +1383,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
$tabstring.=' ';
}
}
-
+
// For external modules
$url = dol_buildpath($menu_array[$i]['url'], 1);
diff --git a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
index 961d255090e..c78ca660027 100644
--- a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
+++ b/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
@@ -201,38 +201,38 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
$title = $outputlangs->transnoentities("CheckReceipt");
$pdf->SetFont('','B',10);
- $pdf->Text(10, 10, $title);
+ $pdf->SetXY(10,8);
+ $pdf->MultiCell(0,2,$title,0,'L');
$pdf->SetFont('','',10);
- $pdf->Text(10, 19, $outputlangs->transnoentities("Numero"));
-
+ $pdf->SetXY(10,14);
+ $pdf->MultiCell(22,2,$outputlangs->transnoentities("Ref"),0,'L');
+ $pdf->SetXY(32,14);
$pdf->SetFont('','',10);
- $pdf->Text(10, 27, $outputlangs->transnoentities("Date") );
+ $pdf->MultiCell(60, 2, $outputlangs->convToOutputCharset($this->number), 0, 'L');
$pdf->SetFont('','',10);
- $pdf->Text(10, 35, $outputlangs->transnoentities("Owner"));
-
- $pdf->SetFont('','B',10);
- $pdf->Text(32, 35, $outputlangs->convToOutputCharset($this->account->proprio));
-
- $pdf->SetFont('','B',10);
- $pdf->Text(32, 19, $outputlangs->convToOutputCharset($this->number));
-
- $pdf->SetFont('','B',10);
- $pdf->Text(32, 27, dol_print_date($this->date,"day",false,$outputlangs));
-
+ $pdf->SetXY(10,20);
+ $pdf->MultiCell(22,2,$outputlangs->transnoentities("Date"),0,'L');
+ $pdf->SetXY(32,20);
+ $pdf->SetFont('','',10);
+ $pdf->MultiCell(60, 2, dol_print_date($this->date,"day",false,$outputlangs));
$pdf->SetFont('','',10);
- $pdf->Text(10, 43, $outputlangs->transnoentities("Account"));
+ $pdf->SetXY(10,26);
+ $pdf->MultiCell(22,2,$outputlangs->transnoentities("Owner"),0,'L');
+ $pdf->SetFont('','',10);
+ $pdf->SetXY(32,26);
+ $pdf->MultiCell(60,2,$outputlangs->convToOutputCharset($this->account->proprio),0,'L');
- $pdf->SetFont('','B',10);
- $pdf->Text(32, 43, $outputlangs->convToOutputCharset($this->account->code_banque));
- $pdf->Text(51, 43, $outputlangs->convToOutputCharset($this->account->code_guichet));
- $pdf->Text(68, 43, $outputlangs->convToOutputCharset($this->account->number));
- $pdf->Text(104, 43, $outputlangs->convToOutputCharset($this->account->cle_rib));
+ $pdf->SetFont('','',10);
+ $pdf->SetXY(10,32);
+ $pdf->MultiCell(0,2,$outputlangs->transnoentities("Account"),0,'L');
+ pdf_bank($pdf,$outputlangs,32,30,$this->account,1);
$pdf->SetFont('','',10);
- $pdf->Text(114, 19, $outputlangs->transnoentities("Signature"));
+ $pdf->SetXY(114,16);
+ $pdf->MultiCell(40, 2, $outputlangs->transnoentities("Signature"), 0, 'L');
$pdf->Rect(9, 47, 192, 7);
$pdf->line(55, 47, 55, 54);
@@ -240,46 +240,51 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
$pdf->line(170, 47, 170, 54);
$pdf->SetFont('','',10);
- $pdf->Text(10, 52, $outputlangs->transnoentities("NumberOfCheques"));
+ $pdf->SetXY(10,49);
+ $pdf->MultiCell(40, 2, $outputlangs->transnoentities("NumberOfCheques"), 0, 'L');
$pdf->SetFont('','B',10);
- $pdf->Text(57, 52, $this->nbcheque);
+ $pdf->SetXY(57,49);
+ $pdf->MultiCell(40, 2, $this->nbcheque, 0, 'L');
$pdf->SetFont('','',10);
- $pdf->Text(148, 52, "Total");
+ $pdf->SetXY(148,49);
+ $pdf->MultiCell(40, 2, $langs->trans("Total"));
$pdf->SetFont('','B',10);
- $pdf->SetXY (170, 47);
- $pdf->MultiCell(31, 7, price($this->amount), 0, 'C', 0);
+ $pdf->SetXY (170, 49);
+ $pdf->MultiCell(31, 2, price($this->amount), 0, 'C', 0);
// Tableau
$pdf->SetFont('','',8);
- $pdf->Text(11,$this->tab_top + 6,$outputlangs->transnoentities("Num"));
+ $pdf->SetXY (11, $this->tab_top+2);
+ $pdf->MultiCell(40,2,$outputlangs->transnoentities("Num"), 0, 'L');
$pdf->line(40, $this->tab_top, 40, $this->tab_top + $this->tab_height + 10);
- $pdf->Text(41,$this->tab_top + 6,$outputlangs->transnoentities("Bank"));
+ $pdf->SetXY (41, $this->tab_top+2);
+ $pdf->MultiCell(40,2,$outputlangs->transnoentities("Bank"), 0, 'L');
$pdf->line(100, $this->tab_top, 100, $this->tab_top + $this->tab_height + 10);
- $pdf->Text(101, $this->tab_top + 6, $outputlangs->transnoentities("CheckTransmitter"));
+ $pdf->SetXY (101, $this->tab_top+2);
+ $pdf->MultiCell(40,2,$outputlangs->transnoentities("CheckTransmitter"), 0, 'L');
$pdf->line(180, $this->tab_top, 180, $this->tab_top + $this->tab_height + 10);
- $pdf->SetXY (180, $this->tab_top);
- $pdf->MultiCell(20, 10, $outputlangs->transnoentities("Amount"), 0, 'R');
+ $pdf->SetXY (180, $this->tab_top+2);
+ $pdf->MultiCell(20,2,$outputlangs->transnoentities("Amount"), 0, 'R');
$pdf->line(9, $this->tab_top + 10, 201, $this->tab_top + 10 );
$pdf->Rect(9, $this->tab_top, 192, $this->tab_height + 10);
$pdf->Rect(9, 14, 192, 31);
- $pdf->line(9, 22, 112, 22);
- $pdf->line(9, 30, 112, 30);
- $pdf->line(9, 38, 112, 38);
+ $pdf->line(9, 19, 112, 19);
+ $pdf->line(9, 25, 112, 25);
+ $pdf->line(9, 31, 112, 31);
$pdf->line(30, 14, 30, 45);
- $pdf->line(48, 38, 48, 45);
- $pdf->line(66, 38, 66, 45);
- $pdf->line(102, 38, 102, 45);
+ //$pdf->line(48, 38, 48, 45);
+ //$pdf->line(66, 38, 66, 45);
+ //$pdf->line(102, 38, 102, 45);
$pdf->line(112, 14, 112, 45);
-
}
diff --git a/htdocs/langs/ar_AR/banks.lang b/htdocs/langs/ar_AR/banks.lang
index 7e9afac7142..8e4102a468d 100644
--- a/htdocs/langs/ar_AR/banks.lang
+++ b/htdocs/langs/ar_AR/banks.lang
@@ -53,7 +53,6 @@ IOMonthlyReporting=تقارير شهرية
BankAccountDomiciliation=معالجة حساب
BankAccountOwner=اسم صاحب الحساب
BankAccountOwnerAddress=معالجة حساب المالك
-RIBControlError=Inetgrity من القيم والضوابط لا. وهذا يعني لهذه المعلومات رقم الحساب ليست كاملة أو خاطئة (ارجع الى البلد ، والأرقام وإيبان).
CreateAccount=إنشاء حساب
StandingOrderToProcess=لعملية
StandingOrderProcessed=تجهيز
diff --git a/htdocs/langs/da_DA/banks.lang b/htdocs/langs/da_DA/banks.lang
index 91a8cb4fa8e..ec6926781d6 100644
--- a/htdocs/langs/da_DA/banks.lang
+++ b/htdocs/langs/da_DA/banks.lang
@@ -55,7 +55,6 @@ IOMonthlyReporting=Månedlig rapportering
BankAccountDomiciliation=Account adresse
BankAccountOwner=Account ejerens navn
BankAccountOwnerAddress=Konto ejer adresse
-RIBControlError=Inetgrity kontrol af værdier mislykkes. Dette betyder for denne konto nummer ikke er komplette eller forkert (check land, numre og IBAN).
CreateAccount=Opret konto
StandingOrderToProcess=Til at behandle
StandingOrderProcessed=Forarbejdede
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index af8c7a28f7d..e6b24592b3e 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -45,7 +45,7 @@ BankAccountDomiciliation=Account address
BankAccountCountry=Account country
BankAccountOwner=Account owner name
BankAccountOwnerAddress=Account owner address
-RIBControlError=Inetgrity checks of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
+RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
CreateAccount=Create account
NewAccount=New account
NewBankAccount=New bank account
diff --git a/htdocs/langs/fi_FI/banks.lang b/htdocs/langs/fi_FI/banks.lang
index 41fd31d820a..6f50ebb90a5 100644
--- a/htdocs/langs/fi_FI/banks.lang
+++ b/htdocs/langs/fi_FI/banks.lang
@@ -53,7 +53,6 @@ IOMonthlyReporting=Kuukausittainen raportointi
BankAccountDomiciliation=Huomioon osoite
BankAccountOwner=Tilin omistajan nimi
BankAccountOwnerAddress=Tilin omistajan osoite
-RIBControlError=Inetgrity tarkastusten arvot epäonnistuu. Tämä tarkoittaa tietoa tämän tilin numero eivät ole täydellisiä tai väärin (tarkista maassa, numerot ja IBAN).
CreateAccount=Luo tili
StandingOrderToProcess=Käsitellä
StandingOrderProcessed=Jalostettu
diff --git a/htdocs/langs/is_IS/banks.lang b/htdocs/langs/is_IS/banks.lang
index d94ca96cd8b..92cddd4c353 100644
--- a/htdocs/langs/is_IS/banks.lang
+++ b/htdocs/langs/is_IS/banks.lang
@@ -53,7 +53,6 @@ BankAccountDomiciliation=Reikningur heimilisfang
BankAccountCountry=Reikningur landi
BankAccountOwner=Eigandi reiknings Nafn
BankAccountOwnerAddress=Eigandi reiknings Heimilisfang
-RIBControlError=Inetgrity athugunum á gildi mistakast. Þetta þýðir að upplýsingar um þennan reikning númer eru ekki lokið eða rangt (athugaðu landi, tölur og IBAN).
CreateAccount=Búa til reikning
NewAccount=Nýr reikningur
NewBankAccount=Nýr bankareikningur
diff --git a/htdocs/langs/nl_BE/banks.lang b/htdocs/langs/nl_BE/banks.lang
index cdbc6ef660a..8916c61ce4f 100644
--- a/htdocs/langs/nl_BE/banks.lang
+++ b/htdocs/langs/nl_BE/banks.lang
@@ -44,7 +44,6 @@ IOMonthlyReporting=Maandelijkse rapportage
BankAccountDomiciliation=Bank adres
BankAccountOwner=Rekeninghouder naam
BankAccountOwnerAddress=Rekeninghouder adres
-RIBControlError=Inetgrity controles van waarden is mislukt. Dit betekent dat de informatie voor dit rekeningnummer niet volledig of onjuist is(check land, nummers en IBAN).
CreateAccount=Maak rekening
StandingOrderToProcess=Te verwerken
StandingOrderProcessed=Verwerkt
diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang
index 95f51aca1b5..4d2a80b0429 100644
--- a/htdocs/langs/pl_PL/banks.lang
+++ b/htdocs/langs/pl_PL/banks.lang
@@ -55,7 +55,6 @@ IOMonthlyReporting=Miesiąc sprawozdawczy
BankAccountDomiciliation=Konto adres
BankAccountOwner=Nazwa właściciela konta
BankAccountOwnerAddress=Adres właściciela konta
-RIBControlError=Inetgrity kontroli wartości kończy się niepowodzeniem. Oznacza to, że informacje na ten numer konta nie są kompletne lub błędne (sprawdź kraju, liczby i IBAN).
CreateAccount=Załóż konto
StandingOrderToProcess=Do procesu
StandingOrderProcessed=Przetworzone
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index 19a6130e61e..92d3abddf4b 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -53,7 +53,6 @@ IOMonthlyReporting=Lunar de raportare
BankAccountDomiciliation=Contul adresa
BankAccountOwner=Contul numele proprietarului
BankAccountOwnerAddress=Contul adresa proprietarului
-RIBControlError=Inetgrity controale de valori nu reuşeşte. Aceasta înseamnă că pentru acest număr de cont nu sunt complete sau greşit (verifica tara, numere şi IBAN).
CreateAccount=Crearea contului
StandingOrderToProcess=Pentru a procesa
StandingOrderProcessed=Prelucrate
diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang
index c3be7e85891..b3518e79bc8 100644
--- a/htdocs/langs/ru_RU/banks.lang
+++ b/htdocs/langs/ru_RU/banks.lang
@@ -53,7 +53,6 @@ IOMonthlyReporting=Ежемесячная отчетность
BankAccountDomiciliation=Счет адрес
BankAccountOwner=Имя владельца счета
BankAccountOwnerAddress=Адрес владельца счета
-RIBControlError=Inetgrity проверки значений сбой. Это значит, для этого номера счета не являются полными или неправильно (проверка страны, цифры и IBAN).
CreateAccount=Создать аккаунт
StandingOrderToProcess=Для обработки
StandingOrderProcessed=Обработано
diff --git a/htdocs/langs/sv_SV/banks.lang b/htdocs/langs/sv_SV/banks.lang
index e8cb8110480..e1cbef87f05 100644
--- a/htdocs/langs/sv_SV/banks.lang
+++ b/htdocs/langs/sv_SV/banks.lang
@@ -53,7 +53,6 @@ BankAccountDomiciliation=Konto adress
BankAccountCountry=Konto land
BankAccountOwner=Konto ägare namn
BankAccountOwnerAddress=Konto ägare adress
-RIBControlError=Inetgrity kontroller av värden misslyckas. Det innebär information för denna kontonummer är ofullständiga eller fel (kontrollera land, siffror och IBAN).
CreateAccount=Skapa konto
NewAccount=Nytt konto
NewBankAccount=Nytt bankkonto
diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang
index 5ef3e1bd012..c8c5fb49aa3 100644
--- a/htdocs/langs/tr_TR/banks.lang
+++ b/htdocs/langs/tr_TR/banks.lang
@@ -52,7 +52,6 @@ IOMonthlyReporting=Aylık raporlama
BankAccountDomiciliation=Hesap adresi
BankAccountOwner=Hesap sahibi adı
BankAccountOwnerAddress=Hesap sahibi adresi
-RIBControlError=Değerler Inetgrity denetler başarısız olur. Bu, bu hesap numarası bilgi anlamına gelir tam olmayan veya yanlış (onay ülke, sayılar ve IBAN).
CreateAccount=Hesap oluşturun
StandingOrderToProcess=Işlemek için
StandingOrderProcessed=İşlenmiş
diff --git a/htdocs/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang
index fe8ae2f9d6a..7eaf041c6ae 100644
--- a/htdocs/langs/zh_CN/banks.lang
+++ b/htdocs/langs/zh_CN/banks.lang
@@ -52,7 +52,6 @@ IOMonthlyReporting=每月报告
BankAccountDomiciliation=帐户地址
BankAccountOwner=帐户持有人姓名
BankAccountOwnerAddress=帐户持有人地址
-RIBControlError=价值Inetgrity检查失败。这意味着该帐号信息不完整或错误（检查国家，数字和银行IBAN）。
CreateAccount=创建帐户
NewAccount=新帐户
NewBankAccount=新的银行帐户
diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php
index a7df27e01e5..b81a855b2d3 100644
--- a/htdocs/lib/pdf.lib.php
+++ b/htdocs/lib/pdf.lib.php
@@ -286,15 +286,20 @@ function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text)
* @param curx X
* @param cury Y
* @param account Bank account object
+ * @param onlynumber Output only number
*/
-function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account)
+function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0)
{
global $mysoc, $conf;
$pdf->SetXY ($curx, $cury);
- $pdf->SetFont('','B',8);
- $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0);
- $cury+=4;
+
+ if (empty($onlynumber))
+ {
+ $pdf->SetFont('','B',8);
+ $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0);
+ $cury+=4;
+ }
$outputlangs->load("banks");
@@ -305,15 +310,17 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account)
{
$savcurx=$curx;
- $pdf->SetFont('','',6);
- $pdf->SetXY ($curx, $cury);
- $pdf->MultiCell(90, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
- $cury+=3;
+ if (empty($onlynumber))
+ {
+ $pdf->SetFont('','',6);
+ $pdf->SetXY ($curx, $cury);
+ $pdf->MultiCell(90, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
+ $cury+=3;
+ }
- $pdf->line($curx+1, $cury+1, $curx+1, $cury+10 );
+ if (empty($onlynumber)) $pdf->line($curx+1, $cury+1, $curx+1, $cury+8 );
$fieldstoshow=array('bank','desk','number','key');
-
if ($conf->global->BANK_SHOW_ORDER_OPTION==1) $fieldstoshow=array('bank','desk','key','number');
foreach ($fieldstoshow as $val)
@@ -322,45 +329,45 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account)
{
// Bank code
$tmplength=18;
- $pdf->SetXY ($curx, $cury+6);
+ $pdf->SetXY ($curx, $cury+5);
$pdf->SetFont('','',8);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->code_banque), 0, 'C', 0);
$pdf->SetXY ($curx, $cury+1);
$curx+=$tmplength;
$pdf->SetFont('','B',6);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("BankCode"), 0, 'C', 0);
- $pdf->line($curx, $cury+1, $curx, $cury+10 );
+ if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8 );
}
if ($val == 'desk')
{
// Desk
$tmplength=18;
- $pdf->SetXY ($curx, $cury+6);
+ $pdf->SetXY ($curx, $cury+5);
$pdf->SetFont('','',8);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->code_guichet), 0, 'C', 0);
$pdf->SetXY ($curx, $cury+1);
$curx+=$tmplength;
$pdf->SetFont('','B',6);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("DeskCode"), 0, 'C', 0);
- $pdf->line($curx, $cury+1, $curx, $cury+10 );
+ if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8 );
}
if ($val == 'number')
{
// Number
$tmplength=24;
- $pdf->SetXY ($curx, $cury+6);
+ $pdf->SetXY ($curx, $cury+5);
$pdf->SetFont('','',8);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->number), 0, 'C', 0);
$pdf->SetXY ($curx, $cury+1);
$curx+=$tmplength;
$pdf->SetFont('','B',6);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("BankAccountNumber"), 0, 'C', 0);
- $pdf->line($curx, $cury+1, $curx, $cury+10 );
+ if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8 );
}
if ($val == 'key')
{
// Key
$tmplength=13;
- $pdf->SetXY ($curx, $cury+6);
+ $pdf->SetXY ($curx, $cury+5);
$pdf->SetFont('','',8);$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($account->cle_rib), 0, 'C', 0);
$pdf->SetXY ($curx, $cury+1);
$curx+=$tmplength;
$pdf->SetFont('','B',6);$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities("BankAccountNumberKey"), 0, 'C', 0);
- $pdf->line($curx, $cury+1, $curx, $cury+10 );
+ if (empty($onlynumber)) $pdf->line($curx, $cury+1, $curx, $cury+8 );
}
}
@@ -387,11 +394,17 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account)
if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
$pdf->SetFont('','',6);
- $pdf->SetXY ($curx, $cury+12);
- $pdf->MultiCell(90, 3, $outputlangs->transnoentities("Residence").': ' . $outputlangs->convToOutputCharset($account->domiciliation), 0, 'L', 0);
- $pdf->SetXY ($curx, $cury+22);
+
+ if (empty($onlynumber))
+ {
+ $cury+=10;
+ $pdf->SetXY ($curx, $cury);
+ $pdf->MultiCell(90, 3, $outputlangs->transnoentities("Residence").': ' . $outputlangs->convToOutputCharset($account->domiciliation), 0, 'L', 0);
+ }
+
+ $pdf->SetXY ($curx, $cury+9);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities($ibankey).': ' . $outputlangs->convToOutputCharset($account->iban), 0, 'L', 0);
- $pdf->SetXY ($curx, $cury+25);
+ $pdf->SetXY ($curx, $cury+12);
$pdf->MultiCell(90, 3, $outputlangs->transnoentities($bickey).': ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0);
return $pdf->getY();
--
GitLab