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 ........
885 lines
26 KiB
PHP
885 lines
26 KiB
PHP
<?php
|
|
/*
|
|
* This file is part of PhpCompta.
|
|
*
|
|
* PhpCompta is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* PhpCompta is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with PhpCompta; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
/* $Revision$ */
|
|
// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
|
|
/*! \file
|
|
* \brief Functions for the ledger of sold
|
|
*/
|
|
require_once("constant.php");
|
|
require_once("class_widget.php");
|
|
require_once("preference.php");
|
|
require_once("fiche_inc.php");
|
|
require_once("user_common.php");
|
|
require_once ("class_own.php");
|
|
require_once ("class_anc_plan.php");
|
|
require_once ('class_anc_operation.php');
|
|
require_once ('class_pre_op_ven.php');
|
|
require_once ('class_own.php');
|
|
require_once ('class_acc_ledger.php');
|
|
require_once ('class_periode.php');
|
|
|
|
/*! FormVenInput
|
|
* \brief Display the form for a sell
|
|
* Used to show detail, encode a new invoice
|
|
* or update one
|
|
*
|
|
*
|
|
* \param p_array which can be empty
|
|
* \param the "journal"
|
|
* \param $p_periode = periode
|
|
* \param view_only if we cannot change it (no right or centralized op)
|
|
* \param $p_article number of article
|
|
* \return string with the form
|
|
*/
|
|
function FormVenInput($p_cn,$p_jrn,$p_periode,$p_array=null,$pview_only=true,$p_article=1)
|
|
{
|
|
|
|
if ( $p_array != null ) {
|
|
// array contains old value
|
|
foreach ( $p_array as $a=>$v) {
|
|
${"$a"}=$v;
|
|
}
|
|
}
|
|
// The date
|
|
list ($l_date_start,$l_date_end)=get_periode($p_cn,$p_periode);
|
|
// $op_date=( ! isset($e_date) )
|
|
// ?substr($l_date_start,2,8):$e_date;
|
|
$op_date=( ! isset($e_date) ) ?$l_date_start:$e_date;
|
|
$e_ech=(isset($e_ech))?$e_ech:"";
|
|
$e_comm=(isset($e_comm))?$e_comm:"";
|
|
// $e_jrn=(isset($e_jrn))?$e_jrn:"";
|
|
// Save old value and set a new one
|
|
|
|
echo_debug('user_form_ven.php',__LINE__,"form_input.php.FormVentep_op_date is $op_date");
|
|
$r="";
|
|
if ( $pview_only == false) {
|
|
$r.=JS_SEARCH_CARD;
|
|
$r.=JS_SHOW_TVA;
|
|
$r.=JS_TVA;
|
|
// Compute href
|
|
// $href=basename($_SERVER['PHP_SELF']);
|
|
$href=basename($_SERVER['PHP_SELF']);
|
|
switch ($href)
|
|
{
|
|
// user_jrn.php
|
|
case 'user_jrn.php':
|
|
$href="user_jrn.php?action=insert_vente&p_jrn=$p_jrn";
|
|
break;
|
|
case 'commercial.php':
|
|
$href="commercial.php?p_action=facture&p_jrn=$p_jrn";
|
|
break;
|
|
default:
|
|
echo_error('user_form_ven.php',__LINE__,'Erreur invalid request uri');
|
|
exit (-1);
|
|
}
|
|
|
|
$r.="<FORM NAME=\"form_detail\" ACTION=\"$href\" METHOD=\"POST\">";
|
|
$r.=dossier::hidden();
|
|
|
|
|
|
}
|
|
$r.="<fieldset>";
|
|
$r.="<legend>Detail client </legend>";
|
|
|
|
$r.='<TABLE>';
|
|
// Date
|
|
//--
|
|
$Date=new widget("js_date");
|
|
$Date->SetReadOnly($pview_only);
|
|
$Date->table=1;
|
|
$Date->tabindex=1;
|
|
$r.="<tr>";
|
|
$r.=$Date->IOValue("e_date",$op_date,"Date");
|
|
$r.="</tr>";
|
|
// Payment limit
|
|
//--
|
|
$Echeance=new widget("js_date");
|
|
$Echeance->SetReadOnly($pview_only);
|
|
$Echeance->table=1;
|
|
$Echeance->tabindex=2;
|
|
$r.="<tr>";
|
|
$r.=$Echeance->IOValue("e_ech",$e_ech,"Echeance");
|
|
$r.="</tr>";
|
|
// Comment
|
|
//--
|
|
$Commentaire=new widget("text");
|
|
$Commentaire->table=1;
|
|
$Commentaire->SetReadOnly($pview_only);
|
|
$Commentaire->size=80;
|
|
$Commentaire->tabindex=3;
|
|
$r.="<tr>";
|
|
$r.=$Commentaire->IOValue("e_comm",$e_comm,"Description");
|
|
$r.="</tr>";
|
|
include_once("fiche_inc.php");
|
|
// Display the customer
|
|
//--
|
|
$fiche='deb';
|
|
echo_debug('user_form_ven.php',__LINE__,"Client Nombre d'enregistrement ".sizeof($fiche));
|
|
// Save old value and set a new one
|
|
//--
|
|
$e_client=( isset ($e_client) )?$e_client:"";
|
|
$e_client_label="";
|
|
|
|
// retrieve e_client_label
|
|
//--
|
|
$a_client=GetFicheAttribut($p_cn,$e_client);
|
|
if ( $a_client != null)
|
|
$e_client_label=$a_client['vw_name']." adresse ".$a_client['vw_addr']." ".$a_client['vw_cp'];
|
|
|
|
|
|
$W1=new widget("js_search");
|
|
$W1->label="Client";
|
|
$W1->name="e_client";
|
|
$W1->tabindex=3;
|
|
$W1->value=$e_client;
|
|
$W1->extra=$fiche; // list of card
|
|
$W1->extra2=$p_jrn;
|
|
$r.="<TR>".$W1->IOValue();
|
|
$client_label=new widget("span");
|
|
$r.= $client_label->IOValue("e_client_label",$e_client_label)."</TD></TR>";
|
|
$r.="</TABLE>";
|
|
|
|
// Record the current number of article
|
|
$Hid=new widget('hidden');
|
|
$r.=$Hid->IOValue("nb_item",$p_article);
|
|
$e_comment=(isset($e_comment))?$e_comment:"";
|
|
$r.="</fieldset>";
|
|
|
|
// Start the div for item to sell
|
|
$r.="<DIV>";
|
|
$r.='<H2 class="info">Détail articles vendus</H2>';
|
|
$r.='<TABLE>';
|
|
$r.='<TR>';
|
|
$r.="<th></th>";
|
|
$r.="<th>Code</th>";
|
|
$r.="<th>Dénomination</th>";
|
|
$r.="<th>prix</th>";
|
|
$r.="<th>tva</th>";
|
|
$r.="<th>quantité</th>";
|
|
$r.='</TR>';
|
|
// For each article
|
|
//--
|
|
for ($i=0;$i< $p_article;$i++) {
|
|
// Code id, price & vat code
|
|
//--
|
|
$march=(isset(${"e_march$i"}))?${"e_march$i"}:"";
|
|
$march_sell=(isset(${"e_march".$i."_sell"}))?${"e_march".$i."_sell"}:"";
|
|
$march_tva_id=(isset(${"e_march$i"."_tva_id"}))?${"e_march$i"."_tva_id"}:"";
|
|
|
|
$march_tva_label="";
|
|
$march_label="";
|
|
|
|
// retrieve the tva label and name
|
|
//--
|
|
$a_fiche=GetFicheAttribut($p_cn, $march);
|
|
if ( $a_fiche != null ) {
|
|
if ( $march_tva_id == "" ) {
|
|
$march_tva_id=$a_fiche['tva_id'];
|
|
$march_tva_label=$a_fiche['tva_label'];
|
|
}
|
|
$march_label=$a_fiche['vw_name'];
|
|
}
|
|
|
|
|
|
// Show input
|
|
//--
|
|
$W1=new widget("js_search");
|
|
$W1->label="";
|
|
$W1->name="e_march".$i;
|
|
$W1->value=$march;
|
|
$W1->extra='cred'; // credits
|
|
$W1->extra2=$p_jrn;
|
|
$W1->readonly=$pview_only;
|
|
$r.="<TR>".$W1->IOValue()."</TD>";
|
|
$Span=new widget ("span");
|
|
$Span->SetReadOnly($pview_only);
|
|
// card's name, price
|
|
//--
|
|
$r.="<TD>".$Span->IOValue("e_march".$i."_label",$march_label)."</TD>";
|
|
// price
|
|
$Price=new widget("text");
|
|
$Price->SetReadOnly($pview_only);
|
|
$Price->table=1;
|
|
$Price->size=9;
|
|
$r.=$Price->IOValue("e_march".$i."_sell",$march_sell);
|
|
// vat label
|
|
//--
|
|
$select_tva=make_array($p_cn,"select tva_id,tva_label from tva_rate order by tva_rate desc",0);
|
|
$Tva=new widget("select");
|
|
$Tva->table=1;
|
|
$Tva->selected=$march_tva_id;
|
|
$r.=$Tva->IOValue("e_march$i"."_tva_id",$select_tva);
|
|
|
|
// quantity
|
|
//--
|
|
$quant=(isset(${"e_quant$i"}))?${"e_quant$i"}:"1";
|
|
$Quantity=new widget("text");
|
|
$Quantity->SetReadOnly($pview_only);
|
|
$Quantity->table=1;
|
|
$Quantity->size=9;
|
|
//$r.=InputType("","TEXT","e_quant".$i,$quant,$pview_only);
|
|
$r.=$Quantity->IOValue("e_quant".$i,$quant);
|
|
$r.="</tr>";
|
|
}
|
|
|
|
|
|
|
|
$r.="</TABLE>";
|
|
$r.="<hr>";
|
|
// Set correctly the REQUEST param for jrn_type
|
|
$h=new widget('hidden');
|
|
$h->name='jrn_type';
|
|
$h->value='VEN';
|
|
$r.=$h->IOValue();
|
|
|
|
if ($pview_only == false ) {
|
|
$r.='<INPUT TYPE="SUBMIT" NAME="add_item" VALUE="Ajout article" TABINDEX="32767">';
|
|
$r.='<INPUT TYPE="SUBMIT" NAME="view_invoice" VALUE="Enregistrer" TABINDEX="32767" ID="SubmitButton">';
|
|
$r.="</DIV>";
|
|
$r.="</FORM>";
|
|
$r.=JS_CALC_LINE;
|
|
} else {
|
|
$r.="</div>";
|
|
|
|
}
|
|
|
|
|
|
|
|
return $r;
|
|
|
|
|
|
}
|
|
/*! form_verify_input
|
|
**************************************************
|
|
* \brief verify if the data to insert are valid
|
|
*
|
|
*
|
|
* \param $p_cn database connection
|
|
* \param $p_jrn concerned ledger
|
|
* \param $User periode
|
|
* \param $array with the post data
|
|
* \param $p_number number of items
|
|
*
|
|
* \return null if error or true if everything is correct
|
|
*/
|
|
function form_verify_input($p_cn,$p_jrn,$p_periode,$p_array,$p_number)
|
|
{
|
|
foreach ($p_array as $name=>$content) {
|
|
${"$name"}=$content;
|
|
}
|
|
// Verify the amount for each
|
|
//
|
|
// Check for CA
|
|
$own = new Own($p_cn);
|
|
|
|
// Verify the date
|
|
if ( isDate($e_date) == null ) {
|
|
echo_error("Invalid date $e_date");
|
|
echo_debug('user_form_ven.php',__LINE__,"Invalid date $e_date");
|
|
echo "<SCRIPT> alert('INVALID DATE $e_date !!!!');</SCRIPT>";
|
|
return null;
|
|
}
|
|
// Verify the quantity
|
|
for ($o = 0;$o < $p_number; $o++) {
|
|
if ( isNumber(${"e_quant$o"}) == 0 ) {
|
|
echo_debug('user_form_ven.php',__LINE__,"invalid quantity ".${"e_quant$o"});
|
|
echo_error("invalid quantity ".${"e_quant$o"});
|
|
echo "<SCRIPT> alert('INVALID QUANTITY !!!');</SCRIPT>";
|
|
return null;
|
|
}
|
|
// check if vat is correct
|
|
if ( strlen(trim(${"e_march$o"."_tva_id"})) !=0
|
|
and
|
|
${"e_march$o"."_tva_id"} != "-1")
|
|
{
|
|
// vat is given we check it now check if valid
|
|
if (isNumber(${"e_march$o"."_tva_id"}) == 0
|
|
or CountSql($p_cn,"select tva_id from tva_rate where tva_id=".${"e_march$o"."_tva_id"}) ==0)
|
|
{
|
|
$msg="Invalid TVA !!! e_march".$o."_tva_id = ".${"e_march".$o."_tva_id"};
|
|
echo_error($msg);
|
|
echo "<SCRIPT>alert('$msg');</SCRIPT>";
|
|
return null;
|
|
|
|
}
|
|
}
|
|
|
|
// encode the pa Check only for mandatory CA
|
|
if ( $own->MY_ANALYTIC!="nu") // use of AA
|
|
{
|
|
|
|
if ( isset (${"amount_t".$o})){
|
|
|
|
$hidden_amount=${"amount_t".$o};
|
|
$ca_amount=0;
|
|
// first we get the number of row for each item
|
|
for ($line=1;$line <=${"nb_t".$o};$line++) {
|
|
$ca_amount+=${"val".$o."l".$line};
|
|
}
|
|
|
|
// compare hidden value and computed
|
|
if ( round($ca_amount-$hidden_amount,2) != 0 ) {
|
|
|
|
$msg="Montant CA est different total marchandise";
|
|
$msg.="montant encode $ca_amount marchandise $hidden_amount";
|
|
echo "<SCRIPT>alert('$msg');</SCRIPT>";
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
|
|
// Verify the ech
|
|
if (strlen($e_ech) != 0 and isNumber($e_ech) == 0 and isDate ($e_ech) == null ) {
|
|
$msg="Echeance invalide";
|
|
echo_error($msg); echo_error($msg);
|
|
echo "<SCRIPT>alert('$msg');</SCRIPT>";
|
|
return null;
|
|
}
|
|
|
|
// if ech is a number of days then compute date limit
|
|
if ( strlen($e_ech) != 0 and isNumber($e_ech) == 1) {
|
|
list($day,$month,$year)=explode(".",$e_date);
|
|
echo_debug('user_form_ven.php',__LINE__," date $e_date = $day.$month.$year");
|
|
$p_ech=date('d.m.Y',mktime(0,0,0,$month,$day+$e_ech,$year));
|
|
echo_debug('user_form_ven.php',__LINE__,"p_ech = $e_ech $p_ech");
|
|
$e_ech=$p_ech;
|
|
$wHidden=new widget("hidden");
|
|
$data.=$wHidden->IOValue("e_ech",$e_ech);
|
|
}
|
|
|
|
// Check if the fiche is in the jrn
|
|
if (IsFicheOfJrn($p_cn , $p_jrn, $e_client,'deb') == 0 )
|
|
{
|
|
$msg="Client invalid please recheck";
|
|
echo_error($msg);
|
|
echo "<SCRIPT>alert('$msg');</SCRIPT>";
|
|
return null;
|
|
}
|
|
// Check if the card has a valid account
|
|
if ( CheckPoste($p_cn,$e_client) == null )
|
|
return null;
|
|
|
|
// check if all e_march are in fiche
|
|
for ($i=0;$i<$p_number;$i++) {
|
|
if ( trim(${"e_march$i"}) == "" ) {
|
|
// no goods to sell
|
|
continue;
|
|
}
|
|
|
|
|
|
// Check
|
|
if ( isFicheOfJrn($p_cn,$p_jrn,${"e_march$i"},'cred') == 0 ) {
|
|
$msg="Fiche inexistante !!! ";
|
|
echo_error(__FILE__.__LINE__.$msg);
|
|
echo "<SCRIPT>alert('$msg');</SCRIPT>";
|
|
return null;
|
|
}
|
|
// Check if the card has a valid account
|
|
if ( CheckPoste($p_cn,${"e_march$i"}) == null )
|
|
return null;
|
|
}
|
|
// Verify the userperiode
|
|
|
|
// p_periode 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 ('user_form_ven',__LINE__,"date start periode $l_date_start date fin periode $l_date_end date demande $e_date");
|
|
if ( cmpDate($e_date,$l_date_start)<0 ||
|
|
cmpDate($e_date,$l_date_end)>0 )
|
|
{
|
|
$msg="Not in the active periode please change your preference";
|
|
echo "<SCRIPT>alert('$msg');</SCRIPT>";
|
|
return null;
|
|
}
|
|
// Periode ferm�
|
|
$per=new Periode($p_cn);
|
|
$per->set_jrn($p_jrn);
|
|
$per->set_periode($p_periode);
|
|
|
|
// Periode ferme
|
|
if ( $per->is_open()==0)
|
|
{
|
|
$msg="Cette periode est fermee pour ce journal";
|
|
echo_error($msg); echo_error($msg);
|
|
echo "<SCRIPT>alert('$msg');</SCRIPT>";
|
|
return null;
|
|
}
|
|
return true;
|
|
}
|
|
/*! FormVenteView ($p_cn,$p_jrn,$p_periode,$p_array,$p_number,$p_doc='html',$p_comment='')
|
|
**************************************************
|
|
* \brief Show the invoice before inserting it
|
|
* the database.
|
|
*
|
|
*
|
|
* \param p_cn database connection
|
|
* \param p_jrn journal
|
|
* \param p_periode
|
|
* \param array of value
|
|
* \param nb of item
|
|
* \param p_doc type form for a form
|
|
* \return string
|
|
*
|
|
*/
|
|
|
|
function FormVenteView ($p_cn,$p_jrn,$p_periode,$p_array,$p_number,$p_doc='form',$p_comment='')
|
|
{
|
|
$own=new own($p_cn);
|
|
|
|
$r="";
|
|
$data="";
|
|
$head_ca="";
|
|
// Keep all the data if hidden
|
|
// and store the array in variables
|
|
$hidden=new widget("hidden");
|
|
foreach ($p_array as $name=>$content) {
|
|
// not the CA data
|
|
if ( strpos( $name,"ta_")===false &&
|
|
strpos( $name,"nb_t")===false &&
|
|
strpos( $name,"val")===false )
|
|
$data.=$hidden->IOValue($name,$content);
|
|
${"$name"}=$content;
|
|
}
|
|
// Compute href
|
|
// $href=basename($_SERVER['PHP_SELF']);
|
|
$href=basename($_SERVER['PHP_SELF']);
|
|
switch ($href)
|
|
{
|
|
// user_jrn.php
|
|
case 'user_jrn.php':
|
|
$href="user_jrn.php?action=record&p_jrn=$p_jrn";
|
|
break;
|
|
case 'commercial.php':
|
|
$href="commercial.php?p_action=facture&sa=record&p_jrn=$p_jrn";
|
|
break;
|
|
default:
|
|
echo_error('user_form_ven.php',__LINE__,'Erreur invalid request uri');
|
|
exit (-1);
|
|
}
|
|
//----------------------------------------------------------------------
|
|
|
|
$r.='<FORM METHOD="POST" enctype="multipart/form-data" ACTION="'.$href.'">';
|
|
$r.=dossier::hidden();
|
|
// start table
|
|
$r.='<TABLE>';
|
|
// Show the Date
|
|
$r.="<tr>";
|
|
$r.="<TD>Date : $e_date</TD>";
|
|
$r.="</tr>";
|
|
// Show the customer Name
|
|
$r.="<tr>";
|
|
$r.="<TD>Client : ".getFicheName($p_cn,$e_client)."</TD>";
|
|
$r.="</tr>";
|
|
|
|
// show date limit
|
|
$r.="<tr>";
|
|
$r.="<TD> Echeance : $e_ech </TD>";
|
|
$r.="</tr>";
|
|
// Show desc
|
|
$r.="<tr>";
|
|
$r.="<TD> Description : $e_comm</TD>";
|
|
$r.="</tr>";
|
|
|
|
$sum_with_vat=0.0;
|
|
$sum_march=0.0;
|
|
// show all article, price vat and sum
|
|
$r.="<TR>";
|
|
$r.="<TH>Article</TH>";
|
|
$r.="<TH>quantité</TH>";
|
|
$r.="<TH>prix unit.</TH>";
|
|
$r.="<TH>taux tva</TH>";
|
|
$r.="<TH>Montant HTVA</TH>";
|
|
$r.="<TH>Montant TVA</TH>";
|
|
$r.="<TH>Total</TH>";
|
|
$r.="</TR>";
|
|
for ($i=0;$i<$p_number;$i++) {
|
|
if ( trim(${"e_march$i"}) == "" ) {
|
|
// no goods to sell
|
|
continue;
|
|
}
|
|
|
|
// Get the name
|
|
$fiche_name=getFicheName($p_cn,${"e_march$i"});
|
|
|
|
// Quantity
|
|
$fiche_quant=${"e_quant$i"};
|
|
|
|
// No row if there is quantity
|
|
if ( $fiche_quant == 0.0 ) continue;
|
|
|
|
|
|
// If the price is not a number, retrieve the price from the database
|
|
if ( isNumber(${"e_march$i"."_sell"}) == 0 ) {
|
|
$fiche_price=getFicheAttribut($p_cn,${"e_march$i"},ATTR_DEF_PRIX_VENTE);
|
|
} else {
|
|
$fiche_price=${"e_march$i"."_sell"};
|
|
}
|
|
|
|
|
|
// VAT
|
|
$vat=(isNumber(${"e_march$i"."_tva_id"})==0)?getFicheAttribut($p_cn,${"e_march$i"},ATTR_DEF_TVA):${"e_march$i"."_tva_id"};
|
|
|
|
// vat label
|
|
// vat rate
|
|
$a_vat=GetTvaRate($p_cn,$vat);
|
|
if ( $a_vat == null ) {
|
|
$vat_label="";
|
|
$vat_rate=0.0;
|
|
} else {
|
|
$vat_label=$a_vat['tva_label'];
|
|
$vat_rate=$a_vat['tva_rate'];
|
|
}
|
|
$fiche_price=round($fiche_price,2);
|
|
// Total card without vat
|
|
$fiche_sum=$fiche_price*$fiche_quant;
|
|
$fiche_sum=round($fiche_sum,2);
|
|
|
|
// Sum of invoice
|
|
$sum_march+=$fiche_sum;
|
|
// vat of the card
|
|
$fiche_amount_vat=round($fiche_price*$fiche_quant*$vat_rate,2);
|
|
// value card + vat
|
|
$fiche_with_vat=$fiche_price*$fiche_quant+$fiche_amount_vat;
|
|
// store in array
|
|
if ( $vat_label != "") {
|
|
if ( ! isset($a_sum_tva_cat[$vat_label])) {
|
|
$a_sum_tva_cat[$vat_label]=0.0;
|
|
}
|
|
$a_sum_tva_cat[$vat_label]+=$fiche_amount_vat;
|
|
}
|
|
// Sum of invoice vat
|
|
$sum_with_vat+=$fiche_with_vat;
|
|
// Show the data
|
|
$r.='<TR>';
|
|
$r.='<TD>'.$fiche_name.'</TD>';
|
|
$r.='<TD ALIGN="CENTER">'.$fiche_quant.'</TD>';
|
|
$r.='<TD ALIGN="right">'.$fiche_price.'</TD>';
|
|
$r.="<TD ALIGN=\"RIGHT\"> $vat_label </TD>";
|
|
$r.='<TD ALIGN="RIGHT">'.round($fiche_sum,2).'</TD>';
|
|
$r.='<TD ALIGN="RIGHT">'.round($fiche_amount_vat,2).'</TD>';
|
|
|
|
$r.='<TD>'.round($fiche_with_vat,2).'</TD>';
|
|
|
|
// to show a select list for the analytic
|
|
// if analytic is op (optionnel) there is a blank line
|
|
$own = new Own($p_cn);
|
|
// encode the pa
|
|
if ( $own->MY_ANALYTIC!='nu') // use of AA
|
|
{
|
|
// show form
|
|
$op=new Anc_Operation($p_cn);
|
|
$null=($own->MY_ANALYTIC=='op')?1:0;
|
|
$r.='<td>';
|
|
$p_mode=($p_doc=="form")?1:0;
|
|
$r.=$op->display_form_plan($_POST,$null,$p_mode,$i,round($fiche_sum,2));
|
|
$r.='</td>';
|
|
}
|
|
|
|
$r.="</TR>";
|
|
}
|
|
|
|
// end table
|
|
$r.='</TABLE> ';
|
|
$total_vat=0.0;
|
|
$r.='<DIV style="padding:30px;font-size:14px">';
|
|
$r.="HTVA =".round( $sum_march,2)." <br>";
|
|
if ( isset($a_sum_tva_cat) && empty ($a_sum_tva_cat) != true) {
|
|
foreach ($a_sum_tva_cat as $tva_cat=>$tva_amount) {
|
|
$r.="Tva ".$tva_cat." =".$tva_amount."<br>";
|
|
$total_vat+=$tva_amount;
|
|
}
|
|
}
|
|
$r.="TVA =".$total_vat.'<br>';
|
|
$r.="TTC = ".round($sum_with_vat,2);
|
|
|
|
|
|
$r.="</DIV>";
|
|
if ( $p_doc == 'form' ) {
|
|
// Propose to save
|
|
$chk=new widget('checkbox');
|
|
$chk->selected=true;
|
|
$r.="Sauvez l'opération ?";
|
|
$r.=$chk->IOValue('opd_save');
|
|
|
|
|
|
// check for upload piece
|
|
$file=new widget("file");
|
|
$file->table=1;
|
|
$r.="<hr>";
|
|
$r.= "<table>";
|
|
$r.="<TR>".$file->IOValue("pj","","Pièce justificative")."</TR>";
|
|
$r.="</table>";
|
|
$r.="<hr>";
|
|
|
|
|
|
// if we were in the management module, appl. propose to generate an invoice
|
|
// if ( $_SERVER['PHP_SELF'] == '/commercial.php')
|
|
echo_debug('user_form_ven',__LINE__," _SERVER['PHP_SELF'] ".$_SERVER['PHP_SELF']);
|
|
if ( basename($_SERVER['PHP_SELF']) == 'commercial.php')
|
|
{
|
|
// if a template exists propose to choose an invoice template
|
|
if ( CountSql($p_cn,
|
|
"select md_id,md_name from document_modele where md_type=4") > 0 )
|
|
{
|
|
$r.='<fieldset> <legend> Génération de facture</legend>';
|
|
$obj=new widget('TEXT');
|
|
$r.='Numero de bon de commande : '.$obj->IOValue('bon_comm').'<br>';
|
|
$r.='Autre information : '.$obj->IOValue('other_info').'<br>';
|
|
|
|
$r.='Générer une facture <input type="checkbox" name="gen_invoice" CHECKED>';
|
|
// We propose to generate the invoice and some template
|
|
$doc_gen=new widget("select");
|
|
$doc_gen->name="gen_doc";
|
|
$doc_gen->value=make_array($p_cn,
|
|
"select md_id,md_name from document_modele where md_type=4");
|
|
$r.=$doc_gen->IOValue().'<br>';
|
|
$r.="</fieldset>";
|
|
}
|
|
}
|
|
|
|
|
|
$r.=$data;
|
|
if ( $sum_with_vat != 0 ) {
|
|
$r.='<INPUT TYPE="SUBMIT" name="record_and_print_invoice" value="Enregistrer" onClick="return verify_ca(\'error\');">';
|
|
if ( $own->MY_ANALYTIC != "nu" )
|
|
$r.='<input type="button" value="verifie CA" onClick="verify_ca(\'ok\');">';
|
|
}
|
|
$r.='<INPUT TYPE="SUBMIT" name="correct_new_invoice" value="Corriger">';
|
|
|
|
$r.='</FORM>';
|
|
}
|
|
return $r;
|
|
|
|
}
|
|
|
|
/*! RecordInvoice($p_cn,$p_array,$p_user,$p_jrn)
|
|
**************************************************
|
|
* \brief Record an invoice in the table jrn &
|
|
* jrnx
|
|
*
|
|
* \param $p_cn Database connection
|
|
* \param $p_array array contains all the invoice data
|
|
* - e_date => e : 01.01.2003
|
|
* - e_client => e : 3
|
|
* - nb_item => e : 3
|
|
* - e_march0 => e : 6
|
|
* - e_quant0 => e : 0
|
|
* - e_march0_sell=>e:1
|
|
* - e_march1 => e : 6
|
|
* - e_quant1 => e : 2
|
|
* - e_march1_sell=>e:1
|
|
* - e_march2 => e : 7
|
|
* - e_quant2 => e : 3
|
|
* - e_march2_sell=>e:1
|
|
* * V : view_invoice => e : Voir cette facture
|
|
* * V : record_invoice => e : Sauver
|
|
* \param $p_periode periode
|
|
* \param $p_jrn current folder (journal)
|
|
*
|
|
* \return array ( internal_code,true on success)
|
|
*/
|
|
function RecordInvoice($p_cn,$p_array,$p_user,$p_jrn)
|
|
{
|
|
echo_debug('RecordInvoice',0,"p_array = $p_array");
|
|
|
|
foreach ( $p_array as $v => $e)
|
|
{
|
|
${"$v"}=$e;
|
|
}
|
|
|
|
// Get the default period
|
|
$periode=$p_user->get_periode();
|
|
$amount=0.0;
|
|
$own=new own($p_cn);
|
|
$group=NextSequence($p_cn,"s_oa_group");
|
|
|
|
// Computing total customer
|
|
//--
|
|
for ($i=0;$i<$nb_item;$i++) {
|
|
// store quantity & goods in array
|
|
$a_good[$i]=${"e_march$i"};
|
|
$a_quant[$i]=${"e_quant$i"};
|
|
$a_price[$i]=0;
|
|
$a_vat[$i]=${"e_march$i"."_tva_id"};
|
|
// check whether the price is set or no
|
|
if ( isNumber(${"e_march$i"."_sell"}) == 0 ) {
|
|
if ( $a_good[$i] != "" ) {
|
|
// If the price is not set we have to find it from the database
|
|
$a_price[$i]=GetFicheAttribut($p_cn,$a_good[$i],ATTR_DEF_PRIX_VENTE);
|
|
}
|
|
} else {
|
|
// The price is valid
|
|
$a_price[$i]=${"e_march$i"."_sell"};
|
|
}
|
|
$a_price[$i]=round($a_price[$i],2);
|
|
$cost=$a_price[$i]*$a_quant[$i];
|
|
$amount+=$cost;
|
|
|
|
echo_debug('RecordInvoice',__LINE__,"cost = $cost amount = $amount ");
|
|
}// for
|
|
echo_debug(__FILE__,__LINE__,"Dossier is ".dossier::id());
|
|
|
|
$comm=FormatString($e_comm);
|
|
// Compute VAT
|
|
//--
|
|
$a_vat_new=ComputeTotalVat($p_cn,$a_good,$a_quant,$a_price,$a_vat);
|
|
$sum_vat=0.0;
|
|
echo_debug(__FILE__,__LINE__,"Dossier is ".dossier::id());
|
|
|
|
if ( $a_vat_new != null ){
|
|
foreach ( $a_vat_new as $element => $t) {
|
|
echo_debug('user_form_ven.php',__LINE__," a_vat element $element t $t");
|
|
$sum_vat+=$t;
|
|
echo_debug('user_form_ven.php',__LINE__,"sum_vat = $sum_vat");
|
|
}
|
|
}
|
|
// First we add in jrnx
|
|
|
|
// Compute the j_grpt
|
|
$seq=NextSequence($p_cn,'s_grpt');
|
|
$oJrn=new Acc_Ledger($p_cn,$p_jrn);
|
|
$internal=$oJrn->compute_internal_code($seq);
|
|
|
|
echo_debug(__FILE__,__LINE__,"Dossier is ".dossier::id());
|
|
// Debit = client
|
|
$poste=GetFicheAttribut($p_cn,$e_client,ATTR_DEF_ACCOUNT);
|
|
echo_debug(__FILE__,__LINE__,"Dossier is ".dossier::id());
|
|
try
|
|
{
|
|
StartSql($p_cn);
|
|
$r=InsertJrnx($p_cn,'d',$p_user->id,$p_jrn,$poste,$e_date,round($amount,2)+round($sum_vat,2),$seq,$periode,$e_client);
|
|
|
|
|
|
// Credit = goods
|
|
for ( $i = 0; $i < $nb_item;$i++) {
|
|
if ( $a_good[$i] == "" ) continue;
|
|
$poste=GetFicheAttribut($p_cn,$a_good[$i],ATTR_DEF_ACCOUNT);
|
|
|
|
// don't record operation of 0
|
|
if ( $a_price[$i]*$a_quant[$i] == 0 ) continue;
|
|
|
|
// record into jrnx
|
|
$j_id=InsertJrnx($p_cn,'c',$p_user->id,$p_jrn,$poste,$e_date,round($a_price[$i]*$a_quant[$i],2),$seq,$periode,$a_good[$i]);
|
|
|
|
/* \brief if the quantity is < 0 then the stock increase (return of
|
|
* material)
|
|
*/
|
|
$nNeg=($a_quant[$i]<0)?-1:1;
|
|
|
|
// always save quantity but in withStock we can find
|
|
// what card need a stock management
|
|
|
|
InsertStockGoods($p_cn,$j_id,$a_good[$i],$nNeg*$a_quant[$i],'c') ;
|
|
if ( $own->MY_ANALYTIC != "nu" )
|
|
{
|
|
// for each item, insert into operation_analytique */
|
|
$op=new Anc_Operation($p_cn);
|
|
$op->oa_group=$group;
|
|
$op->j_id=$j_id;
|
|
$op->oa_date=$e_date;
|
|
$op->oa_debit=($op->oa_amount < 0 )?'t':'f';
|
|
echo_debug(__FILE__.':'.__LINE__,"Description is $e_comm");
|
|
$op->oa_description=FormatString($e_comm);
|
|
$op->save_form_plan($_POST,$i);
|
|
}
|
|
$computed_vat=ComputeVat($p_cn,$a_good[$i],$a_quant[$i],$a_price[$i],$a_vat[$i]);
|
|
$qs_vat=($a_vat[$i]==-1)?0:$computed_vat;
|
|
$r=ExecSql($p_cn,"select insert_quant_sold ".
|
|
"('".$internal."',".$j_id.",'".$a_good[$i]
|
|
."',".$a_quant[$i].",".$a_price[$i]*$a_quant[$i].
|
|
",".$qs_vat.
|
|
",".$a_vat[$i].",'".$e_client."')");
|
|
|
|
|
|
} // end loop
|
|
|
|
// Insert Vat
|
|
|
|
if ( $a_vat_new != null ) // no vat
|
|
|
|
{
|
|
foreach ($a_vat_new as $tva_id => $tva_amount ) {
|
|
$poste=GetTvaPoste($p_cn,$tva_id,'c');
|
|
// if ($tva_amount == 0 ) continue;
|
|
$r=InsertJrnx($p_cn,'c',$p_user->id,$p_jrn,$poste,$e_date,round($tva_amount,2),$seq,$periode);
|
|
}
|
|
}
|
|
echo_debug('user_form_ven.php',__LINE__,"echeance = $e_ech");
|
|
$r=InsertJrn($p_cn,$e_date,$e_ech,$p_jrn,"Invoice",$seq,$periode);
|
|
|
|
// Set Internal code and Comment
|
|
$Res=ExecSql($p_cn,"update jrn set jr_internal='".$internal."' where ".
|
|
" jr_grpt_id = ".$seq);
|
|
|
|
$comment=(FormatString($e_comm) == null )?$internal." client : ".GetFicheName($p_cn,$e_client):FormatString($e_comm);
|
|
|
|
// Update and set the invoice's comment
|
|
$Res=ExecSql($p_cn,"update jrn set jr_comment='".$comment."' where jr_grpt_id=".$seq);
|
|
|
|
if ( isset ($_FILES)) {
|
|
if ( sizeof($_FILES) != 0 )
|
|
save_upload_document($p_cn,$seq);
|
|
}
|
|
|
|
// save the quantity, then we can make an invoice
|
|
for ( $i=0;$i < $nb_item;$i++)
|
|
{
|
|
// don't record operation of 0
|
|
if ( $a_price[$i]*$a_quant[$i] == 0 ) continue;
|
|
|
|
// insert into the table quant_sold
|
|
// Note that negative value are also saved but not the vat !
|
|
if ( $a_vat[$i] == -1) {
|
|
$computed_vat=0;
|
|
$vat_code="null";
|
|
} else {
|
|
$computed_vat=ComputeVat($p_cn,$a_good[$i],$a_quant[$i],$a_price[$i],$a_vat[$i]);
|
|
$vat_code=$a_vat[$i];
|
|
}
|
|
}
|
|
// Save the operation
|
|
if ( isset($_POST['opd_save']) && $_POST['opd_save']=='on' ){
|
|
echo_debug(__FILE__.':'.__LINE__.'- ','save opd');
|
|
$opd=new Pre_op_ven($p_cn);
|
|
$opd->get_post();
|
|
$opd->save();
|
|
echo_debug(__FILE__.':'.__LINE__.'- ',"opd = ",$opd);
|
|
}
|
|
}//try
|
|
catch (Exception $e)
|
|
{
|
|
echo '<span class="error">'.
|
|
'Erreur dans l\'enregistrement '.
|
|
__FILE__.':'.__LINE__.' '.
|
|
$e->getMessage();
|
|
Rollback($p_cn);
|
|
exit();
|
|
}
|
|
Commit($p_cn);
|
|
return array($internal,$comment);
|
|
}
|
|
|
|
?>
|