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
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 101470d1e..692f02c0e 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
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_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/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/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/database.class.php b/include/class/database.class.php
index 23f67dafa..71dce9ccc 100644
--- a/include/class/database.class.php
+++ b/include/class/database.class.php
@@ -112,5 +112,135 @@ class Database extends DatabaseCore
return $Res;
}
+ /**
+ * \brief loop to apply all the path to a folder or
+ * a template
+ * \param $p_name database name
+ *
+ */
+ function apply_patch($p_name)
+ {
+ if (!$this->exist_table('version')) {
+ echo _('Base de donnée vide');
+ return;
+ }
+ $MaxVersion = DBVERSION - 1;
+ $succeed = "✓";
+ echo '
';
+ for ($i = 4; $i <= $MaxVersion; $i++) {
+ $to = $i + 1;
+
+ if ($this->get_version() <= $i) {
+ if ($this->get_version() == 97) {
+ if ($this->exist_schema("amortissement")) {
+ $this->exec_sql('ALTER TABLE amortissement.amortissement_histo
+ ADD CONSTRAINT internal_fk FOREIGN KEY (jr_internal) REFERENCES jrn (jr_internal)
+ ON UPDATE CASCADE ON DELETE SET NULL');
+ }
+ }
+ echo "
Patching " . $p_name .
+ " from the version " . $this->get_version() . " to $to ";
+
+ $this->execute_script(NOALYSS_INCLUDE . '/sql/patch/upgrade' . $i . '.sql');
+ echo $succeed;
+
+ if (!DEBUG)
+ ob_start();
+ // specific for version 4
+ if ($i == 4) {
+ $sql = "select jrn_def_id from jrn_def ";
+ $Res = $this->exec_sql($sql);
+ $Max = $this->size();
+ for ($seq = 0; $seq < $Max; $seq++) {
+ $row = pg_fetch_array($Res, $seq);
+ $sql = sprintf("create sequence s_jrn_%d", $row['jrn_def_id']);
+ $this->exec_sql($sql);
+ }
+ }
+ // specific to version 7
+ if ($i == 7) {
+ // now we use sequence instead of computing a max
+ //
+ $Res2 = $this->exec_sql('select coalesce(max(jr_grpt_id),1) as l from jrn');
+ $Max2 = pg_NumRows($Res2);
+ if ($Max2 == 1) {
+ $Row = pg_fetch_array($Res2, 0);
+ var_dump($Row);
+ $M = $Row['l'];
+ $this->exec_sql("select setval('s_grpt',$M,true)");
+ }
+ }
+ // specific to version 17
+ if ($i == 17) {
+ $this->execute_script(NOALYSS_INCLUDE . '/sql/patch/upgrade17.sql');
+ $max = $this->get_value('select last_value from s_jnt_fic_att_value');
+ $this->alter_seq($p_cn, 's_jnt_fic_att_value', $max + 1);
+ } // version
+ // reset sequence in the modele
+ //--
+ if ($i == 30 && $p_name == "mod") {
+ $a_seq = array('s_jrn', 's_jrn_op', 's_centralized',
+ 's_stock_goods', 'c_order', 's_central');
+ foreach ($a_seq as $seq) {
+ $sql = sprintf("select setval('%s',1,false)", $seq);
+ $Res = $this->exec_sql($sql);
+ }
+ $sql = "select jrn_def_id from jrn_def ";
+ $Res = $this->exec_sql($sql);
+ $Max = pg_NumRows($Res);
+ for ($seq = 0; $seq < $Max; $seq++) {
+ $row = pg_fetch_array($Res, $seq);
+ $sql = sprintf("select setval('s_jrn_%d',1,false)", $row['jrn_def_id']);
+ $this->exec_sql($sql);
+ }
+ }
+ if ($i == 36) {
+ /* check the country and apply the path */
+ $res = $this->exec_sql("select pr_value from parameter where pr_id='MY_COUNTRY'");
+ $country = pg_fetch_result($res, 0, 0);
+ $this->execute_script(NOALYSS_INCLUDE . "/sql/patch/upgrade36." . $country . ".sql");
+ $this->exec_sql('update tmp_pcmn set pcm_type=find_pcm_type(pcm_val)');
+ }
+ if ($i == 59) {
+ $res = $this->exec_sql("select pr_value from parameter where pr_id='MY_COUNTRY'");
+ $country = pg_fetch_result($res, 0, 0);
+ if ($country == 'BE')
+ $this->exec_sql("insert into parm_code values ('SUPPLIER',440,'Poste par défaut pour les fournisseurs')");
+ if ($country == 'FR')
+ $this->exec_sql("insert into parm_code values ('SUPPLIER',400,'Poste par défaut pour les fournisseurs')");
+ }
+ if ($i == 61) {
+ $country = $this->get_value("select pr_value from parameter where pr_id='MY_COUNTRY'");
+ $this->execute_script(NOALYSS_INCLUDE . "/sql/patch/upgrade61." . $country . ".sql");
+ }
+
+ if (!DEBUG)
+ ob_end_clean();
+ }
+ }
+ 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/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 e3ad8efb6..e5b3fa05f 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/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/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..aa9c39f00
--- /dev/null
+++ b/include/class/pdfbalance_simple.class.php
@@ -0,0 +1,63 @@
+dossier=sprintf(_('Balance simple %s'),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/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/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/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/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/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/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_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/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/database_core.class.php b/include/lib/database_core.class.php
index a38725d29..ff42ea6bd 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 '
';
- die("Connection impossible : vérifiez vos paramètres de base
- de données");
+ die();
} else {
echo '
' . _('Erreur de connexion !') . '
';
$this->is_open = false;
@@ -390,115 +389,6 @@ class DatabaseCore
return $this->size($p_ret);
}
- /**
- * \brief loop to apply all the path to a folder or
- * a template
- * \param $p_name database name
- *
- */
-
- function apply_patch($p_name)
- {
- if (!$this->exist_table('version')) {
- echo _('Base de donnée vide');
- return;
- }
- $MaxVersion = DBVERSION - 1;
- $succeed = "✓";
- echo '
';
- for ($i = 4; $i <= $MaxVersion; $i++) {
- $to = $i + 1;
-
- if ($this->get_version() <= $i) {
- if ($this->get_version() == 97) {
- if ($this->exist_schema("amortissement")) {
- $this->exec_sql('ALTER TABLE amortissement.amortissement_histo
- ADD CONSTRAINT internal_fk FOREIGN KEY (jr_internal) REFERENCES jrn (jr_internal)
- ON UPDATE CASCADE ON DELETE SET NULL');
- }
- }
- echo "
Patching " . $p_name .
- " from the version " . $this->get_version() . " to $to ";
-
- $this->execute_script(NOALYSS_INCLUDE . '/sql/patch/upgrade' . $i . '.sql');
- echo $succeed;
-
- if (!DEBUG)
- ob_start();
- // specific for version 4
- if ($i == 4) {
- $sql = "select jrn_def_id from jrn_def ";
- $Res = $this->exec_sql($sql);
- $Max = $this->size();
- for ($seq = 0; $seq < $Max; $seq++) {
- $row = pg_fetch_array($Res, $seq);
- $sql = sprintf("create sequence s_jrn_%d", $row['jrn_def_id']);
- $this->exec_sql($sql);
- }
- }
- // specific to version 7
- if ($i == 7) {
- // now we use sequence instead of computing a max
- //
- $Res2 = $this->exec_sql('select coalesce(max(jr_grpt_id),1) as l from jrn');
- $Max2 = pg_NumRows($Res2);
- if ($Max2 == 1) {
- $Row = pg_fetch_array($Res2, 0);
- var_dump($Row);
- $M = $Row['l'];
- $this->exec_sql("select setval('s_grpt',$M,true)");
- }
- }
- // specific to version 17
- if ($i == 17) {
- $this->execute_script(NOALYSS_INCLUDE . '/sql/patch/upgrade17.sql');
- $max = $this->get_value('select last_value from s_jnt_fic_att_value');
- $this->alter_seq($p_cn, 's_jnt_fic_att_value', $max + 1);
- } // version
- // reset sequence in the modele
- //--
- if ($i == 30 && $p_name == "mod") {
- $a_seq = array('s_jrn', 's_jrn_op', 's_centralized',
- 's_stock_goods', 'c_order', 's_central');
- foreach ($a_seq as $seq) {
- $sql = sprintf("select setval('%s',1,false)", $seq);
- $Res = $this->exec_sql($sql);
- }
- $sql = "select jrn_def_id from jrn_def ";
- $Res = $this->exec_sql($sql);
- $Max = pg_NumRows($Res);
- for ($seq = 0; $seq < $Max; $seq++) {
- $row = pg_fetch_array($Res, $seq);
- $sql = sprintf("select setval('s_jrn_%d',1,false)", $row['jrn_def_id']);
- $this->exec_sql($sql);
- }
- }
- if ($i == 36) {
- /* check the country and apply the path */
- $res = $this->exec_sql("select pr_value from parameter where pr_id='MY_COUNTRY'");
- $country = pg_fetch_result($res, 0, 0);
- $this->execute_script(NOALYSS_INCLUDE . "/sql/patch/upgrade36." . $country . ".sql");
- $this->exec_sql('update tmp_pcmn set pcm_type=find_pcm_type(pcm_val)');
- }
- if ($i == 59) {
- $res = $this->exec_sql("select pr_value from parameter where pr_id='MY_COUNTRY'");
- $country = pg_fetch_result($res, 0, 0);
- if ($country == 'BE')
- $this->exec_sql("insert into parm_code values ('SUPPLIER',440,'Poste par défaut pour les fournisseurs')");
- if ($country == 'FR')
- $this->exec_sql("insert into parm_code values ('SUPPLIER',400,'Poste par défaut pour les fournisseurs')");
- }
- if ($i == 61) {
- $country = $this->get_value("select pr_value from parameter where pr_id='MY_COUNTRY'");
- $this->execute_script(NOALYSS_INCLUDE . "/sql/patch/upgrade61." . $country . ".sql");
- }
-
- if (!DEBUG)
- ob_end_clean();
- }
- }
- echo '
';
- }
/**
*
@@ -571,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);
}
/**
@@ -630,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
@@ -680,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
*/
@@ -693,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/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/html_input.class.php b/include/lib/html_input.class.php
index d3a605895..815ea07ff 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/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 070a2014b..7c59fef75 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/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/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/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/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;
+ }
+
+
+}
+
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 c0fbed4af..43a71e283 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/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'))
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=<</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";