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

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0

Browse Source
This commit is contained in:
Laurent Destailleur 2020-11-05 09:43:38 +01:00
commit 9380ea4bc5
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/commoninvoice.class.php
View File

@ -784,7 +784,7 @@ abstract class CommonInvoice extends CommonObject
if (!$error) if (!$error)
{ {
// Force payment mode of invoice to withdraw // Force payment mode of invoice to withdraw
$payment_mode_id = dol_getIdFromCode($this->db, 'PRE', 'c_paiement', 'code', 'id', 1); $payment_mode_id = dol_getIdFromCode($this->db, ($type == 'bank-transfer' ? 'VIR' : 'PRE'), 'c_paiement', 'code', 'id', 1);
if ($payment_mode_id > 0) if ($payment_mode_id > 0)
{ {
$result = $this->setPaymentMethods($payment_mode_id); $result = $this->setPaymentMethods($payment_mode_id);

1
htdocs/core/modules/import/import_csv.modules.php
View File

@ -645,6 +645,7 @@ class ImportCsv extends ModeleImports
$errorforthistable++; $errorforthistable++;
$error++; $error++;
} }
else $newval = $arrayrecord[($key - 1)]['val']; //We get new value computed.
} }
elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
{ {

1
htdocs/core/modules/import/import_xlsx.modules.php
View File

@ -672,6 +672,7 @@ class ImportXlsx extends ModeleImports
$errorforthistable++; $errorforthistable++;
$error++; $error++;
} }
else $newval = $arrayrecord[($key - 1)]['val']; //We get new value computed.
} }
elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
{ {