From a99d1e16fe08802ae2585301ef7cd7e8c7c9aaec Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Wed, 24 Jul 2019 22:36:03 +0200 Subject: [PATCH 01/14] load_all must always return an array --- include/class/follow_up_detail.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/class/follow_up_detail.class.php b/include/class/follow_up_detail.class.php index e779bc750..fdb39abfd 100644 --- a/include/class/follow_up_detail.class.php +++ b/include/class/follow_up_detail.class.php @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ require_once NOALYSS_INCLUDE.'/class/fiche.class.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; // Copyright Author Dany De Bontridder danydb@aevalys.eu /*!\file @@ -152,7 +152,7 @@ class Follow_Up_Detail $sql, array($this->ag_id) ); - if ( $this->db->count() == 0 ) return; + if ( $this->db->count() == 0 ) return array(); $aRet=array(); for($i=0;$i Date: Wed, 24 Jul 2019 22:47:32 +0200 Subject: [PATCH 02/14] Code cleaning : split database into database (for noalyss) and databasecore , with the functions --- dev/SQL/index.php | 2 +- dev/SQL/template/script_sql.php | 2 +- html/ajax.php | 2 +- html/ajax_misc.php | 2 +- html/ajax_test.php | 2 +- html/compute.php | 2 +- html/direct.php | 2 +- html/do.php | 2 +- html/export.php | 2 +- html/extension.raw.php | 2 +- html/fid.php | 2 +- html/fid_card.php | 2 +- html/install.php | 2 +- html/login.php | 2 +- html/logout.php | 2 +- html/popup.php | 2 +- html/recherche.php | 2 +- html/test.php | 2 +- html/user_login.php | 2 +- include/admin_repo.inc.php | 2 +- include/ajax/ajax_anc_search.php | 2 +- include/ajax/ajax_auto_anc_card.php | 2 +- include/ajax/ajax_card.php | 2 +- include/ajax/ajax_get_receipt.php | 2 +- include/ajax/ajax_history.php | 2 +- include/ajax/ajax_ledger.php | 2 +- include/ajax/ajax_mod_document.php | 2 +- include/ajax/ajax_poste.php | 2 +- include/ajax/ajax_search_operation.php | 2 +- include/ajax/ajax_todo_list.php | 2 +- include/ajax/ajax_update_predef.php | 2 +- include/cfgfiche.inc.php | 2 +- include/cfgledger.inc.php | 2 +- include/class/acc_account.class.php | 2 +- include/class/acc_account_ledger.class.php | 2 +- include/class/acc_bilan.class.php | 2 +- include/class/acc_ledger_info.class.php | 2 +- include/class/acc_reconciliation.class.php | 2 +- include/class/acc_tva.class.php | 2 +- include/class/admin.class.php | 2 +- include/class/anc_group.class.php | 2 +- include/class/anc_group_operation.class.php | 2 +- include/class/anc_plan.class.php | 2 +- include/class/anc_print.class.php | 2 +- include/class/bank.class.php | 2 +- include/class/customer.class.php | 2 +- include/class/database.class.php | 116 +++ include/class/dossier.class.php | 2 +- include/class/exercice.class.php | 2 +- include/class/fiche_attr.class.php | 2 +- include/class/manager.class.php | 2 +- include/class/periode.class.php | 2 +- include/class/print_ledger.class.php | 2 +- include/class/supplier.class.php | 2 +- include/class/user.class.php | 2 +- include/database/fiche_def_ref_sql.class.php | 2 +- include/database/jrn_def_sql.class.php | 2 +- include/database/jrn_periode_sql.class.php | 2 +- include/database/menu_ref_sql.class.php | 2 +- include/database/parm_periode_sql.class.php | 2 +- .../database/poste_analytique_sql.class.php | 2 +- include/database/profile_menu_sql.class.php | 2 +- include/database/profile_sql.class.php | 2 +- include/database/tag_sql.class.php | 2 +- include/database/tva_rate_sql.class.php | 2 +- include/database/user_filter_sql.class.php | 2 +- include/database/v_tva_rate_sql.class.php | 2 +- include/export/export_balance_csv.php | 2 +- include/export/export_balance_pdf.php | 2 +- include/export/export_bilan_oth.php | 2 +- include/export/export_document_template.php | 2 +- include/export/export_fiche_balance_csv.php | 2 +- include/export/export_fiche_balance_pdf.php | 2 +- include/export/export_fiche_csv.php | 2 +- include/export/export_fiche_detail_csv.php | 2 +- include/export/export_fiche_detail_pdf.php | 2 +- include/export/export_fiche_pdf.php | 2 +- include/export/export_form_csv.php | 2 +- include/export/export_form_pdf.php | 2 +- include/export/export_gl_csv.php | 2 +- include/export/export_gl_pdf.php | 2 +- include/export/export_ledger_csv.php | 2 +- include/export/export_ledger_pdf.php | 2 +- include/export/export_poste_detail_csv.php | 2 +- include/export/export_poste_detail_pdf.php | 2 +- include/export/export_rec_csv.php | 2 +- include/export/export_receipt.php | 2 +- include/export/export_reportinit_csv.php | 2 +- include/export/export_security_pdf.php | 2 +- include/ext/dummy/dummy.php | 2 +- include/extension_choice.inc.php | 2 +- include/extension_get.inc.php | 2 +- include/fiche.inc.php | 2 +- include/header_print.php | 2 +- include/impress_bilan.inc.php | 2 +- include/impress_gl_comptes.inc.php | 2 +- include/impress_jrn.inc.php | 2 +- include/impress_poste.inc.php | 2 +- include/impress_rapport.inc.php | 2 +- include/lib/ac_common.php | 2 +- ...base.class.php => database_core.class.php} | 899 ++++++++---------- include/lib/single_record.class.php | 2 +- include/lib/user_common.php | 2 +- include/param_pcmn.inc.php | 2 +- include/param_sec.inc.php | 2 +- include/preod.inc.php | 2 +- include/recover.php | 4 +- include/report.inc.php | 2 +- include/user_detail.inc.php | 2 +- 109 files changed, 623 insertions(+), 608 deletions(-) create mode 100644 include/class/database.class.php rename include/lib/{database.class.php => database_core.class.php} (52%) diff --git a/dev/SQL/index.php b/dev/SQL/index.php index c6b1500f7..14a5a37cc 100644 --- a/dev/SQL/index.php +++ b/dev/SQL/index.php @@ -9,7 +9,7 @@ require_once '../../include/constant.php'; const REPOSITORY_DB=1; const ACCOUNT_DB=2; -require_once NOALYSS_INCLUDE."/lib/database.class.php"; +require_once NOALYSS_INCLUDE."/class/database.class.php"; require_once NOALYSS_INCLUDE."/lib/iselect.class.php"; require_once NOALYSS_INCLUDE."/lib/http_input.class.php"; diff --git a/dev/SQL/template/script_sql.php b/dev/SQL/template/script_sql.php index f162dd14c..f441edcc7 100644 --- a/dev/SQL/template/script_sql.php +++ b/dev/SQL/template/script_sql.php @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; /** diff --git a/html/ajax.php b/html/ajax.php index 1a24adc7a..5bf62668d 100644 --- a/html/ajax.php +++ b/html/ajax.php @@ -14,7 +14,7 @@ */ if ( ! defined ('ALLOWED') ) define ('ALLOWED',1); require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/lib/icon_action.class.php'; require_once NOALYSS_INCLUDE.'/class/user.class.php'; require_once NOALYSS_INCLUDE.'/class/extension.class.php'; diff --git a/html/ajax_misc.php b/html/ajax_misc.php index 39371f252..6cab5ad3b 100644 --- a/html/ajax_misc.php +++ b/html/ajax_misc.php @@ -38,7 +38,7 @@ if ( ! defined('ALLOWED')) define ('ALLOWED',1); require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/fiche.class.php'; require_once NOALYSS_INCLUDE.'/lib/iradio.class.php'; require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; diff --git a/html/ajax_test.php b/html/ajax_test.php index 01fd2b59e..feb8dd10f 100644 --- a/html/ajax_test.php +++ b/html/ajax_test.php @@ -31,7 +31,7 @@ include_once "../include/constant.php"; include_once NOALYSS_INCLUDE."/lib/ac_common.php"; -require_once NOALYSS_INCLUDE."/lib/database.class.php"; +require_once NOALYSS_INCLUDE."/class/database.class.php"; require_once NOALYSS_INCLUDE."/class/dossier.class.php"; require_once NOALYSS_INCLUDE."/lib/html_input.class.php"; require_once NOALYSS_INCLUDE."/lib/http_input.class.php"; diff --git a/html/compute.php b/html/compute.php index cb114da51..b6114eb5a 100644 --- a/html/compute.php +++ b/html/compute.php @@ -31,7 +31,7 @@ * Must return at least tva, htva and tvac */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/acc_compute.class.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; require_once NOALYSS_INCLUDE.'/class/acc_tva.class.php'; diff --git a/html/direct.php b/html/direct.php index ed079f898..d08d460f4 100644 --- a/html/direct.php +++ b/html/direct.php @@ -19,7 +19,7 @@ */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/user.class.php'; $cn=Dossier::connect(); diff --git a/html/do.php b/html/do.php index be778611a..532b9ca9c 100644 --- a/html/do.php +++ b/html/do.php @@ -23,7 +23,7 @@ define('ALLOWED',1); * \brief Main file */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; require_once NOALYSS_INCLUDE.'/lib/user_common.php'; require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; diff --git a/html/export.php b/html/export.php index 0d8cf6dab..d32bc4975 100644 --- a/html/export.php +++ b/html/export.php @@ -27,7 +27,7 @@ define ('ALLOWED',1); require_once '../include/constant.php'; global $g_user,$cn,$g_parameter; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/user.class.php'; require_once NOALYSS_INCLUDE.'/lib/http_input.class.php'; $gDossier=dossier::id(); diff --git a/html/extension.raw.php b/html/extension.raw.php index 2d1eb9355..728aafacc 100644 --- a/html/extension.raw.php +++ b/html/extension.raw.php @@ -24,7 +24,7 @@ * the security. Load several javascript files */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; diff --git a/html/fid.php b/html/fid.php index 124860ca7..005b11d30 100644 --- a/html/fid.php +++ b/html/fid.php @@ -34,7 +34,7 @@ */ require_once '../include/constant.php'; require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/lib/user_common.php'; require_once NOALYSS_INCLUDE.'/lib/http_input.class.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; diff --git a/html/fid_card.php b/html/fid_card.php index 57577bb18..0133dcafe 100644 --- a/html/fid_card.php +++ b/html/fid_card.php @@ -26,7 +26,7 @@ */ require_once '../include/constant.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/lib/http_input.class.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; /*!\brief diff --git a/html/install.php b/html/install.php index b9aa12bc5..75b2498bc 100644 --- a/html/install.php +++ b/html/install.php @@ -282,7 +282,7 @@ if ( ! file_exists(NOALYSS_INCLUDE.'/config.inc.php')) { // magic_quotes_sybase = Off // include_path require_once NOALYSS_INCLUDE.'/lib/config_file.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; // we shouldn't use it // if ( defined ("MULTI") && MULTI==1) { create_htaccess();} diff --git a/html/login.php b/html/login.php index e6ae4ddaa..089040878 100644 --- a/html/login.php +++ b/html/login.php @@ -25,7 +25,7 @@ include_once NOALYSS_INCLUDE.'/lib/ac_common.php'; * \brief Login page */ -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; // Verif if User and Pass match DB // if no, then redirect to the login page $rep=new Database(); diff --git a/html/logout.php b/html/logout.php index be049ff1f..19db731a2 100644 --- a/html/logout.php +++ b/html/logout.php @@ -22,7 +22,7 @@ */ require_once '../include/constant.php'; require_once ("lib/ac_common.php"); -require_once('lib/database.class.php'); +require_once('class/database.class.php'); session_unset(); html_page_start("classic"); diff --git a/html/popup.php b/html/popup.php index f1a3c8a19..b985af528 100644 --- a/html/popup.php +++ b/html/popup.php @@ -23,7 +23,7 @@ require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; require_once NOALYSS_INCLUDE.'/lib/html_input.class.php'; require_once NOALYSS_INCLUDE.'/lib/icon_action.class.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/lib/http_input.class.php'; require_once NOALYSS_INCLUDE.'/class/user.class.php'; require_once NOALYSS_INCLUDE.'/class/periode.class.php'; diff --git a/html/recherche.php b/html/recherche.php index 03f35e294..b2ebdba50 100644 --- a/html/recherche.php +++ b/html/recherche.php @@ -37,7 +37,7 @@ $http=new HttpInput(); $gDossier=dossier::id(); -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; /* Admin. Dossier */ $cn=Dossier::connect(); diff --git a/html/test.php b/html/test.php index bcb72c398..7fd947713 100644 --- a/html/test.php +++ b/html/test.php @@ -31,7 +31,7 @@ include_once("../include/constant.php"); include_once("lib/ac_common.php"); -require_once('lib/database.class.php'); +require_once('class/database.class.php'); require_once ('class/dossier.class.php'); require_once('lib/html_input.class.php'); require_once('lib/icon_action.class.php'); diff --git a/html/user_login.php b/html/user_login.php index d1f037656..6121be652 100644 --- a/html/user_login.php +++ b/html/user_login.php @@ -23,7 +23,7 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu require_once '../include/constant.php'; include_once NOALYSS_INCLUDE.'/lib/ac_common.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/lib/itext.class.php'; require_once NOALYSS_INCLUDE.'/lib/http_input.class.php'; require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; diff --git a/include/admin_repo.inc.php b/include/admin_repo.inc.php index 821a81cce..a18e4ab0e 100644 --- a/include/admin_repo.inc.php +++ b/include/admin_repo.inc.php @@ -27,7 +27,7 @@ if ( ! defined ('ALLOWED_ADMIN')) { die (_('Non autorisé'));} include_once NOALYSS_INCLUDE."/class/user.class.php"; require_once NOALYSS_INCLUDE."/lib/user_common.php"; include_once NOALYSS_INCLUDE."/lib/ac_common.php"; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE."/lib/user_menu.php"; require_once NOALYSS_INCLUDE."/lib/http_input.class.php"; require_once NOALYSS_INCLUDE."/lib/icon_action.class.php"; diff --git a/include/ajax/ajax_anc_search.php b/include/ajax/ajax_anc_search.php index 071ac43e1..5a4711ce1 100644 --- a/include/ajax/ajax_anc_search.php +++ b/include/ajax/ajax_anc_search.php @@ -31,7 +31,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); require_once NOALYSS_INCLUDE.'/lib/itext.class.php'; require_once NOALYSS_INCLUDE.'/lib/ihidden.class.php'; require_once NOALYSS_INCLUDE.'/lib/ibutton.class.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; require_once NOALYSS_INCLUDE.'/class/anc_plan.class.php'; diff --git a/include/ajax/ajax_auto_anc_card.php b/include/ajax/ajax_auto_anc_card.php index 917154d86..a04732662 100644 --- a/include/ajax/ajax_auto_anc_card.php +++ b/include/ajax/ajax_auto_anc_card.php @@ -6,7 +6,7 @@ *@brief no used ?? */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/user.class.php'; $cn=Dossier::connect(); diff --git a/include/ajax/ajax_card.php b/include/ajax/ajax_card.php index d4a076b0f..1e7df81d4 100644 --- a/include/ajax/ajax_card.php +++ b/include/ajax/ajax_card.php @@ -56,7 +56,7 @@ */ if ( ! defined('ALLOWED')) die (_('Accès non autorisé')); -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/fiche.class.php'; require_once NOALYSS_INCLUDE.'/lib/iradio.class.php'; require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; diff --git a/include/ajax/ajax_get_receipt.php b/include/ajax/ajax_get_receipt.php index 1e6019324..00e5cf7a9 100644 --- a/include/ajax/ajax_get_receipt.php +++ b/include/ajax/ajax_get_receipt.php @@ -30,7 +30,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; require_once NOALYSS_INCLUDE.'/class/acc_ledger.class.php'; require_once NOALYSS_INCLUDE.'/class/user.class.php'; diff --git a/include/ajax/ajax_history.php b/include/ajax/ajax_history.php index 904b71fe9..b0eef4eb1 100644 --- a/include/ajax/ajax_history.php +++ b/include/ajax/ajax_history.php @@ -25,7 +25,7 @@ */ if ( ! defined('ALLOWED')) die (_('Accès interdit')); -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/user.class.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; require_once NOALYSS_INCLUDE.'/class/periode.class.php'; diff --git a/include/ajax/ajax_ledger.php b/include/ajax/ajax_ledger.php index 199e311c1..b475004be 100644 --- a/include/ajax/ajax_ledger.php +++ b/include/ajax/ajax_ledger.php @@ -30,7 +30,7 @@ */ if ( ! defined('ALLOWED')) die(_('Non authorisé')); -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/user.class.php'; require_once NOALYSS_INCLUDE.'/class/acc_operation.class.php'; require_once NOALYSS_INCLUDE.'/class/acc_ledger.class.php'; diff --git a/include/ajax/ajax_mod_document.php b/include/ajax/ajax_mod_document.php index 88a48e931..384747bb2 100644 --- a/include/ajax/ajax_mod_document.php +++ b/include/ajax/ajax_mod_document.php @@ -23,7 +23,7 @@ * \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.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; require_once NOALYSS_INCLUDE.'/class/document_modele.class.php'; diff --git a/include/ajax/ajax_poste.php b/include/ajax/ajax_poste.php index d7c96dfd3..899dbadb8 100644 --- a/include/ajax/ajax_poste.php +++ b/include/ajax/ajax_poste.php @@ -36,7 +36,7 @@ if ( ! defined('ALLOWED')) die (_('Non authorisé')); require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; require_once NOALYSS_INCLUDE.'/class/acc_ledger.class.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; require_once NOALYSS_INCLUDE.'/class/acc_account_ledger.class.php'; mb_internal_encoding("UTF-8"); diff --git a/include/ajax/ajax_search_operation.php b/include/ajax/ajax_search_operation.php index 446c9beb4..4b519878c 100644 --- a/include/ajax/ajax_search_operation.php +++ b/include/ajax/ajax_search_operation.php @@ -30,7 +30,7 @@ require_once NOALYSS_INCLUDE.'/class/acc_ledger_search.class.php'; global $http; $gDossier=dossier::id(); -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; /* Admin. Dossier */ $cn=Dossier::connect(); diff --git a/include/ajax/ajax_todo_list.php b/include/ajax/ajax_todo_list.php index 430014b9a..95d9c2597 100644 --- a/include/ajax/ajax_todo_list.php +++ b/include/ajax/ajax_todo_list.php @@ -36,7 +36,7 @@ if ( ! defined ('ALLOWED') ) die (_('Aucun accès direct')); require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; require_once NOALYSS_INCLUDE.'/class/todo_list.class.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/user.class.php'; mb_internal_encoding("UTF-8"); require_once NOALYSS_INCLUDE.'/lib/http_input.class.php'; diff --git a/include/ajax/ajax_update_predef.php b/include/ajax/ajax_update_predef.php index 7979d603a..335afb350 100644 --- a/include/ajax/ajax_update_predef.php +++ b/include/ajax/ajax_update_predef.php @@ -29,7 +29,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; require_once NOALYSS_INCLUDE.'/class/pre_operation.class.php'; diff --git a/include/cfgfiche.inc.php b/include/cfgfiche.inc.php index 1e87e9f3b..6955015cc 100644 --- a/include/cfgfiche.inc.php +++ b/include/cfgfiche.inc.php @@ -25,7 +25,7 @@ require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; require_once NOALYSS_INCLUDE.'/lib/itext.class.php'; require_once NOALYSS_INCLUDE.'/lib/ihidden.class.php'; require_once NOALYSS_INCLUDE.'/class/fiche.class.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/lib/user_menu.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; require_once NOALYSS_INCLUDE.'/lib/sort_table.class.php'; diff --git a/include/cfgledger.inc.php b/include/cfgledger.inc.php index 1d4dbe57c..9da41a3a9 100644 --- a/include/cfgledger.inc.php +++ b/include/cfgledger.inc.php @@ -29,7 +29,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/user.class.php'; require_once NOALYSS_INCLUDE.'/lib/user_menu.php'; require_once NOALYSS_INCLUDE.'/class/acc_ledger.class.php'; diff --git a/include/class/acc_account.class.php b/include/class/acc_account.class.php index 4a41f6915..8f4192712 100644 --- a/include/class/acc_account.class.php +++ b/include/class/acc_account.class.php @@ -24,7 +24,7 @@ * \brief Manage the account from the table tmp_pcmn */ require_once NOALYSS_INCLUDE.'/lib/iselect.class.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; require_once NOALYSS_INCLUDE.'/database/tmp_pcmn_sql.class.php'; diff --git a/include/class/acc_account_ledger.class.php b/include/class/acc_account_ledger.class.php index 4d31139d1..a33d4d20c 100644 --- a/include/class/acc_account_ledger.class.php +++ b/include/class/acc_account_ledger.class.php @@ -24,7 +24,7 @@ * \brief Manage the account from the table jrn, jrnx or tmp_pcmn */ require_once NOALYSS_INCLUDE.'/lib/ihidden.class.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; class Acc_Account_Ledger diff --git a/include/class/acc_bilan.class.php b/include/class/acc_bilan.class.php index 9585cfdee..76ec7b8bf 100644 --- a/include/class/acc_bilan.class.php +++ b/include/class/acc_bilan.class.php @@ -24,7 +24,7 @@ * */ require_once NOALYSS_INCLUDE.'/lib/iselect.class.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; require_once NOALYSS_INCLUDE.'/lib/impress.class.php'; require_once NOALYSS_INCLUDE.'/header_print.php'; diff --git a/include/class/acc_ledger_info.class.php b/include/class/acc_ledger_info.class.php index 52cc71b1b..689879b06 100644 --- a/include/class/acc_ledger_info.class.php +++ b/include/class/acc_ledger_info.class.php @@ -19,7 +19,7 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; /*!\file diff --git a/include/class/acc_reconciliation.class.php b/include/class/acc_reconciliation.class.php index e900f5963..31dc07f06 100644 --- a/include/class/acc_reconciliation.class.php +++ b/include/class/acc_reconciliation.class.php @@ -25,7 +25,7 @@ * */ require_once NOALYSS_INCLUDE.'/lib/iconcerned.class.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; require_once NOALYSS_INCLUDE.'/class/lettering.class.php'; diff --git a/include/class/acc_tva.class.php b/include/class/acc_tva.class.php index ebbe095ac..27b402990 100644 --- a/include/class/acc_tva.class.php +++ b/include/class/acc_tva.class.php @@ -23,7 +23,7 @@ * \brief this class is used for the table tva_rate */ require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; /*!\brief Acc_Tva is used for to map the table tva_rate * parameter are diff --git a/include/class/admin.class.php b/include/class/admin.class.php index f8fc8e20f..77216692b 100644 --- a/include/class/admin.class.php +++ b/include/class/admin.class.php @@ -18,7 +18,7 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/acc_parm_code.class.php'; require_once NOALYSS_INCLUDE.'/class/fiche.class.php'; diff --git a/include/class/anc_group.class.php b/include/class/anc_group.class.php index fd4a1dda6..34f5cfba1 100644 --- a/include/class/anc_group.class.php +++ b/include/class/anc_group.class.php @@ -23,7 +23,7 @@ * \brief class for the group of the analytic account * */ -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/constant.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; require_once NOALYSS_INCLUDE.'/class/anc_print.class.php'; diff --git a/include/class/anc_group_operation.class.php b/include/class/anc_group_operation.class.php index 8c7e22dc1..05f519981 100644 --- a/include/class/anc_group_operation.class.php +++ b/include/class/anc_group_operation.class.php @@ -31,7 +31,7 @@ require_once NOALYSS_INCLUDE.'/lib/itext.class.php'; require_once NOALYSS_INCLUDE.'/lib/iselect.class.php'; require_once NOALYSS_INCLUDE.'/lib/icheckbox.class.php'; require_once NOALYSS_INCLUDE.'/class/anc_operation.class.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/anc_plan.class.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; diff --git a/include/class/anc_plan.class.php b/include/class/anc_plan.class.php index b55e8a951..93bb90608 100644 --- a/include/class/anc_plan.class.php +++ b/include/class/anc_plan.class.php @@ -29,7 +29,7 @@ require_once NOALYSS_INCLUDE.'/lib/itext.class.php'; require_once NOALYSS_INCLUDE.'/lib/ihidden.class.php'; require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/database/poste_analytique_sql.class.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; diff --git a/include/class/anc_print.class.php b/include/class/anc_print.class.php index 174fb1a50..dedefcb2a 100644 --- a/include/class/anc_print.class.php +++ b/include/class/anc_print.class.php @@ -32,7 +32,7 @@ require_once NOALYSS_INCLUDE.'/lib/itext.class.php'; require_once NOALYSS_INCLUDE.'/lib/ihidden.class.php'; require_once NOALYSS_INCLUDE.'/lib/iselect.class.php'; require_once NOALYSS_INCLUDE.'/lib/ibutton.class.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/constant.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; require_once NOALYSS_INCLUDE.'/class/anc_plan.class.php'; diff --git a/include/class/bank.class.php b/include/class/bank.class.php index 731b40466..1429f8778 100644 --- a/include/class/bank.class.php +++ b/include/class/bank.class.php @@ -18,7 +18,7 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/acc_parm_code.class.php'; require_once NOALYSS_INCLUDE.'/class/fiche.class.php'; diff --git a/include/class/customer.class.php b/include/class/customer.class.php index 4a7d10f15..b6e8efcd0 100644 --- a/include/class/customer.class.php +++ b/include/class/customer.class.php @@ -18,7 +18,7 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/acc_parm_code.class.php'; require_once NOALYSS_INCLUDE.'/class/periode.class.php'; require_once NOALYSS_INCLUDE.'/class/fiche.class.php'; diff --git a/include/class/database.class.php b/include/class/database.class.php new file mode 100644 index 000000000..23f67dafa --- /dev/null +++ b/include/class/database.class.php @@ -0,0 +1,116 @@ + 10) + die("-->Dossier invalide [$p_database_id]"); + $noalyss_user = (defined("noalyss_user")) ? noalyss_user : phpcompta_user; + $password = (defined("noalyss_password")) ? noalyss_password : phpcompta_password; + $port = (defined("noalyss_psql_port")) ? noalyss_psql_port : phpcompta_psql_port; + $host = (!defined("noalyss_psql_host")) ? '127.0.0.1' : noalyss_psql_host; + if (defined("MULTI") && MULTI == "0") { + $l_dossier = dbname; + } else { + + if ($p_database_id == 0) { /* connect to the repository */ + $l_dossier = sprintf("%saccount_repository", strtolower(domaine)); + } else if ($p_type == 'dos') { /* connect to a folder (dossier) */ + $l_dossier = sprintf("%sdossier%d", strtolower(domaine), $p_database_id); + } else if ($p_type == 'mod') { /* connect to a template (modele) */ + $l_dossier = sprintf("%smod%d", strtolower(domaine), $p_database_id); + } else if ($p_type == 'template') { + $l_dossier = 'template1'; + } else { + throw new Exception('Connection invalide'); + } + } + + parent::__construct($noalyss_user, $password, $l_dossier, $host, $port); + + if ($this->exist_schema('comptaproc')) { + $this->exec_sql('set search_path to public,comptaproc,pg_catalog;'); + } + $this->exec_sql('set DateStyle to ISO, MDY;'); + + } + + /*** + * \brief Save a "piece justificative" , the name must be pj + * + * \param $seq jr_grpt_id + * \return $oid of the lob file if success + * null if a error occurs + * + */ + function save_receipt($seq) + { + $oid = $this->upload('pj'); + if ($oid == false) { + return false; + } + // Remove old document + $ret = $this->exec_sql("select jr_pj from jrn where jr_grpt_id=$seq"); + if (pg_num_rows($ret) != 0) { + $r = pg_fetch_array($ret, 0); + $old_oid = $r['jr_pj']; + if (strlen($old_oid) != 0) + pg_lo_unlink($cn, $old_oid); + } + // Load new document + $this->exec_sql("update jrn set jr_pj=$1 , jr_pj_name=$2, + jr_pj_type=$3 where jr_grpt_id=$4", + array($oid, $_FILES['pj']['name'], $_FILES['pj']['type'], $seq)); + return $oid; + } + + /** + * \brief Get version of a database, the content of the + * table version + * + * \return version number + * + */ + + function get_version() + { + $Res = $this->get_value("select max(val) from version"); + return $Res; + } + + +} \ No newline at end of file diff --git a/include/class/dossier.class.php b/include/class/dossier.class.php index 5eea06b8b..d1eadd384 100644 --- a/include/class/dossier.class.php +++ b/include/class/dossier.class.php @@ -34,7 +34,7 @@ "desc"=>"dos_description"); * */ -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; require_once NOALYSS_INCLUDE.'/class/user.class.php'; diff --git a/include/class/exercice.class.php b/include/class/exercice.class.php index 504876684..296d5d8d4 100644 --- a/include/class/exercice.class.php +++ b/include/class/exercice.class.php @@ -22,7 +22,7 @@ /*!\file * \brief about the accountant exercice */ -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/lib/iselect.class.php'; class Exercice { diff --git a/include/class/fiche_attr.class.php b/include/class/fiche_attr.class.php index eea1ed8b3..98cea2e90 100644 --- a/include/class/fiche_attr.class.php +++ b/include/class/fiche_attr.class.php @@ -6,7 +6,7 @@ * * */ -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; class Fiche_Attr diff --git a/include/class/manager.class.php b/include/class/manager.class.php index a770dfe88..03719b46d 100644 --- a/include/class/manager.class.php +++ b/include/class/manager.class.php @@ -19,7 +19,7 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/acc_parm_code.class.php'; require_once NOALYSS_INCLUDE.'/class/periode.class.php'; require_once NOALYSS_INCLUDE.'/class/fiche.class.php'; diff --git a/include/class/periode.class.php b/include/class/periode.class.php index c4efd0c2b..dd63445d7 100644 --- a/include/class/periode.class.php +++ b/include/class/periode.class.php @@ -27,7 +27,7 @@ * \brief For the periode tables parm_periode and jrn_periode */ require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE."/database/parm_periode_sql.class.php"; class Periode diff --git a/include/class/print_ledger.class.php b/include/class/print_ledger.class.php index ef43f9ea7..572a04d83 100644 --- a/include/class/print_ledger.class.php +++ b/include/class/print_ledger.class.php @@ -23,7 +23,7 @@ * * @author danydb */ -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/print_ledger_detail.class.php'; require_once NOALYSS_INCLUDE.'/class/print_ledger_simple.class.php'; require_once NOALYSS_INCLUDE.'/class/print_ledger_simple_without_vat.class.php'; diff --git a/include/class/supplier.class.php b/include/class/supplier.class.php index 51fc47182..0400fa34f 100644 --- a/include/class/supplier.class.php +++ b/include/class/supplier.class.php @@ -18,7 +18,7 @@ */ // Copyright Author Dany De Bontridder danydb@aevalys.eu require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/acc_parm_code.class.php'; require_once NOALYSS_INCLUDE.'/class/periode.class.php'; require_once NOALYSS_INCLUDE.'/class/fiche.class.php'; diff --git a/include/class/user.class.php b/include/class/user.class.php index 5b066779a..ed0f7164a 100644 --- a/include/class/user.class.php +++ b/include/class/user.class.php @@ -1065,7 +1065,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.'/lib/database.class.php'; + require_once NOALYSS_INCLUDE.'/class/database.class.php'; $max = Database::num_row($Res); if ($max == 0) diff --git a/include/database/fiche_def_ref_sql.class.php b/include/database/fiche_def_ref_sql.class.php index 5ad8b9939..c952648c4 100644 --- a/include/database/fiche_def_ref_sql.class.php +++ b/include/database/fiche_def_ref_sql.class.php @@ -24,7 +24,7 @@ * category of card */ require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; /** * @class diff --git a/include/database/jrn_def_sql.class.php b/include/database/jrn_def_sql.class.php index 4840fbc34..4f7afc406 100644 --- a/include/database/jrn_def_sql.class.php +++ b/include/database/jrn_def_sql.class.php @@ -28,7 +28,7 @@ @endcode */ -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; /** diff --git a/include/database/jrn_periode_sql.class.php b/include/database/jrn_periode_sql.class.php index eb50639fa..9f440455f 100644 --- a/include/database/jrn_periode_sql.class.php +++ b/include/database/jrn_periode_sql.class.php @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; /** diff --git a/include/database/menu_ref_sql.class.php b/include/database/menu_ref_sql.class.php index f0eb8d673..5fa6982f5 100644 --- a/include/database/menu_ref_sql.class.php +++ b/include/database/menu_ref_sql.class.php @@ -25,7 +25,7 @@ * * */ -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php'; diff --git a/include/database/parm_periode_sql.class.php b/include/database/parm_periode_sql.class.php index 2cbd0806b..18991e97a 100644 --- a/include/database/parm_periode_sql.class.php +++ b/include/database/parm_periode_sql.class.php @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php'; -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; /** diff --git a/include/database/poste_analytique_sql.class.php b/include/database/poste_analytique_sql.class.php index af1184f39..bbf11f865 100644 --- a/include/database/poste_analytique_sql.class.php +++ b/include/database/poste_analytique_sql.class.php @@ -28,7 +28,7 @@ * * @class * @brief abstract of the table public.poste_analytique */ -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php'; diff --git a/include/database/profile_menu_sql.class.php b/include/database/profile_menu_sql.class.php index a5979c8bb..6189fb91d 100644 --- a/include/database/profile_menu_sql.class.php +++ b/include/database/profile_menu_sql.class.php @@ -28,7 +28,7 @@ @endcode */ -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php'; diff --git a/include/database/profile_sql.class.php b/include/database/profile_sql.class.php index adbd7bf1d..33ecc49aa 100644 --- a/include/database/profile_sql.class.php +++ b/include/database/profile_sql.class.php @@ -28,7 +28,7 @@ @endcode */ -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; require_once NOALYSS_INCLUDE.'/lib/noalyss_sql.class.php'; diff --git a/include/database/tag_sql.class.php b/include/database/tag_sql.class.php index f66e9bcec..13698f156 100644 --- a/include/database/tag_sql.class.php +++ b/include/database/tag_sql.class.php @@ -1,5 +1,5 @@ make_array("select fr_id,fr_label from formdef order by fr_label"); diff --git a/include/lib/ac_common.php b/include/lib/ac_common.php index ca7d65492..bf807cdb4 100644 --- a/include/lib/ac_common.php +++ b/include/lib/ac_common.php @@ -25,7 +25,7 @@ * @brief common utilities for a lot of procedure, classe */ -require_once NOALYSS_INCLUDE.'/lib/database.class.php'; +require_once NOALYSS_INCLUDE.'/class/database.class.php'; require_once NOALYSS_INCLUDE.'/class/periode.class.php'; require_once NOALYSS_INCLUDE.'/lib/html_input.class.php'; require_once NOALYSS_INCLUDE.'/lib/function_javascript.php'; diff --git a/include/lib/database.class.php b/include/lib/database_core.class.php similarity index 52% rename from include/lib/database.class.php rename to include/lib/database_core.class.php index 993d7f81f..a38725d29 100644 --- a/include/lib/database.class.php +++ b/include/lib/database_core.class.php @@ -24,115 +24,61 @@ * \file * \brief contains the class for connecting to a postgresql database */ -require_once NOALYSS_INCLUDE.'/constant.php'; -require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; +require_once NOALYSS_INCLUDE . '/constant.php'; +require_once NOALYSS_INCLUDE . '/lib/ac_common.php'; /** * \brief * This class allow you to connect to the postgresql database, execute sql, retrieve data * */ - -class Database +class DatabaseCore { - private $db; /**< database connection */ - private $ret; /**< return value */ + private $db; + /**< database connection */ + private $ret; + /**< return value */ private $is_open; /*!< true is connected */ - /**\brief constructor - * \param $p_database_id is the id of the dossier, or the modele following the - * p_type if = 0 then connect to the repository - * \param $p_type is 'DOS' (defaut) for dossier or 'MOD' - */ - function __construct($p_database_id=0, $p_type='dos') - { - if (IsNumber($p_database_id)==false||strlen($p_database_id)>10) - die("-->Dossier invalide [$p_database_id]"); - $noalyss_user=(defined("noalyss_user"))?noalyss_user:phpcompta_user; - $password=(defined("noalyss_password"))?noalyss_password:phpcompta_password; - $port=(defined("noalyss_psql_port"))?noalyss_psql_port:phpcompta_psql_port; - $host=(!defined("noalyss_psql_host") )?'127.0.0.1':noalyss_psql_host; - if (defined("MULTI")&&MULTI=="0") - { - $l_dossier=dbname; - } - else - { - - if ($p_database_id==0) - { /* connect to the repository */ - $l_dossier=sprintf("%saccount_repository", strtolower(domaine)); - } - else if ($p_type=='dos') - { /* connect to a folder (dossier) */ - $l_dossier=sprintf("%sdossier%d", strtolower(domaine), $p_database_id); - } - else if ($p_type=='mod') - { /* connect to a template (modele) */ - $l_dossier=sprintf("%smod%d", strtolower(domaine), $p_database_id); - } - else if ($p_type=='template') - { - $l_dossier='template1'; - } - else - { - throw new Exception('Connection invalide'); - } - } - - ob_start(); - $a=pg_connect("dbname=$l_dossier host='$host' user='$noalyss_user' - password='$password' port=$port"); - - if ($a==false) - { - if (DEBUG) - { - ob_end_clean(); - echo '

