svn+ssh://danydb@svn/svn/phpcompta/branches/rel410-exp ........ r1909 | danydb | 2008-03-03 18:01:14 +0100 (Mon, 03 Mar 2008) | 1 line New branches for the rel410 : priority = interface ........ r1914 | danydb | 2008-03-05 18:53:35 +0100 (Wed, 05 Mar 2008) | 1 line Code cleaning for the predefined operation ........ r1918 | danydb | 2008-03-07 16:56:47 +0100 (Fri, 07 Mar 2008) | 1 line The database version is now in a constant ........ r1920 | danydb | 2008-03-10 12:07:00 +0100 (Mon, 10 Mar 2008) | 1 line Not needed patch ........ r1922 | danydb | 2008-03-10 16:45:29 +0100 (Mon, 10 Mar 2008) | 1 line COSMETIC : improve login page ........ r1923 | danydb | 2008-03-10 17:10:52 +0100 (Mon, 10 Mar 2008) | 1 line COSMETIC : improve interface template of document ........ r1924 | danydb | 2008-03-10 18:34:12 +0100 (Mon, 10 Mar 2008) | 1 line Cosmetic : improve interface "preference" ........ r1929 | danydb | 2008-03-11 16:08:53 +0100 (Tue, 11 Mar 2008) | 1 line Complete workaround (see rev 1927) ........ r1930 | danydb | 2008-03-11 18:28:23 +0100 (Tue, 11 Mar 2008) | 1 line Task 46 : rewrite Rapport before adding miniRapport ........ r1931 | danydb | 2008-03-11 18:36:31 +0100 (Tue, 11 Mar 2008) | 1 line class_periode was removed by mistake, it is readded ........ r1932 | danydb | 2008-03-12 19:12:07 +0100 (Wed, 12 Mar 2008) | 1 line task 46 : rewritting of rapport ........ r1934 | danydb | 2008-03-13 14:13:23 +0100 (Thu, 13 Mar 2008) | 1 line Task 46 Rapport are completely rewritted ........ r1935 | danydb | 2008-03-13 17:06:36 +0100 (Thu, 13 Mar 2008) | 1 line Task 46 mini report on welcome page -> task finished ........ r1936 | danydb | 2008-03-14 10:55:15 +0100 (Fri, 14 Mar 2008) | 1 line Correct documentation ........ r1937 | danydb | 2008-03-14 12:13:54 +0100 (Fri, 14 Mar 2008) | 1 line if the browser doesn\'t accept the cookie, the PHPSESSID must be put into the url ........ r1938 | danydb | 2008-03-14 16:26:01 +0100 (Fri, 14 Mar 2008) | 1 line Fix unknow pass_1 ........ r1939 | danydb | 2008-03-14 16:27:15 +0100 (Fri, 14 Mar 2008) | 1 line Duplicate DBVERSION ........ r1940 | danydb | 2008-03-14 16:50:14 +0100 (Fri, 14 Mar 2008) | 1 line Cosmetic ........ r1941 | danydb | 2008-03-14 16:51:19 +0100 (Fri, 14 Mar 2008) | 1 line In .htaccess the value of error_reporting must different in prod. ........ r1943 | danydb | 2008-03-15 20:13:47 +0100 (Sat, 15 Mar 2008) | 1 line task 50 : check if bcmath avail. ........ r1952 | danydb | 2008-03-18 16:43:48 +0100 (Tue, 18 Mar 2008) | 1 line Improve code ........ r1955 | danydb | 2008-03-18 18:19:35 +0100 (Tue, 18 Mar 2008) | 1 line Code cleaning : Replace InsertJrn and InsertJrnx by Acc_Operation:insert_jrn and Acc_Operation:insert_jrnx, replace also the reconciliation by Acc_Reconciliation:insert ........ r1956 | danydb | 2008-03-19 19:12:37 +0100 (Wed, 19 Mar 2008) | 1 line Improve code : tva is now an object acc_tva ........ r1957 | danydb | 2008-03-20 13:43:38 +0100 (Thu, 20 Mar 2008) | 1 line Fix some vulnerabilities for SQL Injection ........ r1959 | danydb | 2008-03-20 23:07:24 +0100 (Thu, 20 Mar 2008) | 1 line task 34 : Improve CSS ........ r1960 | danydb | 2008-03-20 23:45:04 +0100 (Thu, 20 Mar 2008) | 1 line task 48 : improve report ........ r1961 | danydb | 2008-03-20 23:52:32 +0100 (Thu, 20 Mar 2008) | 1 line Fix small cosmetic bugs and improve the search account_windows ........ r1962 | danydb | 2008-03-20 23:55:07 +0100 (Thu, 20 Mar 2008) | 1 line improve the search account_windows ........ r1968 | danydb | 2008-03-21 18:46:26 +0100 (Fri, 21 Mar 2008) | 1 line Improve the account search functionnality ........ r1969 | danydb | 2008-03-21 20:29:39 +0100 (Fri, 21 Mar 2008) | 1 line task #31 & task #34 : mail follow-up, 2 step instead of 3 and improve appearance ........ r1970 | danydb | 2008-03-21 22:01:30 +0100 (Fri, 21 Mar 2008) | 1 line Task #27 : modify detail of folder and template ........ r1971 | danydb | 2008-03-21 22:22:20 +0100 (Fri, 21 Mar 2008) | 1 line Task 53 : add the tva rate in the generated invoice ........ r1972 | danydb | 2008-03-21 22:26:41 +0100 (Fri, 21 Mar 2008) | 1 line Make a insensitive search for the folder name ........ r1990 | danydb | 2008-03-26 23:36:46 +0100 (Wed, 26 Mar 2008) | 1 line Conversion to unicode ........ r1991 | danydb | 2008-03-26 23:58:06 +0100 (Wed, 26 Mar 2008) | 1 line cosmetic ........ r1992 | danydb | 2008-03-26 23:58:08 +0100 (Wed, 26 Mar 2008) | 1 line Remove last latin1 code ........ r1995 | danydb | 2008-03-31 17:35:30 +0200 (Mon, 31 Mar 2008) | 1 line report : Add the button Search for new line ........ r1996 | danydb | 2008-03-31 17:38:56 +0200 (Mon, 31 Mar 2008) | 1 line report : add the set_poste_child ........ r1997 | danydb | 2008-03-31 22:32:05 +0200 (Mon, 31 Mar 2008) | 1 line Next SQL Upgrade for class_acc_tva ........ r1998 | danydb | 2008-03-31 22:32:53 +0200 (Mon, 31 Mar 2008) | 1 line Rewriting of class_acc_parm_code ........ r1999 | danydb | 2008-03-31 23:13:23 +0200 (Mon, 31 Mar 2008) | 1 line Improve VAT class and form ........ r2000 | danydb | 2008-03-31 23:16:37 +0200 (Mon, 31 Mar 2008) | 1 line Rewrite TVA insert ........ r2001 | danydb | 2008-04-01 16:01:52 +0200 (Tue, 01 Apr 2008) | 5 lines Start to rewrite ledger encoding Move predefined operation to preod.inc.php Add the menu Predefined operation in the parameter module ........ r2003 | danydb | 2008-04-01 22:02:26 +0200 (Tue, 01 Apr 2008) | 1 line Ergonomy : drop folder and template ........ r2004 | danydb | 2008-04-03 22:59:45 +0200 (Thu, 03 Apr 2008) | 1 line Fix undefined variable in class_periode.php ........ r2005 | danydb | 2008-04-04 00:13:05 +0200 (Fri, 04 Apr 2008) | 1 line Fix undefined variable in gestion->customer->operation ........ r2006 | danydb | 2008-04-07 14:23:01 +0200 (Mon, 07 Apr 2008) | 1 line Login & mot de passe en français ........ r2007 | danydb | 2008-04-07 15:24:56 +0200 (Mon, 07 Apr 2008) | 1 line Documentation : change to unicode ........ r2008 | danydb | 2008-04-07 16:42:02 +0200 (Mon, 07 Apr 2008) | 1 line Protect against SQL Injection ........ r2009 | danydb | 2008-04-07 16:43:07 +0200 (Mon, 07 Apr 2008) | 1 line Download the definition of a report ........ r2010 | danydb | 2008-04-07 16:57:55 +0200 (Mon, 07 Apr 2008) | 2 lines Remove debug info ........ r2011 | danydb | 2008-04-07 17:32:17 +0200 (Mon, 07 Apr 2008) | 1 line Upload and save of a definition of a report ........ r2012 | danydb | 2008-04-08 17:04:00 +0200 (Tue, 08 Apr 2008) | 1 line task 50 : use of bcmat to avoid rounding problem ........ r2013 | danydb | 2008-04-09 13:48:30 +0200 (Wed, 09 Apr 2008) | 2 lines task #36 : add a warning if no mini report is defined ........ r2024 | danydb | 2008-04-11 18:02:22 +0200 (Fri, 11 Apr 2008) | 1 line Task #25 : feature backup / restore useful, restore is always in unicode ........ r2025 | danydb | 2008-04-11 18:35:55 +0200 (Fri, 11 Apr 2008) | 1 line task 51 : warning when trying to create a new folder ........ r2026 | danydb | 2008-04-12 16:00:09 +0200 (Sat, 12 Apr 2008) | 2 lines Cosmetic : change in the detailled operation Debit by Montant ........ r2027 | danydb | 2008-04-12 16:04:32 +0200 (Sat, 12 Apr 2008) | 2 lines Operation ; without details by default ........ r2028 | danydb | 2008-04-12 16:04:47 +0200 (Sat, 12 Apr 2008) | 2 lines Remove details from operation supplier ........ r2029 | danydb | 2008-04-12 16:15:17 +0200 (Sat, 12 Apr 2008) | 1 line Gestion : fix bug in return button when adding a customer ........ r2030 | danydb | 2008-04-12 16:19:19 +0200 (Sat, 12 Apr 2008) | 1 line Gestion : bug remove delete message ........ r2031 | danydb | 2008-04-12 16:22:25 +0200 (Sat, 12 Apr 2008) | 3 lines Remove php tag and replace by echo Add in "Comptabilité" the Great Ledger ........ r2032 | danydb | 2008-04-12 17:10:06 +0200 (Sat, 12 Apr 2008) | 1 line Fix Bilan : France bug with unicode ........ r2033 | danydb | 2008-04-12 17:17:55 +0200 (Sat, 12 Apr 2008) | 3 lines Separate the user setting from the general constant.php, a template file is given (config.inc) Fix some cosmetic bug for this shit of IE ........ r2034 | danydb | 2008-04-18 14:51:13 +0200 (Fri, 18 Apr 2008) | 2 lines Fix bug : missing coma ........ r2035 | danydb | 2008-04-19 23:39:09 +0200 (Sat, 19 Apr 2008) | 1 line class_widget fix button_href to work on the same way with IE and firefox ........ r2036 | danydb | 2008-05-01 18:17:06 +0200 (Thu, 01 May 2008) | 2 lines task #33 start rewriting of encoding operation (VEN) ........ r2037 | danydb | 2008-05-01 18:18:26 +0200 (Thu, 01 May 2008) | 2 lines task #33 start rewriting of encoding operation (VEN) ........ r2040 | danydb | 2008-05-07 20:53:32 +0200 (Wed, 07 May 2008) | 1 line Unicode for doxygen ........ r2043 | danydb | 2008-05-25 17:32:51 +0200 (Sun, 25 May 2008) | 2 lines Default pref is TEXT instead of SELECT ........ r2045 | danydb | 2008-06-14 17:48:46 +0200 (Sat, 14 Jun 2008) | 1 line Add a style input_type ........ r2046 | danydb | 2008-06-14 17:49:58 +0200 (Sat, 14 Jun 2008) | 3 lines 1. Replace the CSS class u_content by content, the u_content existed for historic reason 2. Start the coding of ledger sold ........ r2048 | danydb | 2008-06-14 18:31:55 +0200 (Sat, 14 Jun 2008) | 1 line remove javascript warning ........ r2049 | danydb | 2008-06-14 18:32:26 +0200 (Sat, 14 Jun 2008) | 1 line Ledger SOLD add row ........ r2050 | danydb | 2008-06-14 19:54:29 +0200 (Sat, 14 Jun 2008) | 1 line Ledger sold : replace dot by style ........ r2051 | danydb | 2008-06-14 21:08:48 +0200 (Sat, 14 Jun 2008) | 1 line correct unicode char in doc folder ........ r2052 | danydb | 2008-06-14 23:58:01 +0200 (Sat, 14 Jun 2008) | 1 line Ledger SOLD : automatic update of the total ........ r2053 | danydb | 2008-06-15 12:05:02 +0200 (Sun, 15 Jun 2008) | 1 line Performance : the prototype.js is quite heavy, and is not any more included in every page, instead now, there is a html_min_start_page with a minimum of javascript files and a mintoolkit.js which contains the minimum for javascript ........ r2054 | danydb | 2008-06-15 12:17:22 +0200 (Sun, 15 Jun 2008) | 1 line Prototype.js performance, included only if needed, improve performance for access.php, user_login.php ........ r2055 | danydb | 2008-06-19 11:29:52 +0200 (Thu, 19 Jun 2008) | 1 line Cosmetic : Adapt CSS for F3 ........ r2056 | danydb | 2008-06-19 12:18:13 +0200 (Thu, 19 Jun 2008) | 1 line remove useless comment and debug message ........ r2057 | danydb | 2008-06-19 12:32:58 +0200 (Thu, 19 Jun 2008) | 1 line Update CSS classic ........ r2058 | danydb | 2008-06-24 01:14:21 +0200 (Tue, 24 Jun 2008) | 1 line ........ r2059 | danydb | 2008-06-28 14:05:23 +0200 (Sat, 28 Jun 2008) | 1 line task #67 : infobulle ........ r2060 | danydb | 2008-06-28 14:16:37 +0200 (Sat, 28 Jun 2008) | 1 line Bug in add_row ........ r2061 | danydb | 2008-06-28 14:16:49 +0200 (Sat, 28 Jun 2008) | 1 line task #67 : infobulle ........ r2062 | danydb | 2008-06-28 15:21:57 +0200 (Sat, 28 Jun 2008) | 1 line Compute the sold amount via javascript ........ r2063 | danydb | 2008-06-28 15:34:38 +0200 (Sat, 28 Jun 2008) | 1 line Correct typo ........ r2064 | danydb | 2008-07-01 23:02:29 +0200 (Tue, 01 Jul 2008) | 1 line Add predef operation for VEN ........ r2065 | danydb | 2008-07-02 23:57:45 +0200 (Wed, 02 Jul 2008) | 1 line Fixed undefined use_predef ........ r2066 | danydb | 2008-07-03 15:27:22 +0200 (Thu, 03 Jul 2008) | 2 lines Work without prototype.js ........ r2067 | danydb | 2008-07-03 18:33:03 +0200 (Thu, 03 Jul 2008) | 2 lines Fix bug with undefined variable ........ r2068 | danydb | 2008-07-03 18:43:53 +0200 (Thu, 03 Jul 2008) | 2 lines typo ........ r2069 | danydb | 2008-07-03 20:37:06 +0200 (Thu, 03 Jul 2008) | 1 line New version for Ledger sold and invoice ........ r2070 | danydb | 2008-07-03 20:56:47 +0200 (Thu, 03 Jul 2008) | 1 line Update infobulle + typo ........ r2071 | danydb | 2008-07-04 12:55:16 +0200 (Fri, 04 Jul 2008) | 1 line Correct last bug for compta_ven ........ r2072 | danydb | 2008-07-04 14:34:24 +0200 (Fri, 04 Jul 2008) | 1 line Task#39 Migrate to unicode ........ r2073 | danydb | 2008-07-04 14:34:47 +0200 (Fri, 04 Jul 2008) | 1 line Task#39 Migrate to unicode ........ r2074 | danydb | 2008-07-04 14:40:38 +0200 (Fri, 04 Jul 2008) | 2 lines Add documentation for task #39 (unicode) ........ r2075 | danydb | 2008-07-04 14:53:47 +0200 (Fri, 04 Jul 2008) | 2 lines cosmetic ........ r2076 | danydb | 2008-07-04 16:52:56 +0200 (Fri, 04 Jul 2008) | 2 lines cosmetic ........ r2077 | danydb | 2008-07-04 18:02:23 +0200 (Fri, 04 Jul 2008) | 1 line Update CSS ........ r2078 | danydb | 2008-07-04 18:22:11 +0200 (Fri, 04 Jul 2008) | 2 lines Add reset type ........ r2079 | danydb | 2008-07-04 21:50:24 +0200 (Fri, 04 Jul 2008) | 1 line Rewriting of the financial ledger ........ r2080 | danydb | 2008-07-04 21:53:43 +0200 (Fri, 04 Jul 2008) | 1 line Cosmetic ........ r2081 | danydb | 2008-07-05 00:18:17 +0200 (Sat, 05 Jul 2008) | 1 line Ledger Purchase ........ r2082 | danydb | 2008-07-05 00:18:42 +0200 (Sat, 05 Jul 2008) | 1 line rename compta_ach.php ........ r2083 | danydb | 2008-07-05 03:49:35 +0200 (Sat, 05 Jul 2008) | 1 line Finish ledger purchase ........ r2084 | danydb | 2008-07-05 04:22:50 +0200 (Sat, 05 Jul 2008) | 1 line bugs ledger purchase + javascript : need to trim parameters for Ajax (qcode and amounts) ........ r2085 | danydb | 2008-07-05 06:04:21 +0200 (Sat, 05 Jul 2008) | 1 line Rewriting of the ledger is complete, now we can remove dead code and files ........ r2086 | danydb | 2008-07-05 14:10:23 +0200 (Sat, 05 Jul 2008) | 1 line Correct javascript bugs ........ r2087 | danydb | 2008-07-05 14:13:16 +0200 (Sat, 05 Jul 2008) | 1 line code cleaning ........ r2088 | danydb | 2008-07-05 14:34:16 +0200 (Sat, 05 Jul 2008) | 1 line code cleaning ........ r2089 | danydb | 2008-07-05 17:18:48 +0200 (Sat, 05 Jul 2008) | 1 line Adapt a little bit the direct writing ........ r2090 | danydb | 2008-07-05 21:53:50 +0200 (Sat, 05 Jul 2008) | 1 line Improve installation ........ r2091 | danydb | 2008-07-05 21:54:00 +0200 (Sat, 05 Jul 2008) | 1 line Improve installation ........ r2092 | danydb | 2008-07-05 22:20:11 +0200 (Sat, 05 Jul 2008) | 1 line Setup ........ r2093 | danydb | 2008-07-05 22:33:36 +0200 (Sat, 05 Jul 2008) | 1 line Readd user_action_gl.php ........ r2094 | danydb | 2008-07-05 22:38:15 +0200 (Sat, 05 Jul 2008) | 1 line Re-add user_action_gl.php ........ r2095 | danydb | 2008-07-06 00:52:23 +0200 (Sun, 06 Jul 2008) | 1 line New setup ........ r2096 | danydb | 2008-07-06 02:02:41 +0200 (Sun, 06 Jul 2008) | 1 line small bugs ........ r2097 | danydb | 2008-07-06 19:27:05 +0200 (Sun, 06 Jul 2008) | 1 line Fix security bug with domain ........ r2098 | danydb | 2008-07-06 19:39:55 +0200 (Sun, 06 Jul 2008) | 1 line fix bug : javascript Purchase does not update correctly when a card is blanked ........ r2099 | danydb | 2008-07-13 00:31:41 +0200 (Sun, 13 Jul 2008) | 1 line Task #49 add a simple todo list ........ r2100 | danydb | 2008-07-13 00:32:08 +0200 (Sun, 13 Jul 2008) | 1 line remove print_r ........ r2101 | danydb | 2008-07-13 00:43:55 +0200 (Sun, 13 Jul 2008) | 1 line Add sql patch 49 ........ r2102 | danydb | 2008-07-13 00:44:08 +0200 (Sun, 13 Jul 2008) | 1 line Add sql patch 49 ........ r2103 | danydb | 2008-07-13 00:59:01 +0200 (Sun, 13 Jul 2008) | 1 line Fix bug in the table todo_list ........ r2104 | danydb | 2008-07-13 01:09:49 +0200 (Sun, 13 Jul 2008) | 1 line Task #49 cosmetic todo list ........ r2105 | danydb | 2008-07-15 19:56:35 +0200 (Tue, 15 Jul 2008) | 1 line remove var_dump ........ r2106 | danydb | 2008-07-16 21:42:42 +0200 (Wed, 16 Jul 2008) | 1 line Fix bug : creating card ........ r2107 | danydb | 2008-07-17 12:46:16 +0200 (Thu, 17 Jul 2008) | 1 line Fix numerous small bugs ........ r2108 | danydb | 2008-07-17 13:20:51 +0200 (Thu, 17 Jul 2008) | 1 line Fix bug : if the account changed for a card then the ledgers are update with the new account ........ r2109 | danydb | 2008-07-17 14:44:42 +0200 (Thu, 17 Jul 2008) | 1 line Fix : character encoding ........ r2110 | danydb | 2008-07-17 20:34:15 +0200 (Thu, 17 Jul 2008) | 1 line task : the attribut of a card are now ordered by the users ........ r2111 | danydb | 2008-07-18 13:45:10 +0200 (Fri, 18 Jul 2008) | 1 line Import of opening are now concerned by the qcode ........ r2112 | danydb | 2008-07-18 14:05:47 +0200 (Fri, 18 Jul 2008) | 2 lines Fix bug : quick_writing_add_row duplicates value ........ r2113 | danydb | 2008-07-18 14:23:28 +0200 (Fri, 18 Jul 2008) | 1 line Cosmetic : add comment, fix bug for quick_writing (add a verify ) ........ r2114 | danydb | 2008-07-21 22:25:33 +0200 (Mon, 21 Jul 2008) | 1 line SQL Patch Add order to the card ........ r2115 | danydb | 2008-07-22 15:17:33 +0200 (Tue, 22 Jul 2008) | 1 line Release candidate : fix bug ledger sold ........ r2116 | danydb | 2008-07-22 17:50:14 +0200 (Tue, 22 Jul 2008) | 1 line Fix Bug : Ledger SOLD & PURCHASE ........ r2117 | danydb | 2008-07-24 18:11:57 +0200 (Thu, 24 Jul 2008) | 1 line Fix Bug Ledger FIN + import FIN ........ r2118 | danydb | 2008-07-24 18:29:20 +0200 (Thu, 24 Jul 2008) | 1 line Fix Bug Import FIN utf8 encoding ........ r2119 | danydb | 2008-07-24 22:19:23 +0200 (Thu, 24 Jul 2008) | 1 line Fix Bug Printing and Quick Writing ........ r2120 | danydb | 2008-07-24 22:46:50 +0200 (Thu, 24 Jul 2008) | 1 line Fix Bug Security ........ r2121 | danydb | 2008-07-24 22:51:05 +0200 (Thu, 24 Jul 2008) | 1 line Cosmetic ........ r2122 | danydb | 2008-07-24 23:00:38 +0200 (Thu, 24 Jul 2008) | 2 lines Fix problem with simple printing French ........ r2123 | danydb | 2008-07-24 23:01:48 +0200 (Thu, 24 Jul 2008) | 2 lines Missing { ........ r2124 | danydb | 2008-07-24 23:02:45 +0200 (Thu, 24 Jul 2008) | 2 lines Unicode ........ r2125 | danydb | 2008-07-24 23:04:31 +0200 (Thu, 24 Jul 2008) | 2 lines Unicode ........ r2126 | danydb | 2008-07-25 17:40:28 +0200 (Fri, 25 Jul 2008) | 1 line Fix Bug install on windows ........ r2127 | danydb | 2008-07-25 17:42:01 +0200 (Fri, 25 Jul 2008) | 1 line Add version ........ r2128 | danydb | 2008-07-25 17:44:38 +0200 (Fri, 25 Jul 2008) | 1 line short tag ........ r2129 | danydb | 2008-07-25 18:40:34 +0200 (Fri, 25 Jul 2008) | 1 line Add Generate invoice + Fix bug for show_ledger() ........ r2130 | danydb | 2008-07-25 20:51:47 +0200 (Fri, 25 Jul 2008) | 1 line remove debug ........ r2131 | danydb | 2008-07-25 20:52:12 +0200 (Fri, 25 Jul 2008) | 1 line set version ........ r2132 | danydb | 2008-07-27 22:55:03 +0200 (Sun, 27 Jul 2008) | 1 line Unicode ........ r2133 | danydb | 2008-08-28 17:52:50 +0200 (Thu, 28 Aug 2008) | 1 line add pguser for documentation ........ r2134 | danydb | 2008-08-28 19:55:26 +0200 (Thu, 28 Aug 2008) | 1 line correst documentation script ........ r2135 | danydb | 2008-08-28 21:23:05 +0200 (Thu, 28 Aug 2008) | 1 line Improve install. : automatic writing of htaccess file ........ r2136 | danydb | 2008-08-28 21:23:21 +0200 (Thu, 28 Aug 2008) | 1 line Improve install. : automatic writing of htaccess file ........ r2137 | danydb | 2008-08-28 22:43:31 +0200 (Thu, 28 Aug 2008) | 1 line Remove the useless category of card ........ r2138 | danydb | 2008-08-29 15:57:33 +0200 (Fri, 29 Aug 2008) | 1 line update version ........ r2139 | danydb | 2008-09-04 21:49:29 +0200 (Thu, 04 Sep 2008) | 1 line update doc ........ r2140 | danydb | 2008-09-06 20:47:13 +0200 (Sat, 06 Sep 2008) | 1 line Remove a not wanted hidden value which makes failed the searching for card ........ r2141 | danydb | 2008-09-07 18:57:42 +0200 (Sun, 07 Sep 2008) | 1 line Update doc. ........ r2142 | danydb | 2008-09-08 13:38:00 +0200 (Mon, 08 Sep 2008) | 1 line Fix small in fin ........ r2143 | danydb | 2008-09-08 13:49:52 +0200 (Mon, 08 Sep 2008) | 1 line Fix small bugs in ach & ven ........ r2144 | danydb | 2008-09-08 13:57:25 +0200 (Mon, 08 Sep 2008) | 1 line bug : courrier concerne ........ r2145 | danydb | 2008-09-08 14:24:00 +0200 (Mon, 08 Sep 2008) | 2 lines Fix bug with export of report ........ r2146 | danydb | 2008-09-08 15:25:50 +0200 (Mon, 08 Sep 2008) | 1 line Add the security ........ r2147 | danydb | 2008-09-09 21:31:52 +0200 (Tue, 09 Sep 2008) | 1 line files cleaning ........ r2148 | danydb | 2008-09-09 21:34:40 +0200 (Tue, 09 Sep 2008) | 1 line files cleaning ........ r2149 | danydb | 2008-09-10 13:52:56 +0200 (Wed, 10 Sep 2008) | 1 line Fix bug in ledger sold, purchase for negative amount and financial for qcode ........ r2150 | danydb | 2008-09-10 14:33:07 +0200 (Wed, 10 Sep 2008) | 1 line update version ........ r2151 | danydb | 2008-09-10 14:42:24 +0200 (Wed, 10 Sep 2008) | 1 line Add patch for insert_jrnx ........ r2152 | danydb | 2008-09-10 14:42:56 +0200 (Wed, 10 Sep 2008) | 1 line update version ........ r2153 | danydb | 2008-09-10 17:53:28 +0200 (Wed, 10 Sep 2008) | 1 line typo ........ r2154 | danydb | 2008-09-10 18:07:51 +0200 (Wed, 10 Sep 2008) | 1 line Fix layout ........ r2155 | danydb | 2008-09-13 18:08:09 +0200 (Sat, 13 Sep 2008) | 1 line Update documentation ........ r2156 | danydb | 2008-09-13 18:11:52 +0200 (Sat, 13 Sep 2008) | 1 line Update version ........ r2157 | danydb | 2008-09-13 22:27:29 +0200 (Sat, 13 Sep 2008) | 1 line Add document to upload ........ r2158 | danydb | 2008-09-13 22:28:52 +0200 (Sat, 13 Sep 2008) | 1 line Add document ........
735 lines
24 KiB
PHP
735 lines
24 KiB
PHP
<?php
|
|
/*
|
|
* This file is part of PhpCompta.
|
|
*
|
|
* PhpCompta is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* 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,
|
|
* 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.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with PhpCompta; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
|
|
// $Revision$
|
|
/*!\file
|
|
* \brief contains function for the printing
|
|
* \todo the functions of impress_inc.php should be replaced in a OO way
|
|
*/
|
|
|
|
/*!
|
|
* \brief Get dat for poste
|
|
*
|
|
* \param connection
|
|
* \param condition
|
|
* \param position
|
|
*
|
|
*/
|
|
function get_dataPoste($p_cn,$p_poste,$p_condition)
|
|
{
|
|
$Res=ExecSql($p_cn,"select to_char(j_date,'DD.MM.YYYY') as j_date,".
|
|
"case when j_debit='t' then to_char(j_montant,'999999999.99') else ' ' end as deb_montant,".
|
|
"case when j_debit='f' then to_char(j_montant,'999999999.99') else ' ' end as cred_montant,".
|
|
" jr_comment as description,jrn_def_name as jrn_name,".
|
|
"j_debit, jr_internal ".
|
|
" from jrnx left join jrn_def on jrn_def_id=j_jrn_def ".
|
|
" left join jrn on jr_grpt_id=j_grpt".
|
|
" where j_poste=".$p_poste." and ".$p_condition.
|
|
" order by j_date::date");
|
|
$array=array();
|
|
$tot_cred=0;
|
|
$tot_deb=0;
|
|
$Max=pg_NumRows($Res);
|
|
if ( $Max == 0 ) return null;
|
|
for ($i=0;$i<$Max;$i++) {
|
|
$array[]=pg_fetch_array($Res,$i);
|
|
if ($array[$i]['j_debit']=='t') {
|
|
$tot_deb+=$array[$i]['deb_montant'] ;
|
|
} else {
|
|
$tot_cred+=$array[$i]['cred_montant'] ;
|
|
}
|
|
}
|
|
return array($array,$tot_deb,$tot_cred);
|
|
}
|
|
/*!
|
|
* \brief Get data from the jrn table
|
|
*
|
|
* \param connection
|
|
* \param array periode
|
|
* \param filter (default = YES)
|
|
* \return error code if something code wrong
|
|
* otherwise the result
|
|
*
|
|
*/
|
|
function get_dataJrn($p_cn,$p_array,$filter=YES)
|
|
{
|
|
if ( !isset ($p_array['periode']) ) return NO_PERIOD_SELECTED;
|
|
|
|
if ( $filter==YES) {
|
|
if ( ! isset ( $p_array['central'])){
|
|
$cond=CreatePeriodeCond($p_array['periode']);
|
|
$Res=ExecSql($p_cn,"select to_char(j_date,'DD.MM.YYYY') as j_date,
|
|
j_montant as montant,j_debit as debit,j_poste as poste,".
|
|
"j_text as description,j_grpt as grp,jr_comment as comment,
|
|
j_rapt as oc,jr_internal from jrnx left join jrn on ".
|
|
"jr_grpt_id=j_grpt where j_jrn_def=".$p_array['p_id'].
|
|
" and ".$cond." order by j_date::date,j_grpt,j_debit desc");
|
|
} else {
|
|
// create
|
|
$cond=CreatePeriodeCond($p_array['periode'],"c_periode");
|
|
|
|
$Res=ExecSql($p_cn,"select to_char(c_date,'DD.MM.YYYY') as j_date,
|
|
c_montant as montant,c_debit as debit,c_poste as poste,".
|
|
"c_description as description,c_grp as grp,c_comment as comment,
|
|
c_rapt as oc,c_internal as jr_internal from centralized left join jrn on ".
|
|
"jr_grpt_id=c_grp where c_jrn_def=".$p_array['p_id']." and ".
|
|
$cond." order by c_id,c_date,c_grp,c_debit desc");
|
|
}
|
|
|
|
} // if filter == YES
|
|
if ( $filter == NO) {
|
|
if ( ! isset ($p_array['central']) ) {
|
|
$cond=CreatePeriodeCond($p_array['periode']);
|
|
$Res=ExecSql($p_cn,"select to_char(j_date,'DD.MM.YYYY') as j_date,
|
|
j_montant as montant,j_debit as debit,j_poste as poste,".
|
|
"j_text as description,j_grpt as grp,jr_comment as comment,
|
|
j_rapt as oc,jr_internal from jrnx left join jrn on ".
|
|
"jr_grpt_id=j_grpt where ".
|
|
$cond." order by j_date::date,j_grpt,j_debit desc");
|
|
} else {
|
|
$cond=CreatePeriodeCond($p_array['periode'],"c_periode");
|
|
|
|
$Res=ExecSql($p_cn,"select to_char(c_date,'DD.MM.YYYY') as j_date,
|
|
c_montant as montant,c_debit as debit,c_poste as poste,".
|
|
"c_description as description,c_grp as grp,c_comment as comment,
|
|
c_rapt as oc,c_internal as jr_internal from centralized left join jrn on ".
|
|
"jr_grpt_id=c_grp where ".
|
|
$cond." order by c_id,c_date,c_grp,c_debit desc");
|
|
|
|
}
|
|
}// filter == no
|
|
$array=array();
|
|
$Max=pg_NumRows($Res);
|
|
for ($i=0;$i<$Max;$i++) {
|
|
$array[]=pg_fetch_array($Res,$i);
|
|
}
|
|
return $array;
|
|
}
|
|
/*! \function CreatePeriodeCond
|
|
* \brief Create the sql query for the periode
|
|
*
|
|
* \param p_periode
|
|
* \param p_field (default = j_tech_per)
|
|
* \return a string containing the query
|
|
*
|
|
*/
|
|
function CreatePeriodeCond($p_periode,$p_field=" j_tech_per")
|
|
{
|
|
if ( count($p_periode) == 1) {
|
|
return $p_field."=".$p_periode[0];
|
|
}
|
|
|
|
$cond_periode=" $p_field in (";
|
|
// condition periode
|
|
$old=0;
|
|
$follow=0;
|
|
foreach ( $p_periode as $per) {
|
|
if ( $old == 0) {
|
|
$old=$per;
|
|
$follow=1;
|
|
continue;
|
|
}
|
|
if ( $per == $old+1 ) {
|
|
$old=$per;
|
|
$follow++;
|
|
}
|
|
|
|
}// foreach
|
|
if ( count($p_periode) == $follow) {
|
|
$cond=$p_field." >= ".$p_periode[0].' and '.$p_field.' <= '.$p_periode[count($p_periode)-1];
|
|
return $cond;
|
|
}
|
|
|
|
// condition periode
|
|
foreach ( $p_periode as $per) {
|
|
$cond_periode.=$per.",";
|
|
}
|
|
$cond_periode=substr($cond_periode,0,strlen($cond_periode)-1);
|
|
$cond_periode.=")";
|
|
return $cond_periode;
|
|
}
|
|
/*!
|
|
* \brief Get The data for the pdf printing
|
|
* \param connection
|
|
* \param array
|
|
* \param p_limit starting line
|
|
* \param p_offset number of lines
|
|
* \return Array with the asked data
|
|
*
|
|
*/
|
|
function get_dataJrnPdf($p_cn,$p_array,$p_limit,$p_offset)
|
|
{
|
|
echo_debug('impress_inc.php',__LINE__,"get_dataJrnPdf");
|
|
|
|
if ( !isset ($p_array['periode']) ) return NO_PERIOD_SELECTED;
|
|
|
|
if ( $p_array['filter']==YES) {
|
|
$cond=CreatePeriodeCond($p_array['periode']);
|
|
if ( ! isset ($p_array['central']) ) {
|
|
// Journaux non centralisés
|
|
$Res=ExecSql($p_cn,"select j_id,to_char(j_date,'DD.MM.YYYY') as j_date,
|
|
jr_internal,
|
|
case j_debit when 't' then j_montant::text else ' ' end as deb_montant,
|
|
case j_debit when 'f' then j_montant::text else ' ' end as cred_montant,
|
|
j_debit as debit,j_poste as poste,jr_montant , ".
|
|
"pcm_lib as description,j_grpt as grp,jr_comment ,
|
|
jr_rapt as oc, j_tech_per as periode from jrnx left join jrn on ".
|
|
"jr_grpt_id=j_grpt ".
|
|
" left join tmp_pcmn on pcm_val=j_poste ".
|
|
" where j_jrn_def=".$p_array['p_id'].
|
|
" and ".$cond." order by j_date::date asc,jr_internal,j_debit desc".
|
|
" limit ".$p_limit." offset ".$p_offset);
|
|
}else {
|
|
// Journaux centralisés
|
|
$cond=CreatePeriodeCond($p_array['periode'],"c_periode");
|
|
$Sql="select c_id as j_id,
|
|
c_j_id,
|
|
to_char (c_date,'DD.MM.YYYY') as j_date ,
|
|
c_internal as jr_internal,
|
|
case c_debit when 't' then c_montant::text else ' ' end as deb_montant,
|
|
case c_debit when 'f' then c_montant::text else ' ' end as cred_montant,
|
|
c_debit as j_debit,
|
|
c_poste as poste,
|
|
pcm_lib as description,
|
|
jr_comment,
|
|
jr_montant,
|
|
c_grp as grp,
|
|
c_comment as comment,
|
|
c_rapt as oc,
|
|
c_periode as periode
|
|
from centralized left join jrn on ".
|
|
"jr_grpt_id=c_grp left join tmp_pcmn on pcm_val=c_poste where ".
|
|
" c_jrn_def=".$p_array['p_id']." and ".
|
|
$cond." order by c_id ";
|
|
$Res=ExecSql($p_cn,$Sql." limit ".$p_limit." offset ".$p_offset);
|
|
|
|
}
|
|
} else {
|
|
// Grand Livre
|
|
if (! isset($p_array['central'])) {
|
|
// Non centralisé
|
|
$cond=CreatePeriodeCond($p_array['periode']);
|
|
$Res=ExecSql($p_cn,"select j_id,to_char(j_date,'DD.MM.YYYY') as j_date,
|
|
jr_internal,
|
|
case j_debit when 't' then j_montant::text else ' ' end as deb_montant,
|
|
case j_debit when 'f' then j_montant::text else ' ' end as cred_montant,
|
|
j_debit as debit,j_poste as poste,".
|
|
"pcm_lib as description,j_grpt as grp,jr_comment as jr_comment,
|
|
jr_montant,
|
|
jr_rapt as oc, j_tech_per as periode from jrnx left join jrn on ".
|
|
"jr_grpt_id=j_grpt left join tmp_pcmn on pcm_val=j_poste where ".
|
|
" ".$cond." order by j_date::date,j_grpt,j_debit desc".
|
|
" limit ".$p_limit." offset ".$p_offset);
|
|
|
|
} else {
|
|
// Centralisé
|
|
$cond=CreatePeriodeCond($p_array['periode'],"c_periode");
|
|
$Sql="select c_id as j_id,
|
|
c_j_id,
|
|
to_char (c_date,'DD.MM.YYYY') as j_date ,
|
|
c_internal as jr_internal,
|
|
case c_debit when 't' then c_montant::text else ' ' end as deb_montant,
|
|
case c_debit when 'f' then c_montant::text else ' ' end as cred_montant,
|
|
c_debit as j_debit,
|
|
c_poste as poste,
|
|
pcm_lib as description,
|
|
jr_comment,
|
|
jr_montant,
|
|
c_grp as grp,
|
|
c_comment as comment,
|
|
c_rapt as oc,
|
|
c_periode as periode
|
|
from centralized left join jrn on ".
|
|
"jr_grpt_id=c_grp left join tmp_pcmn on pcm_val=c_poste where ".
|
|
$cond." order by c_id ";
|
|
$Res=ExecSql($p_cn,$Sql." limit ".$p_limit." offset ".$p_offset);
|
|
} // Grand Livre
|
|
}
|
|
|
|
|
|
$array=array();
|
|
$Max=pg_NumRows($Res);
|
|
if ($Max==0) return null;
|
|
$case="";
|
|
$tot_deb=0;
|
|
$tot_cred=0;
|
|
for ($i=0;$i<$Max;$i++) {
|
|
$line=pg_fetch_array($Res,$i);
|
|
$mont_deb=($line['deb_montant']!=0)?sprintf("% 8.2f",$line['deb_montant']):"";
|
|
$mont_cred=($line['cred_montant']!=0)?sprintf("% 8.2f",$line['cred_montant']):"";
|
|
$jr_montant=($line['jr_montant']!=0)?sprintf("% 8.2f",$line['jr_montant']):"";
|
|
$tot_deb+=$line['deb_montant'];
|
|
$tot_cred+=$line['cred_montant'];
|
|
echo_debug('impress_inc.php',__LINE__," GetJrnDataPdf : mont_Deb ".$mont_deb);
|
|
echo_debug('impress_inc.php',__LINE__," GetJrnDataPdf : mont_cred ".$mont_cred);
|
|
|
|
if ( $case != $line['grp'] ) {
|
|
$case=$line['grp'];
|
|
$array[]=array (
|
|
'j_id'=>$line['j_id'],
|
|
'j_date' => $line['j_date'],
|
|
'internal'=>$line['jr_internal'],
|
|
'deb_montant'=>'',
|
|
'cred_montant'=>'<b><i>'.$jr_montant.'</i></b>',
|
|
'description'=>'<b><i>'.$line['jr_comment'].'</i></b>',
|
|
'poste' => $line['oc'],
|
|
'periode' =>$line['periode'] );
|
|
|
|
$array[]=array (
|
|
'j_id'=>$line['j_id'],
|
|
'j_date' => '',
|
|
'internal'=>'',
|
|
'deb_montant'=>$mont_deb,
|
|
'cred_montant'=>$mont_cred,
|
|
'description'=>$line['description'],
|
|
'poste' => $line['poste'],
|
|
'periode' => $line['periode']
|
|
);
|
|
|
|
}else {
|
|
$array[]=array (
|
|
'j_id'=>$line['j_id'],
|
|
'j_date' => '',
|
|
'internal'=>'',
|
|
'deb_montant'=>$mont_deb,
|
|
'cred_montant'=>$mont_cred,
|
|
'description'=>$line['description'],
|
|
'poste' => $line['poste'],
|
|
'periode' => $line['periode']);
|
|
|
|
}
|
|
|
|
|
|
}
|
|
echo_debug('impress_inc.php',__LINE__,"Total debit $tot_deb,credit $tot_cred");
|
|
$a=array($array,$tot_deb,$tot_cred);
|
|
return $a;
|
|
}
|
|
/*!
|
|
* \brief
|
|
*
|
|
* \param
|
|
*
|
|
*\return
|
|
*/
|
|
function get_dataGrpt($p_cn,$p_array)
|
|
{
|
|
if ( !isset ($p_array['periode']) ) return NO_PERIOD_SELECTED;
|
|
$cond=CreatePeriodeCond($p_array['periode']);
|
|
$Res=ExecSql($p_cn,"select distinct ".
|
|
" j_grpt as grp".
|
|
" from jrnx ".
|
|
" where j_jrn_def=".$p_array['p_id'].
|
|
" and ".$cond." order by j_grpt");
|
|
$array=array();
|
|
$Max=pg_NumRows($Res);
|
|
$case="";
|
|
for ($i=0;$i<$Max;$i++) {
|
|
$array[]=pg_fetch_array($Res,$i);
|
|
}
|
|
return $array;
|
|
}
|
|
/*!
|
|
* \brief
|
|
* \param $p_cn database connection
|
|
* \param $p_jr_id jrn.jr_id not centralized
|
|
* or jr_op_id normal ledger centralized or jr_c_op_id if GL and centralized
|
|
* \param $p_jrn_id id of the ledger (0 for GL)
|
|
* \param $p_exercice
|
|
* \param $p_which LAST or FIRST
|
|
* \param $p_type CENT for centralized otherwise empty
|
|
*
|
|
*
|
|
* \return array sum(HTVA) sum(TVAC) sum (each TVA)
|
|
*/
|
|
function get_rappel_simple ($p_cn,$p_jrn_id,$p_jrn_type,$p_from,&$arap)
|
|
{
|
|
echo_debug("impress_inc",__LINE__,"function get_rappel_simple ($p_cn,$p_jrn_id,$p_jrn_type,$p_from,$arap) ");
|
|
if ( $p_jrn_type !='VEN' && $p_jrn_type != "ACH")
|
|
{
|
|
echo "ERREUR Journal invalide $p_jrn_type __FILE__ __LINE__";
|
|
exit;
|
|
}
|
|
// find the last operation of the previous periode
|
|
$min=getDbValue($p_cn,"select max (c_id) from centralized where c_jrn_def=$p_jrn_id ".
|
|
" and c_date < (select p_start from parm_periode where p_id = $p_from)");
|
|
if ($min == "" ) return 0;
|
|
// Find Exercice
|
|
$Exercice=get_exercice($p_cn,$p_from);
|
|
|
|
$a_Tva=get_array($p_cn,"select tva_id,tva_label,tva_poste from tva_rate where tva_rate != 0.0000 order by tva_id");
|
|
|
|
// Compute VAT
|
|
foreach ($a_Tva as $line_tva)
|
|
{
|
|
list ($deb,$cred)=split(',',$line_tva['tva_poste']);
|
|
if ( $p_jrn_type == 'ACH' )
|
|
$ctva=$deb;
|
|
else
|
|
$ctva=$cred;
|
|
$sum_deb=getDbValue($p_cn,"select sum(j_montant) from (select distinct c_internal,j_montant ".
|
|
" from jrnx join centralized on (j_grpt=c_grp) ".
|
|
" where c_id < $min and j_poste = '$ctva' and j_debit='t' and ".
|
|
" c_jrn_def=$p_jrn_id and j_tech_per in ".
|
|
" (select p_id from parm_periode where p_exercice='$Exercice') ) as w");
|
|
|
|
$sum_cred=getDbValue($p_cn,"select sum(j_montant) from (select distinct c_internal,j_montant ".
|
|
" from jrnx join centralized on (j_grpt=c_grp) ".
|
|
" where c_id < $min and j_poste = '$ctva' and j_debit='f' and ".
|
|
" c_jrn_def=$p_jrn_id and j_tech_per in ".
|
|
" (select p_id from parm_periode where p_exercice='$Exercice') ) as w");
|
|
|
|
|
|
|
|
$ix=$line_tva['tva_label'];
|
|
$arap[$ix]=($p_jrn_type=='ACH')?$sum_deb-$sum_cred:$sum_cred-$sum_deb;
|
|
}
|
|
// Previous period
|
|
$previous=getDbValue($p_cn,"select max(p_id) from parm_periode where ".
|
|
"p_end < (select p_end from parm_periode where p_id=$p_from) ".
|
|
" and p_start <= (select p_start from parm_periode where p_id=$p_from)");
|
|
|
|
$j=new Acc_Ledger($p_cn,$p_jrn_id);
|
|
$a=$j->get_rowSimple($previous,$previous,$cent='on');
|
|
$total_tvac=0.0;
|
|
$total_htva=0.0;
|
|
foreach ($a as $line) {
|
|
$total_tvac+=$line['TVAC'];
|
|
$total_htva+=$line['HTVA'];
|
|
}
|
|
return array($total_tvac,$total_htva);
|
|
}
|
|
/*!
|
|
* \brief Get the amount on each page
|
|
*
|
|
* \param $p_cn
|
|
* \param $p_jrnx_id jrnx.j_id
|
|
* \param $p_jrn_id jr_def_id
|
|
* \param $which LAST or FIRST
|
|
* \param $p_type valeur JRN GL-CENTRAL GL-NOCENTRAL
|
|
* \return array sum (deb) sum(cred)
|
|
*
|
|
*/
|
|
function get_rappel($p_cn,$p_jrnx_id,$p_jrn_id,$p_exercice,$which,$p_type,$p_central)
|
|
{
|
|
include_once("preference.php");
|
|
|
|
if ( $which == LAST)
|
|
$cmp="<=";
|
|
else
|
|
$cmp="<";
|
|
|
|
if ( $p_type == 1 ) {
|
|
// Vue filtree => Journaux
|
|
if ( $p_central == 0 ) { // Vue non centralisée
|
|
return array(0,0);
|
|
} // p_central == 0
|
|
|
|
// Vue filtree => Journaux & Jrn centralisé
|
|
if ( $p_central == 1 ) {
|
|
$c_line=CountSql($p_cn,"select * from centralized left join parm_periode on c_periode=p_id ".
|
|
" where c_jrn_def=$p_jrn_id and p_exercice='".$p_exercice."'".
|
|
" and c_order $cmp $p_jrnx_id ");
|
|
|
|
if ($c_line == 0 ) { return array (0,0); }
|
|
$sql="select sum(c_montant) as tot_amount ".
|
|
" from centralized ".
|
|
" left join parm_periode on c_periode=p_id ".
|
|
" inner join jrn on jr_grpt_id=c_grp ".
|
|
" where c_jrn_def=$p_jrn_id and ".
|
|
" p_exercice='".$p_exercice."'".
|
|
" and c_order $cmp $p_jrnx_id " ;
|
|
$Res=ExecSql($p_cn,$sql." and c_debit='t' ");
|
|
if ( pg_NumRows($Res) == 0 )
|
|
$deb=0;
|
|
else {
|
|
$line=pg_fetch_array($Res,0);
|
|
$deb=$line['tot_amount'];
|
|
}
|
|
|
|
$Res=ExecSql($p_cn,$sql." and c_debit='f' ");
|
|
if ( pg_NumRows($Res) == 0 )
|
|
$cred=0;
|
|
else {
|
|
|
|
$line=pg_fetch_array($Res,0);
|
|
$cred=$line['tot_amount'];
|
|
}
|
|
echo_debug('impress_inc.php',__LINE__,"MONTANT $deb,$cred");
|
|
$a=array($deb,$cred);
|
|
return $a;
|
|
|
|
}
|
|
} // Type = jrn
|
|
if ($p_type==0 ) { // Si Grand Livre, prendre donnée centralisée{
|
|
if ( $p_central == 1) {
|
|
$c_line=CountSql($p_cn,"select * from centralized left join parm_periode on c_periode=p_id ".
|
|
"where p_exercice='".$p_exercice."'".
|
|
" and c_id $cmp $p_jrnx_id ");
|
|
|
|
if ($c_line == 0 ) { return array (0,0); }
|
|
$sql="select sum(c_montant) as tot_amount ".
|
|
" from centralized ".
|
|
" left join parm_periode on c_periode=p_id ".
|
|
" where ".
|
|
" p_exercice='".$p_exercice."'".
|
|
" and c_order $cmp $p_jrnx_id " ;
|
|
$Res=ExecSql($p_cn,$sql." and c_debit='t' ");
|
|
if ( pg_NumRows($Res) == 0 )
|
|
$deb=0;
|
|
else {
|
|
$line=pg_fetch_array($Res,0);
|
|
$deb=$line['tot_amount'];
|
|
}
|
|
|
|
$Res=ExecSql($p_cn,$sql." and c_debit='f' ");
|
|
if ( pg_NumRows($Res) == 0 )
|
|
$cred=0;
|
|
else {
|
|
|
|
$line=pg_fetch_array($Res,0);
|
|
$cred=$line['tot_amount'];
|
|
}
|
|
echo_debug('impress_inc.php',__LINE__,"MONTANT $deb,$cred");
|
|
$a=array($deb,$cred);
|
|
return $a;
|
|
} // central == 1
|
|
else // Donnée non centralisée => pas de rappel
|
|
{
|
|
if ($p_central== 0) { // Si Grand Livre, prendre donnée non centralisée{
|
|
return array(0,0);
|
|
}
|
|
}//else
|
|
} // if type==0
|
|
|
|
}
|
|
|
|
/*! \brief Purpose Parse a formula
|
|
*
|
|
* \param $p_cn connexion
|
|
* \param $p_label
|
|
* \param $p_formula
|
|
* \param $p_eval true if we eval here otherwise the function returns
|
|
* a string which must be evaluated
|
|
* \param $p_type_date : type of the date 0 for accountant period or 1
|
|
* for calendar
|
|
* \return array
|
|
*
|
|
*
|
|
*/
|
|
function ParseFormula($p_cn,$p_label,$p_formula,$p_start,$p_end,$p_eval=true,$p_type_date=0)
|
|
{
|
|
|
|
echo_debug('impress_inc',__LINE__,'ParseFormula');
|
|
if ( CheckFormula($p_formula) == false) {
|
|
if ( $p_eval == true)
|
|
return array('desc'=>$p_label.' Erreur Formule!',
|
|
'montant'=>0);
|
|
else
|
|
return $p_formula;
|
|
|
|
}
|
|
if ( $p_type_date == 0 )
|
|
$cond=sql_filter_per($p_cn,$p_start,$p_end,'p_id','j_tech_per');
|
|
else
|
|
$cond="( j_date >= to_date('$p_start','DD.MM.YYYY') and j_date <= to_date('$p_end','DD.MM.YYYY'))";
|
|
echo_debug(__FILE__,__LINE__,"receiving $p_formula");
|
|
include_once("class_acc_account_ledger.php");
|
|
while (ereg("(\[[0-9]*%*D*C*S*\])",$p_formula,$e) == true) {
|
|
|
|
// remove the [ ]
|
|
$x=$e;
|
|
$compute='all';
|
|
if ( strpos($e[0],'D') != 0 )
|
|
$compute='deb';
|
|
if ( strpos($e[0],'C') != 0 )
|
|
$compute='cred';
|
|
if ( strpos($e[0],'S') != 0 )
|
|
$compute='signed';
|
|
echo_debug(__FILE__,__LINE__,' $e = '.$e[0]);
|
|
echo_debug(__FILE__,__LINE__,' $e = '.$e[0]);
|
|
$e[0]=str_replace ("[","",$e[0]);
|
|
$e[0]=str_replace ("]","",$e[0]);
|
|
$e[0]=str_replace ("D","",$e[0]);
|
|
$e[0]=str_replace ("C","",$e[0]);
|
|
$e[0]=str_replace ("S","",$e[0]);
|
|
echo_debug('impress_inc',__LINE__,"p_formula is $p_formula");
|
|
// If there is a FROM clause we must recompute
|
|
// the time cond
|
|
|
|
if ($p_type_date == 0 && ereg ("FROM=[0-9]+\.[0-9]+", $p_formula,$afrom) == true ){
|
|
// There is a FROM clause
|
|
// then we must modify the cond for the periode
|
|
$from=str_replace("FROM=","",$afrom[0]);
|
|
|
|
// Get the periode
|
|
/*! \note special value for the clause FROM=00.0000
|
|
*/
|
|
if ( $from == '00.0000' ) {
|
|
// retrieve the first month of this periode
|
|
$User=new User($p_cn);
|
|
$user_periode=$User->get_periode();
|
|
$periode=getDbValue($p_cn,
|
|
"select p_exercice from parm_periode where p_id=$user_periode");
|
|
$sql_per="select to_char(p_start,'MM.YYYY') as start from parm_periode where ".
|
|
" p_exercice='".$periode."' order by p_start";
|
|
$ret=get_array($p_cn,$sql_per);
|
|
$from=$ret[0]['start'];
|
|
|
|
}
|
|
$from=getPeriodeFromMonth($p_cn,$from);
|
|
|
|
// the clause from is something else
|
|
// Compute the cond
|
|
$cond=sql_filter_per($p_cn,$from,$p_end,'p_id','j_tech_per');
|
|
|
|
}
|
|
|
|
if ( strpos($p_formula,"FROM") != 0) {
|
|
// We remove FROM out of the p_formula
|
|
$p_formula=substr_replace($p_formula,"",strpos($p_formula,"FROM"));
|
|
}
|
|
|
|
// Get sum of account
|
|
$P=new Acc_Account_Ledger($p_cn,$e[0]);
|
|
echo_debug(__FILE__.":".__LINE__." condition is $cond");
|
|
|
|
$detail=$P->get_solde_detail($cond);
|
|
|
|
|
|
if ( $compute=='all')
|
|
$i=$detail['solde'];
|
|
if ( $compute=='deb')
|
|
$i=$detail['debit'];
|
|
if ( $compute=='cred')
|
|
$i=$detail['credit'];
|
|
if ( $compute=='signed')
|
|
$i=$detail['debit']-$detail['credit'];
|
|
echo_debug(__FILE__,__LINE__,"Resultat = $i ");
|
|
$p_formula=str_replace($x[0],$i,$p_formula);
|
|
echo_debug(__FILE__,__LINE__,"p_formula = $p_formula ");
|
|
|
|
}
|
|
|
|
// $p_eval is true then we eval and returns result
|
|
if ( $p_eval == true) {
|
|
$p_formula="\$result=".$p_formula.";";
|
|
echo_debug('impress_inc.php',__LINE__, $p_formula);
|
|
|
|
eval("$p_formula");
|
|
$aret=array('desc'=>$p_label,
|
|
'montant'=>$result);
|
|
return $aret;
|
|
} else {
|
|
// $p_eval is false we returns only the string
|
|
return $p_formula;
|
|
}
|
|
}
|
|
/*!
|
|
* \brief Parse the formula contained in the fo_formula
|
|
* field and return a array containing all the columns
|
|
*
|
|
* \param $p_cn connexion
|
|
* \param $p_label
|
|
* \param $p_formula
|
|
* \return array
|
|
*
|
|
*/
|
|
function GetFormulaValue($p_cn,$p_label,$p_formula,$p_cond)
|
|
{
|
|
$aret=array();
|
|
$l_debit=0;
|
|
$l_credit=0;
|
|
// somme debit
|
|
$Res=ExecSql($p_cn,"select sum (j_montant) as montant from
|
|
jrnx where $p_cond and j_debit='t' and j_poste::text like '$p_formula'");
|
|
if (pg_NumRows($Res)==0){
|
|
$l_debit=0;
|
|
} else {
|
|
$l=pg_fetch_array($Res,0);
|
|
$l_debit=$l['montant'];
|
|
}
|
|
// somme credit
|
|
$Res=ExecSql($p_cn,"select sum (j_montant) as montant from
|
|
jrnx where $p_cond and j_debit='f' and j_poste::text like '$p_formula'");
|
|
if (pg_NumRows($Res)==0) {
|
|
$l_credit=0;
|
|
} else {
|
|
$l=pg_fetch_array($Res,0);
|
|
$l_credit=$l['montant'];
|
|
}
|
|
|
|
if ( $l_credit==$l_debit) {
|
|
$aret=array('desc' => $p_label,
|
|
'montant' => '0',
|
|
'cmontant'=>0);
|
|
}
|
|
if ( $l_credit < $l_debit) {
|
|
$l2=sprintf("% .2f",$l_debit-$l_credit);
|
|
$aret=array('desc' => $p_label,
|
|
'montant' => $l2,
|
|
'cmontant'=>$l2);
|
|
}
|
|
if ( $l_credit>$l_debit) {
|
|
$l2=sprintf("(% .2f)",$l_credit-$l_debit);
|
|
$aret=array('desc' => $p_label,
|
|
'montant' => $l2,
|
|
'cmontant'=> $l_debit-$l_credit);
|
|
|
|
}
|
|
return $aret;
|
|
}
|
|
/*!
|
|
* \brief Check if formula doesn't contain
|
|
* php injection
|
|
* \param string
|
|
*
|
|
* \return true if the formula is good otherwise false
|
|
*/
|
|
function CheckFormula($p_string) {
|
|
// the ereg gets too complex if we want to add a test
|
|
// for parenthesis, math function...
|
|
// So I prefer remove them before testing
|
|
$p_string=str_replace("round","",$p_string);
|
|
$p_string=str_replace("abs","",$p_string);
|
|
$p_string=str_replace("(","",$p_string);
|
|
$p_string=str_replace(")","",$p_string);
|
|
// for the inline test like $a=(cond)?value:other;
|
|
$p_string=str_replace("?","+",$p_string);
|
|
$p_string=str_replace(":","+",$p_string);
|
|
$p_string=str_replace(">=","+",$p_string);
|
|
$p_string=str_replace("<=","+",$p_string);
|
|
$p_string=str_replace(">","+",$p_string);
|
|
$p_string=str_replace("<","+",$p_string);
|
|
// eat Space
|
|
$p_string=str_replace(" ","",$p_string);
|
|
// Remove D/C/S
|
|
$p_string=str_replace("C","",$p_string);
|
|
$p_string=str_replace("D","",$p_string);
|
|
$p_string=str_replace("S","",$p_string);
|
|
if ( ereg ("^(\\$[a-zA-Z]*[0-9]*=){0,1}((\[{0,1}[0-9]+\.*[0-9]*%{0,1}\]{0,1})+ *([+-\*/])* *(\[{0,1}[0-9]+\.*[0-9]*%{0,1}\]{0,1})*)*(([+-\*/])*\\$([a-zA-Z])+[0-9]*([+-\*/])*)* *( *FROM=[0-9][0-0].20[0-9][0-9]){0,1}$",$p_string) == false)
|
|
{
|
|
return false;
|
|
} else {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
?>
|