[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 25/31: Task #448 : payment method VEN
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 25/31: Task #448 : payment method VEN |
Date: |
Sat, 21 Jul 2018 07:47:10 -0400 (EDT) |
sparkyx pushed a commit to annotated tag r700-currency-001
in repository noalyss.
commit dbde8e266580153a4c4755ca6bff76f8fca570e0
Author: Dany De Bontridder <address@hidden>
Date: Fri May 11 00:14:52 2018 +0200
Task #448 : payment method VEN
---
include/class/acc_ledger_sold.class.php | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/include/class/acc_ledger_sold.class.php
b/include/class/acc_ledger_sold.class.php
index 1cea78c..7d14a82 100644
--- a/include/class/acc_ledger_sold.class.php
+++ b/include/class/acc_ledger_sold.class.php
@@ -232,6 +232,10 @@ class Acc_Ledger_Sold extends Acc_Ledger {
throw new Exception(_('Date échéance invalide'),14);
}
+ // Check currency_rate if valid
+ if ( isNumber($p_currency_rate) == 0 || $p_currency_rate <=0 ) {
+ throw new Exception(_('Taux devise invalide'),15);
+ }
}
/*!\brief insert into the database, it calls first the verify function,
@@ -579,7 +583,10 @@ class Acc_Ledger_Sold extends Acc_Ledger {
} else {
$poste_val = $sposte;
}
- $famount = bcsub($cust_amount, $acompte);
+ // Convert paid amount in EUR
+ $acompte=bcmul($acompte, $p_currency_rate);
+
+ $famount=bcsub($cust_amount,$acompte);
$acc_pay->poste = $poste_val;
$acc_pay->qcode = $fqcode;
$acc_pay->amount = abs(round($famount, 2));
- [Noalyss-commit] [noalyss] 30/31: remove debug info, (continued)
- [Noalyss-commit] [noalyss] 30/31: remove debug info, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 28/31: Task #448 : currency , EUR cannot be changed and not display, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 04/31: Currency : add test file + database file + mtable, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 29/31: Task #448 : currency_id = 0 for the default currency + display currency rate in confirm operation, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 26/31: Task #448 : rounded problem add debug info, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 31/31: task #448 : currency always used and remove parameter 'use_currency' from parameters, add SQL script, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 20/31: Task #448 : check currency rate > 0 and payment in eur, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 16/31: Currency : insert operation with currency in VEN and ACH, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 22/31: Task #448 : identical operation with currency, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 18/31: task #448 : Currency : display currency info into operation detail, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 25/31: Task #448 : payment method VEN,
Dany De Bontridder <=