[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 149/218: Currency : purchase, save all detail
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 149/218: Currency : purchase, save all detail also in currency, fix problem with the advance payment |
Date: |
Thu, 12 Sep 2019 15:58:57 -0400 (EDT) |
sparkyx pushed a commit to branch entreprise
in repository noalyss.
commit 2601b09570195d2643ed6c0b90acd62fafb0bcb4
Author: Dany De Bontridder <address@hidden>
Date: Sun Jan 6 15:22:36 2019 +0100
Currency : purchase, save all detail also in currency, fix problem with
the advance payment
---
include/class/acc_ledger_purchase.class.php | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/include/class/acc_ledger_purchase.class.php
b/include/class/acc_ledger_purchase.class.php
index 90911de..f93bbae 100644
--- a/include/class/acc_ledger_purchase.class.php
+++ b/include/class/acc_ledger_purchase.class.php
@@ -788,7 +788,14 @@ class Acc_Ledger_Purchase extends Acc_Ledger
}
$let_client=$acc_operation->insert_jrnx();
-
+ // --- insert also the currency amount for the customer
+ $operation_currency=new Operation_currency_SQL($this->db);
+ $operation_currency->oc_amount=$tot_amount_cur;
+ $operation_currency->oc_vat_amount=0;
+ $operation_currency->oc_price_unit=0;
+ $operation_currency->j_id=$let_client ;
+ $operation_currency->insert();
+
if ( $g_parameter->MY_TVA_USE=='Y')
{
/* save all vat
@@ -933,9 +940,9 @@ class Acc_Ledger_Purchase extends Acc_Ledger
$cust_amount=bcsub($cust_amount, $tot_tva_reversed);
// Convert paid amount in EUR
- $acompte=bcdiv($acompte, $p_currency_rate);
+ $acompte_defcur=bcdiv($acompte, $p_currency_rate);
- $famount=bcsub($cust_amount,$acompte);
+ $famount=bcsub($cust_amount,$acompte_defcur);
$acc_pay->poste=$poste_val;
$acc_pay->qcode=$fqcode;
- [Noalyss-commit] [noalyss] 105/218: Background color, (continued)
- [Noalyss-commit] [noalyss] 105/218: Background color, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 92/218: Merge branch 'master' into r700-currency, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 98/218: Fin currency : detail operation show currency , rate and amount, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 97/218: Fin : currency , add missing info into Operation_Currency, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 113/218: change background, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 95/218: currency : adapt for FIN, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 122/218: Currency : display correctly the saldo at the end / beginning operation, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 136/218: Translation, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 115/218: Currency : ledger printing for FIN + detail operation, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 143/218: Currency : precision 6, display default currency , protect used currency against delete, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 149/218: Currency : purchase, save all detail also in currency, fix problem with the advance payment,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 151/218: Task #1660 : place the button for the inventory on the top, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 157/218: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 75/218: Improve waiting box, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 171/218: Mantis #0001666: Export CSV depuis histo ne filtre pas par journal, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 175/218: mantis #1690: Bug : impossible d'utiliser < dans Inplace_Edit Use base64_decode to protect the string in serialize, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 194/218: TEST : fix some little bugs, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 199/218: Merge with dev7109, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 215/218: Improve Doxygen, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 217/218: Mantis #0001442: CA - facilité de manipulation - effacement Button for cleaning detail analytique in operation, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 187/218: Wrong merge broke fiche.class.php, Dany De Bontridder, 2019/09/12