diff --git a/Doxyfile b/Doxyfile index 38aca0d3c..4abe7bc3c 100644 --- a/Doxyfile +++ b/Doxyfile @@ -998,7 +998,8 @@ EXCLUDE = ./html/addon \ ./include/config.inc.php \ ./vendor \ ./include/tfpdf \ - ./tmp/ + ./tmp/ \ + ./html/js/tinymce # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or diff --git a/include/class/acc_document.class.php b/include/class/acc_document.class.php index f0b9aaf43..11e2ab5ab 100644 --- a/include/class/acc_document.class.php +++ b/include/class/acc_document.class.php @@ -371,7 +371,22 @@ class Acc_Document extends Document { \record_log($e); throw new \Exception("X281 ",281,$e); } - } + } else { + $this->d_lob=$oid; + $this->d_name=$_FILES['pj']['name']; + $this->d_description=$_FILES['pj']['type']; + + // save extracted document into DB + $this->db->exec_sql("update jrn set jr_pj=$1 , jr_pj_name=$2, + jr_pj_type=$3 where jr_id=$4", + array( + $this->d_lob + , $this->d_name + , $this->d_description + , $this->d_id + ) + ); + } $this->db->commit(); return $oid; diff --git a/include/class/acc_ledger_search.class.php b/include/class/acc_ledger_search.class.php index 8d0871d2d..60ef7d600 100644 --- a/include/class/acc_ledger_search.class.php +++ b/include/class/acc_ledger_search.class.php @@ -38,7 +38,13 @@ class Acc_Ledger_Search private $all; //!< Flag to indicate if all ledgers must be searched (1 for yes) private $div; //!< prefix for id of DOM id var $id ; //!< id of the ledger - private $inject_col; //< inject code into list_operation to add an extra column + public $inject_col; //!< inject_code (callback function ) into list_operation + // to add an extra column + // (see Acc_Ledger_Search::list_operation). + // All the HTML code must be in inject_code, including the TD tag + // example $this->inject_col = function() {echo "} + + /** * @brief return a HTML string with the form for the search * @param $p_type if the type of ledger possible values=ALL,VEN,ACH,ODS,FIN: uppercase ! @@ -104,7 +110,6 @@ class Acc_Ledger_Search * @see build_search_sql * @see display_search_form * @see list_operation - * @example search_acc_operation.php */ function search_form() { @@ -792,8 +797,35 @@ class Acc_Ledger_Search * \see build_search_sql * \see display_search_form * \see search_form + @note $this->inject_code (string) code into Acc_Ledger_Search::list_operation + * Example of using inject_col to inject a new column + * @code + %s // %s", $param['jr_id'], $param['jr_montant']); + } elseif ($param == 'header') + { + + return '