[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 02/05: Merge remote-tracking branch 'origin/m
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 02/05: Merge remote-tracking branch 'origin/master' |
Date: |
Mon, 24 Nov 2014 19:39:36 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 0ac146db0709c8055217434e2d47a211c43edfaf
Merge: 62bb3a0 9218e29
Author: Vincent Danjean <address@hidden>
Date: Tue Nov 18 21:36:59 2014 +0100
Merge remote-tracking branch 'origin/master'
doc/developper/Doxyfile | 2 +-
html/ajax.php | 2 +-
html/ajax_card.php | 75 ++-
html/ajax_history.php | 29 +-
html/ajax_ledger.php | 35 +-
html/ajax_misc.php | 27 +-
html/ajax_poste.php | 22 +-
html/do.php | 25 +-
html/extension.raw.php | 2 +-
html/index.php | 2 +-
html/js/acc_ledger.js | 14 +-
html/js/accounting_item.js | 120 +++-
html/js/anc_script.js | 17 +-
html/js/card.js | 8 +-
html/js/gestion.js | 2 +-
html/js/scripts.js | 97 ++-
html/lang/en_US/LC_MESSAGES/messages.po | 151 +++-
html/lang/messages.po | 260 ++++++-
html/lang/nl_NL/LC_MESSAGES/messages.po | 138 +++-
html/style-classic.css | 252 +++++--
html/style-light.css | 173 +++--
html/style-mandarine.css | 98 ++-
html/test.php | 189 ++++-
include/ac_common.php | 10 +-
include/action.common.inc.php | 8 +-
include/adm.inc.php | 2 +-
include/ajax_account_update.php | 213 +++++
include/ajax_add_menu.php | 6 +-
include/ajax_get_profile.php | 36 +-
include/ajax_view_action.php | 3 +-
include/anc_od.inc.php | 8 +-
include/anc_pa.inc.php | 12 +-
include/balance.inc.php | 18 +-
include/bank.inc.php | 4 +-
include/category_card.inc.php | 2 +-
include/cfgfiche.inc.php | 37 +-
include/cfgplugin.inc.php | 154 ++++
include/class_acc_account.php | 4 +-
include/class_acc_account_ledger.php | 4 +-
include/class_acc_balance.php | 3 +-
include/class_acc_bilan.php | 52 +-
include/class_acc_compute.php | 7 +-
include/class_acc_ledger.php | 65 +-
include/class_acc_ledger_fin.php | 30 +-
include/class_acc_ledger_info.php | 6 +-
include/class_acc_ledger_purchase.php | 28 +-
include/class_acc_ledger_sold.php | 24 +-
include/class_acc_operation.php | 12 +
include/class_acc_parm_code.php | 2 +-
include/class_acc_payment.php | 3 +-
include/class_acc_reconciliation.php | 2 +-
include/class_acc_report_row.php | 4 +-
include/class_acc_tva.php | 2 +-
include/class_anc_acc_list.php | 2 +-
include/class_anc_group_operation.php | 6 +-
include/class_anc_key_sql.php | 28 +-
include/class_anc_operation.php | 15 +-
include/class_anc_print.php | 2 +-
include/class_anc_table.php | 2 +-
include/class_anticipation.php | 4 +-
include/class_database.php | 9 +-
include/class_document.php | 15 +-
include/class_document_export.php | 32 +-
include/class_document_modele.php | 4 +-
include/class_dossier.php | 4 +-
include/class_extension.php | 121 +++-
include/class_fiche.php | 48 +-
include/class_fiche_def.php | 17 +-
include/class_fiche_def_ref.php | 4 +-
include/class_follow_up.php | 10 +-
include/class_follow_up_detail.php | 4 +-
include/class_forecast.php | 4 +-
include/class_forecast_cat.php | 4 +-
include/class_forecast_item.php | 4 +-
include/class_gestion_purchase.php | 2 +-
include/class_gestion_sold.php | 2 +-
include/class_html_input.php | 33 +-
include/class_iconcerned.php | 4 +-
include/class_iradio.php | 1 +
include/class_irelated_action.php | 4 +-
include/class_menu_ref_sql.php | 23 +-
include/class_noalyss_sql.php | 49 +-
include/class_pre_op_advanced.php | 6 +-
include/class_pre_operation.php | 8 +-
include/class_profile_menu.php | 6 +-
include/class_profile_menu_sql.php | 284 +------
include/class_profile_sql.php | 3 +-
include/class_stock.php | 7 +-
include/class_stock_goods.php | 2 +-
include/class_tag.php | 4 +-
include/class_tag_sql.php | 3 +-
include/class_todo_list.php | 4 +-
include/class_user.php | 10 +-
include/company.inc.php | 2 +-
include/compta_ach.inc.php | 11 +-
include/compta_fin.inc.php | 15 +-
include/compta_fin_rec.inc.php | 6 +-
include/compta_fin_saldo.inc.php | 4 +-
include/compta_ods.inc.php | 11 +-
include/compta_ven.inc.php | 16 +-
include/constant.php | 9 +-
include/contact.inc.php | 2 +-
include/customer.inc.php | 2 +-
include/dossier.inc.php | 6 +-
include/extension_choice.inc.php | 1 +
include/extension_get.inc.php | 8 +-
include/fiche.inc.php | 44 +-
include/forecast.inc.php | 2 +-
include/function_javascript.php | 27 +-
include/history_operation.inc.php | 77 +-
include/impress_bilan.inc.php | 29 +-
include/impress_gl_comptes.inc.php | 2 +-
include/impress_jrn.inc.php | 6 +-
include/impress_poste.inc.php | 4 +-
include/impress_rapport.inc.php | 25 +-
include/impress_rec.inc.php | 14 +-
include/lettering.account.inc.php | 2 +-
include/lettering.gestion.inc.php | 2 +-
include/manager.inc.php | 2 +-
include/menu.inc.php | 1 +
include/modele.inc.php | 6 +-
include/opening.inc.php | 10 +-
include/operation_ods_new.inc.php | 6 +-
include/param_pcmn.inc.php | 221 +-----
include/param_sec.inc.php | 2 +-
include/payment_middle.inc.php | 4 +-
include/preod.inc.php | 2 +-
include/report.inc.php | 6 +-
include/restore.inc.php | 18 +-
include/search.inc.php | 2 +-
include/stock_cfg.inc.php | 2 +-
include/supplier.inc.php | 2 +-
include/template/action_other_action.php | 2 +-
include/template/detail-action.php | 5 +-
include/template/impress_reconciliation.php | 16 +-
include/template/ledger_detail_ach.php | 109 +---
include/template/ledger_detail_bottom.php | 239 +++++-
include/template/ledger_detail_file.php | 3 +-
include/template/ledger_detail_fin.php | 61 +-
include/template/ledger_detail_misc.php | 61 +-
include/template/ledger_detail_ven.php | 120 +---
include/tva.inc.php | 4 +-
include/user.inc.php | 2 +-
include/user_common.php | 16 +
include/user_detail.inc.php | 4 +-
include/user_menu.php | 29 +-
include/verif_bilan.inc.php | 199 ++++--
scenario/ajax-add-card-category.php | 15 +
scenario/ajax-detail-operation1.php | 14 +
scenario/ajax-detail-operation2.php | 14 +
scenario/ajax-detail-operation3.php | 14 +
scenario/ajax-detail-operation4.php | 14 +
scenario/ajax-save-operation.php | 35 +
scenario/readme.txt | 36 +
scenario/scenario-1415994947.php | 17 +
scenario/scenario-1415994966.php | 17 +
scenario/scenario-1415995071.php | 12 +
scenario/scenario-1415995185.php | 43 +
scenario/scenario-1415995188.php | 40 +
scenario/scenario-1415995192.php | 12 +
scenario/scenario-1415995229.php | 34 +
scenario/scenario-1415995238.php | 34 +
scenario/scenario-1415995254.php | 35 +
scenario/scenario-1415995260.php | 14 +
scenario/scenario-1415995262.php | 106 +++
scenario/scenario-1415995277.php | 108 +++
scenario/scenario-1415995285.php | 11 +
scenario/scenario-1415995301.php | 14 +
scenario/scenario-1415995308.php | 33 +
scenario/scenario-1415995317.php | 12 +
scenario/scenario-1415995350.php | 54 ++
scenario/scenario-1415995352.php | 50 ++
scenario/scenario-1415995357.php | 12 +
scenario/scenario-1415995424.php | 12 +
scenario/scenario-1415995434.php | 19 +
scenario/scenario-1415995437.php | 13 +
scenario/scenario-1415995449.php | 20 +
scenario/scenario-1415995545.php | 12 +
scenario/scenario-1415995575.php | 32 +
scenario/scenario-1415996970.php | 44 +
scenario/scenario-1415996980.php | 35 +
scenario/scenario-1415997148.php | 12 +
scenario/scenario-1415997352.php | 44 +
scenario/scenario-1415997358.php | 35 +
scenario/scenario-1415997389.php | 12 +
scenario/scenario-1415997404.php | 67 ++
scenario/scenario-1415997407.php | 38 +
scenario/scenario-1415997877.php | 12 +
scenario/scenario-1415997886.php | 12 +
scenario/scenario-1415997889.php | 12 +
scenario/scenario-1415998124.php | 13 +
scenario/scenario-1415998134.php | 13 +
scenario/scenario-1415998146.php | 13 +
scenario/scenario-1416078146.php | 14 +
scenario/scenario-ajax-add-card.php | 30 +
scenario/scenario-historic.php | 24 +
scenario/scenario-verif_bilan.php | 13 +
sql/upgrade.sql | 41 +
unit-test/README | 7 +-
.../search_top.php => unit-test/global.example.php | 31 +-
unit-test/include/class_acc_accountTest.php | 4 +-
unit-test/include/class_acc_account_ledgerTest.php | 8 +-
unit-test/include/class_acc_computeTest.php | 8 +-
unit-test/include/class_acc_ledgerTest.php | 839 ++++++++++++++++++++
unit-test/include/class_acc_ledger_finTest.php | 138 ++++
.../include/class_acc_ledger_purchaseTest.php | 127 +++
unit-test/include/class_acc_ledger_soldTest.php | 138 ++++
unit-test/include/class_acc_parm_codeTest.php | 108 +++
unit-test/include/class_anc_accountTest.php | 176 ++++
unit-test/include/class_anc_grandlivreTest.php | 116 +++
unit-test/include/class_anc_keyTest.php | 140 ++++
unit-test/include/class_anc_key_sqlTest.php | 43 +
unit-test/include/class_anc_operationTest.php | 224 ++++++
unit-test/include/class_databaseTest.php | 584 ++++++++++++++
unit-test/include/class_default_menu_sqlTest.php | 32 +
unit-test/include/class_document_exportTest.php | 104 +++
unit-test/include/class_ficheTest.php | 549 +++++++++++++
unit-test/include/class_follow_upTest.php | 428 ++++++++++
unit-test/include/class_follow_up_detailTest.php | 176 ++++
unit-test/include/class_html_inputTest.php | 644 +++++++++++++++
unit-test/include/class_icardTest.php | 128 +++
unit-test/include/class_menu_ref_sqlTest.php | 44 +
unit-test/include/class_profile_sqlTest.php | 32 +
unit-test/include/class_stockTest.php | 128 +++
unit-test/include/class_stock_goods_sqlTest.php | 32 +
unit-test/include/class_stock_sqlTest.php | 28 +
unit-test/include/class_tagTest.php | 152 ++++
unit-test/include/class_tag_sqlTest.php | 32 +
228 files changed, 9682 insertions(+), 1686 deletions(-)