diff --git a/html/admin/setup.php b/html/admin/setup.php index bfd9ca116..d2d9d122b 100644 --- a/html/admin/setup.php +++ b/html/admin/setup.php @@ -213,7 +213,7 @@ if ( ! file_exists('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'include'.D // magic_quotes_sybase = Off // include_path require_once NOALYSS_INCLUDE.'/config_file.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; if ( defined ("MULTI") && MULTI==1) { create_htaccess();} @@ -386,8 +386,8 @@ if ( $Res==0) { ?> Check(); diff --git a/html/ajax.php b/html/ajax.php index cab34f086..9bee61ffa 100644 --- a/html/ajax.php +++ b/html/ajax.php @@ -13,16 +13,16 @@ */ if ( ! defined ('ALLOWED') ) define ('ALLOWED',1); require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_extension.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_extension.php'; if ( !isset ($_REQUEST['gDossier'])) exit(); -require_once NOALYSS_INCLUDE.'/class_own.php'; +require_once NOALYSS_INCLUDE.'/class/class_own.php'; mb_internal_encoding("UTF-8"); global $g_user,$cn,$g_parameter; -$cn=new Database(dossier::id()); +$cn=Dossier::connect(); $g_parameter=new Own($cn); $g_user=new User($cn); $g_user->check(true); diff --git a/html/ajax_card.php b/html/ajax_card.php index c33f2a945..e06348bef 100644 --- a/html/ajax_card.php +++ b/html/ajax_card.php @@ -56,13 +56,13 @@ if ( ! defined('ALLOWED')) define ('ALLOWED',1); require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_iradio.php'; -require_once NOALYSS_INCLUDE.'/function_javascript.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_fiche_attr.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iradio.php'; +require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_attr.php'; mb_internal_encoding("UTF-8"); @@ -89,7 +89,7 @@ set_language(); */ ajax_disconnected($_REQUEST['ctl']); -$cn=new Database($gDossier); +$cn=Dossier::connect(); global $g_user; $g_user=new User($cn); $g_user->check(true); @@ -356,7 +356,7 @@ case 'sc': * *----------------------------------------------------------------------*/ case 'fs': - require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; + require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; $r=HtmlInput::title_box(_("Détail fiche"), 'search_card'); $r.='
'; $q=new IText('query'); @@ -434,14 +434,14 @@ case 'fs': $html=$r; break; case 'action_add_concerned_card': - require_once NOALYSS_INCLUDE.'/ajax_add_concerned_card.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_add_concerned_card.php'; return; break; case 'action_save_concerned': - require 'ajax_action_save_concerned.php'; + require NOALYSS_INCLUDE.'/ajax/ajax_action_save_concerned.php'; return; case 'action_remove_concerned': - require 'ajax_action_remove_concerned.php'; + require NOALYSS_INCLUDE.'/ajax/ajax_action_remove_concerned.php'; return; case 'ac': if ( $g_user->check_action(FICCAT)==1 ) @@ -497,7 +497,7 @@ case 'ac': $str_poste=$search->input(); $submit=HtmlInput::submit('save',_('Sauve')); ob_start(); - require('template/category_of_card.php'); + require(NOALYSS_INCLUDE.'/template/category_of_card.php'); $html.=ob_get_contents(); ob_end_clean(); diff --git a/html/ajax_history.php b/html/ajax_history.php index 0e7792090..c7b3285f1 100644 --- a/html/ajax_history.php +++ b/html/ajax_history.php @@ -26,13 +26,13 @@ if ( ! defined('ALLOWED')) define ('ALLOWED',1); require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_periode.php'; -require_once NOALYSS_INCLUDE.'/class_html_input.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account.php'; -require_once NOALYSS_INCLUDE.'/class_exercice.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; +require_once NOALYSS_INCLUDE.'/lib/class_html_input.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account.php'; +require_once NOALYSS_INCLUDE.'/class/class_exercice.php'; $div=$_REQUEST['div']; mb_internal_encoding("UTF-8"); @@ -41,7 +41,7 @@ mb_internal_encoding("UTF-8"); */ ajax_disconnected($div); global $g_user,$cn; -$cn=new Database(dossier::id()); +$cn=Dossier::connect(); $g_user=new User($cn); set_language(); /* security */ diff --git a/html/ajax_ledger.php b/html/ajax_ledger.php index 842b6763d..6ab53d4f7 100644 --- a/html/ajax_ledger.php +++ b/html/ajax_ledger.php @@ -31,16 +31,16 @@ if ( ! defined('ALLOWED')) define ('ALLOWED',1); require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_acc_operation.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_acc_reconciliation.php'; -require_once NOALYSS_INCLUDE.'/class_anc_operation.php'; -require_once NOALYSS_INCLUDE.'/class_idate.php'; -require_once NOALYSS_INCLUDE.'/class_own.php'; -require_once NOALYSS_INCLUDE.'/class_iconcerned.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_operation.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_reconciliation.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_operation.php'; +require_once NOALYSS_INCLUDE.'/lib/class_idate.php'; +require_once NOALYSS_INCLUDE.'/class/class_own.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iconcerned.php'; /** * Check if we receive the needed data (jr_id...) */ @@ -62,7 +62,7 @@ $gDossier=dossier::id(); */ ajax_disconnected($div); -$cn=new Database(dossier::id()); +$cn=Dossier::connect(); $g_parameter=new Own($cn); if ( LOGINPUT) { diff --git a/html/ajax_misc.php b/html/ajax_misc.php index f30f47019..379091d2d 100644 --- a/html/ajax_misc.php +++ b/html/ajax_misc.php @@ -37,12 +37,12 @@ if ( ! defined('ALLOWED')) define ('ALLOWED',1); require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_iradio.php'; -require_once NOALYSS_INCLUDE.'/function_javascript.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iradio.php'; +require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; mb_internal_encoding("UTF-8"); $var = array('gDossier', 'op'); @@ -66,7 +66,7 @@ global $g_user, $cn, $g_parameter; // but to the administration // if ($gDossier<>0) { - $cn = new Database($gDossier); + $cn =Dossier::connect(); $g_parameter=new Own($cn); $g_user = new User($cn); $g_user->check(true); @@ -102,7 +102,7 @@ if ( LOGINPUT) switch ($op) { case 'pcmn_update': - require 'ajax_pcmn_update.php'; + require NOALYSS_INCLUDE.'/ajax/ajax_pcmn_update.php'; return; case "remove_anc": if ($g_user->check_module('ANCODS') == 0) @@ -122,7 +122,7 @@ switch ($op) //-------------------------------------------------- // get the last date of a ledger case 'lastdate': - require_once NOALYSS_INCLUDE.'/class_acc_ledger_fin.php'; + require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_fin.php'; $ledger = new Acc_Ledger_Fin($cn, $_GET['p_jrn']); $html = $ledger->get_last_date(); $html = escape_xml($html); @@ -137,7 +137,7 @@ EOF; break; case 'bkname': - require_once NOALYSS_INCLUDE.'/class_acc_ledger_fin.php'; + require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_fin.php'; $ledger = new Acc_Ledger_Fin($cn, $_GET['p_jrn']); $html = $ledger->get_bank_name(); $html = escape_xml($html); @@ -152,7 +152,7 @@ EOF; break; // display new calendar case 'cal': - require_once NOALYSS_INCLUDE.'/class_calendar.php'; + require_once NOALYSS_INCLUDE.'/class/class_calendar.php'; /* others report */ $cal = new Calendar(); $cal->set_periode($per); @@ -170,7 +170,7 @@ EOF; break; /* rem a cat of document */ case 'rem_cat_doc': - require_once NOALYSS_INCLUDE.'/class_document_type.php'; + require_once NOALYSS_INCLUDE.'/class/class_document_type.php'; // if user can not return error message $message=""; if ($g_user->check_action(PARCATDOC) == 0) @@ -221,7 +221,7 @@ EOF; require_once NOALYSS_INCLUDE.'/template/document_mod_change.php'; break; case 'dsp_tva': - $cn = new Database($gDossier); + $cn = Dossier::connect(); $Res = $cn->exec_sql("select * from tva_rate order by tva_rate desc"); $Max = Database::num_row($Res); $r = ""; @@ -284,7 +284,7 @@ EOF; EOF; break; case 'label_tva': - $cn = new Database($gDossier); + $cn =Dossier::connect(); if (isNumber($id) == 0) $value = _('tva inconnue'); else @@ -309,7 +309,7 @@ EOF; * display the lettering */ case 'dl': - require_once NOALYSS_INCLUDE.'/class_lettering.php'; + require_once NOALYSS_INCLUDE.'/class/class_lettering.php'; $exercice = $g_user->get_exercice(); if ($g_user->check_module("LETCARD") == 0 && $g_user->check_module("LETACC") == 0) exit(); @@ -516,43 +516,43 @@ EOF; EOF; break; case 'mod_doc': - require_once NOALYSS_INCLUDE.'/ajax_mod_document.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_mod_document.php'; break; case 'input_per': - require_once NOALYSS_INCLUDE.'/ajax_mod_periode.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_mod_periode.php'; break; case 'save_per': - require_once NOALYSS_INCLUDE.'/ajax_mod_periode.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_mod_periode.php'; break; case 'mod_predf': - require_once NOALYSS_INCLUDE.'/ajax_mod_predf_op.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_mod_predf_op.php'; break; case 'save_predf': - require_once NOALYSS_INCLUDE.'/ajax_save_predf_op.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_save_predf_op.php'; break; case 'search_op': require_once NOALYSS_INCLUDE.'/search.inc.php'; break; case 'search_action': - require_once NOALYSS_INCLUDE.'/ajax_search_action.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_search_action.php'; break; case 'display_profile': - require_once NOALYSS_INCLUDE.'/ajax_get_profile.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_get_profile.php'; break; case 'det_menu': - require_once NOALYSS_INCLUDE.'/ajax_get_menu_detail.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_get_menu_detail.php'; break; case 'add_menu': - require_once NOALYSS_INCLUDE.'/ajax_add_menu.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_add_menu.php'; break; case 'display_submenu': - require_once NOALYSS_INCLUDE.'/ajax_display_submenu.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_display_submenu.php'; break; case 'remove_submenu': - require_once NOALYSS_INCLUDE.'/ajax_remove_submenu.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_remove_submenu.php'; break; case 'cardsearch': - require_once NOALYSS_INCLUDE.'/ajax_boxcard_search.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_boxcard_search.php'; break; case 'add_plugin': $me_code = new IText('me_code'); @@ -561,15 +561,16 @@ EOF; $me_description = new IText("me_description"); $me_parameter = new IText("me_parameter"); $new = true; - require_once NOALYSS_INCLUDE.'/ajax_plugin_detail.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_plugin_detail.php'; break; case 'mod_plugin': $m = $cn->get_array("select me_code,me_file,me_menu,me_description,me_parameter from menu_ref where me_code=$1", array($me_code)); if (empty($m)) { - echo HtmlInput::title_box("Ce plugin n'existe pas ", $ctl); - echo "

Il y a une erreur, ce plugin n'existe pas"; + echo HtmlInput::title_box(_("Ce plugin n'existe pas "), $ctl); + echo "

"._("Il y a une erreur, ce plugin n'existe pas"). + "

"; exit; } $me_code = new IText('me_code', $m[0] ['me_code']); @@ -578,71 +579,71 @@ EOF; $me_description = new IText("me_description", $m[0] ['me_description']); $me_parameter = new IText("me_parameter", $m[0] ['me_parameter']); $new = false; - require_once NOALYSS_INCLUDE.'/ajax_plugin_detail.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_plugin_detail.php'; break; case 'saldo': - require_once NOALYSS_INCLUDE.'/ajax_bank_saldo.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_bank_saldo.php'; break; case 'up_predef': - require_once NOALYSS_INCLUDE.'/ajax_update_predef.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_update_predef.php'; break; case 'upd_receipt': - require_once NOALYSS_INCLUDE.'/ajax_get_receipt.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_get_receipt.php'; break; case 'up_pay_method': - require_once NOALYSS_INCLUDE.'/ajax_update_payment.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_update_payment.php'; break; case 'openancsearch': case 'resultancsearch': - require_once NOALYSS_INCLUDE.'/ajax_anc_search.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_anc_search.php'; break; case 'autoanc': - require_once NOALYSS_INCLUDE.'/ajax_auto_anc_card.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_auto_anc_card.php'; break; case 'create_menu'; - require_once NOALYSS_INCLUDE.'/ajax_create_menu.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_create_menu.php'; break; case 'modify_menu'; - require_once NOALYSS_INCLUDE.'/ajax_mod_menu.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_mod_menu.php'; break; case 'mod_stock_repo': - require_once NOALYSS_INCLUDE.'/ajax_mod_stock_repo.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_mod_stock_repo.php'; break; case 'view_mod_stock': - require_once NOALYSS_INCLUDE.'/ajax_view_mod_stock.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_view_mod_stock.php'; break; case 'fddetail': - require_once NOALYSS_INCLUDE.'/ajax_fiche_def_detail.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_fiche_def_detail.php'; break; case 'vw_action': - require_once NOALYSS_INCLUDE.'/ajax_view_action.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_view_action.php'; break; case 'minrow': - require_once NOALYSS_INCLUDE.'/ajax_min_row.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_min_row.php'; break; case 'navigator': - require_once NOALYSS_INCLUDE.'/ajax_navigator.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_navigator.php'; break; case 'preference': - require_once NOALYSS_INCLUDE.'/ajax_preference.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_preference.php'; break; case 'bookmark': - require_once NOALYSS_INCLUDE.'/ajax_bookmark.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_bookmark.php'; break; case 'tag_detail': - require_once NOALYSS_INCLUDE.'/ajax_tag_detail.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_tag_detail.php'; break; case 'tag_save': - require_once NOALYSS_INCLUDE.'/ajax_tag_save.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_tag_save.php'; break; case 'tag_list': - require_once NOALYSS_INCLUDE.'/ajax_tag_list.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_tag_list.php'; break; case 'tag_add': - require_once NOALYSS_INCLUDE.'/ajax_tag_add_action.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_tag_add_action.php'; break; case 'tag_remove': - require_once NOALYSS_INCLUDE.'/ajax_tag_remove_action.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_tag_remove_action.php'; break; case 'tag_choose': require_once NOALYSS_INCLUDE.'/ajax_tag_choose.php'; @@ -651,19 +652,19 @@ EOF; require_once NOALYSS_INCLUDE.'/ajax_tag_choose.php'; break; case 'search_display_tag': - require_once NOALYSS_INCLUDE.'/ajax_search_display_tag.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_search_display_tag.php'; break; case 'search_add_tag': - require_once NOALYSS_INCLUDE.'/ajax_search_add_tag.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_search_add_tag.php'; break; case 'search_clear_tag': - require_once NOALYSS_INCLUDE.'/ajax_search_clear_tag.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_search_clear_tag.php'; break; case 'calendar_zoom': - require_once NOALYSS_INCLUDE.'/ajax_calendar_zoom.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_calendar_zoom.php'; break; case 'ledger_show': - require_once NOALYSS_INCLUDE.'/ajax_ledger_show.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_ledger_show.php'; case 'ledger_description': $ajrn=$cn->get_array('select jrn_def_name,jrn_def_description from jrn_def where jrn_def_id=$1',array($l)); if ( count($ajrn)==1) @@ -682,67 +683,67 @@ EOF; /* * Show the available distribution keys for analytic */ - require_once NOALYSS_INCLUDE.'/ajax_anc_key_choice.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_anc_key_choice.php'; break; case 'anc_key_compute': /* * Show the activities computed with the selected distribution key */ - require_once NOALYSS_INCLUDE.'/ajax_anc_key_compute.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_anc_key_compute.php'; break; case 'account_update': /** * update an accounting (from CFGPCMN) */ - require_once NOALYSS_INCLUDE.'/ajax_account_update.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_account_update.php'; break; // From admin, revoke the access to a folder from an // user case 'folder_remove': - require_once NOALYSS_INCLUDE.'/ajax_admin.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_admin.php'; break; // From admin, display a list of folder to which the user has // no access case 'folder_display': - require_once NOALYSS_INCLUDE.'/ajax_admin.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_admin.php'; break; // From admin, grant the access to a folder to an // user case 'folder_add': - require_once NOALYSS_INCLUDE.'/ajax_admin.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_admin.php'; break; // From admin, display info and propose to drop the folder case 'folder_drop': - require_once NOALYSS_INCLUDE.'/ajax_admin.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_admin.php'; break; // From admin, display the information of a folder you can // modify case 'folder_modify': - require_once NOALYSS_INCLUDE.'/ajax_admin.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_admin.php'; break; // From admin, display info and propose to drop the template case 'modele_drop': - require_once NOALYSS_INCLUDE.'/ajax_admin.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_admin.php'; break; // From admin, display the information of a template you can // modify case 'modele_modify': - require_once NOALYSS_INCLUDE.'/ajax_admin.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_admin.php'; break; // From dashboard, display detail about last operation case 'action_show': - require_once NOALYSS_INCLUDE.'/ajax_gestion.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_gestion.php'; break; // From dashboard, display form for a new event case 'action_add': - require_once NOALYSS_INCLUDE.'/ajax_gestion.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_gestion.php'; break; // Save a event given in the short form case 'action_save': - require_once NOALYSS_INCLUDE.'/ajax_gestion.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_gestion.php'; break; default: var_dump($_GET); diff --git a/html/ajax_poste.php b/html/ajax_poste.php index 13f0e1d91..462557112 100644 --- a/html/ajax_poste.php +++ b/html/ajax_poste.php @@ -35,11 +35,11 @@ if ( ! defined('ALLOWED')) define ('ALLOWED',1); require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/function_javascript.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; mb_internal_encoding("UTF-8"); extract($_REQUEST); @@ -59,8 +59,8 @@ ajax_disconnected($ctl); set_language(); if ( $cont != 0 ) exit(); -$cn=new Database(dossier::id()); -require_once NOALYSS_INCLUDE.'/class_user.php'; +$cn=Dossier::connect(); +require_once NOALYSS_INCLUDE.'/class/class_user.php'; global $g_user; $g_user=new User($cn); $g_user->Check(); diff --git a/html/ajax_todo_list.php b/html/ajax_todo_list.php index e71f29d9b..e71dfd7f3 100644 --- a/html/ajax_todo_list.php +++ b/html/ajax_todo_list.php @@ -35,10 +35,10 @@ */ define ('ALLOWED',1); require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_todo_list.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_todo_list.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; mb_internal_encoding("UTF-8"); $cn= Dossier::connect(); @@ -53,7 +53,7 @@ ajax_disconnected('add_todo_list'); //////////////////////////////////////////////////////////////////////////////// if (isset($_REQUEST['show'])) { - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); $todo=new Todo_list($cn); $todo->set_parameter('id',$_REQUEST['id']); $todo->load(); @@ -78,7 +78,7 @@ if (isset($_REQUEST['show'])) //////////////////////////////////////////////////////////////////////////////// if (isset($_REQUEST['del'])) { - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); $todo=new Todo_list($cn); $todo->set_parameter('id',$_REQUEST['id']); $todo->delete(); @@ -92,7 +92,7 @@ $ac=HtmlInput::default_value_get('act', 'save'); if ($ac == 'save') { - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); $todo=new Todo_List($cn); $id=HtmlInput::default_value_get("id", 0); $todo->set_parameter("id",$id); diff --git a/html/backup.php b/html/backup.php index 127a5a0ad..6dc1e47a2 100644 --- a/html/backup.php +++ b/html/backup.php @@ -20,9 +20,9 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu require_once '../include/constant.php'; require_once("constant.php"); -require_once('class_database.php'); -require_once ("class_user.php"); -require_once ('ac_common.php'); +require_once('lib/class_database.php'); +require_once ("class/class_user.php"); +require_once ('lib/ac_common.php'); $rep=new Database(); $User=new User($rep); diff --git a/html/compute.php b/html/compute.php index 8e5d441fa..f4f9de7c6 100644 --- a/html/compute.php +++ b/html/compute.php @@ -31,11 +31,11 @@ * Must return at least tva, htva and tvac */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_acc_compute.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_acc_tva.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_compute.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_tva.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; // Check if the needed field does exist extract ($_GET); @@ -48,7 +48,7 @@ foreach (array('t','c','p','q','n','gDossier') as $a) } } -$cn=new Database(dossier::id()); +$cn=Dossier::connect(); $User=new User($cn); $User->Check(); // Retrieve the rate of vat, it $t == -1 it means no VAT diff --git a/html/direct.php b/html/direct.php index 12f0e80ea..d968d4283 100644 --- a/html/direct.php +++ b/html/direct.php @@ -19,10 +19,10 @@ */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; -$cn=new Database($_GET['gDossier']); +$cn=Dossier::connect(); global $g_user; $g_user=new User($cn); $g_user->Check(); diff --git a/html/do.php b/html/do.php index 6354d6062..566188797 100644 --- a/html/do.php +++ b/html/do.php @@ -24,13 +24,13 @@ define('ALLOWED',1); * \brief Main file */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/function_javascript.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; require_once NOALYSS_INCLUDE.'/constant.security.php'; -require_once NOALYSS_INCLUDE.'/class_html_input.php'; +require_once NOALYSS_INCLUDE.'/lib/class_html_input.php'; mb_internal_encoding("UTF-8"); // if gDossier is not set redirect to form to choose a folder @@ -84,7 +84,7 @@ global $g_user, $cn,$g_parameter; -$cn = new Database(Dossier::id()); +$cn = Dossier::connect(); /* * check that the database is not empty @@ -252,7 +252,8 @@ if (isset($_REQUEST['ac'])) alert(_('Accès menu impossible')); } else { - alert($e->getTraceAsString()); + alert($e->getMessage()); + error_log($e->getTraceAsString()); } } } @@ -261,21 +262,30 @@ else $default = find_default_module(); $user_profile=$g_user->get_profile(); - if ( $user_profile == "" ) + try + { + if ( $user_profile == "" ) throw new Exception (_('Aucun profil utilisateur')); - $menu_id=$cn->get_value('select - case when pm_id_v3 = 0 then - (case when pm_id_v2 = 0 then pm_id_v1 else pm_id_v2 end) - else pm_id_v3 end - from v_menu_profile where code= upper($1) and p_id=$2', - array($default,$user_profile)); - $_GET['ac']=$default; - $_POST['ac']=$default; - $_REQUEST['ac']=$default; - show_module($menu_id); - $all[0] = $default; - show_menu($menu_id); + $menu_id=$cn->get_value('select + case when pm_id_v3 = 0 then + (case when pm_id_v2 = 0 then pm_id_v1 else pm_id_v2 end) + else pm_id_v3 end + from v_menu_profile where code= upper($1) and p_id=$2', + array($default,$user_profile)); + $_GET['ac']=$default; + $_POST['ac']=$default; + $_REQUEST['ac']=$default; + show_module($menu_id); + $all[0] = $default; + show_menu($menu_id); + } + catch (Exception $exc) + { + echo $exc->getMessage(); + error_log($exc->getTraceAsString()); + } + } diff --git a/html/document/fr_be/bnb.form b/html/document/fr_be/bnb.form index ba7c6d87a..66a86ec4e 100644 --- a/html/document/fr_be/bnb.form +++ b/html/document/fr_be/bnb.form @@ -1,101 +1,101 @@ # Les postesg*(-1) - $C10=round([10%s],2)*(-1) - $C100=round([100%s],2)*(-1) - $C101=round([101%s],2) - $C11=round([11%s],2)*(-1) - $C12=round([12%s],2)*(-1) - $C13=round([13%s],2)*(-1) - $C130=round([130%s],2)*(-1) - $C131=round([131%s],2)*(-1) - $C1310=round([1310%s],2)*(-1) - $C1311=round([1311%s],2)*(-1) - $C132=round([132%s],2)*(-1) - $C133=round([133%s],2)*(-1) - $C14=round([14%s],2)*(-1) - $C140=round([140%s],2)*(-1) - $C141=round([141%s],2) - $C15=round([15%s],2)*(-1) - $C16=round([16%s],2)*(-1) - $C160=round([160%s],2)*(-1) - $C161=round([161%s],2)*(-1) - $C162=round([162%s],2)*(-1) - $C163=round([163%s],2)*(-1) - $C164=round([164%s],2)*(-1) - $C165=round([165%s],2)*(-1) - $C168=round([168%s],2)*(-1) +$C10=round([10%s],2)*(-1) +$C100=round([100%s],2)*(-1) +$C101=round([101%s],2) +$C11=round([11%s],2)*(-1) +$C12=round([12%s],2)*(-1) +$C13=round([13%s],2)*(-1) +$C130=round([130%s],2)*(-1) +$C131=round([131%s],2)*(-1) +$C1310=round([1310%s],2)*(-1) +$C1311=round([1311%s],2)*(-1) +$C132=round([132%s],2)*(-1) +$C133=round([133%s],2)*(-1) +$C14=round([14%s],2)*(-1) +$C140=round([140%s],2)*(-1) +$C141=round([141%s],2) +$C15=round([15%s],2)*(-1) +$C16=round([16%s],2)*(-1) +$C160=round([160%s],2)*(-1) +$C161=round([161%s],2)*(-1) +$C162=round([162%s],2)*(-1) +$C163=round([163%s],2)*(-1) +$C164=round([164%s],2)*(-1) +$C165=round([165%s],2)*(-1) +$C168=round([168%s],2)*(-1) $C17=round([17%s],2)*(-1) - $C170=round([170%s],2)*(-1) - $C171=round([171%s],2)*(-1) - $C172=round([172%s],2)*(-1) - $C173=round([173%s],2)*(-1) - $C174=round([174%s],2)*(-1) - $C175=round([175%s],2)*(-1) - $C176=round([176%s],2)*(-1) - $C178=round([178%s],2)*(-1) - $C179=round([179%s],2)*(-1) +$C170=round([170%s],2)*(-1) +$C171=round([171%s],2)*(-1) +$C172=round([172%s],2)*(-1) +$C173=round([173%s],2)*(-1) +$C174=round([174%s],2)*(-1) +$C175=round([175%s],2)*(-1) +$C176=round([176%s],2)*(-1) +$C178=round([178%s],2)*(-1) +$C179=round([179%s],2)*(-1) $C2=round([2%s],2)*(-1) - $C20=round([20%s],2) - $C21=round([21%s],2) - $C22=round([22%s],2) - $C23=round([23%s],2) - $C24=round([24%s],2) - $C25=round([25%s],2) - $C26=round([26%s],2) - $C27=round([27%s],2) - $C28=round([28%s],2) - $C29=round([29%s],2) - $C290=round([290%s],2) - $C291=round([291%s],2) +$C20=round([20%s],2) +$C21=round([21%s],2) +$C22=round([22%s],2) +$C23=round([23%s],2) +$C24=round([24%s],2) +$C25=round([25%s],2) +$C26=round([26%s],2) +$C27=round([27%s],2) +$C28=round([28%s],2) +$C29=round([29%s],2) +$C290=round([290%s],2) +$C291=round([291%s],2) $C3=round([3%s],2) - $C30=round([30%s],2) - $C31=round([31%s],2) - $C32=round([32%s],2) - $C33=round([33%s],2) - $C34=round([34%s],2) - $C35=round([35%s],2) - $C36=round([36%s],2) - $C37=round([37%s],2) - $C40=round([40%s],2) - $C41=round([41%s],2) - $C42=round([42%s],2)*(-1) - $C43=round([43%s],2)*(-1) - $C439=round([439%s],2)*(-1) - $C44=round([44%s],2)*(-1) - $C440=round([440%s],2)*(-1) - $C441=round([441%s],2)*(-1) - $C444=round([444%s],2)*(-1) - $C45=round([45%s],2)*(-1) - $C450=round([450%s],2)*(-1) - $C451=round([451%s],2)*(-1) - $C452=round([452%s],2)*(-1) - $C453=round([453%s],2)*(-1) - $C454=round([454%s],2)*(-1) +$C30=round([30%s],2) +$C31=round([31%s],2) +$C32=round([32%s],2) +$C33=round([33%s],2) +$C34=round([34%s],2) +$C35=round([35%s],2) +$C36=round([36%s],2) +$C37=round([37%s],2) +$C40=round([40%s],2) +$C41=round([41%s],2) +$C42=round([42%s],2)*(-1) +$C43=round([43%s],2)*(-1) +$C439=round([439%s],2)*(-1) +$C44=round([44%s],2)*(-1) +$C440=round([440%s],2)*(-1) +$C441=round([441%s],2)*(-1) +$C444=round([444%s],2)*(-1) +$C45=round([45%s],2)*(-1) +$C450=round([450%s],2)*(-1) +$C451=round([451%s],2)*(-1) +$C452=round([452%s],2)*(-1) +$C453=round([453%s],2)*(-1) +$C454=round([454%s],2)*(-1) $C455=round([455%s],2)*(-1) $C456=round([456%s],2)*(-1) $C457=round([457%s],2)*(-1) $C458=round([458%s],2)*(-1) - $C459=round([459%s],2)*(-1) - $C46=round([46%s],2) - $C47=round([47%s],2)*(-1) - $C48=round([48%s],2)*(-1) - $C49=round([49%s],2) - $C490=round([490%s],2) - $C491=round([491%s],2) - $C492=round([492%s],2)*(-1) - $C493=round([493%s],2)*(-1) - $C50=round([50%s],2) - $C51=round([51%s],2) - $C52=round([52%s],2) - $C53=round([53%s],2) - $C54=round([54%s],2) - $C55=round([55%s],2) - $C56=round([56%s],2) - $C57=round([57%s],2) - $C58=round([58%s],2) - $C60=round([60%s],2) - $C61=round([61%s],2) - $C62=round([62%s],2) - $C63=round([63%s],2) +$C459=round([459%s],2)*(-1) +$C46=round([46%s],2) +$C47=round([47%s],2)*(-1) +$C48=round([48%s],2)*(-1) +$C49=round([49%s],2) +$C490=round([490%s],2) +$C491=round([491%s],2) +$C492=round([492%s],2)*(-1) +$C493=round([493%s],2)*(-1) +$C50=round([50%s],2) +$C51=round([51%s],2) +$C52=round([52%s],2) +$C53=round([53%s],2) +$C54=round([54%s],2) +$C55=round([55%s],2) +$C56=round([56%s],2) +$C57=round([57%s],2) +$C58=round([58%s],2) +$C60=round([60%s],2) +$C61=round([61%s],2) +$C62=round([62%s],2) +$C63=round([63%s],2) $C630=round([630%s],2) $C631=round([631%s],2) $C632=round([632%s],2) @@ -104,39 +104,39 @@ $C634=round([634%s],2) $C635=round([635%s],2) $C636=round([636%s],2) $C637=round([637%s],2) - - $C649=round([649%s],2)*(-1) - $C64=round([64%s],2) - $C65=round([65%s],2) - $C66=round([66%s],2) - $C67=round([67%s],2) - $C68=round([68%s],2) - $C680=round([680%s],2) +$C649=round([649%s],2)*(-1) +$C64=round([64%s],2) + +$C65=round([65%s],2) +$C66=round([66%s],2) +$C67=round([67%s],2) +$C68=round([68%s],2) +$C680=round([680%s],2) $C689=round([689%s],2) - $C69=round([69%s],2) - $C690=round([690%s],2) - $C691=round([691%s],2) - $C692=round([692%s],2) - $C6920=round([6920%s],2) - $C6921=round([6921%s],2) - $C693=round([693%s],2) - $C694=round([694%s],2) - $C695=round([695%s],2) - $C696=round([696%s],2) +$C69=round([69%s],2) +$C690=round([690%s],2) +$C691=round([691%s],2) +$C692=round([692%s],2) +$C6920=round([6920%s],2) +$C6921=round([6921%s],2) +$C693=round([693%s],2) +$C694=round([694%s],2) +$C695=round([695%s],2) +$C696=round([696%s],2) $C7=round([7%s],2)*(-1) - $C70=round([70%s],2)*(-1) - $C71=round([71%s],2)*(-1) - $C73=round([73%s],2)*(-1) - $C72=round([72%s],2)*(-1) - $C74=round([74%s],2)*(-1) - $C75=round([75%s],2)*(-1) - $C76=round([76%s],2)*(-1) - $C77=round([77%s],2)*(-1) +$C70=round([70%s],2)*(-1) +$C71=round([71%s],2)*(-1) +$C73=round([73%s],2)*(-1) +$C72=round([72%s],2)*(-1) +$C74=round([74%s],2)*(-1) +$C75=round([75%s],2)*(-1) +$C76=round([76%s],2)*(-1) +$C77=round([77%s],2)*(-1) $C780=round([780%s],2)*(-1) $C789=round([789%s],2)*(-1) - $C79=round([79%s],2)*(-1) +$C79=round([79%s],2)*(-1) $C790=round([790%s],2)*(-1) $C791=round([791%s],2)*(-1) $C792=round([792%s],2)*(-1) @@ -144,7 +144,7 @@ $C793=round([793%s],2)*(-1) $C794=round([794%s],2)*(-1) # Les formules (*-1) # -$S1=abs($C2-$C29) +$S1=$C20+$C21+$C22+$C23+$C24+$C25+$C26+$C27+$C28 $S2=$C22+$C23+$C24+$C25+$C26+$C27 $S4=$C30+$C31+$C32+$C33+$C34+$C35+$C36 $S3=$C29+$C50+$C51+$C52+$C53+$C54+$C55+$C56+$C57+$C58+$C490+$C491+$C41+$C40+$S4 diff --git a/html/document/fr_be/bnb.rtf b/html/document/fr_be/bnb.rtf index 90b4d53aa..ff097b452 100644 --- a/html/document/fr_be/bnb.rtf +++ b/html/document/fr_be/bnb.rtf @@ -260,8 +260,7 @@ I-II Produits et charges d'exploitation} Chiffre d'affaires }{\cf1\i0\b0\kerning1\hich\af9\langfe255\dbch\af9\afs18\alang1025\rtlch \ltrch\loch\fs18\lang1033\loch\f8 \tab }{\cf1\i0\b0\kerning1\hich\af9\langfe255\dbch\af9\afs18\alang1025\ai0\rtlch \ltrch\loch\fs18\lang1033\loch\f8 70}{\cf1\i0\b0\kerning1\hich\af9\langfe255\dbch\af9\afs18\alang1025\ai0\rtlch \ltrch\loch\fs18\lang255\loch\f8 -\tab <<$C}{\cf1\i0\b0\kerning1\hich\af9\langfe255\dbch\af9\afs18\alang1025\rtlch \ltrch\loch\fs18\lang255\loch\f8 -70>>} +\tab <<$C70>>} \par \pard\plain \s0\ql\widctlpar\ltrpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\hich\af10\langfe255\dbch\af14\afs24\alang1081\loch\f5\fs24\lang1033\ql\widctlpar\tx330\tx915\tx6930\tx7725{{\*\bkmkstart DDE_LINK}{\*\bkmkend DDE_LINK}\cf1\i\b0\kerning1\hich\af9\langfe255\dbch\af9\afs18\alang1025\ai\rtlch \ltrch\loch\fs18\lang255\loch\f8 Dons et subsides\tab }{\cf1\i0\b0\kerning1\hich\af9\langfe255\dbch\af9\afs18\alang1025\ai0\rtlch \ltrch\loch\fs18\lang255\loch\f8 73\tab <<$C73>>} diff --git a/html/export.php b/html/export.php index 14038c3fd..86cb67941 100644 --- a/html/export.php +++ b/html/export.php @@ -27,10 +27,10 @@ define ('ALLOWED',1); require_once '../include/constant.php'; global $g_user,$cn,$g_parameter; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; $gDossier=dossier::id(); -$cn=new Database($gDossier); +$cn=Dossier::connect(); mb_internal_encoding("UTF-8"); $g_user=new User($cn); $g_user->Check(); @@ -52,5 +52,5 @@ if ($action == null ) if ( $prfile == "") { die (_('Export impossible')); } - require_once $prfile; + require_once NOALYSS_INCLUDE."/export/$prfile"; ?> \ No newline at end of file diff --git a/html/extension.raw.php b/html/extension.raw.php index 7000f1414..7cd12dc2f 100644 --- a/html/extension.raw.php +++ b/html/extension.raw.php @@ -24,18 +24,18 @@ * the security. Load several javascript files */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/function_javascript.php'; -require_once NOALYSS_INCLUDE.'/class_extension.php'; -require_once NOALYSS_INCLUDE.'/class_html_input.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; +require_once NOALYSS_INCLUDE.'/class/class_extension.php'; +require_once NOALYSS_INCLUDE.'/lib/class_html_input.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; global $g_user,$cn,$g_parameter; -$cn=new Database(dossier::id()); +$cn=Dossier::connect(); $g_user=new User($cn); $g_user->check(); $only_plugin=$g_user->check_dossier(dossier::id()); diff --git a/html/fid.php b/html/fid.php index 7284bb280..a09530196 100644 --- a/html/fid.php +++ b/html/fid.php @@ -33,15 +33,15 @@ *\note if the j is -1 then all the card are shown */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_own.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_own.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier=dossier::id(); -require_once('class_user.php'); +require_once('class/class_user.php'); -$cn=new Database(dossier::id()); +$cn=Dossier::connect(); global $g_user; $g_user=new User($cn); $g_user->check(); diff --git a/html/fid_card.php b/html/fid_card.php index 8af3a6498..fab07b321 100644 --- a/html/fid_card.php +++ b/html/fid_card.php @@ -26,8 +26,8 @@ */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; /*!\brief * Received parameters are * - j for the ledger @@ -44,11 +44,11 @@ require_once NOALYSS_INCLUDE.'/class_dossier.php'; $jrn= ( ! isset($_REQUEST['j']))?-1:$_REQUEST['j']; $filter_card=""; -$cn=new Database(dossier::id()); +$cn=Dossier::connect(); $d=$_REQUEST['e']; $filter_card=''; -require_once('class_user.php'); +require_once('class/class_user.php'); global $g_user; $g_user=new User($cn); $g_user->check(); diff --git a/html/index.php b/html/index.php index d6512919c..5eb72b2ab 100644 --- a/html/index.php +++ b/html/index.php @@ -45,7 +45,7 @@ *
  • Dans le répertoire include: Les noms de fichier ajax* correspondent aux fichiers appelé par une fonction javascript en ajax, * normalement le nom de fichier est basé sur le nom de la fonction javascript * exemple pour la fonction javascript anc_key_choice le fichier correspondant est - * ajax_anc_key_choice.php + * ajax/ajax_anc_key_choice.php *
  • Dans le répertoire include/template: les fichiers de * présentation HTML
    • *
  • Utiliser sql/upgrade.sql comme fichier temporaire pour modifier la base de données, en général @@ -96,7 +96,7 @@ * class_*.php if it is related to a class.
    • *
  • In the folder include, files starting with ajax are executed by ajax call, usually, the file name is * based on the javascript function, example for the javascript function anc_key_choice the corresponding file is - * ajax_anc_key_choice.php + * ajax/ajax_anc_key_choice.php * *
  • In the folder include/template: files for the HTML presentation *
    • @@ -208,7 +208,7 @@ background-repeat: repeat-x repeat-y; $my_domain=""; require_once '../include/constant.php'; require_once '../include/config.inc.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; if ( strlen(domaine) > 0 ) { diff --git a/html/lang/en_US/LC_MESSAGES/messages.po b/html/lang/en_US/LC_MESSAGES/messages.po index 036a55d4e..c2d5514b5 100644 --- a/html/lang/en_US/LC_MESSAGES/messages.po +++ b/html/lang/en_US/LC_MESSAGES/messages.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: NOALYSS 672\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-07 00:59+0200\n" -"PO-Revision-Date: 2015-09-07 23:41+0200\n" +"POT-Creation-Date: 2015-09-24 01:32+0200\n" +"PO-Revision-Date: 2015-09-24 01:35+0200\n" "Last-Translator: Dany De Bontridder \n" "Language-Team: American English \n" "Language: en_US\n" @@ -65,6 +65,10 @@ msgstr "These files were not deleted" msgid " Cette action ne vous est pas autorisée Contactez votre responsable" msgstr "This work is not authorized Contact your administrator" +#: include/opening.inc.php:178 +msgid " Choisissez le journal qui contiendra l'opération d'ouverture " +msgstr "Select the select for the reopening" + #: include/ext/tva/ajax.php:205 include/ext/tva/ajax.php:222 msgid " Code TVA " msgstr "VAT code" @@ -365,7 +369,7 @@ msgstr "Home" msgid "Accès" msgstr "Access" -#: include/profile.inc.php:358 +#: include/profile.inc.php:358 include/profile.inc.php:360 msgid "Accès Direct visible" msgstr "Direct Access is visible" @@ -493,6 +497,7 @@ msgstr "Action Management" #: include/template/detail-action.php:176 #: include/template/detail-action.php:181 #: include/template/detail-action.php:187 +#: include/template/detail-action.php:192 msgid "Actions concernées" msgstr "Concerned operations" @@ -514,6 +519,7 @@ msgstr "Action on different documents" #: include/template/form_ledger_detail.php:108 #: include/ext/modop/modop_display.php:112 include/compta_ach.inc.php:286 #: include/compta_ven.inc.php:324 include/ext/modop/modop_display.php:123 +#: include/template/detail-action.php:400 msgid "Actualiser" msgstr "Refresh" @@ -644,6 +650,7 @@ msgid "Ajout client" msgstr "Add a customer" #: include/ext/amortis/include/class_am_card.php:56 +#: include/ext/amortis/include/class_am_card.php:64 msgid "Ajout d'un bien à amortir" msgstr "Add materiel to amortize" @@ -814,6 +821,7 @@ msgstr "Add a folder" #: include/template/detail-action.php:481 #: include/template/detail-action.php:497 #: include/template/detail-action.php:503 +#: include/template/detail-action.php:508 msgid "Ajouter un fichier" msgstr "Add an attachment" @@ -821,7 +829,7 @@ msgstr "Add an attachment" msgid "Ajouter un modèle" msgstr "Add a template" -#: include/profile.inc.php:391 +#: include/profile.inc.php:391 include/profile.inc.php:393 msgid "Ajouter un profil" msgstr "Add a profile" @@ -831,6 +839,7 @@ msgstr "Add a profile" #: include/template/detail-action.php:374 #: include/template/detail-action.php:390 #: include/template/detail-action.php:396 +#: include/template/detail-action.php:401 msgid "Ajouter une ligne" msgstr "Add a row" @@ -961,6 +970,7 @@ msgstr "Year of purchase" #: include/ext/amortis/include/class_am_card.php:177 #: include/ext/amortis/include/class_am_card.php:220 +#: include/ext/amortis/include/class_am_card.php:235 msgid "Année invalide" msgstr "Invalid year" @@ -1179,6 +1189,10 @@ msgstr "No bank account given" msgid "Aucun document" msgstr "No document" +#: include/opening.inc.php:112 +msgid "Aucun dossier" +msgstr "No folder" + #: include/class_user.php:985 include/class_user.php:986 msgid "Aucun dossier disponible" msgstr "No available folder" @@ -1257,6 +1271,7 @@ msgid "Aucun poste trouvé" msgstr "No accounting found" #: html/do.php:219 html/do.php:224 html/do.php:252 html/do.php:265 +#: html/do.php:268 msgid "Aucun profil utilisateur" msgstr "No user profile" @@ -1448,6 +1463,7 @@ msgid "Autres actions" msgstr "atiAdd Action" #: include/template/detail-action.php:64 include/template/detail-action.php:67 +#: include/template/detail-action.php:72 msgid "Autres concernés" msgstr "Others concerne persons" @@ -1710,6 +1726,7 @@ msgstr "CONVERT_GIF_PDF is not installed" #: include/template/detail-action.php:351 #: include/template/detail-action.php:367 #: include/template/detail-action.php:373 +#: include/template/detail-action.php:378 msgid "Cacher les détails" msgstr "Hide details" @@ -1729,7 +1746,7 @@ msgstr "Automatic creation of the accounting" msgid "Calculatrice" msgstr "calculator" -#: include/profile.inc.php:356 +#: include/profile.inc.php:356 include/profile.inc.php:358 msgid "Calculatrice visible" msgstr "calculator is visible" @@ -1862,6 +1879,10 @@ msgstr "This ledger can not be printed in this mode" msgid "Ce plan n'existe pas" msgstr "This plan does not exist" +#: html/ajax_misc.php:571 +msgid "Ce plugin n'existe pas " +msgstr "No plugin" + #: include/ajax_account_update.php:160 msgid "Ce poste existe déjà " msgstr "This accounting already exists" @@ -2011,6 +2032,7 @@ msgstr "Select the report" #: include/ext/amortis/include/class_am_card.php:229 #: include/ext/amortis/include/class_am_card.php:230 +#: include/ext/amortis/include/class_am_card.php:245 msgid "Choisissez poste comptable ou fiche" msgstr "Select card or accounting " @@ -2309,6 +2331,7 @@ msgstr "Stock" #: include/class_acc_ledger_purchase.php:1772 #: include/template/detail-action.php:343 #: include/class_acc_ledger_purchase.php:1771 +#: include/template/detail-action.php:348 msgid "Code TVA" msgstr "VAT Code" @@ -2406,6 +2429,7 @@ msgstr "How" #: include/class_acc_ledger_purchase.php:1761 #: include/template/detail-action.php:266 #: include/class_acc_ledger_purchase.php:1760 +#: include/template/detail-action.php:271 msgid "Commentaire" msgstr "How" @@ -2701,6 +2725,11 @@ msgstr "Do you want to add a year ?" msgid "Contact" msgstr "Contact" +#: include/opening.inc.php:132 include/opening.inc.php:163 +#: include/opening.inc.php:251 +msgid "Continuer" +msgstr "Continue" + #: include/database.item.php:206 include/database.item.php:203 msgid "Contrat" msgstr "Contract" @@ -3028,6 +3057,7 @@ msgstr "In the ledger" #: include/template/dashboard.php:338 include/class_fiche.php:1212 #: include/class_fiche.php:1287 include/ext/importbank/bank_constant.php:54 #: include/class_fiche.php:1229 include/class_fiche.php:1304 +#: include/template/detail-action.php:96 msgid "Date" msgstr "Date" @@ -3160,6 +3190,7 @@ msgstr "Invalid date, operation not reversed" #: include/template/detail-action.php:55 #: include/template/detail-action.php:104 #: include/template/detail-action.php:110 +#: include/template/detail-action.php:115 msgid "Date limite" msgstr "Deadline" @@ -3356,7 +3387,11 @@ msgstr "Event depends on this category" #: include/dossier.inc.php:333 include/class_fiche.php:1230 #: include/class_fiche.php:1307 include/menu.inc.php:110 #: include/database.item.php:156 include/database.item.php:155 -#: include/database.item.php:148 +#: include/database.item.php:148 include/profile.inc.php:356 +#: include/template/detail-action.php:241 +#: include/template/detail-action.php:269 +#: include/template/detail-action.php:345 +#: include/template/detail-action.php:503 msgid "Description" msgstr "Description" @@ -3521,6 +3556,7 @@ msgstr "Generated Document" #: include/template/detail-action.php:397 #: include/template/detail-action.php:413 #: include/template/detail-action.php:419 +#: include/template/detail-action.php:424 msgid "Document à générer" msgstr "Document to generate" @@ -3831,6 +3867,7 @@ msgstr "Sorry the box is not checked" #: include/template/detail-action.php:319 include/stock_inv_histo.inc.php:105 #: include/template/detail-action.php:325 #: include/ext/sav/include/template/sas_display_list.php:66 +#: include/template/detail-action.php:330 msgid "Détail" msgstr "Detail" @@ -4086,6 +4123,7 @@ msgstr "Removal forbidden" #: include/ext/importbank/include/template/show_list.php:83 #: include/ext/importbank/include/class_import_bank.php:141 #: include/dossier.inc.php:272 include/dossier.inc.php:281 +#: include/template/detail-action.php:477 msgid "Effacer" msgstr "Remove" @@ -4462,6 +4500,7 @@ msgstr "Step 3/3" #: include/template/action_search.php:117 #: include/template/detail-action.php:119 #: include/ext/sav/include/template/sas_display_detail.php:145 +#: include/template/detail-action.php:124 msgid "Etat" msgstr "State" @@ -4886,7 +4925,7 @@ msgstr "close" #: include/template/detail-action.php:339 #: include/template/security_list_action.php:56 include/database.item.php:84 #: include/database.item.php:115 include/database.item.php:83 -#: include/database.item.php:114 +#: include/database.item.php:114 include/template/detail-action.php:344 msgid "Fiche" msgstr "Card" @@ -5326,6 +5365,7 @@ msgid "Groupe" msgstr "Group" #: include/template/detail-action.php:139 +#: include/template/detail-action.php:144 msgid "Groupe Gestion" msgstr "Management group" @@ -5365,6 +5405,10 @@ msgstr "Generate the document" msgid "Génére écriture" msgstr "Generate writing" +#: include/template/detail-action.php:311 +msgid "Générer" +msgstr "Generate File" + #: include/ext/tva/class_ext_tva.php:341 msgid "Générer fichier" msgstr "Generate File" @@ -5413,6 +5457,7 @@ msgstr "High" #: include/template/detail-action.php:45 include/template/detail-action.php:94 #: include/template/detail-action.php:100 +#: include/template/detail-action.php:105 msgid "Heure" msgstr "Hour" @@ -5549,6 +5594,10 @@ msgstr "Column for the amount is missing" msgid "Il n'y a aucune marchandise" msgstr "There is no item" +#: html/ajax_misc.php:572 +msgid "Il y a une erreur, ce plugin n'existe pas" +msgstr "This plugin doesn't exist" + #: include/ajax_preference.php:129 include/ajax_preference.php:131 #: include/ajax_preference.php:130 include/ajax_preference.php:132 #: include/ajax_preference.php:137 include/ajax_preference.php:139 @@ -5865,6 +5914,7 @@ msgstr "Javascript" #: include/template/detail-action.php:466 #: include/template/detail-action.php:482 #: include/template/detail-action.php:488 +#: include/template/detail-action.php:493 msgid "Je ne peux pas ajouter de fichier" msgstr "I can not add this file" @@ -6430,6 +6480,7 @@ msgstr "Tuesday" #: include/ext/amortis/include/class_am_card.php:244 #: include/ext/amortis/include/class_am_card.php:248 +#: include/ext/amortis/include/class_am_card.php:263 msgid "Matériel déjà dans la liste" msgstr "Material already in the list" @@ -6644,7 +6695,7 @@ msgstr "Missing description" #: include/template/detail-action.php:444 include/dossier.inc.php:220 #: include/template/detail-action.php:450 include/ajax_get_profile.php:84 #: include/dossier.inc.php:240 include/ajax_view_action.php:48 -#: include/dossier.inc.php:274 +#: include/dossier.inc.php:274 include/template/detail-action.php:455 msgid "Modifier" msgstr "Modify" @@ -6839,6 +6890,7 @@ msgstr "Amount ND" #: include/class_acc_ledger_purchase.php:1773 #: include/template/detail-action.php:344 #: include/class_acc_ledger_purchase.php:1772 +#: include/template/detail-action.php:349 msgid "Montant TVA" msgstr "VAT Amount" @@ -6866,6 +6918,7 @@ msgstr "VAT amount incorrect" #: include/class_acc_ledger_purchase.php:1396 #: include/template/detail-action.php:339 #: include/template/detail-action.php:345 +#: include/template/detail-action.php:350 msgid "Montant TVAC" msgstr "Amount VAT included" @@ -6905,6 +6958,7 @@ msgstr "Initial amount" #: include/class_acc_compute.php:194 include/class_acc_compute.php:195 #: include/ext/amortis/include/class_am_card.php:222 #: include/ext/importbank/include/template/show_transfer.php:100 +#: include/ext/amortis/include/class_am_card.php:237 msgid "Montant invalide" msgstr "Invalid amount" @@ -6945,11 +6999,16 @@ msgstr "Amount to be amortized" msgid "Montant à l'achat" msgstr "Amount to purchase" +#: include/template/detail-action.php:310 +msgid "Montrer articles" +msgstr "Show items" + #: include/template/detail-action.php:336 #: include/template/detail-action.php:335 #: include/template/detail-action.php:350 #: include/template/detail-action.php:366 #: include/template/detail-action.php:372 +#: include/template/detail-action.php:377 msgid "Montrer les détails" msgstr "Show details" @@ -7003,6 +7062,11 @@ msgstr "Number of units" msgid "Nbres anomalies" msgstr "Number of abnormalities" +#: include/opening.inc.php:250 +msgid "" +"Ne corrigez pas encore, cliquez continuer pour passer à l'étape suivante" +msgstr "Continue without changing anything" + #: include/restore.inc.php:196 include/restore.inc.php:135 msgid "" "Ne pas recharger la page, sinon votre base de données sera restaurée une " @@ -7122,6 +7186,7 @@ msgstr "No action" #: include/class_user.php:977 include/dossier.inc.php:218 #: include/class_fiche.php:1598 include/database.item.php:153 #: include/database.item.php:152 include/database.item.php:145 +#: include/profile.inc.php:354 msgid "Nom" msgstr "Name" @@ -7227,6 +7292,7 @@ msgstr "Number annuities" #: include/ext/amortis/include/class_am_card.php:178 #: include/ext/amortis/include/class_am_card.php:221 +#: include/ext/amortis/include/class_am_card.php:236 msgid "Nombre annuités invalide" msgstr "Invalid number annuities" @@ -8073,6 +8139,10 @@ msgstr "Correct" msgid "Pas d'étape" msgstr "No step" +#: include/template/detail-action.php:57 +msgid "Pas de catégorie de contact" +msgstr "Na category for contact" + #: include/ext/invoicing/include/invoice_send_mail.inc.php:75 #: include/ext/invoicing/include/invoice_send_mail.inc.php:80 #: include/ext/invoicing/include/invoice_send_mail.inc.php:103 @@ -8209,6 +8279,7 @@ msgstr "Spare part not found" #: include/template/detail-action.php:408 #: include/template/detail-action.php:424 #: include/template/detail-action.php:430 +#: include/template/detail-action.php:435 msgid "Pièces attachées" msgstr "Attachment" @@ -8506,6 +8577,7 @@ msgstr "" #: include/template/detail-action.php:115 #: include/template/detail-action.php:123 #: include/template/detail-action.php:129 +#: include/template/detail-action.php:134 msgid "Priorité" msgstr "Priority" @@ -8559,7 +8631,7 @@ msgstr "Products" #: include/database.item.php:85 #: include/ext/invoicing/include/invoice_send_mail_input.inc.php:112 #: include/param_sec.inc.php:269 include/database.item.php:82 -#: include/database.item.php:81 +#: include/database.item.php:81 include/param_sec.inc.php:270 msgid "Profil" msgstr "Profile" @@ -8964,6 +9036,7 @@ msgstr "Late" #: include/cfgledger.inc.php:126 include/dossier.inc.php:325 #: include/dossier.inc.php:368 include/forecast.inc.php:343 #: include/dossier.inc.php:361 include/dossier.inc.php:404 +#: include/opening.inc.php:166 include/opening.inc.php:253 msgid "Retour" msgstr "Return" @@ -9119,7 +9192,7 @@ msgstr "new line" #: include/payment_middle.inc.php:53 include/template/dashboard.php:338 #: include/ext/modop/modop_display.php:277 include/class_fiche_def.php:812 #: include/template/dashboard.php:343 include/ext/modop/modop_display.php:294 -#: include/class_fiche_def.php:811 +#: include/class_fiche_def.php:811 include/template/detail-action.php:464 msgid "Sauve" msgstr "Save" @@ -9693,6 +9766,7 @@ msgstr "Tiers" #: include/template/dashboard.php:304 include/template/detail-action.php:254 #: include/template/todo_list_display.php:54 #: include/template/dashboard.php:334 include/template/dashboard.php:339 +#: include/template/detail-action.php:259 msgid "Titre" msgstr "Title" @@ -9970,6 +10044,7 @@ msgstr "Transformation data into another format" #: include/template/detail-action.php:384 #: include/template/detail-action.php:400 #: include/template/detail-action.php:406 +#: include/template/detail-action.php:411 msgid "Transformer en facture" msgstr "Generate invoices" @@ -10314,6 +10389,7 @@ msgstr "Visible Y or N" #: include/ext/amortis/include/class_am_card.php:224 #: include/ext/amortis/include/class_am_card.php:225 +#: include/ext/amortis/include/class_am_card.php:240 msgid "Visible Y ou N\n" msgstr "Visible Y or N\n" @@ -10342,6 +10418,7 @@ msgstr "Do you have a copy of this issue" #: include/template/detail-action.php:252 #: include/template/detail-action.php:268 #: include/template/detail-action.php:274 +#: include/template/detail-action.php:279 #, php-format msgid "Voulez-vous effacer ce commentaire" msgstr "Do you want to delete this comment" @@ -10358,6 +10435,7 @@ msgstr "Do you want to delete this action ?" #: include/template/detail-action.php:185 #: include/template/detail-action.php:190 #: include/template/detail-action.php:196 +#: include/template/detail-action.php:201 #, php-format msgid "Voulez-vous effacer cette action " msgstr "Do you want to delete this action" @@ -10378,6 +10456,7 @@ msgstr "Do you want to delete this relation" #: include/template/detail-action.php:443 #: include/template/detail-action.php:459 #: include/template/detail-action.php:465 +#: include/template/detail-action.php:470 #, php-format msgid "Voulez-vous effacer le document" msgstr "Would you remove this Document" @@ -10556,7 +10635,7 @@ msgstr "You're using the strict accounting entry is the last one" msgid "Vous utilisez un navigateur dépassé depuis près de 8 ans!" msgstr "Your browser is outdated for 8 years!" -#: html/logout.php:30 +#: html/logout.php:30 html/logout.php:46 msgid "Vous êtes déconnecté" msgstr "You are disconnected" @@ -11115,6 +11194,7 @@ msgstr "price" #: include/template/detail-action.php:319 #: include/template/detail-action.php:335 #: include/template/detail-action.php:341 +#: include/template/detail-action.php:346 msgid "prix unitaire" msgstr "Price unit" @@ -11165,6 +11245,7 @@ msgstr "QCode" #: include/class_acc_ledger_purchase.php:1774 #: include/template/form_ledger_detail.php:71 #: include/template/form_ledger_detail.php:78 +#: include/template/detail-action.php:347 msgid "quantité" msgstr "quantity" diff --git a/html/lang/messages.po b/html/lang/messages.po index 873cef116..a99c7aa97 100644 --- a/html/lang/messages.po +++ b/html/lang/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-07 23:30+0200\n" +"POT-Creation-Date: 2015-09-24 01:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -192,7 +192,7 @@ msgstr "" #: include/payment_middle.inc.php:53 include/template/dashboard.php:338 #: include/ext/modop/modop_display.php:277 include/class_fiche_def.php:812 #: include/template/dashboard.php:343 include/ext/modop/modop_display.php:294 -#: include/class_fiche_def.php:811 +#: include/class_fiche_def.php:811 include/template/detail-action.php:464 msgid "Sauve" msgstr "" @@ -322,6 +322,7 @@ msgstr "" #: include/cfgledger.inc.php:126 include/dossier.inc.php:325 #: include/dossier.inc.php:368 include/forecast.inc.php:343 #: include/dossier.inc.php:361 include/dossier.inc.php:404 +#: include/opening.inc.php:166 include/opening.inc.php:253 msgid "Retour" msgstr "" @@ -723,6 +724,7 @@ msgstr "" #: include/class_user.php:977 include/dossier.inc.php:218 #: include/class_fiche.php:1598 include/database.item.php:153 #: include/database.item.php:152 include/database.item.php:145 +#: include/profile.inc.php:354 msgid "Nom" msgstr "" @@ -926,7 +928,7 @@ msgstr "" #: include/template/detail-action.php:339 #: include/template/security_list_action.php:56 include/database.item.php:84 #: include/database.item.php:115 include/database.item.php:83 -#: include/database.item.php:114 +#: include/database.item.php:114 include/template/detail-action.php:344 msgid "Fiche" msgstr "" @@ -1364,6 +1366,7 @@ msgstr "" #: include/template/dashboard.php:338 include/class_fiche.php:1212 #: include/class_fiche.php:1287 include/ext/importbank/bank_constant.php:54 #: include/class_fiche.php:1229 include/class_fiche.php:1304 +#: include/template/detail-action.php:96 msgid "Date" msgstr "" @@ -2015,6 +2018,7 @@ msgstr "" #: include/class_acc_ledger_purchase.php:1774 #: include/template/form_ledger_detail.php:71 #: include/template/form_ledger_detail.php:78 +#: include/template/detail-action.php:347 msgid "quantité" msgstr "" @@ -2050,6 +2054,7 @@ msgstr "" #: include/class_acc_ledger_purchase.php:1773 #: include/template/detail-action.php:344 #: include/class_acc_ledger_purchase.php:1772 +#: include/template/detail-action.php:349 msgid "Montant TVA" msgstr "" @@ -2071,6 +2076,7 @@ msgstr "" #: include/class_acc_ledger_purchase.php:1396 #: include/template/detail-action.php:339 #: include/template/detail-action.php:345 +#: include/template/detail-action.php:350 msgid "Montant TVAC" msgstr "" @@ -2382,7 +2388,11 @@ msgstr "" #: include/dossier.inc.php:333 include/class_fiche.php:1230 #: include/class_fiche.php:1307 include/menu.inc.php:110 #: include/database.item.php:156 include/database.item.php:155 -#: include/database.item.php:148 +#: include/database.item.php:148 include/profile.inc.php:356 +#: include/template/detail-action.php:241 +#: include/template/detail-action.php:269 +#: include/template/detail-action.php:345 +#: include/template/detail-action.php:503 msgid "Description" msgstr "" @@ -2440,6 +2450,7 @@ msgstr "" #: include/template/detail-action.php:374 #: include/template/detail-action.php:390 #: include/template/detail-action.php:396 +#: include/template/detail-action.php:401 msgid "Ajouter une ligne" msgstr "" @@ -2630,6 +2641,7 @@ msgstr "" #: include/ext/importbank/include/template/show_list.php:83 #: include/ext/importbank/include/class_import_bank.php:141 #: include/dossier.inc.php:272 include/dossier.inc.php:281 +#: include/template/detail-action.php:477 msgid "Effacer" msgstr "" @@ -2679,7 +2691,7 @@ msgstr "" #: include/template/detail-action.php:444 include/dossier.inc.php:220 #: include/template/detail-action.php:450 include/ajax_get_profile.php:84 #: include/dossier.inc.php:240 include/ajax_view_action.php:48 -#: include/dossier.inc.php:274 +#: include/dossier.inc.php:274 include/template/detail-action.php:455 msgid "Modifier" msgstr "" @@ -3168,6 +3180,7 @@ msgstr "" #: include/template/form_ledger_detail.php:108 #: include/ext/modop/modop_display.php:112 include/compta_ach.inc.php:286 #: include/compta_ven.inc.php:324 include/ext/modop/modop_display.php:123 +#: include/template/detail-action.php:400 msgid "Actualiser" msgstr "" @@ -3764,7 +3777,7 @@ msgstr "" #: include/database.item.php:85 #: include/ext/invoicing/include/invoice_send_mail_input.inc.php:112 #: include/param_sec.inc.php:269 include/database.item.php:82 -#: include/database.item.php:81 +#: include/database.item.php:81 include/param_sec.inc.php:270 msgid "Profil" msgstr "" @@ -5237,6 +5250,7 @@ msgstr "" #: include/template/action_search.php:117 #: include/template/detail-action.php:119 #: include/ext/sav/include/template/sas_display_detail.php:145 +#: include/template/detail-action.php:124 msgid "Etat" msgstr "" @@ -5355,6 +5369,7 @@ msgstr "" #: include/template/dashboard.php:304 include/template/detail-action.php:254 #: include/template/todo_list_display.php:54 #: include/template/dashboard.php:334 include/template/dashboard.php:339 +#: include/template/detail-action.php:259 msgid "Titre" msgstr "" @@ -5372,12 +5387,14 @@ msgstr "" #: include/template/detail-action.php:45 include/template/detail-action.php:94 #: include/template/detail-action.php:100 +#: include/template/detail-action.php:105 msgid "Heure" msgstr "" #: include/template/detail-action.php:55 #: include/template/detail-action.php:104 #: include/template/detail-action.php:110 +#: include/template/detail-action.php:115 msgid "Date limite" msgstr "" @@ -5398,6 +5415,7 @@ msgstr "" #: include/template/detail-action.php:115 #: include/template/detail-action.php:123 #: include/template/detail-action.php:129 +#: include/template/detail-action.php:134 msgid "Priorité" msgstr "" @@ -5413,6 +5431,7 @@ msgstr "" #: include/template/detail-action.php:185 #: include/template/detail-action.php:190 #: include/template/detail-action.php:196 +#: include/template/detail-action.php:201 #, php-format msgid "Voulez-vous effacer cette action " msgstr "" @@ -5438,6 +5457,7 @@ msgstr "" #: include/class_acc_ledger_purchase.php:1761 #: include/template/detail-action.php:266 #: include/class_acc_ledger_purchase.php:1760 +#: include/template/detail-action.php:271 msgid "Commentaire" msgstr "" @@ -5456,6 +5476,7 @@ msgstr "" #: include/template/detail-action.php:319 #: include/template/detail-action.php:335 #: include/template/detail-action.php:341 +#: include/template/detail-action.php:346 msgid "prix unitaire" msgstr "" @@ -5474,6 +5495,7 @@ msgstr "" #: include/class_acc_ledger_purchase.php:1772 #: include/template/detail-action.php:343 #: include/class_acc_ledger_purchase.php:1771 +#: include/template/detail-action.php:348 msgid "Code TVA" msgstr "" @@ -5482,6 +5504,7 @@ msgstr "" #: include/template/detail-action.php:350 #: include/template/detail-action.php:366 #: include/template/detail-action.php:372 +#: include/template/detail-action.php:377 msgid "Montrer les détails" msgstr "" @@ -5490,6 +5513,7 @@ msgstr "" #: include/template/detail-action.php:351 #: include/template/detail-action.php:367 #: include/template/detail-action.php:373 +#: include/template/detail-action.php:378 msgid "Cacher les détails" msgstr "" @@ -5500,6 +5524,7 @@ msgstr "" #: include/template/detail-action.php:397 #: include/template/detail-action.php:413 #: include/template/detail-action.php:419 +#: include/template/detail-action.php:424 msgid "Document à générer" msgstr "" @@ -5508,6 +5533,7 @@ msgstr "" #: include/template/detail-action.php:408 #: include/template/detail-action.php:424 #: include/template/detail-action.php:430 +#: include/template/detail-action.php:435 msgid "Pièces attachées" msgstr "" @@ -5516,6 +5542,7 @@ msgstr "" #: include/template/detail-action.php:443 #: include/template/detail-action.php:459 #: include/template/detail-action.php:465 +#: include/template/detail-action.php:470 #, php-format msgid "Voulez-vous effacer le document" msgstr "" @@ -5525,6 +5552,7 @@ msgstr "" #: include/template/detail-action.php:466 #: include/template/detail-action.php:482 #: include/template/detail-action.php:488 +#: include/template/detail-action.php:493 msgid "Je ne peux pas ajouter de fichier" msgstr "" @@ -5734,6 +5762,7 @@ msgstr "" #: include/template/detail-action.php:319 include/stock_inv_histo.inc.php:105 #: include/template/detail-action.php:325 #: include/ext/sav/include/template/sas_display_list.php:66 +#: include/template/detail-action.php:330 msgid "Détail" msgstr "" @@ -6654,11 +6683,13 @@ msgstr "" #: include/ext/amortis/include/class_am_card.php:177 #: include/ext/amortis/include/class_am_card.php:220 +#: include/ext/amortis/include/class_am_card.php:235 msgid "Année invalide" msgstr "" #: include/ext/amortis/include/class_am_card.php:178 #: include/ext/amortis/include/class_am_card.php:221 +#: include/ext/amortis/include/class_am_card.php:236 msgid "Nombre annuités invalide" msgstr "" @@ -6666,6 +6697,7 @@ msgstr "" #: include/class_acc_compute.php:194 include/class_acc_compute.php:195 #: include/ext/amortis/include/class_am_card.php:222 #: include/ext/importbank/include/template/show_transfer.php:100 +#: include/ext/amortis/include/class_am_card.php:237 msgid "Montant invalide" msgstr "" @@ -7679,7 +7711,7 @@ msgstr "" msgid "Code invalide" msgstr "" -#: html/logout.php:30 +#: html/logout.php:30 html/logout.php:46 msgid "Vous êtes déconnecté" msgstr "" @@ -8473,6 +8505,7 @@ msgstr "" #: include/template/detail-action.php:176 #: include/template/detail-action.php:181 #: include/template/detail-action.php:187 +#: include/template/detail-action.php:192 msgid "Actions concernées" msgstr "" @@ -8481,6 +8514,7 @@ msgstr "" #: include/template/detail-action.php:252 #: include/template/detail-action.php:268 #: include/template/detail-action.php:274 +#: include/template/detail-action.php:279 #, php-format msgid "Voulez-vous effacer ce commentaire" msgstr "" @@ -8490,6 +8524,7 @@ msgstr "" #: include/template/detail-action.php:481 #: include/template/detail-action.php:497 #: include/template/detail-action.php:503 +#: include/template/detail-action.php:508 msgid "Ajouter un fichier" msgstr "" @@ -8864,6 +8899,7 @@ msgid "choix des journaux" msgstr "" #: include/ext/amortis/include/class_am_card.php:56 +#: include/ext/amortis/include/class_am_card.php:64 msgid "Ajout d'un bien à amortir" msgstr "" @@ -9274,6 +9310,7 @@ msgstr "" #: include/template/detail-action.php:384 #: include/template/detail-action.php:400 #: include/template/detail-action.php:406 +#: include/template/detail-action.php:411 msgid "Transformer en facture" msgstr "" @@ -9808,6 +9845,7 @@ msgid " pour la fiche " msgstr "" #: include/template/detail-action.php:64 include/template/detail-action.php:67 +#: include/template/detail-action.php:72 msgid "Autres concernés" msgstr "" @@ -9927,6 +9965,7 @@ msgstr "" #: include/ext/amortis/include/class_am_card.php:224 #: include/ext/amortis/include/class_am_card.php:225 +#: include/ext/amortis/include/class_am_card.php:240 msgid "Visible Y ou N\n" msgstr "" @@ -9936,6 +9975,7 @@ msgstr "" #: include/ext/amortis/include/class_am_card.php:244 #: include/ext/amortis/include/class_am_card.php:248 +#: include/ext/amortis/include/class_am_card.php:263 msgid "Matériel déjà dans la liste" msgstr "" @@ -10197,6 +10237,7 @@ msgstr "" #: include/ext/amortis/include/class_am_card.php:229 #: include/ext/amortis/include/class_am_card.php:230 +#: include/ext/amortis/include/class_am_card.php:245 msgid "Choisissez poste comptable ou fiche" msgstr "" @@ -10885,6 +10926,7 @@ msgid "Accès menu impossible" msgstr "" #: html/do.php:219 html/do.php:224 html/do.php:252 html/do.php:265 +#: html/do.php:268 msgid "Aucun profil utilisateur" msgstr "" @@ -11002,11 +11044,11 @@ msgstr "" msgid "Enregistré dans le journal" msgstr "" -#: include/profile.inc.php:356 +#: include/profile.inc.php:356 include/profile.inc.php:358 msgid "Calculatrice visible" msgstr "" -#: include/profile.inc.php:358 +#: include/profile.inc.php:358 include/profile.inc.php:360 msgid "Accès Direct visible" msgstr "" @@ -11035,6 +11077,7 @@ msgid "Ajout d'une catégorie " msgstr "" #: include/template/detail-action.php:139 +#: include/template/detail-action.php:144 msgid "Groupe Gestion" msgstr "" @@ -11194,7 +11237,7 @@ msgstr "" msgid "Aucun modèle (dossier vide, devant être restauré manuellement)" msgstr "" -#: include/profile.inc.php:391 +#: include/profile.inc.php:391 include/profile.inc.php:393 msgid "Ajouter un profil" msgstr "" @@ -11286,3 +11329,41 @@ msgstr "" #: include/database.item.php:240 msgid "Salaire" msgstr "" + +#: html/ajax_misc.php:571 +msgid "Ce plugin n'existe pas " +msgstr "" + +#: html/ajax_misc.php:572 +msgid "Il y a une erreur, ce plugin n'existe pas" +msgstr "" + +#: include/opening.inc.php:112 +msgid "Aucun dossier" +msgstr "" + +#: include/opening.inc.php:132 include/opening.inc.php:163 +#: include/opening.inc.php:251 +msgid "Continuer" +msgstr "" + +#: include/opening.inc.php:178 +msgid " Choisissez le journal qui contiendra l'opération d'ouverture " +msgstr "" + +#: include/opening.inc.php:250 +msgid "" +"Ne corrigez pas encore, cliquez continuer pour passer à l'étape suivante" +msgstr "" + +#: include/template/detail-action.php:57 +msgid "Pas de catégorie de contact" +msgstr "" + +#: include/template/detail-action.php:310 +msgid "Montrer articles" +msgstr "" + +#: include/template/detail-action.php:311 +msgid "Générer" +msgstr "" diff --git a/html/lang/nl_NL/LC_MESSAGES/messages.po b/html/lang/nl_NL/LC_MESSAGES/messages.po index 293f6086b..cd36c3337 100644 --- a/html/lang/nl_NL/LC_MESSAGES/messages.po +++ b/html/lang/nl_NL/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: NOALYSS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-07 00:59+0200\n" +"POT-Creation-Date: 2015-09-24 01:32+0200\n" "PO-Revision-Date: 2015-08-28 17:38+0200\n" "Last-Translator: Dany De Bontridder \n" "Language-Team: American English \n" @@ -68,6 +68,12 @@ msgstr "Deze bestanden zijn niet verwijderd geweest" msgid " Cette action ne vous est pas autorisée Contactez votre responsable" msgstr "U bent niet bevoegd voor deze actie. Contacteer uw verantwoordelijke" +#: include/opening.inc.php:178 +#, fuzzy +msgid " Choisissez le journal qui contiendra l'opération d'ouverture " +msgstr "" +"Onmogelijk om een journaal te verwijderen waarin operaties nog actief zijn" + #: include/ext/tva/ajax.php:205 include/ext/tva/ajax.php:222 msgid " Code TVA " msgstr "BTW Code" @@ -378,7 +384,7 @@ msgid "Accès" msgstr "Toegang" # Je suppose que "Direct Form" est une application en anglais -#: include/profile.inc.php:358 +#: include/profile.inc.php:358 include/profile.inc.php:360 #, fuzzy msgid "Accès Direct visible" msgstr "Met Direct Form" @@ -514,6 +520,7 @@ msgstr "Actie management" #: include/template/detail-action.php:176 #: include/template/detail-action.php:181 #: include/template/detail-action.php:187 +#: include/template/detail-action.php:192 msgid "Actions concernées" msgstr "Betreffende acties" @@ -535,6 +542,7 @@ msgstr "Handelingen op verschillende documenten" #: include/template/form_ledger_detail.php:108 #: include/ext/modop/modop_display.php:112 include/compta_ach.inc.php:286 #: include/compta_ven.inc.php:324 include/ext/modop/modop_display.php:123 +#: include/template/detail-action.php:400 msgid "Actualiser" msgstr "Updaten" @@ -671,6 +679,7 @@ msgid "Ajout client" msgstr "Lijn toevoegen" #: include/ext/amortis/include/class_am_card.php:56 +#: include/ext/amortis/include/class_am_card.php:64 msgid "Ajout d'un bien à amortir" msgstr "Toevoeging van een af te betalen goed " @@ -855,6 +864,7 @@ msgstr "Een bestand toevoegen" #: include/template/detail-action.php:481 #: include/template/detail-action.php:497 #: include/template/detail-action.php:503 +#: include/template/detail-action.php:508 msgid "Ajouter un fichier" msgstr "Een bestand toevoegen" @@ -863,7 +873,7 @@ msgstr "Een bestand toevoegen" msgid "Ajouter un modèle" msgstr "Geen enkel model" -#: include/profile.inc.php:391 +#: include/profile.inc.php:391 include/profile.inc.php:393 #, fuzzy msgid "Ajouter un profil" msgstr "Een bestand toevoegen" @@ -874,6 +884,7 @@ msgstr "Een bestand toevoegen" #: include/template/detail-action.php:374 #: include/template/detail-action.php:390 #: include/template/detail-action.php:396 +#: include/template/detail-action.php:401 msgid "Ajouter une ligne" msgstr "Voeg een lijn" @@ -1007,6 +1018,7 @@ msgstr "Jaar van de aankoop" #: include/ext/amortis/include/class_am_card.php:177 #: include/ext/amortis/include/class_am_card.php:220 +#: include/ext/amortis/include/class_am_card.php:235 msgid "Année invalide" msgstr "Ongeldig jaar" @@ -1247,6 +1259,11 @@ msgstr "Geen enkele bankrekening is gegeven" msgid "Aucun document" msgstr "Geen enkel document" +#: include/opening.inc.php:112 +#, fuzzy +msgid "Aucun dossier" +msgstr "Naam van de map" + #: include/class_user.php:985 include/class_user.php:986 #, fuzzy msgid "Aucun dossier disponible" @@ -1329,6 +1346,7 @@ msgid "Aucun poste trouvé" msgstr "Geen enkele post gevonden " #: html/do.php:219 html/do.php:224 html/do.php:252 html/do.php:265 +#: html/do.php:268 #, fuzzy msgid "Aucun profil utilisateur" msgstr "Gebruiker toevoegen" @@ -1529,6 +1547,7 @@ msgid "Autres actions" msgstr "Andere acties" #: include/template/detail-action.php:64 include/template/detail-action.php:67 +#: include/template/detail-action.php:72 #, fuzzy msgid "Autres concernés" msgstr "Betreffende acties" @@ -1805,6 +1824,7 @@ msgstr "CONVERT_GIF_PDF is niet geïnstalleerd" #: include/template/detail-action.php:351 #: include/template/detail-action.php:367 #: include/template/detail-action.php:373 +#: include/template/detail-action.php:378 msgid "Cacher les détails" msgstr "Details verbergen" @@ -1825,7 +1845,7 @@ msgstr "Automatisch aanmaken van de boekhoudkundige post" msgid "Calculatrice" msgstr "Rekenmachine" -#: include/profile.inc.php:356 +#: include/profile.inc.php:356 include/profile.inc.php:358 #, fuzzy msgid "Calculatrice visible" msgstr "Rekenmachine" @@ -1966,6 +1986,11 @@ msgstr "" msgid "Ce plan n'existe pas" msgstr "Dit plan bestaat niet" +#: html/ajax_misc.php:571 +#, fuzzy +msgid "Ce plugin n'existe pas " +msgstr "Dit plan bestaat niet" + #: include/ajax_account_update.php:160 #, fuzzy msgid "Ce poste existe déjà " @@ -2128,6 +2153,7 @@ msgstr "Kies uw dossier" #: include/ext/amortis/include/class_am_card.php:229 #: include/ext/amortis/include/class_am_card.php:230 +#: include/ext/amortis/include/class_am_card.php:245 #, fuzzy msgid "Choisissez poste comptable ou fiche" msgstr "Boekhoudkundige post of fiche veranderen" @@ -2441,6 +2467,7 @@ msgstr "Stock code" #: include/class_acc_ledger_purchase.php:1772 #: include/template/detail-action.php:343 #: include/class_acc_ledger_purchase.php:1771 +#: include/template/detail-action.php:348 msgid "Code TVA" msgstr "BTW-code" @@ -2539,6 +2566,7 @@ msgstr "Comm" #: include/class_acc_ledger_purchase.php:1761 #: include/template/detail-action.php:266 #: include/class_acc_ledger_purchase.php:1760 +#: include/template/detail-action.php:271 msgid "Commentaire" msgstr "Commentaar" @@ -2848,6 +2876,12 @@ msgstr "Bevestigt u de toevoeging van een boekhoudkundige oefening?" msgid "Contact" msgstr "Contact" +#: include/opening.inc.php:132 include/opening.inc.php:163 +#: include/opening.inc.php:251 +#, fuzzy +msgid "Continuer" +msgstr "Contact" + #: include/database.item.php:206 include/database.item.php:203 #, fuzzy msgid "Contrat" @@ -3196,6 +3230,7 @@ msgstr "In het dagboek" #: include/template/dashboard.php:338 include/class_fiche.php:1212 #: include/class_fiche.php:1287 include/ext/importbank/bank_constant.php:54 #: include/class_fiche.php:1229 include/class_fiche.php:1304 +#: include/template/detail-action.php:96 msgid "Date" msgstr "Datum" @@ -3332,6 +3367,7 @@ msgstr "Handeling is niet gevonden" #: include/template/detail-action.php:55 #: include/template/detail-action.php:104 #: include/template/detail-action.php:110 +#: include/template/detail-action.php:115 msgid "Date limite" msgstr "Uiterste datum" @@ -3533,7 +3569,11 @@ msgstr "Kan dit bestand op te slaan" #: include/dossier.inc.php:333 include/class_fiche.php:1230 #: include/class_fiche.php:1307 include/menu.inc.php:110 #: include/database.item.php:156 include/database.item.php:155 -#: include/database.item.php:148 +#: include/database.item.php:148 include/profile.inc.php:356 +#: include/template/detail-action.php:241 +#: include/template/detail-action.php:269 +#: include/template/detail-action.php:345 +#: include/template/detail-action.php:503 msgid "Description" msgstr "Beschrijving" @@ -3705,6 +3745,7 @@ msgstr "Gegenereerd papier" #: include/template/detail-action.php:397 #: include/template/detail-action.php:413 #: include/template/detail-action.php:419 +#: include/template/detail-action.php:424 msgid "Document à générer" msgstr "Documenteer je Maken" @@ -4031,6 +4072,7 @@ msgstr "Sorry hebt u Het niet VAK aangekruisd" #: include/template/detail-action.php:319 include/stock_inv_histo.inc.php:105 #: include/template/detail-action.php:325 #: include/ext/sav/include/template/sas_display_list.php:66 +#: include/template/detail-action.php:330 msgid "Détail" msgstr "Detail" @@ -4294,6 +4336,7 @@ msgstr "Erasure" #: include/ext/importbank/include/template/show_list.php:83 #: include/ext/importbank/include/class_import_bank.php:141 #: include/dossier.inc.php:272 include/dossier.inc.php:281 +#: include/template/detail-action.php:477 msgid "Effacer" msgstr "Wissen" @@ -4685,6 +4728,7 @@ msgstr "Stap 3/3" #: include/template/action_search.php:117 #: include/template/detail-action.php:119 #: include/ext/sav/include/template/sas_display_detail.php:145 +#: include/template/detail-action.php:124 msgid "Etat" msgstr "Toestand" @@ -5120,7 +5164,7 @@ msgstr "Dicht" #: include/template/detail-action.php:339 #: include/template/security_list_action.php:56 include/database.item.php:84 #: include/database.item.php:115 include/database.item.php:83 -#: include/database.item.php:114 +#: include/database.item.php:114 include/template/detail-action.php:344 msgid "Fiche" msgstr "Blad" @@ -5580,6 +5624,7 @@ msgid "Groupe" msgstr "Groep" #: include/template/detail-action.php:139 +#: include/template/detail-action.php:144 #, fuzzy msgid "Groupe Gestion" msgstr "Management Module" @@ -5621,6 +5666,11 @@ msgstr "Document Maken" msgid "Génére écriture" msgstr "Schrijven opstellen" +#: include/template/detail-action.php:311 +#, fuzzy +msgid "Générer" +msgstr "Map maken" + #: include/ext/tva/class_ext_tva.php:341 msgid "Générer fichier" msgstr "Map maken" @@ -5669,6 +5719,7 @@ msgstr "" #: include/template/detail-action.php:45 include/template/detail-action.php:94 #: include/template/detail-action.php:100 +#: include/template/detail-action.php:105 msgid "Heure" msgstr "Tijd" @@ -5805,6 +5856,10 @@ msgstr "" msgid "Il n'y a aucune marchandise" msgstr "Er are Geen goederen" +#: html/ajax_misc.php:572 +msgid "Il y a une erreur, ce plugin n'existe pas" +msgstr "" + #: include/ajax_preference.php:129 include/ajax_preference.php:131 #: include/ajax_preference.php:130 include/ajax_preference.php:132 #: include/ajax_preference.php:137 include/ajax_preference.php:139 @@ -6134,6 +6189,7 @@ msgstr "Javascript" #: include/template/detail-action.php:466 #: include/template/detail-action.php:482 #: include/template/detail-action.php:488 +#: include/template/detail-action.php:493 msgid "Je ne peux pas ajouter de fichier" msgstr "EEN blad Toevoegen is niet mogelijk" @@ -6722,6 +6778,7 @@ msgstr "Dinsdag" #: include/ext/amortis/include/class_am_card.php:244 #: include/ext/amortis/include/class_am_card.php:248 +#: include/ext/amortis/include/class_am_card.php:263 #, fuzzy msgid "Matériel déjà dans la liste" msgstr "Materiaaldemping" @@ -6942,7 +6999,7 @@ msgstr "Verandering" #: include/template/detail-action.php:444 include/dossier.inc.php:220 #: include/template/detail-action.php:450 include/ajax_get_profile.php:84 #: include/dossier.inc.php:240 include/ajax_view_action.php:48 -#: include/dossier.inc.php:274 +#: include/dossier.inc.php:274 include/template/detail-action.php:455 msgid "Modifier" msgstr "Veranderen" @@ -7140,6 +7197,7 @@ msgstr "Niet terug te vorderen bedrag" #: include/class_acc_ledger_purchase.php:1773 #: include/template/detail-action.php:344 #: include/class_acc_ledger_purchase.php:1772 +#: include/template/detail-action.php:349 msgid "Montant TVA" msgstr "BTW Bedrag" @@ -7168,6 +7226,7 @@ msgstr "Foutief bedrag van de BTW" #: include/class_acc_ledger_purchase.php:1396 #: include/template/detail-action.php:339 #: include/template/detail-action.php:345 +#: include/template/detail-action.php:350 msgid "Montant TVAC" msgstr "BTW Inbegrepen Bedrag" @@ -7207,6 +7266,7 @@ msgstr "Oorspronkelijk bedrag" #: include/class_acc_compute.php:194 include/class_acc_compute.php:195 #: include/ext/amortis/include/class_am_card.php:222 #: include/ext/importbank/include/template/show_transfer.php:100 +#: include/ext/amortis/include/class_am_card.php:237 msgid "Montant invalide" msgstr "Ongeldig bedrag" @@ -7247,11 +7307,17 @@ msgstr "Af te schrijven" msgid "Montant à l'achat" msgstr "Oplopen tot aankoop" +#: include/template/detail-action.php:310 +#, fuzzy +msgid "Montrer articles" +msgstr "Artikel toevoegen" + #: include/template/detail-action.php:336 #: include/template/detail-action.php:335 #: include/template/detail-action.php:350 #: include/template/detail-action.php:366 #: include/template/detail-action.php:372 +#: include/template/detail-action.php:377 msgid "Montrer les détails" msgstr "Details Tonen" @@ -7307,6 +7373,13 @@ msgstr "Aantal eenheden" msgid "Nbres anomalies" msgstr "Aantal onregelmatigheden" +# CSV = pour lire un file CSV sur ordinateur? +#: include/opening.inc.php:250 +#, fuzzy +msgid "" +"Ne corrigez pas encore, cliquez continuer pour passer à l'étape suivante" +msgstr "Uitvoeren in CSV of naar de volgende stap gaan " + #: include/restore.inc.php:196 include/restore.inc.php:135 msgid "" "Ne pas recharger la page, sinon votre base de données sera restaurée une " @@ -7427,6 +7500,7 @@ msgstr "Geen handeling" #: include/class_user.php:977 include/dossier.inc.php:218 #: include/class_fiche.php:1598 include/database.item.php:153 #: include/database.item.php:152 include/database.item.php:145 +#: include/profile.inc.php:354 msgid "Nom" msgstr "Naam" @@ -7537,6 +7611,7 @@ msgstr "Aantal lijfrentes" #: include/ext/amortis/include/class_am_card.php:178 #: include/ext/amortis/include/class_am_card.php:221 +#: include/ext/amortis/include/class_am_card.php:236 msgid "Nombre annuités invalide" msgstr "Aantal ongeldige annuïteiten" @@ -8421,6 +8496,11 @@ msgstr "Geen onregelmatigheden gevonden" msgid "Pas d'étape" msgstr "" +#: include/template/detail-action.php:57 +#, fuzzy +msgid "Pas de catégorie de contact" +msgstr "Categorie naam van het record" + #: include/ext/invoicing/include/invoice_send_mail.inc.php:75 #: include/ext/invoicing/include/invoice_send_mail.inc.php:80 #: include/ext/invoicing/include/invoice_send_mail.inc.php:103 @@ -8559,6 +8639,7 @@ msgstr "Map niet bestaat" #: include/template/detail-action.php:408 #: include/template/detail-action.php:424 #: include/template/detail-action.php:430 +#: include/template/detail-action.php:435 msgid "Pièces attachées" msgstr "Documenten" @@ -8870,6 +8951,7 @@ msgstr "" #: include/template/detail-action.php:115 #: include/template/detail-action.php:123 #: include/template/detail-action.php:129 +#: include/template/detail-action.php:134 msgid "Priorité" msgstr "Prioriteit" @@ -8923,7 +9005,7 @@ msgstr "Producten" #: include/database.item.php:85 #: include/ext/invoicing/include/invoice_send_mail_input.inc.php:112 #: include/param_sec.inc.php:269 include/database.item.php:82 -#: include/database.item.php:81 +#: include/database.item.php:81 include/param_sec.inc.php:270 msgid "Profil" msgstr "Profiel" @@ -9338,6 +9420,7 @@ msgstr "Is te laat" #: include/cfgledger.inc.php:126 include/dossier.inc.php:325 #: include/dossier.inc.php:368 include/forecast.inc.php:343 #: include/dossier.inc.php:361 include/dossier.inc.php:404 +#: include/opening.inc.php:166 include/opening.inc.php:253 msgid "Retour" msgstr "Terug" @@ -9495,7 +9578,7 @@ msgstr "Nieuwe lijn" #: include/payment_middle.inc.php:53 include/template/dashboard.php:338 #: include/ext/modop/modop_display.php:277 include/class_fiche_def.php:812 #: include/template/dashboard.php:343 include/ext/modop/modop_display.php:294 -#: include/class_fiche_def.php:811 +#: include/class_fiche_def.php:811 include/template/detail-action.php:464 msgid "Sauve" msgstr "OPSLAAN" @@ -10078,6 +10161,7 @@ msgstr "Derde" #: include/template/dashboard.php:304 include/template/detail-action.php:254 #: include/template/todo_list_display.php:54 #: include/template/dashboard.php:334 include/template/dashboard.php:339 +#: include/template/detail-action.php:259 msgid "Titre" msgstr "Titel" @@ -10362,6 +10446,7 @@ msgstr "" #: include/template/detail-action.php:384 #: include/template/detail-action.php:400 #: include/template/detail-action.php:406 +#: include/template/detail-action.php:411 msgid "Transformer en facture" msgstr "Omzetten in een factuur" @@ -10728,6 +10813,7 @@ msgstr "Zichtbare Y of N" #: include/ext/amortis/include/class_am_card.php:224 #: include/ext/amortis/include/class_am_card.php:225 +#: include/ext/amortis/include/class_am_card.php:240 #, fuzzy msgid "Visible Y ou N\n" msgstr "Zichtbare Y of N" @@ -10757,6 +10843,7 @@ msgstr "Heeft u een kopie van deze kwestie" #: include/template/detail-action.php:252 #: include/template/detail-action.php:268 #: include/template/detail-action.php:274 +#: include/template/detail-action.php:279 #, php-format msgid "Voulez-vous effacer ce commentaire" msgstr "Wilt u deze opmerking verwijderen?" @@ -10773,6 +10860,7 @@ msgstr "Wilt u deze plug-in wissen?" #: include/template/detail-action.php:185 #: include/template/detail-action.php:190 #: include/template/detail-action.php:196 +#: include/template/detail-action.php:201 #, php-format msgid "Voulez-vous effacer cette action " msgstr "Wilt u deze actie wilt verwijderen" @@ -10793,6 +10881,7 @@ msgstr "Wilt u deze actie wilt verwijderen" #: include/template/detail-action.php:443 #: include/template/detail-action.php:459 #: include/template/detail-action.php:465 +#: include/template/detail-action.php:470 #, php-format msgid "Voulez-vous effacer le document" msgstr "Wilt u sterven afvegen papier?" @@ -10976,7 +11065,7 @@ msgstr "U van Gebruikt Strikt-modus, datum van de laatste is Operatie" msgid "Vous utilisez un navigateur dépassé depuis près de 8 ans!" msgstr "IE 6 wordt niet ondersteund" -#: html/logout.php:30 +#: html/logout.php:30 html/logout.php:46 msgid "Vous êtes déconnecté" msgstr "De verbinding is verbroken" @@ -11561,6 +11650,7 @@ msgstr "Prijs" #: include/template/detail-action.php:319 #: include/template/detail-action.php:335 #: include/template/detail-action.php:341 +#: include/template/detail-action.php:346 msgid "prix unitaire" msgstr "Eenheid Prijs" @@ -11611,6 +11701,7 @@ msgstr "Qcode" #: include/class_acc_ledger_purchase.php:1774 #: include/template/form_ledger_detail.php:71 #: include/template/form_ledger_detail.php:78 +#: include/template/detail-action.php:347 msgid "quantité" msgstr "hoeveelheid" @@ -11791,8 +11882,6 @@ msgstr "Mag Niet voor this U gegeven coderen" msgid "wiki" msgstr "wiki" -#, fuzzy - #, fuzzy #~ msgid "Compte en banque clôturé" #~ msgstr "Bankrekening" diff --git a/html/login.php b/html/login.php index 5b8725fcf..7f0815423 100644 --- a/html/login.php +++ b/html/login.php @@ -19,13 +19,13 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu require_once '../include/constant.php'; -include_once NOALYSS_INCLUDE.'/ac_common.php'; +include_once NOALYSS_INCLUDE.'/lib/ac_common.php'; /*! \file * \brief Login page */ -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; // Verif if User and Pass match DB // if no, then redirect to the login page $rep=new Database(); @@ -53,7 +53,7 @@ if ( isset ($_POST["p_user"] ) ) echo ""; exit(); } - include_once NOALYSS_INCLUDE."/class_user.php"; + include_once NOALYSS_INCLUDE."/class/class_user.php"; $User=new User($rep); $User->Check(false,'LOGIN'); if ($g_captcha == true) @@ -92,7 +92,7 @@ else } - include_once ("class_user.php"); + include_once ("class/class_user.php"); $User=new User($rep); $User->Check(); diff --git a/html/logout.php b/html/logout.php index de566e04e..0b65167d6 100644 --- a/html/logout.php +++ b/html/logout.php @@ -21,12 +21,28 @@ * \brief Logout */ require_once '../include/constant.php'; -require_once ("ac_common.php"); -require_once('class_database.php'); +require_once ("lib/ac_common.php"); +require_once('lib/class_database.php'); html_page_start("classic"); session_unset(); +/* clean Global variable */ + +if ( isset ($g_user) ) unset ($GLOBAL['g_user']); +if ( isset ($g_pass) ) unset ($GLOBAL['g_pass']); +// +// Clean the possible cookies +// +if (isset($_SERVER['HTTP_COOKIE'])) { + $cookies = explode(';', $_SERVER['HTTP_COOKIE']); + foreach($cookies as $cookie) { + $parts = explode('=', $cookie); + $name = trim($parts[0]); + setcookie($name, '', time()-1000); + setcookie($name, '', time()-1000, '/'); + } +} echo '

    '._('Vous êtes déconnecté').'

    '; echo ''; diff --git a/html/not_implemented.php b/html/not_implemented.php index 9b7c1d1be..0c2656c46 100644 --- a/html/not_implemented.php +++ b/html/not_implemented.php @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // Copyright Author Dany De Bontridder danydb@aevalys.eu -include_once("ac_common.php"); +include_once("lib/ac_common.php"); html_page_start(); echo '

    Not Implemented

    '; html_page_stop(); diff --git a/html/popup.php b/html/popup.php index 727efb778..e7b888485 100644 --- a/html/popup.php +++ b/html/popup.php @@ -18,13 +18,13 @@ */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/function_javascript.php'; -require_once NOALYSS_INCLUDE.'/class_html_input.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_periode.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; +require_once NOALYSS_INCLUDE.'/lib/class_html_input.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; html_page_start($_SESSION['g_theme']); @@ -33,7 +33,7 @@ global $g_user; if ( basename($_GET['ajax']) == 'ajax_history.php' ) { $href=dossier::get(); - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); /* current year */ $g_user=new User($cn); $exercice=$g_user->get_exercice(); diff --git a/html/recherche.php b/html/recherche.php index cd59fa2e4..aba5f08f7 100644 --- a/html/recherche.php +++ b/html/recherche.php @@ -21,9 +21,9 @@ * \brief Search module */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -include_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +include_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; html_page_start($_SESSION['g_theme']); @@ -32,11 +32,11 @@ load_all_script(); $gDossier=dossier::id(); -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; /* Admin. Dossier */ -$cn=new Database($gDossier); -include_once NOALYSS_INCLUDE.'/class_user.php'; +$cn=Dossier::connect(); +include_once NOALYSS_INCLUDE.'/class/class_user.php'; global $g_user; $g_user=new User($cn); diff --git a/html/show_document.php b/html/show_document.php index 67ac28bb2..a30cdfd58 100644 --- a/html/show_document.php +++ b/html/show_document.php @@ -23,15 +23,15 @@ * \brief retrieve a document */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_document.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_document.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier = dossier::id(); -$cn = new Database($gDossier); +$cn = Dossier::connect(); $action = (isset($_REQUEST['a'])) ? $_REQUEST['a'] : 'sh'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; global $g_user; $g_user = new User($cn); $g_user->Check(); diff --git a/html/show_document_modele.php b/html/show_document_modele.php index c641cb663..bafd8aa5f 100644 --- a/html/show_document_modele.php +++ b/html/show_document_modele.php @@ -22,15 +22,15 @@ * \brief send the document template */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier=dossier::id(); -$cn=new Database($gDossier); +$cn=Dossier::connect(); -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; global $g_user; $g_user=new User($cn); $g_user->Check(); diff --git a/html/show_pj.php b/html/show_pj.php index 7563e824d..2af9bbf73 100644 --- a/html/show_pj.php +++ b/html/show_pj.php @@ -22,8 +22,8 @@ * \brief show an attach of an operation */ require_once '../include/constant.php'; -include_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +include_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier=dossier::id(); if ( !isset ($_GET['jrn'] ) || @@ -32,15 +32,15 @@ if ( !isset ($_GET['jrn'] ) || echo_error("Missing parameters"); } -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; set_language(); $jr_grpt_id=$_GET['jr_grpt_id']; -$cn=new Database($gDossier); +$cn=Dossier::connect(); -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; global $g_user; $g_user=new User($cn); $g_user->Check(); diff --git a/html/test.php b/html/test.php index 2dc2fb563..819c8b0a8 100644 --- a/html/test.php +++ b/html/test.php @@ -30,12 +30,12 @@ include_once("../include/constant.php"); -include_once("ac_common.php"); -require_once('class_database.php'); -require_once ('class_dossier.php'); -require_once('class_html_input.php'); -require_once ('function_javascript.php'); -require_once 'class_user.php'; +include_once("lib/ac_common.php"); +require_once('lib/class_database.php'); +require_once ('class/class_dossier.php'); +require_once('lib/class_html_input.php'); +require_once ('lib/function_javascript.php'); +require_once 'class/class_user.php'; load_all_script(); $gDossier=HtmlInput::default_value_get('gDossier', -1); if ($gDossier==-1) @@ -45,7 +45,7 @@ if ($gDossier==-1) } $gDossierLogInput=$gDossier; global $cn, $g_user, $g_succeed, $g_failed; -$cn=new Database($_GET['gDossier']); +$cn=Dossier::id(); $g_parameter=new Own($cn); $g_user=new User($cn); diff --git a/html/user_login.php b/html/user_login.php index af9808fda..162f8cfcf 100644 --- a/html/user_login.php +++ b/html/user_login.php @@ -22,14 +22,14 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu require_once '../include/constant.php'; -include_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/function_javascript.php'; +include_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; @html_page_start($_SESSION['g_theme']); $rep=new Database(); -include_once NOALYSS_INCLUDE.'/class_user.php'; +include_once NOALYSS_INCLUDE.'/class/class_user.php'; $User=new User($rep); $User->Check(); diff --git a/include/action.inc.php b/include/action.inc.php index ff2ea68c3..d0d00f5f4 100644 --- a/include/action.inc.php +++ b/include/action.inc.php @@ -28,11 +28,11 @@ $retour=HtmlInput::button_anchor(_('Retour liste'), //----------------------------------------------------- // Follow_Up //----------------------------------------------------- -require_once NOALYSS_INCLUDE.'/class_icard.php'; -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_ifile.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_follow_up.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icard.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ifile.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/class/class_follow_up.php'; /*!\brief Show the list of action, this code should be common * to several webpage. But for the moment we keep like that * because it is used only by this file. diff --git a/include/adm.inc.php b/include/adm.inc.php index 6e32b3bd7..330825330 100644 --- a/include/adm.inc.php +++ b/include/adm.inc.php @@ -21,13 +21,13 @@ * the customer category */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_customer.php'; -require_once NOALYSS_INCLUDE.'/class_ibutton.php'; -require_once NOALYSS_INCLUDE.'/class_fiche_def.php'; -require_once NOALYSS_INCLUDE.'/class_fiche_def.php'; -require_once NOALYSS_INCLUDE.'/class_admin.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_customer.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ibutton.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_def.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_def.php'; +require_once NOALYSS_INCLUDE.'/class/class_admin.php'; global $g_user; diff --git a/include/ajax_account_update.php b/include/ajax/ajax_account_update.php similarity index 100% rename from include/ajax_account_update.php rename to include/ajax/ajax_account_update.php diff --git a/include/ajax_action_remove_concerned.php b/include/ajax/ajax_action_remove_concerned.php similarity index 97% rename from include/ajax_action_remove_concerned.php rename to include/ajax/ajax_action_remove_concerned.php index e6da62534..7a0b47f08 100644 --- a/include/ajax_action_remove_concerned.php +++ b/include/ajax/ajax_action_remove_concerned.php @@ -23,7 +23,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); $ag_id=HtmlInput::default_value_get("ag_id", "0"); $f_id=HtmlInput::default_value_get("f_id", "0"); if ( $ag_id == 0 || $f_id == 0 ) throw new Exception ("Invalid values", 0); -require_once 'class_follow_up.php'; +require_once 'class/class_follow_up.php'; $follow=new Follow_Up($cn,$ag_id); ob_start(); diff --git a/include/ajax_action_save_concerned.php b/include/ajax/ajax_action_save_concerned.php similarity index 97% rename from include/ajax_action_save_concerned.php rename to include/ajax/ajax_action_save_concerned.php index b8b780e7d..e1600a96f 100644 --- a/include/ajax_action_save_concerned.php +++ b/include/ajax/ajax_action_save_concerned.php @@ -24,7 +24,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); /** * Insert into follow-up the card (f_id) for the action_gestion (ag_id) */ -require_once 'class_follow_up.php'; +require_once 'class/class_follow_up.php'; $follow=new Follow_Up($cn,$ag_id); $follow->insert_linked_card($f_id); /** diff --git a/include/ajax_add_concerned_card.php b/include/ajax/ajax_add_concerned_card.php similarity index 96% rename from include/ajax_add_concerned_card.php rename to include/ajax/ajax_add_concerned_card.php index da09c7122..25181606d 100644 --- a/include/ajax_add_concerned_card.php +++ b/include/ajax/ajax_add_concerned_card.php @@ -28,7 +28,7 @@ $ag_id=HtmlInput::default_value_get("ag_id", "0"); if ($ag_id == 0 ) throw new Exception('ag_id is null'); -require_once('class_acc_ledger.php'); +require_once('class/class_acc_ledger.php'); $r=HtmlInput::title_box(_("Détail fiche"), 'search_card'); $r.=''; @@ -66,7 +66,7 @@ for ($i=0; $i

    '; echo HtmlInput::hidden('create_menu', 1); -require_once 'template/menu_detail.php'; +require_once NOALYSS_INCLUDE.'/template/menu_detail.php'; echo HtmlInput::submit('create_menubt',_('Sauver')); echo HtmlInput::button_close('divmenu'); echo ''; diff --git a/include/ajax_display_submenu.php b/include/ajax/ajax_display_submenu.php similarity index 50% rename from include/ajax_display_submenu.php rename to include/ajax/ajax_display_submenu.php index d8271f1fd..f005149f4 100644 --- a/include/ajax_display_submenu.php +++ b/include/ajax/ajax_display_submenu.php @@ -45,54 +45,10 @@ if ($module == "" return; } -require_once NOALYSS_INCLUDE.'/class_profile_menu.php'; +require_once NOALYSS_INCLUDE.'/class/class_profile_menu.php'; $p_level++; $profile=new Profile_Menu($cn); $profile->p_id=$p_id; $profile->display_module_menu($module,$p_level); -//////////////////////////////////////////////////////////////////////////////// -// EXAMPLE -//////////////////////////////////////////////////////////////////////////////// -/* -if ($ac == 'save') // operation -{ - - $cn=new Database(dossier::id()); - $todo=new Todo_List($cn); - $id=HtmlInput::default_value_get("id", 0); // get variable - $todo->set_parameter("id",$id); - if ($id <> 0 ) { $todo->load(); } - else - { - $todo->set_parameter("owner", $_SESSION['g_user']); - } - - $todo->set_parameter("date", HtmlInput::default_value_get("p_date_todo", "")); - $todo->set_parameter("title", HtmlInput::default_value_get("p_title", "")); - $todo->set_parameter("desc", HtmlInput::default_value_get("p_desc", "")); - $todo->set_is_public(HtmlInput::default_value_get("p_public", "N")); - - if ( $todo->get_parameter('owner') == $_SESSION['g_user'] ) $todo->save(); - $todo->load(); - //---------------------------------------------------------------- - // Answer in XML - header('Content-type: text/xml; charset=UTF-8'); - $dom=new DOMDocument('1.0','UTF-8'); - $tl_id=$dom->createElement('tl_id',$todo->get_parameter('id')); - $tl_content=$dom->createElement('row',$todo->display_row('class="odd"','N')); - $root=$dom->createElement("root"); - $todo_class=$todo->get_class(); - $todo_class=($todo_class=="")?' odd ':$todo_class; - $class=$dom->createElement("style",$todo_class); - - $root->appendChild($tl_id); - $root->appendChild($tl_content); - $root->appendChild($class); - $dom->appendChild($root); - - echo $dom->saveXML(); - exit(); -} - */ ?> \ No newline at end of file diff --git a/include/ajax_fiche_def_detail.php b/include/ajax/ajax_fiche_def_detail.php similarity index 91% rename from include/ajax_fiche_def_detail.php rename to include/ajax/ajax_fiche_def_detail.php index effdb4993..fbd5fc0ea 100644 --- a/include/ajax_fiche_def_detail.php +++ b/include/ajax/ajax_fiche_def_detail.php @@ -26,8 +26,8 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_fiche_def.php'; -require_once NOALYSS_INCLUDE.'/class_tool_uos.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_def.php'; +require_once NOALYSS_INCLUDE.'/lib/class_tool_uos.php'; global $g_user; $g_user->can_request(FICCAT,0); diff --git a/include/ajax_gestion.php b/include/ajax/ajax_gestion.php similarity index 95% rename from include/ajax_gestion.php rename to include/ajax/ajax_gestion.php index d59c68105..a7f1e3a36 100644 --- a/include/ajax_gestion.php +++ b/include/ajax/ajax_gestion.php @@ -30,7 +30,7 @@ if ($op=='action_show') /** * display action */ - require_once NOALYSS_INCLUDE.'/class_follow_up.php'; + require_once NOALYSS_INCLUDE.'/class/class_follow_up.php'; $gestion=new Follow_Up($cn); $array=$gestion->get_last(25); $len_array=count($array); @@ -39,14 +39,14 @@ if ($op=='action_show') } if ($op=='action_add') { - require_once NOALYSS_INCLUDE.'/class_follow_up.php'; + require_once NOALYSS_INCLUDE.'/class/class_follow_up.php'; $gestion=new Follow_Up($cn); $gestion->display_short(); return; } if ($op=='action_save') { - require_once NOALYSS_INCLUDE.'/class_follow_up.php'; + require_once NOALYSS_INCLUDE.'/class/class_follow_up.php'; /** * save info from the get diff --git a/include/ajax_get_menu_detail.php b/include/ajax/ajax_get_menu_detail.php similarity index 100% rename from include/ajax_get_menu_detail.php rename to include/ajax/ajax_get_menu_detail.php diff --git a/include/ajax_get_profile.php b/include/ajax/ajax_get_profile.php similarity index 96% rename from include/ajax_get_profile.php rename to include/ajax/ajax_get_profile.php index 8dcab3b77..18f82cd0e 100644 --- a/include/ajax_get_profile.php +++ b/include/ajax/ajax_get_profile.php @@ -31,9 +31,9 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); // Security if ( $g_user->check_module('CFGPRO') == 0 ) die(); -require_once NOALYSS_INCLUDE.'/class_profile_sql.php'; -require_once NOALYSS_INCLUDE.'/class_profile_menu.php'; -require_once NOALYSS_INCLUDE.'/class_html_input.php'; +require_once NOALYSS_INCLUDE.'/database/class_profile_sql.php'; +require_once NOALYSS_INCLUDE.'/class/class_profile_menu.php'; +require_once NOALYSS_INCLUDE.'/lib/class_html_input.php'; $p_id=HtmlInput::default_value_request('p_id', -1); $profile=new Profile_sql($cn,$p_id); $gDossier=Dossier::id(); diff --git a/include/ajax_get_receipt.php b/include/ajax/ajax_get_receipt.php similarity index 87% rename from include/ajax_get_receipt.php rename to include/ajax/ajax_get_receipt.php index 472c9fa14..1f6159b28 100644 --- a/include/ajax_get_receipt.php +++ b/include/ajax/ajax_get_receipt.php @@ -30,10 +30,10 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; // Check if the needed field does exist extract ($_GET); diff --git a/include/ajax_ledger_show.php b/include/ajax/ajax_ledger_show.php similarity index 84% rename from include/ajax_ledger_show.php rename to include/ajax/ajax_ledger_show.php index db9534c29..6afa939ae 100644 --- a/include/ajax_ledger_show.php +++ b/include/ajax/ajax_ledger_show.php @@ -14,8 +14,8 @@ */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_html_input.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/class_html_input.php'; if ( ! isset ($r_jrn)) { $r_jrn=null;} $ctl='div_jrn'.$div; ob_start(); diff --git a/include/ajax_min_row.php b/include/ajax/ajax_min_row.php similarity index 92% rename from include/ajax_min_row.php rename to include/ajax/ajax_min_row.php index c454ccc8f..05302cdbb 100644 --- a/include/ajax_min_row.php +++ b/include/ajax/ajax_min_row.php @@ -26,8 +26,8 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; extract($_GET); /* check the parameters */ foreach ( array('j','ctl') as $a ) diff --git a/include/ajax_mod_document.php b/include/ajax/ajax_mod_document.php similarity index 87% rename from include/ajax_mod_document.php rename to include/ajax/ajax_mod_document.php index 157d25b10..a26046763 100644 --- a/include/ajax_mod_document.php +++ b/include/ajax/ajax_mod_document.php @@ -23,12 +23,12 @@ * \brief show the detail of a document and let you modify it */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_document_modele.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_document_modele.php'; /* 1. Check security */ -$cn=new Database(dossier::id()); +$cn=Dossier::id(); /* 2. find the document */ $doc=new Document_Modele($cn,$id); diff --git a/include/ajax_mod_menu.php b/include/ajax/ajax_mod_menu.php similarity index 90% rename from include/ajax_mod_menu.php rename to include/ajax/ajax_mod_menu.php index 7d32b3fe2..b3136d45d 100644 --- a/include/ajax_mod_menu.php +++ b/include/ajax/ajax_mod_menu.php @@ -3,7 +3,7 @@ //see licence.txt if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_menu_ref.php'; +require_once NOALYSS_INCLUDE.'/class/class_menu_ref.php'; $m=new Menu_Ref($cn,$me_code); $msg="Modification ".$m->me_code.' '.h($m->me_menu); echo '
    '; diff --git a/include/ajax_mod_periode.php b/include/ajax/ajax_mod_periode.php similarity index 98% rename from include/ajax_mod_periode.php rename to include/ajax/ajax_mod_periode.php index f28cd13c4..b2d9f15a0 100644 --- a/include/ajax_mod_periode.php +++ b/include/ajax/ajax_mod_periode.php @@ -20,7 +20,7 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_periode.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; /**\file * \brief display or save a periode diff --git a/include/ajax_mod_predf_op.php b/include/ajax/ajax_mod_predf_op.php similarity index 97% rename from include/ajax_mod_predf_op.php rename to include/ajax/ajax_mod_predf_op.php index 1e5ea89c2..9c4745432 100644 --- a/include/ajax_mod_predf_op.php +++ b/include/ajax/ajax_mod_predf_op.php @@ -25,7 +25,7 @@ */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); ob_start(); -require_once NOALYSS_INCLUDE.'/class_pre_operation.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_operation.php'; $op=new Pre_Operation($cn,$_GET['id']); $array=$op->load(); echo HtmlInput::anchor_close('mod_predf_op'); diff --git a/include/ajax_mod_stock_repo.php b/include/ajax/ajax_mod_stock_repo.php similarity index 97% rename from include/ajax_mod_stock_repo.php rename to include/ajax/ajax_mod_stock_repo.php index e808e7de4..12a9ed527 100644 --- a/include/ajax_mod_stock_repo.php +++ b/include/ajax/ajax_mod_stock_repo.php @@ -26,7 +26,7 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_stock_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_stock_sql.php'; $st=new Stock_Sql($_GET['r_id']); ?> diff --git a/include/ajax_navigator.php b/include/ajax/ajax_navigator.php similarity index 100% rename from include/ajax_navigator.php rename to include/ajax/ajax_navigator.php diff --git a/include/ajax_pcmn_update.php b/include/ajax/ajax_pcmn_update.php similarity index 97% rename from include/ajax_pcmn_update.php rename to include/ajax/ajax_pcmn_update.php index de4d80d98..4f4a94941 100644 --- a/include/ajax_pcmn_update.php +++ b/include/ajax/ajax_pcmn_update.php @@ -76,7 +76,7 @@ if ( $pcmn_val != "") } -require 'template/pcmn_update.php'; +require NOALYSS_INCLUDE.'/template/pcmn_update.php'; $response = ob_get_clean(); $html = escape_xml($response); if ( headers_sent() ) { diff --git a/include/ajax_plugin_detail.php b/include/ajax/ajax_plugin_detail.php similarity index 100% rename from include/ajax_plugin_detail.php rename to include/ajax/ajax_plugin_detail.php diff --git a/include/ajax_preference.php b/include/ajax/ajax_preference.php similarity index 95% rename from include/ajax_preference.php rename to include/ajax/ajax_preference.php index 0b4c8945b..82bb35de6 100644 --- a/include/ajax_preference.php +++ b/include/ajax/ajax_preference.php @@ -22,11 +22,11 @@ * it permits to change the user preferences */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_iperiod.php'; -require_once NOALYSS_INCLUDE.'/class_acc_report.php'; -require_once NOALYSS_INCLUDE.'/class_periode.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iperiod.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_report.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; echo HtmlInput::title_box(_('Préférence'), 'preference_div'); echo '
    '; echo '

    '; @@ -43,7 +43,7 @@ if (isset($_REQUEST['gDossier']) && $_REQUEST['gDossier']<>0) { $g_user->load_global_pref(); $msg = ""; - $cn = new Database($_REQUEST['gDossier']); + $cn =Dossier::connect(); $g_user->cn = $cn; $inside_dossier = true; $local_pref=$g_user->get_preference(); diff --git a/include/ajax_remove_submenu.php b/include/ajax/ajax_remove_submenu.php similarity index 100% rename from include/ajax_remove_submenu.php rename to include/ajax/ajax_remove_submenu.php diff --git a/include/ajax_save_predf_op.php b/include/ajax/ajax_save_predf_op.php similarity index 100% rename from include/ajax_save_predf_op.php rename to include/ajax/ajax_save_predf_op.php diff --git a/include/ajax_search_action.php b/include/ajax/ajax_search_action.php similarity index 86% rename from include/ajax_search_action.php rename to include/ajax/ajax_search_action.php index aae5edff7..684da335f 100755 --- a/include/ajax_search_action.php +++ b/include/ajax/ajax_search_action.php @@ -21,9 +21,9 @@ * \brief Search module */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -include_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_follow_up.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +include_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_follow_up.php'; $_REQUEST['ac']='FOLLOW'; diff --git a/include/ajax_search_add_tag.php b/include/ajax/ajax_search_add_tag.php similarity index 96% rename from include/ajax_search_add_tag.php rename to include/ajax/ajax_search_add_tag.php index f40c9e177..a9c3e103e 100644 --- a/include/ajax_search_add_tag.php +++ b/include/ajax/ajax_search_add_tag.php @@ -19,7 +19,7 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu if ( !defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_tag.php'; +require_once NOALYSS_INCLUDE.'/class/class_tag.php'; ob_start(); if ($_GET['clear']==1) { /* Add a clear button */ diff --git a/include/ajax_search_clear_tag.php b/include/ajax/ajax_search_clear_tag.php similarity index 95% rename from include/ajax_search_clear_tag.php rename to include/ajax/ajax_search_clear_tag.php index fb8508ad9..697543e34 100644 --- a/include/ajax_search_clear_tag.php +++ b/include/ajax/ajax_search_clear_tag.php @@ -19,7 +19,7 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu if ( !defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_tag.php'; +require_once NOALYSS_INCLUDE.'/class/class_tag.php'; ob_start(); echo Tag::button_search($_GET['pref']); $response= ob_get_clean(); diff --git a/include/ajax_search_display_tag.php b/include/ajax/ajax_search_display_tag.php similarity index 95% rename from include/ajax_search_display_tag.php rename to include/ajax/ajax_search_display_tag.php index 90270becd..592e1d469 100644 --- a/include/ajax_search_display_tag.php +++ b/include/ajax/ajax_search_display_tag.php @@ -19,7 +19,7 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu if ( !defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_tag.php'; +require_once NOALYSS_INCLUDE.'/class/class_tag.php'; ob_start(); $tag=new Tag($cn); $tag->select_search($_GET['pref']); diff --git a/include/ajax_tag_add_action.php b/include/ajax/ajax_tag_add_action.php similarity index 100% rename from include/ajax_tag_add_action.php rename to include/ajax/ajax_tag_add_action.php diff --git a/include/ajax_tag_detail.php b/include/ajax/ajax_tag_detail.php similarity index 86% rename from include/ajax_tag_detail.php rename to include/ajax/ajax_tag_detail.php index 1226260a5..d04f1ee51 100644 --- a/include/ajax_tag_detail.php +++ b/include/ajax/ajax_tag_detail.php @@ -6,8 +6,8 @@ //see licence.txt if ( !defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_tool_uos.php'; -require_once NOALYSS_INCLUDE.'/class_tag.php'; +require_once NOALYSS_INCLUDE.'/lib/class_tool_uos.php'; +require_once NOALYSS_INCLUDE.'/class/class_tag.php'; ob_start(); $tag=new Tag($cn); $tag->data->t_id=$_GET['tag']; @@ -32,7 +32,7 @@ else : echo HtmlInput::hidden('t_id', $_GET['tag']); echo HtmlInput::hidden('ac',$_GET['ac']); $data=$tag->data; - require_once 'template/tag_detail.php'; + require_once NOALYSS_INCLUDE.'/template/tag_detail.php'; echo HtmlInput::submit("save_tag_sb", "Valider"); ?>

    diff --git a/include/ajax_tag_list.php b/include/ajax/ajax_tag_list.php similarity index 96% rename from include/ajax_tag_list.php rename to include/ajax/ajax_tag_list.php index f8dc50641..983e877de 100644 --- a/include/ajax_tag_list.php +++ b/include/ajax/ajax_tag_list.php @@ -19,7 +19,7 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu if ( !defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_tag.php'; +require_once NOALYSS_INCLUDE.'/class/class_tag.php'; ob_start(); $tag=new Tag($cn); $tag->select(); diff --git a/include/ajax_tag_remove_action.php b/include/ajax/ajax_tag_remove_action.php similarity index 100% rename from include/ajax_tag_remove_action.php rename to include/ajax/ajax_tag_remove_action.php diff --git a/include/ajax_tag_save.php b/include/ajax/ajax_tag_save.php similarity index 77% rename from include/ajax_tag_save.php rename to include/ajax/ajax_tag_save.php index 9194a1840..d2dc0705b 100644 --- a/include/ajax_tag_save.php +++ b/include/ajax/ajax_tag_save.php @@ -4,7 +4,7 @@ if ( !defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_tag.php'; +require_once NOALYSS_INCLUDE.'/class/class_tag.php'; $tag=new Tag($cn); $tag->save($_GET); diff --git a/include/ajax_tag_select_search.php b/include/ajax/ajax_tag_select_search.php similarity index 95% rename from include/ajax_tag_select_search.php rename to include/ajax/ajax_tag_select_search.php index d364ec0f5..1652c1d4e 100644 --- a/include/ajax_tag_select_search.php +++ b/include/ajax/ajax_tag_select_search.php @@ -19,7 +19,7 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu if ( !defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_tag.php'; +require_once NOALYSS_INCLUDE.'/class/class_tag.php'; ob_start(); $tag=new Tag($cn); $tag->select_search(); diff --git a/include/ajax_update_payment.php b/include/ajax/ajax_update_payment.php similarity index 94% rename from include/ajax_update_payment.php rename to include/ajax/ajax_update_payment.php index f12a61a0b..970a63930 100644 --- a/include/ajax_update_payment.php +++ b/include/ajax/ajax_update_payment.php @@ -26,7 +26,7 @@ * -l for the ledger */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; $ledger=new Acc_Ledger($cn,$l); echo $ledger->input_paid(1); ?> diff --git a/include/ajax_update_predef.php b/include/ajax/ajax_update_predef.php similarity index 90% rename from include/ajax_update_predef.php rename to include/ajax/ajax_update_predef.php index 80eaf2049..bd6bac2e4 100644 --- a/include/ajax_update_predef.php +++ b/include/ajax/ajax_update_predef.php @@ -29,9 +29,9 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_pre_operation.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_operation.php'; // Check if the needed field does exist extract ($_GET); @@ -44,7 +44,7 @@ foreach (array('l','t','d','gDossier') as $a) } } -$cn=new Database(dossier::id()); +$cn=Dossier::id(); $op=new Pre_operation_detail($cn); $op->set('ledger',$l); $op->set('ledger_type',$t); diff --git a/include/ajax_view_action.php b/include/ajax/ajax_view_action.php similarity index 95% rename from include/ajax_view_action.php rename to include/ajax/ajax_view_action.php index 38a1f794c..ea5e87d69 100644 --- a/include/ajax_view_action.php +++ b/include/ajax/ajax_view_action.php @@ -27,8 +27,8 @@ */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); ob_start(); -require_once NOALYSS_INCLUDE.'/class_follow_up.php'; -require_once NOALYSS_INCLUDE.'/class_default_menu.php'; +require_once NOALYSS_INCLUDE.'/class/class_follow_up.php'; +require_once NOALYSS_INCLUDE.'/class/class_default_menu.php'; echo HtmlInput::title_box(_("Détail action"), $div); $act = new Follow_Up($cn); diff --git a/include/ajax_view_mod_stock.php b/include/ajax/ajax_view_mod_stock.php similarity index 97% rename from include/ajax_view_mod_stock.php rename to include/ajax/ajax_view_mod_stock.php index d6426c7d0..c079b9395 100644 --- a/include/ajax_view_mod_stock.php +++ b/include/ajax/ajax_view_mod_stock.php @@ -25,7 +25,7 @@ * @brief show detail of inv. * */ -require_once NOALYSS_INCLUDE.'/class_stock_goods.php'; +require_once NOALYSS_INCLUDE.'/class/class_stock_goods.php'; if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); $st=new Stock_Goods($cn); diff --git a/include/anc_acc_balance.inc.php b/include/anc_acc_balance.inc.php index efa03f892..e58a90984 100644 --- a/include/anc_acc_balance.inc.php +++ b/include/anc_acc_balance.inc.php @@ -3,7 +3,7 @@ //see licence.txt if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_anc_acc_list.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_acc_list.php'; echo '
    '; $tab = new Anc_Acc_List($cn); $tab->get_request(); diff --git a/include/anc_acc_table.inc.php b/include/anc_acc_table.inc.php index 357c2ddc8..d1ce3a905 100644 --- a/include/anc_acc_table.inc.php +++ b/include/anc_acc_table.inc.php @@ -3,7 +3,7 @@ //see licence.txt if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_anc_table.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_table.php'; $tab = new Anc_Table($cn); $tab->get_request(); echo '
    '; diff --git a/include/anc_balance_double.inc.php b/include/anc_balance_double.inc.php index b8baab3e4..fd450aadb 100644 --- a/include/anc_balance_double.inc.php +++ b/include/anc_balance_double.inc.php @@ -3,7 +3,7 @@ //see licence.txt if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_anc_balance_double.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_balance_double.php'; $bc = new Anc_Balance_Double($cn); $bc->get_request(); echo ''; diff --git a/include/anc_balance_simple.inc.php b/include/anc_balance_simple.inc.php index fdab93c2a..aa28ad81b 100644 --- a/include/anc_balance_simple.inc.php +++ b/include/anc_balance_simple.inc.php @@ -3,7 +3,7 @@ //see licence.txt if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_anc_balance_simple.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_balance_simple.php'; $bs = new Anc_Balance_Simple($cn); $bs->get_request(); echo ''; diff --git a/include/anc_great_ledger.inc.php b/include/anc_great_ledger.inc.php index fc7c51a75..40bbe3b8a 100644 --- a/include/anc_great_ledger.inc.php +++ b/include/anc_great_ledger.inc.php @@ -5,7 +5,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); echo '
    '; -require_once NOALYSS_INCLUDE.'/class_anc_grandlivre.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_grandlivre.php'; $grandLivre=new Anc_Grandlivre($cn); diff --git a/include/anc_group.inc.php b/include/anc_group.inc.php index fdda9f312..97651f26e 100644 --- a/include/anc_group.inc.php +++ b/include/anc_group.inc.php @@ -24,9 +24,9 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_anc_group.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_group.php'; $r=new Anc_Group($cn); diff --git a/include/anc_group_balance.inc.php b/include/anc_group_balance.inc.php index 532c897b4..91ba047e5 100644 --- a/include/anc_group_balance.inc.php +++ b/include/anc_group_balance.inc.php @@ -3,7 +3,7 @@ //see licence.txt if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_anc_group.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_group.php'; $gr = new Anc_Group($cn); $gr->get_request(); diff --git a/include/anc_history.inc.php b/include/anc_history.inc.php index 7efb2a6e5..0bc5312c9 100644 --- a/include/anc_history.inc.php +++ b/include/anc_history.inc.php @@ -5,7 +5,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_anc_listing.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_listing.php'; $list = new Anc_Listing($cn); $list->get_request(); diff --git a/include/anc_key.inc.php b/include/anc_key.inc.php index b9d5a2227..097c083c2 100644 --- a/include/anc_key.inc.php +++ b/include/anc_key.inc.php @@ -29,7 +29,7 @@ if (!defined('ALLOWED')) die('Appel direct ne sont pas permis'); global $cn, $g_user; -require_once NOALYSS_INCLUDE.'/class_anc_key.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_key.php'; $op=HtmlInput::default_value_request("op", "list"); switch ($op) diff --git a/include/anc_od.inc.php b/include/anc_od.inc.php index 54d33398d..17600d7bb 100644 --- a/include/anc_od.inc.php +++ b/include/anc_od.inc.php @@ -26,12 +26,12 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_anc_account.php'; -require_once NOALYSS_INCLUDE.'/class_anc_operation.php'; -require_once NOALYSS_INCLUDE.'/class_anc_plan.php'; -require_once NOALYSS_INCLUDE.'/class_anc_group_operation.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_account.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_operation.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_plan.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_group_operation.php'; global $g_user; diff --git a/include/anc_pa.inc.php b/include/anc_pa.inc.php index 23e6798ae..a5477b26e 100644 --- a/include/anc_pa.inc.php +++ b/include/anc_pa.inc.php @@ -25,8 +25,8 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_anc_plan.php'; -require_once NOALYSS_INCLUDE.'/class_anc_account.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_plan.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_account.php'; $ret=""; $str_dossier=Dossier::get(); //--------------------------------------------------------------------------- diff --git a/include/balance.inc.php b/include/balance.inc.php index 04809874c..202bb8ef7 100644 --- a/include/balance.inc.php +++ b/include/balance.inc.php @@ -24,15 +24,15 @@ * some variable are already defined ($cn, $g_user ...) */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -include_once NOALYSS_INCLUDE.'/ac_common.php'; -include_once NOALYSS_INCLUDE.'/class_acc_balance.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_periode.php'; -require_once NOALYSS_INCLUDE.'/class_exercice.php'; +include_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +include_once NOALYSS_INCLUDE.'/class/class_acc_balance.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; +require_once NOALYSS_INCLUDE.'/class/class_exercice.php'; global $g_user; $gDossier=dossier::id(); $exercice=(isset($_GET['exercice']))?$_GET['exercice']:$g_user->get_exercice(); diff --git a/include/balance_age.inc.php b/include/balance_age.inc.php index ba5a4da91..a20cc813a 100644 --- a/include/balance_age.inc.php +++ b/include/balance_age.inc.php @@ -65,7 +65,7 @@ $w_lettre->selected=HtmlInput::default_value_get('p_let','unlet'); ?> '; diff --git a/include/balance_card_ageing.inc.php b/include/balance_card_ageing.inc.php index 60fe728a3..25599cb9e 100644 --- a/include/balance_card_ageing.inc.php +++ b/include/balance_card_ageing.inc.php @@ -25,8 +25,8 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); * @brief * @param type $name Descriptionara */ -require_once NOALYSS_INCLUDE.'/class_exercice.php'; -require_once NOALYSS_INCLUDE.'/class_balance_age.php'; +require_once NOALYSS_INCLUDE.'/class/class_exercice.php'; +require_once NOALYSS_INCLUDE.'/class/class_balance_age.php'; $let=( isset ($_GET['p_let']))?'let':'unlet'; $export_csv = '
    '; diff --git a/include/bank.inc.php b/include/bank.inc.php index 6d7ff1c13..d0b0a1580 100644 --- a/include/bank.inc.php +++ b/include/bank.inc.php @@ -21,10 +21,10 @@ * the supplier category */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_bank.php'; -require_once NOALYSS_INCLUDE.'/class_ibutton.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_bank.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ibutton.php'; global $g_user; $low_action=(isset($_REQUEST['sb']))?$_REQUEST['sb']:'list'; diff --git a/include/calendar.inc.php b/include/calendar.inc.php index 74db9a814..4f665c155 100644 --- a/include/calendar.inc.php +++ b/include/calendar.inc.php @@ -8,7 +8,7 @@ */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_calendar.php'; +require_once NOALYSS_INCLUDE.'/class/class_calendar.php'; $cal=new Calendar(); $cal->default_periode=(isset ($_GET['in']))?$_GET['in']:$g_user->get_periode(); diff --git a/include/card_attr.inc.php b/include/card_attr.inc.php index 151150faa..6c182c12c 100644 --- a/include/card_attr.inc.php +++ b/include/card_attr.inc.php @@ -23,7 +23,7 @@ * \brief Manage the attributs */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_fiche_attr.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_attr.php'; diff --git a/include/cat_document.inc.php b/include/cat_document.inc.php index 43d2cf250..a0b458f59 100644 --- a/include/cat_document.inc.php +++ b/include/cat_document.inc.php @@ -26,7 +26,7 @@ // show list of document if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_document_type.php'; +require_once NOALYSS_INCLUDE.'/class/class_document_type.php'; if ( isset($_POST['add']) ) { diff --git a/include/category_card.inc.php b/include/category_card.inc.php index 845d3c6af..5e5ad00c1 100644 --- a/include/category_card.inc.php +++ b/include/category_card.inc.php @@ -26,7 +26,7 @@ * the customer category */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_contact.php'; +require_once NOALYSS_INCLUDE.'/class/class_contact.php'; $str_dossier=Dossier::get(); /* $sub_action = sb = detail */ diff --git a/include/category_detail.inc.php b/include/category_detail.inc.php index 95e68b954..bd081226d 100644 --- a/include/category_detail.inc.php +++ b/include/category_detail.inc.php @@ -32,7 +32,7 @@ // Save modification //--------------------------------------------------------------------------- if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_customer.php'; +require_once NOALYSS_INCLUDE.'/class/class_customer.php'; if ( isset ($_POST['mod'])) { diff --git a/include/category_followup.inc.php b/include/category_followup.inc.php index d4b0a7fdc..1e011c81a 100644 --- a/include/category_followup.inc.php +++ b/include/category_followup.inc.php @@ -27,7 +27,7 @@ * - $cn = database connection */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_follow_up.php'; +require_once NOALYSS_INCLUDE.'/class/class_follow_up.php'; /** *\note problem with ShowActionList, this function is local diff --git a/include/category_operation.inc.php b/include/category_operation.inc.php index 1fb5b063a..34b8faceb 100644 --- a/include/category_operation.inc.php +++ b/include/category_operation.inc.php @@ -29,7 +29,7 @@ * - $ss_action */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; $f=new Fiche($cn,$_REQUEST['f_id']); $qcode=$f->get_quick_code(); $_GET['qcode']=$qcode; diff --git a/include/cfgfiche.inc.php b/include/cfgfiche.inc.php index 17620fa13..cbca11e74 100644 --- a/include/cfgfiche.inc.php +++ b/include/cfgfiche.inc.php @@ -21,16 +21,16 @@ * \brief module to manage the card (removing, listing, creating, modify attribut) */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; require_once NOALYSS_INCLUDE.'/user_menu.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_sort_table.php'; -require_once NOALYSS_INCLUDE.'/class_fiche_def.php'; -require_once NOALYSS_INCLUDE.'/class_tool_uos.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_sort_table.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_def.php'; +require_once NOALYSS_INCLUDE.'/lib/class_tool_uos.php'; $retour=HtmlInput::button_anchor("Retour à la liste", HtmlInput::get_to_string(array("gDossier","ac"))); $action=HtmlInput::default_value_post('action', ''); diff --git a/include/cfgledger.inc.php b/include/cfgledger.inc.php index b0b1bea44..90f0d1f1e 100644 --- a/include/cfgledger.inc.php +++ b/include/cfgledger.inc.php @@ -27,12 +27,12 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; require_once NOALYSS_INCLUDE.'/user_menu.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; $gDossier=dossier::id(); global $cn; diff --git a/include/cfgplugin.inc.php b/include/cfgplugin.inc.php index b440dd33b..afa0e9943 100644 --- a/include/cfgplugin.inc.php +++ b/include/cfgplugin.inc.php @@ -19,7 +19,7 @@ // Copyright (2014) Author Dany De Bontridder if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_extension.php'; +require_once NOALYSS_INCLUDE.'/class/class_extension.php'; /** * @file diff --git a/include/cfgtags.inc.php b/include/cfgtags.inc.php index 2a4743e41..3f4c19271 100644 --- a/include/cfgtags.inc.php +++ b/include/cfgtags.inc.php @@ -24,8 +24,8 @@ if ( !defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); * @brief Manage the tags * */ -require_once NOALYSS_INCLUDE.'/class_tag.php'; -require_once NOALYSS_INCLUDE.'/class_tool_uos.php'; +require_once NOALYSS_INCLUDE.'/class/class_tag.php'; +require_once NOALYSS_INCLUDE.'/lib/class_tool_uos.php'; $tag=new Tag($cn); $uos=new Tool_Uos('tag'); diff --git a/include/class_acc_account.php b/include/class/class_acc_account.php similarity index 97% rename from include/class_acc_account.php rename to include/class/class_acc_account.php index 960dd26a9..f8347ad2f 100644 --- a/include/class_acc_account.php +++ b/include/class/class_acc_account.php @@ -23,9 +23,9 @@ /*! * \brief Manage the account from the table tmp_pcmn */ -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; class Acc_Account { @@ -205,7 +205,6 @@ class Acc_Account /*!\brief for developper only during test */ static function test_me() { - $cn=new Database(dossier::id()); } /** diff --git a/include/class_acc_account_ledger.php b/include/class/class_acc_account_ledger.php similarity index 99% rename from include/class_acc_account_ledger.php rename to include/class/class_acc_account_ledger.php index ebf8f2b17..274039d64 100644 --- a/include/class_acc_account_ledger.php +++ b/include/class/class_acc_account_ledger.php @@ -23,9 +23,9 @@ /*! * \brief Manage the account from the table jrn, jrnx or tmp_pcmn */ -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; class Acc_Account_Ledger { @@ -648,7 +648,7 @@ class Acc_Account_Ledger } static function test_me() { - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); $a=new Acc_Account_Ledger($cn,550); echo ' Journal 4 '.$a->belong_ledger(4); return $a->belong_ledger(4);; diff --git a/include/class_acc_balance.php b/include/class/class_acc_balance.php similarity index 98% rename from include/class_acc_balance.php rename to include/class/class_acc_balance.php index 654bdd2df..f5b693950 100644 --- a/include/class_acc_balance.php +++ b/include/class/class_acc_balance.php @@ -23,7 +23,7 @@ /*! * \brief Class for manipulating data to print the balance of account */ -require_once NOALYSS_INCLUDE.'/class_acc_account.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account.php'; class Acc_Balance { @@ -273,9 +273,9 @@ class Acc_Balance } static function test_me () { - require 'class_user.php'; + require 'class/class_user.php'; global $g_user; - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); $g_user=new User($cn); $a=new Acc_Balance($cn); $a->get_row(163, 175, 1); diff --git a/include/class_acc_bilan.php b/include/class/class_acc_bilan.php similarity index 98% rename from include/class_acc_bilan.php rename to include/class/class_acc_bilan.php index 18bff4ce7..2088bbdc6 100644 --- a/include/class_acc_bilan.php +++ b/include/class/class_acc_bilan.php @@ -23,12 +23,12 @@ * \brief this class handle the different bilan, from the table bilan * */ -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_impress.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_impress.php'; require_once NOALYSS_INCLUDE.'/header_print.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; /*! * \brief this class handle the different bilan, from the table bilan, parse the form and replace @@ -696,7 +696,7 @@ class Acc_Bilan if ( isset($_GET['result'])) { ob_start(); - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); $a=new Acc_Bilan($cn); $a->get_request_get(); @@ -714,7 +714,7 @@ class Acc_Bilan } else { - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); $a=new Acc_Bilan($cn); $a->get_request_get(); diff --git a/include/class_acc_compute.php b/include/class/class_acc_compute.php similarity index 100% rename from include/class_acc_compute.php rename to include/class/class_acc_compute.php diff --git a/include/class_acc_ledger.php b/include/class/class_acc_ledger.php similarity index 98% rename from include/class_acc_ledger.php rename to include/class/class_acc_ledger.php index 5326cf7a4..2f8654cad 100644 --- a/include/class_acc_ledger.php +++ b/include/class/class_acc_ledger.php @@ -17,32 +17,32 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // Copyright Author Dany De Bontridder danydb@aevalys.eu -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_icard.php'; -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_idate.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_iperiod.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_anc_operation.php'; -require_once NOALYSS_INCLUDE.'/class_acc_operation.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_pre_op_advanced.php'; -require_once NOALYSS_INCLUDE.'/class_acc_reconciliation.php'; -require_once NOALYSS_INCLUDE.'/class_periode.php'; -require_once NOALYSS_INCLUDE.'/class_gestion_purchase.php'; -require_once NOALYSS_INCLUDE.'/class_gestion_sold.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_inum.php'; -require_once NOALYSS_INCLUDE.'/class_lettering.php'; -require_once NOALYSS_INCLUDE.'/class_sort_table.php'; -require_once NOALYSS_INCLUDE.'/class_jrn_def_sql.php'; -require_once NOALYSS_INCLUDE.'/class_acc_payment.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icard.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_idate.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iperiod.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_operation.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_operation.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_op_advanced.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_reconciliation.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; +require_once NOALYSS_INCLUDE.'/class/class_gestion_purchase.php'; +require_once NOALYSS_INCLUDE.'/class/class_gestion_sold.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_inum.php'; +require_once NOALYSS_INCLUDE.'/class/class_lettering.php'; +require_once NOALYSS_INCLUDE.'/lib/class_sort_table.php'; +require_once NOALYSS_INCLUDE.'/database/class_jrn_def_sql.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_payment.php'; /** \file * @brief Class for jrn, class acc_ledger for manipulating the ledger */ @@ -3245,7 +3245,7 @@ class Acc_Ledger extends jrn_def_sql { echo Acc_Reconciliation::$javascript; html_page_start(); - $cn = new Database(dossier::id()); + $cn = Dossier::connect(); $_SESSION['g_user'] = 'phpcompta'; $_SESSION['g_pass'] = 'phpcompta'; @@ -3334,7 +3334,7 @@ class Acc_Ledger extends jrn_def_sql if ($pCase == 'search') { html_page_start(); - $cn = new Database(dossier::id()); + $cn = Dossier::connect(); $ledger = new Acc_Ledger($cn, 0); $_SESSION['g_user'] = 'phpcompta'; $_SESSION['g_pass'] = 'phpcompta'; @@ -3346,7 +3346,7 @@ class Acc_Ledger extends jrn_def_sql /////////////////////////////////////////////////////////////////////////// if ($pCase == 'reverse') { - $cn = new Database(dossier::id()); + $cn = Dossier::connect(); $jr_internal = 'OD-01-272'; try { diff --git a/include/class_acc_ledger_fin.php b/include/class/class_acc_ledger_fin.php similarity index 98% rename from include/class_acc_ledger_fin.php rename to include/class/class_acc_ledger_fin.php index 61e40c58a..3d441f960 100644 --- a/include/class_acc_ledger_fin.php +++ b/include/class/class_acc_ledger_fin.php @@ -24,17 +24,17 @@ * \brief the class Acc_Ledger_Fin inherits from Acc_Ledger, this * object permit to manage the financial ledger */ -require_once NOALYSS_INCLUDE.'/class_idate.php'; -require_once NOALYSS_INCLUDE.'/class_icard.php'; -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_iconcerned.php'; -require_once NOALYSS_INCLUDE.'/class_ifile.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_acc_reconciliation.php'; +require_once NOALYSS_INCLUDE.'/lib/class_idate.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icard.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iconcerned.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ifile.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_reconciliation.php'; class Acc_Ledger_Fin extends Acc_Ledger { diff --git a/include/class_acc_ledger_info.php b/include/class/class_acc_ledger_info.php similarity index 96% rename from include/class_acc_ledger_info.php rename to include/class/class_acc_ledger_info.php index 398ff9466..d4066187d 100644 --- a/include/class_acc_ledger_info.php +++ b/include/class/class_acc_ledger_info.php @@ -18,9 +18,9 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; /*!\file * \brief Manage additional info for Accountancy @@ -200,7 +200,7 @@ class Acc_Ledger_Info static function test_me() { echo "Dossier = ".Dossier::id(); - $cn=new Database(Dossier::id()); + $cn=Dossier::connect(); $a=new Acc_Ledger_Info($cn); $a->jr_id=3; $a->id_type='BON_COMMANDE'; diff --git a/include/class_acc_ledger_purchase.php b/include/class/class_acc_ledger_purchase.php similarity index 97% rename from include/class_acc_ledger_purchase.php rename to include/class/class_acc_ledger_purchase.php index 203636653..f057f4252 100644 --- a/include/class_acc_ledger_purchase.php +++ b/include/class/class_acc_ledger_purchase.php @@ -22,25 +22,25 @@ /*!\file * \brief class for the purchase, herits from acc_ledger */ -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_icard.php'; -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_iperiod.php'; -require_once NOALYSS_INCLUDE.'/class_idate.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_ifile.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_acc_compute.php'; -require_once NOALYSS_INCLUDE.'/class_anc_operation.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; -require_once NOALYSS_INCLUDE.'/class_acc_parm_code.php'; -require_once NOALYSS_INCLUDE.'/class_acc_payment.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_itva_popup.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_info.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_fin.php'; -require_once NOALYSS_INCLUDE.'/class_stock_goods.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icard.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iperiod.php'; +require_once NOALYSS_INCLUDE.'/lib/class_idate.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ifile.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_compute.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_operation.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_parm_code.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_payment.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itva_popup.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_info.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_fin.php'; +require_once NOALYSS_INCLUDE.'/class/class_stock_goods.php'; /*!\brief Handle the ledger of purchase, * @@ -908,8 +908,8 @@ class Acc_Ledger_Purchase extends Acc_Ledger echo ''. 'Erreur dans l\'enregistrement '. __FILE__.':'.__LINE__.' '. - $e->getMessage().$e->getTraceAsString(); - + $e->getMessage().$e->getMessage(); + error_log($e->getMessage()); $this->db->rollback(); throw new Exception($e); } @@ -1032,16 +1032,17 @@ class Acc_Ledger_Purchase extends Acc_Ledger if ( $g_parameter->MY_PJ_SUGGEST=='Y') { $add_js="update_pj();"; +} + if ($g_parameter->MY_DATE_SUGGEST == 'Y') + { + $add_js.='get_last_date();'; } - if ($g_parameter->MY_DATE_SUGGEST == 'Y') - { - $add_js.='get_last_date();'; - } - $add_js.='update_name();'; - $add_js.='update_pay_method();'; - $add_js.='update_row("sold_item");'; + $add_js.='update_name();'; + $add_js.='update_pay_method();'; + $add_js.='update_row("sold_item");'; - $wLedger=$this->select_ledger('ACH',2); + $wLedger=$this->select_ledger('ACH',2); + if ($wLedger == null) throw new Exception(_('Pas de journal disponible')); $wLedger->javascript="onChange='update_predef(\"ach\",\"f\",\"".$_REQUEST['ac']."\");$add_js'"; $wLedger->table=1; @@ -1717,8 +1718,8 @@ EOF; * Retrieve data from the view v_detail_purchase * @global $g_user connected user * @param $p_from jrn.jr_tech_per from - * @param type $p_end jrn.jr_tech_per to - * @return type + * @param $p_end jrn.jr_tech_per to + * @return handle to database result */ function get_detail_purchase($p_from,$p_end) { diff --git a/include/class_acc_ledger_sold.php b/include/class/class_acc_ledger_sold.php similarity index 98% rename from include/class_acc_ledger_sold.php rename to include/class/class_acc_ledger_sold.php index 0e8d45e82..912cf2fbd 100644 --- a/include/class_acc_ledger_sold.php +++ b/include/class/class_acc_ledger_sold.php @@ -23,24 +23,24 @@ /* !\file * \brief class for the sold, herits from acc_ledger */ -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_icard.php'; -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_idate.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_ifile.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_acc_compute.php'; -require_once NOALYSS_INCLUDE.'/class_anc_operation.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; -require_once NOALYSS_INCLUDE.'/class_acc_payment.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_own.php'; -require_once NOALYSS_INCLUDE.'/class_itva_popup.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_fin.php'; -require_once NOALYSS_INCLUDE.'/class_stock_goods.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icard.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_idate.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ifile.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_compute.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_operation.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_payment.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_own.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itva_popup.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_fin.php'; +require_once NOALYSS_INCLUDE.'/class/class_stock_goods.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; /* !\brief Handle the ledger of sold, * @@ -1365,7 +1365,7 @@ EOF; */ static function test_me($p_string = '') { - $cn = new Database(dossier::id()); + $cn = Dossier::connect(); $a = new Acc_Ledger_Sold($cn, 2); echo $a->input(); } diff --git a/include/class_acc_operation.php b/include/class/class_acc_operation.php similarity index 99% rename from include/class_acc_operation.php rename to include/class/class_acc_operation.php index 1de6fc41d..6a1c0fa72 100644 --- a/include/class_acc_operation.php +++ b/include/class/class_acc_operation.php @@ -23,8 +23,8 @@ * \brief this file match the tables jrn & jrnx the purpose is to * remove or save accountant writing to these table. */ -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; /*! \brief this file match the tables jrn & jrnx the purpose is to * remove or save accountant writing to these table. @@ -578,7 +578,7 @@ class Acc_Operation $_SESSION['g_user']='phpcompta'; $_SESSION['g_pass']='dany'; global $g_user; - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); $g_user=new User($cn); $a=new Acc_Operation($cn); $a->jr_id=1444; diff --git a/include/class_acc_parm_code.php b/include/class/class_acc_parm_code.php similarity index 97% rename from include/class_acc_parm_code.php rename to include/class/class_acc_parm_code.php index 21a4459af..e178e0d0e 100644 --- a/include/class_acc_parm_code.php +++ b/include/class/class_acc_parm_code.php @@ -25,8 +25,8 @@ * \brief Manage the table parm_code which contains the custom parameter * for the module accountancy */ -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; class Acc_Parm_Code { diff --git a/include/class_acc_payment.php b/include/class/class_acc_payment.php similarity index 97% rename from include/class_acc_payment.php rename to include/class/class_acc_payment.php index 1cb9b6015..3bc5543f0 100644 --- a/include/class_acc_payment.php +++ b/include/class/class_acc_payment.php @@ -22,12 +22,12 @@ /*!\file * \brief Handle the table mod_payment */ -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_icard.php'; -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_fiche_def.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icard.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_def.php'; require_once NOALYSS_INCLUDE.'/constant.php'; /*!\brief Handle the table mod_payment *\note the private data member are accessed via diff --git a/include/class_acc_reconciliation.php b/include/class/class_acc_reconciliation.php similarity index 98% rename from include/class_acc_reconciliation.php rename to include/class/class_acc_reconciliation.php index 512718103..3feb08671 100644 --- a/include/class_acc_reconciliation.php +++ b/include/class/class_acc_reconciliation.php @@ -24,10 +24,10 @@ * must use it * */ -require_once NOALYSS_INCLUDE.'/class_iconcerned.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_lettering.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iconcerned.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_lettering.php'; /*! \brief new class for managing the reconciliation it must be used * instead of the function InsertRapt, ... @@ -417,7 +417,7 @@ j1.j_poste as poste echo ''; echo ''; echo ''; - include 'template/impress_reconciliation_detail.php'; + include NOALYSS_INCLUDE.'/template/impress_reconciliation_detail.php'; echo ''; echo ''; } @@ -524,7 +524,7 @@ j1.j_poste as poste static function test_me() { - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); $rap=new Acc_Reconciliation($cn); var_dump($rap->get_reconciled_amount('',false)); } diff --git a/include/class_acc_report.php b/include/class/class_acc_report.php similarity index 98% rename from include/class_acc_report.php rename to include/class/class_acc_report.php index b992d014c..14b1b18d2 100644 --- a/include/class_acc_report.php +++ b/include/class/class_acc_report.php @@ -21,10 +21,10 @@ * \brief Create, view, modify and parse report */ -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_ibutton.php'; -require_once NOALYSS_INCLUDE.'/class_acc_report_row.php'; -require_once NOALYSS_INCLUDE.'/class_impress.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ibutton.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_report_row.php'; +require_once NOALYSS_INCLUDE.'/lib/class_impress.php'; /*! * \brief Class rapport Create, view, modify and parse report @@ -422,7 +422,7 @@ class Acc_Report } static function test_me() { - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); $a=new Acc_Report($cn); print_r($a->get_list()); $array=array("text0"=>"test1", diff --git a/include/class_acc_report_row.php b/include/class/class_acc_report_row.php similarity index 98% rename from include/class_acc_report_row.php rename to include/class/class_acc_report_row.php index 1f4a377e0..97e1b3287 100644 --- a/include/class_acc_report_row.php +++ b/include/class/class_acc_report_row.php @@ -107,7 +107,7 @@ class Acc_Report_Row } static function test_me() { - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); $a=new Acc_Report_Row(); $array=array("text0"=>"test1", "form0"=>"7%", diff --git a/include/class_acc_tva.php b/include/class/class_acc_tva.php similarity index 97% rename from include/class_acc_tva.php rename to include/class/class_acc_tva.php index 7ce28ea1e..801daaccf 100644 --- a/include/class_acc_tva.php +++ b/include/class/class_acc_tva.php @@ -22,8 +22,8 @@ /*!\file * \brief this class is used for the table tva_rate */ -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; /*!\brief Acc_Tva is used for to map the table tva_rate * parameter are @@ -177,7 +177,7 @@ class Acc_Tva */ static function test_me() { - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); $a=new Acc_Tva($cn); echo $a->get_info(); $a->set_parameter("id",1); diff --git a/include/class_admin.php b/include/class/class_admin.php similarity index 84% rename from include/class_admin.php rename to include/class/class_admin.php index 0b0835fac..b0a5a3d21 100644 --- a/include/class_admin.php +++ b/include/class/class_admin.php @@ -18,12 +18,12 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_acc_parm_code.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_parm_code.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; /*! \file * \brief Derived from class fiche Administration are a specific kind of card * concerned only by official (or not) administration diff --git a/include/class_anc_acc_link.php b/include/class/class_anc_acc_link.php similarity index 96% rename from include/class_anc_acc_link.php rename to include/class/class_anc_acc_link.php index fa802ff7d..4adbcc80f 100644 --- a/include/class_anc_acc_link.php +++ b/include/class/class_anc_acc_link.php @@ -22,7 +22,7 @@ /*!\file * \brief link between accountancy and analytic, like table but as a listing */ -require_once NOALYSS_INCLUDE.'/class_anc_print.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_print.php'; class Anc_Acc_Link extends Anc_Print { diff --git a/include/class_anc_acc_list.php b/include/class/class_anc_acc_list.php similarity index 99% rename from include/class_anc_acc_list.php rename to include/class/class_anc_acc_list.php index 3b7c6a07b..70fe3ac7a 100644 --- a/include/class_anc_acc_list.php +++ b/include/class/class_anc_acc_list.php @@ -23,7 +23,7 @@ * \brief */ -require_once NOALYSS_INCLUDE.'/class_anc_acc_link.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_acc_link.php'; class Anc_Acc_List extends Anc_Acc_Link { diff --git a/include/class_anc_account.php b/include/class/class_anc_account.php similarity index 96% rename from include/class_anc_account.php rename to include/class/class_anc_account.php index 1d9da5f7f..f983c743c 100644 --- a/include/class_anc_account.php +++ b/include/class/class_anc_account.php @@ -26,12 +26,12 @@ /*!\brief contains the object for the poste_analytique (table poste_analytique) * */ -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_anc_plan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_plan.php'; class Anc_Account { @@ -305,7 +305,7 @@ class Anc_Account } static function test_me() { - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); $pa_id=$cn->get_value("select max(pa_id) from plan_analytique"); $o=new Anc_Account($cn); echo "

    Poste_Analytique

    "; diff --git a/include/class_anc_balance_double.php b/include/class/class_anc_balance_double.php similarity index 97% rename from include/class_anc_balance_double.php rename to include/class/class_anc_balance_double.php index 5574903cb..c799d8d12 100644 --- a/include/class_anc_balance_double.php +++ b/include/class/class_anc_balance_double.php @@ -28,13 +28,13 @@ * Print the crossed balance between 2 plan * */ -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_ibutton.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_anc_print.php'; -require_once NOALYSS_INCLUDE.'/class_anc_plan.php'; -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ibutton.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_print.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_plan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_pdf.php'; class Anc_Balance_Double extends Anc_Print { @@ -557,7 +557,7 @@ class Anc_Balance_Double extends Anc_Print */ static function test_me() { - $a=new Database(dossier::id()); + $a=Dossier::connect(); $bal=new Anc_Balance_Double($a); $bal->get_request(); diff --git a/include/class_anc_balance_simple.php b/include/class/class_anc_balance_simple.php similarity index 96% rename from include/class_anc_balance_simple.php rename to include/class/class_anc_balance_simple.php index 9dd563dc7..000e7628d 100644 --- a/include/class_anc_balance_simple.php +++ b/include/class/class_anc_balance_simple.php @@ -23,11 +23,11 @@ \brief manage the simple balance for CA, inherit from balance_ca */ -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_anc_print.php'; -require_once NOALYSS_INCLUDE.'/class_anc_plan.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_print.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_plan.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_pdf.php'; require_once NOALYSS_INCLUDE.'/header_print.php'; /*! \brief manage the simple balance for CA, inherit from balance_ca * @@ -286,7 +286,7 @@ class Anc_Balance_Simple extends Anc_Print static function test_me () { // call the page with ?gDossier=14 - $a=new Database(dossier::id()); + $a=Dossier::connect(); $bal=new Anc_Balance_Simple($a); $bal->get_request(); diff --git a/include/class_anc_grandlivre.php b/include/class/class_anc_grandlivre.php similarity index 98% rename from include/class_anc_grandlivre.php rename to include/class/class_anc_grandlivre.php index 452da710b..3cf02c466 100644 --- a/include/class_anc_grandlivre.php +++ b/include/class/class_anc_grandlivre.php @@ -22,8 +22,8 @@ /*!\file * \brief show the Grand Livre for analytic */ -require_once NOALYSS_INCLUDE.'/class_anc_print.php'; -require_once NOALYSS_INCLUDE.'/class_impress.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_print.php'; +require_once NOALYSS_INCLUDE.'/lib/class_impress.php'; class Anc_GrandLivre extends Anc_Print { diff --git a/include/class_anc_group.php b/include/class/class_anc_group.php similarity index 97% rename from include/class_anc_group.php rename to include/class/class_anc_group.php index daff410da..30d3a0436 100644 --- a/include/class_anc_group.php +++ b/include/class/class_anc_group.php @@ -23,10 +23,10 @@ * \brief class for the group of the analytic account * */ -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_anc_print.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_print.php'; /*! \brief class for the group of the analytic account * @@ -239,7 +239,7 @@ order by ga_description,po_name"; static function test_me() { - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); print_r($cn); $o=new Anc_Group($cn); $r=$o->myList(); diff --git a/include/class_anc_group_operation.php b/include/class/class_anc_group_operation.php similarity index 94% rename from include/class_anc_group_operation.php rename to include/class/class_anc_group_operation.php index 502a9cc9a..2140ca9cb 100644 --- a/include/class_anc_group_operation.php +++ b/include/class/class_anc_group_operation.php @@ -26,14 +26,14 @@ /*! \brief group of object operations, used for misc operation * */ -require_once NOALYSS_INCLUDE.'/class_idate.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_anc_operation.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_anc_plan.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_idate.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_operation.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_plan.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; class Anc_Group_Operation { @@ -257,7 +257,7 @@ class Anc_Group_Operation static function test_me() { $dossier=dossier::id(); - $cn=new Database($dossier); + $cn=Dossier::connect(); if ( isset($_POST['go'])) { diff --git a/include/class_anc_key.php b/include/class/class_anc_key.php similarity index 96% rename from include/class_anc_key.php rename to include/class/class_anc_key.php index 587178aab..a1a99a2cd 100644 --- a/include/class_anc_key.php +++ b/include/class/class_anc_key.php @@ -25,7 +25,7 @@ * @brief Class to manage distribution keys for Analytic accountancy * */ -require_once NOALYSS_INCLUDE.'/class_anc_key_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_anc_key_sql.php'; class Anc_Key { @@ -83,7 +83,7 @@ class Anc_Key echo _('Aucune clef disponible'); echo _('Allez dans ANCKEY pour en ajouter pour ce journal'); } - include 'template/anc_key_display_choice.php'; + include NOALYSS_INCLUDE.'/template/anc_key_display_choice.php'; } /** @@ -100,7 +100,7 @@ class Anc_Key { echo _('Aucune clef disponible'); } - include 'template/anc_key_display_list.php'; + include NOALYSS_INCLUDE.'/template/anc_key_display_list.php'; } /** @@ -265,7 +265,8 @@ class Anc_Key } catch (Exception $e) { - if ( DEBUG ) { echo $e->getTraceAsString(); var_dump($_POST);} else { echo _('erreur');} + if ( DEBUG ) { echo $e->getTraceAsString(); } else { echo _('erreur').$e->getMessage();} + error_log($e->getTraceAsString()); $cn->rollback(); } } diff --git a/include/class_anc_listing.php b/include/class/class_anc_listing.php similarity index 96% rename from include/class_anc_listing.php rename to include/class/class_anc_listing.php index 93c1a3f75..9804ad96c 100644 --- a/include/class_anc_listing.php +++ b/include/class/class_anc_listing.php @@ -23,10 +23,10 @@ * \brief definition of Anc_Listing */ -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_anc_plan.php'; -require_once NOALYSS_INCLUDE.'/class_anc_print.php'; -require_once NOALYSS_INCLUDE.'/class_anc_operation.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_plan.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_print.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_operation.php'; /*! * \brief manage the CA listing * diff --git a/include/class_anc_operation.php b/include/class/class_anc_operation.php similarity index 98% rename from include/class_anc_operation.php rename to include/class/class_anc_operation.php index 20c90cc28..8e907d5c5 100644 --- a/include/class_anc_operation.php +++ b/include/class/class_anc_operation.php @@ -22,12 +22,12 @@ /*!\file *\brief definition of Anc_Operation */ -require_once NOALYSS_INCLUDE.'/class_ibutton.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_anc_plan.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ibutton.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_plan.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; /*! \brief this class is used to show the form for entering an * operation only FOR analytic operation @@ -939,7 +939,7 @@ class Anc_Operation */ function test_me() { - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); $anco=new Anc_Operation($cn); $j_id=200; $anco->j_id=$j_id; diff --git a/include/class_anc_plan.php b/include/class/class_anc_plan.php similarity index 95% rename from include/class_anc_plan.php rename to include/class/class_anc_plan.php index ab6646ba3..3db85afef 100644 --- a/include/class_anc_plan.php +++ b/include/class/class_anc_plan.php @@ -26,12 +26,12 @@ /*! \brief * Concerns the Analytic plan (table plan_analytique) */ -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_anc_account.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_account.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; class Anc_Plan { @@ -202,7 +202,7 @@ class Anc_Plan } static function test_me() { - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); echo "

    Plan analytique : test

    "; echo "clean"; $cn->exec_sql("delete from plan_analytique"); diff --git a/include/class_anc_print.php b/include/class/class_anc_print.php similarity index 91% rename from include/class_anc_print.php rename to include/class/class_anc_print.php index f9fc3e5ff..24d79df75 100644 --- a/include/class_anc_print.php +++ b/include/class/class_anc_print.php @@ -27,16 +27,16 @@ * * */ -require_once NOALYSS_INCLUDE.'/class_idate.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_ibutton.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_idate.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ibutton.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_anc_plan.php'; -require_once NOALYSS_INCLUDE.'/class_ianccard.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_plan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ianccard.php'; class Anc_Print { var $db; /*!< $db database connection */ diff --git a/include/class_anc_table.php b/include/class/class_anc_table.php similarity index 99% rename from include/class_anc_table.php rename to include/class/class_anc_table.php index 877c83684..01ef0fac9 100644 --- a/include/class_anc_table.php +++ b/include/class/class_anc_table.php @@ -22,7 +22,7 @@ /*!\file * \brief object to show a table: link between accountancy and analytic */ -require_once NOALYSS_INCLUDE.'/class_anc_acc_link.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_acc_link.php'; class Anc_Table extends Anc_Acc_Link { diff --git a/include/class_anticipation.php b/include/class/class_anticipation.php similarity index 97% rename from include/class_anticipation.php rename to include/class/class_anticipation.php index e5ba8ce10..230339fcf 100644 --- a/include/class_anticipation.php +++ b/include/class/class_anticipation.php @@ -29,13 +29,13 @@ *@see Forecast Forecast_Cat Forecast_Item * */ -require_once NOALYSS_INCLUDE.'/class_forecast.php'; -require_once NOALYSS_INCLUDE.'/class_forecast_cat.php'; -require_once NOALYSS_INCLUDE.'/class_forecast_item.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_periode.php'; -require_once NOALYSS_INCLUDE.'/class_impress.php'; +require_once NOALYSS_INCLUDE.'/class/class_forecast.php'; +require_once NOALYSS_INCLUDE.'/class/class_forecast_cat.php'; +require_once NOALYSS_INCLUDE.'/class/class_forecast_item.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; +require_once NOALYSS_INCLUDE.'/lib/class_impress.php'; class Anticipation { @@ -442,7 +442,7 @@ class Anticipation */ static function test_me() { - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); $test=new Anticipation($cn); } diff --git a/include/class_balance_age.php b/include/class/class_balance_age.php similarity index 96% rename from include/class_balance_age.php rename to include/class/class_balance_age.php index 364448bc3..a356623d6 100644 --- a/include/class_balance_age.php +++ b/include/class/class_balance_age.php @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -require_once NOALYSS_INCLUDE.'/class_lettering.php'; +require_once NOALYSS_INCLUDE.'/class/class_lettering.php'; /* * * * @file @@ -91,7 +91,7 @@ class Balance_Age $this->get_array_card('U', $p_fiche); $a_fiche=$this->afiche; $nb_fiche=count($a_fiche); - require 'template/balance_aged_result.php'; + require NOALYSS_INCLUDE.'/template/balance_aged_result.php'; } function display_category($p_date_start, $p_cat, $p_let) @@ -101,7 +101,7 @@ class Balance_Age $this->get_array_card('X', $p_cat); $a_fiche=$this->afiche; $nb_fiche=count($a_fiche); - require 'template/balance_aged_result.php'; + require NOALYSS_INCLUDE.'/template/balance_aged_result.php'; } /** @@ -115,7 +115,7 @@ class Balance_Age $this->get_array_card('F'); $a_fiche=$this->afiche; $nb_fiche=count($a_fiche); - require 'template/balance_aged_result.php'; + require NOALYSS_INCLUDE.'/template/balance_aged_result.php'; } /** @@ -129,7 +129,7 @@ class Balance_Age $this->get_array_card('C'); $a_fiche=$this->afiche; $nb_fiche=count($a_fiche); - require 'template/balance_aged_result.php'; + require NOALYSS_INCLUDE.'/template/balance_aged_result.php'; } function export_csv($p_date_start, $p_let) diff --git a/include/class_bank.php b/include/class/class_bank.php similarity index 84% rename from include/class_bank.php rename to include/class/class_bank.php index 886c2090d..8e90ab011 100644 --- a/include/class_bank.php +++ b/include/class/class_bank.php @@ -18,12 +18,12 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_acc_parm_code.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_parm_code.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; /*! \file * \brief Derived from class fiche Administration are a specific kind of card * concerned only by official (or not) administration diff --git a/include/class_calendar.php b/include/class/class_calendar.php similarity index 97% rename from include/class_calendar.php rename to include/class/class_calendar.php index 4959392ea..af86dec84 100644 --- a/include/class_calendar.php +++ b/include/class/class_calendar.php @@ -51,7 +51,7 @@ class Calendar global $g_user; $profile=$g_user->get_profile(); - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); $sql="select ag_id,to_char(ag_remind_date,'DD')::integer as ag_timestamp_day,ag_title,ag_hour, coalesce(name,'interne') as str_name ". @@ -113,7 +113,7 @@ class Calendar */ function fill_from_todo(&$p_array,$p_style) { - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); if ($p_style=="short") { $sql="select count(*) as nb,to_char(tl_date,'DD')::integer as tl_date_day ". @@ -172,7 +172,7 @@ class Calendar $this->fill_from_action($cell,$p_type); $this->fill_from_todo($cell,$p_type); $wMonth=new ISelect('per'); - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); $wMonth->value=$cn->make_array("select p_id,to_char(p_start,'MM/YYYY') from parm_periode where p_exercice = '$exercice_user' order by p_start"); $wMonth->selected=$this->default_periode; $wMonth->javascript="onchange=change_month(this)"; @@ -201,7 +201,7 @@ class Calendar */ function set_month_year() { - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); $array=$cn->get_array("select to_char(p_start,'MM') as month, to_char(p_start,'YYYY') as year ". " from parm_periode where p_id=$1",array($this->default_periode)); $this->month=(int)$array[0]['month']; @@ -218,7 +218,7 @@ class Calendar function get_preference() { global $g_user; - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); $today=date('d.m.Y'); $p_id=$cn->get_value(" select p_id from parm_periode @@ -262,7 +262,7 @@ class Calendar $this->fill_from_action($cell,"long"); $this->fill_from_todo($cell,"long"); $wMonth=new ISelect('per_div'); - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); $wMonth->value=$cn->make_array("select p_id,to_char(p_start,'MM/YYYY') from parm_periode where p_exercice = '$exercice_user' order by p_start"); $wMonth->selected=$this->default_periode; $wMonth->javascript=sprintf("onchange=calendar_zoom({gDossier:%d,invalue:'%s',outvalue:'%s',distype:'%s',notitle:%d})", @@ -292,7 +292,7 @@ class Calendar function zoom_list($notitle) { global $g_user; - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); $profile=$g_user->get_profile(); // Get the event from now and before 30 before diff --git a/include/class_contact.php b/include/class/class_contact.php similarity index 97% rename from include/class_contact.php rename to include/class/class_contact.php index 31bde74c4..9c7016146 100644 --- a/include/class_contact.php +++ b/include/class/class_contact.php @@ -18,9 +18,9 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu //!\brief class for the contact, contact are derived from fiche -require_once NOALYSS_INCLUDE.'/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; /*! \file * \brief Contact are a card which are own by a another card (customer, supplier...) */ diff --git a/include/class_customer.php b/include/class/class_customer.php similarity index 94% rename from include/class_customer.php rename to include/class/class_customer.php index 754557435..1c9a49e0e 100644 --- a/include/class_customer.php +++ b/include/class/class_customer.php @@ -18,12 +18,12 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_acc_parm_code.php'; -require_once NOALYSS_INCLUDE.'/class_periode.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_parm_code.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; /*! \file * \brief Derived from class fiche Customer are a specific kind of card */ diff --git a/include/class_default_menu.php b/include/class/class_default_menu.php similarity index 95% rename from include/class_default_menu.php rename to include/class/class_default_menu.php index 4c6d32f40..1419bb43b 100644 --- a/include/class_default_menu.php +++ b/include/class/class_default_menu.php @@ -23,8 +23,8 @@ * * @author dany */ -require_once NOALYSS_INCLUDE.'/class_default_menu_sql.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; +require_once NOALYSS_INCLUDE.'/database/class_default_menu_sql.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; class Default_Menu { @@ -106,7 +106,8 @@ class Default_Menu } } catch (Exception $e) { - $e->getTraceAsString(); + error_log($e->getTraceAsString()); + echo $e->getMessage(); throw $e; } } diff --git a/include/class_document.php b/include/class/class_document.php similarity index 99% rename from include/class_document.php rename to include/class/class_document.php index 7acaf9109..f0153d4e5 100644 --- a/include/class_document.php +++ b/include/class/class_document.php @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // Copyright Author Dany De Bontridder danydb@aevalys.eu -require_once NOALYSS_INCLUDE.'/class_own.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_follow_up.php'; -require_once NOALYSS_INCLUDE.'/class_acc_tva.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_zip_extended.php'; +require_once NOALYSS_INCLUDE.'/class/class_own.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_follow_up.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_tva.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_zip_extended.php'; /*! \file * \brief Class Document corresponds to the table document diff --git a/include/class_document_export.php b/include/class/class_document_export.php similarity index 100% rename from include/class_document_export.php rename to include/class/class_document_export.php diff --git a/include/class_document_modele.php b/include/class/class_document_modele.php similarity index 97% rename from include/class_document_modele.php rename to include/class/class_document_modele.php index e993af3b3..85c6ae5bb 100644 --- a/include/class_document_modele.php +++ b/include/class/class_document_modele.php @@ -23,9 +23,9 @@ /*! * \brief Class for the document template */ -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_ifile.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ifile.php'; class Document_modele { var $cn; /*!< $cn database connection */ @@ -162,7 +162,7 @@ class Document_modele $oid= $this->cn->lo_import($new_name); if ( $oid == false ) { - echo_error('class_document_modele.php',__LINE__,"cannot upload document"); + echo_error('class/class_document_modele.php',__LINE__,"cannot upload document"); $this->cn->rollback(); return; } @@ -327,7 +327,7 @@ class Document_modele $oid= $this->cn->lo_import($new_name); if ( $oid == false ) { - echo_error('class_document_modele.php',__LINE__,"cannot upload document"); + echo_error('class/class_document_modele.php',__LINE__,"cannot upload document"); $this->cn->rollback(); return; } diff --git a/include/class_document_type.php b/include/class/class_document_type.php similarity index 100% rename from include/class_document_type.php rename to include/class/class_document_type.php diff --git a/include/class_dossier.php b/include/class/class_dossier.php similarity index 51% rename from include/class_dossier.php rename to include/class/class_dossier.php index 292558775..ca3e93aa3 100644 --- a/include/class_dossier.php +++ b/include/class/class_dossier.php @@ -1,4 +1,5 @@ "dos_id", - "name"=>"dos_name", - "desc"=>"dos_description"); + "name"=>"dos_name", + "desc"=>"dos_description"); * */ -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; class Dossier { + private static $variable=array("id"=>"dos_id", - "name"=>"dos_name", - "desc"=>"dos_description"); + "name"=>"dos_name", + "desc"=>"dos_description"); + function __construct($p_id) { - $this->cn=new Database(); // Connect to the repository + $this->cn=new Database(); // Connect to the repository $this->dos_id=$p_id; } - /*!\brief return the $_REQUEST['gDossier'] after a check */ + + /* !\brief return the $_REQUEST['gDossier'] after a check */ + static function id() { self::check(); @@ -56,25 +61,30 @@ class Dossier /** * @brief Show the folder where user have access. * @param p_type string - - A for all dossiers - - R for accessible folders - - X forbidden folders + - A for all dossiers + - R for accessible folders + - X forbidden folders * @param p_login is the user name * @param p_text is a part of the name where are looking for * @return nothing * */ - static function show_dossier($p_type,$p_login="",$p_text="",$limit=0) + static function show_dossier($p_type, $p_login="", $p_text="", $limit=0) { $cn=new Database(); $str_limit=($limit==0)?'':' limit '.$limit; - if ( $p_type == "A") + if ($p_type=="A") { - $l_sql="select *, 'W' as priv_priv from ac_dossier where dos_name ~* $2 or dos_description ~* $2 ORDER BY dos_name $str_limit "; - $a_row=$cn->get_array($l_sql,$p_text); + $l_sql="select *, 'W' as priv_priv " + . "from ac_dossier " + . "where " + . "dos_name ~* $2 " + . "or dos_description ~* $2 " + . "ORDER BY dos_name $str_limit "; + $a_row=$cn->get_array($l_sql, $p_text); return $a_row; } - else if ($p_type == "R") + else if ($p_type=="R") { $l_sql="select * from jnt_use_dos natural join ac_dossier @@ -86,41 +96,40 @@ class Dossier order by dos_name $str_limit "; - - $a_row=$cn->get_array($l_sql,array($p_login,$p_text)); - return $a_row; - } - else if ($p_type == 'X') + $a_row=$cn->get_array($l_sql, array($p_login, $p_text)); + return $a_row; + } + else if ($p_type=='X') { $l_sql=' select * from ac_dossier where dos_id not in (select dos_id from jnt_use_dos where use_id=$1) and ( dos_name ~* $2 or dos_description ~* $2) order by dos_name '.$str_limit; - $a_row=$cn->get_array($l_sql,array($p_login,$p_text)); + $a_row=$cn->get_array($l_sql, array($p_login, $p_text)); return $a_row; - } else { - throw new Exception (_("Erreur paramètre")); - } - - + throw new Exception(_("Erreur paramètre")); + } } + /** * Count the number of folder in the repository * @return integer */ - function count() + function count() { $nb_folder=$this->cn->get_value('select count(*) from ac_dossier'); return $nb_folder; } - /*! + + /* ! * \brief Return all the users * as an array */ + function get_user_folder($sql="") { @@ -135,10 +144,12 @@ class Dossier ag_dossier from ac_users as ac - left join (select array_to_string(array_agg(dos_name),',') as ag_dossier,jt.use_id as jt_use_id - from ac_dossier as ds - join jnt_use_dos as jt on (jt.dos_id=ds.dos_id) - group by jt.use_id) as dossier_name on (jt_use_id=ac.use_id) + left join + (select array_to_string(array_agg(dos_name),',') as ag_dossier, + jt.use_id as jt_use_id + from ac_dossier as ds + join jnt_use_dos as jt on (jt.dos_id=ds.dos_id) + group by jt.use_id) as dossier_name on (jt_use_id=ac.use_id) where use_login!='phpcompta' $sql @@ -146,51 +157,56 @@ class Dossier $res=$this->cn->get_array($sql); return $res; - } + } + + /* !\brief check if gDossier is set */ - /*!\brief check if gDossier is set */ static function check() { - if ( ! isset ($_REQUEST['gDossier']) ) + if (!isset($_REQUEST['gDossier'])) { - echo_error ('Dossier inconnu '); + echo_error('Dossier inconnu '); exit('Dossier invalide '); } $id=$_REQUEST['gDossier']; - if ( is_numeric ($id) == 0 || - strlen($id)> 6 || - $id > 999999) + if (is_numeric($id)==0|| + strlen($id)>6|| + $id>999999) exit('gDossier Invalide : '.$id); - } - /*!\brief return a string to put to gDossier into a GET */ + + /* !\brief return a string to put to gDossier into a GET */ + static function get() { self::check(); return "gDossier=".$_REQUEST['gDossier']; - } - /*!\brief return a string to set gDossier into a FORM */ + /* !\brief return a string to set gDossier into a FORM */ + static function hidden() { self::check(); return ''; } - /*!\brief retrieve the name of the current dossier */ + + /* !\brief retrieve the name of the current dossier */ + static function name($id=0) { self::check(); $cn=new Database(); $id=($id==0)?$_REQUEST['gDossier']:$id; - $name=$cn->get_value("select dos_name from ac_dossier where dos_id=$1",array($_REQUEST['gDossier'])); + $name=$cn->get_value("select dos_name from ac_dossier where dos_id=$1", + array($_REQUEST['gDossier'])); return $name; } public function get_parameter($p_string) { - if ( array_key_exists($p_string,self::$variable) ) + if (array_key_exists($p_string, self::$variable)) { $idx=self::$variable[$p_string]; return $this->$idx; @@ -198,21 +214,21 @@ class Dossier else throw new Exception("Attribut inexistant $p_string"); } - public function set_parameter($p_string,$p_value) + + public function set_parameter($p_string, $p_value) { - if ( array_key_exists($p_string,self::$variable) ) + if (array_key_exists($p_string, self::$variable)) { $idx=self::$variable[$p_string]; $this->$idx=$p_value; } else - throw new Exception("Attribut inexistant $p_string"); - - + throw new Exception("Attribut inexistant $p_string"); } + public function get_info() { - return var_export(self::$variable,true); + return var_export(self::$variable, true); } public function save() @@ -222,20 +238,22 @@ class Dossier public function update() { - if ( strlen(trim($this->dos_name))== 0 ) return; + if (strlen(trim($this->dos_name))==0) + return; - if ( $this->cn->get_value("select count(*) from ac_dossier where dos_name=$1 and dos_id<>$2", - array($this->dos_name,$this->dos_id)) !=0 ) - return ; + if ($this->cn->get_value("select count(*) from ac_dossier " + . " where dos_name=$1 and dos_id<>$2", + array($this->dos_name, $this->dos_id))!=0) + return; $sql="update ac_dossier set dos_name=$1,dos_description=$2 ". - " where dos_id = $3"; + " where dos_id = $3"; $res=$this->cn->exec_sql( - $sql, - array(trim($this->dos_name), - trim($this->dos_description), - $this->dos_id) - ); + $sql, + array(trim($this->dos_name), + trim($this->dos_description), + $this->dos_id) + ); } public function load() @@ -244,71 +262,77 @@ class Dossier $sql="select dos_name,dos_description from ac_dossier where dos_id=$1"; $res=$this->cn->exec_sql( - $sql, - array($this->dos_id) - ); + $sql, array($this->dos_id) + ); - if ( Database::num_row($res) == 0 ) return; - $row=Database::fetch_array($res,0); - foreach ($row as $idx=>$value) + if (Database::num_row($res)==0) + return; + $row=Database::fetch_array($res, 0); + foreach ($row as $idx=> $value) { $this->$idx=$value; } - } static function get_version($p_cn) - { - return $p_cn->get_value('select val from version'); - } + { + return $p_cn->get_value('select val from version'); + } - static function connect() - { - $id = Dossier::id(); - $cn = new Database($id); - return $cn; - } - /** - *connect to folder and give to admin. the profile Admin(builtin) - * @param int $p_id dossier::id() - */ - static function synchro_admin($p_id) - { - // connect to target - $cn=new Database($p_id); + static function connect() + { + static $cn=null; + if ($cn!=null) + return $cn; + $id=Dossier::id(); + $cn=new Database($id); + return $cn; + } - if (! $cn->exist_table("profile_menu")) - { - echo_warning("Dossier invalide"); - return; - } - // connect to repo - $repo=new Database(); + /** + * connect to folder and give to admin. the profile Admin(builtin) + * @param int $p_id dossier::id() + */ + static function synchro_admin($p_id) + { + // connect to target + $cn=new Database($p_id); - $a_admin=$repo->get_array("select use_login from ac_users where + if (!$cn->exist_table("profile_menu")) + { + echo_warning("Dossier invalide"); + return; + } + // connect to repo + $repo=new Database(); + + $a_admin=$repo->get_array("select use_login from ac_users where use_admin=1 and use_active=1"); - try - { - /** - * synchro global - */ - $cn->start(); - for ($i=0;$iget_value("select p_id from profile_user - where user_name=$1",array($a_admin[$i]['use_login'])); - if ( $exist == "") - { - $cn->exec_sql("insert into profile_user(user_name,p_id) values($1,1)", - array($a_admin[$i]['use_login'])); - } + try + { + /** + * synchro global + */ + $cn->start(); + for ($i=0; $iget_value("select p_id from profile_user + where user_name=$1", + array($a_admin[$i]['use_login'])); + if ($exist=="") + { + $cn->exec_sql("insert into profile_user(user_name,p_id) values($1,1)", + array($a_admin[$i]['use_login'])); + } + } + $cn->commit(); + } + catch (Exception $e) + { + echo_warning($e->getMessage()); + error_log($e->getTraceAsString()); + $cn->rollback(); + } + } - } - $cn->commit(); - } catch(Exception $e) - { - echo_warning($e->getMessage()); - $cn->rollback(); - } - } } diff --git a/include/class_exercice.php b/include/class/class_exercice.php similarity index 95% rename from include/class_exercice.php rename to include/class/class_exercice.php index 490157b5a..702aef931 100644 --- a/include/class_exercice.php +++ b/include/class/class_exercice.php @@ -22,8 +22,8 @@ /*!\file * \brief about the accountant exercice */ -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; class Exercice { function __construct(&$cn) diff --git a/include/class_extension.php b/include/class/class_extension.php similarity index 97% rename from include/class_extension.php rename to include/class/class_extension.php index 7ca07c3b2..00a82dffb 100644 --- a/include/class_extension.php +++ b/include/class/class_extension.php @@ -35,10 +35,10 @@ * - enable (extension.ex_enable) * - filepath (extension.ex_file) */ -require_once NOALYSS_INCLUDE.'/class_menu_ref_sql.php'; -require_once NOALYSS_INCLUDE.'/class_profile_sql.php'; -require_once NOALYSS_INCLUDE.'/class_menu_ref.php'; -require_once NOALYSS_INCLUDE.'/class_profile_menu.php'; +require_once NOALYSS_INCLUDE.'/database/class_menu_ref_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_profile_sql.php'; +require_once NOALYSS_INCLUDE.'/class/class_menu_ref.php'; +require_once NOALYSS_INCLUDE.'/class/class_profile_menu.php'; class Extension extends Menu_Ref_sql { diff --git a/include/class_fiche.php b/include/class/class_fiche.php similarity index 99% rename from include/class_fiche.php rename to include/class/class_fiche.php index 065c24a08..6e7e211e0 100644 --- a/include/class_fiche.php +++ b/include/class/class_fiche.php @@ -20,13 +20,13 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu -include_once("class_fiche_attr.php"); -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_itva_popup.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_fiche_def.php'; -require_once NOALYSS_INCLUDE.'/class_iposte.php'; +include_once("class/class_fiche_attr.php"); +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itva_popup.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_def.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iposte.php'; /*! \file * \brief define Class fiche, this class are using @@ -1959,7 +1959,7 @@ class Fiche } static function test_me() { - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); $a=new Fiche($cn); $select_cat=new ISelect('fd_id'); $select_cat->value=$cn->make_array('select fd_id,fd_label from fiche_def where frd_id='. diff --git a/include/class_fiche_attr.php b/include/class/class_fiche_attr.php similarity index 98% rename from include/class_fiche_attr.php rename to include/class/class_fiche_attr.php index ff7a4fbd5..eaf1d22e4 100644 --- a/include/class_fiche_attr.php +++ b/include/class/class_fiche_attr.php @@ -6,8 +6,8 @@ * * */ -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; class Fiche_Attr { diff --git a/include/class_fiche_def.php b/include/class/class_fiche_def.php similarity index 98% rename from include/class_fiche_def.php rename to include/class/class_fiche_def.php index 9962fb7ba..c3f731bc0 100644 --- a/include/class_fiche_def.php +++ b/include/class/class_fiche_def.php @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // Copyright Author Dany De Bontridder danydb@aevalys.eu -require_once NOALYSS_INCLUDE.'/class_fiche_attr.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_fiche_def_ref.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; -require_once NOALYSS_INCLUDE.'/class_iradio.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_attr.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_def_ref.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iradio.php'; /*! \file * \brief define Class fiche and fiche def, those class are using diff --git a/include/class_fiche_def_ref.php b/include/class/class_fiche_def_ref.php similarity index 100% rename from include/class_fiche_def_ref.php rename to include/class/class_fiche_def_ref.php diff --git a/include/class_follow_up.php b/include/class/class_follow_up.php similarity index 98% rename from include/class_follow_up.php rename to include/class/class_follow_up.php index ed5c662cf..4b007e847 100644 --- a/include/class_follow_up.php +++ b/include/class/class_follow_up.php @@ -18,26 +18,26 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // Copyright Author Dany De Bontridder danydb@aevalys.eu -require_once NOALYSS_INCLUDE.'/class_itextarea.php'; -require_once NOALYSS_INCLUDE.'/class_idate.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_icard.php'; -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_ifile.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_document.php'; -require_once NOALYSS_INCLUDE.'/class_document_type.php'; -require_once NOALYSS_INCLUDE.'/class_document_modele.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; -require_once NOALYSS_INCLUDE.'/class_follow_up_detail.php'; -require_once NOALYSS_INCLUDE.'/class_inum.php'; -require_once NOALYSS_INCLUDE.'/class_sort_table.php'; -require_once NOALYSS_INCLUDE.'/class_irelated_action.php'; -require_once NOALYSS_INCLUDE.'/class_tag.php'; -require_once NOALYSS_INCLUDE.'/class_default_menu.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itextarea.php'; +require_once NOALYSS_INCLUDE.'/lib/class_idate.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icard.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ifile.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_document.php'; +require_once NOALYSS_INCLUDE.'/class/class_document_type.php'; +require_once NOALYSS_INCLUDE.'/class/class_document_modele.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_follow_up_detail.php'; +require_once NOALYSS_INCLUDE.'/lib/class_inum.php'; +require_once NOALYSS_INCLUDE.'/lib/class_sort_table.php'; +require_once NOALYSS_INCLUDE.'/lib/class_irelated_action.php'; +require_once NOALYSS_INCLUDE.'/class/class_tag.php'; +require_once NOALYSS_INCLUDE.'/class/class_default_menu.php'; /** * \file * \brief class_action for manipulating actions @@ -541,7 +541,7 @@ class Follow_Up $menu=new Default_Menu(); /* get template */ ob_start(); - require 'template/detail-action.php'; + require NOALYSS_INCLUDE.'/template/detail-action.php'; $content=ob_get_contents(); ob_end_clean(); $r.=$content; @@ -1771,7 +1771,7 @@ class Follow_Up function display_short() { $cn=$this->db; - include 'template/action_display_short.php'; + include NOALYSS_INCLUDE.'/template/action_display_short.php'; } /** * Add an event , with the minimum of informations, diff --git a/include/class_follow_up_detail.php b/include/class/class_follow_up_detail.php similarity index 98% rename from include/class_follow_up_detail.php rename to include/class/class_follow_up_detail.php index 35365b90b..89f7e1da7 100644 --- a/include/class_follow_up_detail.php +++ b/include/class/class_follow_up_detail.php @@ -16,8 +16,8 @@ * along with NOALYSS; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; // Copyright Author Dany De Bontridder danydb@aevalys.eu /*!\file diff --git a/include/class_forecast.php b/include/class/class_forecast.php similarity index 100% rename from include/class_forecast.php rename to include/class/class_forecast.php diff --git a/include/class_forecast_cat.php b/include/class/class_forecast_cat.php similarity index 100% rename from include/class_forecast_cat.php rename to include/class/class_forecast_cat.php diff --git a/include/class_forecast_item.php b/include/class/class_forecast_item.php similarity index 100% rename from include/class_forecast_item.php rename to include/class/class_forecast_item.php diff --git a/include/class_gestion_purchase.php b/include/class/class_gestion_purchase.php similarity index 98% rename from include/class_gestion_purchase.php rename to include/class/class_gestion_purchase.php index 8a1d59204..b738bb325 100644 --- a/include/class_gestion_purchase.php +++ b/include/class/class_gestion_purchase.php @@ -26,7 +26,7 @@ /*! \brief this object handles the table quant_purchase * */ -require_once NOALYSS_INCLUDE.'/class_gestion_table.php'; +require_once NOALYSS_INCLUDE.'/class/class_gestion_table.php'; class gestion_purchase extends gestion_table diff --git a/include/class_gestion_sold.php b/include/class/class_gestion_sold.php similarity index 98% rename from include/class_gestion_sold.php rename to include/class/class_gestion_sold.php index 1b0036f63..a047ab6cd 100644 --- a/include/class_gestion_sold.php +++ b/include/class/class_gestion_sold.php @@ -27,7 +27,7 @@ * */ -require_once NOALYSS_INCLUDE.'/class_gestion_table.php'; +require_once NOALYSS_INCLUDE.'/class/class_gestion_table.php'; class gestion_sold extends gestion_table diff --git a/include/class_gestion_table.php b/include/class/class_gestion_table.php similarity index 100% rename from include/class_gestion_table.php rename to include/class/class_gestion_table.php diff --git a/include/class_lettering.php b/include/class/class_lettering.php similarity index 99% rename from include/class_lettering.php rename to include/class/class_lettering.php index 9b5d769c8..659da38f5 100644 --- a/include/class_lettering.php +++ b/include/class/class_lettering.php @@ -22,7 +22,7 @@ /*!\file * \brief letter the accounting entry (row level) */ -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; /** *@brief mother class for the lettering by account and by card @@ -258,7 +258,7 @@ class Lettering $this->get_all(); $r=""; ob_start(); - include('template/letter_all.php'); + include(NOALYSS_INCLUDE.'/template/letter_all.php'); $r=ob_get_contents(); ob_end_clean(); return $r; @@ -286,7 +286,7 @@ class Lettering $this->get_letter(); $r=""; ob_start(); - include('template/letter_all.php'); + include(NOALYSS_INCLUDE.'/template/letter_all.php'); $r=ob_get_contents(); ob_end_clean(); return $r; @@ -300,7 +300,7 @@ class Lettering $this->get_letter_diff(); $r=""; ob_start(); - include('template/letter_all.php'); + include(NOALYSS_INCLUDE.'/template/letter_all.php'); $r=ob_get_contents(); ob_end_clean(); return $r; @@ -316,7 +316,7 @@ class Lettering $this->get_unletter(); $r=""; ob_start(); - include('template/letter_all.php'); + include(NOALYSS_INCLUDE.'/template/letter_all.php'); $r=ob_get_contents(); ob_end_clean(); return $r; diff --git a/include/class_manager.php b/include/class/class_manager.php similarity index 82% rename from include/class_manager.php rename to include/class/class_manager.php index 55b323f70..76a06864c 100644 --- a/include/class_manager.php +++ b/include/class/class_manager.php @@ -19,12 +19,12 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_acc_parm_code.php'; -require_once NOALYSS_INCLUDE.'/class_periode.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_parm_code.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; /*! \file * \brief Derived from class fiche Supplier are a specific kind of card */ diff --git a/include/class_menu_ref.php b/include/class/class_menu_ref.php similarity index 96% rename from include/class_menu_ref.php rename to include/class/class_menu_ref.php index 264695980..d18a23216 100644 --- a/include/class_menu_ref.php +++ b/include/class/class_menu_ref.php @@ -21,7 +21,7 @@ *@file *@brief Menu_Ref let you manage the available menu */ -require_once NOALYSS_INCLUDE.'/class_menu_ref_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_menu_ref_sql.php'; class Menu_Ref extends Menu_Ref_sql { function format_code() diff --git a/include/class_own.php b/include/class/class_own.php similarity index 100% rename from include/class_own.php rename to include/class/class_own.php diff --git a/include/class_periode.php b/include/class/class_periode.php similarity index 99% rename from include/class_periode.php rename to include/class/class_periode.php index 2f650c33e..67f43b052 100644 --- a/include/class_periode.php +++ b/include/class/class_periode.php @@ -25,8 +25,8 @@ /*! * \brief For the periode tables parm_periode and jrn_periode */ -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; class Periode { var $cn; /*!< database connection */ @@ -567,7 +567,7 @@ class Periode } static function test_me() { - $cn=new Database(dossier::id()); + $cn=Dossier::connect(); $obj=new Periode($cn); $obj->set_jrn(1); $obj->display_form_periode(); diff --git a/include/class_pre_op_ach.php b/include/class/class_pre_op_ach.php similarity index 99% rename from include/class_pre_op_ach.php rename to include/class/class_pre_op_ach.php index 74d6a887e..2f92bf26b 100644 --- a/include/class_pre_op_ach.php +++ b/include/class/class_pre_op_ach.php @@ -22,7 +22,7 @@ /*!\file * \brief definition of the class pre_op_ach */ -require_once NOALYSS_INCLUDE.'/class_pre_operation.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_operation.php'; /*---------------------------------------------------------------------- */ /*!\brief concerns the predefined operation for ACH ledger @@ -147,7 +147,7 @@ class Pre_op_ach extends Pre_operation_detail } function display($p_array) { - require_once NOALYSS_INCLUDE.'/class_acc_ledger_purchase.php'; + require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_purchase.php'; global $g_parameter,$g_user; extract($p_array); $ledger=new Acc_Ledger_Purchase($this->db,$this->jrn_def_id); diff --git a/include/class_pre_op_advanced.php b/include/class/class_pre_op_advanced.php similarity index 98% rename from include/class_pre_op_advanced.php rename to include/class/class_pre_op_advanced.php index fd9ffbece..e0ba2538f 100644 --- a/include/class_pre_op_advanced.php +++ b/include/class/class_pre_op_advanced.php @@ -22,7 +22,7 @@ /*!\file * \brief definition of the class Pre_Op_Advanced */ -require_once NOALYSS_INCLUDE.'/class_pre_operation.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_operation.php'; /*---------------------------------------------------------------------- */ /*!\brief concerns the predefined operation for the operation from 'Ecriture direct' @@ -157,7 +157,7 @@ class Pre_Op_Advanced extends Pre_operation_detail function display($p_array) { global $g_parameter, $g_user; - require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; + require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; $legder=new Acc_Ledger($this->db,$this->jrn_def_id); $legder->nb=$legder->get_min_row(); diff --git a/include/class_pre_op_fin.php b/include/class/class_pre_op_fin.php similarity index 98% rename from include/class_pre_op_fin.php rename to include/class/class_pre_op_fin.php index ca2893314..25e475207 100644 --- a/include/class_pre_op_fin.php +++ b/include/class/class_pre_op_fin.php @@ -22,7 +22,7 @@ /*!\file * \brief definition of the class Pre_op_fin */ -require_once NOALYSS_INCLUDE.'/class_pre_operation.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_operation.php'; /*---------------------------------------------------------------------- */ /*!\brief concerns the predefined operation for FIN ledger diff --git a/include/class_pre_op_ods.php b/include/class/class_pre_op_ods.php similarity index 98% rename from include/class_pre_op_ods.php rename to include/class/class_pre_op_ods.php index c47b00221..db576ba6b 100644 --- a/include/class_pre_op_ods.php +++ b/include/class/class_pre_op_ods.php @@ -22,7 +22,7 @@ /*!\file * \brief definition of the class Pre_op_ods */ -require_once NOALYSS_INCLUDE.'/class_pre_operation.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_operation.php'; /*---------------------------------------------------------------------- */ /*!\brief concerns the predefined operation for ODS ledger diff --git a/include/class_pre_op_ven.php b/include/class/class_pre_op_ven.php similarity index 99% rename from include/class_pre_op_ven.php rename to include/class/class_pre_op_ven.php index 9894aecc6..6a8e4d83d 100644 --- a/include/class_pre_op_ven.php +++ b/include/class/class_pre_op_ven.php @@ -22,7 +22,7 @@ /*!\file * \brief definition of the class Pre_op_ven */ -require_once NOALYSS_INCLUDE.'/class_pre_operation.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_operation.php'; /*---------------------------------------------------------------------- */ /*!\brief concerns the predefined operation for VEN ledger @@ -143,7 +143,7 @@ class Pre_op_ven extends Pre_operation_detail { global $g_parameter,$g_user; if ( $p_array != null ) extract($p_array); - require_once NOALYSS_INCLUDE.'/class_acc_ledger_sold.php'; + require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_sold.php'; $ledger=new Acc_Ledger_Sold($this->db,$this->jrn_def_id); $flag_tva=$g_parameter->MY_TVA_USE; diff --git a/include/class_pre_operation.php b/include/class/class_pre_operation.php similarity index 97% rename from include/class_pre_operation.php rename to include/class/class_pre_operation.php index a0c13b9d3..60b031a23 100644 --- a/include/class_pre_operation.php +++ b/include/class/class_pre_operation.php @@ -27,11 +27,11 @@ * and op_def_detail * */ -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_pre_op_ach.php'; -require_once NOALYSS_INCLUDE.'/class_pre_op_ven.php'; -require_once NOALYSS_INCLUDE.'/class_pre_op_advanced.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_op_ach.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_op_ven.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_op_advanced.php'; class Pre_operation { var $db; /*!< $db database connection */ diff --git a/include/class_print_ledger.php b/include/class/class_print_ledger.php similarity index 91% rename from include/class_print_ledger.php rename to include/class/class_print_ledger.php index d1435034e..90403eda1 100644 --- a/include/class_print_ledger.php +++ b/include/class/class_print_ledger.php @@ -23,13 +23,13 @@ * * @author danydb */ -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_print_ledger_detail.php'; -require_once NOALYSS_INCLUDE.'/class_print_ledger_simple.php'; -require_once NOALYSS_INCLUDE.'/class_print_ledger_simple_without_vat.php'; -require_once NOALYSS_INCLUDE.'/class_print_ledger_fin.php'; -require_once NOALYSS_INCLUDE.'/class_print_ledger_misc.php'; -require_once NOALYSS_INCLUDE.'/class_print_ledger_detail_item.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_print_ledger_detail.php'; +require_once NOALYSS_INCLUDE.'/class/class_print_ledger_simple.php'; +require_once NOALYSS_INCLUDE.'/class/class_print_ledger_simple_without_vat.php'; +require_once NOALYSS_INCLUDE.'/class/class_print_ledger_fin.php'; +require_once NOALYSS_INCLUDE.'/class/class_print_ledger_misc.php'; +require_once NOALYSS_INCLUDE.'/class/class_print_ledger_detail_item.php'; /** * @brief Strategie class for the print_ledger class diff --git a/include/class_print_ledger_detail.php b/include/class/class_print_ledger_detail.php similarity index 99% rename from include/class_print_ledger_detail.php rename to include/class/class_print_ledger_detail.php index 7806143b3..6b9031075 100644 --- a/include/class_print_ledger_detail.php +++ b/include/class/class_print_ledger_detail.php @@ -23,7 +23,7 @@ * \brief this class extends PDF and let you export the detailled printing * of any ledgers */ -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/lib/class_pdf.php'; class Print_Ledger_Detail extends PDF { diff --git a/include/class_print_ledger_detail_item.php b/include/class/class_print_ledger_detail_item.php similarity index 98% rename from include/class_print_ledger_detail_item.php rename to include/class/class_print_ledger_detail_item.php index 9bdcf8333..64c762009 100644 --- a/include/class_print_ledger_detail_item.php +++ b/include/class/class_print_ledger_detail_item.php @@ -23,8 +23,8 @@ * * @author danydb */ -require_once NOALYSS_INCLUDE.'/class_acc_ledger_sold.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_purchase.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_sold.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_purchase.php'; class Print_Ledger_Detail_Item extends PDFLand { public function __construct (Database $p_cn,Acc_Ledger $p_jrn) diff --git a/include/class_print_ledger_fin.php b/include/class/class_print_ledger_fin.php similarity index 98% rename from include/class_print_ledger_fin.php rename to include/class/class_print_ledger_fin.php index 99fe33672..21f56e6b4 100644 --- a/include/class_print_ledger_fin.php +++ b/include/class/class_print_ledger_fin.php @@ -22,7 +22,7 @@ /*!\file * \brief print a listing of financial */ -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/lib/class_pdf.php'; class Print_Ledger_Financial extends PDF { private $rap_amount; /* amount from begining exercice */ diff --git a/include/class_print_ledger_misc.php b/include/class/class_print_ledger_misc.php similarity index 98% rename from include/class_print_ledger_misc.php rename to include/class/class_print_ledger_misc.php index dcf34dbf0..6afa26dc6 100644 --- a/include/class_print_ledger_misc.php +++ b/include/class/class_print_ledger_misc.php @@ -22,7 +22,7 @@ /*!\file * \brief print a listing of financial */ -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/lib/class_pdf.php'; class Print_Ledger_Misc extends PDF { function __construct($p_cn,$p_jrn) diff --git a/include/class_print_ledger_simple.php b/include/class/class_print_ledger_simple.php similarity index 99% rename from include/class_print_ledger_simple.php rename to include/class/class_print_ledger_simple.php index 21a3ae3ce..2fafc0c72 100644 --- a/include/class_print_ledger_simple.php +++ b/include/class/class_print_ledger_simple.php @@ -23,7 +23,7 @@ * \brief this class extends PDF and let you export the detailled printing * of any ledgers */ -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/lib/class_pdf.php'; class Print_Ledger_Simple extends PDF { diff --git a/include/class_print_ledger_simple_without_vat.php b/include/class/class_print_ledger_simple_without_vat.php similarity index 99% rename from include/class_print_ledger_simple_without_vat.php rename to include/class/class_print_ledger_simple_without_vat.php index c56c0fdca..3430fd63c 100644 --- a/include/class_print_ledger_simple_without_vat.php +++ b/include/class/class_print_ledger_simple_without_vat.php @@ -23,7 +23,7 @@ * \brief this class extends PDF and let you export the detailled printing * of any ledgers */ -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/lib/class_pdf.php'; class Print_Ledger_Simple_Without_Vat extends PDF { diff --git a/include/class_profile_menu.php b/include/class/class_profile_menu.php similarity index 99% rename from include/class_profile_menu.php rename to include/class/class_profile_menu.php index 58de6dd88..e53f469a4 100644 --- a/include/class_profile_menu.php +++ b/include/class/class_profile_menu.php @@ -18,7 +18,7 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu -require_once NOALYSS_INCLUDE.'/class_profile_menu_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_profile_menu_sql.php'; /** * Manage the menu of a profile diff --git a/include/class_stock.php b/include/class/class_stock.php similarity index 99% rename from include/class_stock.php rename to include/class/class_stock.php index 611e625ca..76fcb430d 100644 --- a/include/class_stock.php +++ b/include/class/class_stock.php @@ -26,7 +26,7 @@ * * */ -require_once NOALYSS_INCLUDE.'/class_stock_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_stock_sql.php'; class Stock extends Stock_Sql { @@ -39,7 +39,7 @@ class Stock extends Stock_Sql { $sql = $this->create_query_histo($p_array); - require_once NOALYSS_INCLUDE.'/class_sort_table.php'; + require_once NOALYSS_INCLUDE.'/lib/class_sort_table.php'; $p_url = HtmlInput::get_to_string(array("gDossier", "ac", "wcard", "wdate_start", "wdate_end", "wrepo", "wamount_start", "wamount_end", "wcode_stock", "wdirection")); diff --git a/include/class_stock_goods.php b/include/class/class_stock_goods.php similarity index 97% rename from include/class_stock_goods.php rename to include/class/class_stock_goods.php index e1a0887c5..96a817ad3 100644 --- a/include/class_stock_goods.php +++ b/include/class/class_stock_goods.php @@ -25,7 +25,7 @@ * @brief Manage the goods * */ -require_once NOALYSS_INCLUDE.'/class_stock_goods_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_stock_goods_sql.php'; class Stock_Goods extends Stock_Goods_Sql { @@ -165,8 +165,9 @@ class Stock_Goods extends Stock_Goods_Sql } catch (Exception $exc) { - echo $exc->getTraceAsString(); - throw $exc; + error_log( $exc->getTraceAsString()); + echo $exc->getMessage(); + throw $exc; } } /** diff --git a/include/class_supplier.php b/include/class/class_supplier.php similarity index 86% rename from include/class_supplier.php rename to include/class/class_supplier.php index 1afca1395..4f008ee67 100644 --- a/include/class_supplier.php +++ b/include/class/class_supplier.php @@ -18,12 +18,12 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_acc_parm_code.php'; -require_once NOALYSS_INCLUDE.'/class_periode.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_parm_code.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; /*! \file * \brief Derived from class fiche Supplier are a specific kind of card */ diff --git a/include/class_tag.php b/include/class/class_tag.php similarity index 98% rename from include/class_tag.php rename to include/class/class_tag.php index ee49c6a85..81ce9c69a 100644 --- a/include/class_tag.php +++ b/include/class/class_tag.php @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // Copyright Author Dany De Bontridder danydb@aevalys.eu -require_once NOALYSS_INCLUDE.'/class_tag_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_tag_sql.php'; class Tag { diff --git a/include/class_todo_list.php b/include/class/class_todo_list.php similarity index 98% rename from include/class_todo_list.php rename to include/class/class_todo_list.php index 24ac21678..9c32c4cdd 100644 --- a/include/class_todo_list.php +++ b/include/class/class_todo_list.php @@ -23,7 +23,7 @@ * \brief the todo list is managed by this class */ -require_once NOALYSS_INCLUDE.'/function_javascript.php'; +require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; /*!\brief * This class manages the table todo_list @@ -292,7 +292,7 @@ class Todo_List { ob_start(); $this->load(); - include 'template/todo_list_display.php'; + include NOALYSS_INCLUDE.'/template/todo_list_display.php'; $ret=ob_get_clean(); return $ret; @@ -373,7 +373,7 @@ class Todo_List // Get array of user $p_array=User::get_list(Dossier::id()); $dossier=Dossier::id(); - include 'template/todo_list_list_user.php'; + include NOALYSS_INCLUDE.'/template/todo_list_list_user.php'; } /** diff --git a/include/class_user.php b/include/class/class_user.php similarity index 99% rename from include/class_user.php rename to include/class/class_user.php index c16630372..5a1f7051c 100644 --- a/include/class_user.php +++ b/include/class/class_user.php @@ -29,9 +29,9 @@ */ require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; class User { @@ -1055,7 +1055,7 @@ class User $Res = $cn->exec_sql("select distinct dos_id,dos_name,dos_description from ac_dossier where dos_name ~* $1 or dos_description ~* $1 order by dos_name", array($p_filter)); } - require_once NOALYSS_INCLUDE.'/class_database.php'; + require_once NOALYSS_INCLUDE.'/lib/class_database.php'; $max = Database::num_row($Res); if ($max == 0) diff --git a/include/company.inc.php b/include/company.inc.php index ff1152bdb..ce82c3b94 100644 --- a/include/company.inc.php +++ b/include/company.inc.php @@ -21,7 +21,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); global $g_user; echo '
    '; -require_once NOALYSS_INCLUDE.'/class_own.php'; +require_once NOALYSS_INCLUDE.'/class/class_own.php'; if (isset($_POST['record_company'])) { $m = new Own($cn); diff --git a/include/compta_ach.inc.php b/include/compta_ach.inc.php index f4f310487..6e321a9af 100644 --- a/include/compta_ach.inc.php +++ b/include/compta_ach.inc.php @@ -25,13 +25,13 @@ * \brief file included to manage all the sold operation */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_purchase.php'; -require_once NOALYSS_INCLUDE.'/class_pre_op_ach.php'; -require_once NOALYSS_INCLUDE.'/class_ipopup.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_purchase.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_op_ach.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ipopup.php'; $gDossier = dossier::id(); global $g_parameter; -$cn = new Database(dossier::id()); +$cn = Dossier::connect(); //menu = show a list of ledger $str_dossier = dossier::get(); $ac = "ac=" . $_REQUEST['ac']; diff --git a/include/compta_fin.inc.php b/include/compta_fin.inc.php index f818bf5b2..136b567eb 100644 --- a/include/compta_fin.inc.php +++ b/include/compta_fin.inc.php @@ -23,14 +23,14 @@ * \brief this file is to be included to handle the financial ledger */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_acc_ledger_fin.php'; -require_once NOALYSS_INCLUDE.'/class_ipopup.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_fin.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ipopup.php'; global $g_user,$g_parameter; $gDossier=dossier::id(); -$cn=new Database(dossier::id()); +$cn=Dossier::connect(); $menu_action="?ledger_type=fin&ac=".$_REQUEST['ac']."&".dossier::get(); $Ledger=new Acc_Ledger_Fin($cn,0); diff --git a/include/compta_fin_rec.inc.php b/include/compta_fin_rec.inc.php index 080f6f5c7..687f72297 100644 --- a/include/compta_fin_rec.inc.php +++ b/include/compta_fin_rec.inc.php @@ -28,7 +28,7 @@ */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); global $g_failed,$g_succeed; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_fin.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_fin.php'; bcscale(2); echo '
    '; $Ledger = new Acc_Ledger_Fin($cn, 0); diff --git a/include/compta_fin_saldo.inc.php b/include/compta_fin_saldo.inc.php index 48e285ee3..89a2bc4af 100644 --- a/include/compta_fin_saldo.inc.php +++ b/include/compta_fin_saldo.inc.php @@ -27,7 +27,7 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_acc_parm_code.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_parm_code.php'; echo '
    '; $fiche=new Fiche($cn); diff --git a/include/compta_ods.inc.php b/include/compta_ods.inc.php index a760c3f9c..bf1197d69 100644 --- a/include/compta_ods.inc.php +++ b/include/compta_ods.inc.php @@ -27,17 +27,17 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_acc_reconciliation.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_periode.php'; -require_once NOALYSS_INCLUDE.'/function_javascript.php'; -require_once NOALYSS_INCLUDE.'/class_ipopup.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_reconciliation.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; +require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ipopup.php'; global $g_user; -$cn = new Database(dossier::id()); +$cn = Dossier::connect(); $id_predef = (isset($_REQUEST['p_jrn_predef'])) ? $_REQUEST['p_jrn_predef'] : -1; $id_ledger = (isset($_REQUEST['p_jrn'])) ? $_REQUEST['p_jrn'] : $id_predef; @@ -76,7 +76,7 @@ elseif (isset($_POST['summary'])) { echo alert($e->getMessage()); $p_msg=$e->getMessage(); - require('operation_ods_new.inc.php'); + require_once NOALYSS_INCLUDE.'/operation_ods_new.inc.php'; } return; diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php index 13029b4fb..a5cf6851c 100644 --- a/include/compta_ven.inc.php +++ b/include/compta_ven.inc.php @@ -23,15 +23,15 @@ * \brief file included to manage all the sold operation */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_sold.php'; -require_once NOALYSS_INCLUDE.'/class_pre_op_ven.php'; -require_once NOALYSS_INCLUDE.'/class_document.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_info.php'; -require_once NOALYSS_INCLUDE.'/class_ipopup.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_sold.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_op_ven.php'; +require_once NOALYSS_INCLUDE.'/class/class_document.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_info.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ipopup.php'; $gDossier=dossier::id(); -$cn=new Database(dossier::id()); +$cn=Dossier::connect(); //menu = show a list of ledger $str_dossier=dossier::get(); $ac="ac=".$_REQUEST['ac']; diff --git a/include/config_file.php b/include/config_file.php index 11a82f782..432ff9c05 100644 --- a/include/config_file.php +++ b/include/config_file.php @@ -23,9 +23,9 @@ * \brief functions concerning the config file config.inc.php. The domain is not set into the form for security issues */ -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; function is_unix() { diff --git a/include/contact.inc.php b/include/contact.inc.php index 832fe003b..ab60a0539 100644 --- a/include/contact.inc.php +++ b/include/contact.inc.php @@ -21,11 +21,11 @@ * the contact category */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_contact.php'; -require_once NOALYSS_INCLUDE.'/class_ibutton.php'; -require_once NOALYSS_INCLUDE.'/class_fiche_def.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_contact.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ibutton.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_def.php'; diff --git a/include/customer.inc.php b/include/customer.inc.php index 66beaed74..f08255646 100644 --- a/include/customer.inc.php +++ b/include/customer.inc.php @@ -22,11 +22,11 @@ * the customer category */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_customer.php'; -require_once NOALYSS_INCLUDE.'/class_ibutton.php'; -require_once NOALYSS_INCLUDE.'/class_fiche_def.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_customer.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ibutton.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_def.php'; diff --git a/include/dashboard.inc.php b/include/dashboard.inc.php index f9d5f441b..bd56d91f5 100644 --- a/include/dashboard.inc.php +++ b/include/dashboard.inc.php @@ -1,19 +1,19 @@ '; global $g_user; diff --git a/include/class_anc_key_sql.php b/include/database/class_anc_key_sql.php similarity index 98% rename from include/class_anc_key_sql.php rename to include/database/class_anc_key_sql.php index 07be1ed31..121284c93 100644 --- a/include/class_anc_key_sql.php +++ b/include/database/class_anc_key_sql.php @@ -23,7 +23,7 @@ * @brief Class to manage distribution keys for SQL. * */ -require_once NOALYSS_INCLUDE.'/class_noalyss_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_noalyss_sql.php'; /** diff --git a/include/class_default_menu_sql.php b/include/database/class_default_menu_sql.php similarity index 96% rename from include/class_default_menu_sql.php rename to include/database/class_default_menu_sql.php index 38292e161..3e96bac60 100644 --- a/include/class_default_menu_sql.php +++ b/include/database/class_default_menu_sql.php @@ -23,7 +23,7 @@ * * @author dany */ -require_once NOALYSS_INCLUDE.'/class_noalyss_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_noalyss_sql.php'; class Default_Menu_SQL extends Noalyss_SQL { diff --git a/include/class_jrn_def_sql.php b/include/database/class_jrn_def_sql.php similarity index 98% rename from include/class_jrn_def_sql.php rename to include/database/class_jrn_def_sql.php index 3008f3c0b..2ddb98bd0 100644 --- a/include/class_jrn_def_sql.php +++ b/include/database/class_jrn_def_sql.php @@ -28,8 +28,8 @@ @endcode */ -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; /** * @brief Manage the table public.jrn_def diff --git a/include/class_menu_ref_sql.php b/include/database/class_menu_ref_sql.php similarity index 92% rename from include/class_menu_ref_sql.php rename to include/database/class_menu_ref_sql.php index 0659e3454..9bd6b19d2 100644 --- a/include/class_menu_ref_sql.php +++ b/include/database/class_menu_ref_sql.php @@ -24,9 +24,9 @@ * * */ -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_noalyss_sql.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/database/class_noalyss_sql.php'; /** * @brief Manage the table public.menu_ref diff --git a/include/class_noalyss_sql.php b/include/database/class_noalyss_sql.php similarity index 100% rename from include/class_noalyss_sql.php rename to include/database/class_noalyss_sql.php diff --git a/include/class_profile_menu_sql.php b/include/database/class_profile_menu_sql.php similarity index 91% rename from include/class_profile_menu_sql.php rename to include/database/class_profile_menu_sql.php index 846ff1396..7b8006bd5 100644 --- a/include/class_profile_menu_sql.php +++ b/include/database/class_profile_menu_sql.php @@ -28,9 +28,9 @@ @endcode */ -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_noalyss_sql.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/database/class_noalyss_sql.php'; /** * @brief Manage the table public.profile_menu diff --git a/include/class_profile_sql.php b/include/database/class_profile_sql.php similarity index 90% rename from include/class_profile_sql.php rename to include/database/class_profile_sql.php index dba506d7f..82d14fc38 100644 --- a/include/class_profile_sql.php +++ b/include/database/class_profile_sql.php @@ -28,9 +28,9 @@ @endcode */ -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_noalyss_sql.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/database/class_noalyss_sql.php'; /** * @brief Manage the table public.profile diff --git a/include/class_stock_goods_sql.php b/include/database/class_stock_goods_sql.php similarity index 97% rename from include/class_stock_goods_sql.php rename to include/database/class_stock_goods_sql.php index 4ec94240d..6c5925bbb 100644 --- a/include/class_stock_goods_sql.php +++ b/include/database/class_stock_goods_sql.php @@ -25,7 +25,7 @@ * @brief * */ -require_once NOALYSS_INCLUDE.'/class_noalyss_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_noalyss_sql.php'; class Stock_Goods_Sql extends Noalyss_SQL { diff --git a/include/class_stock_sql.php b/include/database/class_stock_sql.php similarity index 95% rename from include/class_stock_sql.php rename to include/database/class_stock_sql.php index 2d36dbe6c..c227b7870 100644 --- a/include/class_stock_sql.php +++ b/include/database/class_stock_sql.php @@ -25,7 +25,7 @@ * @brief * */ -require_once NOALYSS_INCLUDE.'/class_noalyss_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_noalyss_sql.php'; class Stock_Sql extends Noalyss_SQL { function __construct($cn,$p_id=-1) diff --git a/include/class_tag_sql.php b/include/database/class_tag_sql.php similarity index 89% rename from include/class_tag_sql.php rename to include/database/class_tag_sql.php index 149248c55..191ead8c7 100644 --- a/include/class_tag_sql.php +++ b/include/database/class_tag_sql.php @@ -1,7 +1,7 @@ '; @@ -35,7 +35,7 @@ $doc=new Document_modele($cn); //----------------------------------------------------- if ( $sub_action=='add_document') { - require_once NOALYSS_INCLUDE.'/class_document_modele.php'; + require_once NOALYSS_INCLUDE.'/class/class_document_modele.php'; $doc=new Document_modele($cn); $doc->md_name=$_POST['md_name']; $doc->md_id=-1; // because it is a new model @@ -49,7 +49,7 @@ if ( $sub_action=='add_document') //----------------------------------------------------- if ( $sub_action=='rm_template') { - require_once NOALYSS_INCLUDE.'/class_document_modele.php'; + require_once NOALYSS_INCLUDE.'/class/class_document_modele.php'; // Get all the document to remove foreach ( $_POST as $name=>$value ) @@ -68,7 +68,7 @@ if ( $sub_action=='rm_template') //---------------------------------------------------------------------- if ( $sub_action == 'mod_template') { - require_once NOALYSS_INCLUDE.'/class_document_modele.php'; + require_once NOALYSS_INCLUDE.'/class/class_document_modele.php'; $doc=new Document_modele($cn,$_POST['id']); $doc->update($_POST); } diff --git a/include/dossier.inc.php b/include/dossier.inc.php index f1d9bd7c8..569bacb6d 100644 --- a/include/dossier.inc.php +++ b/include/dossier.inc.php @@ -23,10 +23,10 @@ if ( !defined ('ALLOWED')) die('Forbidden'); * \brief Management of the folder * */ -require_once NOALYSS_INCLUDE.'/class_itext.php'; -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_itextarea.php'; -require_once NOALYSS_INCLUDE.'/class_html_input.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itext.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/lib/class_itextarea.php'; +require_once NOALYSS_INCLUDE.'/lib/class_html_input.php'; $sa=(isset($_REQUEST['sa']))?$_REQUEST['sa']:'list'; //--------------------------------------------------------------------------- @@ -208,7 +208,7 @@ if ( isset ($_POST["DATABASE"]) ) // List of folder if ( $sa == 'list' ) { - require_once NOALYSS_INCLUDE.'/class_sort_table.php'; + require_once NOALYSS_INCLUDE.'/lib/class_sort_table.php'; echo '

    '; echo HtmlInput::button(_('Ajouter'),_('Ajouter un dossier')," onclick=\$('folder_add_id').show()"); echo '

    '; diff --git a/include/export_anc_acc_list_csv.php b/include/export/export_anc_acc_list_csv.php similarity index 94% rename from include/export_anc_acc_list_csv.php rename to include/export/export_anc_acc_list_csv.php index e58d0c238..3269007b9 100644 --- a/include/export_anc_acc_list_csv.php +++ b/include/export/export_anc_acc_list_csv.php @@ -28,7 +28,7 @@ header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="export-anc-list.csv"',FALSE); -require_once NOALYSS_INCLUDE.'/class_anc_acc_list.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_acc_list.php'; $bal=new Anc_Acc_List($cn); diff --git a/include/export_anc_balance_double_csv.php b/include/export/export_anc_balance_double_csv.php similarity index 92% rename from include/export_anc_balance_double_csv.php rename to include/export/export_anc_balance_double_csv.php index 635a1572a..067f85fc0 100644 --- a/include/export_anc_balance_double_csv.php +++ b/include/export/export_anc_balance_double_csv.php @@ -31,9 +31,9 @@ header('Content-type: application/csv'); header('Pragma: public'); header('Content-Disposition: attachment;filename="ca_bal_croise.csv"',FALSE); -require_once NOALYSS_INCLUDE.'/class_anc_balance_double.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_balance_double.php'; -$cn=new Database(dossier::id()); +$cn=Dossier::connect(); $bal=new Anc_Balance_Double($cn); $bal->get_request(); diff --git a/include/export_anc_balance_double_pdf.php b/include/export/export_anc_balance_double_pdf.php similarity index 91% rename from include/export_anc_balance_double_pdf.php rename to include/export/export_anc_balance_double_pdf.php index 012c68f37..65db9337e 100644 --- a/include/export_anc_balance_double_pdf.php +++ b/include/export/export_anc_balance_double_pdf.php @@ -23,10 +23,10 @@ * \brief export the operation in pdf */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_anc_balance_double.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_balance_double.php'; require_once NOALYSS_INCLUDE.'/header_print.php'; -$cn=new Database(dossier::id()); +$cn=Dossier::connect(); $balance=new Anc_Balance_Double($cn); diff --git a/include/export_anc_balance_group_csv.php b/include/export/export_anc_balance_group_csv.php similarity index 95% rename from include/export_anc_balance_group_csv.php rename to include/export/export_anc_balance_group_csv.php index fed3c0015..611df20a7 100644 --- a/include/export_anc_balance_group_csv.php +++ b/include/export/export_anc_balance_group_csv.php @@ -23,7 +23,7 @@ * \brief export balance by group */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_anc_group.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_group.php'; header('Pragma: public'); header('Content-type: application/csv'); diff --git a/include/export_anc_balance_simple_csv.php b/include/export/export_anc_balance_simple_csv.php similarity index 92% rename from include/export_anc_balance_simple_csv.php rename to include/export/export_anc_balance_simple_csv.php index d97c87cb5..5a948c8ff 100644 --- a/include/export_anc_balance_simple_csv.php +++ b/include/export/export_anc_balance_simple_csv.php @@ -27,9 +27,9 @@ header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="ca_bal_simple.csv"',FALSE); -require_once NOALYSS_INCLUDE.'/class_anc_balance_simple.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_balance_simple.php'; -$cn=new Database(dossier::id()); +$cn=Dossier::connect(); $bal=new Anc_Balance_Simple($cn); $bal->get_request(); diff --git a/include/export_anc_balance_simple_pdf.php b/include/export/export_anc_balance_simple_pdf.php similarity index 91% rename from include/export_anc_balance_simple_pdf.php rename to include/export/export_anc_balance_simple_pdf.php index edaa0c71d..5f55cee73 100644 --- a/include/export_anc_balance_simple_pdf.php +++ b/include/export/export_anc_balance_simple_pdf.php @@ -24,9 +24,9 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_anc_balance_simple.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_balance_simple.php'; -$cn=new Database(dossier::id()); +$cn=Dossier::connect(); $balance=new Anc_Balance_Simple($cn); diff --git a/include/export_anc_grandlivre_csv.php b/include/export/export_anc_grandlivre_csv.php similarity index 94% rename from include/export_anc_grandlivre_csv.php rename to include/export/export_anc_grandlivre_csv.php index 403f69063..c5564b17f 100644 --- a/include/export_anc_grandlivre_csv.php +++ b/include/export/export_anc_grandlivre_csv.php @@ -23,7 +23,7 @@ header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="anc-grand-livre.csv"',FALSE); -require_once NOALYSS_INCLUDE.'/class_anc_grandlivre.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_grandlivre.php'; $cn=Dossier::connect(); diff --git a/include/export_anc_list_csv.php b/include/export/export_anc_list_csv.php similarity index 92% rename from include/export_anc_list_csv.php rename to include/export/export_anc_list_csv.php index 569bb0de9..5d08e3431 100644 --- a/include/export_anc_list_csv.php +++ b/include/export/export_anc_list_csv.php @@ -28,9 +28,9 @@ header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="jrn.csv"',FALSE); -require_once NOALYSS_INCLUDE.'/class_anc_listing.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_listing.php'; -$cn=new Database(dossier::id()); +$cn=Dossier::connect(); $bal=new Anc_Listing($cn); $bal->get_request(); diff --git a/include/export_anc_receipt_pdf.php b/include/export/export_anc_receipt_pdf.php similarity index 94% rename from include/export_anc_receipt_pdf.php rename to include/export/export_anc_receipt_pdf.php index 7025f40d2..88b642fee 100644 --- a/include/export_anc_receipt_pdf.php +++ b/include/export/export_anc_receipt_pdf.php @@ -27,7 +27,7 @@ if (!defined('ALLOWED')) /** * export all the selected documents for Ana Accountancy in PDF */ -require_once NOALYSS_INCLUDE.'/class_document_export.php'; +require_once NOALYSS_INCLUDE.'/class/class_document_export.php'; $ck = HtmlInput::default_value_get('ck', 0); if ($ck == 0) diff --git a/include/export_anc_table_csv.php b/include/export/export_anc_table_csv.php similarity index 95% rename from include/export_anc_table_csv.php rename to include/export/export_anc_table_csv.php index 9a3fd8dca..cbf064b42 100644 --- a/include/export_anc_table_csv.php +++ b/include/export/export_anc_table_csv.php @@ -27,7 +27,7 @@ header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="anc-table-export.csv"',FALSE); -require_once NOALYSS_INCLUDE.'/class_anc_table.php'; +require_once NOALYSS_INCLUDE.'/class/class_anc_table.php'; $atable=new Anc_Table($cn); $atable->get_request(); $atable->export_csv(); diff --git a/include/export_balance_age_csv.php b/include/export/export_balance_age_csv.php similarity index 98% rename from include/export_balance_age_csv.php rename to include/export/export_balance_age_csv.php index cac21b304..023dd4731 100644 --- a/include/export_balance_age_csv.php +++ b/include/export/export_balance_age_csv.php @@ -21,7 +21,7 @@ if (!defined('ALLOWED')) die('Appel direct ne sont pas permis'); -require 'class_balance_age.php'; +require 'class/class_balance_age.php'; header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="balance_age.csv"',FALSE); diff --git a/include/export_balance_csv.php b/include/export/export_balance_csv.php similarity index 89% rename from include/export_balance_csv.php rename to include/export/export_balance_csv.php index cb3303d31..805a42df3 100644 --- a/include/export_balance_csv.php +++ b/include/export/export_balance_csv.php @@ -24,17 +24,17 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="balance.csv"',FALSE); -include_once ("ac_common.php"); -include_once("class_acc_balance.php"); -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +include_once ("lib/ac_common.php"); +include_once("class/class_acc_balance.php"); +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier=dossier::id(); -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; -$cn=new Database($gDossier); +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; +$cn=Dossier::connect(); bcscale(2); -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; $bal=new Acc_Balance($cn); $bal->jrn=null; diff --git a/include/export_balance_pdf.php b/include/export/export_balance_pdf.php similarity index 96% rename from include/export_balance_pdf.php rename to include/export/export_balance_pdf.php index 1620aa024..e7c7cdc6d 100644 --- a/include/export_balance_pdf.php +++ b/include/export/export_balance_pdf.php @@ -30,17 +30,17 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -include_once("ac_common.php"); -require_once NOALYSS_INCLUDE.'/class_database.php'; -include_once("class_acc_balance.php"); +include_once("lib/ac_common.php"); +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +include_once("class/class_acc_balance.php"); require_once NOALYSS_INCLUDE.'/header_print.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_pdf.php'; $gDossier=dossier::id(); bcscale(4); -$cn=new Database($gDossier); +$cn=Dossier::connect(); $rep=new Database(); -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; $g_user->Check(); $bal=new Acc_Balance($cn); diff --git a/include/export_bilan_oth.php b/include/export/export_bilan_oth.php similarity index 84% rename from include/export_bilan_oth.php rename to include/export/export_bilan_oth.php index a4c2ebee1..f4767ea10 100644 --- a/include/export_bilan_oth.php +++ b/include/export/export_bilan_oth.php @@ -21,18 +21,18 @@ * \brief send a Bilan in RTF format */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -include_once("ac_common.php"); -include_once("class_impress.php"); -require_once NOALYSS_INCLUDE.'/class_database.php'; +include_once("lib/ac_common.php"); +include_once("lib/class_impress.php"); +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; require_once NOALYSS_INCLUDE.'/header_print.php'; -require_once NOALYSS_INCLUDE.'/class_acc_bilan.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_bilan.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier=dossier::id(); /* Admin. Dossier */ -$cn=new Database($gDossier); +$cn=Dossier::connect(); $bilan=new Acc_Bilan($cn); $bilan->get_request_get(); diff --git a/include/export_fiche_balance_csv.php b/include/export/export_fiche_balance_csv.php similarity index 96% rename from include/export_fiche_balance_csv.php rename to include/export/export_fiche_balance_csv.php index 45886783a..3b9b47fca 100644 --- a/include/export_fiche_balance_csv.php +++ b/include/export/export_fiche_balance_csv.php @@ -29,10 +29,10 @@ header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="bal-fiche.csv"',FALSE); // Security we check if user does exist and his privilege -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; $allcard=(isset($_GET['allcard']))?1:0; /* balance */ diff --git a/include/export_fiche_balance_pdf.php b/include/export/export_fiche_balance_pdf.php similarity index 96% rename from include/export_fiche_balance_pdf.php rename to include/export/export_fiche_balance_pdf.php index c60f58ae5..a31347c71 100644 --- a/include/export_fiche_balance_pdf.php +++ b/include/export/export_fiche_balance_pdf.php @@ -25,16 +25,16 @@ */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); // Security we check if user does exist and his privilege -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_pdf.php'; -require_once NOALYSS_INCLUDE.'/class_lettering.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/class/class_lettering.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; /* Security */ $gDossier=dossier::id(); -$cn=new Database($gDossier); +$cn=Dossier::connect(); $g_user->Check(); $g_user->check_dossier($gDossier); $name=$cn->get_value('select fd_label from fiche_def where fd_id=$1',array($_GET['cat'])); diff --git a/include/export_fiche_csv.php b/include/export/export_fiche_csv.php similarity index 88% rename from include/export_fiche_csv.php rename to include/export/export_fiche_csv.php index aff85a612..ee957bd8b 100644 --- a/include/export_fiche_csv.php +++ b/include/export/export_fiche_csv.php @@ -24,15 +24,15 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="fiche.csv"',FALSE); -include_once ("ac_common.php"); -include_once('class_fiche.php'); -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +include_once ("lib/ac_common.php"); +include_once('class/class_fiche.php'); +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier=dossier::id(); -$cn=new Database($gDossier); +$cn=Dossier::connect(); -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; diff --git a/include/export_fiche_detail_csv.php b/include/export/export_fiche_detail_csv.php similarity index 95% rename from include/export_fiche_detail_csv.php rename to include/export/export_fiche_detail_csv.php index ad6c00e5c..286e63a9b 100644 --- a/include/export_fiche_detail_csv.php +++ b/include/export/export_fiche_detail_csv.php @@ -21,18 +21,18 @@ * \brief Send the poste list in csv */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -include_once("ac_common.php"); -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; +include_once("lib/ac_common.php"); +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; $f_id=HtmlInput::default_value_request("f_id", "-"); if ( $f_id == "-") { throw new Exception ('Invalid parameter'); } -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier=dossier::id(); /* Admin. Dossier */ -$cn=new Database($gDossier); +$cn=Dossier::connect(); $Fiche=new Fiche($cn,$f_id); diff --git a/include/export_fiche_detail_pdf.php b/include/export/export_fiche_detail_pdf.php similarity index 94% rename from include/export_fiche_detail_pdf.php rename to include/export/export_fiche_detail_pdf.php index 73d5d1504..a0b6d4031 100644 --- a/include/export_fiche_detail_pdf.php +++ b/include/export/export_fiche_detail_pdf.php @@ -23,17 +23,17 @@ * \brief send the account list in PDF */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -include_once("class_acc_account_ledger.php"); -include_once("ac_common.php"); -require_once NOALYSS_INCLUDE.'/class_database.php'; -include_once("class_impress.php"); -require_once NOALYSS_INCLUDE.'/class_fiche.php'; +include_once("class/class_acc_account_ledger.php"); +include_once("lib/ac_common.php"); +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +include_once("lib/class_impress.php"); +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; require_once NOALYSS_INCLUDE.'/header_print.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_pdf.php'; $gDossier=dossier::id(); -$cn=new Database($gDossier); +$cn=Dossier::connect(); extract($_GET); diff --git a/include/export_fiche_pdf.php b/include/export/export_fiche_pdf.php similarity index 95% rename from include/export_fiche_pdf.php rename to include/export/export_fiche_pdf.php index 73c4925ce..3d1a93bf0 100644 --- a/include/export_fiche_pdf.php +++ b/include/export/export_fiche_pdf.php @@ -25,16 +25,16 @@ */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); // Security we check if user does exist and his privilege -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_pdf.php'; -require_once NOALYSS_INCLUDE.'/class_lettering.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/class/class_lettering.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; /* Security */ $gDossier=dossier::id(); -$cn=new Database($gDossier); +$cn=Dossier::connect(); $g_user->Check(); $g_user->check_dossier($gDossier); diff --git a/include/export_follow_up_csv.php b/include/export/export_follow_up_csv.php similarity index 95% rename from include/export_follow_up_csv.php rename to include/export/export_follow_up_csv.php index 0fa1323f1..3f40aceb3 100644 --- a/include/export_follow_up_csv.php +++ b/include/export/export_follow_up_csv.php @@ -26,7 +26,7 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_follow_up.php'; +require_once NOALYSS_INCLUDE.'/class/class_follow_up.php'; header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="action-gestion.csv"',FALSE); diff --git a/include/export_form_csv.php b/include/export/export_form_csv.php similarity index 87% rename from include/export_form_csv.php rename to include/export/export_form_csv.php index 6fb205cab..ed26bcb3f 100644 --- a/include/export_form_csv.php +++ b/include/export/export_form_csv.php @@ -21,20 +21,20 @@ * \brief Send a report in CSV format */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_acc_report.php'; -require_once NOALYSS_INCLUDE.'/class_impress.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_report.php'; +require_once NOALYSS_INCLUDE.'/lib/class_impress.php'; header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="rapport.csv"',FALSE); -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier=dossier::id(); /* Admin. Dossier */ -$cn=new Database($gDossier); +$cn=Dossier::connect(); $Form=new Acc_Report($cn,$_GET['form_id']); $Form->get_name(); diff --git a/include/export_form_pdf.php b/include/export/export_form_pdf.php similarity index 88% rename from include/export_form_pdf.php rename to include/export/export_form_pdf.php index 5bb8e12cf..226111118 100644 --- a/include/export_form_pdf.php +++ b/include/export/export_form_pdf.php @@ -23,19 +23,19 @@ * \brief Send a report in PDF */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -include_once("class_acc_report.php"); -include_once("ac_common.php"); -require_once NOALYSS_INCLUDE.'/class_database.php'; -include_once("class_impress.php"); -require_once NOALYSS_INCLUDE.'/class_user.php'; +include_once("class/class_acc_report.php"); +include_once("lib/ac_common.php"); +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +include_once("lib/class_impress.php"); +require_once NOALYSS_INCLUDE.'/class/class_user.php'; require_once NOALYSS_INCLUDE.'/header_print.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_acc_report.php'; -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_report.php'; +require_once NOALYSS_INCLUDE.'/lib/class_pdf.php'; $gDossier=dossier::id(); -$cn=new Database($gDossier); +$cn=Dossier::connect(); extract($_GET); $ret=""; diff --git a/include/export_gl_csv.php b/include/export/export_gl_csv.php similarity index 94% rename from include/export_gl_csv.php rename to include/export/export_gl_csv.php index 2e40e610a..167cc3e25 100644 --- a/include/export_gl_csv.php +++ b/include/export/export_gl_csv.php @@ -23,13 +23,13 @@ * \brief create GL comptes as PDF */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -include_once('class_acc_account_ledger.php'); -include_once('ac_common.php'); -require_once NOALYSS_INCLUDE.'/class_database.php'; -include_once('class_impress.php'); -require_once NOALYSS_INCLUDE.'/class_own.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +include_once('class/class_acc_account_ledger.php'); +include_once('lib/ac_common.php'); +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +include_once('lib/class_impress.php'); +require_once NOALYSS_INCLUDE.'/class/class_own.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="gl_comptes.csv"',FALSE); @@ -39,7 +39,7 @@ header('Pragma: public'); $gDossier=dossier::id(); /* Security */ -$cn=new Database($gDossier); +$cn=Dossier::connect(); extract($_GET); diff --git a/include/export_gl_pdf.php b/include/export/export_gl_pdf.php similarity index 94% rename from include/export_gl_pdf.php rename to include/export/export_gl_pdf.php index eed2fe5bd..991cf911d 100644 --- a/include/export_gl_pdf.php +++ b/include/export/export_gl_pdf.php @@ -23,20 +23,20 @@ * \brief create GL comptes as PDF */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -include_once('class_acc_account_ledger.php'); -include_once('ac_common.php'); -require_once NOALYSS_INCLUDE.'/class_database.php'; -include_once('class_impress.php'); -require_once NOALYSS_INCLUDE.'/class_own.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +include_once('class/class_acc_account_ledger.php'); +include_once('lib/ac_common.php'); +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +include_once('lib/class_impress.php'); +require_once NOALYSS_INCLUDE.'/class/class_own.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_pdf.php'; bcscale(2); $gDossier=dossier::id(); /* Security */ -$cn=new Database($gDossier); +$cn=Dossier::connect(); $g_user->Check(); $g_user->check_dossier($gDossier); diff --git a/include/export_histo_csv.php b/include/export/export_histo_csv.php similarity index 100% rename from include/export_histo_csv.php rename to include/export/export_histo_csv.php diff --git a/include/export_ledger_csv.php b/include/export/export_ledger_csv.php similarity index 95% rename from include/export_ledger_csv.php rename to include/export/export_ledger_csv.php index a7f94ab1f..240f9c47f 100644 --- a/include/export_ledger_csv.php +++ b/include/export/export_ledger_csv.php @@ -25,15 +25,15 @@ $fDate = date('dmy-Hi'); header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="jrn-'.$fDate.'.csv"',FALSE); -include_once ("ac_common.php"); -require_once NOALYSS_INCLUDE.'/class_own.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_sold.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_purchase.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +include_once ("lib/ac_common.php"); +require_once NOALYSS_INCLUDE.'/class/class_own.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_sold.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_purchase.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier=dossier::id(); -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; /* * Variable from $_GET @@ -50,7 +50,7 @@ if ( $get_jrn ==-1 || $get_option == -1 || $get_from_periode == null || $get_to } -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; $g_user->Check(); $g_user->check_dossier($gDossier); diff --git a/include/export_ledger_pdf.php b/include/export/export_ledger_pdf.php similarity index 74% rename from include/export_ledger_pdf.php rename to include/export/export_ledger_pdf.php index 52f5ea92a..1f9c2b505 100644 --- a/include/export_ledger_pdf.php +++ b/include/export/export_ledger_pdf.php @@ -26,20 +26,20 @@ */ if (!defined('ALLOWED')) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier = dossier::id(); -require_once NOALYSS_INCLUDE.'/class_pdf.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_impress.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_own.php'; -require_once NOALYSS_INCLUDE.'/class_periode.php'; -require_once NOALYSS_INCLUDE.'/class_print_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_impress.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_own.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; +require_once NOALYSS_INCLUDE.'/class/class_print_ledger.php'; -$cn = new Database($gDossier); +$cn = Dossier::connect(); $periode = new Periode($cn); $l_type = "JRN"; diff --git a/include/export_poste_detail_csv.php b/include/export/export_poste_detail_csv.php similarity index 94% rename from include/export_poste_detail_csv.php rename to include/export/export_poste_detail_csv.php index c781a28e3..fda45529f 100644 --- a/include/export_poste_detail_csv.php +++ b/include/export/export_poste_detail_csv.php @@ -21,19 +21,19 @@ * \brief Send the poste list in csv */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; -require_once NOALYSS_INCLUDE.'/class_acc_operation.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_operation.php'; $fDate=date('dmy-Hi'); header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="poste-'.$fDate.'-'.$_REQUEST['poste_id'].'.csv"',FALSE); -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier=dossier::id(); /* Admin. Dossier */ -$cn=new Database($gDossier); +$cn=Dossier::connect(); if ( isset ( $_REQUEST['poste_fille']) ) { //choisit de voir tous les postes diff --git a/include/export_poste_detail_pdf.php b/include/export/export_poste_detail_pdf.php similarity index 95% rename from include/export_poste_detail_pdf.php rename to include/export/export_poste_detail_pdf.php index 3d055cbfc..a3f66ad7e 100644 --- a/include/export_poste_detail_pdf.php +++ b/include/export/export_poste_detail_pdf.php @@ -23,19 +23,19 @@ * \brief send the account list in PDF */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_impress.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_impress.php'; require_once NOALYSS_INCLUDE.'/header_print.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; -require_once NOALYSS_INCLUDE.'/class_pdf.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_pdf.php'; $gDossier=dossier::id(); /* Security */ -$cn=new Database($gDossier); +$cn=Dossier::connect(); extract($_GET); if ( isset ( $poste_fille) ) diff --git a/include/export_rec_csv.php b/include/export/export_rec_csv.php similarity index 81% rename from include/export_rec_csv.php rename to include/export/export_rec_csv.php index da719f587..00e3198eb 100644 --- a/include/export_rec_csv.php +++ b/include/export/export_rec_csv.php @@ -15,10 +15,10 @@ header('Pragma: public'); header('Content-type: application/csv'); header('Content-Disposition: attachment;filename="'.$filename.'.csv"',FALSE); -require_once NOALYSS_INCLUDE.'/class_acc_reconciliation.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_reconciliation.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; // -------------------------- // Check if all mandatory arg are passed foreach (array('choice','p_end','p_start') as $arg) diff --git a/include/export_reportinit_csv.php b/include/export/export_reportinit_csv.php similarity index 83% rename from include/export_reportinit_csv.php rename to include/export/export_reportinit_csv.php index a078693d7..139f9481e 100644 --- a/include/export_reportinit_csv.php +++ b/include/export/export_reportinit_csv.php @@ -25,11 +25,11 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/user_common.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/class_acc_report.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/user_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_report.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; if ( ! isset($_GET['gDossier']) || ! isset($_GET['f']) ) { @@ -45,7 +45,7 @@ if ( ! is_dir('tmp') ) mkdir ('tmp'); } -$cn=new Database($gDossier); +$cn=Dossier::connect(); $rap=new Acc_Report($cn,$_GET['f']); $file= fopen('php://output',"a+"); diff --git a/include/export_security_pdf.php b/include/export/export_security_pdf.php similarity index 93% rename from include/export_security_pdf.php rename to include/export/export_security_pdf.php index 667b6e015..cb2a39f6f 100755 --- a/include/export_security_pdf.php +++ b/include/export/export_security_pdf.php @@ -22,18 +22,18 @@ * \brief Print the user security in pdf */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; $gDossier=dossier::id(); -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_pdf.php'; -$cn=new Database($gDossier); +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_pdf.php'; +$cn=Dossier::connect(); //----------------------------------------------------- // Security // Check User $rep=new Database(); -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; $User=new User($rep); //----------------------------------------------------- diff --git a/include/export_stock_histo_csv.php b/include/export/export_stock_histo_csv.php similarity index 97% rename from include/export_stock_histo_csv.php rename to include/export/export_stock_histo_csv.php index e47b9a10d..33a629b2d 100644 --- a/include/export_stock_histo_csv.php +++ b/include/export/export_stock_histo_csv.php @@ -26,7 +26,7 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_stock.php'; +require_once NOALYSS_INCLUDE.'/class/class_stock.php'; $stock=new Stock($cn); $sql = $stock->create_query_histo($_GET); diff --git a/include/export_stock_resume_list.php b/include/export/export_stock_resume_list.php similarity index 98% rename from include/export_stock_resume_list.php rename to include/export/export_stock_resume_list.php index eccd5e781..51ca30ace 100644 --- a/include/export_stock_resume_list.php +++ b/include/export/export_stock_resume_list.php @@ -26,7 +26,7 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_stock.php'; +require_once NOALYSS_INCLUDE.'/class/class_stock.php'; global $cn; // var_dump($_GET); $stock=new Stock($cn); diff --git a/include/ext/dummy/dummy.php b/include/ext/dummy/dummy.php index 5def22b63..54906a83b 100755 --- a/include/ext/dummy/dummy.php +++ b/include/ext/dummy/dummy.php @@ -1,10 +1,10 @@ '; @html_page_start($_SESSION['g_theme']); -$cn=new Database(dossier::id()); +$cn=Dossier::connect(); global $g_user; $g_user=new User($cn); $g_user->check(); diff --git a/include/extension_get.inc.php b/include/extension_get.inc.php index 8ae3d4f34..f98d406fc 100644 --- a/include/extension_get.inc.php +++ b/include/extension_get.inc.php @@ -3,16 +3,16 @@ //see licence.txt if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/function_javascript.php'; -require_once NOALYSS_INCLUDE.'/class_extension.php'; -require_once NOALYSS_INCLUDE.'/class_html_input.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; +require_once NOALYSS_INCLUDE.'/class/class_extension.php'; +require_once NOALYSS_INCLUDE.'/lib/class_html_input.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; require_once NOALYSS_INCLUDE.'/constant.security.php'; -require_once NOALYSS_INCLUDE.'/class_user.php'; +require_once NOALYSS_INCLUDE.'/class/class_user.php'; /** * included from do.php + extension_choice.inc.php diff --git a/include/fiche.inc.php b/include/fiche.inc.php index 36b97cbd3..97a381244 100644 --- a/include/fiche.inc.php +++ b/include/fiche.inc.php @@ -22,12 +22,12 @@ * \brief printing of category of card : balance, historic */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_fiche.php'; -require_once NOALYSS_INCLUDE.'/class_lettering.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; +require_once NOALYSS_INCLUDE.'/class/class_lettering.php'; $gDossier = dossier::id(); -$cn = new Database($gDossier); +$cn = Dossier::connect(); global $g_user, $g_failed; ; @@ -282,7 +282,7 @@ if (isDate($_REQUEST['start']) == null || isDate($_REQUEST['end']) == null) /*************************************************************************************************************************/ if ( $_GET['histo'] == 6) { - require_once NOALYSS_INCLUDE.'/class_balance_age.php'; + require_once NOALYSS_INCLUDE.'/class/class_balance_age.php'; $bal=new Balance_Age($cn); $export_csv = ''; $export_csv .=HtmlInput::request_to_hidden(array('gDossier','ac','p_let','p_date_start')); @@ -318,7 +318,7 @@ if ( $_GET['histo'] == 6) /*************************************************************************************************************************/ if ( $_GET['histo'] == 7) { - require_once NOALYSS_INCLUDE.'/class_balance_age.php'; + require_once NOALYSS_INCLUDE.'/class/class_balance_age.php'; $bal=new Balance_Age($cn); $export_csv = ''; $export_csv .=HtmlInput::request_to_hidden(array('gDossier','ac','p_let','p_date_start')); diff --git a/include/fiche_def.inc.php b/include/fiche_def.inc.php index 789b83ece..6200eb2e9 100644 --- a/include/fiche_def.inc.php +++ b/include/fiche_def.inc.php @@ -18,8 +18,8 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_fiche_def.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_fiche_def.php'; /*! \file * \brief Let customise the fiche_def_ref for the user diff --git a/include/forecast.inc.php b/include/forecast.inc.php index 18836ccab..db7cfcf72 100644 --- a/include/forecast.inc.php +++ b/include/forecast.inc.php @@ -25,7 +25,7 @@ */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_anticipation.php'; +require_once NOALYSS_INCLUDE.'/class/class_anticipation.php'; $action=HtmlInput::default_value_get('action',''); echo '
    '; diff --git a/include/header_print.php b/include/header_print.php index d940f2bd3..382407f85 100644 --- a/include/header_print.php +++ b/include/header_print.php @@ -24,9 +24,9 @@ * */ -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_own.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/class/class_own.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; date_default_timezone_set ('Europe/Brussels'); diff --git a/include/history_operation.inc.php b/include/history_operation.inc.php index e08fca24b..8e615ae0e 100644 --- a/include/history_operation.inc.php +++ b/include/history_operation.inc.php @@ -28,10 +28,10 @@ * */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_acc_ledger_purchase.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_fin.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger_sold.php'; -require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_purchase.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_fin.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger_sold.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; global $g_user,$cn; $p_array = $_GET; $ledger_type=HtmlInput::default_value_get("ledger_type", 'ALL'); diff --git a/include/impress_bilan.inc.php b/include/impress_bilan.inc.php index 5eb256038..0a946eecb 100644 --- a/include/impress_bilan.inc.php +++ b/include/impress_bilan.inc.php @@ -17,8 +17,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_acc_bilan.php'; -require_once NOALYSS_INCLUDE.'/class_exercice.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_bilan.php'; +require_once NOALYSS_INCLUDE.'/class/class_exercice.php'; //ini_set("memory_limit","150M"); /*! \file @@ -31,7 +31,7 @@ require_once NOALYSS_INCLUDE.'/class_exercice.php'; //----------------------------------------------------- // Show the jrn and date //----------------------------------------------------- -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; global $g_user; //----------------------------------------------------- // Form diff --git a/include/impress_gl_comptes.inc.php b/include/impress_gl_comptes.inc.php index 015d62ada..1ae6dd126 100644 --- a/include/impress_gl_comptes.inc.php +++ b/include/impress_gl_comptes.inc.php @@ -18,11 +18,11 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_icard.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_acc_operation.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icard.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_operation.php'; /*! \file * \brief Print account (html or pdf) * file included from user_impress @@ -33,7 +33,7 @@ require_once NOALYSS_INCLUDE.'/class_acc_operation.php'; //----------------------------------------------------- // Show the jrn and date //----------------------------------------------------- -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; global $g_user; //----------------------------------------------------- // Form @@ -46,7 +46,7 @@ echo HtmlInput::hidden('type','gl_comptes'); echo dossier::hidden(); echo ''; -$cn=new Database(dossier::id()); +$cn=Dossier::connect(); $periode=new Periode($cn); $a=$periode->get_limit($g_user->get_exercice()); // $a is an array @@ -110,7 +110,7 @@ echo ''; //----------------------------------------------------- if ( isset( $_REQUEST['bt_html'] ) ) { - require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; + require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; echo '
    '; echo Acc_Account_Ledger::HtmlTableHeader("gl_comptes"); echo '
    '; diff --git a/include/impress_jrn.inc.php b/include/impress_jrn.inc.php index aefb0e5ba..56ad9c2f0 100644 --- a/include/impress_jrn.inc.php +++ b/include/impress_jrn.inc.php @@ -22,18 +22,18 @@ * \brief ask for Printing the ledger (pdf,html) */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_exercice.php'; -require_once NOALYSS_INCLUDE.'/class_dossier.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/class/class_exercice.php'; +require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; load_all_script(); $gDossier = dossier::id(); global $g_user; //----------------------------------------------------- // Show the jrn and date //----------------------------------------------------- -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; if ($g_user->Admin() == 0 && $g_user->is_local_admin() == 0) { @@ -145,7 +145,7 @@ echo '
    '; //----------------------------------------------------- if (isset($_REQUEST['bt_html'])) { - require_once NOALYSS_INCLUDE.'/class_acc_ledger.php'; + require_once NOALYSS_INCLUDE.'/class/class_acc_ledger.php'; $d = var_export($_GET, true); $Jrn = new Acc_Ledger($cn, $_GET['jrn_id']); @@ -379,16 +379,16 @@ if (isset($_REQUEST['bt_html'])) switch ($obj->signature) { case 'FIN': - require 'template/operation_detail_fin.php'; + require NOALYSS_INCLUDE.'/template/operation_detail_fin.php'; break; case 'ACH': - require 'template/operation_detail_ach.php'; + require NOALYSS_INCLUDE.'/template/operation_detail_ach.php'; break; case 'VEN': - require 'template/operation_detail_ven.php'; + require NOALYSS_INCLUDE.'/template/operation_detail_ven.php'; break; case 'ODS': - require 'template/operation_detail_misc.php'; + require NOALYSS_INCLUDE.'/template/operation_detail_misc.php'; break; default: die("unknown type of ledger"); diff --git a/include/impress_poste.inc.php b/include/impress_poste.inc.php index 9301503b4..8edf1fe28 100644 --- a/include/impress_poste.inc.php +++ b/include/impress_poste.inc.php @@ -18,11 +18,11 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_ispan.php'; -require_once NOALYSS_INCLUDE.'/class_icard.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_acc_operation.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ispan.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icard.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_operation.php'; /*! \file * \brief Print account (html or pdf) * file included from user_impress @@ -33,8 +33,8 @@ require_once NOALYSS_INCLUDE.'/class_acc_operation.php'; //----------------------------------------------------- // Show the jrn and date //----------------------------------------------------- -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/class_ipopup.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ipopup.php'; global $g_user; //----------------------------------------------------- @@ -129,7 +129,7 @@ if ( isset( $_REQUEST['bt_html'] ) ) echo alert(_('Date malformée, désolée')); return; } - require_once NOALYSS_INCLUDE.'/class_acc_account_ledger.php'; + require_once NOALYSS_INCLUDE.'/class/class_acc_account_ledger.php'; $go=0; // we ask a poste_id if ( isset($_GET['poste_id']) && strlen(trim($_GET['poste_id'])) != 0 ) @@ -149,7 +149,7 @@ if ( isset( $_REQUEST['bt_html'] ) ) } if ( strlen(trim($_GET['f_id'])) != 0 ) { - require_once NOALYSS_INCLUDE.'/class_fiche.php'; + require_once NOALYSS_INCLUDE.'/class/class_fiche.php'; // thanks the qcode we found the poste account $fiche=new Fiche($cn); $qcode=$fiche->get_by_qcode($_GET['f_id']); diff --git a/include/impress_rapport.inc.php b/include/impress_rapport.inc.php index d7dae649a..39a5245c6 100644 --- a/include/impress_rapport.inc.php +++ b/include/impress_rapport.inc.php @@ -23,11 +23,11 @@ * some variable are already defined ($cn, $g_user ...) */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_idate.php'; -require_once NOALYSS_INCLUDE.'/class_acc_report.php'; -require_once NOALYSS_INCLUDE.'/class_exercice.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_idate.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_report.php'; +require_once NOALYSS_INCLUDE.'/class/class_exercice.php'; global $g_user; //----------------------------------------------------- // If print is asked @@ -161,7 +161,7 @@ if ( isset( $_GET['bt_html'] ) ) //----------------------------------------------------- // Show the jrn and date //----------------------------------------------------- -require_once NOALYSS_INCLUDE.'/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; $ret=$cn->make_array("select fr_id,fr_label from formdef order by fr_label"); diff --git a/include/impress_rec.inc.php b/include/impress_rec.inc.php index 608f09da1..f24467313 100644 --- a/include/impress_rec.inc.php +++ b/include/impress_rec.inc.php @@ -23,8 +23,8 @@ * \brief print the all the operation reconciled or not, with or without the same amount */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_acc_reconciliation.php'; -require_once NOALYSS_INCLUDE.'/function_javascript.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_reconciliation.php'; +require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; global $g_user; /** diff --git a/include/lettering.account.inc.php b/include/lettering.account.inc.php index 6755924b9..80722594b 100644 --- a/include/lettering.account.inc.php +++ b/include/lettering.account.inc.php @@ -24,7 +24,7 @@ */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_lettering.php'; +require_once NOALYSS_INCLUDE.'/class/class_lettering.php'; echo '
    '; echo '
    '; diff --git a/include/periode.inc.php b/include/periode.inc.php index f7e285aa6..2cb074fb5 100644 --- a/include/periode.inc.php +++ b/include/periode.inc.php @@ -22,10 +22,10 @@ */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); $gDossier=dossier::id(); -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_periode.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/class/class_periode.php'; echo '
    '; -$cn=new Database($gDossier); +$cn=Dossier::connect(); //----------------------------------------------------- // Periode //----------------------------------------------------- diff --git a/include/poste.inc.php b/include/poste.inc.php index d140855d0..b9fee74a0 100644 --- a/include/poste.inc.php +++ b/include/poste.inc.php @@ -22,8 +22,8 @@ * action contains the sub action */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_acc_parm_code.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/class/class_acc_parm_code.php'; echo '
    '; $gDossier=dossier::id(); diff --git a/include/preod.inc.php b/include/preod.inc.php index b2c80288e..4cc88b621 100644 --- a/include/preod.inc.php +++ b/include/preod.inc.php @@ -23,12 +23,12 @@ * \brief included file for managing the predefined operation */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_iselect.php'; -require_once NOALYSS_INCLUDE.'/class_icheckbox.php'; -require_once NOALYSS_INCLUDE.'/class_ihidden.php'; -require_once NOALYSS_INCLUDE.'/class_database.php'; -require_once NOALYSS_INCLUDE.'/ac_common.php'; -require_once NOALYSS_INCLUDE.'/class_pre_operation.php'; +require_once NOALYSS_INCLUDE.'/lib/class_iselect.php'; +require_once NOALYSS_INCLUDE.'/lib/class_icheckbox.php'; +require_once NOALYSS_INCLUDE.'/lib/class_ihidden.php'; +require_once NOALYSS_INCLUDE.'/lib/class_database.php'; +require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE.'/class/class_pre_operation.php'; /* * Value from $_GET or $_REQUEST diff --git a/include/profile.inc.php b/include/profile.inc.php index 958b88638..eb5a38879 100644 --- a/include/profile.inc.php +++ b/include/profile.inc.php @@ -20,7 +20,7 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu if (!defined('ALLOWED')) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/class_profile_sql.php'; +require_once NOALYSS_INCLUDE.'/database/class_profile_sql.php'; global $cn; //********************************************** @@ -57,7 +57,8 @@ if (isset($_POST['change_profile'])) } catch (Exception $exc) { - echo $exc->getTraceAsString(); + echo $exc->getMessage(); + error_log( $exc->getTraceAsString()); throw $exc; } } @@ -95,7 +96,8 @@ if (isset($_POST['change_stock'])) } catch (Exception $exc) { - echo $exc->getTraceAsString(); + echo $exc->getMessage(); + error_log($exc->getTraceAsString()); throw $exc; } } @@ -400,7 +402,7 @@ echo '
    '; echo '
    '; if (isset($_POST['p_id'])) { - require_once NOALYSS_INCLUDE.'/ajax_get_profile.php'; + require_once NOALYSS_INCLUDE.'/ajax/ajax_get_profile.php'; ?>