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 ........
1037 lines
32 KiB
PHP
1037 lines
32 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.f
|
|
|
|
require_once("class_fiche.php");
|
|
require_once("class_document.php");
|
|
require_once("class_document_type.php");
|
|
require_once("user_common.php");
|
|
/*!\file
|
|
* \brief class_action for manipulating actions
|
|
* action can be :
|
|
* <ul>
|
|
* <li>an invoice
|
|
* <li>a meeting
|
|
* <li>an order
|
|
* <li>a letter
|
|
*</ul>
|
|
* The table document_type are the possible actions
|
|
*/
|
|
/*!
|
|
* \brief class_action for manipulating actions
|
|
* action can be :
|
|
* <ul>
|
|
* <li> a meeting
|
|
* <li>an order
|
|
* <li>a letter
|
|
* </ul>
|
|
* The table document_type are the possible actions
|
|
*/
|
|
|
|
class action
|
|
{
|
|
/*!< $db database connexion
|
|
* $ag_comment description (ag_gestion.ag_comment)
|
|
* $ag_timestamp document date (ag_gestion.ag_timestamp)
|
|
* $dt_id type of the document (document_type.dt_id)
|
|
* $d_state stage of the document (printed, send to client...)
|
|
* $d_number number of the document
|
|
* $d_filename filename's document
|
|
* $d_mimetype document's filename
|
|
* $ag_title title document
|
|
* $f_id_dest fiche id (From field )
|
|
* $f_id_exp fiche id (to field)
|
|
* $ag_ref_ag_id concern previous action
|
|
* $ag_id pk of the table action_gestion
|
|
|
|
* \todo replace attribut from class document document by an object document
|
|
*/
|
|
var $db;
|
|
var $ag_comment;
|
|
var $ag_timestamp;
|
|
var $dt_id;
|
|
var $d_state;
|
|
var $d_number;
|
|
var $d_filename;
|
|
var $d_mimetype;
|
|
var $ag_title;
|
|
var $f_id;
|
|
var $ag_ref_ag_id;
|
|
/*! constructor
|
|
* \brief constructor
|
|
* \param p_cn database connection
|
|
*/
|
|
function action ($p_cn)
|
|
{
|
|
$this->db=$p_cn;
|
|
$this->f_id=0;
|
|
|
|
}
|
|
//----------------------------------------------------------------------
|
|
/*! Display
|
|
* \brief Display the object, the tags for the FORM
|
|
* are in the caller. It will be used for adding and updating
|
|
* action
|
|
*\note If ag_id is not equal to zero then it is an update otherwise
|
|
* it is a new document
|
|
*
|
|
* \param $p_view if set to true the form will be in readonly mode
|
|
* \param $p_gen true we show the tag for generating a doc
|
|
*
|
|
* \note update the reference number or the document type is not allowed
|
|
*
|
|
*
|
|
* \return string containing the html code
|
|
*/
|
|
function Display($p_view,$p_gen)
|
|
{
|
|
echo_debug('class_action',__LINE__,'Display() :'.var_export($_POST,true));
|
|
echo_debug('class_action',__LINE__,'Display $this :'.var_export($this,true));
|
|
|
|
|
|
if ( $p_view=='UPD')
|
|
{
|
|
$upd=true;
|
|
$readonly=false;
|
|
}
|
|
elseif ($p_view=="NEW")
|
|
{
|
|
$upd=false;
|
|
$readonly=false;
|
|
}
|
|
elseif ($p_view=='READ')
|
|
{
|
|
$upd=true;
|
|
$readonly=true;
|
|
}
|
|
else
|
|
{
|
|
exit('class_action'.__LINE__.'Action::Display error unknown parameter'.$p_view);
|
|
|
|
}
|
|
// Compute the widget
|
|
// Date
|
|
$date=new widget("js_date");
|
|
$date->readonly=$readonly;
|
|
$date->name="ag_timestamp";
|
|
$date->value=$this->ag_timestamp;
|
|
|
|
|
|
// for insert mode only
|
|
if ( $upd == false )
|
|
{
|
|
// Doc Type
|
|
$doc_type=new widget("select");
|
|
$doc_type->name="dt_id";
|
|
$doc_type->value=make_array($this->db,"select dt_id,dt_value from document_type where dt_id in (".ACTION.")");
|
|
$doc_type->selected=$this->dt_id;
|
|
$doc_type->readonly=false;
|
|
$str_doc_type=$doc_type->IOValue();
|
|
echo_debug('class_action',__LINE__,var_export($doc_type,true));
|
|
}
|
|
else {
|
|
// Doc Type
|
|
$doc_type=new widget("hidden");
|
|
$doc_type->name="dt_id";
|
|
$doc_type->value=$this->dt_id;
|
|
$str_doc_type=$doc_type->IOValue()." ".getDbValue($this->db,"select dt_value from document_type where dt_id=".$this->dt_id);
|
|
}
|
|
|
|
// Description
|
|
$desc=new widget('RICHTEXT');
|
|
$desc->width=700;
|
|
$desc->heigh=100;
|
|
$desc->name="ag_comment";
|
|
$desc->readonly=$readonly;
|
|
/*!\todo Formatstring and urldecode ?? */
|
|
$desc->value=FormatString(urldecode($this->ag_comment));
|
|
|
|
// state
|
|
// Retrieve the value
|
|
if ( $p_view != 'READ' )
|
|
{
|
|
$a=make_array($this->db,"select s_id,s_value from document_state ");
|
|
$state=new widget("select");
|
|
$state->readonly=$readonly;
|
|
$state->name="d_state";
|
|
$state->value=$a;
|
|
$state->selected=$this->d_state;
|
|
$str_state=$state->IOValue();
|
|
} else {
|
|
$str_state="";
|
|
if ( strlen($this->d_state) != 0 )
|
|
{ $str_state=getDbValue($this->db,"select s_value from document_state where s_id=".$this->d_state);
|
|
$g=new widget("hidden");
|
|
$str_state.=$g->IOValue('d_state',$this->d_state);
|
|
}
|
|
}
|
|
// Retrieve the value if there is an attached doc
|
|
$doc_ref="";
|
|
// Document id
|
|
|
|
$h2=new widget("hidden");
|
|
$h2->name="d_id";
|
|
$h2->value=$this->d_id;
|
|
|
|
if ( $this->d_id != 0 && $this->d_id != "" )
|
|
{
|
|
$h2->readonly=($p_view=='NEW')?false:true;
|
|
$doc=new Document($this->db,$this->d_id);
|
|
$doc->get();
|
|
if ( strlen(trim($doc->d_lob)) != 0 )
|
|
{
|
|
$d_id=new widget("hidden");
|
|
$doc_ref="<p> Document ".$doc->a_ref().'</p>';
|
|
$doc_ref.=$h2->IOValue().$d_id->IOValue('d_id',$this->d_id);
|
|
}
|
|
|
|
}
|
|
|
|
|
|
// title
|
|
$title=new widget("text");
|
|
$title->readonly=$readonly;
|
|
$title->name="ag_title";
|
|
// $title->value=FormatString($this->ag_title);
|
|
$title->value=$this->ag_title;
|
|
$title->size=80;
|
|
|
|
// ag_ref
|
|
// Always false for update
|
|
$ag_ref=new widget("text");
|
|
$ag_ref->readonly=$upd;
|
|
$ag_ref->name="ag_ref";
|
|
$ag_ref->value=FormatString($this->ag_ref);
|
|
$client_label=new widget("span");
|
|
|
|
// f_id_dest destination
|
|
if ( $this->qcode_dest != '- ERROR -' && strlen(trim($this->qcode_dest)) != 0)
|
|
{
|
|
$tiers=new fiche($this->db);
|
|
$tiers->get_by_qcode($this->qcode_dest);
|
|
$qcode_dest_label=$tiers->strAttribut(1);
|
|
} else {
|
|
// echo "f_id $this->f_id";
|
|
$qcode_dest_label=($this->f_id_dest==0 || trim($this->qcode_dest)=="")?'Interne ':'Error';
|
|
}
|
|
|
|
// f_id_exp sender
|
|
if ( $this->qcode_exp != '- ERROR -' && strlen(trim($this->qcode_exp)) != 0)
|
|
{
|
|
$tiers=new fiche($this->db);
|
|
$tiers->get_by_qcode($this->qcode_exp);
|
|
$qcode_exp_label=$tiers->strAttribut(1);
|
|
} else {
|
|
$qcode_exp_label=($this->f_id_exp==0 || trim($this->qcode_exp)=="")?'Interne ':'Error';
|
|
}
|
|
|
|
$h_ag_id=new widget("hidden");
|
|
// if concerns another action : show the link otherwise nothing
|
|
$lag_ref_ag_id=" X / XX ";
|
|
|
|
if ( $this->ag_ref_ag_id != 0 )
|
|
{
|
|
// $this->GetAgRef("ag_ref_ag_id")."</A>";
|
|
|
|
$lag_ref_ag_id='<a class="mtitle" href="commercial.php?p_action=suivi_courrier&sa=detail&ag_id='.
|
|
$this->ag_ref_ag_id.'&'.dossier::get().'">'.
|
|
getDbValue($this->db,"select ag_ref from action_gestion where ag_id=".$this->ag_ref_ag_id).
|
|
"</A>";
|
|
}
|
|
// sender
|
|
$w=new widget('js_search_only');
|
|
$w->readonly=$readonly;
|
|
$w->name='qcode_exp';
|
|
$w->value=($this->f_id_exp != 0)?$this->qcode_exp:"";
|
|
$w->label="";
|
|
$w->extra='4,8,9,14,16';
|
|
$sp= new widget("span");
|
|
$h_agrefid=new widget('hidden');
|
|
// destination
|
|
$wdest=new widget('js_search_only');
|
|
$wdest->readonly=$readonly;
|
|
$wdest->name='qcode_dest';
|
|
$wdest->value=($this->f_id_dest != 0)?$this->qcode_dest:"";
|
|
$wdest->label="";
|
|
$wdest->extra='4,8,9,14,16';
|
|
$spdest= new widget("span");
|
|
$h_agrefid=new widget('hidden');
|
|
$str_ag_ref="<b>".(($this->ag_ref != "")?$this->ag_ref:" Nouveau ")."</b>";
|
|
// Preparing the return string
|
|
$r="";
|
|
$r.=JS_SEARCH_CARD;
|
|
$r.= '<p>Date :'.$date->IOValue()." <br>Reference ".$str_ag_ref;
|
|
$r.=" Concerne :".$lag_ref_ag_id.
|
|
' Type d\' action';
|
|
echo_debug('class_action',__LINE__,"str_doc_type $str_doc_type");
|
|
$r.= $str_doc_type;
|
|
|
|
// state
|
|
$r.=" Etat :".$str_state."</p>";
|
|
|
|
|
|
$r.= "<p> ";
|
|
$r.="Expéditeur : ".$w->IOValue();
|
|
$r.=$sp->IOValue('qcode_exp_label',$qcode_exp_label)."</TD></TR>";
|
|
$r.="Destinataire :".$wdest->IOValue();
|
|
$r.=$spdest->IOValue('qcode_dest_label',$qcode_dest_label)."</TD></TR>";
|
|
|
|
// $r.=' Ref :'.$ag_ref->IOValue();
|
|
$r.="</p>";
|
|
echo_debug('class_action',__LINE__,' ag_id is '.$this->ag_id);
|
|
|
|
$r.= "<p> Titre : ".$title->IOValue();
|
|
$r.= "<p>".$desc->IOValue()."</p>";
|
|
$r.= $doc_ref;
|
|
|
|
//hidden
|
|
$r.="<p>";
|
|
$r.=$h2->IOValue();
|
|
$r.=$h_agrefid->IOValue("ag_ref_ag_id",$this->ag_ref_ag_id);
|
|
$r.=$h_ag_id->IOValue('ag_id',$this->ag_id);
|
|
$hidden=new widget('hidden');
|
|
$r.=$hidden->IOValue('f_id_dest',$this->f_id_dest);
|
|
$hidden2=new widget('hidden');
|
|
$r.=$hidden2->IOValue('f_id_exp',$this->f_id_exp);
|
|
|
|
$r.="</p>";
|
|
|
|
// show the list of the concern operation
|
|
if ( CountSql($this->db,'select * from action_gestion where ag_ref_ag_id!=0 and ag_ref_ag_id='.$this->ag_id.
|
|
" limit 2") > 0 )
|
|
$r.=$this->myList(ACTION," and ag_ref_ag_id=".$this->ag_id);
|
|
return $r;
|
|
|
|
}
|
|
//----------------------------------------------------------------------
|
|
/*!\brief This function shows the detail of an action thanks the ag_id
|
|
*/
|
|
function get()
|
|
{
|
|
echo_debug('class_action',__LINE__,'Action::Get() ');
|
|
$sql="select ag_id, ag_comment,to_char (ag_timestamp,'DD-MM-YYYY') as ag_timestamp,".
|
|
" f_id_dest,f_id_exp,ag_title,ag_comment,ag_ref,d_id,ag_type,d_state, ".
|
|
" ag_ref_ag_id ".
|
|
" from action_gestion left join document using (ag_id) where ag_id=".$this->ag_id;
|
|
$r=ExecSql($this->db,$sql);
|
|
$row=pg_fetch_all($r);
|
|
if ( $row==false) return;
|
|
$this->ag_comment=$row[0]['ag_comment'];
|
|
$this->ag_timestamp=$row[0]['ag_timestamp'];
|
|
$this->f_id_dest=$row[0]['f_id_dest'];
|
|
$this->f_id_exp=$row[0]['f_id_exp'];
|
|
$this->ag_title=$row[0]['ag_title'];
|
|
$this->ag_type=$row[0]['ag_type'];
|
|
$this->ag_ref=$row[0]['ag_ref'];
|
|
$this->ag_ref_ag_id=$row[0]['ag_ref_ag_id'];
|
|
$this->d_id=$row[0]['d_id'];
|
|
//
|
|
echo_debug('class_action',__LINE__,' Document id = '.$this->d_id);
|
|
// if there is no document set 0 to d_id
|
|
if ( $this->d_id == "" )
|
|
$this->d_id=0;
|
|
// if there is a document fill the object
|
|
if ($this->d_id != 0 )
|
|
{
|
|
$this->state=$row['0']['d_state'];
|
|
$this->d_state=$row[0]['d_state'];
|
|
}
|
|
echo_debug('class_action',__LINE__,' After test Document id = '.$this->d_id);
|
|
$this->dt_id=$this->ag_type;
|
|
$adest=new fiche($this->db,$this->f_id_dest);
|
|
$this->qcode_dest=$adest->strAttribut(ATTR_DEF_QUICKCODE);
|
|
$aexp=new fiche($this->db,$this->f_id_exp);
|
|
$this->qcode_exp=$aexp->strAttribut(ATTR_DEF_QUICKCODE);
|
|
|
|
echo_debug('class_action',__LINE__,'Detail end () :'.var_export($_POST,true));
|
|
echo_debug('class_action',__LINE__,'Detail $this :'.var_export($this,true));
|
|
|
|
}
|
|
/*! Confirm
|
|
* \brief Display the encoded data and ask a confirmation
|
|
* this correspond to the stage 1, before the generation
|
|
* or the upload of document
|
|
*
|
|
*
|
|
* \return string containing the form
|
|
*/
|
|
function Confirm()
|
|
{
|
|
echo_debug('class_action',__LINE__,'confirm() :'.var_export($_POST,true));
|
|
echo_debug('class_action',__LINE__,'confirm $this :'.var_export($this,true));
|
|
|
|
if ( isDate($this->ag_timestamp) == null )
|
|
{
|
|
// if the date is invalid, default date is today
|
|
$this->ag_timestamp=date("d.m.Y");
|
|
}
|
|
// Compute the widget
|
|
// Date
|
|
$date=new widget("text");
|
|
$date->readonly=true;
|
|
$date->name="ag_timestamp";
|
|
$date->value=$this->ag_timestamp;
|
|
// Doc Type
|
|
$doc_type=new widget("hidden");
|
|
$doc_type->name="dt_id";
|
|
$doc_type->value=$this->dt_id;
|
|
$a=ExecSql($this->db,"select dt_value from document_type where dt_id=".$this->dt_id);
|
|
$v=pg_fetch_array($a,0);
|
|
$str_type=$v[0];
|
|
if ( isset ($_REQUEST['url']))
|
|
{
|
|
$retour=widget::button_href('Retour',urldecode($_REQUEST['url']));
|
|
|
|
$h_url=sprintf('<input type="hidden" name="url" value="%s">',urldecode($_REQUEST['url']));
|
|
}
|
|
else
|
|
{
|
|
$retour="";
|
|
$h_url="";
|
|
}
|
|
|
|
// state
|
|
$a=ExecSql($this->db,"select s_value from document_state where s_id=".$this->d_state);
|
|
$v=pg_fetch_array($a,0);
|
|
$str_state=$v[0];
|
|
$state=new widget("hidden");
|
|
$state->name="d_state";
|
|
$state->value=$this->d_state;
|
|
|
|
// title
|
|
$title=new widget("text");
|
|
$title->readonly=true;
|
|
$title->name="ag_title";
|
|
$title->value=FormatString($this->ag_title);
|
|
|
|
// Description
|
|
$desc=new widget('textarea');
|
|
$desc->name="ag_comment";
|
|
$desc->readonly=" disabled ";
|
|
$desc->value=$this->ag_comment;
|
|
// Propose to generate a document
|
|
$gen=new widget ("checkbox");
|
|
$gen->name="p_gen";
|
|
$doc_gen=new widget("select");
|
|
$doc_gen->name="gen_doc";
|
|
$doc_gen->value=make_array($this->db,
|
|
"select md_id,md_name from document_modele where md_type=".$this->dt_id);
|
|
|
|
$h_agrefid=new widget('hidden');
|
|
|
|
// f_id
|
|
if ( trim($this->qcode_dest) =="")
|
|
{
|
|
// internal document
|
|
$this->f_id_dest=0; // internal document
|
|
$namedest="interne";
|
|
}
|
|
else // ( trim($this->qcode_dest) !="" )
|
|
{
|
|
$tiers=new fiche($this->db);
|
|
$tiers->get_by_qcode($this->qcode_dest);
|
|
$this->f_id_dest=$tiers->id;
|
|
$namedest=$tiers->strAttribut(1);
|
|
if ( $namedest == '- ERROR -') $this->f_id_dest=-1;
|
|
}
|
|
|
|
// f_id
|
|
if ( trim($this->qcode_exp) =="")
|
|
{
|
|
// internal document
|
|
$this->f_id_exp=0; // internal document
|
|
$nameexp="interne";
|
|
}
|
|
else // ( trim($this->qcode_exp) !="" )
|
|
{
|
|
$tiers=new fiche($this->db);
|
|
$tiers->get_by_qcode($this->qcode_exp);
|
|
$this->f_id_exp=$tiers->id;
|
|
$nameexp=$tiers->strAttribut(1);
|
|
if ( $nameexp == '- ERROR -') $this->f_id_exp=-1;
|
|
}
|
|
|
|
|
|
|
|
// Preparing the return string
|
|
$r=$retour."<form method=\"post\">";
|
|
$r.=dossier::hidden();
|
|
$r.="<p>Date : ".$date->IOValue()."</p>";
|
|
$r.="<p>Etat $str_state".$state->IOValue()."</p>";
|
|
$r.="<p>Type du document $str_type".$doc_type->IOValue()."</p>";
|
|
$r.="<p> Expediteur : ".$this->qcode_exp." ".$nameexp.'</p>';
|
|
$r.="<p> Destinataire : ".$this->qcode_dest." ".$namedest.'</p>';
|
|
$r.="<p> Titre : ".$title->IOValue();
|
|
$r.="<p>Description :".$desc->IOValue()."</p>";
|
|
|
|
// if no document exist for this type then do not display the question
|
|
if ( sizeof($doc_gen->value) != 0)
|
|
$r.="<p> Générer un document ".$gen->IOValue()." ".$doc_gen->IOValue()."</p>";
|
|
|
|
|
|
// Add the hidden tag
|
|
$r.='<input type="hidden" name="sa" value="save_action_st2">';
|
|
$r.='<input type="hidden" name="p_action" value="suivi_courrier">';
|
|
$r.='<input type="hidden" name="f_id_dest" value="'.$this->f_id_dest.'">';
|
|
$r.='<input type="hidden" name="f_id_exp" value="'.$this->f_id_exp.'">';
|
|
$r.='<input type="hidden" name="qcode_dest" value="'.$this->qcode_dest.'">';
|
|
$r.='<input type="hidden" name="qcode_exp" value="'.$this->qcode_exp.'">';
|
|
|
|
|
|
$r.= $h_agrefid->IOValue("ag_ref_ag_id",$this->ag_ref_ag_id);
|
|
|
|
// retrieve customer
|
|
|
|
|
|
if ( $this->f_id_dest != -1 && $this->f_id_exp !=-1 )
|
|
$r.=widget::submit("Save","Sauve");
|
|
$r.=widget::submit("corr","Corrige");
|
|
|
|
$r.=$h_url."</form>";
|
|
return $r;
|
|
}
|
|
/*! SaveStage2
|
|
* \brief Save the document and propose to save the generated document or
|
|
* to upload one, the data are included except the file. Temporary the generated
|
|
* document is save
|
|
*
|
|
* \return
|
|
*/
|
|
function SaveStage2()
|
|
{
|
|
echo_debug('class_action',__LINE__,'saveStage2() :'.var_export($_POST,true));
|
|
echo_debug('class_action',__LINE__,' saveStage2() $this :'.var_export($this,true));
|
|
|
|
// Get The sequence id,
|
|
$seq_name="seq_doc_type_".$this->dt_id;
|
|
$str_file="";
|
|
$add_file='';
|
|
// f_id dest
|
|
$tiers=new fiche($this->db);
|
|
$tiers->get_by_qcode($this->qcode_dest);
|
|
|
|
// f_id exp
|
|
$exp=new fiche($this->db);
|
|
$exp->get_by_qcode($this->qcode_exp);
|
|
|
|
if ( trim($this->ag_title) == "")
|
|
{
|
|
$doc_mod=new document_type($this->db);
|
|
$doc_mod->dt_id=$this->dt_id;
|
|
$doc_mod->get();
|
|
$this->ag_title=$doc_mod->dt_value;
|
|
}
|
|
echo_debug('class_action',__LINE__," tiers->id ".$tiers->id);
|
|
$this->ag_id=NextSequence($this->db,'action_gestion_ag_id_seq');
|
|
// Create the reference
|
|
$ref=$this->dt_id.'/'.$this->ag_id;
|
|
$this->ag_ref=$ref;
|
|
/*!\brief the ag_comment is already urlencoded
|
|
*/
|
|
//we remove newline
|
|
$this->ag_comment=str_replace("%OD","",$this->ag_comment);
|
|
$this->ag_comment=str_replace("%OA","",$this->ag_comment);
|
|
// save into the database
|
|
$sql=sprintf("insert into action_gestion".
|
|
"(ag_id,ag_timestamp,ag_type,ag_title,f_id_dest,f_id_exp,ag_comment,ag_ref,ag_ref_ag_id) ".
|
|
" values (%d,to_date('%s','DD-MM-YYYY'),'%d','%s',%d,%d,'%s','%s',%d)",
|
|
$this->ag_id,
|
|
$this->ag_timestamp,
|
|
$this->dt_id,
|
|
FormatString($this->ag_title),
|
|
$tiers->id,
|
|
$exp->id,
|
|
$this->ag_comment,
|
|
$ref,
|
|
$this->ag_ref_ag_id
|
|
);
|
|
ExecSql($this->db,$sql);
|
|
|
|
|
|
|
|
// the lob filename and the mimetype needed if we want to generate a doc.
|
|
if ( $this->gen == 'on' )
|
|
{
|
|
$doc=new Document($this->db);
|
|
$doc->f_id=$tiers->id;
|
|
$doc->md_id=$this->md_id;
|
|
$doc->ag_id=$this->ag_id;
|
|
$doc->d_state=$this->d_state;
|
|
$str_file=$doc->Generate();
|
|
$d='<input type="hidden" name="d_id" value="'.$doc->d_id.'">';
|
|
}
|
|
$r="";
|
|
// readonly and upload of a file
|
|
$r.="<hr>";
|
|
$r.='<form enctype="multipart/form-data" method="post">';
|
|
$r.=dossier::hidden();
|
|
echo_debug("class_action",__LINE__,"call display");
|
|
$r.=$this->Display('READ',false);
|
|
// Add the hidden tag
|
|
$r.='<input type="hidden" name="sa" value="save_action_st3">';
|
|
$r.='<input type="hidden" name="p_action" value="suivi_courrier">';
|
|
// add the d_id
|
|
$r.='<input type="hidden" name="d_id" value="'.$this->d_id.'">';
|
|
// ag_comment must be saved in urlcode
|
|
$r.='<input type="hidden" name="ag_comment" value="'.urlencode($this->ag_comment).'">';
|
|
// add hidden code for qcode_exp, qcode_dest
|
|
$r.='<input type="hidden" name="qcode_dest" value="'.$this->qcode_dest.'">';
|
|
$r.='<input type="hidden" name="qcode_exp" value="'.$this->qcode_exp.'">';
|
|
// Value for the generated document
|
|
if ( $this->gen == 'on' )
|
|
{
|
|
$r.='<input type="hidden" name="d_id" value="'.$doc->d_id.'">';
|
|
$r.="Sauver le document généré :";
|
|
$r.=$str_file;
|
|
$checkbox=new widget("checkbox");
|
|
$checkbox->name="save_generate";
|
|
$r.=$checkbox->IOValue();
|
|
$r.="<hr>";
|
|
}
|
|
$upload=new widget("file");
|
|
$upload->name="file_upload";
|
|
$upload->value="";
|
|
$r.="Enregistrer le fichier ".$upload->IOValue();
|
|
$r.=widget::submit("save","Sauve le fichier");
|
|
$r.="</form>";
|
|
return $r;
|
|
}
|
|
/*! SaveStage3
|
|
* \brief Upload the document or save the generated document
|
|
* \param $d_id document_id when we upload we don't increment seq. if = 0 then no file
|
|
*
|
|
*/
|
|
function SaveStage3($d_id)
|
|
{
|
|
echo_debug('class_action',__LINE__,'SaveStage3() :'.var_export($_POST,true));
|
|
echo_debug('class_action',__LINE__,'SaveStage3 :'.var_export($this,true));
|
|
|
|
// if we save the generated doc
|
|
if ( isset($_POST['save_generate']))
|
|
{
|
|
return;
|
|
}
|
|
|
|
// Upload a new document
|
|
$doc=new Document($this->db);
|
|
$doc->ag_id=$this->ag_id;
|
|
// if there is a document and it is not an update
|
|
if ( sizeof($_FILES) !=0 && $d_id==0)
|
|
{
|
|
$doc->md_type=$this->dt_id;
|
|
$doc->blank();
|
|
}
|
|
else
|
|
$doc->d_id=$d_id;
|
|
|
|
$doc->Upload($this->ag_id);
|
|
}
|
|
|
|
/*! myList($p_filter="")
|
|
* \brief Show list of action
|
|
* \param $p_filter filters on the document_type
|
|
* \param $p_search must a valid sql command ( ex 'and ag_title like upper('%hjkh%'))
|
|
*
|
|
*
|
|
* \return string containing html code
|
|
*/
|
|
function myList($p_filter="",$p_search="")
|
|
{
|
|
$str_dossier=dossier::get();
|
|
// for the sort
|
|
$sort="";
|
|
$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" border="0" >';
|
|
$image_sel_asc='<IMAGE SRC="image/select2.png" border="0" >';
|
|
|
|
$url=CleanUrl();
|
|
|
|
$sort_date='<th><A class="mtitle" href="?'.$url.'&s=date_a">'.$image_asc.'</A>'.
|
|
'Date'.
|
|
'<A class="mtitle" href="?'.$url.'&s=date_d&'.$str_dossier.'">'.$image_desc.'</A></th>';
|
|
$sort_exp='<th><A class="mtitle" href="?'.$url.'&s=exp&'.$str_dossier.'">'.$image_asc.'</A>'.
|
|
'Expéditeur'.
|
|
'<A class="mtitle" href="?'.$url.'&s=exp_d&'.$str_dossier.'">'.$image_desc.'</A></th>';
|
|
$sort_dest='<th><A class="mtitle" href="?'.$url.'&s=dest&'.$str_dossier.'">'.$image_asc.'</A>'.
|
|
'Destinataire'.
|
|
'<A class="mtitle" href="?'.$url.'&s=dest_d&'.$str_dossier.'">'.$image_desc.'</A></th>';
|
|
$sort_titre='<th><A class="mtitle" href="?'.$url.'&s=ti&'.$str_dossier.'">'.$image_asc.'</A>'.
|
|
'Titre'.
|
|
'<A class="mtitle" href="?'.$url.'&s=ti_d&'.$str_dossier.'">'.$image_desc.'</A></th>';
|
|
$sort_concerne='<th><A class="mtitle" href="?'.$url.'&s=conc&'.$str_dossier.'">'.$image_asc.'</A>'.
|
|
'Concerne'.
|
|
'<A class="mtitle" href="?'.$url.'&s=conc_d&'.$str_dossier.'">'.$image_desc.'</A></th>';
|
|
$sort_reference='<th><A class="mtitle" href="?'.$url.'&s=ref&'.$str_dossier.'">'.$image_asc.'</A>'.
|
|
'Référence'.
|
|
'<A class="mtitle" href="?'.$url.'&s=ref_d&'.$str_dossier.'">'.$image_desc.'</A></th>';
|
|
|
|
if ( isset($_GET['s'])){
|
|
{
|
|
switch ($_GET['s']) {
|
|
case "date_a":
|
|
$sort=" ag_timestamp asc";
|
|
$sort_date='<th>'.$image_sel_asc.'</A>'.
|
|
'Date'.
|
|
'<A class="mtitle" href="?'.$url.'&s=date_d">'.$image_desc.'</A></th>';
|
|
break;
|
|
|
|
case "date_d":
|
|
$sort=" ag_timestamp desc";
|
|
$sort_date='<th><A class="mtitle" href="?'.$url.'&s=date_a">'.$image_asc.'</A>'.
|
|
'Date'.
|
|
$image_sel_desc.'</th>';
|
|
break;
|
|
|
|
case "exp":
|
|
$sort_exp='<th>'.$image_sel_asc.'</A>'.
|
|
'Expéditeur'.
|
|
'<A class="mtitle" href="?'.$url.'&s=exp_d">'.$image_asc.'</A></th>';
|
|
$sort=" f_id_exp asc";
|
|
break;
|
|
|
|
case "exp_d":
|
|
$sort_exp='<th><A class="mtitle" href="?'.$url.'&s=exp">'.$image_asc.'</A>'.
|
|
'Expéditeur'.
|
|
$image_sel_desc.'</th>';
|
|
|
|
$sort=" f_id_exp desc";
|
|
break;
|
|
|
|
case "dest":
|
|
$sort_dest='<th>'.$image_sel_asc.
|
|
'Destinataire'.
|
|
'<A class="mtitle" href="?'.$url.'&s=dest_d">'.$image_desc.'</A></th>';
|
|
|
|
$sort=" f_id_dest asc";
|
|
break;
|
|
case "dest_d":
|
|
$sort_dest='<th><A class="mtitle" href="?'.$url.'&s=dest">'.$image_asc.'</A>'.
|
|
'Destinataire'.
|
|
$image_sel_desc.'</th>';
|
|
|
|
$sort=" f_id_dest desc";
|
|
break;
|
|
|
|
case "ti":
|
|
$sort_titre='<th>'.$image_sel_asc.
|
|
'Titre'.
|
|
'<A class="mtitle" href="?'.$url.'&s=ti_d">'.$image_desc.'</A></th>';
|
|
|
|
$sort=" ag_title asc";
|
|
break;
|
|
case "ti_d":
|
|
$sort_titre='<th><A class="mtitle" href="?'.$url.'&s=ti">'.$image_asc.'</A>'.
|
|
'Titre'.
|
|
$image_sel_desc.'</th>';
|
|
|
|
$sort=" ag_title desc";
|
|
break;
|
|
|
|
case "conc":
|
|
$sort_concerne='<th>'.$image_sel_asc.
|
|
'Concerne'.
|
|
'<A class="mtitle" href="?'.$url.'&s=conc_d">'.$image_desc.'</A></th>';
|
|
|
|
$sort=" ag_ref_ag_id asc";
|
|
break;
|
|
case "conc_d":
|
|
$sort_concerne='<th><A class="mtitle" href="?'.$url.'&s=conc">'.$image_asc.'</A>'.
|
|
'Concerne'.
|
|
$image_sel_desc.'</th>';
|
|
|
|
$sort=" ag_ref_ag_id desc";
|
|
break;
|
|
|
|
case "ref":
|
|
$sort_reference='<th>'.$image_sel_asc.
|
|
'Référence'.
|
|
'<A class="mtitle" href="?'.$url.'&s=ref_d">'.$image_desc.'</A></th>';
|
|
|
|
$sort=" ag_ref ";
|
|
break;
|
|
|
|
case "ref_d":
|
|
$sort_reference='<th><A class="mtitle" href="?'.$url.'&s=ref">'.$image_asc.'</A>'.
|
|
'Référence'.
|
|
$image_sel_desc.'</th>';
|
|
|
|
$sort=" ag_ref desc";
|
|
break;
|
|
|
|
|
|
}
|
|
$sort=" order by ".$sort;
|
|
}
|
|
}
|
|
$sql="
|
|
select ag_id,to_char(ag_timestamp,'DD-MM-YYYY') as my_date,ag_ref_ag_id,f_id_dest,f_id_exp".
|
|
",ag_title,d_id,md_type,dt_value,ag_ref
|
|
from action_gestion
|
|
left outer join document using (ag_id)
|
|
left outer join document_modele on (ag_type=md_type)
|
|
join document_type on (ag_type=dt_id)
|
|
where dt_id in ($p_filter) $p_search $sort";
|
|
$max_line=CountSql($this->db,$sql);
|
|
$step=$_SESSION['g_pagesize'];
|
|
$page=(isset($_GET['offset']))?$_GET['page']:1;
|
|
$offset=(isset($_GET['offset']))?pg_escape_string($_GET['offset']):0;
|
|
$limit=" LIMIT $step OFFSET $offset ";
|
|
$bar=jrn_navigation_bar($offset,$max_line,$step,$page);
|
|
|
|
$Res=ExecSql($this->db,$sql.$limit);
|
|
$a_row=pg_fetch_all($Res);
|
|
|
|
$r="";
|
|
$r.=$bar;
|
|
$r.='<table class="document">';
|
|
$r.="<tr>";
|
|
$r.=$sort_date;
|
|
$r.=$sort_dest;
|
|
$r.=$sort_exp;
|
|
$r.=$sort_titre;
|
|
$r.='<th>type</th>';
|
|
$r.=$sort_reference;
|
|
$r.=$sort_concerne;
|
|
$r.='<th>Document</th>';
|
|
$r.="</tr>";
|
|
|
|
|
|
// if there are no records return a message
|
|
if ( sizeof ($a_row) == 0 or $a_row == false )
|
|
{
|
|
$r='<div class="u_redcontent">';
|
|
$r.='<hr>Aucun enregistrement trouvé';
|
|
$r.="</div>";
|
|
return $r;
|
|
|
|
}
|
|
$r.=JS_SEARCH_CARD;
|
|
$i=0;
|
|
foreach ($a_row as $row )
|
|
{
|
|
$href='<A class="document" HREF="commercial.php?p_action=suivi_courrier&sa=detail&ag_id='.$row['ag_id'].'&'.$str_dossier.'">';
|
|
$i++;
|
|
$tr=($i%2==0)?'even':'odd';
|
|
$r.="<tr class=\"$tr\">";
|
|
$r.="<td>".$href.$row['my_date'].'</a>'."</td>";
|
|
// Destinataire
|
|
$fdest=new fiche($this->db);
|
|
$fdest->id=$row['f_id_dest'];
|
|
$qcode_dest=$fdest->strAttribut(ATTR_DEF_QUICKCODE);
|
|
|
|
$qdest=($qcode_dest=="- ERROR -")?"Interne":$qcode_dest;
|
|
$jsdest=sprintf("javascript:showfiche('%s','%s')",
|
|
$_REQUEST['PHPSESSID'],$qdest);
|
|
if ( $qdest != 'Interne' )
|
|
{
|
|
$r.="<td>".$href.$qdest." : ".$fdest->getName().'</a></td>';
|
|
}
|
|
else
|
|
$r.="<td>$href Interne </a> </td>";
|
|
|
|
// Expediteur
|
|
$fexp=new fiche($this->db);
|
|
$fexp->id=$row['f_id_exp'];
|
|
$qcode_exp=$fexp->strAttribut(ATTR_DEF_QUICKCODE);
|
|
|
|
$qexp=($qcode_exp=="- ERROR -")?"Interne":$qcode_exp;
|
|
$jsexp=sprintf("javascript:showfiche('%s','%s')",
|
|
$_REQUEST['PHPSESSID'],$qexp);
|
|
if ( $qexp != 'Interne' )
|
|
{
|
|
$r.="<td>$href".$qexp." : ".$fexp->getName().'</a></td>';
|
|
}
|
|
else
|
|
$r.="<td>$href Interne </a></td>";
|
|
|
|
$ref="";
|
|
|
|
// show reference
|
|
if ( $row['ag_ref_ag_id'] != 0 )
|
|
{
|
|
$retSqlStmt=ExecSql($this->db,
|
|
"select ag_ref from action_gestion where ag_id=".$row['ag_ref_ag_id']);
|
|
$retSql=pg_fetch_all($retSqlStmt);
|
|
if ( $retSql != null )
|
|
{
|
|
foreach ($retSql as $line)
|
|
{
|
|
$ref.='<A href="commercial.php?p_action=suivi_courrier&query='.$line['ag_ref'].'&'.$str_dossier.'">'.
|
|
$line['ag_ref']."<A>";
|
|
}
|
|
}
|
|
}
|
|
|
|
$r.='<td>'.$href.
|
|
$row['ag_title']."</A></td>";
|
|
$r.="<td>".$row['dt_value']."</td>";
|
|
$r.="<td>".$row['ag_ref']."</td>";
|
|
$r.="<td>".$ref."</td>";
|
|
if ( $row['d_id'] != '')
|
|
{
|
|
$doc=new Document($this->db,$row['d_id']);
|
|
$doc->get();
|
|
if ( strlen(trim($doc->d_lob)) != 0 )
|
|
$r.="<td>".$doc->a_ref()."</td>";
|
|
}
|
|
$r.="</tr>";
|
|
|
|
}
|
|
$r.="</table>";
|
|
|
|
$r.=$bar;
|
|
//$r.="</div>";
|
|
return $r;
|
|
}
|
|
//----------------------------------------------------------------------
|
|
/*!\brief Update the data into the database
|
|
*
|
|
* \return true on success otherwise false
|
|
*/
|
|
function Update()
|
|
{
|
|
echo_debug('class_action',__LINE__,'Update() $_POST() :'.var_export($_POST,true));
|
|
echo_debug('class_action',__LINE__,'Update() $this :'.var_export($this,true));
|
|
|
|
// if ag_id == 0 nothing to do
|
|
if ( $this->ag_id == 0 ) return ;
|
|
|
|
|
|
// retrieve customer
|
|
// f_id
|
|
|
|
if ( trim($this->qcode_exp) =="" )
|
|
{
|
|
// internal document
|
|
$this->f_id_exp=0; // internal document
|
|
}
|
|
else
|
|
{
|
|
$tiers=new fiche($this->db);
|
|
if ( $tiers->get_by_qcode($this->qcode_exp) == -1 ) // Error we cannot retrieve this qcode
|
|
return false;
|
|
else
|
|
$this->f_id_exp=$tiers->id;
|
|
|
|
}
|
|
if ( trim($this->qcode_dest) =="" )
|
|
{
|
|
// internal document
|
|
$this->f_id_dest=0; // internal document
|
|
}
|
|
else
|
|
{
|
|
$tiers=new fiche($this->db);
|
|
if ( $tiers->get_by_qcode($this->qcode_dest) == -1 ) // Error we cannot retrieve this qcode
|
|
return false;
|
|
else
|
|
$this->f_id_dest=$tiers->id;
|
|
|
|
}
|
|
|
|
|
|
//remove newline from ag_comment
|
|
$this->ag_comment=str_replace("\n","",$this->ag_comment);
|
|
$this->ag_comment=str_replace("\r","",$this->ag_comment);
|
|
|
|
// url encoded
|
|
$this->ag_comment=urlencode($this->ag_comment);
|
|
|
|
// bug PHP : sometimes the newline remains
|
|
$this->ag_comment=str_replace("%A0","",$this->ag_comment);
|
|
$this->ag_comment=str_replace("%0D","",$this->ag_comment);
|
|
$this->ag_comment=str_replace("+%A0+","",$this->ag_comment);
|
|
$this->ag_comment=str_replace("+%0D+","",$this->ag_comment);
|
|
|
|
|
|
$sql=sprintf("update action_gestion set ag_comment='%s',".
|
|
" ag_timestamp=to_date('%s','DD.MM.YYYY'),".
|
|
" ag_title='%s',".
|
|
" ag_type=%d, ".
|
|
" f_id_exp=%d, ".
|
|
" f_id_dest=%d, ".
|
|
" ag_ref_ag_id=%d".
|
|
" where ag_id = %d",
|
|
$this->ag_comment,
|
|
$this->ag_timestamp,
|
|
FormatString($this->ag_title),
|
|
$this->dt_id,
|
|
$this->f_id_exp,
|
|
$this->f_id_dest,
|
|
$this->ag_ref_ag_id,
|
|
$this->ag_id);
|
|
ExecSql($this->db,$sql);
|
|
echo_debug('class_action',__LINE__,$_FILES);
|
|
if ( strlen(trim($_FILES['file_upload']['name'])) !=0 )
|
|
{
|
|
echo_debug('class_action',__LINE__,'sizeof($_FILES) = '.sizeof($_FILES));
|
|
echo_debug('class_action',__LINE__,'$this->d_id = '.$this->d_id);
|
|
|
|
// Upload a new document
|
|
$doc=new Document($this->db);
|
|
if ( $this->d_id !=0 )
|
|
{
|
|
$doc->d_id=$this->d_id;
|
|
} else {
|
|
// we need to increment the counter
|
|
$doc->ag_id=$this->ag_id;
|
|
$doc->md_type=$this->dt_id;
|
|
$doc->blank();
|
|
}
|
|
$doc->Upload($this->ag_id);
|
|
|
|
}
|
|
if ( $this->d_id != 0 )
|
|
{
|
|
$doc=new Document($this->db);
|
|
$doc->d_id=$this->d_id ;
|
|
$doc->d_state=$this->d_state;
|
|
$doc->save();
|
|
}
|
|
return true;
|
|
}
|
|
/*!\brief remove the action
|
|
*
|
|
*/
|
|
function remove()
|
|
{
|
|
$this->get();
|
|
// remove the key
|
|
$sql=sprintf("delete from action_gestion where ag_id=%d",$this->ag_id);
|
|
ExecSql($this->db,$sql);
|
|
|
|
// remove the ref
|
|
$sql=sprintf("update action_gestion set ag_ref_ag_id=0 where ag_ref_ag_id=%d",
|
|
$this->ag_id);
|
|
ExecSql($this->db,$sql);
|
|
|
|
// if there is a document
|
|
if ( $this->dt_id != 0 )
|
|
{
|
|
$doc=new Document($this->db,$this->dt_id);
|
|
$doc->get();
|
|
$doc->remove();
|
|
if ( strlen(trim($doc->d_lob))!=0 )
|
|
pg_lo_unlink($this->db,$doc->dt_lob);
|
|
}
|
|
|
|
}
|
|
}
|