noalyss-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Noalyss-commit] [noalyss] 62/323: Merge branch 'master' of ssh://ns3/sr


From: Dany De Bontridder
Subject: [Noalyss-commit] [noalyss] 62/323: Merge branch 'master' of ssh://ns3/srv/git/noalyss
Date: Wed, 14 Mar 2018 17:38:18 -0400 (EDT)

sparkyx pushed a commit to branch master
in repository noalyss.

commit 8cf3a7d1ff84e3baf547873506f5e48518c1c10c
Merge: cfdff5a 4b3e8d3
Author: Dany DE BONTRIDDER <address@hidden>
Date:   Thu Jan 18 14:26:58 2018 +0100

    Merge branch 'master' of ssh://ns3/srv/git/noalyss

 dev/misc-testing/pdf/pdf-page-break.php            |    2 +-
 doc/developper/Doxyfile                            |    2 +-
 html/ajax.php                                      |    5 +-
 html/ajax_misc.php                                 |   39 +-
 html/ajax_test.php                                 |    2 +-
 html/do.php                                        |   25 +-
 html/fid.php                                       |    2 +-
 html/image/OpenSansRegular.woff                    |  Bin 109000 -> 67532 bytes
 html/image/SansationLight/readme.txt               |   26 +
 html/image/ajax-loader.gif                         |  Bin 0 -> 1737 bytes
 html/image/fontello/fontello.eot                   |  Bin 0 -> 24888 bytes
 html/image/fontello/fontello.svg                   |  150 +
 html/image/fontello/fontello.ttf                   |  Bin 0 -> 24720 bytes
 html/image/fontello/fontello.woff                  |  Bin 0 -> 15328 bytes
 html/image/fontello/fontello.woff2                 |  Bin 0 -> 12980 bytes
 html/js/acc_ledger.js                              |  233 +-
 html/js/accounting_item.js                         |    2 +-
 html/js/admin.js                                   |    4 +-
 html/js/ajax_fiche.js                              |   68 +
 html/js/calc.js                                    |   11 +-
 html/js/card.js                                    |   69 +-
 html/js/controls.js                                |    2 +-
 html/js/managetable.js                             |    4 +-
 html/js/scripts.js                                 |  520 +++-
 html/js/todo_list.js                               |    2 +-
 html/lang/en_US/LC_MESSAGES/messages.po            | 3007 ++++++++++++++++----
 html/lang/messages.po                              | 2912 +++++++++++++++----
 html/lang/nl_NL/LC_MESSAGES/messages.po            | 2987 +++++++++++++++----
 html/popup.php                                     |   16 +-
 html/recherche.php                                 |   26 +-
 html/style-classic.css                             |   75 +-
 html/style-light.css                               |   74 +-
 html/style-mandarine.css                           | 2166 --------------
 html/style-mobile.css                              | 2006 -------------
 html/style-print.css                               |    2 +-
 html/style-r692.css                                |  168 +-
 html/test.php                                      |    4 +-
 html/user_login.php                                |    5 +-
 include/action.common.inc.php                      |   20 +-
 include/ajax/ajax_accounting.php                   |    3 +-
 include/ajax/ajax_action_remove_concerned.php      |    5 +-
 include/ajax/ajax_action_save_concerned.php        |    4 +
 include/ajax/ajax_add_concerned_card.php           |    8 +-
 include/ajax/ajax_admin.php                        |    7 +
 include/ajax/ajax_anc_key_compute.php              |   20 +-
 include/ajax/ajax_anc_plan.php                     |    5 +-
 include/ajax/ajax_auto_anc_card.php                |    7 +-
 include/ajax/ajax_boxcard_search.php               |    4 +-
 include/ajax/ajax_calendar_zoom.php                |    4 +
 include/ajax/ajax_card.php                         |   54 +-
 include/ajax/ajax_create_menu.php                  |    4 +
 include/ajax/ajax_display_letter.php               |    7 +-
 include/ajax/ajax_display_submenu.php              |    1 +
 include/ajax/ajax_fiche_def_detail.php             |    7 +-
 include/ajax/ajax_get_menu_detail.php              |    2 +-
 include/ajax/ajax_ledger.php                       |   23 +-
 include/ajax/ajax_ledger_show.php                  |    6 +-
 include/ajax/ajax_min_row.php                      |    2 +-
 include/ajax/ajax_mod_menu.php                     |    4 +
 include/ajax/ajax_mod_periode.php                  |  105 -
 include/ajax/ajax_mod_predf_op.php                 |    2 +-
 include/ajax/ajax_navigator.php                    |    9 +-
 include/ajax/ajax_periode.php                      |  297 ++
 include/ajax/ajax_poste.php                        |    7 +-
 include/ajax/ajax_preference.php                   |   64 +-
 include/ajax/ajax_remove_submenu.php               |    6 +-
 include/ajax/ajax_search_add_tag.php               |    5 +
 include/ajax/ajax_search_clear_tag.php             |    5 +
 include/ajax/ajax_search_display_tag.php           |    5 +
 include/ajax/ajax_search_filter.php                |  201 ++
 .../ajax_search_operation.php}                     |   41 +-
 include/ajax/ajax_tag_add_action.php               |    6 +
 include/ajax/ajax_tag_detail.php                   |    1 +
 include/ajax/ajax_tag_list.php                     |    4 +
 include/ajax/ajax_tag_remove_action.php            |    4 +
 include/ajax/ajax_tag_save.php                     |    6 +-
 include/ajax/ajax_tag_select_search.php            |    6 +-
 include/ajax/ajax_template_cat_card.php            |   73 +
 include/ajax/ajax_template_cat_category.php        |  120 +
 include/ajax/ajax_todo_list.php                    |    3 +-
 include/ajax/ajax_user_security.php                |   55 +-
 include/ajax/ajax_view_action.php                  |    2 +-
 include/anc_acc_balance.inc.php                    |    5 +-
 include/anc_acc_table.inc.php                      |    6 +-
 include/anc_balance_double.inc.php                 |    6 +-
 include/anc_balance_simple.inc.php                 |    6 +-
 include/anc_great_ledger.inc.php                   |    6 +-
 include/anc_group_balance.inc.php                  |    6 +-
 include/anc_history.inc.php                        |    6 +-
 include/anc_pa.inc.php                             |    4 +-
 include/balance.inc.php                            |   56 +-
 include/balance_age.inc.php                        |    7 +-
 include/balance_card_ageing.inc.php                |    4 +-
 include/cat_document.inc.php                       |    2 +-
 include/category_card.inc.php                      |    2 +-
 include/cfgfiche.inc.php                           |    2 +-
 include/cfgledger.inc.php                          |    9 +-
 include/class/acc_account.class.php                |   56 +-
 include/class/acc_account_ledger.class.php         |    7 +-
 include/class/acc_balance.class.php                |   69 +-
 include/class/acc_ledger.class.php                 | 1135 ++------
 include/class/acc_ledger_fin.class.php             |    7 +-
 include/class/acc_ledger_purchase.class.php        |   17 +-
 include/class/acc_ledger_search.class.php          | 1126 ++++++++
 include/class/acc_ledger_sold.class.php            |   23 +-
 include/class/acc_operation.class.php              |   37 +-
 include/class/acc_plan_mtable.class.php            |   20 +-
 include/class/acc_reconciliation.class.php         |    5 +-
 include/class/acc_report.class.php                 |    2 +-
 include/class/anc_balance_double.class.php         |   15 +-
 include/class/anc_print.class.php                  |    6 +-
 include/class/document.class.php                   |    4 +-
 include/class/fiche.class.php                      |  131 +-
 include/class/fiche_def.class.php                  |   12 +-
 include/class/fiche_def_ref.class.php              |   94 +-
 ...lass.php => noalyss_parameter_folder.class.php} |    2 +-
 include/class/periode.class.php                    |  915 +++---
 include/class/periode_ledger.class.php             |   76 +
 include/class/periode_ledger_table.class.php       |  163 ++
 include/class/pre_op_ach.class.php                 |    2 +-
 include/class/pre_op_advanced.class.php            |    4 +-
 include/class/pre_op_ven.class.php                 |    2 +-
 include/class/pre_operation.class.php              |    2 +-
 include/class/print_ledger.class.php               |    4 +-
 include/class/print_ledger_simple.class.php        |   36 +-
 include/class/template_card_category.class.php     |  183 ++
 include/class/user.class.php                       |  117 +-
 include/company.inc.php                            |    6 +-
 include/compta_ach.inc.php                         |    9 +-
 include/compta_fin_rec.inc.php                     |    4 +-
 include/compta_fin_saldo.inc.php                   |    2 +-
 include/compta_ods.inc.php                         |    3 +-
 include/compta_ven.inc.php                         |    7 +-
 include/constant.php                               |    5 +
 include/dashboard.inc.php                          |    4 +
 include/database/acc_plan_sql.class.php            |    9 +-
 include/database/fiche_def_ref_sql.class.php       |   67 +
 include/database/jrn_def_sql.class.php             |   10 +-
 include/database/jrn_periode_sql.class.php         |   69 +
 include/database/parm_periode_sql.class.php        |   75 +
 include/database/user_filter_sql.class.php         |   92 +
 include/dossier.inc.php                            |    2 +-
 include/export/export_balance_pdf.php              |   47 +-
 include/export/export_gl_csv.php                   |    5 +-
 include/export/export_gl_pdf.php                   |    4 +-
 include/export/export_histo_csv.php                |    3 +-
 include/export/export_ledger_csv.php               |    4 +-
 include/export/export_ledger_pdf.php               |    4 +-
 include/fiche.inc.php                              |    8 +-
 include/fiche_def.inc.php                          |   74 +-
 include/header_print.php                           |    4 +-
 include/history_operation.inc.php                  |   11 +-
 include/impress_gl_comptes.inc.php                 |   18 +-
 include/impress_jrn.inc.php                        |   24 +-
 include/lib/ac_common.php                          |   21 +-
 include/lib/data_sql.class.php                     |   52 +-
 include/lib/database.class.php                     |   51 +-
 include/lib/filetosend.class.php                   |    9 +
 include/lib/html_input.class.php                   | 1331 ++++-----
 include/lib/http_input.class.php                   |   11 +-
 include/lib/ibutton.class.php                      |    6 +-
 include/lib/icard.class.php                        |  337 +--
 include/lib/icheckbox.class.php                    |    5 +-
 include/lib/icon_action.class.php                  |  188 ++
 include/lib/iconcerned.class.php                   |   20 +-
 include/lib/idate.class.php                        |   14 +-
 include/lib/ihidden.class.php                      |    7 +-
 include/lib/inplace_switch.class.php               |    6 +-
 include/lib/inum.class.php                         |    4 +-
 include/lib/iposte.class.php                       |    3 +-
 include/lib/manage_table_sql.class.php             |   16 +-
 include/lib/noalyss_csv.class.php                  |   46 +-
 include/lib/pdf.class.php                          |    7 +-
 include/lib/select_box.class.php                   |  158 +
 include/lib/sendmail.class.php                     |    6 +-
 include/lib/user_common.php                        |    2 +-
 include/menu.inc.php                               |    2 +-
 include/modele.inc.php                             |    2 +-
 include/opening.inc.php                            |    7 +-
 include/operation_ods_confirm.inc.php              |   15 +-
 include/operation_ods_new.inc.php                  |    2 +-
 include/param_sec.inc.php                          |   91 +-
 include/periode.inc.php                            |  195 +-
 include/restore.inc.php                            |    2 +-
 include/template/action_search.php                 |    4 +-
 include/template/anc_key_input.php                 |    2 +-
 include/template/dashboard.php                     |   16 +-
 include/template/document_mod_change.php           |    2 +-
 include/template/fiche_list.php                    |    2 +-
 include/template/form_ledger_detail.php            |    6 +-
 include/template/form_ledger_fin.php               |    4 +-
 include/template/history_top.php                   |    6 +-
 include/template/ledger_detail_ach.php             |    4 +-
 include/template/ledger_detail_bottom.php          |   37 +-
 include/template/ledger_detail_fin.php             |    4 +-
 include/template/ledger_detail_misc.php            |    6 +-
 include/template/ledger_detail_top.php             |   10 +-
 include/template/ledger_detail_ven.php             |    4 +-
 include/template/ledger_search.php                 |   10 +-
 include/template/param_jrn.php                     |   29 +-
 include/template/periode_add_exercice.php          |  118 +-
 include/template/predf_ledger_detail.php           |    6 +-
 include/template/print_ledger_simple.php           |   51 +-
 include/template/security_list_action.php          |    6 +-
 include/template/template_config_form.php          |   18 +-
 include/template/todo_list_display.php             |    2 +-
 include/tva.inc.php                                |    4 +-
 include/user.inc.php                               |    2 +-
 scenario/ajax_manage_table_sql.php                 |    2 +-
 scenario/select-box-test.php                       |   62 +
 scenario/test_manage_table_sql.php                 |    2 +-
 sql/upgrade.sql                                    |   79 +-
 unit-test/global.example.php                       |    2 +-
 unit-test/include/class/acc_account.classTest.php  |    2 +-
 .../include/class/acc_account_ledgerTest.class.php |    2 +-
 unit-test/include/class/acc_balanceTest.class.php  |    2 +-
 unit-test/include/class/acc_bilanTest.class.php    |    2 +-
 217 files changed, 14935 insertions(+), 8998 deletions(-)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]