From dd913b2385b2387a9d216498cd059a37e377cc17 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Wed, 31 Mar 2021 20:40:26 +0200 Subject: [PATCH] Update --- htdocs/accountancy/class/accountancyimport.class.php | 4 ++-- htdocs/core/modules/modAccounting.class.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/accountancy/class/accountancyimport.class.php b/htdocs/accountancy/class/accountancyimport.class.php index c27ff6911ed..230aa392cd7 100644 --- a/htdocs/accountancy/class/accountancyimport.class.php +++ b/htdocs/accountancy/class/accountancyimport.class.php @@ -48,7 +48,7 @@ class AccountancyImport * @param array $listvalues Values list to add * @return int <0 if KO, >0 if OK */ - public function computeMontant(&$arrayrecord, $fieldname, &$listfields, &$listvalues) { + public function computeAmount(&$arrayrecord, $fieldname, &$listfields, &$listvalues) { $fieldArr = explode('.', $fieldname); if (count($fieldArr) > 0) { $fieldname = $fieldArr[1]; @@ -78,7 +78,7 @@ class AccountancyImport * @param array $listvalues Values list to add * @return int <0 if KO, >0 if OK */ - public function computeSens(&$arrayrecord, $fieldname, &$listfields, &$listvalues) { + public function computeDirection(&$arrayrecord, $fieldname, &$listfields, &$listvalues) { $fieldArr = explode('.', $fieldname); if (count($fieldArr) > 0) { $fieldname = $fieldArr[1]; diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php index 8034f98d9a7..d62ede90982 100644 --- a/htdocs/core/modules/modAccounting.class.php +++ b/htdocs/core/modules/modAccounting.class.php @@ -350,8 +350,8 @@ class modAccounting extends DolibarrModules 'b.sens'=>'rule-computeSens' ); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent) $this->import_convertvalue_array[$r]=array( - 'b.montant' => array('rule' => 'compute', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'computeMontant', 'element' => 'Accountancy'), - 'b.sens' => array('rule' => 'compute', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'computeSens', 'element' => 'Accountancy'), + 'b.montant' => array('rule' => 'compute', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'computeAmount', 'element' => 'Accountancy'), + 'b.sens' => array('rule' => 'compute', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'computeDirection', 'element' => 'Accountancy'), ); $this->import_regex_array[$r] = array( //'b.doc_date'=>'^\d{4}\d{2}\d{2}$',