[Noalyss-commit] [noalyss] 55/238: integrate fix for bug in insert_quant_purchase which cannot save private fee Conflicts: include/sql/patch/upgrade128.sql

[Dany De Bontridder]

sparkyx pushed a commit to annotated tag rel7110
in repository noalyss.

commit 93d39e3c075fa83ad846b01ecf19052b32a5a821
Author: Dany De Bontridder <address@hidden>
Date:   Sat May 12 13:55:09 2018 +0200

    integrate fix for bug in insert_quant_purchase which cannot save private
    fee
    Conflicts:
        include/sql/patch/upgrade128.sql
    
    Conflicts:
        include/sql/patch/upgrade128.sql
---
 include/sql/patch/upgrade128.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/sql/patch/upgrade128.sql b/include/sql/patch/upgrade128.sql
index 7d85433..9d87918 100644
--- a/include/sql/patch/upgrade128.sql
+++ b/include/sql/patch/upgrade128.sql
@@ -103,7 +103,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;
 
-
+            
 
 insert into version (val,v_description) values (129,'Currency : create view , 
create tables ');
 commit;