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 ........
725 lines
22 KiB
PHP
725 lines
22 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
|
|
*/
|
|
/* $Revision$ */
|
|
|
|
// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
|
|
|
|
/*!\file
|
|
* \brief the class Acc_Ledger_Fin inherits from Acc_Ledger, this
|
|
* object permit to manage the financial ledger
|
|
*/
|
|
require_once('class_acc_ledger.php');
|
|
require_once('poste.php');
|
|
|
|
class Acc_Ledger_Fin extends Acc_Ledger {
|
|
/*!\brief verify that the data are correct before inserting or confirming
|
|
*\param an array (usually $_POST)
|
|
*\return String
|
|
*\note return an AcException if an error occurs
|
|
*/
|
|
public function verify($p_array) {
|
|
extract ($p_array);
|
|
/* check if there is a customer */
|
|
if ( strlen(trim($e_bank_account)) == 0 )
|
|
throw new AcException('Vous n\'avez pas donné de banque',11);
|
|
|
|
/* check if the date is valid */
|
|
if ( isDate($e_date) == null ) {
|
|
throw new AcException('Date invalide', 2);
|
|
}
|
|
|
|
/* check if the periode is closed */
|
|
if ( $this->is_closed($periode)==1 )
|
|
{
|
|
throw new AcException('Periode fermee',6);
|
|
}
|
|
|
|
/* check that the datum is in the choosen periode */
|
|
$per=new Periode($this->db);
|
|
list ($min,$max)=$per->get_date_limit($periode);
|
|
if ( cmpDate($e_date,$min) < 0 ||
|
|
cmpDate($e_date,$max) > 0)
|
|
throw new AcException('Date et periode ne correspondent pas',6);
|
|
$fiche=new fiche($this->db);
|
|
$fiche->get_by_qcode($e_bank_account);
|
|
if ( $fiche->empty_attribute(ATTR_DEF_ACCOUNT) == true)
|
|
throw new AcException('La fiche '.$e_bank_account.'n\'a pas de poste comptable',8);
|
|
|
|
/* The account exists */
|
|
$poste=new Acc_Account_Ledger($this->db,$fiche->strAttribut(ATTR_DEF_ACCOUNT));
|
|
if ( $poste->load() == false ){
|
|
throw new AcException('Pour la fiche '.$e_bank_account.' le poste comptable ['.$poste->id.'] n\'existe pas',9);
|
|
}
|
|
|
|
/* Check if the card belong to the ledger */
|
|
$fiche=new fiche ($this->db);
|
|
$fiche->get_by_qcode($e_bank_account);
|
|
if ( $fiche->belong_ledger($p_jrn,'deb') !=1 )
|
|
throw new AcException('La fiche '.$e_bank_account.'n\'est pas accessible à ce journal',10);
|
|
|
|
$nb=0;
|
|
$tot_amount=0;
|
|
//----------------------------------------
|
|
// foreach item
|
|
//----------------------------------------
|
|
for ($i=0;$i< $nb_item;$i++) {
|
|
if ( strlen(trim(${'e_other'.$i}))== 0) continue;
|
|
/* check if amount are numeric and */
|
|
if ( isNumber(${'e_other'.$i.'_amount'}) == 0 )
|
|
throw new AcException('La fiche '.${'e_other'.$i}.'a un montant invalide ['.${'e_other'.$i}.']',6);
|
|
|
|
/* compute the total */
|
|
$tot_amount+=round(${'e_other'.$i.'_amount'},2);
|
|
|
|
/* check if all card has a ATTR_DEF_ACCOUNT*/
|
|
$fiche=new fiche($this->db);
|
|
$fiche->get_by_qcode(${'e_other'.$i});
|
|
if ( $fiche->empty_attribute(ATTR_DEF_ACCOUNT) == true)
|
|
throw new AcException('La fiche '.${'e_other'.$i}.'n\'a pas de poste comptable',8);
|
|
/* The account exists */
|
|
$poste=new Acc_Account_Ledger($this->db,$fiche->strAttribut(ATTR_DEF_ACCOUNT));
|
|
if ( $poste->load() == false ){
|
|
throw new AcException('Pour la fiche '.${'e_other'.$i}.' le poste comptable ['.$poste->id.'n\'existe pas',9);
|
|
}
|
|
/* Check if the card belong to the ledger */
|
|
$fiche=new fiche ($this->db);
|
|
$fiche->get_by_qcode(${'e_other'.$i});
|
|
if ( $fiche->belong_ledger($p_jrn,'cred') !=1 )
|
|
throw new AcException('La fiche '.${'e_other'.$i}.'n\'est pas accessible à ce journal',10);
|
|
$nb++;
|
|
}
|
|
if ( $nb == 0 )
|
|
throw new AcException('Il n\'y a aucune opération',12);
|
|
|
|
/* Check if the last_saldo and first_saldo are correct */
|
|
if ( strlen(trim($last_sold)) != 0 && isNumber($last_sold) &&
|
|
strlen(trim($first_sold)) != 0 && isNumber($first_sold))
|
|
{
|
|
$diff=$last_sold-$first_sold;
|
|
$diff=round($diff,2);
|
|
if ( $first_sold != 0 && $last_sold !=0) {
|
|
if ( $tot_amount != $diff )
|
|
throw new AcException('Le montant de l\'extrait est incorrect'.
|
|
$tot_amount.' extrait '.$diff,13);
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
|
|
/*!\brief
|
|
*\param $p_array contains the value usually it is $_POST
|
|
*\return string with html code
|
|
*\note the form tag are not set here
|
|
*/
|
|
function display_form($p_array=null) {
|
|
if ( $p_array != null)
|
|
extract ($p_array);
|
|
$pview_only=false;
|
|
$user = new User($this->db);
|
|
|
|
// The first day of the periode
|
|
$pPeriode=new Periode($this->db);
|
|
list ($l_date_start,$l_date_end)=$pPeriode->get_date_limit($user->get_periode());
|
|
|
|
$op_date=( ! isset($e_date) ) ?$l_date_start:$e_date;
|
|
$ext_no=( ! isset($ext_no) ) ?'':$ext_no;
|
|
|
|
$r="";
|
|
|
|
$r.=JS_INFOBULLE;
|
|
$r.=JS_SEARCH_CARD;
|
|
$r.=JS_AJAX_FICHE;
|
|
$r.=JS_CONCERNED_OP;
|
|
|
|
$r.=dossier::hidden();
|
|
$r.=widget::hidden('phpsessid',$_REQUEST['PHPSESSID']);
|
|
//$r.=widget::hidden('p_jrn',$this->id);
|
|
$r.='<fieldset><legend>Banque, caisse </legend>';
|
|
$r.='<TABLE width="100%">';
|
|
// Date
|
|
//--
|
|
$Date=new widget("js_date");
|
|
$Date->SetReadOnly($pview_only);
|
|
$Date->table=1;
|
|
$Date->tabindex=1;
|
|
$r.="<tr>";
|
|
$r.=$Date->IOValue("e_date",$op_date,"Date");
|
|
// Periode
|
|
//--
|
|
$l_user_per=$user->get_periode();
|
|
$l_form_per=FormPeriode($this->db,$l_user_per,OPEN);
|
|
$r.="<td class=\"input_text\">";
|
|
$label=widget::infobulle(3);
|
|
$r.="Période comptable $label</td><td>".$l_form_per;
|
|
$r.="</td>";
|
|
$r.="</tr>";
|
|
// Ledger (p_jrn)
|
|
//--
|
|
$wLedger=$this->select_ledger('FIN',2);
|
|
if ($wLedger == null) exit ('Pas de journal disponible');
|
|
$wLedger->table=1;
|
|
$wLedger->label=" Journal ".widget::infobulle(2) ;
|
|
$r.='<tr>';
|
|
$r.=$wLedger->IOValue();
|
|
$r.='</tr>';
|
|
|
|
//retrieve bank name
|
|
$e_bank_account=( isset ($e_bank_account) )?$e_bank_account:"";
|
|
$e_bank_account_label="";
|
|
|
|
// retrieve e_bank_account_label
|
|
if ( $e_bank_account != "" ) {
|
|
$fBank=new fiche($this->db);
|
|
$fBank->get_by_qcode($e_bank_account);
|
|
$e_bank_account_label=$fBank->strAttribut(ATTR_DEF_NAME).' '.
|
|
' Adresse : '.$fBank->strAttribut(ATTR_DEF_ADRESS).' '.
|
|
$fBank->strAttribut(ATTR_DEF_CP).' '.
|
|
$fBank->strAttribut(ATTR_DEF_CITY).' ';
|
|
|
|
}
|
|
|
|
$W1=new widget("js_search_only");
|
|
$W1->readonly=$pview_only;
|
|
$W1->label="Banque ".widget::infobulle(0);
|
|
$W1->name="e_bank_account";
|
|
$W1->value=$e_bank_account;
|
|
$W1->extra='deb'; // credits
|
|
$W1->extra2="Recherche";
|
|
$W1->table=0;
|
|
$r.="<TR><td colspan=\"4\">".$W1->IOValue();
|
|
$Span=new widget ("span");
|
|
$Span->SetReadOnly($pview_only);
|
|
$r.=$Span->IOValue("e_bank_account_label",$e_bank_account_label)."</TD>";
|
|
|
|
$r.="</TABLE>";
|
|
|
|
$r.='</fieldset>';
|
|
|
|
|
|
|
|
|
|
$r.='<fieldset><legend>Opérations financières</legend>';
|
|
//--------------------------------------------------
|
|
// Saldo begin end
|
|
//-------------------------------------------------
|
|
$r.='<fieldset><legend>Extrait de compte</legend>';
|
|
$r.='<table>';
|
|
$r.='<tr>';
|
|
// Extrait
|
|
//--
|
|
$wExt=new widget('TEXT');
|
|
$label=widget::infobulle(5);
|
|
$wExt->label='Numéro d\'extrait '.$label;
|
|
$wExt->table=1;
|
|
$r.=$wExt->IOValue("ext_no",$ext_no);
|
|
$label=widget::infobulle(7);
|
|
$r.='<td class="input_text">Solde début extrait'.$label.' </td>';
|
|
$wFirst=new widget('text');
|
|
$wFist->table=0;
|
|
$first_sold=(isset($first_sold))?$first_sold:"";
|
|
$r.='<td>'.$wFirst->IOValue('first_sold',$first_sold).'</td>';
|
|
$wLast=new widget('text');
|
|
$wLast->table=1;
|
|
$last_sold= isset($last_sold)?$last_sold:"";
|
|
$r.='<td class="input_text">Solde fin extrait'.$label.' </td>';
|
|
$r.='<td>'.$wLast->IOValue('last_sold',$last_sold).'</td>';
|
|
$r.='</table>';
|
|
$r.='</fieldset>';
|
|
|
|
//--------------------------------------------------
|
|
// financial operation
|
|
//-------------------------------------------------
|
|
$r.='<TABLE id="fin_item">';
|
|
$r.="<TR>";
|
|
$r.="<th colspan=\"2\">code".widget::infobulle(0)."</TH>";
|
|
$r.="<th>Commentaire</TH>";
|
|
$r.="<th>Montant</TH>";
|
|
$r.='<th colspan="2"> Op. Concernée(s)</th>';
|
|
$r.="</TR>";
|
|
// Parse each " tiers"
|
|
for ($i=0; $i < MAX_ARTICLE; $i++) {
|
|
$tiers=(isset(${"e_other".$i}))?${"e_other".$i}:"";
|
|
$tiers_label="";
|
|
$tiers_amount=(isset(${"e_other$i"."_amount"}))?round(${"e_other$i"."_amount"},2):0;
|
|
|
|
$tiers_comment=(isset (${"e_other$i"."_comment"}))?${"e_other$i"."_comment"}:"";
|
|
// If $tiers has a value
|
|
if ( $tiers != "" )
|
|
{
|
|
$fTiers=new fiche($this->db);
|
|
$fTiers->get_by_qcode($tiers);
|
|
|
|
$tiers_label=$fTiers->strAttribut(ATTR_DEF_NAME);
|
|
|
|
}
|
|
${"e_other$i"."_amount"}=(isset (${"e_other$i"."_amount"}))?${"e_other$i"."_amount"}:0;
|
|
|
|
$W1=new widget("js_search_only");
|
|
$W1->label="";
|
|
$W1->name="e_other".$i;
|
|
$W1->value=$tiers;
|
|
$W1->extra='cred'; // credits
|
|
$W1->extra2='Recherche';
|
|
$W1->readonly=$pview_only;
|
|
$r.="<TR><td>".$W1->IOValue()."</TD>";
|
|
// label
|
|
$other=new widget("span");
|
|
$r.='<TD style="width:25%;border-bottom:1px dotted grey;">';
|
|
$r.=$other->IOValue("e_other$i"."_label", $tiers_label);
|
|
// Comment
|
|
$wComment=new widget("text");
|
|
$wComment->table=1;
|
|
$wComment->size=35;
|
|
$wComment->SetReadOnly($pview_only);
|
|
$r.=$wComment->IOValue("e_other$i"."_comment",$tiers_comment);
|
|
// amount
|
|
$wAmount=new widget("text");
|
|
$wAmount->table=1;
|
|
$wAmount->size=7;
|
|
$wAmount->SetReadOnly($pview_only);
|
|
$r.=$wAmount->IOValue("e_other$i"."_amount",$tiers_amount);
|
|
// concerned
|
|
${"e_concerned".$i}=(isset(${"e_concerned".$i}))?${"e_concerned".$i}:"";
|
|
$wConcerned=new widget("js_concerned");
|
|
$wConcerned->SetReadOnly($pview_only);
|
|
$wConcerned->extra=0;
|
|
$wConcerned->table=1;
|
|
$wConcerned->extra2='paid';
|
|
$r.=$wConcerned->IOValue("e_concerned".$i,${"e_concerned".$i});
|
|
$r.='</TR>';
|
|
}
|
|
$r.="</TABLE>";
|
|
|
|
$r.='</fieldset>';
|
|
|
|
|
|
|
|
return $r;
|
|
|
|
}
|
|
/*!\brief show the summary before inserting into the database, it
|
|
*calls the function for adding a attachment. The function verify
|
|
*should be called before
|
|
*\param $p_array an array usually is $_POST
|
|
*\return string with code html
|
|
*/
|
|
public function confirm($p_array) {
|
|
$r="";
|
|
|
|
extract ($p_array);
|
|
$pPeriode=new Periode($this->db);
|
|
$pPeriode->id=$periode;
|
|
list ($l_date_start,$l_date_end)=$pPeriode->get_date_limit($periode);
|
|
$exercice=$pPeriode->get_exercice();
|
|
$r.='';
|
|
$r.='<fieldset><legend>Banque, caisse </legend>';
|
|
$r.='<TABLE width="100%">';
|
|
// Date
|
|
//--
|
|
$r.="<tr>";
|
|
$r.='<td> Date : </td><td>'.$e_date;
|
|
// Periode
|
|
//--
|
|
$r.="<td>";
|
|
$r.="Période comptable </td><td>";
|
|
$r.=$l_date_start.' - '.$l_date_end;
|
|
$r.="</td>";
|
|
$r.="</tr>";
|
|
// Ledger (p_jrn)
|
|
//--
|
|
$r.='<tr>';
|
|
$r.='<td> Journal </td>';
|
|
$this->id=$p_jrn;
|
|
$r.='<td>';
|
|
$r.=$this->get_name();
|
|
$r.='</td>';
|
|
$r.='</tr>';
|
|
|
|
//retrieve bank name
|
|
$e_bank_account=( isset ($e_bank_account) )?$e_bank_account:"";
|
|
$e_bank_account_label="";
|
|
|
|
$fBank=new fiche($this->db);
|
|
$fBank->get_by_qcode($e_bank_account);
|
|
$e_bank_account_label=$fBank->strAttribut(ATTR_DEF_NAME).' '.
|
|
' Adresse : '.$fBank->strAttribut(ATTR_DEF_ADRESS).' '.
|
|
$fBank->strAttribut(ATTR_DEF_CP).' '.
|
|
$fBank->strAttribut(ATTR_DEF_CITY).' ';
|
|
|
|
$filter_year=" and j_tech_per in (select p_id from parm_periode where p_exercice='".$exercice."')";
|
|
|
|
|
|
$solde=get_solde($this->db,$fBank->strAttribut(ATTR_DEF_ACCOUNT),$filter_year);
|
|
$new_solde=$solde;
|
|
|
|
$r.="<TR><td colspan=\"4\"> Banque ";
|
|
$r.=$e_bank_account_label;
|
|
|
|
$r.="</TABLE>";
|
|
|
|
$r.='</fieldset>';
|
|
|
|
$r.='<fieldset><legend>Opérations financières</legend>';
|
|
//--------------------------------------------------
|
|
// Saldo begin end
|
|
//-------------------------------------------------
|
|
$r.='<fieldset><legend>Extrait de compte</legend>';
|
|
$r.='<table>';
|
|
$r.='<tr>';
|
|
// Extrait
|
|
//--
|
|
$r.='<td> Numéro d\'extrait</td>'.$ext_no;
|
|
$r.='<td >Solde début extrait </td>';
|
|
$r.='<td>'.$first_sold.'</td>';
|
|
$r.='<td>Solde fin extrait </td>';
|
|
$r.='<td>'.$last_sold.'</td>';
|
|
$r.='</table>';
|
|
$r.='</fieldset>';
|
|
|
|
//--------------------------------------------------
|
|
// financial operation
|
|
//-------------------------------------------------
|
|
$r.='<TABLE style="width:100%" id="fin_item">';
|
|
$r.="<TR>";
|
|
$r.="<th colspan=\"2\">code</TH>";
|
|
$r.="<th>Commentaire</TH>";
|
|
$r.="<th>Montant</TH>";
|
|
$r.='<th colspan="2"> Op. Concernée(s)</th>';
|
|
$r.="</TR>";
|
|
// Parse each " tiers"
|
|
$tot_amount=0;
|
|
//--------------------------------------------------
|
|
// For each items
|
|
//--------------------------------------------------
|
|
for ($i=0; $i < $nb_item; $i++) {
|
|
|
|
$tiers=(isset(${"e_other".$i}))?${"e_other".$i}:"";
|
|
|
|
if ( strlen(trim($tiers))==0)continue;
|
|
$tiers_label="";
|
|
$tiers_amount=round(${"e_other$i"."_amount"},2);
|
|
$tot_amount=bcadd($tot_amount,$tiers_amount);
|
|
$tiers_comment=${"e_other$i"."_comment"};
|
|
// If $tiers has a value
|
|
$fTiers=new fiche($this->db);
|
|
$fTiers->get_by_qcode($tiers);
|
|
|
|
$tiers_label=$fTiers->strAttribut(ATTR_DEF_NAME);
|
|
|
|
$r.="<TR><td>".${'e_other'.$i}."</TD>";
|
|
// label
|
|
$other=new widget("span");
|
|
$r.='<TD style="width:25%;border-bottom:1px dotted grey;">';
|
|
$r.=$fTiers->strAttribut(ATTR_DEF_NAME);
|
|
$r.='</td>';
|
|
// Comment
|
|
$r.='<td style="width:40%">'.$tiers_comment.'</td>';
|
|
// amount
|
|
$r.='<td>'.$tiers_amount.'</td>';
|
|
// concerned
|
|
$r.='<td>';
|
|
$r.=${"e_concerned".$i};
|
|
$r.='</td>';
|
|
$r.='</TR>';
|
|
}
|
|
$r.="</TABLE>";
|
|
|
|
// saldo
|
|
$r.='<br>Ancien solde = '.$solde;
|
|
$new_solde+=$tot_amount;
|
|
$r.='<br>Nouveau solde = '.$new_solde;
|
|
// check for upload piece
|
|
$file=new widget("file");
|
|
$file->table=0;
|
|
$r.="<br>Ajoutez une pièce justificative ";
|
|
$r.=$file->IOValue("pj","");
|
|
|
|
$r.='</fieldset>';
|
|
//--------------------------------------------------
|
|
// Hidden variables
|
|
//--------------------------------------------------
|
|
$r.=dossier::hidden();
|
|
$r.=widget::hidden('phpsessid',$_REQUEST['PHPSESSID']);
|
|
$r.=widget::hidden('p_jrn',$this->id);
|
|
$r.=widget::hidden('nb_item',$nb_item);
|
|
$r.=widget::hidden('last_sold',$last_sold);
|
|
$r.=widget::hidden('first_sold',$first_sold);
|
|
$r.=widget::hidden('e_bank_account',$e_bank_account);
|
|
$r.=widget::hidden('ext_no',$ext_no);
|
|
$r.=widget::hidden('e_date',$e_date);
|
|
$r.=widget::hidden('periode',$periode);
|
|
$r.=dossier::hidden();
|
|
$r.=widget::hidden('sa','n');
|
|
for ($i=0; $i < $nb_item; $i++) {
|
|
$tiers=(isset(${"e_other".$i}))?${"e_other".$i}:"";
|
|
$r.=widget::hidden('e_other'.$i,$tiers);
|
|
$r.=widget::hidden('e_other'.$i.'_comment',${'e_other'.$i.'_comment'});
|
|
$r.=widget::hidden('e_other'.$i.'_amount',${'e_other'.$i.'_amount'});
|
|
$r.=widget::hidden('e_concerned'.$i,${'e_concerned'.$i});
|
|
}
|
|
|
|
return $r;
|
|
}
|
|
/*!\brief save the data into the database, included the attachment,
|
|
*and the reconciliations
|
|
*\param $p_array usually $_POST
|
|
*\return string with HTML code
|
|
*/
|
|
public function insert($p_array) {
|
|
$internal_code="";
|
|
$oid=0;
|
|
extract ($p_array);
|
|
|
|
// Debit = banque
|
|
|
|
$fBank=new fiche($this->db);
|
|
$fBank->get_by_qcode($e_bank_account);
|
|
// Get the saldo
|
|
$pPeriode=new Periode($this->db);
|
|
$pPeriode->id=$periode;
|
|
$exercice=$pPeriode->get_exercice();
|
|
|
|
$filter_year=" and j_tech_per in (select p_id from parm_periode where p_exercice='".$exercice."')";
|
|
$solde=get_solde($this->db,$fBank->strAttribut(ATTR_DEF_ACCOUNT),$filter_year);
|
|
$new_solde=$solde;
|
|
|
|
try
|
|
{
|
|
StartSql($this->db);
|
|
$amount=0.0;
|
|
// Credit = goods
|
|
for ( $i = 0; $i < $nb_item;$i++) {
|
|
// if tiers is set and amount != 0 insert it into the database
|
|
// and quit the loop ?
|
|
if ( strlen(trim(${"e_other$i"}))==0 ) continue;
|
|
|
|
$fPoste=new fiche($this->db);
|
|
$fPoste->get_by_qcode(${"e_other$i"});
|
|
// round it
|
|
${"e_other$i"."_amount"}=round( ${"e_other$i"."_amount"},2);
|
|
|
|
$amount+=${"e_other$i"."_amount"};
|
|
// Record a line for the bank
|
|
// Compute the j_grpt
|
|
$seq=NextSequence($this->db,'s_grpt');
|
|
|
|
$acc_operation=new Acc_Operation($this->db);
|
|
$acc_operation->date=$e_date;
|
|
$acc_operation->poste=$fPoste->strAttribut(ATTR_DEF_ACCOUNT);
|
|
$acc_operation->amount=${"e_other$i"."_amount"}*(-1);
|
|
$acc_operation->grpt=$seq;
|
|
$acc_operation->jrn=$p_jrn;
|
|
$acc_operation->type='d';
|
|
$acc_operation->periode=$periode;
|
|
$acc_operation->insert_jrnx();
|
|
|
|
$acc_operation=new Acc_Operation($this->db);
|
|
$acc_operation->date=$e_date;
|
|
$acc_operation->poste=$fBank->strAttribut(ATTR_DEF_ACCOUNT);
|
|
$acc_operation->amount=${"e_other$i"."_amount"};
|
|
$acc_operation->grpt=$seq;
|
|
$acc_operation->jrn=$p_jrn;
|
|
$acc_operation->type='d';
|
|
$acc_operation->periode=$periode;
|
|
$acc_operation->insert_jrnx();
|
|
|
|
|
|
if ( FormatString(${"e_other$i"."_comment"}) == null ) {
|
|
// if comment is blank set a default one
|
|
$comment="ext :".$ext_no." compte : ".$fBank->strAttribut(ATTR_DEF_NAME).' a '.
|
|
$fPoste->strAttribut(ATTR_DEF_NAME);
|
|
} else {
|
|
$comment='ext: '.$ext_no.' '.${'e_other'.$i.'_comment'};
|
|
}
|
|
|
|
|
|
$acc_operation=new Acc_Operation($this->db);
|
|
$acc_operation->jrn=$p_jrn;
|
|
$acc_operation->amount=abs(${"e_other$i"."_amount"});
|
|
$acc_operation->date=$e_date;
|
|
$acc_operation->desc=$comment;
|
|
$acc_operation->grpt=$seq;
|
|
$acc_operation->periode=$periode;
|
|
$jr_id=$acc_operation->insert_jrn();
|
|
|
|
$internal=$this->compute_internal_code($seq);
|
|
|
|
|
|
if ( trim(${"e_concerned".$i}) != "" ) {
|
|
if ( strpos(${"e_concerned".$i},',') !== 0 )
|
|
{
|
|
$aRapt=split(',',${"e_concerned".$i});
|
|
foreach ($aRapt as $rRapt) {
|
|
if ( isNumber($rRapt) == 1 )
|
|
{
|
|
InsertRapt($this->db,$jr_id,$rRapt);
|
|
}
|
|
}
|
|
} else
|
|
if ( isNumber(${"e_concerned".$i}) == 1 )
|
|
{
|
|
InsertRapt($this->db,$jr_id,${"e_concerned$i"});
|
|
}
|
|
}
|
|
|
|
// Set Internal code
|
|
$this->grpt_id=$seq;
|
|
$this->update_internal_code($internal);
|
|
|
|
|
|
|
|
if ( $i == 0 )
|
|
{
|
|
// first record we upload the files and
|
|
// keep variable to update other row of jrn
|
|
if ( isset ($_FILES))
|
|
$oid=save_upload_document($this->db,$seq);
|
|
|
|
} else {
|
|
if ( $oid != 0 )
|
|
{
|
|
ExecSql($this->db,"update jrn set jr_pj=".$oid.", jr_pj_name='".$_FILES['pj']['name']."', ".
|
|
"jr_pj_type='".$_FILES['pj']['type']."' where jr_grpt_id=$seq");
|
|
}
|
|
}
|
|
|
|
} // for nbitem
|
|
}
|
|
catch (Exception $e)
|
|
{
|
|
echo '<span class="error">'.
|
|
'Erreur dans l\'enregistrement '.
|
|
__FILE__.':'.__LINE__.' '.
|
|
$e->getMessage();
|
|
Rollback($this->db);
|
|
exit();
|
|
|
|
}
|
|
Commit($this->db);
|
|
$r="";
|
|
$r.="<br>Ancien solde ".$solde;
|
|
$new_solde+=$amount;
|
|
$r.="<br>Nouveau solde ".$new_solde;
|
|
return $r;
|
|
}
|
|
/*!\brief
|
|
*\param
|
|
*\return
|
|
*\note
|
|
*\see
|
|
*\todo
|
|
*/
|
|
|
|
|
|
function show_ledger() {
|
|
echo dossier::hidden();
|
|
$hid=new widget("hidden");
|
|
|
|
$hid->name="p_action";
|
|
$hid->value="bank";
|
|
echo $hid->IOValue();
|
|
|
|
|
|
$hid->name="sa";
|
|
$hid->value="l";
|
|
echo $hid->IOValue();
|
|
|
|
$User=new User($this->db);
|
|
|
|
$w=new widget("select");
|
|
// filter on the current year
|
|
$filter_year=" where p_exercice='".$User->get_exercice()."'";
|
|
|
|
$periode_start=make_array($this->db,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_start,p_end",1);
|
|
// User is already set User=new User($this->db);
|
|
$current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->get_periode();
|
|
$w->selected=$current;
|
|
|
|
echo JS_SEARCH_CARD;
|
|
echo JS_PROTOTYPE;
|
|
echo JS_AJAX_FICHE;
|
|
echo '<form>';
|
|
echo 'Période '.$w->IOValue("p_periode",$periode_start);
|
|
$wLedger=$this->select_ledger('fin',3);
|
|
if ($wLedger == null) exit ('Pas de journal disponible');
|
|
echo 'Journal '.$wLedger->IOValue();
|
|
$w=new widget('js_search_only');
|
|
$qcode=(isset($_GET['qcode']))?$_GET['qcode']:"";
|
|
echo dossier::hidden();
|
|
echo widget::hidden('p_action','bank');
|
|
echo widget::hidden('sa','l');
|
|
$w->name='qcode';
|
|
$w->value=$qcode;
|
|
$w->label='';
|
|
$this->type='FIN';
|
|
$all=$this->get_all_fiche_def();
|
|
$w->extra=$all;
|
|
$w->extra2='QuickCode';
|
|
$sp= new widget("span");
|
|
echo $sp->IOValue("qcode_label","",$qcode);
|
|
echo $w->IOValue();
|
|
|
|
echo widget::submit('gl_submit','Rechercher');
|
|
echo '</form>';
|
|
|
|
// Show list of sell
|
|
// Date - date of payment - Customer - amount
|
|
if ( $current != -1 )
|
|
{
|
|
$filter_per=" and jr_tech_per=".$current;
|
|
}
|
|
else
|
|
{
|
|
$filter_per=" and jr_tech_per in (select p_id from parm_periode where p_exercice=".
|
|
$User->get_exercice().")";
|
|
}
|
|
/* security */
|
|
$available_ledger=" and jr_def_id= ".$this->id." and ".$User->get_ledger_sql();
|
|
|
|
// Show list of sell
|
|
// Date - date of payment - Customer - amount
|
|
$sql=SQL_LIST_ALL_INVOICE.$filter_per." and jr_def_type='FIN'".
|
|
" $available_ledger" ;
|
|
$step=$_SESSION['g_pagesize'];
|
|
$page=(isset($_GET['offset']))?$_GET['page']:1;
|
|
$offset=(isset($_GET['offset']))?$_GET['offset']:0;
|
|
|
|
$l="";
|
|
|
|
// check if qcode contains something
|
|
if ( $qcode != "" )
|
|
{
|
|
// add a condition to filter on the quick code
|
|
$l=" and jr_grpt_id in (select j_grpt from jrnx where j_qcode='$qcode') ";
|
|
}
|
|
|
|
list($max_line,$list)=ListJrn($this->db,0,"where jrn_def_type='FIN' $filter_per $l $available_ledger "
|
|
,null,$offset,0);
|
|
$bar=jrn_navigation_bar($offset,$max_line,$step,$page);
|
|
|
|
echo "<hr> $bar";
|
|
echo $list;
|
|
echo "$bar <hr>";
|
|
|
|
|
|
|
|
|
|
}
|
|
}
|