[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 20/31: Task #448 : check currency rate > 0 an
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 20/31: Task #448 : check currency rate > 0 and payment in eur |
Date: |
Sat, 21 Jul 2018 07:47:09 -0400 (EDT) |
sparkyx pushed a commit to annotated tag r700-currency-001
in repository noalyss.
commit 35e989af291a302e6cab32d2d78faaafb1f8dbf1
Author: Dany De Bontridder <address@hidden>
Date: Thu May 10 21:41:59 2018 +0200
Task #448 : check currency rate > 0 and payment in eur
---
include/class/acc_ledger_purchase.class.php | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/include/class/acc_ledger_purchase.class.php
b/include/class/acc_ledger_purchase.class.php
index 6e53be9..2d509f7 100644
--- a/include/class/acc_ledger_purchase.class.php
+++ b/include/class/acc_ledger_purchase.class.php
@@ -276,6 +276,10 @@ class Acc_Ledger_Purchase 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);
+ }
}
/**
* Compute the ND amount thanks the attribute of the concerned card. The
object
@@ -905,7 +909,12 @@ class Acc_Ledger_Purchase extends Acc_Ledger
}
// remove the VAT autoliquidation
$cust_amount=bcsub($cust_amount, $tot_tva_reversed);
+
+ // 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] 14/31: INum : add function onchange with inplace edit, (continued)
- [Noalyss-commit] [noalyss] 14/31: INum : add function onchange with inplace edit, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 15/31: insert_jrnx : add debug, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 07/31: Currency : add menu for currency, Dany De Bontridder, 2018/07/21
- [Noalyss-commit] [noalyss] 19/31: Task #448 : currency : cosmetic operation detail, Dany De Bontridder, 2018/07/21
- [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 <=
- [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, 2018/07/21