[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 186/323: Merge branch 'master' into sql-revie
|
From: |
Dany De Bontridder |
|
Subject: |
[Noalyss-commit] [noalyss] 186/323: Merge branch 'master' into sql-review-700 |
|
Date: |
Wed, 14 Mar 2018 17:38:47 -0400 (EDT) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 2dd8642278824923065083a02720fd9f19b6653f
Merge: cdd7259 388a39a
Author: Dany De Bontridder <address@hidden>
Date: Sat Feb 10 22:09:27 2018 +0100
Merge branch 'master' into sql-review-700
Conflicts:
html/install.php
doc/developper/Doxyfile | 1 -
html/ajax_misc.php | 95 +-
html/do.php | 2 +-
html/image/bg-submit4.gif | Bin 2454 -> 0 bytes
html/image/bg-submit4.png | Bin 217 -> 0 bytes
html/image/bg-submit5.png | Bin 877 -> 0 bytes
html/image/bgcolor.gif | Bin 148 -> 0 bytes
html/image/blackdot.gif | Bin 807 -> 0 bytes
html/image/bold.gif | Bin 81 -> 0 bytes
html/image/button-edit.png | Bin 299 -> 0 bytes
html/image/centre.gif | Bin 76 -> 0 bytes
html/image/compute.png | Bin 689 -> 0 bytes
html/image/copy.gif | Bin 118 -> 0 bytes
html/image/cut.gif | Bin 100 -> 0 bytes
html/image/delete.gif | Bin 167 -> 0 bytes
html/image/edit.png | Bin 607 -> 0 bytes
html/image/email.gif | Bin 374 -> 0 bytes
html/image/empty.gif | Bin 58 -> 0 bytes
html/image/home.png | Bin 32783 -> 0 bytes
html/image/hr.gif | Bin 77 -> 0 bytes
html/image/hyperlink.gif | Bin 196 -> 0 bytes
html/image/icon-off.png | Bin 299 -> 0 bytes
html/image/icon-on.png | Bin 301 -> 0 bytes
html/image/indent.gif | Bin 96 -> 0 bytes
html/image/italic.gif | Bin 84 -> 0 bytes
html/image/justifyfull.gif | Bin 76 -> 0 bytes
html/image/left_just.gif | Bin 76 -> 0 bytes
html/image/list.gif | Bin 88 -> 0 bytes
html/image/load.gif | Bin 563 -> 0 bytes
html/image/logo-noalyss-7000-3.svg | 305 ------
html/image/logo6720.png | Bin 17594 -> 0 bytes
html/image/logo7.png | Bin 17594 -> 0 bytes
html/image/logo7000.png | Bin 0 -> 58953 bytes
html/image/logout.png | Bin 33054 -> 0 bytes
html/image/magnifier13.png | Bin 469 -> 0 bytes
html/image/numbered_list.gif | Bin 90 -> 0 bytes
html/image/orange_flower.gif | Bin 319562 -> 0 bytes
html/image/outdent.gif | Bin 96 -> 0 bytes
html/image/param.png | Bin 32742 -> 0 bytes
html/image/paste.gif | Bin 152 -> 0 bytes
html/image/popout.png | Bin 675 -> 0 bytes
html/image/preference.png | Bin 30931 -> 0 bytes
html/image/print.png | Bin 8061 -> 0 bytes
html/image/redo.gif | Bin 88 -> 0 bytes
html/image/right_just.gif | Bin 76 -> 0 bytes
html/image/search.png | Bin 4545 -> 0 bytes
html/image/smiley.gif | Bin 310 -> 0 bytes
html/image/spellcheck.gif | Bin 107 -> 0 bytes
html/image/spirale2.gif | Bin 162454 -> 0 bytes
html/image/textcolor.gif | Bin 109 -> 0 bytes
html/image/trash-24.gif | Bin 0 -> 412 bytes
html/image/undefined.png | Bin 16139 -> 0 bytes
html/image/underline.gif | Bin 93 -> 0 bytes
html/image/undo.gif | Bin 89 -> 0 bytes
html/image/x-office-calendar.png | Bin 904 -> 0 bytes
html/index.css | 22 +-
html/index.php | 2 +-
html/install.php | 17 +-
html/js/acc_ledger.js | 32 +
html/js/managetable.js | 2 +-
html/js/scripts.js | 122 ++-
html/js/smoke.js | 1027 ++++++++++----------
html/popup.php | 10 +-
html/{style-r692.css => style-classic7.css} | 85 +-
html/style-light.css | 26 +
html/test.php | 2 +-
include/ajax/ajax_history.php | 9 +-
include/ajax/ajax_history_anc_account.php | 69 ++
include/ajax/ajax_preference.php | 35 +-
include/ajax/ajax_tva_parameter.php | 78 ++
include/anc_great_ledger.inc.php | 9 +-
include/anc_od.inc.php | 4 +-
include/balance.inc.php | 83 +-
include/class/acc_balance.class.php | 17 +-
include/class/acc_ledger.class.php | 6 +
include/class/acc_ledger_fin.class.php | 2 +-
include/class/acc_ledger_purchase.class.php | 1 +
include/class/acc_ledger_sold.class.php | 1 +
include/class/anc_balance_double.class.php | 7 +-
include/class/anc_grandlivre.class.php | 4 +-
include/class/anc_listing.class.php | 2 +-
include/class/anc_operation.class.php | 64 +-
include/class/anc_print.class.php | 8 +-
include/class/document_export.class.php | 18 +-
include/class/dossier.class.php | 2 +-
include/class/exercice.class.php | 4 +-
include/class/print_ledger.class.php | 154 ++-
include/class/tva_rate_mtable.class.php | 278 ++++++
include/class/user.class.php | 1 +
include/constant.php | 10 +-
include/database/tva_rate_sql.class.php | 70 ++
include/database/v_tva_rate_sql.class.php | 72 ++
include/dossier.inc.php | 2 +-
include/export/export_anc_receipt_pdf.php | 11 +-
include/export/export_balance_pdf.php | 36 +-
include/export/export_ledger_csv.php | 54 +-
include/export/export_poste_detail_csv.php | 4 +-
include/history_operation.inc.php | 3 +-
include/lib/database.class.php | 2 +-
include/lib/html_input.class.php | 25 +
include/lib/ianccard.class.php | 2 +-
include/lib/icon_action.class.php | 6 +-
include/lib/impress.class.php | 44 +-
include/lib/inplace_edit.class.php | 2 +-
include/lib/inplace_switch.class.php | 10 +-
include/lib/inum.class.php | 87 +-
include/lib/iperiod.class.php | 9 +-
include/lib/iposte.class.php | 1 -
include/lib/itva_popup.class.php | 19 +-
include/lib/manage_table_sql.class.php | 47 +-
include/lib/message_javascript.php | 4 +-
include/lib/progress_bar.class.php | 128 +++
include/param_pcmn.inc.php | 5 +-
include/param_sec.inc.php | 4 +-
include/sql/patch/ac-upgrade17.sql | 16 +
include/sql/patch/upgrade125.sql | 36 +
.../sql/patch/upgrade126.sql | 32 +-
include/sql/patch/upgrade127.sql | 18 +
include/template/history_top.php | 2 +-
include/template/periode_add_exercice.php | 17 +-
include/tva.inc.php | 312 +-----
include/user.inc.php | 2 +-
scenario/progress-bar.test.php | 65 ++
scenario/tva_parameter.php | 80 ++
sql/upgrade.sql | 118 +--
125 files changed, 2345 insertions(+), 1616 deletions(-)
- [Noalyss-commit] [noalyss] 165/323: PRINTBAL translate, (continued)
- [Noalyss-commit] [noalyss] 165/323: PRINTBAL translate, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 197/323: CSS classic 7 : menu use font OpenSansRegular instead of SansaLight, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 199/323: CSS classic 7 : menu use font OpenSansRegular instead of SansaLight, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 163/323: Remove unused file, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 201/323: CSS : page login : forgotten email, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 190/323: SQL : remove comment on extension, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 200/323: Improve Cosmetic : login page, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 198/323: Improve Cosmetic : login page, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 204/323: change email, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 191/323: Fix SQL, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 186/323: Merge branch 'master' into sql-review-700,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 223/323: Dashboard : Event hour is not mandatory, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 224/323: Dashboard : Add event improve cosmetic, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 205/323: CSS : recover box, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 210/323: sorttable.js : alternate properly the color of the table rows, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 220/323: Welcome : adapt to small screen, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 195/323: demo is inactive by default, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 211/323: sorttable.js : Add an icon if the column is already sorted, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 196/323: Fix SQL, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 227/323: patch sql : remove commented code, Dany De Bontridder, 2018/03/14
- [Noalyss-commit] [noalyss] 225/323: Dashboard : Fix box, Dany De Bontridder, 2018/03/14