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 ........
1127 lines
33 KiB
PHP
1127 lines
33 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
|
|
|
|
include_once("postgres.php");
|
|
require_once("class_document.php");
|
|
require_once("class_acc_operation.php");
|
|
/*! \file
|
|
* \brief Common functions
|
|
*/
|
|
/*!
|
|
**************************************************
|
|
*\brief Return the rate of the p_tva_id
|
|
*
|
|
*
|
|
* \param $p_cn database connection
|
|
* \param $p_tva_id tva.tva_id
|
|
*
|
|
* \return
|
|
* an array containing the rate and the label
|
|
* the tva rate or null if a problem occured
|
|
*/
|
|
|
|
function GetTvaRate($p_cn,$p_tva_id) {
|
|
// $p_tva_id is an empty string, returns 0
|
|
if (strlen(trim($p_tva_id))==0) return 0;
|
|
|
|
// Get vat info from the database
|
|
$Res=ExecSql($p_cn,"select tva_id,tva_rate,tva_label from tva_rate where tva_id=".$p_tva_id);
|
|
if (pg_NumRows($Res) == 0 ) return null;
|
|
|
|
$r=pg_fetch_array($Res,0);
|
|
return $r;
|
|
|
|
}
|
|
/*!
|
|
**************************************************
|
|
*\brief Compute the vat,
|
|
* the fiche.f_id are in a_fiche
|
|
* the quantity in a_quant
|
|
*
|
|
*
|
|
*
|
|
* \param $p_cn database connection
|
|
* \param $a_fiche fiche id array
|
|
* \param $a_quantity array
|
|
* \param $a_price array
|
|
* \param $ap_vat Array of tva id
|
|
* \param $a_amount_tva for the expense, if the tva amount is given
|
|
* \param $all = false if we reduce VAT
|
|
* \return: array
|
|
* a[tva_id] = amount vat
|
|
*/
|
|
function ComputeTotalVat($p_cn, $a_fiche,$a_quant,$a_price,$ap_vat,$a_vat_amount=null,$all=false )
|
|
{
|
|
echo_debug('user_common.php',__LINE__,"ComputeTotalVat $a_fiche $a_quant $a_price");
|
|
foreach ( $a_fiche as $t=>$el) {
|
|
echo_debug('user_common.php',__LINE__,"t $t e $el");
|
|
}
|
|
$r=null;
|
|
// foreach goods
|
|
//--
|
|
foreach ( $a_fiche as $idx=>$element) {
|
|
echo_debug ('user_common.php',__LINE__,"idx $idx element $element");
|
|
// if the card id is null or empty
|
|
if ( strlen(trim($element))==0) continue;
|
|
|
|
// Get the tva_id
|
|
if ( $ap_vat != null and
|
|
isNumber($ap_vat[$idx])== 1 and $ap_vat[$idx] != -1 )
|
|
{
|
|
$tva_id=$ap_vat[$idx];
|
|
echo_debug('user_common',__LINE__,' tva_id is given');
|
|
echo_debug('user_common',__LINE__,$ap_vat);
|
|
}
|
|
else
|
|
{
|
|
$tva_id=GetFicheAttribut($p_cn,$element,ATTR_DEF_TVA);
|
|
echo_debug('user_common',__LINE__,'retrieve tva_id');
|
|
}
|
|
echo_debug('user_common',__LINE__,"tva id $tva_id");
|
|
if ( $tva_id == null ) continue;
|
|
// for each fiche find the tva_rate and tva_id
|
|
$a_vat=GetTvaRate($p_cn,$tva_id);
|
|
|
|
// Get the attribut price of the card(fiche)
|
|
if ( $a_vat != null and $a_vat['tva_id'] != "" )
|
|
{
|
|
$flag=true;
|
|
$a=$a_vat['tva_id'];
|
|
// Compute vat for this item
|
|
$vat_amount=round($a_price[$idx]*$a_vat['tva_rate']*$a_quant[$idx],2);
|
|
|
|
// if a vat amount is given
|
|
if ( $a_vat_amount != null &&
|
|
$a_vat_amount[$idx] != 0 )
|
|
{
|
|
$vat_amount= $a_vat_amount[$idx] ;
|
|
echo_debug(__FILE__.':'.__LINE__.'- VAT_AMOUNT IS GIVEN '.$vat_amount);
|
|
|
|
}
|
|
echo_debug('user_common',__LINE__,"vat amount = $vat_amount");
|
|
// only the deductible vat
|
|
if ( $all == false )
|
|
{
|
|
//variable containing the nd part
|
|
// used when a card has both special rule for vat
|
|
$nd1=0;
|
|
|
|
$base=$a_price[$idx]*$a_vat['tva_rate']*$a_quant[$idx];
|
|
$nd_amount3=0;
|
|
// if a part is not deductible then reduce vat_amount
|
|
$nd3=GetFicheAttribut($p_cn,$a_fiche[$idx],ATTR_DEF_DEP_PRIV);
|
|
if ( $nd3 != null && strlen(trim($nd3)) != 0 && $nd3 != 0 )
|
|
{
|
|
// if tva amount is given we do not compute it
|
|
if ( $a_vat_amount != null &&
|
|
$a_vat_amount[$idx] != 0 ) {
|
|
$nd_amount3=round($a_vat_amount[$idx]*$nd3,2);
|
|
$a_vat_amount[$idx]-=$nd_amount3;
|
|
}
|
|
else
|
|
$nd_amount3=round($a_price[$idx]*$a_vat['tva_rate']*$a_quant[$idx]*$nd3,2);
|
|
|
|
$vat_amount=$vat_amount-$nd_amount3;
|
|
|
|
$base=$base*$nd3;
|
|
// when using both vat, their sum cannot exceed 1, if = 1 then vat = 0
|
|
$flag=false;
|
|
}
|
|
|
|
|
|
// if a part is not deductible then reduce vat_amount
|
|
$nd=GetFicheAttribut($p_cn,$a_fiche[$idx],ATTR_DEF_TVA_NON_DEDUCTIBLE);
|
|
if ( $nd != null && strlen(trim($nd)) != 0 && $nd != 0 )
|
|
{
|
|
// if tva amount is given we do not compute it
|
|
if ( $a_vat_amount != null &&
|
|
$a_vat_amount[$idx] != 0 )
|
|
$nd_amount=round($a_vat_amount[$idx]*$nd,2);
|
|
else
|
|
$nd_amount=round($base*$nd,2);
|
|
|
|
|
|
// problem with round
|
|
$vat_amount=$vat_amount-$nd_amount;
|
|
echo_debug('user_common.php',__LINE__,
|
|
"A - TVA Attr fiche [$nd] nd amount [ $nd_amount ]".
|
|
"vat amount [ $vat_amount]");
|
|
$flag=false;
|
|
// save nd into nd1
|
|
$nd1=$nd;
|
|
}
|
|
// if a part is not deductible then reduce vat_amount
|
|
$nd=GetFicheAttribut($p_cn,$a_fiche[$idx],ATTR_DEF_TVA_NON_DEDUCTIBLE_RECUP);
|
|
if ( $nd != null && strlen(trim($nd)) != 0 && $nd != 0 )
|
|
{
|
|
// if tva amount is given we do not compute it
|
|
if ( $a_vat_amount != null &&
|
|
$a_vat_amount[$idx] != 0 )
|
|
$nd_amount2=round($a_vat_amount[$idx]*$nd,2);
|
|
else
|
|
$nd_amount2=round($base*$nd,2);
|
|
|
|
$vat_amount=$vat_amount-$nd_amount2;
|
|
// when using both vat, their sum cannot exceed 1, if = 1 then vat = 0
|
|
if ( ($nd+$nd1) == 1)
|
|
$vat_amount=0;
|
|
echo_debug('user_common.php',__LINE__,
|
|
"B - TVA Attr fiche [$nd] nd amount [ $nd_amount2 ]".
|
|
"vat amount [ $vat_amount]");
|
|
|
|
$flag=false;
|
|
}
|
|
}
|
|
|
|
$r[$a]=isset ( $r[$a] )?$r[$a]+$vat_amount:$vat_amount;
|
|
}
|
|
|
|
}
|
|
echo_debug('user_common.php',__LINE__," return ".var_export($r,true));
|
|
return $r;
|
|
|
|
|
|
}
|
|
|
|
/*!
|
|
**************************************************
|
|
*\brief Compute the vat for only one elt,
|
|
* the fiche.f_id are in p_fiche
|
|
* the quantity in p_quant
|
|
*
|
|
*
|
|
*
|
|
* \param $p_cn database connection
|
|
* \param $p_fiche fiche id int
|
|
* \param $p_quantity int
|
|
* \param $p_price float
|
|
* \param $p_tva_id
|
|
* -
|
|
* \return the amount of vat
|
|
*/
|
|
function ComputeVat($p_cn, $p_fiche,$p_quant,$p_price,$p_vat )
|
|
{
|
|
echo_debug('user_common.php',__LINE__,"function ComputeVat($p_cn,$p_fiche,$p_quant,$p_price,$p_vat )");
|
|
// Get the tva_id
|
|
if ( $p_vat != null and isNumber($p_vat)== 1 and $p_vat != -1)
|
|
$tva_id=$p_vat;
|
|
else
|
|
$tva_id=GetFicheAttribut($p_cn,$p_fiche,ATTR_DEF_TVA);
|
|
|
|
echo_debug('user_common',__LINE__,"ComputeVat tva id = $tva_id");
|
|
if ( $tva_id == null ) return -1;
|
|
// find the tva_rate and tva_id
|
|
$a_vat=GetTvaRate($p_cn,$tva_id);
|
|
$vat_amount=null;
|
|
// Get the attribut price of the card(fiche)
|
|
if ( $a_vat != null and $a_vat['tva_id'] != "" )
|
|
{
|
|
$a=$a_vat['tva_id'];
|
|
$vat_amount=$p_price*$a_vat['tva_rate']*$p_quant;
|
|
}
|
|
echo_debug('user_common',__LINE__,'return tva'.round($vat_amount,2));
|
|
return round($vat_amount,2);
|
|
|
|
|
|
}
|
|
|
|
|
|
/*!
|
|
**************************************************
|
|
*\brief Get the account of tva_rate.tva_poste
|
|
* return the credit or the debit account
|
|
* \param $p_cn connection
|
|
* \param $p_tva_id tva_rate.tva_id
|
|
* \param $p_cred type ( d or credit)
|
|
*
|
|
* \return
|
|
* return the credit or the debit account
|
|
* null if error
|
|
*/
|
|
function GetTvaPoste($p_cn,$p_tva_id,$p_cred) {
|
|
$Res=ExecSql($p_cn,"select tva_poste from tva_rate where tva_id=$p_tva_id");
|
|
if ( pg_NumRows($Res) == 0 ) return null;
|
|
$a=pg_fetch_array($Res,0);
|
|
list ($deb,$cred)=split(",",$a['tva_poste']);
|
|
if ( $p_cred=='c' ) return $cred;
|
|
if ($p_cred=='d') return $deb;
|
|
echo_error ("Invalid $p_cred in GetTvaRate");
|
|
return null;
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*!
|
|
*\brief show all the lines of the asked jrn, uses also the $_GET['o'] for the sort
|
|
*
|
|
*
|
|
* \param $p_cn database connection
|
|
* \param $p_jrn jrn_id jrn.jrn_def_id
|
|
* \param $p_where the sql query where clause
|
|
* \param $p_array param. for a search
|
|
* \param $p_value offset
|
|
* \param $p_paid value : 0 nothing is shown, 1 check box; 2 check_box disable
|
|
* \return array (entryCount,generatedHTML);
|
|
*
|
|
*/
|
|
function ListJrn($p_cn,$p_jrn,$p_where="",$p_array=null,$p_value=0,$p_paid=0)
|
|
{
|
|
echo_debug(__FILE__,__LINE__,"Entering into function ListJrn($p_cn,$p_jrn,$p_where='',$p_array=null,$p_value=0,$p_paid=0)");
|
|
$gDossier=dossier::id();
|
|
$amount_paid=0.0;
|
|
$amount_unpaid=0.0;
|
|
include_once("central_inc.php");
|
|
$limit=($_SESSION['g_pagesize']!=-1)?" LIMIT ".$_SESSION['g_pagesize']:"";
|
|
$offset=($_SESSION['g_pagesize']!=-1)?" OFFSET ".pg_escape_string($p_value):"";
|
|
$order=" order by jr_date_order asc,jr_internal asc";
|
|
// Sort
|
|
$url=CleanUrl();
|
|
$str_dossier=dossier::get();
|
|
$image_asc='<IMAGE SRC="image/down.png" border="0" >';
|
|
$image_desc='<IMAGE SRC="image/up.png" border="0">';
|
|
$image_sel_desc='<IMAGE SRC="image/select1.png">';
|
|
$image_sel_asc='<IMAGE SRC="image/select2.png">';
|
|
|
|
$sort_date="<th> <A class=\"mtitle\" HREF=\"?$url&o=da\">$image_asc</A>Date <A class=\"mtitle\" HREF=\"?$url&o=dd\">$image_desc</A></th>";
|
|
$sort_description="<th> <A class=\"mtitle\" HREF=\"?$url&o=ca\">$image_asc</A>Description <A class=\"mtitle\" HREF=\"?$url&o=cd\">$image_desc</A></th>";
|
|
$sort_amount="<th> <A class=\"mtitle\" HREF=\"?$url&o=ma\">$image_asc</A>Montant <A class=\"mtitle\" HREF=\"?$url&o=md\">$image_desc</A></th>";
|
|
$sort_echeance="<th> <A class=\"mtitle\" HREF=\"?$url&o=ea\">$image_asc</A>Echéance <A class=\"mtitle\" HREF=\"?$url&o=ed\">$image_desc</A> </th>";
|
|
// if an order is asked
|
|
if ( isset ($_GET['o']) )
|
|
{
|
|
switch ($_GET['o'])
|
|
{
|
|
case 'da':
|
|
// date asc
|
|
$sort_date="<th>$image_sel_asc Date <A class=\"mtitle\" HREF=\"?$url&o=dd\">$image_desc</A></th>";
|
|
$order=" order by jr_date_order asc ";
|
|
break;
|
|
case 'dd':
|
|
$sort_date="<th> <A class=\"mtitle\" HREF=\"?$url&o=da\">$image_asc</A> Date $image_sel_desc</th>";
|
|
// date desc
|
|
$order=" order by jr_date_order desc ";
|
|
break;
|
|
case 'ma':
|
|
// montant asc
|
|
$sort_amount="<th> $image_sel_asc Montant <A class=\"mtitle\" HREF=\"?$url&o=md\">$image_desc</A></th>";
|
|
$order=" order by jr_montant asc ";
|
|
break;
|
|
case 'md':
|
|
// montant desc
|
|
$sort_amount="<th> <A class=\"mtitle\" HREF=\"?$url&o=ma\">$image_asc</A>Montant $image_sel_desc</th>";
|
|
$order=" order by jr_montant desc ";
|
|
break;
|
|
case 'ca':
|
|
// jr_comment asc
|
|
$sort_description="<th> $image_sel_asc Description <A class=\"mtitle\" HREF=\"?$url&o=cd\">$image_desc</A></th>";
|
|
$order=" order by jr_comment asc ";
|
|
break;
|
|
case 'cd':
|
|
// jr_comment desc
|
|
$sort_description="<th> <A class=\"mtitle\" HREF=\"?$url&o=ca\">$image_asc</A>Description $image_sel_desc</th>";
|
|
$order=" order by jr_comment desc ";
|
|
break;
|
|
case 'ea':
|
|
// jr_comment asc
|
|
$sort_echeance="<th> $image_sel_asc Echeance <A class=\"mtitle\" HREF=\"?$url&o=ed\">$image_desc</A></th>";
|
|
$order=" order by jr_ech asc ";
|
|
break;
|
|
case 'ed':
|
|
// jr_comment desc
|
|
$sort_echeance="<th> <A class=\"mtitle\" HREF=\"?$url&o=ea\">$image_asc</A> Echeance $image_sel_desc</th>";
|
|
$order=" order by jr_ech desc ";
|
|
break;
|
|
|
|
}
|
|
}
|
|
// set a filter for the FIN
|
|
$a_parm_code=get_array($p_cn,"select p_value from parm_code where p_code in ('BANQUE','COMPTE_COURANT','CAISSE')");
|
|
$sql_fin="(";
|
|
$or="";
|
|
foreach ($a_parm_code as $code) {
|
|
$sql_fin.="$or j_poste::text like '".$code['p_value']."%'";
|
|
$or=" or ";
|
|
}
|
|
$sql_fin.=")";
|
|
|
|
if ( $p_array == null ) {
|
|
$sql="select jr_id ,
|
|
jr_montant,
|
|
jr_comment,
|
|
to_char(jr_ech,'DD.MM.YYYY') as jr_ech,
|
|
to_char(jr_date,'DD.MM.YYYY') as jr_date,
|
|
jr_date as jr_date_order,
|
|
jr_grpt_id,
|
|
jr_rapt,
|
|
jr_internal,
|
|
jrn_def_id,
|
|
jrn_def_name,
|
|
jrn_def_ech,
|
|
jrn_def_type,
|
|
jr_valid,
|
|
jr_tech_per,
|
|
jr_pj_name,
|
|
p_closed
|
|
from
|
|
jrn
|
|
join jrn_def on jrn_def_id=jr_def_id
|
|
join parm_periode on p_id=jr_tech_per
|
|
$p_where
|
|
$order";
|
|
}
|
|
if ( $p_array != null ) {
|
|
// Construction Query
|
|
foreach ( $p_array as $key=>$element) {
|
|
${"l_$key"}=$element;
|
|
}
|
|
$sql="select jr_id ,
|
|
jr_montant,
|
|
jr_comment,
|
|
jr_ech,
|
|
to_char(jr_date,'DD.MM.YYYY') as jr_date,
|
|
jr_date as jr_date_order,
|
|
jr_grpt_id,
|
|
jr_rapt,
|
|
jr_internal,
|
|
jrn_def_id,
|
|
jrn_def_name,
|
|
jrn_def_ech,
|
|
jrn_def_type,
|
|
jr_valid,
|
|
jr_tech_per,
|
|
jr_pj_name,
|
|
p_closed
|
|
from
|
|
jrn join jrn_def on jrn_def_id=jr_def_id
|
|
join parm_periode on p_id=jr_tech_per
|
|
";
|
|
$jrn_sql=($p_jrn =0)?"1=1":"jrn_def_id=$p_jrn ";
|
|
$l_and=" where ";
|
|
// amount
|
|
// remove space
|
|
$l_s_montant=trim($l_s_montant);
|
|
// replace comma by dot
|
|
$l_s_montant=str_replace(',','.',$l_s_montant);
|
|
$l_st_montant=trim($l_st_montant);
|
|
// replace comma by dot
|
|
$l_st_montant=str_replace(',','.',$l_st_montant);
|
|
|
|
echo_debug('user_common',__LINE__,"l_s_montant $l_s_montant");
|
|
|
|
if ( ereg("^[0-9]+$", $l_s_montant) || ereg ("^[0-9]+\.[0-9]+$", $l_s_montant) )
|
|
{
|
|
$sql.=$l_and." jr_montant >= $l_s_montant";
|
|
$l_and=" and ";
|
|
}
|
|
if ( ereg("^[0-9]+$", $l_st_montant) || ereg ("^[0-9]+\.[0-9]+$", $l_st_montant) )
|
|
{
|
|
$sql.=$l_and." jr_montant <= $l_st_montant";
|
|
$l_and=" and ";
|
|
}
|
|
|
|
// date
|
|
if ( isDate($l_date_start) != null )
|
|
{
|
|
$sql.=$l_and." jr_date >= to_date('".$l_date_start."','DD.MM.YYYY')";
|
|
$l_and=" and ";
|
|
}
|
|
if ( isDate($l_date_end) != null ) {
|
|
$sql.=$l_and." jr_date <= to_date('".$l_date_end."','DD.MM.YYYY')";
|
|
$l_and=" and ";
|
|
}
|
|
// comment
|
|
$l_s_comment=FormatString($l_s_comment);
|
|
if ( $l_s_comment != null )
|
|
{
|
|
$sql.=$l_and." upper(jr_comment) like upper('%".$l_s_comment."%') ";
|
|
$l_and=" and ";
|
|
}
|
|
// internal
|
|
$l_s_internal=FormatString($l_s_internal);
|
|
if ( $l_s_internal != null ) {
|
|
$sql.=$l_and." jr_internal like ('%$l_s_internal%') ";
|
|
$l_and=" and ";
|
|
}
|
|
// Poste
|
|
$l_poste=FormatString($l_poste);
|
|
if ( $l_poste != null ) {
|
|
$sql.=$l_and." jr_grpt_id in (select j_grpt
|
|
from jrnx where j_poste::text like '$l_poste' ) ";
|
|
$l_and=" and ";
|
|
}
|
|
// Quick Code
|
|
if ( $l_qcode != null )
|
|
{
|
|
$l_qcode=FormatString($l_qcode);
|
|
$sql.=$l_and." jr_grpt_id in ( select j_grpt from
|
|
jrnx where trim(j_qcode) = upper(trim('$l_qcode')))";
|
|
$l_and=" and ";
|
|
}
|
|
// if not admin check filter
|
|
$User=new User(DbConnect());
|
|
$User->Check();
|
|
if ( $User->admin == 0 )
|
|
{
|
|
$sql.=$l_and." jr_def_id in ( select uj_jrn_id ".
|
|
" from user_sec_jrn where ".
|
|
" uj_login='".$_SESSION['g_user']."'".
|
|
" and uj_priv in ('R','W'))";
|
|
}
|
|
$sql.=$order;
|
|
}// p_array != null
|
|
// Count
|
|
$count=CountSql($p_cn,$sql);
|
|
// Add the limit
|
|
$sql.=$limit.$offset;
|
|
|
|
// Execute SQL stmt
|
|
$Res=ExecSql($p_cn,$sql);
|
|
|
|
//starting from here we can refactor, so that instead of returning the generated HTML,
|
|
//this function returns a tree structure.
|
|
|
|
$r="";
|
|
|
|
$r.=JS_VIEW_JRN_CANCEL;
|
|
$r.=JS_VIEW_JRN_MODIFY;
|
|
|
|
$Max=pg_NumRows($Res);
|
|
|
|
//TODO: correct this message.
|
|
if ($Max==0) return array(0,"Aucun enregistrement trouvé");
|
|
|
|
$r.='<table style="width:100%;border:solid blue 2px ;border-style:outset;">';
|
|
$l_sessid=$_REQUEST['PHPSESSID'];
|
|
|
|
$r.="<tr class=\"even\">";
|
|
$r.="<th> Internal</th>";
|
|
$r.=$sort_date;
|
|
$r.=$sort_echeance;
|
|
$r.=$sort_description;
|
|
$r.=$sort_amount;
|
|
// if $p_paid is not equal to 0 then we have a paid column
|
|
if ( $p_paid != 0 )
|
|
{
|
|
$r.="<th> Payé</th>";
|
|
}
|
|
$r.="<th>Op. Concernée</th>";
|
|
$r.="<th>Document</th>";
|
|
$r.="</tr>";
|
|
// Total Amount
|
|
$tot=0.0;
|
|
$gDossier=dossier::id();
|
|
for ($i=0; $i < $Max;$i++) {
|
|
|
|
|
|
$row=pg_fetch_array($Res,$i);
|
|
|
|
if ( $i % 2 == 0 ) $tr='<TR class="odd">';
|
|
else $tr='<TR class="even">';
|
|
$r.=$tr;
|
|
//internal code
|
|
// button modify
|
|
$r.="<TD>";
|
|
// If url contains
|
|
//
|
|
|
|
$href=basename($_SERVER['PHP_SELF']);
|
|
echo_debug(__FILE__,__LINE__,"href = $href");
|
|
switch ($href)
|
|
{
|
|
// user_jrn.php
|
|
case 'compta.php':
|
|
$vue="E"; //Expert View
|
|
break;
|
|
case 'commercial.php':
|
|
$vue="S"; //Simple View
|
|
break;
|
|
case 'recherche.php':
|
|
$vue=(isset($_GET['expert']))?'E':'S';
|
|
break;
|
|
default:
|
|
echo_error('user_form_ach.php',__LINE__,'Erreur invalid request uri');
|
|
exit (-1);
|
|
}
|
|
//DEBUG
|
|
// $r.=$l_sessid;
|
|
$r.=sprintf('<A class="detail" HREF="javascript:modifyOperation(\'%s\',\'%s\',\'%s\',\'%s\',\'%s\')" >%s</A>',
|
|
$row['jr_id'], $l_sessid,$gDossier, $p_jrn,$vue, $row['jr_internal']);
|
|
$r.="</TD>";
|
|
// date
|
|
$r.="<TD>";
|
|
$r.=$row['jr_date'];
|
|
$r.="</TD>";
|
|
// echeance
|
|
$r.="<TD>";
|
|
$r.=$row['jr_ech'];
|
|
$r.="</TD>";
|
|
|
|
// comment
|
|
$r.="<TD>";
|
|
$r.=$row['jr_comment'];
|
|
$r.="</TD>";
|
|
|
|
// Amount
|
|
// If the ledger is financial :
|
|
// the credit must be negative and written in red
|
|
$positive=0;
|
|
|
|
// Check ledger type :
|
|
if ( $row['jrn_def_type'] == 'FIN' )
|
|
{
|
|
$positive = CountSql($p_cn,"select * from jrn inner join jrnx on jr_grpt_id=j_grpt ".
|
|
" where jr_id=".$row['jr_id']." and $sql_fin ".
|
|
" and j_debit='f'");
|
|
}
|
|
$r.="<TD align=\"right\">";
|
|
|
|
$tot=($positive != 0)?$tot-$row['jr_montant']:$tot+$row['jr_montant'];
|
|
//STAN $positive always == 0
|
|
$r.=( $positive != 0 )?"<font color=\"red\"> - ".sprintf("%8.2f",$row['jr_montant'])."</font>":sprintf("%8.2f",$row['jr_montant']);
|
|
$r.="</TD>";
|
|
|
|
|
|
// Show the paid column if p_paid is not null
|
|
if ( $p_paid !=0 )
|
|
{
|
|
$w=new widget("checkbox");
|
|
$w->name="rd_paid".$row['jr_id'];
|
|
$w->selected=($row['jr_rapt']=='paid')?true:false;
|
|
// if p_paid == 2 then readonly
|
|
$w->readonly=( $p_paid == 2)?true:false;
|
|
$h=new widget("hidden");
|
|
$h->name="set_jr_id".$row['jr_id'];
|
|
$r.='<TD>'.$w->IOValue().$h->IOValue().'</TD>';
|
|
if ( $row['jr_rapt']=='paid')
|
|
$amount_paid+=$row['jr_montant'];
|
|
else
|
|
$amount_unpaid+=$row['jr_montant'];
|
|
}
|
|
|
|
// Rapprochement
|
|
$a=GetConcerned($p_cn,$row['jr_id']);
|
|
$r.="<TD>";
|
|
if ( $a != null ) {
|
|
|
|
foreach ($a as $key => $element)
|
|
{
|
|
$operation=new Acc_Operation($p_cn);
|
|
$operation->jr_id=$element;
|
|
$l_amount=getDbValue($p_cn,"select jr_montant from jrn ".
|
|
" where jr_id=$element");
|
|
$r.= "<A class=\"detail\" HREF=\"javascript:modifyOperation('".$element."','".$l_sessid."',".$gDossier.")\" > ".$operation->get_internal()." [ $l_amount € ]</A>";
|
|
}//for
|
|
}// if ( $a != null ) {
|
|
$r.="</TD>";
|
|
|
|
if ( $row['jr_valid'] == 'f' ) {
|
|
$r.="<TD> Opération annulée</TD>";
|
|
} else {
|
|
// all operations can be removed either by setting to 0 the amount
|
|
// or by writing the opposite operation if the period is closed
|
|
$r.="<TD>";
|
|
// cancel operation
|
|
$r.=sprintf('<input TYPE="BUTTON" VALUE="%s" onClick="cancelOperation(\'%s\',\'%s\',%d,\'%s\')">',
|
|
"Annuler",$row['jr_grpt_id'],$l_sessid,$gDossier,$p_jrn);
|
|
$r.="</TD>";
|
|
} // else
|
|
//document
|
|
if ( $row['jr_pj_name'] != "")
|
|
{
|
|
$image='<IMG SRC="image/insert_table.gif" title="'.$row['jr_pj_name'].'" border="0">';
|
|
$r.="<TD>".sprintf('<A class="detail" HREF="show_pj.php?jrn=%s&jr_grpt_id=%s&%s&PHPSESSID=%s">%s</A>',
|
|
$p_jrn,
|
|
$row['jr_grpt_id'],
|
|
$str_dossier,
|
|
$_REQUEST['PHPSESSID'],
|
|
$image)
|
|
."</TD>";
|
|
}
|
|
else
|
|
$r.="<TD></TD>";
|
|
|
|
// end row
|
|
$r.="</tr>";
|
|
|
|
}
|
|
$amount_paid=round($amount_paid,4);
|
|
$amount_unpaid=round($amount_unpaid,4);
|
|
$tot=round($tot,4);
|
|
$r.="<TR>";
|
|
$r.='<TD COLSPAN="4">Total</TD>';
|
|
$r.='<TD ALIGN="RIGHT">'.$tot."</TD>";
|
|
$r.="</tr>";
|
|
if ( $p_paid != 0 ) {
|
|
$r.="<TR>";
|
|
$r.='<TD COLSPAN="4">Payé</TD>';
|
|
$r.='<TD ALIGN="RIGHT">'.$amount_paid."</TD>";
|
|
$r.="</tr>";
|
|
$r.="<TR>";
|
|
$r.='<TD COLSPAN="4">Non payé</TD>';
|
|
$r.='<TD ALIGN="RIGHT">'.$amount_unpaid."</TD>";
|
|
$r.="</tr>";
|
|
}
|
|
$r.="</table>";
|
|
|
|
return array ($count,$r);
|
|
}
|
|
|
|
|
|
|
|
/*! InsertStockGoods($p_cn,$j_id,$a_good[$i],$a_quant[$i],'c');
|
|
**************************************************
|
|
*\brief Insert data into stock_goods,
|
|
*
|
|
* \param $p_cn database connection
|
|
*
|
|
* \param $p_j_id the j_id
|
|
* \param $p_good the goods
|
|
* \param $p_quant quantity
|
|
* \param $p_type c for credit or d for debit
|
|
*
|
|
* \return none
|
|
* \note Link to jrn gives the date
|
|
*/
|
|
function InsertStockGoods($p_cn,$p_j_id,$p_good,$p_quant,$p_type)
|
|
{
|
|
echo_debug('user_common.php',__LINE__,"function InsertStockGoods($p_cn,$p_j_id,$p_good,$p_quant,$p_type)");
|
|
// Retrieve the good account for stock
|
|
$code=new fiche($p_cn);
|
|
$code->get_by_qcode($p_good);
|
|
$code_marchandise=$code->strAttribut(ATTR_DEF_STOCK);
|
|
$p_good=FormatString($p_good);
|
|
$sql="select f_id from vw_poste_qcode where j_qcode=upper('$p_good')";
|
|
$Res=ExecSql($p_cn,$sql);
|
|
$r=pg_fetch_array($Res,0);
|
|
$f_id=$r['f_id'];
|
|
$user=new User($p_cn);
|
|
$exercice=$user->get_exercice();
|
|
if ( $exercice == 0 ) throw Exception ('Annee invalide erreur');
|
|
|
|
|
|
$Res=ExecSql($p_cn,"insert into stock_goods (
|
|
j_id,
|
|
f_id,
|
|
sg_code,
|
|
sg_quantity,
|
|
sg_type,sg_exercice ) values (
|
|
$p_j_id,
|
|
$f_id,
|
|
'$code_marchandise',
|
|
$p_quant, '$p_type',$exercice)
|
|
");
|
|
return $Res;
|
|
}
|
|
/*! withStock($p_cn,$p_f_id)
|
|
**************************************************
|
|
*\brief return true if we manage stock for it
|
|
* value is stored in attr_value
|
|
*
|
|
* parm :
|
|
* - $p_cn database connection
|
|
* - $p_f_id fiche.f_id
|
|
* gen :
|
|
* - none
|
|
* return:
|
|
* none
|
|
*/
|
|
function withStock($p_cn,$p_f_id)
|
|
{
|
|
$a=getFicheAttribut($p_cn,$p_f_id, ATTR_DEF_STOCK);
|
|
if ( $a == "1" ) return true;
|
|
return false;
|
|
|
|
}
|
|
/*! VerifyOperationDate ($p_cn,$p_user,$p_date)
|
|
**************************************************
|
|
*\brief Verify if
|
|
* the date is a valid date
|
|
* the date is in the default period
|
|
* the period is not closed
|
|
*
|
|
* parm :
|
|
* - db connection
|
|
* - user
|
|
* - date
|
|
* gen :
|
|
* - none
|
|
* return:
|
|
* - null if error or date if ok
|
|
*/
|
|
function VerifyOperationDate($p_cn,$p_periode,$p_date) {
|
|
|
|
// Verify the date
|
|
if ( isDate($p_date) == null ) {
|
|
echo_error("Invalid date $p_date");
|
|
echo_debug('user_common.php',__LINE__,"Invalid date $p_date");
|
|
echo "<SCRIPT> alert('INVALID DATE $p_date !!!!');</SCRIPT>";
|
|
return null;
|
|
}
|
|
// userPref contient la periode par default
|
|
list ($l_date_start,$l_date_end)=get_periode($p_cn,$p_periode);
|
|
|
|
// Date dans la periode active
|
|
echo_debug ("date start periode $l_date_start date fin periode $l_date_end date demandee $p_date");
|
|
if ( cmpDate($p_date,$l_date_start)<0 ||
|
|
cmpDate($p_date,$l_date_end)>0 )
|
|
{
|
|
$msg="Not in the active periode please change your preference";
|
|
echo_error($msg); echo_error($msg);
|
|
echo "<SCRIPT>alert('$msg');</SCRIPT>";
|
|
return null;
|
|
}
|
|
return $p_date;
|
|
}
|
|
|
|
/*!
|
|
**************************************************
|
|
*\brief Insert into jrn_rapt the concerned operations
|
|
*
|
|
*
|
|
* \param $p_cn database connection
|
|
* \param $jr_id (jrn.jr_id) => jrn_rapt.jr_id
|
|
* \param $jr_id2 (jrn.jr_id) => jrn_rapt.jra_concerned
|
|
*
|
|
* \return none
|
|
*
|
|
*/
|
|
function InsertRapt($p_cn,$jr_id,$jr_id2) {
|
|
if ( isNumber($jr_id) == 0 || isNumber($jr_id2) == 0 )
|
|
{
|
|
echo_error(" InsertRapt : invalid jr_id $jr_id, jr_id2 $jr_id2");
|
|
echo_debug('user_common.php',__LINE__," InsertRapt : invalid jr_id $jr_id, jr_id2 $jr_id2");
|
|
return false;
|
|
}
|
|
// verify if exists
|
|
if ( CountSql($p_cn,"select jra_id from jrn_rapt where jra_concerned=$jr_id and jr_id=$jr_id2
|
|
union
|
|
select jra_id from jrn_rapt where jra_concerned=$jr_id2 and jr_id=$jr_id ") ==0)
|
|
{
|
|
// Ok we can insert
|
|
$Res=ExecSql($p_cn,"insert into jrn_rapt(jr_id,jra_concerned) values ($jr_id,$jr_id2)");
|
|
}
|
|
return true;
|
|
}
|
|
/*! DeleteRapt($p_cn,$jr_id,$jr_id2)
|
|
**************************************************
|
|
*\brief Insert into jrn_rapt the concerned operations
|
|
*
|
|
* parm :
|
|
* \param $p_cn database connection
|
|
* \param $jr_id (jrn.jr_id) => jrn_rapt.jr_id
|
|
* \param $jr_id2 (jrn.jr_id) => jrn_rapt.jra_concerned
|
|
*
|
|
* \return none
|
|
*/
|
|
function DeleteRapt($p_cn,$jr_id,$jr_id2) {
|
|
echo_debug('user_common.php',__LINE__,"DeleteRapt($p_cn,$jr_id,$jr_id2) ");
|
|
if ( isNumber($jr_id) == 0 or
|
|
isNumber($jr_id2) == 0 )
|
|
{
|
|
echo_error(" InsertRapt : invalid jr_id jr_id = $jr_id jr_id2 = $jr_id2");
|
|
return;
|
|
}
|
|
// verify if exists
|
|
if ( CountSql($p_cn,"select jra_id from jrn_rapt where jra_concerned=$jr_id and jr_id=$jr_id2
|
|
union
|
|
select jra_id from jrn_rapt where jra_concerned=$jr_id2 and jr_id=$jr_id ") !=0)
|
|
{
|
|
// Ok we can insert
|
|
$Res=ExecSql($p_cn,"delete from jrn_rapt where (jra_concerned=$jr_id2 and jr_id=$jr_id) or
|
|
(jra_concerned=$jr_id and jr_id=$jr_id2) ");
|
|
}
|
|
}
|
|
|
|
/*! GetConcerned (p_cn ,jr_id)
|
|
**************************************************
|
|
*\brief Return an array of the concerned operation
|
|
*
|
|
*
|
|
*\param database connection
|
|
*\param jrn.jr_id
|
|
* \return array if something is found or null
|
|
*/
|
|
function GetConcerned ($p_cn, $jr_id) {
|
|
echo_debug(__FILE__.":".__LINE__."Get Concerned");
|
|
$sql=" select jr_id as cn from jrn_rapt where jra_concerned=$jr_id
|
|
union
|
|
select jra_concerned as cn from jrn_rapt where jr_id=$jr_id";
|
|
$Res=ExecSql($p_cn,$sql);
|
|
|
|
// If nothing is found return null
|
|
$n=pg_NumRows($Res);
|
|
|
|
if ($n ==0 ) return null;
|
|
|
|
// put everything in an array
|
|
for ($i=0;$i<$n;$i++) {
|
|
$l=pg_fetch_array($Res,$i);
|
|
$r[$i]=$l['cn'];
|
|
}
|
|
return $r;
|
|
}
|
|
/*! GetGrpt($p_cn,$p_jr_id)
|
|
**************************************************
|
|
*\brief Return the jr_grpt_id from jrn where
|
|
* jr_id = $p_jr_id
|
|
*
|
|
* parm :
|
|
* - $p_jr_id jrn.jr_id
|
|
* - $p_cn database connection
|
|
* gen :
|
|
* - none
|
|
* return:
|
|
* - return the jrn.jr_grpt_id or null
|
|
*/
|
|
function GetGrpt($p_cn,$p_jr_id)
|
|
{
|
|
$Res=ExecSql($p_cn,"select jr_grpt_id from jrn where jr_id=".$p_jr_id);
|
|
if ( pg_NumRows($Res) == 0 ) {
|
|
return null;
|
|
}
|
|
$r=pg_fetch_array($Res,0);
|
|
return $r['jr_grpt_id'];
|
|
}
|
|
/*! UpdateComment ($p_cn,$p_jr_id,$p_comment)
|
|
**************************************************
|
|
*\brief Update comment in jrn
|
|
*
|
|
* parm :
|
|
* - database conn.
|
|
* - jrn.jr_id
|
|
* - comment
|
|
* gen :
|
|
* - none
|
|
* return:
|
|
* - none
|
|
*/
|
|
function UpdateComment ($p_cn,$p_jr_id,$p_comment) {
|
|
$p_comment=FormatString($p_comment);
|
|
$Res=ExecSql($p_cn,"update jrn set jr_comment='".$p_comment."'
|
|
where jr_id = $p_jr_id");
|
|
|
|
}
|
|
|
|
/*! isValid ($p_cn, $p_grpt_id
|
|
**************************************************
|
|
*\brief test if a jrn op is valid
|
|
*
|
|
* \param $p_cn db
|
|
* \param $p_grpt_id
|
|
* \return:
|
|
* - 1 is valid
|
|
* - 0 is not valid
|
|
*/
|
|
function isValid ($p_cn,$p_grpt_id) {
|
|
$Res=ExecSql($p_cn,"select jr_valid from jrn where jr_grpt_id=$p_grpt_id");
|
|
|
|
if ( ( $M = pg_NumRows($Res)) == 0 ) return 0;
|
|
|
|
$a=pg_fetch_array($Res,0);
|
|
|
|
if ( $a['jr_valid'] == 't') return 1;
|
|
if ( $a['jr_valid'] == 'f') return 0;
|
|
|
|
echo_error ("Invalid result = ".$a['result']);
|
|
|
|
|
|
}
|
|
|
|
/*!
|
|
**************************************************
|
|
*\brief
|
|
* Create a navigation_bar (pagesize)
|
|
*
|
|
* \param $p_offset first record number
|
|
* \param $p_line total of returned row
|
|
* \param $p_size current g_pagesize user's preference
|
|
* \param $p_page number of the page where the user is
|
|
* \param $p_javascript javascript code to add
|
|
* \note example :
|
|
\verbatim
|
|
$step=$_SESSION['g_pagesize'];
|
|
$page=(isset($_GET['offset']))?$_GET['page']:1;
|
|
$offset=(isset($_GET['offset']))?$_GET['offset']:0;
|
|
|
|
list ($max_ligne,$list)=ListJrn($cn,$_GET['p_jrn'],$sql,null,$offset,1);
|
|
$bar=jrn_navigation_bar($offset,$max_ligne,$step,$page);
|
|
\endverbatim
|
|
* \return string with the nav. bar
|
|
*/
|
|
function jrn_navigation_bar($p_offset,$p_line,$p_size=0,$p_page=1,$p_javascript="")
|
|
{
|
|
echo_debug('user_common',__LINE__,"function jrn_navigation_bar($p_offset,$p_line,$p_size=0,$p_page=1)");
|
|
// if the pagesize is unlimited return ""
|
|
// in that case there is no nav. bar
|
|
if ( $_SESSION['g_pagesize'] == -1 ) return "";
|
|
if ( $p_size==0) {
|
|
$p_size= $_SESSION['g_pagesize'];
|
|
}
|
|
// if there is no row return an empty string
|
|
if ( $p_line == 0 ) return "";
|
|
|
|
// Clean url, cut away variable coming frm here
|
|
$url=cleanUrl();
|
|
// action to clean
|
|
$url=str_replace('&p_action=delete','',$url);
|
|
|
|
// compute max of page
|
|
$nb_page=($p_line-($p_line%$p_size))/$p_size;
|
|
echo_debug('user_common',__LINE__,"nb_page = $nb_page");
|
|
// if something remains
|
|
if ( $p_line % $p_size != 0 ) $nb_page+=1;
|
|
|
|
// if max page == 1 then return a empty string
|
|
if ( $nb_page == 1) return "";
|
|
|
|
// restore the sort
|
|
if ( isset($_GET['o']))
|
|
$url=$url.'&o='.$_GET['o'];
|
|
|
|
$r="";
|
|
// previous
|
|
if ($p_page !=1) {
|
|
$e=$p_page-1;
|
|
$step=$p_size;
|
|
$offset=($e-1)*$step;
|
|
|
|
$r='<A class="mtitle" href="'.$_SERVER['PHP_SELF']."?".$url."&offset=$offset&step=$step&page=$e&size=$step".'" '.$p_javascript.'>';
|
|
//$r.="Précédent";
|
|
$r.='<INPUT TYPE="IMAGE" width="12" SRC="image/go-previous.png">';
|
|
$r.="</A> ";
|
|
}
|
|
//----------------------------------------------------------------------
|
|
// Create a partial bar
|
|
// if current page < 11 show 1 to 20
|
|
// otherwise show $p_page -10 to $p_page + 10
|
|
//----------------------------------------------------------------------
|
|
$start_bar=($p_page < 11 )?1:$p_page-10;
|
|
$end_bar =($p_page < 11 )?20:$p_page+10;
|
|
$end_bar =($end_bar > $nb_page )?$nb_page:$end_bar;
|
|
|
|
// Create the bar
|
|
for ($e=$start_bar;$e<=$end_bar;$e++) {
|
|
// do not included current page
|
|
if ( $e != $p_page ) {
|
|
$step=$p_size;
|
|
$offset=($e-1)*$step;
|
|
|
|
$go=$_SERVER['PHP_SELF']."?".$url."&offset=$offset&step=$step&page=$e&size=$step";
|
|
|
|
$r.=sprintf('<A class="mtitle" HREF="%s" CLASS="one" %s >%d</A> ',$go,$p_javascript,$e);
|
|
} else {
|
|
$r.="<b> [ $e ] </b>";
|
|
} //else
|
|
} //for
|
|
// next
|
|
|
|
if ($p_page !=$nb_page) {
|
|
// If we are not at the last page show the button next
|
|
$e=$p_page+1;
|
|
$step=$p_size;
|
|
$offset=($e-1)*$step;
|
|
|
|
$r.=' <A class="mtitle" href="'.$_SERVER['PHP_SELF']."?".$url."&offset=$offset&step=$step&page=$e&size=$step".'" '.$p_javascript.' >';
|
|
//$r.="Suivant";
|
|
$r.='<INPUT TYPE="IMAGE" width="12" SRC="image/go-next.png">';
|
|
$r.="</A>";
|
|
}
|
|
|
|
|
|
return $r;
|
|
}
|
|
|
|
|
|
/*!\brief Verify that a fiche has a valid ledger. It must be verify before
|
|
* entering data into jrnx. Called from the form_verify_input
|
|
* \param $p_cn database connx
|
|
* \param $qcode the quick_code
|
|
* \return null if an error occurs + a alert message in javascript
|
|
* otherwise 1
|
|
*/
|
|
function CheckPoste($p_cn,$qcode)
|
|
{
|
|
// check if the ATTR_DEF_ACCOUNT is set
|
|
$poste=GetFicheAttribut($p_cn,$qcode,ATTR_DEF_ACCOUNT);
|
|
echo_debug('poste.php',__LINE__,"poste value = ".$poste."size = ".strlen(trim($poste)));
|
|
if ( $poste == null )
|
|
{
|
|
$msg="La fiche ".$qcode." n\'a pas de poste comptable";
|
|
echo_error($msg); echo_debug('poste.php',__LINE__,$msg);
|
|
echo "<SCRIPT>alert('$msg');</SCRIPT>";
|
|
return null;
|
|
|
|
}
|
|
if ( strlen(trim($poste))==0 )
|
|
{
|
|
$msg="La fiche ".$qcode." n\'a pas de poste comptable";
|
|
echo_error($msg); echo_debug('poste.php',__LINE__,$msg);
|
|
echo "<SCRIPT>alert('$msg');</SCRIPT>";
|
|
return null;
|
|
}
|
|
// Check that the account exists
|
|
if ( CountSql($p_cn,
|
|
"select * from tmp_pcmn where pcm_val=$poste") == 0 )
|
|
{
|
|
$msg=" Le poste comptable $poste de la fiche ".$qcode." n\'existe pas, il faudra le creer manuellement dans le module comptabilite, menu : avance->plan comptable";
|
|
echo_error($msg); echo_debug('poste.php',__LINE__,$msg);
|
|
echo "<SCRIPT>alert('$msg');</SCRIPT>";
|
|
return null;
|
|
|
|
}
|
|
return 1;
|
|
}
|
|
/*!
|
|
* \brief Clean the url, remove the $_GET offset,step, page and size
|
|
* \param none
|
|
*
|
|
* \return the cleaned url
|
|
*/
|
|
|
|
function CleanUrl()
|
|
{
|
|
// Compute the url
|
|
$url="";
|
|
$and="";
|
|
$get=$_GET;
|
|
if ( isset ($get) ) {
|
|
foreach ($get as $name=>$value ) {
|
|
// we clean the parameter offset, step, page and size
|
|
if ( ! in_array($name,array('offset','step','page','size','s','o'))) {
|
|
$url.=$and.$name."=".$value;
|
|
$and="&";
|
|
}// if
|
|
}//foreach
|
|
}// if
|
|
return $url;
|
|
}
|
|
function get_redirect($p_string) {
|
|
echo '<HTML><head><META HTTP-EQUIV="REFRESH" content="0;url='.$p_string.'"></head><body> Connecting... </body></html>';
|
|
}
|
|
?>
|