Merge branch 'master' of git.sv.gnu.org:/srv/git/noalyss

Conflicts:
	sql/upgrade.sql
This commit is contained in:
Dany De Bontridder 2014-07-22 23:16:05 +02:00
commit f0a057f2e8
86 changed files with 1353 additions and 413 deletions

View file

@ -1,8 +1,8 @@
begin;
update theme set the_name='Mandarine' ,the_filestyle='style-mandarine.css' where the_name='Colored';
update theme set the_name='Mobile' ,the_filestyle='style-mobile.css' where the_name='EPad';
update user_global_pref set parameter_value='Mandarine' where parameter_value='Colored';
update user_global_pref set parameter_value='Mobile' where parameter_value='EPad';
update theme set the_name = 'Classique' where the_name='classic';
update user_global_pref set parameter_value='Classique' where parameter_type='THEME';
update theme set the_filestyle='style-classic.css' where the_filestyle='style.css';
CREATE OR REPLACE FUNCTION public.upgrade_repo(p_version integer)

View file

@ -0,0 +1,9 @@
begin;
INSERT INTO menu_ref(me_code, me_menu, me_file, me_type)VALUES ('PDF:AncReceipt', 'Export pièce PDF', 'export_anc_receipt_pdf.php','PR');
insert into profile_menu(me_code,p_id,p_type_display,pm_default) values ('PDF:AncReceipt',1,'P',0);
update version set val=116;
commit;