Impossible de se connecter à postgreSql !

'; - echo '

'; - echo "Vos paramètres sont incorrectes :
"; - echo "
"; - echo "base de donnée : $l_dossier
"; - echo "Domaine : ".domaine."
"; - echo "Port $port
"; - echo "Utilisateur : $noalyss_user
"; - echo '

'; - - die("Connection impossible : vérifiez vos paramètres de base - de données"); - } - else - { - echo '

Erreur de connexion !

'; - $this->is_open=false; - return; - } - } - $this->db=$a; - $this->is_open=TRUE; - if ($this->exist_schema('comptaproc')){ - pg_exec($this->db, 'set search_path to public,comptaproc,pg_catalog;'); - } - pg_exec($this->db, 'set DateStyle to ISO, MDY;'); - ob_end_clean(); - } - /** - * Connect to a database return an connx to db or false if it fails - * - * @param string $p_user Username + /*** Connect to a database return an connx to db or false if it fails + * + * @param string $p_user Username * @param type $p_password User's password * @param $p_dbname name of the database to connect * @param type $p_host Host of DB * @param type $p_port Port of DB */ - static function connect($p_user,$p_password,$p_dbname,$p_host,$p_port) { - $a=pg_connect("dbname=$p_dbname host='$p_host' user='$p_user' - password='$p_password' port=$p_port"); - return $a; + + function __construct($p_user, $p_password, $p_dbname, $p_host, $p_port) + { + $this->db = pg_connect("dbname=$p_dbname host='$p_host' user='$p_user' + password='$p_password' port=$p_port"); + if ($this->db == false) { + if (DEBUG) { + + echo '

Impossible de se connecter à postgreSql !

'; + echo '

'; + echo "Vos paramètres sont incorrectes :
"; + echo "
"; + echo "base de donnée : $p_dbname
"; + echo "Port $p_port
"; + echo "Utilisateur : $p_user
"; + echo '

'; + + die("Connection impossible : vérifiez vos paramètres de base + de données"); + } else { + echo '

' . _('Erreur de connexion !') . '

'; + $this->is_open = false; + throw new Exception(_('Erreur Connexion')); + } + } + + $this->is_open = TRUE; + } + public function verify() { // Verify that the elt we want to add is correct @@ -142,12 +88,61 @@ class Database { pg_set_client_encoding($this->db, $p_charset); } + function get_encoding() { return pg_client_encoding($this->db); } + /** + * @return mixed + */ + public function get_db() + { + return $this->db; + } + + /** + * @param mixed $db + */ + public function set_db($db) + { + $this->db = $db; + } + + /** + * @return mixed + */ + public function get_ret() + { + return $this->ret; + } + + /** + * @param mixed $ret + */ + public function set_ret($ret) + { + $this->ret = $ret; + } + + /** + * @return mixed + */ + public function get_is_open() + { + return $this->is_open; + } + + /** + * @param mixed $is_open + */ + public function set_is_open($is_open) + { + $this->is_open = $is_open; + } + /** * \brief send a sql string to the database * \param $p_string sql string @@ -156,43 +151,34 @@ class Database * error occured */ - function exec_sql($p_string, $p_array=null) + function exec_sql($p_string, $p_array = null) { - try - { - if ( ! $this->is_open ) throw new Exception(' Database is closed'); - $this->sql=$p_string; - $this->array=$p_array; + try { + if (!$this->is_open) throw new Exception(' Database is closed'); + $this->sql = $p_string; + $this->array = $p_array; - if ($p_array==null) - { + if ($p_array == null) { if (!DEBUG) - $this->ret=pg_query($this->db, $p_string); + $this->ret = pg_query($this->db, $p_string); else - $this->ret=@pg_query($this->db, $p_string); - } - else - { - $a=is_array($p_array); - if (!is_array($p_array)) - { + $this->ret = @pg_query($this->db, $p_string); + } else { + $a = is_array($p_array); + if (!is_array($p_array)) { throw new Exception("Erreur : exec_sql attend un array"); } - if (!DEBUG) - $this->ret=pg_query_params($this->db, $p_string, $p_array); + if (!DEBUG) + $this->ret = pg_query_params($this->db, $p_string, $p_array); else - $this->ret=@pg_query_params($this->db, $p_string, $p_array); + $this->ret = @pg_query_params($this->db, $p_string, $p_array); } - if (!$this->ret) - { - $str_error=pg_last_error($this->db).pg_result_error($this->ret); - throw new Exception(" SQL ERROR $p_string ".$str_error, 1); + if (!$this->ret) { + $str_error = pg_last_error($this->db) . pg_result_error($this->ret); + throw new Exception(" SQL ERROR $p_string " . $str_error, 1); } - } - catch (Exception $a) - { - if (DEBUG) - { + } catch (Exception $a) { + if (DEBUG) { print_r($p_string); print_r($p_array); echo $a->getMessage(); @@ -201,23 +187,23 @@ class Database } record_log($a->getTraceAsString()); $this->rollback(); - + throw ($a); } return $this->ret; } - /** + /** * \brief Count the number of row returned by a sql statement * * \param $p_sql sql string * \param $p_array if not null we use the safer pg_query_params */ - function count_sql($p_sql, $p_array=null) + function count_sql($p_sql, $p_array = null) { - $r_sql=$this->exec_sql($p_sql, $p_array); + $r_sql = $this->exec_sql($p_sql, $p_array); return pg_NumRows($r_sql); } @@ -227,7 +213,7 @@ class Database function get_current_seq($p_seq) { - $Res=$this->get_value("select currval('$p_seq') as seq"); + $Res = $this->get_value("select currval('$p_seq') as seq"); return $Res; } @@ -237,8 +223,8 @@ class Database function get_next_seq($p_seq) { - $Res=$this->exec_sql("select nextval('$p_seq') as seq"); - $seq=pg_fetch_array($Res, 0); + $Res = $this->exec_sql("select nextval('$p_seq') as seq"); + $seq = pg_fetch_array($Res, 0); return $seq['seq']; } @@ -248,7 +234,7 @@ class Database */ function start() { - $Res=$this->exec_sql("start transaction"); + $Res = $this->exec_sql("start transaction"); } /** @@ -257,8 +243,8 @@ class Database */ function commit() { - if ( ! $this->is_open) return; - $Res=$this->exec_sql("commit"); + if (!$this->is_open) return; + $Res = $this->exec_sql("commit"); } /** @@ -266,8 +252,8 @@ class Database */ function rollback() { - if ( ! $this->is_open) return; - $Res=$this->exec_sql("rollback"); + if (!$this->is_open) return; + $Res = $this->exec_sql("rollback"); } /** @@ -277,9 +263,9 @@ class Database */ function alter_seq($p_name, $min) { - if ($min<1) - $min=1; - $Res=$this->exec_sql("alter sequence $p_name restart $min"); + if ($min < 1) + $min = 1; + $Res = $this->exec_sql("alter sequence $p_name restart $min"); } /** @@ -290,87 +276,74 @@ class Database function execute_script($script) { - if (!DEBUG) - { + if (!DEBUG) { ob_start(); } else { - $debug=fopen("/tmp/debug.log","w+"); + $debug = fopen("/tmp/debug.log", "w+"); } - $hf=fopen($script, 'r'); - if ($hf==false) - { - throw new Exception ( 'Ne peut ouvrir '.$script); + $hf = fopen($script, 'r'); + if ($hf == false) { + throw new Exception ('Ne peut ouvrir ' . $script); } - $sql=""; - $flag_function=false; - while (!feof($hf)) - { - $buffer=fgets($hf); - $buffer=str_replace('$BODY$', '$_$', $buffer); - print $buffer."
"; + $sql = ""; + $flag_function = false; + while (!feof($hf)) { + $buffer = fgets($hf); + $buffer = str_replace('$BODY$', '$_$', $buffer); + print $buffer . "
"; // comment are not execute - if (substr($buffer, 0, 2)=="--") - { + if (substr($buffer, 0, 2) == "--") { //echo "comment $buffer"; continue; } // Blank Lines Are Skipped - If (Strlen($buffer)==0) - { + If (Strlen($buffer) == 0) { //echo "Blank $buffer"; Continue; } - if (strpos(strtolower($buffer), "create function")===0) - { + if (strpos(strtolower($buffer), "create function") === 0) { echo "found a function"; - $flag_function=true; - $sql=$buffer; + $flag_function = true; + $sql = $buffer; continue; } - if (strpos(strtolower($buffer), "create or replace function")===0) - { + if (strpos(strtolower($buffer), "create or replace function") === 0) { echo "found a function"; - $flag_function=true; - $sql=$buffer; + $flag_function = true; + $sql = $buffer; continue; } // No semi colon -> multiline command - if ($flag_function==false&&strpos($buffer, ';')==false) - { - $sql.=$buffer; + if ($flag_function == false && strpos($buffer, ';') == false) { + $sql .= $buffer; continue; } - if ($flag_function) - { - if ( strpos(strtolower($buffer), "$$;")===false && - strpos(strtolower($buffer), '$_$;')===false && - strpos(strtolower($buffer), '$function$;')===false && - strpos(strtolower($buffer), 'language plpgsql;')===false && - strpos(strtolower($buffer), 'language plpgsql ;')===false - ) - { - $sql.=$buffer; + if ($flag_function) { + if (strpos(strtolower($buffer), "$$;") === false && + strpos(strtolower($buffer), '$_$;') === false && + strpos(strtolower($buffer), '$function$;') === false && + strpos(strtolower($buffer), 'language plpgsql;') === false && + strpos(strtolower($buffer), 'language plpgsql ;') === false + ) { + $sql .= $buffer; continue; } - } - else - { + } else { // cut the semi colon - $buffer=str_replace(';', '', $buffer); + $buffer = str_replace(';', '', $buffer); } - $sql.=$buffer; - if ( DEBUG ) fwrite($debug, $sql); - if ($this->exec_sql($sql)==false) - { - + $sql .= $buffer; + if (DEBUG) fwrite($debug, $sql); + if ($this->exec_sql($sql) == false) { + $this->rollback(); if (!DEBUG) ob_end_clean(); print "ERROR : $sql"; throw new Exception("ERROR : $sql"); } - $sql=""; - $flag_function=false; + $sql = ""; + $flag_function = false; print "
"; } // while (feof) fclose($hf); @@ -378,19 +351,6 @@ class Database ob_end_clean(); } - /** - * \brief Get version of a database, the content of the - * table version - * - * \return version number - * - */ - - function get_version() - { - $Res=$this->get_value("select max(val) from version"); - return $Res; - } /** * @brief fetch the $p_indice array from the last query @@ -399,13 +359,13 @@ class Database */ function fetch($p_indice) { - if ($this->ret==false) + if ($this->ret == false) throw new Exception('this->ret is empty'); return pg_fetch_array($this->ret, $p_indice); } /** - * + * * @brief return the number of rows found by the last query, or the number * of rows from $p_ret * @param $p_ret is the result of a query, the default value is null, in that case @@ -413,19 +373,19 @@ class Database * @note synomym for count() */ - function size($p_ret=null) + function size($p_ret = null) { - if ($p_ret==null) + if ($p_ret == null) return pg_NumRows($this->ret); else return pg_NumRows($p_ret); } /** - * @brief synomym for size() + * @brief synomym for size() */ - function count($p_ret=null) + function count($p_ret = null) { return $this->size($p_ret); } @@ -439,113 +399,98 @@ class Database function apply_patch($p_name) { - if ( ! $this->exist_table('version')) { + if (!$this->exist_table('version')) { echo _('Base de donnée vide'); return; } - $MaxVersion=DBVERSION-1; - $succeed="✓"; + $MaxVersion = DBVERSION - 1; + $succeed = "✓"; echo ''; } + /** + * return the name of the database with the domain name + * @param $p_id of the folder WITHOUT the domain name + * @param $p_type dos for folder mod for template + * @return formatted name + */ + function format_name($p_id, $p_type) + { + switch ($p_type) { + case 'dos': + $sys_name = sprintf("%sdossier%d", strtolower(domaine), $p_id); + break; + case 'mod': + $sys_name = sprintf("%smod%d", strtolower(domaine), $p_id); + break; + default: + echo_error(__FILE__ . " format_name invalid type " . $p_type, __LINE__); + throw new Exception(__FILE__ . " format_name invalid type " . $p_type . __LINE__); + } + return $sys_name; + } } \ No newline at end of file diff --git a/include/lib/database_core.class.php b/include/lib/database_core.class.php index 2b3bd9e8e..aa0aa5999 100644 --- a/include/lib/database_core.class.php +++ b/include/lib/database_core.class.php @@ -57,17 +57,16 @@ class DatabaseCore if ($this->db == false) { if (DEBUG) { - echo '

Impossible de se connecter à postgreSql !

'; + echo '

'._('Impossible de se connecter à postgreSql').'

'; echo '

'; - echo "Vos paramètres sont incorrectes :
"; + echo _("Vos paramètres sont incorrectes").":
"; echo "
"; - echo "base de donnée : $p_dbname
"; - echo "Port $p_port
"; - echo "Utilisateur : $p_user
"; + printf (_("base de donnée = %s"), $p_dbname)."
"; + printf (_("Port %s"),$p_port )."
"; + printf ( _("Utilisateur : %s"),$p_user )."
"; echo '

'; - die("Connection impossible : vérifiez vos paramètres de base - de données"); + die(); } else { echo '

' . _('Erreur de connexion !') . '

'; $this->is_open = false; @@ -462,7 +461,7 @@ class DatabaseCore $array = $this->get_array($p_sql, $p_array); if (empty($array)) return null; if (count($array) == 1) return $array[0]; - throw new Exception("Database:get_row retourne trop de lignes", 100); + throw new Exception(_("Database:get_row retourne trop de lignes"), 100); } /** @@ -521,27 +520,6 @@ class DatabaseCore return false; } - /** - * return the name of the database with the domain name - * @param $p_id of the folder WITHOUT the domain name - * @param $p_type dos for folder mod for template - * @return formatted name - */ - function format_name($p_id, $p_type) - { - switch ($p_type) { - case 'dos': - $sys_name = sprintf("%sdossier%d", strtolower(domaine), $p_id); - break; - case 'mod': - $sys_name = sprintf("%smod%d", strtolower(domaine), $p_id); - break; - default: - echo_error(__FILE__ . " format_name invalid type " . $p_type, __LINE__); - throw new Exception(__FILE__ . " format_name invalid type " . $p_type . __LINE__); - } - return $sys_name; - } /** * Count the database name in a system view From 396fe8d99a688c80763a99faf39cf55049c97bdd Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Sat, 27 Jul 2019 13:18:21 +0200 Subject: [PATCH 05/14] Replace PHPCOMPTA by NOALYSS --- include/ajax/ajax_accounting.php | 2 +- include/ajax/ajax_anc_accounting.php | 2 +- include/ajax/ajax_anc_detail_operation.php | 2 +- include/ajax/ajax_display_all_card.php | 2 +- include/ajax/ajax_follow_up.php | 2 +- include/ajax/ajax_history_anc_account.php | 2 +- include/ajax/ajax_periode.php | 2 +- include/ajax/ajax_search_filter.php | 2 +- include/ajax/ajax_template_cat_card.php | 2 +- include/ajax/ajax_template_cat_category.php | 2 +- include/ajax/ajax_tva_parameter.php | 2 +- include/ajax/ajax_user_security.php | 2 +- include/class/acc_ledger_history_financial.class.php | 2 +- include/class/acc_ledger_history_generic.class.php | 2 +- include/class/acc_ledger_history_purchase.class.php | 2 +- include/class/acc_ledger_history_sale.class.php | 2 +- include/class/acc_ledger_search.class.php | 2 +- include/class/anc_account_table.class.php | 2 +- include/class/package_contrib.class.php | 2 +- include/class/package_core.class.php | 2 +- include/class/package_noalyss.class.php | 2 +- include/class/package_plugin.class.php | 2 +- include/class/package_repository.class.php | 2 +- include/class/package_template.class.php | 2 +- include/class/periode_ledger.class.php | 2 +- include/class/periode_ledger_table.class.php | 2 +- include/class/template_card_category.class.php | 2 +- include/class/tva_rate_mtable.class.php | 2 +- include/database/acc_plan_sql.class.php | 2 +- include/database/poste_analytique_sql.class.php | 2 +- include/lib/http_input.class.php | 2 +- include/lib/icon_action.class.php | 2 +- include/lib/inplace_switch.class.php | 2 +- include/template/acc_ledger_history_financial_oneline.php | 2 +- include/template/acc_ledger_history_purchase_detail.php | 2 +- include/template/acc_ledger_history_purchase_extended.php | 2 +- include/template/acc_ledger_history_purchase_oneline.php | 2 +- include/template/acc_ledger_history_sale_detail.php | 2 +- include/template/acc_ledger_history_sale_extended.php | 2 +- include/upgrade-core.php | 2 +- include/upgrade-plugin.php | 2 +- include/upgrade-template.php | 2 +- scenario/FicheTest.php | 2 +- scenario/acc_ledger_AccountTest.php | 2 +- scenario/acc_ledger_historyTest.php | 2 +- scenario/ajax_acc_plan_mtable.php | 2 +- scenario/ajax_manage_table_sql.php | 2 +- scenario/create-database.php | 2 +- scenario/html_tab.test.php | 2 +- scenario/package_repository.test.php | 2 +- scenario/test_acc_plan_mtable.php | 2 +- scenario/test_manage_table_sql.php | 2 +- scenario/tva_parameter.php | 2 +- 53 files changed, 53 insertions(+), 53 deletions(-) diff --git a/include/ajax/ajax_accounting.php b/include/ajax/ajax_accounting.php index a0f6c81ff..82ba65b59 100644 --- a/include/ajax/ajax_accounting.php +++ b/include/ajax/ajax_accounting.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/ajax/ajax_anc_accounting.php b/include/ajax/ajax_anc_accounting.php index fe148215f..b7ecc23af 100644 --- a/include/ajax/ajax_anc_accounting.php +++ b/include/ajax/ajax_anc_accounting.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/ajax/ajax_anc_detail_operation.php b/include/ajax/ajax_anc_detail_operation.php index 81844a9bc..a12112657 100644 --- a/include/ajax/ajax_anc_detail_operation.php +++ b/include/ajax/ajax_anc_detail_operation.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/ajax/ajax_display_all_card.php b/include/ajax/ajax_display_all_card.php index 4f9b5168e..22332a051 100644 --- a/include/ajax/ajax_display_all_card.php +++ b/include/ajax/ajax_display_all_card.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/ajax/ajax_follow_up.php b/include/ajax/ajax_follow_up.php index bc99e3722..bd44370a9 100644 --- a/include/ajax/ajax_follow_up.php +++ b/include/ajax/ajax_follow_up.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/ajax/ajax_history_anc_account.php b/include/ajax/ajax_history_anc_account.php index 73036ae8a..5e643574b 100644 --- a/include/ajax/ajax_history_anc_account.php +++ b/include/ajax/ajax_history_anc_account.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/ajax/ajax_periode.php b/include/ajax/ajax_periode.php index 6dd49386a..df7af35ac 100644 --- a/include/ajax/ajax_periode.php +++ b/include/ajax/ajax_periode.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/ajax/ajax_search_filter.php b/include/ajax/ajax_search_filter.php index 30489b501..8d9419cf9 100644 --- a/include/ajax/ajax_search_filter.php +++ b/include/ajax/ajax_search_filter.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/ajax/ajax_template_cat_card.php b/include/ajax/ajax_template_cat_card.php index 05ad1c1cc..155bd2de2 100644 --- a/include/ajax/ajax_template_cat_card.php +++ b/include/ajax/ajax_template_cat_card.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/ajax/ajax_template_cat_category.php b/include/ajax/ajax_template_cat_category.php index 32f22d9e2..241b98954 100644 --- a/include/ajax/ajax_template_cat_category.php +++ b/include/ajax/ajax_template_cat_category.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/ajax/ajax_tva_parameter.php b/include/ajax/ajax_tva_parameter.php index 9dffd57c2..cf2107aa0 100644 --- a/include/ajax/ajax_tva_parameter.php +++ b/include/ajax/ajax_tva_parameter.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/ajax/ajax_user_security.php b/include/ajax/ajax_user_security.php index 6deddf0b9..43d8e37dd 100644 --- a/include/ajax/ajax_user_security.php +++ b/include/ajax/ajax_user_security.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/class/acc_ledger_history_financial.class.php b/include/class/acc_ledger_history_financial.class.php index 9b5a1d931..e8a0624f9 100644 --- a/include/class/acc_ledger_history_financial.class.php +++ b/include/class/acc_ledger_history_financial.class.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/class/acc_ledger_history_generic.class.php b/include/class/acc_ledger_history_generic.class.php index 4a68b0b61..3606193fa 100644 --- a/include/class/acc_ledger_history_generic.class.php +++ b/include/class/acc_ledger_history_generic.class.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/class/acc_ledger_history_purchase.class.php b/include/class/acc_ledger_history_purchase.class.php index 9db214052..8024ab7c2 100644 --- a/include/class/acc_ledger_history_purchase.class.php +++ b/include/class/acc_ledger_history_purchase.class.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/class/acc_ledger_history_sale.class.php b/include/class/acc_ledger_history_sale.class.php index 400de9944..693bad729 100644 --- a/include/class/acc_ledger_history_sale.class.php +++ b/include/class/acc_ledger_history_sale.class.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/class/acc_ledger_search.class.php b/include/class/acc_ledger_search.class.php index 8dd53fabf..40e0ca6a3 100644 --- a/include/class/acc_ledger_search.class.php +++ b/include/class/acc_ledger_search.class.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/class/anc_account_table.class.php b/include/class/anc_account_table.class.php index 62f652d34..a1beb3942 100644 --- a/include/class/anc_account_table.class.php +++ b/include/class/anc_account_table.class.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/class/package_contrib.class.php b/include/class/package_contrib.class.php index 19196398a..ef4d80a02 100644 --- a/include/class/package_contrib.class.php +++ b/include/class/package_contrib.class.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/class/package_core.class.php b/include/class/package_core.class.php index 45a167b3c..451148af8 100644 --- a/include/class/package_core.class.php +++ b/include/class/package_core.class.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/class/package_noalyss.class.php b/include/class/package_noalyss.class.php index d33fde657..6e1828875 100644 --- a/include/class/package_noalyss.class.php +++ b/include/class/package_noalyss.class.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/class/package_plugin.class.php b/include/class/package_plugin.class.php index 2c0dd98a6..2a6ddc7d4 100644 --- a/include/class/package_plugin.class.php +++ b/include/class/package_plugin.class.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/class/package_repository.class.php b/include/class/package_repository.class.php index cfb3026ac..11affb494 100644 --- a/include/class/package_repository.class.php +++ b/include/class/package_repository.class.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/class/package_template.class.php b/include/class/package_template.class.php index caa5666d4..fd2896fb3 100644 --- a/include/class/package_template.class.php +++ b/include/class/package_template.class.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/class/periode_ledger.class.php b/include/class/periode_ledger.class.php index f172df57a..6d484136a 100644 --- a/include/class/periode_ledger.class.php +++ b/include/class/periode_ledger.class.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/class/periode_ledger_table.class.php b/include/class/periode_ledger_table.class.php index 6fbc7450a..d3b9c28b0 100644 --- a/include/class/periode_ledger_table.class.php +++ b/include/class/periode_ledger_table.class.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/class/template_card_category.class.php b/include/class/template_card_category.class.php index fbd9c05c0..b5b7e439b 100644 --- a/include/class/template_card_category.class.php +++ b/include/class/template_card_category.class.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/class/tva_rate_mtable.class.php b/include/class/tva_rate_mtable.class.php index 804672f1c..6e21d10e4 100644 --- a/include/class/tva_rate_mtable.class.php +++ b/include/class/tva_rate_mtable.class.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/database/acc_plan_sql.class.php b/include/database/acc_plan_sql.class.php index c4c63e1f3..589f68d89 100644 --- a/include/database/acc_plan_sql.class.php +++ b/include/database/acc_plan_sql.class.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/database/poste_analytique_sql.class.php b/include/database/poste_analytique_sql.class.php index bbf11f865..a99b8a250 100644 --- a/include/database/poste_analytique_sql.class.php +++ b/include/database/poste_analytique_sql.class.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/lib/http_input.class.php b/include/lib/http_input.class.php index 77b3e1287..68d9648d1 100644 --- a/include/lib/http_input.class.php +++ b/include/lib/http_input.class.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/lib/icon_action.class.php b/include/lib/icon_action.class.php index 8d31bc801..b7331dc3b 100644 --- a/include/lib/icon_action.class.php +++ b/include/lib/icon_action.class.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/lib/inplace_switch.class.php b/include/lib/inplace_switch.class.php index 8120a8f9e..77d395331 100644 --- a/include/lib/inplace_switch.class.php +++ b/include/lib/inplace_switch.class.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/template/acc_ledger_history_financial_oneline.php b/include/template/acc_ledger_history_financial_oneline.php index bdcff150b..7c05350a1 100644 --- a/include/template/acc_ledger_history_financial_oneline.php +++ b/include/template/acc_ledger_history_financial_oneline.php @@ -7,7 +7,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/template/acc_ledger_history_purchase_detail.php b/include/template/acc_ledger_history_purchase_detail.php index d563af211..02d4fae07 100644 --- a/include/template/acc_ledger_history_purchase_detail.php +++ b/include/template/acc_ledger_history_purchase_detail.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/template/acc_ledger_history_purchase_extended.php b/include/template/acc_ledger_history_purchase_extended.php index 8f7b4eec1..c6b241275 100644 --- a/include/template/acc_ledger_history_purchase_extended.php +++ b/include/template/acc_ledger_history_purchase_extended.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/template/acc_ledger_history_purchase_oneline.php b/include/template/acc_ledger_history_purchase_oneline.php index f60544d97..97d011fc5 100644 --- a/include/template/acc_ledger_history_purchase_oneline.php +++ b/include/template/acc_ledger_history_purchase_oneline.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/template/acc_ledger_history_sale_detail.php b/include/template/acc_ledger_history_sale_detail.php index e747884a3..320632115 100644 --- a/include/template/acc_ledger_history_sale_detail.php +++ b/include/template/acc_ledger_history_sale_detail.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/template/acc_ledger_history_sale_extended.php b/include/template/acc_ledger_history_sale_extended.php index 4e7fa1856..9a0631fe7 100644 --- a/include/template/acc_ledger_history_sale_extended.php +++ b/include/template/acc_ledger_history_sale_extended.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/upgrade-core.php b/include/upgrade-core.php index 8ccd967fd..7ff0e5284 100644 --- a/include/upgrade-core.php +++ b/include/upgrade-core.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/upgrade-plugin.php b/include/upgrade-plugin.php index d557e7cdf..099db9f73 100644 --- a/include/upgrade-plugin.php +++ b/include/upgrade-plugin.php @@ -7,7 +7,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/include/upgrade-template.php b/include/upgrade-template.php index 3176d32fc..95eea01f1 100644 --- a/include/upgrade-template.php +++ b/include/upgrade-template.php @@ -7,7 +7,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/scenario/FicheTest.php b/scenario/FicheTest.php index 6e5c651da..b1970ec93 100644 --- a/scenario/FicheTest.php +++ b/scenario/FicheTest.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/scenario/acc_ledger_AccountTest.php b/scenario/acc_ledger_AccountTest.php index cc09e95c9..02be61717 100644 --- a/scenario/acc_ledger_AccountTest.php +++ b/scenario/acc_ledger_AccountTest.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/scenario/acc_ledger_historyTest.php b/scenario/acc_ledger_historyTest.php index 7337b8ca6..62dd95791 100644 --- a/scenario/acc_ledger_historyTest.php +++ b/scenario/acc_ledger_historyTest.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/scenario/ajax_acc_plan_mtable.php b/scenario/ajax_acc_plan_mtable.php index 935bde297..c782969ca 100644 --- a/scenario/ajax_acc_plan_mtable.php +++ b/scenario/ajax_acc_plan_mtable.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/scenario/ajax_manage_table_sql.php b/scenario/ajax_manage_table_sql.php index 83c1b4714..d7401060b 100644 --- a/scenario/ajax_manage_table_sql.php +++ b/scenario/ajax_manage_table_sql.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/scenario/create-database.php b/scenario/create-database.php index 6cd9b482f..02d2307af 100644 --- a/scenario/create-database.php +++ b/scenario/create-database.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/scenario/html_tab.test.php b/scenario/html_tab.test.php index f47ebd6bc..f629ef7ba 100644 --- a/scenario/html_tab.test.php +++ b/scenario/html_tab.test.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/scenario/package_repository.test.php b/scenario/package_repository.test.php index 5c14014b5..870015437 100644 --- a/scenario/package_repository.test.php +++ b/scenario/package_repository.test.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/scenario/test_acc_plan_mtable.php b/scenario/test_acc_plan_mtable.php index 383f63260..6c3840fd1 100644 --- a/scenario/test_acc_plan_mtable.php +++ b/scenario/test_acc_plan_mtable.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/scenario/test_manage_table_sql.php b/scenario/test_manage_table_sql.php index b342606cc..bfc4ae8ed 100644 --- a/scenario/test_manage_table_sql.php +++ b/scenario/test_manage_table_sql.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/scenario/tva_parameter.php b/scenario/tva_parameter.php index d721c5116..72154e8be 100644 --- a/scenario/tva_parameter.php +++ b/scenario/tva_parameter.php @@ -8,7 +8,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * PhpCompta is distributed in the hope that it will be useful, + * NOALYSS is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. From 25ef8ad6892ef3cc2fb0c979195b16d580f6950e Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Sat, 27 Jul 2019 17:50:42 +0200 Subject: [PATCH 06/14] Code Cleaning split PDF into PDF_Core and PDF --- include/class/anc_balance_double.class.php | 2 +- include/class/anc_balance_simple.class.php | 2 +- include/class/pdf.class.php | 144 ++++++ include/class/pdf_land.class.php | 71 +++ include/class/pdf_operation.class.php | 2 +- include/class/pdfbalance_simple.class.php | 63 +++ include/class/print_ledger_detail.class.php | 2 +- include/class/print_ledger_fin.class.php | 2 +- include/class/print_ledger_misc.class.php | 2 +- include/class/print_ledger_simple.class.php | 2 +- .../print_ledger_simple_without_vat.class.php | 2 +- include/export/export_balance_pdf.php | 3 +- include/export/export_fiche_balance_pdf.php | 2 +- include/export/export_fiche_detail_pdf.php | 2 +- include/export/export_fiche_pdf.php | 2 +- include/export/export_form_pdf.php | 4 +- include/export/export_gl_pdf.php | 2 +- include/export/export_ledger_pdf.php | 2 +- include/export/export_poste_detail_pdf.php | 2 +- include/export/export_security_pdf.php | 2 +- include/lib/pdf.class.php | 414 ------------------ include/lib/pdf_core.class.php | 225 ++++++++++ 22 files changed, 522 insertions(+), 432 deletions(-) create mode 100644 include/class/pdf.class.php create mode 100644 include/class/pdf_land.class.php create mode 100644 include/class/pdfbalance_simple.class.php delete mode 100644 include/lib/pdf.class.php create mode 100644 include/lib/pdf_core.class.php diff --git a/include/class/anc_balance_double.class.php b/include/class/anc_balance_double.class.php index 92337a374..0851e5bb6 100644 --- a/include/class/anc_balance_double.class.php +++ b/include/class/anc_balance_double.class.php @@ -30,7 +30,7 @@ require_once NOALYSS_INCLUDE.'/lib/ibutton.class.php'; require_once NOALYSS_INCLUDE.'/lib/ihidden.class.php'; require_once NOALYSS_INCLUDE.'/class/anc_print.class.php'; require_once NOALYSS_INCLUDE.'/class/anc_plan.class.php'; -require_once NOALYSS_INCLUDE.'/lib/pdf.class.php'; +require_once NOALYSS_INCLUDE.'/class/pdf.class.php'; /** * @class * @brief Print the crossed balance between 2 plan diff --git a/include/class/anc_balance_simple.class.php b/include/class/anc_balance_simple.class.php index 4766cc365..6a9764eea 100644 --- a/include/class/anc_balance_simple.class.php +++ b/include/class/anc_balance_simple.class.php @@ -27,7 +27,7 @@ require_once NOALYSS_INCLUDE.'/lib/ihidden.class.php'; require_once NOALYSS_INCLUDE.'/class/anc_print.class.php'; require_once NOALYSS_INCLUDE.'/class/anc_plan.class.php'; require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; -require_once NOALYSS_INCLUDE.'/lib/pdf.class.php'; +require_once NOALYSS_INCLUDE.'/class/pdfbalance_simple.class.php'; require_once NOALYSS_INCLUDE.'/header_print.php'; /*! \brief manage the simple balance for CA, inherit from balance_ca * diff --git a/include/class/pdf.class.php b/include/class/pdf.class.php new file mode 100644 index 000000000..f091ef37d --- /dev/null +++ b/include/class/pdf.class.php @@ -0,0 +1,144 @@ +cn = $p_cn; + + $this->own = new Noalyss_Parameter_Folder($this->cn); + $this->soc = $this->own->MY_NAME; + $this->date = date('d.m.Y'); + parent::__construct($orientation,$unit,$format); + date_default_timezone_set ('Europe/Paris'); + } + function setDossierInfo($dossier = "n/a") + { + $this->dossier = dossier::name()." ".$dossier; + } + function Header() + { + //Arial bold 12 + $this->SetFont('DejaVu', 'B', 12); + //Title + parent::Cell(0,10,$this->dossier, 'B', 0, 'C'); + //Line break + parent::Ln(20); + } + function Footer() + { + //Position at 2 cm from bottom + $this->SetY(-20); + //Arial italic 8 + $this->SetFont('Arial', '', 8); + //Page number + parent::Cell(0,8,'Date '.$this->date." - Page ".$this->PageNo().'/{nb}',0,0,'C'); + parent::Ln(3); + // Created by NOALYSS + parent::Cell(0,8,'Created by NOALYSS, online on http://www.noalyss.eu',0,0,'C',false,'http://www.noalyss.eu'); + } + /** + *@brief retrieve the client name and quick_code + *@param $p_jr_id jrn.jr_id + *@param $p_jrn_type ledger type ACH VEN FIN + *@return array (0=>qcode,1=>name) or for FIN 0=>customer qc 1=>customer name 2=>bank qc 3=>bank name + *@see class_print_ledger_simple, class_print_ledger_simple_without_vat + */ + function get_tiers($p_jr_id,$p_jrn_type) + { + if ( $p_jrn_type=='ACH' ) + { + $array=$this->cn->get_array('SELECT + jrnx.j_grpt, + quant_purchase.qp_supplier, + quant_purchase.qp_internal, + jrn.jr_internal + FROM + public.quant_purchase, + public.jrnx, + public.jrn + WHERE + quant_purchase.j_id = jrnx.j_id AND + jrnx.j_grpt = jrn.jr_grpt_id and jr_id=$1',array($p_jr_id)); + if (count($array)==0) return array("ERREUR $p_jr_id",''); + $customer_id=$array[0]['qp_supplier']; + $fiche=new Fiche($this->cn,$customer_id); + $customer_qc=$fiche->get_quick_code($customer_id); + $customer_name=$fiche->getName(); + return array($customer_qc,$customer_name); + } + if ( $p_jrn_type=='VEN' ) + { + $array=$this->cn->get_array('SELECT + quant_sold.qs_client + FROM + public.quant_sold, + public.jrnx, + public.jrn + WHERE + quant_sold.j_id = jrnx.j_id AND + jrnx.j_grpt = jrn.jr_grpt_id and jr_id=$1',array($p_jr_id)); + if (count($array)==0) return array("ERREUR $p_jr_id",''); + $customer_id=$array[0]['qs_client']; + $fiche=new Fiche($this->cn,$customer_id); + $customer_qc=$fiche->get_quick_code($customer_id); + $customer_name=$fiche->getName(); + return array($customer_qc,$customer_name); + } + if ( $p_jrn_type=='FIN' ) + { + $array=$this->cn->get_array('SELECT + qf_other,qf_bank + FROM + public.quant_fin + WHERE + quant_fin.jr_id =$1',array($p_jr_id)); + if (count($array)==0) return array("ERREUR $p_jr_id",'','',''); + $customer_id=$array[0]['qf_other']; + $fiche=new Fiche($this->cn,$customer_id); + $customer_qc=$fiche->get_quick_code($customer_id); + $customer_name=$fiche->getName(); + + $bank_id=$array[0]['qf_bank']; + $fiche=new Fiche($this->cn,$bank_id); + $bank_qc=$fiche->get_quick_code($bank_id); + $bank_name=$fiche->getName(); + + return array($customer_qc,$customer_name,$bank_qc,$bank_name); + } + } + + +} \ No newline at end of file diff --git a/include/class/pdf_land.class.php b/include/class/pdf_land.class.php new file mode 100644 index 000000000..811f39b87 --- /dev/null +++ b/include/class/pdf_land.class.php @@ -0,0 +1,71 @@ +bigger=0; + + parent::__construct($p_cn,'L', $unit, $format); + date_default_timezone_set ('Europe/Paris'); + $this->AddFont('DejaVu','','DejaVuSans.ttf',true); + $this->AddFont('DejaVu','B','DejaVuSans-Bold.ttf',true); + $this->AddFont('DejaVu','BI','DejaVuSans-BoldOblique.ttf',true); + $this->AddFont('DejaVuCond','','DejaVuSansCondensed.ttf',true); + $this->AddFont('DejaVuCond','B','DejaVuSansCondensed-Bold.ttf',true); + $this->AddFont('DejaVuCond','I','DejaVuSansCondensed-Oblique.ttf',true); + + $this->cn = $p_cn; + $this->own = new Noalyss_Parameter_Folder($this->cn); + $this->soc = $this->own->MY_NAME; + $this->date = date('d.m.Y'); + } + function Header() + { + //Arial bold 12 + $this->SetFont('DejaVu', 'B', 10); + //Title + $this->Cell(0,10,$this->dossier, 'B', 0, 'C'); + //Line break + $this->Ln(20); + } + function Footer() + { + //Position at 2 cm from bottom + $this->SetY(-20); + //Arial italic 8 + $this->SetFont('DejaVuCond', 'I', 8); + //Page number + $this->Cell(0,8,'Date '.$this->date." - Page ".$this->PageNo().'/{nb}',0,0,'C'); + $this->Ln(3); + // Created by NOALYSS + $this->Cell(0,8,'Created by NOALYSS, online on http://www.noalyss.eu',0,0,'C',false,'http://www.noalyss.eu'); + + } +} \ No newline at end of file diff --git a/include/class/pdf_operation.class.php b/include/class/pdf_operation.class.php index 19dc67d39..867b24392 100644 --- a/include/class/pdf_operation.class.php +++ b/include/class/pdf_operation.class.php @@ -25,7 +25,7 @@ * Detail Operation ACC + ANC , it will use Acc_Operation and Anc_Operation * */ -require_once NOALYSS_INCLUDE . '/lib/pdf.class.php'; +require_once NOALYSS_INCLUDE . '/class/pdf.class.php'; require_once NOALYSS_INCLUDE . '/class/acc_operation.class.php'; require_once NOALYSS_INCLUDE . '/class/acc_ledger.class.php'; require_once NOALYSS_INCLUDE . '/class/acc_operation.class.php'; diff --git a/include/class/pdfbalance_simple.class.php b/include/class/pdfbalance_simple.class.php new file mode 100644 index 000000000..d1da93504 --- /dev/null +++ b/include/class/pdfbalance_simple.class.php @@ -0,0 +1,63 @@ +dossier='Balance simple '.dossier::name(); + $this->from_poste=$p_from_poste; + $this->to_poste=$to_poste; + $this->from=$p_from; + $this->to=$p_to; + } + function Header() + { + parent::Header(); + $this->SetFont('DejaVu','B',8); + $titre=sprintf("Balance simple poste %s %s date %s %s", + $this->from_poste, + $this->to_poste, + $this->from, + $this->to); + $this->Cell(0,7,$titre,1,0,'C'); + + $this->Ln(); + $this->SetFont('DejaVu','',6); + + $this->Cell(110,7,'Poste Comptable','B'); + $this->Cell(20,7,'Débit','B',0,'L'); + $this->Cell(20,7,'Crédit','B',0,'L'); + $this->Cell(20,7,'Solde','B',0,'L'); + $this->Cell(20,7,'D/C','B',0,'L'); + $this->Ln(); + + } +} diff --git a/include/class/print_ledger_detail.class.php b/include/class/print_ledger_detail.class.php index d8c458cd4..2c59ecfb8 100644 --- a/include/class/print_ledger_detail.class.php +++ b/include/class/print_ledger_detail.class.php @@ -23,7 +23,7 @@ * \brief this class extends PDF and let you export the detailled printing * of any ledgers */ -require_once NOALYSS_INCLUDE.'/lib/pdf.class.php'; +require_once NOALYSS_INCLUDE.'/class/pdf_land.class.php'; class Print_Ledger_Detail extends PDF { diff --git a/include/class/print_ledger_fin.class.php b/include/class/print_ledger_fin.class.php index bfa141c81..3fa367fef 100644 --- a/include/class/print_ledger_fin.class.php +++ b/include/class/print_ledger_fin.class.php @@ -22,7 +22,7 @@ /*!\file * \brief print a listing of financial */ -require_once NOALYSS_INCLUDE.'/lib/pdf.class.php'; +require_once NOALYSS_INCLUDE.'/class/pdf.class.php'; class Print_Ledger_Financial extends PDF { private $rap_amount; /* amount from begining exercice */ diff --git a/include/class/print_ledger_misc.class.php b/include/class/print_ledger_misc.class.php index 72910b4e6..037f5378f 100644 --- a/include/class/print_ledger_misc.class.php +++ b/include/class/print_ledger_misc.class.php @@ -22,7 +22,7 @@ /*!\file * \brief print a listing of financial */ -require_once NOALYSS_INCLUDE.'/lib/pdf.class.php'; +require_once NOALYSS_INCLUDE.'/class/pdf.class.php'; class Print_Ledger_Misc extends PDF { function __construct($p_cn,$p_jrn) diff --git a/include/class/print_ledger_simple.class.php b/include/class/print_ledger_simple.class.php index 114d5f201..ef21133cf 100644 --- a/include/class/print_ledger_simple.class.php +++ b/include/class/print_ledger_simple.class.php @@ -23,7 +23,7 @@ * \brief this class extends PDF and let you export the detailled printing * of any ledgers */ -require_once NOALYSS_INCLUDE.'/lib/pdf.class.php'; +require_once NOALYSS_INCLUDE.'/class/pdf.class.php'; class Print_Ledger_Simple extends PDF { diff --git a/include/class/print_ledger_simple_without_vat.class.php b/include/class/print_ledger_simple_without_vat.class.php index ec77e2381..56653592f 100644 --- a/include/class/print_ledger_simple_without_vat.class.php +++ b/include/class/print_ledger_simple_without_vat.class.php @@ -23,7 +23,7 @@ * \brief this class extends PDF and let you export the detailled printing * of any ledgers */ -require_once NOALYSS_INCLUDE.'/lib/pdf.class.php'; +require_once NOALYSS_INCLUDE.'/class/pdf.class.php'; class Print_Ledger_Simple_Without_Vat extends PDF { diff --git a/include/export/export_balance_pdf.php b/include/export/export_balance_pdf.php index f78fc392a..2490bb13f 100644 --- a/include/export/export_balance_pdf.php +++ b/include/export/export_balance_pdf.php @@ -35,7 +35,8 @@ require_once NOALYSS_INCLUDE . '/class/database.class.php'; include_once("class/acc_balance.class.php"); require_once NOALYSS_INCLUDE . '/header_print.php'; require_once NOALYSS_INCLUDE . '/class/dossier.class.php'; -require_once NOALYSS_INCLUDE . '/lib/pdf.class.php'; +require_once NOALYSS_INCLUDE . '/class/pdf.class.php'; +require_once NOALYSS_INCLUDE . '/class/pdf_land.class.php'; require_once NOALYSS_INCLUDE . '/lib/http_input.class.php'; $http = new HttpInput(); diff --git a/include/export/export_fiche_balance_pdf.php b/include/export/export_fiche_balance_pdf.php index e25d87a85..3c027cb53 100644 --- a/include/export/export_fiche_balance_pdf.php +++ b/include/export/export_fiche_balance_pdf.php @@ -27,7 +27,7 @@ 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.class.php'; require_once NOALYSS_INCLUDE.'/class/database.class.php'; -require_once NOALYSS_INCLUDE.'/lib/pdf.class.php'; +require_once NOALYSS_INCLUDE.'/class/pdf.class.php'; require_once NOALYSS_INCLUDE.'/class/lettering.class.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; diff --git a/include/export/export_fiche_detail_pdf.php b/include/export/export_fiche_detail_pdf.php index 187d7bf61..de21a96ff 100644 --- a/include/export/export_fiche_detail_pdf.php +++ b/include/export/export_fiche_detail_pdf.php @@ -31,7 +31,7 @@ require_once NOALYSS_INCLUDE.'/class/fiche.class.php'; require_once NOALYSS_INCLUDE.'/header_print.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; require_once NOALYSS_INCLUDE.'/class/acc_operation.class.php'; -require_once NOALYSS_INCLUDE.'/lib/pdf.class.php'; +require_once NOALYSS_INCLUDE.'/class/pdf.class.php'; require_once NOALYSS_INCLUDE.'/lib/http_input.class.php'; $http=new HttpInput(); diff --git a/include/export/export_fiche_pdf.php b/include/export/export_fiche_pdf.php index 04ceae7a0..03585e55a 100644 --- a/include/export/export_fiche_pdf.php +++ b/include/export/export_fiche_pdf.php @@ -28,7 +28,7 @@ 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.class.php'; require_once NOALYSS_INCLUDE.'/class/database.class.php'; -require_once NOALYSS_INCLUDE.'/lib/pdf.class.php'; +require_once NOALYSS_INCLUDE.'/class/pdf.class.php'; require_once NOALYSS_INCLUDE.'/class/lettering.class.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; diff --git a/include/export/export_form_pdf.php b/include/export/export_form_pdf.php index a6d5682fe..71ad34ee4 100644 --- a/include/export/export_form_pdf.php +++ b/include/export/export_form_pdf.php @@ -31,7 +31,7 @@ require_once NOALYSS_INCLUDE.'/class/user.class.php'; require_once NOALYSS_INCLUDE.'/header_print.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; require_once NOALYSS_INCLUDE.'/class/acc_report.class.php'; -require_once NOALYSS_INCLUDE.'/lib/pdf.class.php'; +require_once NOALYSS_INCLUDE.'/class/pdf.class.php'; require_once NOALYSS_INCLUDE.'/lib/http_input.class.php'; $http=new HttpInput(); @@ -55,7 +55,7 @@ $pdf->setTitle("Rapport ".$Libelle,true); // Step ?? //-- -$p_step=$http->get('p_step',"string",0); +$step=$http->get('p_step',"string",0); if ( $step == 0 ) { // No step asked diff --git a/include/export/export_gl_pdf.php b/include/export/export_gl_pdf.php index a335fcce0..eda3328e3 100644 --- a/include/export/export_gl_pdf.php +++ b/include/export/export_gl_pdf.php @@ -30,7 +30,7 @@ include_once('lib/impress.class.php'); require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; require_once NOALYSS_INCLUDE.'/class/user.class.php'; -require_once NOALYSS_INCLUDE.'/lib/pdf.class.php'; +require_once NOALYSS_INCLUDE.'/class/pdf.class.php'; require_once NOALYSS_INCLUDE.'/lib/http_input.class.php'; $http=new HttpInput(); $from_periode = $http->get("from_periode","date"); diff --git a/include/export/export_ledger_pdf.php b/include/export/export_ledger_pdf.php index eb224b09b..9f30e8d93 100644 --- a/include/export/export_ledger_pdf.php +++ b/include/export/export_ledger_pdf.php @@ -28,7 +28,7 @@ if (!defined('ALLOWED')) die('Appel direct ne sont pas permis'); require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; $gDossier = dossier::id(); -require_once NOALYSS_INCLUDE.'/lib/pdf.class.php'; +require_once NOALYSS_INCLUDE.'/class/pdf.class.php'; require_once NOALYSS_INCLUDE.'/class/user.class.php'; require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; require_once NOALYSS_INCLUDE.'/class/database.class.php'; diff --git a/include/export/export_poste_detail_pdf.php b/include/export/export_poste_detail_pdf.php index edb91ced6..f755dab26 100644 --- a/include/export/export_poste_detail_pdf.php +++ b/include/export/export_poste_detail_pdf.php @@ -31,7 +31,7 @@ require_once NOALYSS_INCLUDE.'/header_print.php'; require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; require_once NOALYSS_INCLUDE.'/class/acc_operation.class.php'; require_once NOALYSS_INCLUDE.'/class/user.class.php'; -require_once NOALYSS_INCLUDE.'/lib/pdf.class.php'; +require_once NOALYSS_INCLUDE.'/class/pdf.class.php'; require_once NOALYSS_INCLUDE.'/lib/http_input.class.php'; $http=new HttpInput(); diff --git a/include/export/export_security_pdf.php b/include/export/export_security_pdf.php index 47ef7df61..9f461c66c 100755 --- a/include/export/export_security_pdf.php +++ b/include/export/export_security_pdf.php @@ -26,7 +26,7 @@ require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; $gDossier=dossier::id(); require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; require_once NOALYSS_INCLUDE.'/class/database.class.php'; -require_once NOALYSS_INCLUDE.'/lib/pdf.class.php'; +require_once NOALYSS_INCLUDE.'/class/pdf.class.php'; require_once NOALYSS_INCLUDE.'/lib/http_input.class.php'; $http=new HttpInput(); diff --git a/include/lib/pdf.class.php b/include/lib/pdf.class.php deleted file mode 100644 index 90600bd7b..000000000 --- a/include/lib/pdf.class.php +++ /dev/null @@ -1,414 +0,0 @@ -width=$w ; - $this->height=$h ; - $this->text=$txt; - $this->border=$border; - $this->new_line=$ln; - $this->align=$align; - $this->fill=$fill; - $this->link=$link; - $this->type=$type; - return $this; - } -} -class PDF extends TFPDF -{ - - var $cn = null; - var $own = null; - var $soc = ""; - var $dossier = "n/a"; - var $date = ""; - private $cells=array(); - - public function __construct ($p_cn = null, $orientation = 'P', $unit = 'mm', $format = 'A4') - { - $this->bigger=0; - if($p_cn == null) die("No database connection. Abort."); - - parent::__construct($orientation, $unit, $format); - $this->AddFont('DejaVu','','DejaVuSans.ttf',true); - $this->AddFont('DejaVu','B','DejaVuSans-Bold.ttf',true); - $this->AddFont('DejaVu','BI','DejaVuSans-BoldOblique.ttf',true); - $this->AddFont('DejaVuCond','','DejaVuSansCondensed.ttf',true); - $this->AddFont('DejaVuCond','B','DejaVuSansCondensed-Bold.ttf',true); - $this->AddFont('DejaVuCond','I','DejaVuSansCondensed-Oblique.ttf',true); - date_default_timezone_set ('Europe/Paris'); - - $this->cn = $p_cn; - $this->own = new Noalyss_Parameter_Folder($this->cn); - $this->soc = $this->own->MY_NAME; - $this->date = date('d.m.Y'); - $this->cells=array(); - } - - function setDossierInfo($dossier = "n/a") - { - $this->dossier = dossier::name()." ".$dossier; - } - - function Header() - { - //Arial bold 12 - $this->SetFont('DejaVu', 'B', 12); - //Title - parent::Cell(0,10,$this->dossier, 'B', 0, 'C'); - //Line break - parent::Ln(20); - } - function Footer() - { - //Position at 2 cm from bottom - $this->SetY(-20); - //Arial italic 8 - $this->SetFont('Arial', '', 8); - //Page number - parent::Cell(0,8,'Date '.$this->date." - Page ".$this->PageNo().'/{nb}',0,0,'C'); - parent::Ln(3); - // Created by NOALYSS - parent::Cell(0,8,'Created by NOALYSS, online on http://www.noalyss.eu',0,0,'C',false,'http://www.noalyss.eu'); - } - /** - * Count the number of rows a p_text will take for a multicell - * @param $p_text String - * @param $p_colSize size of the column in User Unit - */ - private function count_nb_row($p_text,$p_colSize) - { - // If colSize is bigger than the size of the string then it takes 1 line - if ( $this->GetStringWidth($p_text) <= $p_colSize) return 1; - $nRow=0; - $aWords=explode(' ',$p_text); - $nb_words=count($aWords); - $string=""; - - for ($i=0;$i < $nb_words;$i++){ - // Concatenate String with current word + a space - $string.=$aWords[$i]; - - // if there is a word after add a space - if ( $i+1 < $nb_words) $string.=" "; - - // Compute new size and compare to the colSize - if ( $this->GetStringWidth($string) >= $p_colSize) { - // If the size of the string if bigger than we add a row, the current - // word is the first word of the next line - $nRow++; - $string=$aWords[$i]; - } - } - $nRow++; - return $nRow; - - - - } - /** - * Check if a page must be added due a MultiCell - * @return boolean - */ - private function check_page_add() - { - // break on page - $size=count($this->cells); - for ($i=0;$i < $size ; $i++) - { - if ($this->cells[$i]->type == 'M' ) - { - /** - * On doit calculer si le texte dépasse la texte et compter le - * nombre de lignes que le texte prendrait. Ensuite il faut - * faire un saut de page (renvoit true) si dépasse - */ - - $sizetext=$this->GetStringWidth($this->cells[$i]->text); - - // if text bigger than column width then check - - $y=$this->GetY(); - $nb_row=$this->count_nb_row($this->cells[$i]->text, $this->cells[$i]->width); - $height=$this->cells[$i]->height*$nb_row; - - // If the text is bigger than a sheet of paper then return false - if ($height >= $this->h) return false; - - if ( $y + $height > ($this->h - $this->bMargin -7 )) - return true; - - } - } - return false; - } - private function print_row() - { - static $e=0; - $e++; - if ( $this->check_page_add() == true ) $this->AddPage (); - $this->bigger=0; - $size=count($this->cells); - $cell=$this->cells; - if ($size == 0 )return; - for ($i=0;$i < $size ; $i++) - { - $a=$cell[$i]; - $a->text= str_replace("\\", "", $a->text); - switch ($a->type) - { - case "M": - $x_m=$this->GetX(); - $y_m=$this->GetY(); - parent::MultiCell( - $a->width, - $a->height, - $a->text, - $a->border, - $a->align, - $a->fill - ); - $x_m=$x_m+$a->width; - $tmp=$this->GetY()-$y_m; - if ( $tmp > $this->bigger) $this->bigger=$tmp; - $this->SetXY($x_m,$y_m); - break; - - case "C": - - parent::Cell( $a->width, - $a->height, - $a->text, - $a->border, - $a->new_line, - $a->align, - $a->fill, - $a->link); - break; - - default: - break; - } - } - $this->cells=array(); - } - private function add_cell(Cellule $Ce) - { - $size=count($this->cells); - $this->cells[$size]=$Ce; - - } - function write_cell ($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='') - { - $this->add_cell(new Cellule($w,$h,$txt,$border,$ln,$align,$fill,$link,'C')); - - } - function LongLine($w,$h,$txt,$border=0,$align='',$fill=false) - { - $this->add_cell(new Cellule($w,$h,$txt,$border,0,$align,$fill,'','M')); - - } - function line_new($p_step=null){ - $this->print_row(); - if ( $this->bigger==0) - parent::Ln($p_step); - else - parent::Ln($this->bigger); - $this->bigger=0; - } - /** - *@brief retrieve the client name and quick_code - *@param $p_jr_id jrn.jr_id - *@param $p_jrn_type ledger type ACH VEN FIN - *@return array (0=>qcode,1=>name) or for FIN 0=>customer qc 1=>customer name 2=>bank qc 3=>bank name - *@see class_print_ledger_simple, class_print_ledger_simple_without_vat - */ - function get_tiers($p_jr_id,$p_jrn_type) - { - if ( $p_jrn_type=='ACH' ) - { - $array=$this->cn->get_array('SELECT - jrnx.j_grpt, - quant_purchase.qp_supplier, - quant_purchase.qp_internal, - jrn.jr_internal - FROM - public.quant_purchase, - public.jrnx, - public.jrn - WHERE - quant_purchase.j_id = jrnx.j_id AND - jrnx.j_grpt = jrn.jr_grpt_id and jr_id=$1',array($p_jr_id)); - if (count($array)==0) return array("ERREUR $p_jr_id",''); - $customer_id=$array[0]['qp_supplier']; - $fiche=new Fiche($this->cn,$customer_id); - $customer_qc=$fiche->get_quick_code($customer_id); - $customer_name=$fiche->getName(); - return array($customer_qc,$customer_name); - } - if ( $p_jrn_type=='VEN' ) - { - $array=$this->cn->get_array('SELECT - quant_sold.qs_client - FROM - public.quant_sold, - public.jrnx, - public.jrn - WHERE - quant_sold.j_id = jrnx.j_id AND - jrnx.j_grpt = jrn.jr_grpt_id and jr_id=$1',array($p_jr_id)); - if (count($array)==0) return array("ERREUR $p_jr_id",''); - $customer_id=$array[0]['qs_client']; - $fiche=new Fiche($this->cn,$customer_id); - $customer_qc=$fiche->get_quick_code($customer_id); - $customer_name=$fiche->getName(); - return array($customer_qc,$customer_name); - } - if ( $p_jrn_type=='FIN' ) - { - $array=$this->cn->get_array('SELECT - qf_other,qf_bank - FROM - public.quant_fin - WHERE - quant_fin.jr_id =$1',array($p_jr_id)); - if (count($array)==0) return array("ERREUR $p_jr_id",'','',''); - $customer_id=$array[0]['qf_other']; - $fiche=new Fiche($this->cn,$customer_id); - $customer_qc=$fiche->get_quick_code($customer_id); - $customer_name=$fiche->getName(); - - $bank_id=$array[0]['qf_bank']; - $fiche=new Fiche($this->cn,$bank_id); - $bank_qc=$fiche->get_quick_code($bank_id); - $bank_name=$fiche->getName(); - - return array($customer_qc,$customer_name,$bank_qc,$bank_name); - } - } - - -} - -class PDFLand extends PDF -{ - - public function __construct ($p_cn = null, $orientation = 'P', $unit = 'mm', $format = 'A4') - { - - if($p_cn == null) die("No database connection. Abort."); - $this->bigger=0; - - parent::__construct($p_cn,'L', $unit, $format); - date_default_timezone_set ('Europe/Paris'); - $this->AddFont('DejaVu','','DejaVuSans.ttf',true); - $this->AddFont('DejaVu','B','DejaVuSans-Bold.ttf',true); - $this->AddFont('DejaVu','BI','DejaVuSans-BoldOblique.ttf',true); - $this->AddFont('DejaVuCond','','DejaVuSansCondensed.ttf',true); - $this->AddFont('DejaVuCond','B','DejaVuSansCondensed-Bold.ttf',true); - $this->AddFont('DejaVuCond','I','DejaVuSansCondensed-Oblique.ttf',true); - - $this->cn = $p_cn; - $this->own = new Noalyss_Parameter_Folder($this->cn); - $this->soc = $this->own->MY_NAME; - $this->date = date('d.m.Y'); - } - function Header() - { - //Arial bold 12 - $this->SetFont('DejaVu', 'B', 10); - //Title - $this->Cell(0,10,$this->dossier, 'B', 0, 'C'); - //Line break - $this->Ln(20); - } - function Footer() - { - //Position at 2 cm from bottom - $this->SetY(-20); - //Arial italic 8 - $this->SetFont('DejaVuCond', 'I', 8); - //Page number - $this->Cell(0,8,'Date '.$this->date." - Page ".$this->PageNo().'/{nb}',0,0,'C'); - $this->Ln(3); - // Created by NOALYSS - $this->Cell(0,8,'Created by NOALYSS, online on http://www.noalyss.eu',0,0,'C',false,'http://www.noalyss.eu'); - - } -} - -class PDFBalance_simple extends PDF -{ - /** - *@brief set_info(dossier,from poste,to poste, from periode, to periode) - *@param $p_from_poste start = poste - *@param $p_to_poste end = poste - *@param $p_from periode start - *@param $p_to periode end - */ - function set_info($p_from_poste,$to_poste,$p_from,$p_to) - { - $this->dossier='Balance simple '.dossier::name(); - $this->from_poste=$p_from_poste; - $this->to_poste=$to_poste; - $this->from=$p_from; - $this->to=$p_to; - } - function Header() - { - parent::Header(); - $this->SetFont('DejaVu','B',8); - $titre=sprintf("Balance simple poste %s %s date %s %s", - $this->from_poste, - $this->to_poste, - $this->from, - $this->to); - $this->Cell(0,7,$titre,1,0,'C'); - - $this->Ln(); - $this->SetFont('DejaVu','',6); - - $this->Cell(110,7,'Poste Comptable','B'); - $this->Cell(20,7,'Débit','B',0,'L'); - $this->Cell(20,7,'Crédit','B',0,'L'); - $this->Cell(20,7,'Solde','B',0,'L'); - $this->Cell(20,7,'D/C','B',0,'L'); - $this->Ln(); - - } -} diff --git a/include/lib/pdf_core.class.php b/include/lib/pdf_core.class.php new file mode 100644 index 000000000..805bd8761 --- /dev/null +++ b/include/lib/pdf_core.class.php @@ -0,0 +1,225 @@ +width=$w ; + $this->height=$h ; + $this->text=$txt; + $this->border=$border; + $this->new_line=$ln; + $this->align=$align; + $this->fill=$fill; + $this->link=$link; + $this->type=$type; + return $this; + } +} +class PDF_Core extends TFPDF +{ + + + + private $cells=array(); + + public function __construct ( $orientation = 'P', $unit = 'mm', $format = 'A4') + { + $this->bigger=0; + + parent::__construct($orientation, $unit, $format); + $this->AddFont('DejaVu','','DejaVuSans.ttf',true); + $this->AddFont('DejaVu','B','DejaVuSans-Bold.ttf',true); + $this->AddFont('DejaVu','BI','DejaVuSans-BoldOblique.ttf',true); + $this->AddFont('DejaVuCond','','DejaVuSansCondensed.ttf',true); + $this->AddFont('DejaVuCond','B','DejaVuSansCondensed-Bold.ttf',true); + $this->AddFont('DejaVuCond','I','DejaVuSansCondensed-Oblique.ttf',true); + + + + $this->cells=array(); + } + + + /** + * Count the number of rows a p_text will take for a multicell + * @param $p_text String + * @param $p_colSize size of the column in User Unit + */ + private function count_nb_row($p_text,$p_colSize) + { + // If colSize is bigger than the size of the string then it takes 1 line + if ( $this->GetStringWidth($p_text) <= $p_colSize) return 1; + $nRow=0; + $aWords=explode(' ',$p_text); + $nb_words=count($aWords); + $string=""; + + for ($i=0;$i < $nb_words;$i++){ + // Concatenate String with current word + a space + $string.=$aWords[$i]; + + // if there is a word after add a space + if ( $i+1 < $nb_words) $string.=" "; + + // Compute new size and compare to the colSize + if ( $this->GetStringWidth($string) >= $p_colSize) { + // If the size of the string if bigger than we add a row, the current + // word is the first word of the next line + $nRow++; + $string=$aWords[$i]; + } + } + $nRow++; + return $nRow; + + + + } + /** + * Check if a page must be added due a MultiCell + * @return boolean + */ + private function check_page_add() + { + // break on page + $size=count($this->cells); + for ($i=0;$i < $size ; $i++) + { + if ($this->cells[$i]->type == 'M' ) + { + /** + * On doit calculer si le texte dépasse la texte et compter le + * nombre de lignes que le texte prendrait. Ensuite il faut + * faire un saut de page (renvoit true) si dépasse + */ + + $sizetext=$this->GetStringWidth($this->cells[$i]->text); + + // if text bigger than column width then check + + $y=$this->GetY(); + $nb_row=$this->count_nb_row($this->cells[$i]->text, $this->cells[$i]->width); + $height=$this->cells[$i]->height*$nb_row; + + // If the text is bigger than a sheet of paper then return false + if ($height >= $this->h) return false; + + if ( $y + $height > ($this->h - $this->bMargin -7 )) + return true; + + } + } + return false; + } + private function print_row() + { + static $e=0; + $e++; + if ( $this->check_page_add() == true ) $this->AddPage (); + $this->bigger=0; + $size=count($this->cells); + $cell=$this->cells; + if ($size == 0 )return; + for ($i=0;$i < $size ; $i++) + { + $a=$cell[$i]; + $a->text= str_replace("\\", "", $a->text); + switch ($a->type) + { + case "M": + $x_m=$this->GetX(); + $y_m=$this->GetY(); + parent::MultiCell( + $a->width, + $a->height, + $a->text, + $a->border, + $a->align, + $a->fill + ); + $x_m=$x_m+$a->width; + $tmp=$this->GetY()-$y_m; + if ( $tmp > $this->bigger) $this->bigger=$tmp; + $this->SetXY($x_m,$y_m); + break; + + case "C": + + parent::Cell( $a->width, + $a->height, + $a->text, + $a->border, + $a->new_line, + $a->align, + $a->fill, + $a->link); + break; + + default: + break; + } + } + $this->cells=array(); + } + private function add_cell(Cellule $Ce) + { + $size=count($this->cells); + $this->cells[$size]=$Ce; + + } + function write_cell ($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='') + { + $this->add_cell(new Cellule($w,$h,$txt,$border,$ln,$align,$fill,$link,'C')); + + } + function LongLine($w,$h,$txt,$border=0,$align='',$fill=false) + { + $this->add_cell(new Cellule($w,$h,$txt,$border,0,$align,$fill,'','M')); + + } + function line_new($p_step=null){ + $this->print_row(); + if ( $this->bigger==0) + parent::Ln($p_step); + else + parent::Ln($this->bigger); + $this->bigger=0; + } + + +} + From 54f8bb1d4b5babad9e4f24561b2b3aa91920e800 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Sat, 27 Jul 2019 17:53:17 +0200 Subject: [PATCH 07/14] Improve doxygen --- doc/developper/Doxyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/developper/Doxyfile b/doc/developper/Doxyfile index 3571e04c5..5cf03c545 100644 --- a/doc/developper/Doxyfile +++ b/doc/developper/Doxyfile @@ -887,7 +887,7 @@ HTML_ALIGN_MEMBERS = YES # JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox # Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). -HTML_DYNAMIC_SECTIONS = NO +HTML_DYNAMIC_SECTIONS = YES # If the GENERATE_DOCSET tag is set to YES, additional index files # will be generated that can be used as input for Apple's Xcode 3 From 9a483f19c38abd709a320477bbda05377dd08730 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Sat, 27 Jul 2019 17:53:59 +0200 Subject: [PATCH 08/14] Doxygen does not allow to document javascript Remove tag for using with jsdoc --- html/js/acc_ledger.js | 58 +++++++++++++++++++------------------- html/js/accounting_item.js | 8 +++--- html/js/admin.js | 2 +- html/js/anc_script.js | 10 +++---- html/js/card.js | 34 +++++++++++----------- html/js/gestion.js | 26 ++++++++--------- 6 files changed, 69 insertions(+), 69 deletions(-) diff --git a/html/js/acc_ledger.js b/html/js/acc_ledger.js index 3bbe15048..917c57f30 100644 --- a/html/js/acc_ledger.js +++ b/html/js/acc_ledger.js @@ -26,7 +26,7 @@ */ var layer = 1; /** - * @brief update the list of available predefined operation when we change the ledger. + * update the list of available predefined operation when we change the ledger. */ function update_predef(p_type, p_direct, p_ac) { @@ -64,7 +64,7 @@ function update_predef(p_type, p_direct, p_ac) } /** - * @brief update the list of payment method when we change the ledger. + * update the list of payment method when we change the ledger. */ function update_pay_method() { @@ -88,7 +88,7 @@ function update_pay_method() } /** - *@brief update ctl id =jrn_name with the value of p_jrn + * update ctl id =jrn_name with the value of p_jrn */ function update_name() { @@ -109,7 +109,7 @@ function update_name() } /** - * @brief update the field predef + * update the field predef */ function error_get_predef(request, json) { @@ -117,7 +117,7 @@ function error_get_predef(request, json) } /** - * @brief update the list of available predefined operation when we change the ledger. + * update the list of available predefined operation when we change the ledger. */ function update_pj() { @@ -135,7 +135,7 @@ function update_pj() ); } /** - *@brief ask the name, quick_code of the bank for the ledger + * ask the name, quick_code of the bank for the ledger */ function update_bank() { @@ -154,7 +154,7 @@ function update_bank() } /** - * @brief Update the number of rows when changing of ledger + * Update the number of rows when changing of ledger */ function update_row(ctl) { @@ -211,7 +211,7 @@ function update_row(ctl) } } /** - * @brief Put into the span, the name of the bank, the bank account + * Put into the span, the name of the bank, the bank account * and the quick_code */ function success_update_bank(req) @@ -237,7 +237,7 @@ function success_update_bank(req) } } /** - * @brief call ajax, ask what is the last date for the current ledger + * call ajax, ask what is the last date for the current ledger */ function get_last_date() { @@ -255,7 +255,7 @@ function get_last_date() ); } /** - * @brief callback ajax, set the ctl with the last date from the ledger + * callback ajax, set the ctl with the last date from the ledger */ function success_get_last_date(req) { @@ -280,7 +280,7 @@ function success_get_last_date(req) } } /** - * @brief update the field predef + * update the field predef */ function success_get_pj(request, json) { @@ -294,7 +294,7 @@ function success_get_pj(request, json) g("e_pj_suggest").value = answer.pj; } /** - * @brief update the field predef + * update the field predef */ function error_get_pj(request, json) { @@ -302,7 +302,7 @@ function error_get_pj(request, json) } /** - * @brief add a line in the form for the ledger fin + * add a line in the form for the ledger fin */ function ledger_fin_add_row() { @@ -345,7 +345,7 @@ function ledger_fin_add_row() } /** - * @brief add a line in the form for the purchase ledger + * add a line in the form for the purchase ledger * @param p_dossier folder id * @param p_table_name */ @@ -389,7 +389,7 @@ function ledger_add_row() } } /** - * @brief compute the sum of a purchase, update the span tvac, htva and tva + * compute the sum of a purchase, update the span tvac, htva and tva * all the needed data are taken from the document (hidden field : gdossier) * @param the number of the changed ctrl */ @@ -444,7 +444,7 @@ function compute_ledger(p_ctl_nb) ); } /** - *@brief refresh the purchase screen, recompute vat, total... + * refresh the purchase screen, recompute vat, total... */ function refresh_ledger() { @@ -470,7 +470,7 @@ function refresh_ledger() g('tvac').innerHTML = Math.round(tvac * 100) / 100; } /** - *@brief update the field htva, tva_id and tvac, callback function for compute_sold + * update the field htva, tva_id and tvac, callback function for compute_sold * it the field TVA in the answer contains NA it means that VAT is appliable and then do not * update the VAT field except htva_martc */ @@ -515,7 +515,7 @@ function success_compute_ledger(request, json) } /** - * @brief callback error function for compute_sold + * callback error function for compute_sold */ function error_compute_ledger(request, json) { @@ -591,7 +591,7 @@ function clean_ledger(p_ctl_nb) } /** - * @brief add a line in the form for the quick_writing + * add a line in the form for the quick_writing */ function quick_writing_add_row() { @@ -651,7 +651,7 @@ function go_next_concerned() return true; } /** - * @brief View the history of an account + * View the history of an account * @param {type} p_value * @param {type} dossier * @returns {undefined} @@ -683,7 +683,7 @@ function view_history_account(p_value, dossier,p_exercice) } /** - * @brief View the history of an account + * View the history of an account * @param {type} p_value * @param {type} dossier * @returns {undefined} @@ -715,7 +715,7 @@ function view_history_anc_account(p_value, dossier,p_exercice) } /** - * @brief Change the view of account history + * Change the view of account history * @param {type} obj * @returns {Boolean} */ @@ -788,7 +788,7 @@ function view_history_card(p_value, dossier,p_exercice) ); } /** - * @brief update history view after changing the exercice + * update history view after changing the exercice * @param {type} obj * @returns {Boolean} */ @@ -951,7 +951,7 @@ function dropLink(p_dossier, p_div, p_jr_id, p_jr_id2) ); } /** - *@brief this function is called before the querystring is send to the + * this function is called before the querystring is send to the * fid2.php, add a filter based on the ledger 'p_jrn' *@param obj is the input field *@param queryString is the queryString to modify @@ -972,7 +972,7 @@ function filter_card(obj, queryString) return queryString; } /** - *@brief to display the lettering for the operation, call + * to display the lettering for the operation, call * ajax function *@param obj object attribut : gDossier,j_id,obj_type */ @@ -1082,7 +1082,7 @@ function search_letter(obj) } } /** - *@brief save an operation in ajax, it concerns only the + * save an operation in ajax, it concerns only the * comment, the pj and the rapt * the form elements are access by their name *@param obj form @@ -1205,7 +1205,7 @@ function show_reconcile(p_div, p_let) } /** - * @brief add a line in the form for the purchase ledger + * add a line in the form for the purchase ledger */ function gestion_add_row() { @@ -1268,7 +1268,7 @@ function document_remove(p_dossier,p_div,p_jrid) }); } /*** - * @brief receive an object and display a list of filter + form to save one + * receive an object and display a list of filter + form to save one * fill up the span (id : {div}search_filter_span) with the name of the selected filter * Object = '{'div':'','type':'ALL','all_type':1,'dossier':'10104'}' * @see Acc_Ledger_Search @@ -1401,7 +1401,7 @@ function load_filter(p_div,p_dossier,p_filter_id) { }); } /** - * @brief delete a saved search filter from the db, it is limited to the current + * delete a saved search filter from the db, it is limited to the current * user * @parameter p_div identification des elements LI manageli{div}_{filter_id} diff --git a/html/js/accounting_item.js b/html/js/accounting_item.js index 41f3a34ff..3ec5648f7 100644 --- a/html/js/accounting_item.js +++ b/html/js/accounting_item.js @@ -40,7 +40,7 @@ function set_jrn_parent(p_ctl,p_value) } } /** - *@brief show the popup for search an accounting item + * show the popup for search an accounting item *@param object this, it must contains some attribute as * - jrn if set and different to 0, will filter the accounting item for a * ledger @@ -136,7 +136,7 @@ function search_poste(obj) } } /** - *@brief when you submit the form for searching a accounting item + * when you submit the form for searching a accounting item *@param obj form *@note the same as search_poste, except it answer to a FORM and not * to a click event @@ -194,7 +194,7 @@ function search_get_poste(obj) } /** - *@brief show the answer of ajax request + * show the answer of ajax request *@param answer in XML */ function result_poste_search(req) @@ -231,7 +231,7 @@ function result_poste_search(req) } /** -*@brief error for ajax +* error for ajax */ function errorPoste() { diff --git a/html/js/admin.js b/html/js/admin.js index 64cc823a6..3f8b747db 100644 --- a/html/js/admin.js +++ b/html/js/admin.js @@ -17,7 +17,7 @@ */ /** * @file - * @brief contains the javascript for the administration page + * contains the javascript for the administration page */ /** * Display the forbidden folders if the request comes from a form diff --git a/html/js/anc_script.js b/html/js/anc_script.js index 97e524de2..89c46159e 100644 --- a/html/js/anc_script.js +++ b/html/js/anc_script.js @@ -21,7 +21,7 @@ /** * @file - * @brief javascript for the analytic accountancy + * javascript for the analytic accountancy */ /*!\brief add a row for the CA @@ -322,7 +322,7 @@ function caod_checkTotal() } /** - *@brief remove an operation + * remove an operation *@param p_dossier is the folder *@param p_oa_group is the group of the analytic operation */ @@ -378,7 +378,7 @@ function anc_add_row(tableid) nb.value++; } /** - *@brief this function is called before the querystring is send to the + * this function is called before the querystring is send to the * fid2.php, add a filter based on the ledger 'p_jrn' *@param obj is the input field *@param queryString is the queryString to modify @@ -391,7 +391,7 @@ function filter_anc(obj, queryString) return queryString; } /** - * @brief compute and display Analytic activity, related to the choosen distribution key + * compute and display Analytic activity, related to the choosen distribution key * @param p_dossier is the dossier id * @param p_table is table id to replace * @param p_amount is the amount to distribute @@ -440,7 +440,7 @@ function anc_key_compute(p_dossier, p_table, p_amount, p_key_id) } } /** - * @brief choose the distribution key + * choose the distribution key * in ajax, a window let you choose what key you want to use * * @param p_dossier is the dossier diff --git a/html/js/card.js b/html/js/card.js index 0986a8c2c..a63219908 100644 --- a/html/js/card.js +++ b/html/js/card.js @@ -25,7 +25,7 @@ var card_layer=1; /** - *@brief search a card an display the result into a inner box + * search a card an display the result into a inner box */ function boxsearch_card(p_dossier) { @@ -55,7 +55,7 @@ function boxsearch_card(p_dossier) } } /** - *@brief show the ipopup with the form to search a card + * show the ipopup with the form to search a card * the properties * - jrn for the ledger * - fs for the action @@ -122,7 +122,7 @@ function search_card(obj) } } /** - *@brief Display form for select card to add to action : other_concerned + * Display form for select card to add to action : other_concerned *action_add_concerned_card */ function action_add_concerned_card(obj) @@ -224,7 +224,7 @@ function action_add_concerned_card(obj) } /** - *@brief when you submit the form for searching a card + * when you submit the form for searching a card *@param obj form *@note the same as search_card, except it answer to a FORM and not * to a click event @@ -285,7 +285,7 @@ function search_get_card(obj) ); } /** - *@brief show the answer of ajax request + * show the answer of ajax request *@param answer in XML */ function result_card_search(req) @@ -399,7 +399,7 @@ function update_value(text,li) ajaxFid(text); } /** - *@brief is called when something change in ICard + * is called when something change in ICard *@param the input field *@see ICard */ @@ -409,7 +409,7 @@ function fill_data_onchange(ctl) } /** - *@brief is called when something change in ICard + * is called when something change in ICard *@param the input field *@see ICard */ @@ -419,7 +419,7 @@ function fill_data(text,li) } /** - *@brief is called when something change in ICard + * is called when something change in ICard *@param the input field *@see ICard */ @@ -429,7 +429,7 @@ function fill_fin_data_onchange(ctl) ajax_saldo(ctl.id); } /** - *@brief is called when something change in ICard + * is called when something change in ICard *@param the input field *@see ICard */ @@ -439,7 +439,7 @@ function fill_fin_data(text,li) ajax_saldo($(text.id)); } /** - *@brief show the ipopup window and display the details of a card, + * show the ipopup window and display the details of a card, * to work some attribute must be set *@param obj.qcode is the qcode, obj.nohistory if you don't want to display * the history button, obj.ro is the popin is readonly @@ -498,7 +498,7 @@ function fill_ipopcard(obj) ); } /** - *@brief + * * \param request : object request * \param json : json answer \code @@ -537,7 +537,7 @@ function successFill_ipopcard(req,json) } } /** - *@brief show the ipopup for selecting a card type, it is a needed step before adding + * show the ipopup for selecting a card type, it is a needed step before adding * a card *@param input field (obj) it must have the attribute ipopup * possible attribute : @@ -628,7 +628,7 @@ function select_card_type(obj) ); } /** - *@brief Show a blank card + * Show a blank card *@param obj Form object (obj) * possible attribute : * - filter is the filter but with a fd_id list, -1 means there is no filter @@ -717,7 +717,7 @@ function form_blank_card(obj) } /** - *@brief save the data contained into the form 'save_card' + * save the data contained into the form 'save_card' *@param input field (obj) it must have the attribute ipopup * possible attribute : *@see ajax_card.php @@ -782,7 +782,7 @@ function save_card(obj) ); } /** - *@brief add a category of card, + * add a category of card, *@param obj with the attribute * - ipopup the ipopup to show * - type_cat the category of card we want to add @@ -828,7 +828,7 @@ function add_category(obj) } /** - * @brief save the form and add a new category of card + * save the form and add a new category of card * @param obj if the form object */ function save_card_category(obj) @@ -864,7 +864,7 @@ function save_card_category(obj) return false; } /** - *@brief Remove a definition of an attribut + * Remove a definition of an attribut *@param attr_def.ad_id *@param gDossier *@param table_id to rm the row diff --git a/html/js/gestion.js b/html/js/gestion.js index de1e19b61..621efdf03 100644 --- a/html/js/gestion.js +++ b/html/js/gestion.js @@ -27,7 +27,7 @@ /** - *@brief remove an attached document of an action + * remove an attached document of an action *@param dossier *@param dt_id id of the document (pk document:d_id) */ @@ -54,7 +54,7 @@ function remove_document(p_dossier,p_id) /** - *@brief remove the concerned operation of an action + * remove the concerned operation of an action *@param dossier *@param p_id id pk action_comment_operation */ @@ -95,7 +95,7 @@ function successRemoveOp(request,json) } } /** - *@brief remove the concerned operation of an action + * remove the concerned operation of an action *@param dossier *@param p_id id pk action_comment_operation */ @@ -132,7 +132,7 @@ function remove_action(p_dossier,p_id,ag_id) } /** - *@brief remove comment of an action + * remove comment of an action *@param dossier *@param p_id pk action_gestion_comment */ @@ -169,14 +169,14 @@ function successRemoveComment(request,json) } /** - *@brief error if a document if removed + * error if a document if removed */ function errorRemoveDoc() { alert_box('Impossible d\'effacer ce document'); } /** - *@brief success when removing a document + * success when removing a document */ function successRemoveDoc(request,json) { @@ -192,7 +192,7 @@ function successRemoveDoc(request,json) } /** -* @brief check the format of the hour +* check the format of the hour * @param p_ctl is the control where the hour is encoded */ function check_hour(p_ctl) @@ -211,7 +211,7 @@ function check_hour(p_ctl) } /** - *@brief remove an attached document of an action + * remove an attached document of an action *@param dossier *@param dt_id id of the document (pk document:d_id) */ @@ -240,14 +240,14 @@ function removeStock(s_id,p_dossier) }); } /** - *@brief error if a document if removed + * error if a document if removed */ function errorRemoveStock() { alert_box('Impossible d\'effacer '); } /** - *@brief success when removing a document + * success when removing a document */ function successRemoveStock(request,json) { @@ -267,7 +267,7 @@ function successRemoveStock(request,json) } } /** - * @brief display details of the last actions in management + * display details of the last actions in management * called from dashboard * @param p_dossier : dossier id */ @@ -293,7 +293,7 @@ function action_show(p_dossier) } } /** - * @brief Display a box for adding a new event + * Display a box for adding a new event * @param {type} p_dossier * @returns {undefined} */ @@ -323,7 +323,7 @@ function action_add(p_dossier) { } } /** - * @brief The new event is entered into the div action_add_div, we try + * The new event is entered into the div action_add_div, we try * to save and receive as answer a XML file with a code of success and possibly * a message * If the message is OK then the div is fading out, otherwise the reason of From a269d459887278c1c59aec583dd0a19bb98dafb9 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Sat, 27 Jul 2019 19:59:25 +0200 Subject: [PATCH 09/14] translation --- include/class/pdfbalance_simple.class.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/class/pdfbalance_simple.class.php b/include/class/pdfbalance_simple.class.php index d1da93504..aa9c39f00 100644 --- a/include/class/pdfbalance_simple.class.php +++ b/include/class/pdfbalance_simple.class.php @@ -32,7 +32,7 @@ class PDFBalance_simple extends PDF */ function set_info($p_from_poste,$to_poste,$p_from,$p_to) { - $this->dossier='Balance simple '.dossier::name(); + $this->dossier=sprintf(_('Balance simple %s'),dossier::name()); $this->from_poste=$p_from_poste; $this->to_poste=$to_poste; $this->from=$p_from; @@ -42,7 +42,7 @@ class PDFBalance_simple extends PDF { parent::Header(); $this->SetFont('DejaVu','B',8); - $titre=sprintf("Balance simple poste %s %s date %s %s", + $titre=sprintf(_("Balance simple poste %s %s date %s %s"), $this->from_poste, $this->to_poste, $this->from, @@ -52,11 +52,11 @@ class PDFBalance_simple extends PDF $this->Ln(); $this->SetFont('DejaVu','',6); - $this->Cell(110,7,'Poste Comptable','B'); - $this->Cell(20,7,'Débit','B',0,'L'); - $this->Cell(20,7,'Crédit','B',0,'L'); - $this->Cell(20,7,'Solde','B',0,'L'); - $this->Cell(20,7,'D/C','B',0,'L'); + $this->Cell(110,7,_('Poste Comptable'),'B'); + $this->Cell(20,7,_('Débit'),'B',0,'L'); + $this->Cell(20,7,_('Crédit'),'B',0,'L'); + $this->Cell(20,7,_('Solde'),'B',0,'L'); + $this->Cell(20,7,_('D/C'),'B',0,'L'); $this->Ln(); } From 35e3de4c7c3af08bf76ac5181614eaca47ef13d9 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Sat, 27 Jul 2019 20:03:46 +0200 Subject: [PATCH 10/14] Documentation : automatic format breaks doxygen tag --- include/ajax/ajax_search_operation.php | 2 +- include/class/dossier.class.php | 16 ++++++------ include/class/extension.class.php | 10 ++++---- include/class/fiche.class.php | 2 +- include/class/periode.class.php | 34 ++++++++++++++------------ include/export/export_ledger_csv.php | 2 +- include/lib/database_core.class.php | 4 +-- include/lib/html_input.class.php | 34 +++++++++++++------------- include/lib/idate.class.php | 4 +-- include/lib/inum.class.php | 8 +++--- include/periode.inc.php | 2 +- 11 files changed, 60 insertions(+), 58 deletions(-) diff --git a/include/ajax/ajax_search_operation.php b/include/ajax/ajax_search_operation.php index 4b519878c..68988eab9 100644 --- a/include/ajax/ajax_search_operation.php +++ b/include/ajax/ajax_search_operation.php @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // Copyright Author Dany De Bontridder danydb@aevalys.eu -/* ! \file +/*! \file * \brief Search module */ if (!defined('ALLOWED')) diff --git a/include/class/dossier.class.php b/include/class/dossier.class.php index d1eadd384..23705b168 100644 --- a/include/class/dossier.class.php +++ b/include/class/dossier.class.php @@ -20,13 +20,13 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu -/* !\file +/*!\file * \brief the class for the dossier, everywhere we need to know to * which folder we are connected, because we can't use $_SESSION, we * need to pass the dossier_id via a _GET or a POST variable */ -/* ! \brief manage the current dossier, everywhere we need to know to +/*! \brief manage the current dossier, everywhere we need to know to * which folder we are connected, because we can't use $_SESSION, we * need to pass the dossier_id via a _GET or a POST variable * private static $variable=array("id"=>"dos_id", @@ -52,7 +52,7 @@ class Dossier $this->dos_id=$p_id; } - /* !\brief return the $_REQUEST['gDossier'] after a check */ + /*!\brief return the $_REQUEST['gDossier'] after a check */ static function id() { @@ -127,7 +127,7 @@ class Dossier return $nb_folder; } - /* ! + /*! * \brief Return all the users * as an array */ @@ -161,7 +161,7 @@ class Dossier return $res; } - /* !\brief check if gDossier is set */ + /*!\brief check if gDossier is set */ static function check() { @@ -177,7 +177,7 @@ class Dossier exit('gDossier Invalide : '.$id); } - /* ! + /*! * \brief return a string to put to gDossier into a GET */ @@ -187,7 +187,7 @@ class Dossier 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() { @@ -195,7 +195,7 @@ class Dossier return ''; } - /* !\brief retrieve the name of the current dossier */ + /*!\brief retrieve the name of the current dossier */ static function name($id=0) { diff --git a/include/class/extension.class.php b/include/class/extension.class.php index 86e29a814..64e4d33e5 100644 --- a/include/class/extension.class.php +++ b/include/class/extension.class.php @@ -20,11 +20,11 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu -/* !\file +/*!\file * \brief the extension class manages the plugins for the security, the access * the inclusion... */ -/* !\brief manage the extension, it involves the table extension +/*!\brief manage the extension, it involves the table extension * * Data member * - $cn database connection @@ -57,7 +57,7 @@ class Extension extends Menu_Ref_sql throw new Exception('Extension non trouvée, le chemin est-il correct?'); } - /* !@brief search a extension, the what is the column (extends_code */ + /*!@brief search a extension, the what is the column (extends_code */ function search($p_what) { @@ -67,7 +67,7 @@ class Extension extends Menu_Ref_sql return 1; } - /* !\brief return 1 if the user given in parameter can access this extension + /*!\brief return 1 if the user given in parameter can access this extension * otherwise returns 0 * \param $p_login the user login * \return 1 has access, 0 has no access @@ -86,7 +86,7 @@ class Extension extends Menu_Ref_sql return 0; } - /* !@brief make an array of the available plugin for the current user + /*!@brief make an array of the available plugin for the current user * @return an array * @see ISelect */ diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php index 647b19b95..f8458424a 100644 --- a/include/class/fiche.class.php +++ b/include/class/fiche.class.php @@ -184,7 +184,7 @@ class Fiche { /* - * !! Missing attribute + *!! Missing attribute */ foreach ($e->attribut as $f ) { diff --git a/include/class/periode.class.php b/include/class/periode.class.php index dd63445d7..322dd120a 100644 --- a/include/class/periode.class.php +++ b/include/class/periode.class.php @@ -20,10 +20,10 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu -/* !\file +/*!\file * \brief definition of the class periode */ -/* ! +/*! * \brief For the periode tables parm_periode and jrn_periode */ require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; @@ -33,13 +33,13 @@ require_once NOALYSS_INCLUDE."/database/parm_periode_sql.class.php"; class Periode { - var $cn; /* !< database connection */ - var $jrn_def_id; /* !< the jr, 0 means all the ledger */ - var $p_id; /* !< pk of parm_periode */ - var $status; /* !< status is CL for closed, OP for + var $cn; /*!< database connection */ + var $jrn_def_id; /*!< the jr, 0 means all the ledger */ + var $p_id; /*!< pk of parm_periode */ + var $status; /*!< status is CL for closed, OP for open and CE for centralized */ - var $p_start; /* !< start of the periode */ - var $p_end; /* !< end of the periode */ + var $p_start; /*!< start of the periode */ + var $p_end; /*!< end of the periode */ function __construct($p_cn, $p_id=0) { @@ -58,7 +58,8 @@ class Periode $this->p_id=$pp_id; } - /* !\brief return the p_id of the start and the end of the exercice + /** + * \brief return the p_id of the start and the end of the exercice * into an array * \param $p_exercice * \return array [start]=>,[end]=> @@ -73,7 +74,8 @@ class Periode return array("start"=>$start, "end"=>$end); } - /* !\brief check if a periode is closed. If jrn_def_id is set to a no zero value then check only for this ledger + /*! + * \brief check if a periode is closed. If jrn_def_id is set to a no zero value then check only for this ledger * @see Periode::set_ledger * \return 1 is the periode is closed otherwise return 0 */ @@ -274,7 +276,7 @@ class Periode } } - /* !\brief load data from database + /*!\brief load data from database * \return 0 on success and -1 on error */ @@ -295,7 +297,7 @@ class Periode return 0; } - /* !\brief return the max and the min periode of the exercice given + /*!\brief return the max and the min periode of the exercice given * in parameter * \param $p_exercice is the exercice * \return an array of Periode object @@ -319,7 +321,7 @@ class Periode return array($rMax, $rMin); } - /* ! + /*! * \brief Give the start & end date of a periode * \param $p_periode is the periode id, if omitted the value is the current object * \return array containing the start date & the end date, index are p_start and p_end or NULL if @@ -344,7 +346,7 @@ class Periode return Database::fetch_array($Res, 0); } - /* !\brief return the first day of periode + /*!\brief return the first day of periode * the this->p_id must be set * \return a string with the date (DD.MM.YYYY) */ @@ -357,7 +359,7 @@ class Periode return $p_start; } - /* !\brief return the last day of periode + /*!\brief return the last day of periode * the this->p_id must be set * \return a string with the date (DD.MM.YYYY) */ @@ -381,7 +383,7 @@ class Periode return Database::fetch_result($Res, 0, 0); } - /* !\brief retrieve the periode thanks the date_end + /*!\brief retrieve the periode thanks the date_end * \param $p_date format DD.MM.YYYY * \return the periode id * \exception if not periode is found or if more than one periode is found diff --git a/include/export/export_ledger_csv.php b/include/export/export_ledger_csv.php index f5b910965..b1eabe927 100644 --- a/include/export/export_ledger_csv.php +++ b/include/export/export_ledger_csv.php @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // Copyright Author Dany De Bontridder danydb@aevalys.eu -/* ! +/*! * \file * \brief Send a ledger in CSV format , receives * - jrn_id id of the ledger diff --git a/include/lib/database_core.class.php b/include/lib/database_core.class.php index aa0aa5999..ff42ea6bd 100644 --- a/include/lib/database_core.class.php +++ b/include/lib/database_core.class.php @@ -549,7 +549,7 @@ class DatabaseCore } /* - * !\brief test if a view exist + *!\brief test if a view exist * \return true if the view. exist otherwise false */ @@ -562,7 +562,7 @@ class DatabaseCore } /* - * !\brief test if a schema exists + *!\brief test if a schema exists * \return true if the schemas exists otherwise false */ diff --git a/include/lib/html_input.class.php b/include/lib/html_input.class.php index 3fffb05af..765643be8 100755 --- a/include/lib/html_input.class.php +++ b/include/lib/html_input.class.php @@ -22,11 +22,11 @@ require_once NOALYSS_INCLUDE.'/lib/icon_action.class.php'; // Copyright Author Dany De Bontridder danydb@aevalys.eu -/* ! \file +/*! \file * \brief This class is used to create all the HTML INPUT TYPE */ -/* ! +/*! * \brief class widget This class is used to create all the HTML INPUT TYPE * and some specials which works with javascript like * js_search. @@ -55,20 +55,20 @@ require_once NOALYSS_INCLUDE.'/lib/icon_action.class.php'; class HtmlInput { - var $type; /* !< $type type of the widget */ - var $name; /* !< $name field NAME of the INPUT */ - var $value; /* !< $value what the INPUT contains */ - var $readOnly; /* !< $readonly true : we cannot change value */ - var $size; /* !< $size size of the input */ - var $selected; /* !< $selected for SELECT RADIO and CHECKBOX the selected value */ - var $table; /* !< $table =1 add the table tag */ - var $label; /* !< $label the question before the input */ - var $disabled; /* !< $disabled poss. value == true or nothing, to disable INPUT */ - var $extra; /* !< $extra different usage, it depends of the $type */ - var $extra2; /* !< $extra2 different usage, + var $type; /*!< $type type of the widget */ + var $name; /*!< $name field NAME of the INPUT */ + var $value; /*!< $value what the INPUT contains */ + var $readOnly; /*!< $readonly true : we cannot change value */ + var $size; /*!< $size size of the input */ + var $selected; /*!< $selected for SELECT RADIO and CHECKBOX the selected value */ + var $table; /*!< $table =1 add the table tag */ + var $label; /*!< $label the question before the input */ + var $disabled; /*!< $disabled poss. value == true or nothing, to disable INPUT */ + var $extra; /*!< $extra different usage, it depends of the $type */ + var $extra2; /*!< $extra2 different usage, it depends of the $type */ - var $javascript; /* !< $javascript is the javascript to add to the widget */ - var $ctrl; /* !<$ctrl is the control to update (see js_search_card_control) */ + var $javascript; /*!< $javascript is the javascript to add to the widget */ + var $ctrl; /*!<$ctrl is the control to update (see js_search_card_control) */ var $tabindex; function __construct($p_name="", $p_value="", $p_id="") @@ -94,7 +94,7 @@ class HtmlInput $this->readOnly=$p_read; } - /* !\brief set the extra javascript property for the INPUT field + /*!\brief set the extra javascript property for the INPUT field * \param $p_name name of the parameter * \param $p_value default value of this parameter */ @@ -229,7 +229,7 @@ class HtmlInput return self::hidden('plugin_code', $_REQUEST['plugin_code']); } - /* !\brief create a button with a ref + /*!\brief create a button with a ref * \param $p_label the text * \param $p_value the location of the window, * \param $p_name the id of the span diff --git a/include/lib/idate.class.php b/include/lib/idate.class.php index b3a466b81..f61901f71 100644 --- a/include/lib/idate.class.php +++ b/include/lib/idate.class.php @@ -47,7 +47,7 @@ class IDate extends HtmlInput $this->autofocus=false; } - /* !\brief show the html input of the widget */ + /*!\brief show the html input of the widget */ public function input($p_name=null, $p_value=null) { @@ -90,7 +90,7 @@ class IDate extends HtmlInput return $r; } - /* !\brief print in html the readonly value of the widget */ + /*!\brief print in html the readonly value of the widget */ public function display() { diff --git a/include/lib/inum.class.php b/include/lib/inum.class.php index e6375fe41..f2755c499 100644 --- a/include/lib/inum.class.php +++ b/include/lib/inum.class.php @@ -20,11 +20,11 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu -/* !\file +/*!\file * \brief for the numeric input text field */ require_once NOALYSS_INCLUDE.'/lib/itext.class.php'; -/* !\brief +/*!\brief * This class handles only the numeric input, the input will * call a javascript * to change comma to period and will round it (2 decimal), the precision is given by @@ -51,7 +51,7 @@ class INum extends IText $this->javascript='onchange="format_number(this,2);"'; } - /* !\brief print in html the readonly value of the widget */ + /*!\brief print in html the readonly value of the widget */ public function display() { @@ -73,7 +73,7 @@ class INum extends IText return $r; } - /* !\brief show the html input of the widget */ + /*!\brief show the html input of the widget */ public function input($p_name=null, $p_value=null) { diff --git a/include/periode.inc.php b/include/periode.inc.php index 3feaad465..36791c454 100644 --- a/include/periode.inc.php +++ b/include/periode.inc.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 -/* ! \file +/*! \file * \brief add, modify, close or delete a period */ if (!defined('ALLOWED')) From 47f3b3e9430b2cd4b3f310d8dbc74b873dcffb39 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Sun, 28 Jul 2019 13:22:36 +0200 Subject: [PATCH 11/14] Code Cleaning split sendmail between sendmail_core (not related to noalyss) and sendmail which is used by noalyss --- include/class/sendmail.class.php | 132 ++++++++++++++++++ include/lib/filetosend.class.php | 6 +- ...mail.class.php => sendmail_core.class.php} | 110 +++------------ include/recover.php | 5 +- 4 files changed, 154 insertions(+), 99 deletions(-) create mode 100644 include/class/sendmail.class.php rename include/lib/{sendmail.class.php => sendmail_core.class.php} (58%) diff --git a/include/class/sendmail.class.php b/include/class/sendmail.class.php new file mode 100644 index 000000000..8c265a9f9 --- /dev/null +++ b/include/class/sendmail.class.php @@ -0,0 +1,132 @@ +can_send() == false ) throw new Exception(_('Email non envoyé'),EMAIL_LIMIT); + + if (!mail($this->mailto, $this->subject, $this->content,$this->header)) + { + throw new Exception('send failed'); + } + // Increment email amount + $repo =new Database(); + $date=date('Ymd'); + $http=new HttpInput(); + $dossier=$http->request("gDossier","string", -1); + $this->increment_mail($repo,$dossier,$date); + } + /** + * Check if email can be sent from a folder + * @return boolean + */ + function can_send() { + /** + * if send from a dossier , then check limit of this dossier + * otherwise send true + */ + $http=new HttpInput(); + $dossier=$http->request("gDossier","string", -1); + if ($dossier == -1 ) return true; + + /** + * Compare max value in repo + */ + $repo =new Database(); + $date=date('Ymd'); + // get max email + $max_email = $this->get_max_email($repo,$dossier); + // + // This folder cannot send email + if ($max_email == 0 ) return false; + // + // This folder has unlimited email + if ($max_email == -1 ) return true; + + // get email sent today from account_repository + $email_sent = $this->get_email_sent($repo,$dossier , $date); + // + if ( $email_sent >= $max_email) return false; + + return true; + } + /** + * return max email the folder can send + * @param $p_repo Database + * @param $p_dossier_id int + */ + function get_max_email(Database $p_repo,$p_dossier_id) + { + $max_email = $p_repo->get_value("select dos_email from ac_dossier where dos_id=$1", + array($p_dossier_id)); + return $max_email; + } + /** + * Return the amount of send emails for the date (YYYYMMDD) + * @param Database $p_repo + * @param $p_dossier_id int + * @param $p_date string YYYYMMDD + */ + function get_email_sent(Database $p_repo,$p_dossier_id,$p_date) + { + + $email_sent = $p_repo->get_value ('select de_sent_email from dossier_sent_email where dos_id = $1 and de_date=$2', + array($p_dossier_id,$p_date)); + return $email_sent; + + + } + /** + * Add $p_amount_email to email sent + * @param $p_repo Database + * @param $p_dossier int id of the folder (dossier.dos_id) + * @param $p_date string (YYYYMMDD) + */ + function increment_mail(Database $p_repo,$p_dossier,$p_date) + { + if ( $p_dossier == -1) return ; + $email_sent = $this->get_email_sent($p_repo,$p_dossier,$p_date); + if ( $email_sent == 0 ){ + $p_repo->exec_sql("insert into public.dossier_sent_email(de_sent_email,dos_id,de_date) values($1,$2,$3)", + array(1,$p_dossier,$p_date)); + return; + } else { + // update + sp_emaoun_email + $p_repo->exec_sql("update dossier_sent_email set de_sent_email=de_sent_email+1 where dos_id=$1 and de_date=$2", + array($p_dossier,$p_date)); + } + } + +} \ No newline at end of file diff --git a/include/lib/filetosend.class.php b/include/lib/filetosend.class.php index fa9b4e3be..fc7479940 100644 --- a/include/lib/filetosend.class.php +++ b/include/lib/filetosend.class.php @@ -16,19 +16,19 @@ * along with NOALYSS; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -// Copyright Author Dany De Bontridder danydb@aevalys.eu +// Copyright Author Dany De Bontridder danydb@noalyss.eu /** *@file * @brief file to add to a message * - * @see Sendmail + * @see Sendmail_Core * @author dany */ /** * @brief file to add to a message * - * @see Sendmail + * @see Sendmail_Core * @author dany */ diff --git a/include/lib/sendmail.class.php b/include/lib/sendmail_core.class.php similarity index 58% rename from include/lib/sendmail.class.php rename to include/lib/sendmail_core.class.php index c41c96652..922bb7433 100644 --- a/include/lib/sendmail.class.php +++ b/include/lib/sendmail_core.class.php @@ -29,9 +29,8 @@ * @author dany */ require_once NOALYSS_INCLUDE.'/lib/filetosend.class.php'; -require_once NOALYSS_INCLUDE.'/class/dossier.class.php'; -class Sendmail +class Sendmail_Core { private $mailto; @@ -42,6 +41,10 @@ class Sendmail private $content; private $header; + function __construct() + { + } + /** * set the from * @param $p_from has the form name @@ -109,8 +112,8 @@ class Sendmail function compose() { $this->verify(); - $this->header=""; - $this->content=""; + $this->header=""; + $this->content=""; // a random hash will be necessary to send mixed content $separator = md5(time()); @@ -152,104 +155,23 @@ class Sendmail $this->content .= "--" . $separator . "--"; } + /** - * Send the message + * Send email * @throws Exception */ function send() { - if ( $this->can_send() == false ) throw new Exception(_('Email non envoyé'),EMAIL_LIMIT); + try { + $this->verify(); - if (!mail($this->mailto, $this->subject, $this->content,$this->header)) + } catch (Exception $e) { + throw $e; + } + + if (!mail($this->mailto, $this->subject, $this->content,$this->header)) { throw new Exception('send failed'); } - // Increment email amount - $repo =new Database(); - $date=date('Ymd'); - $http=new HttpInput(); - $dossier=$http->request("gDossier","string", -1); - $this->increment_mail($repo,$dossier,$date); } - /** - * Check if email can be sent from a folder - * @return boolean - */ - function can_send() { - /** - * if send from a dossier , then check limit of this dossier - * otherwise send true - */ - $http=new HttpInput(); - $dossier=$http->request("gDossier","string", -1); - if ($dossier == -1 ) return true; - - /** - * Compare max value in repo - */ - $repo =new Database(); - $date=date('Ymd'); - // get max email - $max_email = $this->get_max_email($repo,$dossier); - // - // This folder cannot send email - if ($max_email == 0 ) return false; - // - // This folder has unlimited email - if ($max_email == -1 ) return true; - - // get email sent today from account_repository - $email_sent = $this->get_email_sent($repo,$dossier , $date); - // - if ( $email_sent >= $max_email) return false; - - return true; - } - /** - * return max email the folder can send - * @param $p_repo Database - * @param $p_dossier_id int - */ - function get_max_email(Database $p_repo,$p_dossier_id) - { - $max_email = $p_repo->get_value("select dos_email from ac_dossier where dos_id=$1", - array($p_dossier_id)); - return $max_email; - } - /** - * Return the amount of send emails for the date (YYYYMMDD) - * @param Database $p_repo - * @param $p_dossier_id int - * @param $p_date string YYYYMMDD - */ - function get_email_sent(Database $p_repo,$p_dossier_id,$p_date) - { - - $email_sent = $p_repo->get_value ('select de_sent_email from dossier_sent_email where dos_id = $1 and de_date=$2', - array($p_dossier_id,$p_date)); - return $email_sent; - - - } - /** - * Add $p_amount_email to email sent - * @param $p_repo Database - * @param $p_dossier int id of the folder (dossier.dos_id) - * @param $p_date string (YYYYMMDD) - */ - function increment_mail(Database $p_repo,$p_dossier,$p_date) - { - if ( $p_dossier == -1) return ; - $email_sent = $this->get_email_sent($p_repo,$p_dossier,$p_date); - if ( $email_sent == 0 ){ - $p_repo->exec_sql("insert into public.dossier_sent_email(de_sent_email,dos_id,de_date) values($1,$2,$3)", - array(1,$p_dossier,$p_date)); - return; - } else { - // update + sp_emaoun_email - $p_repo->exec_sql("update dossier_sent_email set de_sent_email=de_sent_email+1 where dos_id=$1 and de_date=$2", - array($p_dossier,$p_date)); - } - } - } diff --git a/include/recover.php b/include/recover.php index 2d20a5ffa..ec082d1fc 100644 --- a/include/recover.php +++ b/include/recover.php @@ -63,7 +63,7 @@ if ($action=="") : set_from(ADMIN_WEB); $mail->mailto($user_email); $mail->set_subject("NOALYSS : Réinitialisation de mot de passe"); + $noalyss_url=NOALYSS_URL; $message=<< Date: Sun, 28 Jul 2019 13:56:51 +0200 Subject: [PATCH 12/14] Adapt Unit Test --- unit-test/README | 8 ++ unit-test/bootstrap.php.example | 164 ++++++++++++++++++++++++++++++++ 2 files changed, 172 insertions(+) diff --git a/unit-test/README b/unit-test/README index 119aedde6..0aa553d9c 100644 --- a/unit-test/README +++ b/unit-test/README @@ -27,3 +27,11 @@ Permet de voir les lignes de code qui ont été testées php /phpunit.phar --coverage-html html --bootstrap bootstrap.php include exemple depuis NETBEANS "/usr/bin/php" "/home/dany/Program/phpunit-skelgen.phar" "--ansi" "generate-test" "--bootstrap=/home/dany/developpement/phpcompta/noalyss/unit-test/bootstrap.php" "View_SQL" "/home/dany/developpement/phpcompta/noalyss/include/lib/view_sql.class.php" "View_SQLTest" "/home/dany/developpement/phpcompta/noalyss/unit-test/include/lib/view_sql.classTest.php" + +Pour avoir tous les fichiers à inclure +========================================= +Depuis ici, faites + +cd ../include + +find class lib -type f | awk '{print "require_once NOALYSS_INCLUDE.--""--;";}'|sed -e 's/--/"/g' >> ../unit-test/bootstrap.php diff --git a/unit-test/bootstrap.php.example b/unit-test/bootstrap.php.example index 2d4bb8a12..fc3f769a8 100644 --- a/unit-test/bootstrap.php.example +++ b/unit-test/bootstrap.php.example @@ -150,3 +150,167 @@ require_once NOALYSS_INCLUDE.'/class/class_user.php'; require_once NOALYSS_INCLUDE.'/lib/class_zip_extended.php'; +require_once NOALYSS_INCLUDE."class/package_repository.class.php"; +require_once NOALYSS_INCLUDE."class/acc_compute.class.php"; +require_once NOALYSS_INCLUDE."class/sendmail.class.php"; +require_once NOALYSS_INCLUDE."class/fiche_attr.class.php"; +require_once NOALYSS_INCLUDE."class/acc_report.class.php"; +require_once NOALYSS_INCLUDE."class/database.class.php"; +require_once NOALYSS_INCLUDE."class/gestion_table.class.php"; +require_once NOALYSS_INCLUDE."class/acc_report_row.class.php"; +require_once NOALYSS_INCLUDE."class/package_core.class.php"; +require_once NOALYSS_INCLUDE."class/print_ledger.class.php"; +require_once NOALYSS_INCLUDE."class/pre_op_ods.class.php"; +require_once NOALYSS_INCLUDE."class/anc_table.class.php"; +require_once NOALYSS_INCLUDE."class/pdfbalance_simple.class.php"; +require_once NOALYSS_INCLUDE."class/tag.class.php"; +require_once NOALYSS_INCLUDE."class/acc_ledger_purchase.class.php"; +require_once NOALYSS_INCLUDE."class/lettering.class.php"; +require_once NOALYSS_INCLUDE."class/profile_menu.class.php"; +require_once NOALYSS_INCLUDE."class/forecast_cat.class.php"; +require_once NOALYSS_INCLUDE."class/anc_operation.class.php"; +require_once NOALYSS_INCLUDE."class/print_ledger_fin.class.php"; +require_once NOALYSS_INCLUDE."class/acc_bilan.class.php"; +require_once NOALYSS_INCLUDE."class/pre_op_ach.class.php"; +require_once NOALYSS_INCLUDE."class/exercice.class.php"; +require_once NOALYSS_INCLUDE."class/document_export.class.php"; +require_once NOALYSS_INCLUDE."class/admin.class.php"; +require_once NOALYSS_INCLUDE."class/class_print_ledger_misc.php.rej"; +require_once NOALYSS_INCLUDE."class/acc_payment.class.php"; +require_once NOALYSS_INCLUDE."class/acc_reconciliation.class.php"; +require_once NOALYSS_INCLUDE."class/acc_ledger_history_generic.class.php"; +require_once NOALYSS_INCLUDE."class/template_card_category.class.php"; +require_once NOALYSS_INCLUDE."class/print_ledger_simple.class.php"; +require_once NOALYSS_INCLUDE."class/anc_account_table.class.php"; +require_once NOALYSS_INCLUDE."class/todo_list.class.php"; +require_once NOALYSS_INCLUDE."class/supplier.class.php"; +require_once NOALYSS_INCLUDE."class/document.class.php"; +require_once NOALYSS_INCLUDE."class/periode.class.php"; +require_once NOALYSS_INCLUDE."class/fiche_def_ref.class.php"; +require_once NOALYSS_INCLUDE."class/anc_acc_link.class.php"; +require_once NOALYSS_INCLUDE."class/noalyss_parameter_folder.class.php"; +require_once NOALYSS_INCLUDE."class/extension.class.php"; +require_once NOALYSS_INCLUDE."class/pre_op_fin.class.php"; +require_once NOALYSS_INCLUDE."class/forecast_item.class.php"; +require_once NOALYSS_INCLUDE."class/manager.class.php"; +require_once NOALYSS_INCLUDE."class/anc_group_operation.class.php"; +require_once NOALYSS_INCLUDE."class/user.class.php"; +require_once NOALYSS_INCLUDE."class/menu_ref.class.php"; +require_once NOALYSS_INCLUDE."class/print_ledger_detail_item.class.php"; +require_once NOALYSS_INCLUDE."class/anc_plan.class.php"; +require_once NOALYSS_INCLUDE."class/anc_key.class.php"; +require_once NOALYSS_INCLUDE."class/gestion_purchase.class.php"; +require_once NOALYSS_INCLUDE."class/stock_goods.class.php"; +require_once NOALYSS_INCLUDE."class/anc_balance_double.class.php"; +require_once NOALYSS_INCLUDE."class/acc_account.class.php"; +require_once NOALYSS_INCLUDE."class/default_menu.class.php"; +require_once NOALYSS_INCLUDE."class/follow_up.class.php"; +require_once NOALYSS_INCLUDE."class/pre_operation.class.php"; +require_once NOALYSS_INCLUDE."class/class_acc_ledger.php.orig"; +require_once NOALYSS_INCLUDE."class/acc_balance.class.php"; +require_once NOALYSS_INCLUDE."class/anc_balance_simple.class.php"; +require_once NOALYSS_INCLUDE."class/anc_acc_list.class.php"; +require_once NOALYSS_INCLUDE."class/dossier.class.php"; +require_once NOALYSS_INCLUDE."class/anc_print.class.php"; +require_once NOALYSS_INCLUDE."class/print_ledger_simple_without_vat.class.php"; +require_once NOALYSS_INCLUDE."class/gestion_sold.class.php"; +require_once NOALYSS_INCLUDE."class/balance_age.class.php"; +require_once NOALYSS_INCLUDE."class/anc_group.class.php"; +require_once NOALYSS_INCLUDE."class/print_ledger_misc.class.php"; +require_once NOALYSS_INCLUDE."class/periode_ledger_table.class.php"; +require_once NOALYSS_INCLUDE."class/package_noalyss.class.php"; +require_once NOALYSS_INCLUDE."class/calendar.class.php"; +require_once NOALYSS_INCLUDE."class/forecast.class.php"; +require_once NOALYSS_INCLUDE."class/pdf.class.php"; +require_once NOALYSS_INCLUDE."class/package_template.class.php"; +require_once NOALYSS_INCLUDE."class/class_periode.php.orig"; +require_once NOALYSS_INCLUDE."class/package_plugin.class.php"; +require_once NOALYSS_INCLUDE."class/acc_ledger.class.php"; +require_once NOALYSS_INCLUDE."class/tva_rate_mtable.class.php"; +require_once NOALYSS_INCLUDE."class/acc_ledger_fin.class.php"; +require_once NOALYSS_INCLUDE."class/print_ledger_detail.class.php"; +require_once NOALYSS_INCLUDE."class/acc_ledger_history_financial.class.php"; +require_once NOALYSS_INCLUDE."class/stock.class.php"; +require_once NOALYSS_INCLUDE."class/anc_listing.class.php"; +require_once NOALYSS_INCLUDE."class/anc_grandlivre.class.php"; +require_once NOALYSS_INCLUDE."class/acc_ledger_history.class.php"; +require_once NOALYSS_INCLUDE."class/customer.class.php"; +require_once NOALYSS_INCLUDE."class/fiche.class.php"; +require_once NOALYSS_INCLUDE."class/acc_ledger_info.class.php"; +require_once NOALYSS_INCLUDE."class/Acc_Account_LedgerTest.php"; +require_once NOALYSS_INCLUDE."class/class_print_ledger_misc.php.orig"; +require_once NOALYSS_INCLUDE."class/class_acc_ledger.php.rej"; +require_once NOALYSS_INCLUDE."class/package_contrib.class.php"; +require_once NOALYSS_INCLUDE."class/acc_parm_code.class.php"; +require_once NOALYSS_INCLUDE."class/acc_plan_mtable.class.php"; +require_once NOALYSS_INCLUDE."class/acc_ledger_history_sale.class.php"; +require_once NOALYSS_INCLUDE."class/pdf_operation.class.php"; +require_once NOALYSS_INCLUDE."class/periode_ledger.class.php"; +require_once NOALYSS_INCLUDE."class/contact.class.php"; +require_once NOALYSS_INCLUDE."class/pre_op_advanced.class.php"; +require_once NOALYSS_INCLUDE."class/document_type.class.php"; +require_once NOALYSS_INCLUDE."class/bank.class.php"; +require_once NOALYSS_INCLUDE."class/fiche_def.class.php"; +require_once NOALYSS_INCLUDE."class/acc_tva.class.php"; +require_once NOALYSS_INCLUDE."class/acc_operation.class.php"; +require_once NOALYSS_INCLUDE."class/acc_ledger_sold.class.php"; +require_once NOALYSS_INCLUDE."class/pdf_land.class.php"; +require_once NOALYSS_INCLUDE."class/pre_op_ven.class.php"; +require_once NOALYSS_INCLUDE."class/acc_account_ledger.class.php"; +require_once NOALYSS_INCLUDE."class/follow_up_detail.class.php"; +require_once NOALYSS_INCLUDE."class/class_periode.php.rej"; +require_once NOALYSS_INCLUDE."class/acc_ledger_history_purchase.class.php"; +require_once NOALYSS_INCLUDE."class/anticipation.class.php"; +require_once NOALYSS_INCLUDE."class/document_modele.class.php"; +require_once NOALYSS_INCLUDE."class/acc_ledger_search.class.php"; +require_once NOALYSS_INCLUDE."lib/irelated_action.class.php"; +require_once NOALYSS_INCLUDE."lib/http_input.class.php"; +require_once NOALYSS_INCLUDE."lib/zip_extended.class.php"; +require_once NOALYSS_INCLUDE."lib/sendmail_core.class.php"; +require_once NOALYSS_INCLUDE."lib/iperiod.class.php"; +require_once NOALYSS_INCLUDE."lib/single_record.class.php"; +require_once NOALYSS_INCLUDE."lib/icard.class.php"; +require_once NOALYSS_INCLUDE."lib/data_sql.class.php"; +require_once NOALYSS_INCLUDE."lib/ac_common.php"; +require_once NOALYSS_INCLUDE."lib/inplace_edit.class.php"; +require_once NOALYSS_INCLUDE."lib/noalyss_sql.class.php"; +require_once NOALYSS_INCLUDE."lib/iselect.class.php.orig"; +require_once NOALYSS_INCLUDE."lib/ibutton.class.php"; +require_once NOALYSS_INCLUDE."lib/user_common.php"; +require_once NOALYSS_INCLUDE."lib/icon_action.class.php"; +require_once NOALYSS_INCLUDE."lib/sort_table.class.php"; +require_once NOALYSS_INCLUDE."lib/ac_common.php.orig"; +require_once NOALYSS_INCLUDE."lib/iradio.class.php"; +require_once NOALYSS_INCLUDE."lib/ianccard.class.php"; +require_once NOALYSS_INCLUDE."lib/ispan.class.php"; +require_once NOALYSS_INCLUDE."lib/message_javascript.php"; +require_once NOALYSS_INCLUDE."lib/iconcerned.class.php"; +require_once NOALYSS_INCLUDE."lib/itva_popup.class.php"; +require_once NOALYSS_INCLUDE."lib/html_table.class.php"; +require_once NOALYSS_INCLUDE."lib/inplace_switch.class.php"; +require_once NOALYSS_INCLUDE."lib/noalyss_csv.class.php"; +require_once NOALYSS_INCLUDE."lib/database_core.class.php"; +require_once NOALYSS_INCLUDE."lib/html_input.class.php"; +require_once NOALYSS_INCLUDE."lib/function_javascript.php"; +require_once NOALYSS_INCLUDE."lib/iselect.class.php"; +require_once NOALYSS_INCLUDE."lib/iposte.class.php"; +require_once NOALYSS_INCLUDE."lib/select_box.class.php"; +require_once NOALYSS_INCLUDE."lib/ifile.class.php"; +require_once NOALYSS_INCLUDE."lib/output_html_tab.class.php"; +require_once NOALYSS_INCLUDE."lib/user_menu.php"; +require_once NOALYSS_INCLUDE."lib/html_tab.class.php"; +require_once NOALYSS_INCLUDE."lib/idate.class.php"; +require_once NOALYSS_INCLUDE."lib/itext.class.php"; +require_once NOALYSS_INCLUDE."lib/ac_common.php.rej"; +require_once NOALYSS_INCLUDE."lib/pdf_core.class.php"; +require_once NOALYSS_INCLUDE."lib/progress_bar.class.php"; +require_once NOALYSS_INCLUDE."lib/config_file.php"; +require_once NOALYSS_INCLUDE."lib/impress.class.php"; +require_once NOALYSS_INCLUDE."lib/iaction.class.php"; +require_once NOALYSS_INCLUDE."lib/inum.class.php"; +require_once NOALYSS_INCLUDE."lib/ipopup.class.php"; +require_once NOALYSS_INCLUDE."lib/icheckbox.class.php"; +require_once NOALYSS_INCLUDE."lib/itextarea.class.php"; +require_once NOALYSS_INCLUDE."lib/filetosend.class.php"; +require_once NOALYSS_INCLUDE."lib/ihidden.class.php"; +require_once NOALYSS_INCLUDE."lib/manage_table_sql.class.php"; From 660aed7957ff77211992ba08a1990600f6c2f66f Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Mon, 29 Jul 2019 11:07:55 +0200 Subject: [PATCH 13/14] New function PDF_Core:is_fill add documentation --- include/lib/pdf_core.class.php | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/include/lib/pdf_core.class.php b/include/lib/pdf_core.class.php index 805bd8761..91c76723b 100644 --- a/include/lib/pdf_core.class.php +++ b/include/lib/pdf_core.class.php @@ -211,6 +211,11 @@ class PDF_Core extends TFPDF $this->add_cell(new Cellule($w,$h,$txt,$border,0,$align,$fill,'','M')); } + /** + * Print all the cell stored and call Ln (new line) + * @param int $p_step + */ + function line_new($p_step=null){ $this->print_row(); if ( $this->bigger==0) @@ -219,6 +224,27 @@ class PDF_Core extends TFPDF parent::Ln($this->bigger); $this->bigger=0; } + /** + * If the step is even then return 1 and set the backgroup color to blue , otherwise + * returns 0, and set the background color to white + * It is use to compute alternated colored row , it the parameter fill in write_cell and + * cell + * @see PDF:write_cell + * @see TPDF:cell + * + */ + function is_fill($p_step) + { + if ($p_step % 2 == 0) { + $pdf->SetFillColor(220, 221, 255); + $fill = 1; + } else { + $pdf->SetFillColor(0, 0, 0); + $fill = 0; + } + return $p_step; + } + } From df6b32ae16dedcfe5b966fc8efb52dbb800b95cb Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Mon, 29 Jul 2019 11:08:21 +0200 Subject: [PATCH 14/14] PDF_Core : code cleaning --- include/lib/pdf.class.php | 438 -------------------------------------- 1 file changed, 438 deletions(-) delete mode 100644 include/lib/pdf.class.php diff --git a/include/lib/pdf.class.php b/include/lib/pdf.class.php deleted file mode 100644 index 42efcaa8d..000000000 --- a/include/lib/pdf.class.php +++ /dev/null @@ -1,438 +0,0 @@ -width=$w ; - $this->height=$h ; - $this->text=$txt; - $this->border=$border; - $this->new_line=$ln; - $this->align=$align; - $this->fill=$fill; - $this->link=$link; - $this->type=$type; - return $this; - } -} -class PDF extends TFPDF -{ - - var $cn = null; - var $own = null; - var $soc = ""; - var $dossier = "n/a"; - var $date = ""; - private $cells=array(); - - public function __construct ($p_cn = null, $orientation = 'P', $unit = 'mm', $format = 'A4') - { - $this->bigger=0; - if($p_cn == null) die("No database connection. Abort."); - - parent::__construct($orientation, $unit, $format); - $this->AddFont('DejaVu','','DejaVuSans.ttf',true); - $this->AddFont('DejaVu','B','DejaVuSans-Bold.ttf',true); - $this->AddFont('DejaVu','BI','DejaVuSans-BoldOblique.ttf',true); - $this->AddFont('DejaVuCond','','DejaVuSansCondensed.ttf',true); - $this->AddFont('DejaVuCond','B','DejaVuSansCondensed-Bold.ttf',true); - $this->AddFont('DejaVuCond','I','DejaVuSansCondensed-Oblique.ttf',true); - date_default_timezone_set ('Europe/Paris'); - - $this->cn = $p_cn; - $this->own = new Noalyss_Parameter_Folder($this->cn); - $this->soc = $this->own->MY_NAME; - $this->date = date('d.m.Y'); - $this->cells=array(); - } - - function setDossierInfo($dossier = "n/a") - { - $this->dossier = dossier::name()." ".$dossier; - } - - function Header() - { - //Arial bold 12 - $this->SetFont('DejaVu', 'B', 12); - //Title - parent::Cell(0,10,$this->dossier, 'B', 0, 'C'); - //Line break - parent::Ln(20); - } - function Footer() - { - //Position at 2 cm from bottom - $this->SetY(-20); - //Arial italic 8 - $this->SetFont('Arial', '', 8); - //Page number - parent::Cell(0,8,'Date '.$this->date." - Page ".$this->PageNo().'/{nb}',0,0,'C'); - parent::Ln(3); - // Created by NOALYSS - parent::Cell(0,8,'Created by NOALYSS, online on http://www.noalyss.eu',0,0,'C',false,'http://www.noalyss.eu'); - } - /** - * Count the number of rows a p_text will take for a multicell - * @param $p_text String - * @param $p_colSize size of the column in User Unit - */ - private function count_nb_row($p_text,$p_colSize) - { - // If colSize is bigger than the size of the string then it takes 1 line - if ( $this->GetStringWidth($p_text) <= $p_colSize) return 1; - $nRow=0; - $aWords=explode(' ',$p_text); - $nb_words=count($aWords); - $string=""; - - for ($i=0;$i < $nb_words;$i++){ - // Concatenate String with current word + a space - $string.=$aWords[$i]; - - // if there is a word after add a space - if ( $i+1 < $nb_words) $string.=" "; - - // Compute new size and compare to the colSize - if ( $this->GetStringWidth($string) >= $p_colSize) { - // If the size of the string if bigger than we add a row, the current - // word is the first word of the next line - $nRow++; - $string=$aWords[$i]; - } - } - $nRow++; - return $nRow; - - - - } - /** - * Check if a page must be added due a MultiCell - * @return boolean - */ - private function check_page_add() - { - // break on page - $size=count($this->cells); - for ($i=0;$i < $size ; $i++) - { - if ($this->cells[$i]->type == 'M' ) - { - /** - * On doit calculer si le texte dépasse la texte et compter le - * nombre de lignes que le texte prendrait. Ensuite il faut - * faire un saut de page (renvoit true) si dépasse - */ - - $sizetext=$this->GetStringWidth($this->cells[$i]->text); - - // if text bigger than column width then check - - $y=$this->GetY(); - $nb_row=$this->count_nb_row($this->cells[$i]->text, $this->cells[$i]->width); - $height=$this->cells[$i]->height*$nb_row; - - // If the text is bigger than a sheet of paper then return false - if ($height >= $this->h) return false; - - if ( $y + $height > ($this->h - $this->bMargin -7 )) - return true; - - } - } - return false; - } - private function print_row() - { - static $e=0; - $e++; - if ( $this->check_page_add() == true ) $this->AddPage (); - $this->bigger=0; - $size=count($this->cells); - $cell=$this->cells; - if ($size == 0 )return; - for ($i=0;$i < $size ; $i++) - { - $a=$cell[$i]; - $a->text= str_replace("\\", "", $a->text); - switch ($a->type) - { - case "M": - $x_m=$this->GetX(); - $y_m=$this->GetY(); - parent::MultiCell( - $a->width, - $a->height, - $a->text, - $a->border, - $a->align, - $a->fill - ); - $x_m=$x_m+$a->width; - $tmp=$this->GetY()-$y_m; - if ( $tmp > $this->bigger) $this->bigger=$tmp; - $this->SetXY($x_m,$y_m); - break; - - case "C": - - parent::Cell( $a->width, - $a->height, - $a->text, - $a->border, - $a->new_line, - $a->align, - $a->fill, - $a->link); - break; - - default: - break; - } - } - $this->cells=array(); - } - private function add_cell(Cellule $Ce) - { - $size=count($this->cells); - $this->cells[$size]=$Ce; - - } - function write_cell ($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='') - { - $this->add_cell(new Cellule($w,$h,$txt,$border,$ln,$align,$fill,$link,'C')); - - } - function LongLine($w,$h,$txt,$border=0,$align='',$fill=false) - { - $this->add_cell(new Cellule($w,$h,$txt,$border,0,$align,$fill,'','M')); - - } - /** - * Print all the cell stored and call Ln (new line) - * @param int $p_step - */ - function line_new($p_step=null){ - $this->print_row(); - if ( $this->bigger==0) - parent::Ln($p_step); - else - parent::Ln($this->bigger); - $this->bigger=0; - } - /** - * If the step is even then return 1 and set the backgroup color to blue , otherwise - * returns 0, and set the background color to white - * It is use to compute alternated colored row , it the parameter fill in write_cell and - * cell - * @see PDF:write_cell - * @see TPDF:cell - * - */ - function is_fill($p_step) - { - if ($p_step % 2 == 0) { - $pdf->SetFillColor(220, 221, 255); - $fill = 1; - } else { - $pdf->SetFillColor(0, 0, 0); - $fill = 0; - } - return $p_step; - } - /** - *@brief retrieve the client name and quick_code - *@param $p_jr_id jrn.jr_id - *@param $p_jrn_type ledger type ACH VEN FIN - *@return array (0=>qcode,1=>name) or for FIN 0=>customer qc 1=>customer name 2=>bank qc 3=>bank name - *@see class_print_ledger_simple, class_print_ledger_simple_without_vat - */ - function get_tiers($p_jr_id,$p_jrn_type) - { - if ( $p_jrn_type=='ACH' ) - { - $array=$this->cn->get_array('SELECT - jrnx.j_grpt, - quant_purchase.qp_supplier, - quant_purchase.qp_internal, - jrn.jr_internal - FROM - public.quant_purchase, - public.jrnx, - public.jrn - WHERE - quant_purchase.j_id = jrnx.j_id AND - jrnx.j_grpt = jrn.jr_grpt_id and jr_id=$1',array($p_jr_id)); - if (count($array)==0) return array("ERREUR $p_jr_id",''); - $customer_id=$array[0]['qp_supplier']; - $fiche=new Fiche($this->cn,$customer_id); - $customer_qc=$fiche->get_quick_code($customer_id); - $customer_name=$fiche->getName(); - return array($customer_qc,$customer_name); - } - if ( $p_jrn_type=='VEN' ) - { - $array=$this->cn->get_array('SELECT - quant_sold.qs_client - FROM - public.quant_sold, - public.jrnx, - public.jrn - WHERE - quant_sold.j_id = jrnx.j_id AND - jrnx.j_grpt = jrn.jr_grpt_id and jr_id=$1',array($p_jr_id)); - if (count($array)==0) return array("ERREUR $p_jr_id",''); - $customer_id=$array[0]['qs_client']; - $fiche=new Fiche($this->cn,$customer_id); - $customer_qc=$fiche->get_quick_code($customer_id); - $customer_name=$fiche->getName(); - return array($customer_qc,$customer_name); - } - if ( $p_jrn_type=='FIN' ) - { - $array=$this->cn->get_array('SELECT - qf_other,qf_bank - FROM - public.quant_fin - WHERE - quant_fin.jr_id =$1',array($p_jr_id)); - if (count($array)==0) return array("ERREUR $p_jr_id",'','',''); - $customer_id=$array[0]['qf_other']; - $fiche=new Fiche($this->cn,$customer_id); - $customer_qc=$fiche->get_quick_code($customer_id); - $customer_name=$fiche->getName(); - - $bank_id=$array[0]['qf_bank']; - $fiche=new Fiche($this->cn,$bank_id); - $bank_qc=$fiche->get_quick_code($bank_id); - $bank_name=$fiche->getName(); - - return array($customer_qc,$customer_name,$bank_qc,$bank_name); - } - } - - -} - -class PDFLand extends PDF -{ - - public function __construct ($p_cn = null, $orientation = 'P', $unit = 'mm', $format = 'A4') - { - - if($p_cn == null) die("No database connection. Abort."); - $this->bigger=0; - - parent::__construct($p_cn,'L', $unit, $format); - date_default_timezone_set ('Europe/Paris'); - $this->AddFont('DejaVu','','DejaVuSans.ttf',true); - $this->AddFont('DejaVu','B','DejaVuSans-Bold.ttf',true); - $this->AddFont('DejaVu','BI','DejaVuSans-BoldOblique.ttf',true); - $this->AddFont('DejaVuCond','','DejaVuSansCondensed.ttf',true); - $this->AddFont('DejaVuCond','B','DejaVuSansCondensed-Bold.ttf',true); - $this->AddFont('DejaVuCond','I','DejaVuSansCondensed-Oblique.ttf',true); - - $this->cn = $p_cn; - $this->own = new Noalyss_Parameter_Folder($this->cn); - $this->soc = $this->own->MY_NAME; - $this->date = date('d.m.Y'); - } - function Header() - { - //Arial bold 12 - $this->SetFont('DejaVu', 'B', 10); - //Title - $this->Cell(0,10,$this->dossier, 'B', 0, 'C'); - //Line break - $this->Ln(20); - } - function Footer() - { - //Position at 2 cm from bottom - $this->SetY(-20); - //Arial italic 8 - $this->SetFont('DejaVuCond', 'I', 8); - //Page number - $this->Cell(0,8,'Date '.$this->date." - Page ".$this->PageNo().'/{nb}',0,0,'C'); - $this->Ln(3); - // Created by NOALYSS - $this->Cell(0,8,'Created by NOALYSS, online on http://www.noalyss.eu',0,0,'C',false,'http://www.noalyss.eu'); - - } -} - -class PDFBalance_simple extends PDF -{ - /** - *@brief set_info(dossier,from poste,to poste, from periode, to periode) - *@param $p_from_poste start = poste - *@param $p_to_poste end = poste - *@param $p_from periode start - *@param $p_to periode end - */ - function set_info($p_from_poste,$to_poste,$p_from,$p_to) - { - $this->dossier='Balance simple '.dossier::name(); - $this->from_poste=$p_from_poste; - $this->to_poste=$to_poste; - $this->from=$p_from; - $this->to=$p_to; - } - function Header() - { - parent::Header(); - $this->SetFont('DejaVu','B',8); - $titre=sprintf("Balance simple poste %s %s date %s %s", - $this->from_poste, - $this->to_poste, - $this->from, - $this->to); - $this->Cell(0,7,$titre,1,0,'C'); - - $this->Ln(); - $this->SetFont('DejaVu','',6); - - $this->Cell(110,7,'Poste Comptable','B'); - $this->Cell(20,7,'Débit','B',0,'L'); - $this->Cell(20,7,'Crédit','B',0,'L'); - $this->Cell(20,7,'Solde','B',0,'L'); - $this->Cell(20,7,'D/C','B',0,'L'); - $this->Ln(); - - } -}