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 ........
418 lines
13 KiB
PHP
418 lines
13 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
|
|
*/
|
|
/*!\file
|
|
* \brief import operation into the accountancy
|
|
*/
|
|
// Copyright Author Olivier Dzwoniarkiewicz
|
|
// Modified Dany De Bontridder ddebontridder@yahoo.fr
|
|
// $Revision$
|
|
include_once("jrn.php");
|
|
include_once("preference.php");
|
|
include_once("user_common.php");
|
|
require_once('class_user.php');
|
|
require_once('class_widget.php');
|
|
require_once('class_fiche.php');
|
|
require_once('class_acc_ledger.php');
|
|
require_once("class_acc_parm_code.php");
|
|
require_once('class_acc_operation.php');
|
|
/*!
|
|
**************************************************
|
|
* \brief Parse the file and insert the record
|
|
* into the table import_tmp. Insert in a temporary table, if
|
|
* no confirmation is given then the data are removed otherwise
|
|
* records are inserted into import_tmp. Following
|
|
* the choosen bank a different file is included to
|
|
* to parse the CSV, take the cbc_be.inc.php as template
|
|
*
|
|
* \param $p_cn database connection
|
|
* \param $file the uploaded file
|
|
* \param $p_bq_account the bank account (target)
|
|
* \param $p_format_csv file to include (depending of the bank)
|
|
*/
|
|
function ImportCSV($p_cn,$file,$p_bq_account,$p_format_csv,$p_jrn)
|
|
{
|
|
if(!$handle = fopen($file, "r")) {
|
|
print 'could not open file. quitting';
|
|
die;
|
|
}
|
|
|
|
StartSql($p_cn);
|
|
|
|
|
|
// include the right format for CSV --> given by the <form
|
|
require_once($p_format_csv);
|
|
|
|
|
|
echo "Importation terminée.";
|
|
|
|
// if importation succeeds then we can commit the change
|
|
Commit($p_cn);
|
|
|
|
}
|
|
/*!\brief Update import_tmp with the bank account
|
|
*
|
|
*/
|
|
function UpdateCSV($p_cn){
|
|
$code=FormatString($_POST['code']);
|
|
$count=FormatString($_POST['count']);
|
|
$poste=FormatString($_POST['poste'.$count]);
|
|
$concern=FormatString($_POST['e_concerned'.$count]);
|
|
$sql = utf8_encode("update import_tmp set poste_comptable='$poste' ,status='w',".
|
|
"jr_rapt='$concern' where code='$code'");
|
|
$Res=ExecSql($p_cn,$sql);
|
|
}
|
|
|
|
|
|
|
|
|
|
/*!\brief This function show a record from the table import_tmp, the tag for the form
|
|
* are not included in the function and must set in the calling proc.
|
|
* \param $p_val array (row from import_type)
|
|
* \param $counter a counter used in the form
|
|
* \param $p_cn database connection
|
|
* \param $p_form indicates if the button for the form is enable,
|
|
* modify the Quick Code or remove record poss.value are form, remove
|
|
*/
|
|
function ShowBox($p_val,$counter,$p_cn,$p_form='form'){
|
|
$w=new widget('js_search_only');
|
|
$w->name='poste'.$counter;
|
|
$w->extra='filter';
|
|
$w->extra2='QuickCode';
|
|
$w->label='';
|
|
$w->table=0;
|
|
if ( $p_form == 'remove' )
|
|
$w->readonly=true;
|
|
|
|
$oJrn=new Acc_Ledger($p_cn,$p_val['jrn']);
|
|
// widget concerned
|
|
$wConcerned=new widget('js_concerned');
|
|
$wConcerned->name="e_concerned"+$counter;
|
|
$wConcerned->extra=abs($p_val['montant']);
|
|
$wConcerned->extra2='paid';
|
|
$wConcerned->label='op. concernée';
|
|
$wConcerned->table=0;
|
|
$s=new widget('span');
|
|
|
|
// if in readonly retrieve the conc. ope
|
|
if ( $p_form== 'remove') {
|
|
$wConcerned->readonly=true;
|
|
$wConcerned->value=$p_val['jr_rapt'];
|
|
}
|
|
|
|
if ( isset($p_val['poste_comptable']))
|
|
{
|
|
$w->value=$p_val['poste_comptable'];
|
|
$cn=DbConnect(dossier::id());
|
|
$f=new fiche($p_cn);
|
|
$f->get_by_qcode($p_val['poste_comptable']);
|
|
$s->value=$f->strAttribut(ATTR_DEF_NAME);
|
|
}
|
|
echo '<input type="hidden" id="code'.$counter.'" value="'.$p_val['code'].'">';
|
|
echo '<input type="hidden" name="count" value="'.$counter.'">';
|
|
echo widget::hidden('p_jrn',$p_val['jrn']);
|
|
echo '<table border="1" width="500">';
|
|
echo '<tr><td width="200">'.$p_val['code'].'</td><td width="200">'.$p_val['date_exec'].'</td><td width="100">'.$p_val['montant'].' EUR</td><tr/>';
|
|
echo "<tr><td> Journal : ".$oJrn->get_name()."</TD><TD>poste comptable Destination : ".$p_val['bq_account']."</td><tr>";
|
|
echo '<tr colspan="3"><td height="50" colspan="3">'.$p_val['detail'].'</td></tr>';
|
|
echo '<tr><td colspan="3"> '.$wConcerned->IOValue("e_concerned".$counter).'</td></tr>';
|
|
echo '<tr><td>'.$w->IOValue().' '.$s->IOValue('poste'.$counter.'_label').
|
|
"</TD>";
|
|
|
|
echo "<td>n° compte : ".$p_val['num_compte']."</td>";
|
|
if ( $p_form == 'form') {
|
|
$str_update=sprintf("import_update('%s','%s','%s');",
|
|
$_REQUEST['PHPSESSID'],
|
|
dossier::id(),
|
|
$counter);
|
|
$str_remove=sprintf("import_remove('%s','%s','%s');",
|
|
$_REQUEST['PHPSESSID'],
|
|
dossier::id(),
|
|
$counter);
|
|
|
|
echo '<td><input type="button" value="Modifier" onClick="'.$str_update.'">';
|
|
echo '<input type="button" name="trashit" value="Effacer.."'.
|
|
' onClick="'.$str_remove.'" >'.
|
|
'</td><tr/>';
|
|
}
|
|
if ($p_form == 'remove' ) {
|
|
$str_notconfi=sprintf("import_not_confirmed('%s','%s','%s');",
|
|
$_REQUEST['PHPSESSID'],
|
|
dossier::id(),
|
|
$counter);
|
|
|
|
echo '<td><input type="button" value="Enlever" onClick="'.$str_notconfi.'"'.
|
|
'></td><tr/>';
|
|
}
|
|
|
|
echo '</table>';
|
|
|
|
}
|
|
/*!\brief Verify the import
|
|
*/
|
|
|
|
function VerifImport($p_cn){
|
|
$sql = "select * from import_tmp where status='n' ".
|
|
" order by date_exec,code";
|
|
$Res=ExecSql($p_cn,$sql);
|
|
$Num=pg_NumRows($Res);
|
|
echo $Num." opérations à complèter.<br/><br/>";
|
|
$i=1;
|
|
// include javascript for popup
|
|
echo JS_SEARCH_CARD;
|
|
echo JS_CONCERNED_OP;
|
|
echo JS_AJAX_FICHE;
|
|
echo JS_PROTOTYPE;
|
|
while($val = pg_fetch_array($Res)){
|
|
echo '<form METHOD="POST" id="form_'.$i.'"action="import.php?action=verif">';
|
|
echo dossier::hidden();
|
|
ShowBox($val,$i,$p_cn,'form');
|
|
echo '</form>';
|
|
$i++;
|
|
}
|
|
|
|
}
|
|
/*!\brief ConfirmCSV shows the operation which are going to be transfered
|
|
*
|
|
* \param $p_cn database conx
|
|
* \param $periode user's periode
|
|
*/
|
|
function ConfirmTransfert($p_cn,$periode){
|
|
|
|
$sql = "select to_char(p_start,'DD-MM-YYYY') as p_start,to_char(p_end,'DD-MM-YYYY') as p_end".
|
|
" from parm_periode where p_id = '".$periode."'";
|
|
$Res=ExecSql($p_cn,$sql);
|
|
$val = pg_fetch_array($Res);
|
|
if ( $val == false )
|
|
{
|
|
echo "<script>".
|
|
"alert ('Vous devez selectionner votre période dans vos préférences');".
|
|
"</script>";
|
|
exit();
|
|
}
|
|
$start ="to_date('".$val['p_start']."','DD-MM-YYYY')";
|
|
$end = "to_date('".$val['p_end']."','DD-MM-YYYY')";
|
|
|
|
$sql = "select code,to_char(date_exec,'DD.MM.YYYY') as date_exec, ".
|
|
" montant,num_compte,poste_comptable,bq_account,jrn,detail,jr_rapt ".
|
|
" from import_tmp where
|
|
status = 'w' AND date_exec BETWEEN ".$start." and ".$end;
|
|
|
|
|
|
|
|
$Res=ExecSql($p_cn,$sql);
|
|
$Num=pg_NumRows($Res);
|
|
echo $Num." opérations à transfèrer.<br/><br/>";
|
|
if ( $Num == 0 ) return;
|
|
$i=1;
|
|
while($val = pg_fetch_array($Res)){
|
|
|
|
echo '<form method="post" id="form_'.$i.'" action="import.php">';
|
|
echo dossier::hidden();
|
|
echo '<input type="hidden" name="action" value="remove">';
|
|
ShowBox($val,$i,$p_cn,'remove');
|
|
echo '</form>';
|
|
$i++;
|
|
}
|
|
echo '<form method="post" id="form_'.$i.'" action="import.php">';
|
|
echo dossier::hidden();
|
|
echo '<input type="hidden" name="action" value="transfer">';
|
|
echo '<input type="submit" name="sub" value="Commencer le transfert">';
|
|
echo '</form>';
|
|
|
|
}
|
|
|
|
/*!\brief Transfert data into the ledger
|
|
* set the column import_tmp.status to w (wait) if the account is not correct
|
|
* otherwise transfert it to the ledger and set the column import_tmp.status
|
|
* to t (transfert)
|
|
* \param $p_cn connx
|
|
* \param $periode periode
|
|
*/
|
|
|
|
function TransferCSV($p_cn, $periode){
|
|
//on obtient la période courante
|
|
$User=new User($p_cn);
|
|
$periode = $User->get_periode();
|
|
|
|
// on trouve les dates frontières de cette période
|
|
$sql = "select to_char(p_start,'DD-MM-YYYY') as p_start,to_char(p_end,'DD-MM-YYYY') as p_end".
|
|
" from parm_periode where p_id = '".$periode."'";
|
|
|
|
$Res=ExecSql($p_cn,$sql);
|
|
$val = pg_fetch_array($Res);
|
|
if ( $val == false )
|
|
{
|
|
echo "<script>".
|
|
"alert ('Vous devez selectionner votre période dans vos préférences');".
|
|
"</script>";
|
|
exit();
|
|
}
|
|
|
|
$start ="to_date('".$val['p_start']."','DD-MM-YYYY')";
|
|
$end = "to_date('".$val['p_end']."','DD-MM-YYYY')";
|
|
$sql = "select code,to_char(date_exec,'DD.MM.YYYY') as date_exec, ".
|
|
" montant,num_compte,poste_comptable,bq_account,jrn,detail,jr_rapt ".
|
|
" from import_tmp where ".
|
|
" status= 'w' AND date_exec BETWEEN ".$start." and ".$end;
|
|
|
|
try
|
|
{
|
|
StartSql($p_cn);
|
|
$ResAll=ExecSql($p_cn,$sql);
|
|
$Max=pg_NumRows($ResAll);
|
|
echo $Max." opérations à transférer.<br/>";
|
|
for ($i = 0;$i < $Max;$i++) {
|
|
$val=pg_fetch_array($ResAll,$i);
|
|
|
|
$code=$val['code'];
|
|
$date_exec=$val['date_exec'];
|
|
$montant=$val['montant'];
|
|
$num_compte=$val['num_compte'];
|
|
$poste_comptable=$val['poste_comptable'];
|
|
$bq_account=$val['bq_account'];
|
|
$jrn=$val['jrn'];
|
|
$oJrn=new Acc_Ledger($p_cn,$jrn);
|
|
$detail=$val['detail'];
|
|
$jr_rapt=$val['jr_rapt'];
|
|
|
|
// Retrieve the account thx the quick code
|
|
$f=new fiche($p_cn);
|
|
$f->get_by_qcode($poste_comptable,false);
|
|
$poste_comptable=$f->strAttribut(ATTR_DEF_ACCOUNT);
|
|
|
|
// Vérification que le poste comptable trouvé existe
|
|
if ( $poste_comptable == '- ERROR -')
|
|
$test=0;
|
|
else
|
|
{
|
|
$sqltest = "select * from tmp_pcmn WHERE pcm_val='".$poste_comptable."'";
|
|
|
|
$Restest=ExecSql($p_cn,$sqltest);
|
|
$test=pg_NumRows($Restest);
|
|
}
|
|
|
|
// Test it
|
|
if($test == 0) {
|
|
$sqlupdate = "update import_tmp set status='n' WHERE code='".$code."' AND num_compte='".$num_compte."' or num_compte is null";
|
|
$Resupdate=ExecSql($p_cn,$sqlupdate);
|
|
echo "Poste comptable erronné pour l'opération ".$num_compte."-".$code.", réinitialisation du poste comptable<br/>";
|
|
continue;
|
|
}
|
|
|
|
|
|
// Finances
|
|
|
|
$seq=NextSequence($p_cn,'s_grpt');
|
|
$p_user = $_SESSION['g_user'];
|
|
|
|
$acc_op=new Acc_Operation($p_cn);
|
|
$acc_op->amount=$montant;
|
|
$acc_op->desc=$detail;
|
|
$acc_op->type="d";
|
|
$acc_op->date=$date_exec;
|
|
$acc_op->user=$p_user;
|
|
$acc_op->poste=$bq_account;
|
|
$acc_op->grpt=$seq;
|
|
$acc_op->jrn=$jrn;
|
|
$acc_op->periode=$periode;
|
|
$acc_op->qcode="";
|
|
$r=$acc_op->insert_jrnx();
|
|
|
|
|
|
$acc_op->type="c";
|
|
$acc_op->poste=$poste_comptable;
|
|
$acc_op->amount=$montant;
|
|
$r=$acc_op->insert_jrnx();
|
|
|
|
|
|
|
|
//remove annoying double-quote
|
|
$num_compte=str_replace('"','',$num_compte);
|
|
$code=str_replace('\"','',$code);
|
|
$acc_op->comment=$detail.$num_compte." ".$code;
|
|
|
|
$jr_id=$acc_op->insert_jrn();
|
|
|
|
$internal=$oJrn->compute_internal_code($seq);
|
|
|
|
$Res=ExecSql($p_cn,"update jrn set jr_internal='".$internal."' where ".
|
|
" jr_id = ".$jr_id);
|
|
// insert rapt
|
|
|
|
$acc_reconc=new Acc_Reconciliation($p_cn);
|
|
$acc_reconc->set_jr_id=$jr_id;
|
|
$acc_reconc->insert($jr_rapt);
|
|
|
|
echo "Tranfert de l'opération ".$code." effectué<br/>";
|
|
$sql2 = "update import_tmp set status='t' where code='".$code."'";
|
|
$Res2=ExecSql($p_cn,$sql2);
|
|
}
|
|
} catch (Exception $e) {
|
|
Rollback($p_cn);
|
|
echo '<span class="error">'.
|
|
'Erreur dans '.__FILE__.':'.__LINE__.
|
|
' Message = '.$e->getMessage().
|
|
'</span>';
|
|
}
|
|
|
|
Commit($p_cn);
|
|
|
|
}
|
|
/*!
|
|
**************************************************
|
|
* \brief ShowForm for getting data about
|
|
* the bank transfert in cvs
|
|
*
|
|
* \param $p_cn database connection
|
|
*
|
|
* \return none
|
|
*/
|
|
|
|
function ShowFormTransfert($p_cn){
|
|
$w=new widget("select");
|
|
echo '<FORM METHOD="POST" action="import.php?action=import" enctype="multipart/form-data">';
|
|
echo dossier::hidden();
|
|
echo '<INPUT TYPE="file" name="fupload" size="20"><br>';
|
|
// ask for the journal target
|
|
$jrn=make_array ($p_cn,"select jrn_def_id,jrn_def_name from jrn_def where jrn_def_type='FIN';");
|
|
$w->label='Journal';
|
|
echo $w->label." :".$w->IOValue('import_jrn',$jrn)."<br>";
|
|
// choose the bank account
|
|
$banque=new Acc_Parm_Code($p_cn,'BANQUE');
|
|
$bq=make_array($p_cn,"select pcm_val,pcm_lib from tmp_pcmn where pcm_val::text like '".$banque->p_value."%'");
|
|
$w->label='Banque';
|
|
echo "Compte en banque :".$w->IOValue('import_bq',$bq)."<br>";
|
|
$format_csv=make_array($p_cn,"select include_file,name from format_csv_banque;");
|
|
$w->label="Format import";
|
|
echo $w->label.$w->IOValue('format_csv',$format_csv).'<br>';
|
|
echo '<INPUT TYPE="SUBMIT" Value="Import fiche">';
|
|
echo '</FORM>';
|
|
}
|
|
|
|
/*!\brief RemoveRow put a flag delete on a row of the table import_tmp
|
|
* (import_tmp.status)
|
|
* \param $p_cn database connection
|
|
* \param $p_code import_tmp.code must be unique
|
|
*/
|
|
function DropRecord($p_cn,$p_code)
|
|
{
|
|
ExecSql($p_cn,"update import_tmp set status='d' where code='".$p_code."'");
|
|
}
|
|
|
|
?>
|