[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 40/238: Fix bug quant_purchase , private fee
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 40/238: Fix bug quant_purchase , private fee not saved |
Date: |
Sat, 26 Oct 2019 04:40:26 -0400 (EDT) |
sparkyx pushed a commit to annotated tag rel7110
in repository noalyss.
commit 512c548eaf8409993dbaea64c3a0274ae5bb1672
Author: Dany De Bontridder <address@hidden>
Date: Sat May 12 13:57:53 2018 +0200
Fix bug quant_purchase , private fee not saved
---
include/constant.php | 2 +-
include/sql/patch/upgrade128.sql | 56 +---------------------------------------
2 files changed, 2 insertions(+), 56 deletions(-)
diff --git a/include/constant.php b/include/constant.php
index cce784f..1354c81 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -110,7 +110,7 @@ if ( !defined ("NOALYSS_PACKAGE_REPOSITORY")) {
if ( ! defined ("SYSINFO_DISPLAY")) {
define ("SYSINFO_DISPLAY",TRUE);
}
-define ("DBVERSION",129);
+define ("DBVERSION",130);
define ("MONO_DATABASE",25);
define ("DBVERSIONREPO",18);
define ('NOTFOUND','--not found--');
diff --git a/include/sql/patch/upgrade128.sql b/include/sql/patch/upgrade128.sql
index b219fed..c5bf05e 100644
--- a/include/sql/patch/upgrade128.sql
+++ b/include/sql/patch/upgrade128.sql
@@ -101,61 +101,7 @@ alter table jrn add currency_rate_ref numeric(20,6)
default 1;
update jrn set currency_rate_ref=1;
ALTER TABLE public.jrn ADD CONSTRAINT jrn_currency_fk FOREIGN KEY
(currency_id) REFERENCES public.currency(id) ON DELETE RESTRICT ON UPDATE
RESTRICT;
-CREATE OR REPLACE FUNCTION comptaproc.insert_quant_purchase(p_internal text,
p_j_id numeric, p_fiche character varying, p_quant numeric, p_price numeric,
p_vat numeric, p_vat_code integer, p_nd_amount numeric, p_nd_tva numeric,
p_nd_tva_recup numeric, p_dep_priv numeric, p_client character varying,
p_tva_sided numeric, p_price_unit numeric)
- RETURNS void
-AS $function$
-declare
- fid_client integer;
- fid_good integer;
- account_priv account_type;
- fid_good_account account_type;
- n_dep_priv numeric;
-begin
- n_dep_priv := p_dep_priv;
- select p_value into account_priv from parm_code where
p_code='DEP_PRIV';
- select f_id into fid_client from
- fiche_detail where ad_id=23 and ad_value=upper(trim(p_client));
- select f_id into fid_good from
- fiche_detail where ad_id=23 and ad_value=upper(trim(p_fiche));
- select ad_value into fid_good_account from fiche_detail where ad_id=5
and f_id=fid_good;
- if strpos( fid_good_account , account_priv ) = 1 then
- n_dep_priv=p_price;
- end if;
-
- insert into quant_purchase
- (qp_internal,
- j_id,
- qp_fiche,
- qp_quantite,
- qp_price,
- qp_vat,
- qp_vat_code,
- qp_nd_amount,
- qp_nd_tva,
- qp_nd_tva_recup,
- qp_supplier,
- qp_dep_priv,
- qp_vat_sided,
- qp_unit)
- values
- (p_internal,
- p_j_id,
- fid_good,
- p_quant,
- p_price,
- p_vat,
- p_vat_code,
- p_nd_amount,
- p_nd_tva,
- p_nd_tva_recup,
- fid_client,
- n_dep_priv,
- p_tva_sided,
- p_price_unit);
- return;
-end;
-$function$
-LANGUAGE plpgsql;
+
insert into version (val,v_description) values (129,'Currency : create view ,
create tables ');
commit;
\ No newline at end of file
- [Noalyss-commit] [noalyss] 50/238: Protect function nb , return the string if the parameter is not a float, (continued)
- [Noalyss-commit] [noalyss] 50/238: Protect function nb , return the string if the parameter is not a float, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 53/238: Missing class : missing class for acc_ledger, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 51/238: New version of libreoffice use the numeric in another way, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 45/238: Fix todo_list : if list empty , gets an error in php 7.2, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 47/238: typo, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 52/238: Create invoice : New version of libreoffice use the numeric in another way, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 65/238: Merge branch 'master' into r700-currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 68/238: Documentation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 76/238: Bug : cannot set group, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 37/238: comment, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 40/238: Fix bug quant_purchase , private fee not saved,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 48/238: Task #448 : add currency to card -> history + export CSV, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 58/238: Fix : security fixes see rapport exakat (Damien Seguy), Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 62/238: translation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 64/238: Merge master, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 59/238: Security fix : f_id is a number, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 74/238: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 63/238: CFGLED : security fix : remove $_REQUEST, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 66/238: Remove the default "<div class=content>" which lead to cosmetic bug in the plugins, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 75/238: Improve waiting box, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 88/238: FIN : cosmetic : bug due the currency feature in the input there are 2 supplementary rows for total in EUR and CURRENCY. Those rows don't exist for FIN, Dany De Bontridder, 2019/10/26