Merge branch 'dev7109' into entreprise

This commit is contained in:
Dany De Bontridder 2019-08-17 22:22:59 +02:00
commit f33ff144e5
70 changed files with 2833 additions and 797 deletions

View file

@ -0,0 +1,8 @@
begin;
update attr_def set ad_extra = '[sql] fd_id in (select fd_id from fiche_def where frd_id in (4,8,9,14))' where ad_id=25;
alter table mod_payment rename to payment_method;
insert into version (val,v_description) values (135,'rename table mod_payment');
commit ;

View file

@ -0,0 +1,23 @@
begin;
insert into menu_ref (me_code,me_menu,me_file,me_description,me_type,me_description_etendue)
values('PRINTTVA','Résumé TVA','tax_summary.inc.php','totaux par TVA et par journal','ME','Calcul des totaux par TVA et par journal');
insert into profile_menu (me_code,me_code_dep,p_id,p_order,p_type_display,pm_default,pm_id_dep)
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'
union
select me_code,'PRINT',2,250,'E',0,716 from menu_ref where me_code='PRINTTVA'
;
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 version (val,v_description) values (136,'new feature PRINTTVA');
commit ;