[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 125/238: Merge branch 'master' into r700-curr
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 125/238: Merge branch 'master' into r700-currency |
Date: |
Sat, 26 Oct 2019 04:40:50 -0400 (EDT) |
sparkyx pushed a commit to annotated tag rel7110
in repository noalyss.
commit 3aec0e2e579b2f90af6566f7010301d9044876e3
Merge: 2134aef 836ac70
Author: Dany De Bontridder <address@hidden>
Date: Tue Dec 18 00:03:34 2018 +0100
Merge branch 'master' into r700-currency
* master:
cfgcurrency : file for the new version : if the file to include does not
exist then display a warning and exit look also into NOALYSS_INCLUDE
cfgcurrency : file for the new version : if the file to include does not
exist then display a warning and exit look also into NOALYSS_INCLUDE
cfgcurrency : file for the new version : if the file to include does not
exist then display a warning and exit
Pre_Operation : add attribut
predefined operation , find a label for an accounting thx its value, the
pk is now an numeric id
predefined operation , invalid value for database::setp
Database upgrade 131
change background
Indentation
acc_ledger_fin . translation
Background color
reverse for quant_fin
Quant_Fin : set the j_id when an operation is recorded
Version DB 131
Currency : SQL quant_fin is adapted
include/class/acc_ledger_fin.class.php | 9 +++++----
include/class/pre_op_advanced.class.php | 2 +-
include/class/pre_operation.class.php | 1 +
include/lib/ac_common.php | 12 ++++++++++--
4 files changed, 17 insertions(+), 7 deletions(-)
diff --cc include/class/acc_ledger_fin.class.php
index 3b5c119,4c2ab45..9d7b682
--- a/include/class/acc_ledger_fin.class.php
+++ b/include/class/acc_ledger_fin.class.php
@@@ -1209,12 -1153,13 +1209,13 @@@ class Acc_Ledger_Fin extends Acc_Ledge
/**
* insert into the quant_fin table
- * @param $bank_id is the f_id of the bank
- * @param $jr_id is the jrn.jr_id of the operation
- * @param $other is the f_id of the benefit
- * @param $amount is the amount
+ * @param integer $bank_id is the f_id of the bank
+ * @param integer $jr_id is the jrn.jr_id of the operation
+ * @param integer $other is the f_id of the benefit
+ * @param integer $amount is the amount
+ * @param integer $p_j_id is the j_id of the operation
*/
- function insert_quant_fin($p_bankid, $p_jrid, $p_otherid,
$p_amount,$p_j_id)
+ function insert_quant_fin($p_bankid, $p_jrid, $p_otherid,
$p_amount,$p_j_id_currency)
{
$sql = "INSERT INTO quant_fin(qf_bank, jr_id, qf_other,
qf_amount,j_id)
VALUES ($1, $2, $3, $4,$5);";
- [Noalyss-commit] [noalyss] 111/238: Currency : sales in listing mode, (continued)
- [Noalyss-commit] [noalyss] 111/238: Currency : sales in listing mode, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 115/238: Currency : ledger printing for FIN + detail operation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 127/238: Merge commit '3f53de417dd89e9a90a386404f93f8648155e046' into r700-currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 118/238: Currency : export CSV history for card and accounting, fix bug with unneeded oc_vat_amount + add the currency rate, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 114/238: Currency : purchase oneline + extended html and csv, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 121/238: Currency : error when displaying, add 4 due to a mistype instruction, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 128/238: Missing bracket, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 136/238: Translation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 131/238: Translation + use of httpInput, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 148/238: remove commented code, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 125/238: Merge branch 'master' into r700-currency,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 170/238: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 129/238: Esthetic with button "Add accounting", Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 144/238: Currency : meaning 1 EUR is worth x currency for Sales, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 132/238: Translation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 120/238: Currency : send the saldo for financial ledger, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 145/238: Currency : the meaning is : 1 euro is worth xxx Currency , so we divide the amount with the currency rate to compute the EUR value, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 140/238: Misc. Operation : input : Missing tag TR, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 137/238: Translation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 141/238: Currency : for misc. operation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 164/238: Currency Show currency info for MISC, Dany De Bontridder, 2019/10/26