[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 148/173: Merge branch 'dev7400-1' into next-r
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 148/173: Merge branch 'dev7400-1' into next-release-8 |
Date: |
Mon, 22 Mar 2021 12:59:16 -0400 (EDT) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit b9c1bdfa3e13b98aaa3ee7e7594ba750c8bcf396
Merge: 9c40c9d 3450d5f
Author: Dany De Bontridder <danydb@noalyss.eu>
AuthorDate: Fri Jul 17 11:50:04 2020 +0200
Merge branch 'dev7400-1' into next-release-8
html/calendar-blue.css | 4 ++--
html/js/acc_ledger.js | 1 -
html/js/lang/calendar-fr.js | 2 +-
html/recherche.php | 20 +++++++++++++----
html/style-classic7.css | 3 ++-
include/action.common.inc.php | 4 ++--
include/ajax/ajax_card.php | 2 +-
include/ajax/ajax_display_letter.php | 2 +-
include/ajax/ajax_ledger.php | 8 +++----
include/ajax/ajax_periode.php | 2 +-
include/ajax/ajax_tva_parameter.php | 2 +-
include/anc_key.inc.php | 2 +-
include/anc_pa.inc.php | 2 +-
include/card_attr.inc.php | 2 +-
include/cfgledger.inc.php | 8 +++----
include/class/acc_bilan.class.php | 2 +-
include/class/acc_ledger.class.php | 12 +++++-----
include/class/acc_ledger_fin.class.php | 2 +-
include/class/acc_ledger_info.class.php | 4 ++--
include/class/acc_ledger_purchase.class.php | 4 ++--
include/class/acc_ledger_sold.class.php | 3 +--
include/class/acc_operation.class.php | 19 ++++++++++++----
include/class/acc_report.class.php | 4 ++--
include/class/anc_account_table.class.php | 34 ++++++++++++++++++++++++++++-
include/class/anc_group_operation.class.php | 4 ++--
include/class/anc_key.class.php | 2 +-
include/class/anc_operation.class.php | 2 +-
include/class/default_menu.class.php | 2 +-
include/class/document_modele.class.php | 4 ++--
include/class/document_type.class.php | 6 ++---
include/class/dossier.class.php | 2 +-
include/class/fiche.class.php | 4 ++--
include/class/fiche_attr.class.php | 6 ++---
include/class/follow_up.class.php | 1 +
include/class/periode.class.php | 4 ++--
include/class/pre_op_ach.class.php | 2 +-
include/class/pre_op_advanced.class.php | 2 +-
include/class/pre_op_fin.class.php | 2 +-
include/class/pre_op_ods.class.php | 2 +-
include/class/pre_op_ven.class.php | 2 +-
include/class/tva_rate_mtable.class.php | 4 ++--
include/config.inc.example | 2 ++
include/lib/ac_common.php | 5 ++---
include/lib/manage_table_sql.class.php | 4 ++--
include/lib/message_javascript.php | 6 ++---
include/tfpdf/tfpdf.php | 2 +-
sql/upgrade.sql | 2 +-
47 files changed, 138 insertions(+), 82 deletions(-)
diff --cc sql/upgrade.sql
index e8af5a3,fb36c0d..206b4a8
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@@ -1,13 -1,44 +1,13 @@@
-CREATE OR REPLACE FUNCTION comptaproc.jrn_check_periode()
- RETURNS trigger
- LANGUAGE plpgsql
-AS $function$
-declare
-bClosed bool;
-str_status text;
-ljr_tech_per jrn.jr_tech_per%TYPE;
-ljr_def_id jrn.jr_def_id%TYPE;
-lreturn jrn%ROWTYPE;
-begin
-if TG_OP='UPDATE' then
- ljr_tech_per :=OLD.jr_tech_per ;
- NEW.jr_tech_per :=
comptaproc.find_periode(to_char(NEW.jr_date,'DD.MM.YYYY'));
- ljr_def_id :=OLD.jr_def_id;
- lreturn :=NEW;
- if NEW.jr_date = OLD.jr_date then
- return NEW;
- end if;
- if comptaproc.is_closed(NEW.jr_tech_per,NEW.jr_def_id) = true then
- raise exception 'Periode fermee';
- end if;
-end if;
-
-if TG_OP='INSERT' then
- NEW.jr_tech_per :=
comptaproc.find_periode(to_char(NEW.jr_date,'DD.MM.YYYY'));
- ljr_tech_per :=NEW.jr_tech_per ;
- ljr_def_id :=NEW.jr_def_id;
- lreturn :=NEW;
-end if;
-
-if TG_OP='DELETE' then
- ljr_tech_per :=OLD.jr_tech_per;
- ljr_def_id :=OLD.jr_def_id;
- lreturn :=OLD;
-end if;
-
-if comptaproc.is_closed (ljr_tech_per,ljr_def_id) = true then
- raise exception 'Periode fermee';
-end if;
-
-return lreturn;
-end;$function$
-;
+begin;
+insert into "parameter" (pr_id ) values ('MY_DEFAULT_ROUND_ERROR_DEB');
+insert into "parameter" (pr_id ) values ('MY_DEFAULT_ROUND_ERROR_CRED');
+drop view if exists v_all_card_currency;
+
+create or replace view v_all_card_currency as
+select sum(oc_amount) as sum_oc_amount,sum(oc_vat_amount) as
sum_oc_vat_amount,f_id,j_id
+from
+operation_currency
+join jrnx using (j_id)
+group by f_id,j_id;
+
- commit ;
++commit ;
- [Noalyss-commit] [noalyss] 115/173: indent, (continued)
- [Noalyss-commit] [noalyss] 115/173: indent, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 118/173: Adapt printtva to entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 121/173: test : find the accounting with the biggest number of records, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 124/173: Merge branch 'v7110-stable' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 122/173: test : use the accounting with the biggest number of records, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 127/173: Merge branch 'dev7112' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 133/173: Test Acc_Account, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 136/173: Bug database.class.php : n'applique pas le patch, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 143/173: Merge commit '57309561191906d4099c8db08b7fa737f7c8e1e0' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 144/173: Merge commit 'b8fafe1f2b705272b9e3853a8a791200fb718fa6' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 148/173: Merge branch 'dev7400-1' into next-release-8,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 149/173: Merge branch 'enterprise' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 155/173: Merge branch 'master' into dev-8-bootstrap, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 156/173: rel8100 Merge branch 'master' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 157/173: Merge branch 'dev-8-bug-saldo-not-checked', Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 161/173: Move CSS and start to integrate BootStrap, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 163/173: Move CSS and start to integrate BootStrap Add fonts, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 165/173: Currency : adapt test, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 166/173: BootStrap : set up + move CSS and font to their own folders, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 167/173: Task 0001912: Developpement DEBUG new system with level, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 168/173: Task #1911: FOLLOW : télécharger toutes les documents en une fois, Dany De Bontridder, 2021/03/22