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

Update

Browse Source
This commit is contained in:
Alexandre SPANGARO 2021-03-31 20:40:26 +02:00
parent 9b65529fc7
commit dd913b2385
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/accountancy/class/accountancyimport.class.php
View File

@ -48,7 +48,7 @@ class AccountancyImport
* @param array $listvalues Values list to add * @param array $listvalues Values list to add
* @return int <0 if KO, >0 if OK * @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); $fieldArr = explode('.', $fieldname);
if (count($fieldArr) > 0) { if (count($fieldArr) > 0) {
$fieldname = $fieldArr[1]; $fieldname = $fieldArr[1];
@ -78,7 +78,7 @@ class AccountancyImport
* @param array $listvalues Values list to add * @param array $listvalues Values list to add
* @return int <0 if KO, >0 if OK * @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); $fieldArr = explode('.', $fieldname);
if (count($fieldArr) > 0) { if (count($fieldArr) > 0) {
$fieldname = $fieldArr[1]; $fieldname = $fieldArr[1];

4
htdocs/core/modules/modAccounting.class.php
View File

@ -350,8 +350,8 @@ class modAccounting extends DolibarrModules
'b.sens'=>'rule-computeSens' 'b.sens'=>'rule-computeSens'
); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent) ); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
$this->import_convertvalue_array[$r]=array( $this->import_convertvalue_array[$r]=array(
'b.montant' => array('rule' => 'compute', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'computeMontant', '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' => 'computeSens', '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( $this->import_regex_array[$r] = array(
//'b.doc_date'=>'^\d{4}\d{2}\d{2}$', //'b.doc_date'=>'^\d{4}\d{2}\d{2}$',