lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename "Reconciled" with "BankLineReconciled" for bank conciliation

Browse Source
This commit is contained in:
Laurent Destailleur 2022-03-25 14:43:48 +01:00
parent 8d2d0f1e84
commit 644e509265
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/class/subscription.class.php
View File

@ -358,7 +358,7 @@ class Subscription extends CommonObject
$result = $member->update_end_date($user); $result = $member->update_end_date($user);
if ($this->fk_bank > 0 && is_object($accountline) && $accountline->id > 0) { // If we found bank account line (this means this->fk_bank defined) if ($this->fk_bank > 0 && is_object($accountline) && $accountline->id > 0) { // If we found bank account line (this means this->fk_bank defined)
$result = $accountline->delete($user); // Return false if refused because line is conciliated $result = $accountline->delete($user); // Return false if refused because line is reconciled
if ($result > 0) { if ($result > 0) {
$this->db->commit(); $this->db->commit();
return 1; return 1;

2
htdocs/compta/bank/bankentries_list.php
View File

@ -170,7 +170,7 @@ $arrayfields = array(
'balancebefore'=>array('label'=>$langs->trans("BalanceBefore"), 'checked'=>0, 'position'=>1000), 'balancebefore'=>array('label'=>$langs->trans("BalanceBefore"), 'checked'=>0, 'position'=>1000),
'balance'=>array('label'=>$langs->trans("Balance"), 'checked'=>1, 'position'=>1001), 'balance'=>array('label'=>$langs->trans("Balance"), 'checked'=>1, 'position'=>1001),
'b.num_releve'=>array('label'=>$langs->trans("AccountStatement"), 'checked'=>1, 'position'=>1010), 'b.num_releve'=>array('label'=>$langs->trans("AccountStatement"), 'checked'=>1, 'position'=>1010),
'b.conciliated'=>array('label'=>$langs->trans("Conciliated"), 'enabled'=> $object->rappro, 'checked'=>($action == 'reconcile' ? 1 : 0), 'position'=>1020), 'b.conciliated'=>array('label'=>$langs->trans("BankLineReconciled"), 'enabled'=> $object->rappro, 'checked'=>($action == 'reconcile' ? 1 : 0), 'position'=>1020),
); );
// Extra fields // Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php'; include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';

4
htdocs/compta/paiement/cheque/class/remisecheque.class.php
View File

@ -730,7 +730,7 @@ class RemiseCheque extends CommonObject
$bankline = new AccountLine($db); $bankline = new AccountLine($db);
$bankline->fetch($bank_id); $bankline->fetch($bank_id);
/* Conciliation is allowed because when check is returned, a new line is created onto bank transaction log. /* Reconciliation is allowed because when check is returned, a new line is created onto bank transaction log.
if ($bankline->rappro) if ($bankline->rappro)
{ {
$this->error='ActionRefusedLineAlreadyConciliated'; $this->error='ActionRefusedLineAlreadyConciliated';
@ -739,7 +739,7 @@ class RemiseCheque extends CommonObject
$this->db->begin(); $this->db->begin();
// Not conciliated, we can delete it // Not reconciled, we can delete it
//$bankline->delete($user); // We delete //$bankline->delete($user); // We delete
$bankaccount = $payment->fk_account; $bankaccount = $payment->fk_account;

2
htdocs/core/lib/functions2.lib.php
View File

@ -628,7 +628,7 @@ function dol_print_object_info($object, $usetable = 0)
if ($usetable) { if ($usetable) {
print '<tr><td class="titlefield">'; print '<tr><td class="titlefield">';
} }
print $langs->trans("ConciliatedBy"); print $langs->trans("ReconciledBy");
if ($usetable) { if ($usetable) {
print '</td><td>'; print '</td><td>';
} else { } else {

2
htdocs/core/modules/modBanque.class.php
View File

@ -151,7 +151,7 @@ class modBanque extends DolibarrModules
$this->export_fields_array[$r] = array( $this->export_fields_array[$r] = array(
'b.rowid'=>'IdTransaction', 'ba.ref'=>'AccountRef', 'ba.label'=>'AccountLabel', 'b.datev'=>'DateValue', 'b.dateo'=>'DateOperation', 'b.label'=>'Label', 'b.rowid'=>'IdTransaction', 'ba.ref'=>'AccountRef', 'ba.label'=>'AccountLabel', 'b.datev'=>'DateValue', 'b.dateo'=>'DateOperation', 'b.label'=>'Label',
'b.num_chq'=>'ChequeOrTransferNumber', 'b.fk_bordereau'=>'ChequeBordereau', '-b.amount'=>'Debit', 'b.amount'=>'Credit', 'b.num_chq'=>'ChequeOrTransferNumber', 'b.fk_bordereau'=>'ChequeBordereau', '-b.amount'=>'Debit', 'b.amount'=>'Credit',
'b.num_releve'=>'AccountStatement', 'b.rappro'=>'Conciliated', 'b.datec'=>"DateCreation", "bu.url_id"=>"IdThirdParty", 'b.num_releve'=>'AccountStatement', 'b.rappro'=>'BankLineReconciled', 'b.datec'=>"DateCreation", "bu.url_id"=>"IdThirdParty",
"s.nom"=>"ThirdParty", "s.code_compta"=>"CustomerAccountancyCode", "s.code_compta_fournisseur"=>"SupplierAccountancyCode" "s.nom"=>"ThirdParty", "s.code_compta"=>"CustomerAccountancyCode", "s.code_compta_fournisseur"=>"SupplierAccountancyCode"
); );
$this->export_TypeFields_array[$r] = array('ba.ref'=>'Text', 'ba.label'=>'Text', 'b.datev'=>'Date', 'b.dateo'=>'Date', 'b.label'=>'Text', 'b.num_chq'=>'Text', 'b.fk_bordereau'=>'Text', '-b.amount'=>'Numeric', 'b.amount'=>'Numeric', 'b.num_releve'=>'Text', 'b.rappro'=>'Boolean', 'b.datec'=>"Date", "bu.url_id"=>"Text", "s.nom"=>"Text", "s.code_compta"=>"Text", "s.code_compta_fournisseur"=>"Text"); $this->export_TypeFields_array[$r] = array('ba.ref'=>'Text', 'ba.label'=>'Text', 'b.datev'=>'Date', 'b.dateo'=>'Date', 'b.label'=>'Text', 'b.num_chq'=>'Text', 'b.fk_bordereau'=>'Text', '-b.amount'=>'Numeric', 'b.amount'=>'Numeric', 'b.num_releve'=>'Text', 'b.rappro'=>'Boolean', 'b.datec'=>"Date", "bu.url_id"=>"Text", "s.nom"=>"Text", "s.code_compta"=>"Text", "s.code_compta_fournisseur"=>"Text");

6
htdocs/langs/en_US/banks.lang
View File

@ -95,11 +95,11 @@ LineRecord=Transaction
AddBankRecord=Add entry AddBankRecord=Add entry
AddBankRecordLong=Add entry manually AddBankRecordLong=Add entry manually
Conciliated=Reconciled Conciliated=Reconciled
ConciliatedBy=Reconciled by ReConciliedBy=Reconciled by
DateConciliating=Reconcile date DateConciliating=Reconcile date
BankLineConciliated=Entry reconciled with bank receipt BankLineConciliated=Entry reconciled with bank receipt
Reconciled=Reconciled BankLineReconciled=Reconciled
NotReconciled=Not reconciled BankLineNotReconciled=Not reconciled
CustomerInvoicePayment=Customer payment CustomerInvoicePayment=Customer payment
SupplierInvoicePayment=Vendor payment SupplierInvoicePayment=Vendor payment
SubscriptionPayment=Subscription payment SubscriptionPayment=Subscription payment