[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 02/02: Merge branch 'master' of git.sv.gnu.or
|
From: |
Dany De Bontridder |
|
Subject: |
[Noalyss-commit] [noalyss] 02/02: Merge branch 'master' of git.sv.gnu.org:/srv/git/noalyss |
|
Date: |
Tue, 22 Jul 2014 21:16:41 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit f0a057f2e8f4d1de0d71a70b0b4fb57571a8c72e
Merge: 5b94dc1 2295ffe
Author: Dany De Bontridder <address@hidden>
Date: Tue Jul 22 23:16:05 2014 +0200
Merge branch 'master' of git.sv.gnu.org:/srv/git/noalyss
Conflicts:
sql/upgrade.sql
README | 2 +-
contrib/mono-dossier/mono.sql | 8 +
doc/commencer-avec-noalyss.odt | Bin 0 -> 50975 bytes
doc/commencer-avec-noalyss.pdf | Bin 0 -> 69409 bytes
doc/commencer-avec-phpcompta.odt | Bin 45461 -> 0 bytes
doc/commencer-avec-phpcompta.pdf | Bin 68580 -> 0 bytes
html/admin/sql/patch/ac-upgrade14.sql | 4 +-
html/admin/sql/patch/upgrade115.sql | 9 +
html/backup.php | 6 +-
html/direct.php | 19 ++
html/do.php | 6 +-
html/export.php | 11 +-
html/image/bg-submit5.png | Bin 280 -> 877 bytes
html/image/documents.png | Bin 0 -> 11918 bytes
html/index.php | 23 ++-
html/js/acc_ledger.js | 2 +
html/js/infobulle.js | 5 +
html/js/modele_document.js | 18 ++
html/js/prototype.js | 23 ++-
html/js/scripts.js | 40 ++--
html/popup.php | 17 ++
html/style-classic.css | 25 ++-
html/style-light.css | 71 +++++--
html/style-mandarine.css | 21 ++-
html/style-mobile.css | 34 +++-
html/style-print.css | 64 +++---
include/anc_acc_balance.inc.php | 2 +
include/anc_balance_double.inc.php | 15 ++-
include/anc_balance_simple.inc.php | 14 ++-
include/anc_great_ledger.inc.php | 53 ++++-
include/anc_history.inc.php | 14 ++-
include/balance.inc.php | 2 +-
include/balance_card.inc.php | 2 +-
include/class_acc_ledger.php | 98 +++++++++-
include/class_acc_ledger_purchase.php | 2 +-
include/class_anc_balance_double.php | 4 +-
include/class_anc_balance_simple.php | 7 +-
include/class_anc_grandlivre.php | 195 ++++++++++++--------
include/class_anc_group.php | 2 +
include/class_anc_listing.php | 21 +-
include/class_anc_operation.php | 2 +-
include/class_anc_print.php | 68 ++++++--
include/class_anticipation.php | 1 +
include/class_database.php | 6 +-
include/class_default_menu.php | 20 ++-
include/class_default_menu_sql.php | 20 ++-
include/class_document.php | 2 +
include/class_document_export.php | 201 ++++++++++++++++++++
include/class_fiche_attr.php | 6 +-
include/class_fiche_def_ref.php | 15 ++
include/class_filetosend.php | 18 ++
include/class_follow_up.php | 2 +-
include/class_html_input.php | 20 ++
include/class_idate.php | 2 +-
include/class_jrn_def_sql.php | 18 ++
include/class_menu_ref.php | 20 ++-
include/class_menu_ref_sql.php | 18 ++
include/class_print_ledger_detail_item.php | 18 ++
include/class_profile_menu.php | 19 ++-
include/class_profile_menu_sql.php | 18 ++
include/class_profile_sql.php | 18 ++
include/class_sendmail.php | 18 ++
include/class_sort_table.php | 18 ++
include/company.inc.php | 19 ++
include/constant.php | 40 ++++-
include/constant.security.php | 19 ++
include/default_menu.inc.php | 19 ++
include/export_anc_grandlivre_csv.php | 19 ++
.../export_anc_receipt_pdf.php | 41 ++---
include/export_form_csv.php | 5 +-
include/export_form_pdf.php | 6 +-
include/export_gl_csv.php | 8 +-
include/export_histo_csv.php | 2 +-
include/forecast.inc.php | 6 +-
include/impress_poste.inc.php | 2 +-
include/impress_rapport.inc.php | 15 +-
include/restore.inc.php | 9 +-
include/template/dashboard.php | 4 +
include/template/form_ledger_detail.php | 2 +-
include/template/impress_cat_card.php | 2 +-
include/template/ledger_detail_bottom.php | 2 +-
include/template/ledger_detail_ven.php | 8 +-
include/template/module.php | 5 +-
include/template/param_jrn.php | 51 ++++--
include/template/template.gif | Bin 0 -> 6626 bytes
release-note | 94 ---------
86 files changed, 1328 insertions(+), 437 deletions(-)
diff --cc html/admin/sql/patch/ac-upgrade14.sql
index 599cb17,e88be72..140f727
--- a/html/admin/sql/patch/ac-upgrade14.sql
+++ b/html/admin/sql/patch/ac-upgrade14.sql
@@@ -1,25 -1,8 +1,25 @@@
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';
-update version set val=15;
+
+CREATE OR REPLACE FUNCTION public.upgrade_repo(p_version integer)
+ RETURNS void
+AS $function$
+declare
+ is_mono integer;
+begin
+ select count (*) into is_mono from information_schema.tables where
table_name='repo_version';
+ if is_mono = 1 then
+ update repo_version set val=p_version;
+ else
+ update repo_version set val=p_version;
+ end if;
+end;
+$function$
+ language plpgsql;
+select upgrade_repo(15);
+
commit;