Merge branch 'dev7109' into entreprise

This commit is contained in:
Dany De Bontridder 2019-08-26 15:50:46 +02:00
commit 6872a81d8b
64 changed files with 7294 additions and 4743 deletions

View file

@ -8,16 +8,16 @@ select me_code,'PRINT',1,250,'E',0,6 from menu_ref where me_code='PRINTTVA'
union
select me_code,'PRINT',1,250,'E',0,35 from menu_ref where me_code='PRINTTVA'
union
select me_code,'PRINT',2,250,'E',0,719 from menu_ref where me_code='PRINTTVA'
select me_code,'PRINT',2,250,'E',0,719 from menu_ref where me_code='PRINTTVA' and exists (select 1 from profile where p_id=2)
union
select me_code,'PRINT',2,250,'E',0,716 from menu_ref where me_code='PRINTTVA'
select me_code,'PRINT',2,250,'E',0,716 from menu_ref where me_code='PRINTTVA' and exists (select 1 from profile where p_id=2)
;
insert into menu_ref (me_code,me_menu,me_file,me_type)
values ('CSV:printtva','Export Résumé TVA','export_printtva_csv.php','PR'),
('PDF:printtva','Export Résumé TVA','export_printtva_pdf.php','PR')
;
insert into profile_menu(me_code,p_id,p_type_display) values ('CSV:printtva',1,'P'),('PDF:printtva',1,'P'),('CSV:printtva',2,'P'),('PDF:printtva',2,'P');
insert into profile_menu(me_code,p_id,p_type_display) select 'CSV:printtva',p_id,'P' from profile where p_id in (1,2) union all select 'PDF:printtva',p_id,'P' from profile where p_id in (1,2);
insert into version (val,v_description) values (136,'new feature PRINTTVA');
commit ;

View file

@ -0,0 +1,15 @@
begin;
alter table jrn_def add column jrn_def_negative_amount char(1) default '0';
update jrn_def set jrn_def_negative_amount = '0';
alter table jrn_def add constraint negative_amount_ck check (jrn_def_negative_amount in ('1','0'));
alter table jrn_def alter jrn_def_negative_amount set not null;
comment on column jrn_def.jrn_def_negative_amount is '1 echo a warning if you are not using an negative amount, default 0 for no warning';
alter table jrn_def add column jrn_def_negative_warning text;
update jrn_def set jrn_def_negative_warning = 'Attention, ce journal doit utiliser des montants négatifs';
comment on column jrn_def.jrn_def_negative_warning is 'Yell a warning if the amount if not negative , in the case of jrn_def_negative_amount is Y';
insert into version (val,v_description) values (137,'Ledger warning');
commit ;