From 615c63fbc4aea4d0e136e868993e71190aacadd2 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Mon, 22 May 2017 14:46:45 +0200 Subject: [PATCH] Release 2.4.1 --- CHANGELOG.txt | 243 +++++++++++++++++++++++++++++++++++ sql/en_US-demo.sql | 309 ++++++++++++++++++++++----------------------- sql/en_US-new.sql | 4 +- version.php | 2 +- 4 files changed, 400 insertions(+), 158 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index fbfeea3e..8595a276 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,246 @@ +2017-05-19 21:55:10 +0200 Joe Hunt +Sales type bug in tax_included (persistent on) +M sales/manage/sales_types.php + +2017-05-19 14:04:16 +0200 Joe Hunt +Dedeted doc/CHANGELOG.old.txt. Not neede any more. +D doc/CHANGELOG.old.txt + +2017-05-19 12:28:20 +0200 Joe Hunt +Merge branch 'unstable' of ssh://git.code.sf.net/p/frontaccounting/git into unstable +2017-05-19 12:27:41 +0200 Joe Hunt +0003761: Reorder email is not sent for items used work order. Fixed. +M manufacturing/includes/db/work_order_costing_db.inc + +2017-05-18 22:02:12 +0200 Janusz Dobrowolski +[0003780] Sales Invoice to partial delivery was improperly issued as final prepayment invoice. +M sales/customer_invoice.php +M sales/includes/cart_class.inc +M sales/includes/db/sales_invoice_db.inc +M sales/includes/ui/sales_order_ui.inc +M sales/sales_order_entry.php + +2017-05-17 23:47:26 +0200 Joe Hunt +0003871: [Fixed Assets] new patch fix for: 0003866, 0003869 +M fixed_assets/includes/fixed_assets_db.inc +M fixed_assets/inquiry/stock_inquiry.php +M includes/db_pager.inc +M includes/ui/db_pager_view.inc +M reporting/rep451.php + +2017-05-15 16:22:21 +0200 Joe Hunt +0003789: Comments is cut off when actual invoice is printed. Maximized to 130 characters. +M reporting/includes/reports_classes.inc + +2017-05-15 15:08:39 +0200 Joe Hunt +Rerun. 0003864: [Fixed Assets] GL Transactions for Fixed Asset Sales are wrong (patch provided) +M sales/includes/db/sales_delivery_db.inc + +2017-05-15 08:48:53 +0200 Joe Hunt +Improvements to dashboard. +M includes/dashboard.inc + +2017-05-15 08:25:39 +0200 Joe Hunt +0003862: Straight Line Depreciation value calculation is wrong 0003863: Fixed Assets Valuation Report Includes inactive Items with Valuation 0003864: [Fixed Assets] GL Transactions for Fixed Asset Sales are wrong (patch provided) +M fixed_assets/includes/depreciation.inc +M includes/db/inventory_db.inc +M sales/includes/db/sales_delivery_db.inc + +2017-05-14 21:21:33 +0200 Joe Hunt +Optimized Inventory Valuation Reports, 301 and 308. +M reporting/rep301.php +M reporting/rep308.php + +2017-05-12 18:02:36 +0200 Joe Hunt +Added a small Arabic font file and improved the builtin DashBoard. +M config.default.php +M includes/dashboard.inc +A reporting/fonts/zarnormal.ttf +M reporting/includes/class.graphic.inc + +2017-05-11 13:40:13 +0200 Joe Hunt +Merge branch 'unstable' of ssh://git.code.sf.net/p/frontaccounting/git into unstable +2017-05-11 13:39:42 +0200 Joe Hunt +Customer/Supplier Balances Report | Allocated column not showing correctly. Fixed. +M reporting/rep101.php +M reporting/rep201.php + +2017-05-02 21:59:12 +0200 Janusz Dobrowolski +[0003795] Fixed incorrect GL postings for cash purchase invoices. +M purchasing/includes/db/supp_payment_db.inc + +2017-05-02 08:38:21 +0200 Joe Hunt +0003816: Customer Credit Note (stand alone) does not restore inventory +M sales/includes/db/sales_credit_db.inc + +2017-03-19 15:26:09 +0100 Janusz Dobrowolski +Additional fix to previous commit. +M reporting/prn_redirect.php + +2017-03-19 14:41:39 +0100 ApMuthu +Fixed problems with excel report generation. +M includes/main.inc +M reporting/prn_redirect.php + +2017-03-19 14:39:50 +0100 Janusz Dobrowolski +Additional fix to unique filenames. +M includes/dashboard.inc + +2017-03-18 15:56:19 +0100 Janusz Dobrowolski +Improved entropy for report file urls. +M admin/attachments.php +M includes/main.inc +M includes/ui/ui_controls.inc +M reporting/includes/excel_report.inc +M reporting/includes/pdf_report.inc +M reporting/rep102.php +M reporting/rep202.php +M reporting/rep706.php +M reporting/rep707.php + +2017-01-17 11:47:56 +0100 Janusz Dobrowolski +Fixed buggy prefix in sql query in 2.1 upgrade class. +M sql/alter2.1.php + +2017-01-18 15:59:57 +0100 Joe Hunt +Fixed an array_combine object issue. +M includes/main.inc +M includes/ui/ui_lists.inc + +2017-01-15 19:22:16 +0100 Janusz Dobrowolski +[0003733] Fixed php7 compatibility issue. +M frontaccounting.php + +2017-01-15 18:28:20 +0100 Janusz Dobrowolski +[0003658] Errors during reference line edition when no table prefix is used. +M includes/db/class.reflines_db.inc + +2016-12-23 08:57:23 +0100 Joe Hunt +Bug submitting forms in FA 2.4.x when checkbox field not changed. Fixed +M includes/ui/ui_input.inc + +2016-12-03 23:15:02 +0100 Joe Hunt +Rerun Items Summary Report +M reporting/rep309.php + +2016-11-29 16:20:32 +0100 Joe Hunt +Fixed A Bug in Item Sales Summary Report +M reporting/rep309.php + +2016-11-18 14:30:47 +0100 Joe Hunt +Merge branch 'unstable' of ssh://git.code.sf.net/p/frontaccounting/git into unstable +2016-11-18 14:30:11 +0100 Joe Hunt +0003667: supplier payment link after entering supplier invoice resultes in erro. Fixed. +M purchasing/supplier_invoice.php + +2016-09-06 12:34:03 +0200 Janusz Dobrowolski +Fixed problem with installing third party extension packages. +M includes/packages.inc + +2016-09-06 08:55:51 +0200 Joe Hunt +Increased space for built in number columns etc. in reports. +M reporting/rep101.php +M reporting/rep201.php +M reporting/rep203.php +M reporting/rep601.php +M reporting/rep602.php +M reporting/rep701.php +M reporting/rep706.php +M reporting/rep707.php + +2016-01-30 21:50:20 +0700 Cambell +Added functions for custom css files registered by modules +M includes/main.inc +M includes/page/header.inc + +2016-02-06 11:32:32 +0700 Cambell +Supplier Payment: by default bank account is selected to be the same as that used on the last payment for the supplier (if any, or default currency account otherwise). +M purchasing/includes/db/supp_trans_db.inc +M purchasing/supplier_payment.php + +2016-08-05 15:55:19 +0700 Cambell +Ajax calls: set the checkbox value = 0 for an unset checkbox rather than skipping the element. +M js/utils.js + +2016-08-06 10:43:40 +0200 Janusz Dobrowolski +Fixed broken html enities handling in longer TextWrap fields in reports. +M reporting/includes/class.pdf.inc + +2016-08-06 10:36:43 +0200 Joe Hunt +One comma too much in line 312 /purchasing/manage/suppliers.php. Fixed. +M purchasing/manage/suppliers.php + +2016-07-31 23:47:24 +0200 Joe Hunt +Removed redundant line in reporting/includes/header2.inc. +M reporting/includes/header2.inc + +2016-07-26 09:13:39 +0200 Joe Hunt +Rerun. Dimension is missing in Supplier Invoice View. GL Rows. Apmuthu. +M purchasing/includes/db/invoice_db.inc + +2016-07-26 08:11:54 +0200 Joe Hunt +Dimension is missing in Supplier Invoice View GL Rows. Fixed a parameter bug in add_supp_invoice_gl_item. +M purchasing/includes/db/invoice_db.inc +M purchasing/includes/db/invoice_items_db.inc + +2016-07-24 14:54:28 +0200 Joe Hunt +Minor bug in deleting fiscal years. Apmuthu. +M admin/db/fiscalyears_db.inc + +2016-07-15 10:55:11 +0200 Joe Hunt +Bug 3585. 'Exclude from purchase' function not working in PO. +M purchasing/includes/ui/po_ui.inc + +2016-07-08 08:49:19 +0200 Joe Hunt +Bug. is_date_closed() should be performed before is_date_in_fiscalyears(). +M admin/void_transaction.php +M includes/date_functions.inc + +2016-05-27 12:10:57 +0200 Joe Hunt +Rerun. Tabbed dialogs allowed non access pages. +M purchasing/manage/suppliers.php +M sales/manage/customers.php + +2016-05-27 11:19:00 +0200 Janusz Dobrowolski +Fixed security check for last tab in tabbed_content. +M inventory/manage/items.php +M js/inserts.js + +2016-05-27 09:11:57 +0200 Joe Hunt +Tabbed dialogs allowed non access pages. +M inventory/manage/items.php +M purchasing/manage/suppliers.php +M sales/manage/customers.php + +2016-05-22 22:29:20 +0200 Joe Hunt +Bloomberg Rate has changed their wrapper from span to div. +M gl/includes/db/gl_db_rates.inc + +2016-05-19 22:48:45 +0200 Janusz Dobrowolski +Fixed typo in last commit. +M gl/manage/bank_accounts.php + +2016-05-19 22:37:03 +0200 Janusz Dobrowolski +Fixed bug in bank account edition. +M gl/manage/bank_accounts.php + +2016-05-17 19:05:28 +0200 Janusz Dobrowolski +Fixed typos in installer translation files, fixed translations in dashboard procedures. +M includes/dashboard.inc +M install/lang/de_DE/LC_MESSAGES/de_DE.mo +M install/lang/de_DE/LC_MESSAGES/de_DE.po +M install/lang/pt_PT/LC_MESSAGES/pt_PT.mo +M install/lang/pt_PT/LC_MESSAGES/pt_PT.po +M lang/new_language_template/LC_MESSAGES/empty.po + +2016-02-25 13:25:42 +0100 Janusz Dobrowolski +Constant string after last placeholder in reference line definition was ignored. +M includes/references.inc + +2016-02-23 20:08:46 +0100 Joe Hunt +New CHANGELOG.txt file +M CHANGELOG.txt + 2016-02-22 15:33:49 +0100 Janusz Dobrowolski Fixed missing changes in upgrade sql files. M sql/alter2.4.sql diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql index ceaab195..439138c8 100644 --- a/sql/en_US-demo.sql +++ b/sql/en_US-demo.sql @@ -5,7 +5,7 @@ -- Company: Training Co -- User: Administrator --- Compatibility: 2.4.Beta +-- Compatibility: 2.4.1 -- -- Database: `fatraining` @@ -86,34 +86,34 @@ CREATE TABLE IF NOT EXISTS `0_audit_trail` ( -- INSERT INTO `0_audit_trail` VALUES -('1', '18', '1', '1', '2015-05-05 14:08:02', NULL, '1', '2015-05-05', '0'), -('2', '25', '1', '1', '2015-05-05 14:08:14', NULL, '1', '2015-05-05', '0'), -('3', '30', '1', '1', '2015-05-05 14:09:54', NULL, '1', '2015-05-10', '0'), -('4', '13', '1', '1', '2015-05-05 14:09:55', NULL, '1', '2015-05-10', '0'), -('5', '10', '1', '1', '2015-05-05 14:09:55', NULL, '1', '2015-05-10', '0'), -('6', '12', '1', '1', '2015-05-05 14:09:55', NULL, '1', '2015-05-10', '0'), -('7', '26', '1', '1', '2015-05-05 14:18:49', 'Quick production.', '1', '2015-05-05', '0'), -('8', '18', '2', '1', '2015-05-05 14:22:32', NULL, '1', '2015-05-05', '0'), -('9', '25', '2', '1', '2015-05-05 14:22:32', NULL, '1', '2015-05-05', '0'), -('10', '20', '1', '1', '2015-05-05 14:22:32', NULL, '1', '2015-05-05', '0'), -('11', '30', '2', '1', '2015-05-07 07:55:15', NULL, '1', '2015-05-07', '0'), -('12', '13', '2', '1', '2015-05-07 07:55:16', NULL, '1', '2015-05-07', '0'), -('13', '10', '2', '1', '2015-05-07 07:55:16', NULL, '1', '2015-05-07', '0'), -('14', '12', '2', '1', '2015-05-07 07:55:16', NULL, '1', '2015-05-07', '0'), -('15', '30', '3', '1', '2015-05-07 08:08:24', NULL, '1', '2015-05-07', '0'), -('16', '30', '4', '1', '2015-05-07 09:18:44', NULL, '1', '2015-05-07', '0'), -('17', '30', '5', '1', '2015-05-07 11:42:41', NULL, '1', '2015-05-07', '0'), -('18', '13', '3', '1', '2015-05-07 11:42:41', NULL, '1', '2015-05-07', '0'), -('19', '10', '3', '1', '2015-05-07 11:42:41', NULL, '1', '2015-05-07', '0'), -('20', '30', '6', '1', '2015-05-07 14:02:35', NULL, '1', '2015-05-07', '0'), -('21', '30', '7', '1', '2015-05-07 14:05:38', NULL, '1', '2015-05-07', '0'), -('22', '13', '4', '1', '2015-05-07 14:05:38', NULL, '1', '2015-05-07', '0'), -('23', '10', '4', '1', '2015-05-07 14:05:38', NULL, '1', '2015-05-07', '0'), -('24', '12', '3', '1', '2015-05-07 14:05:38', NULL, '1', '2015-05-07', '0'), -('25', '26', '2', '1', '2015-05-07 15:59:34', NULL, '1', '2015-05-07', NULL), -('26', '26', '3', '1', '2015-05-07 15:59:01', NULL, '1', '2015-05-07', '0'), -('27', '26', '2', '1', '2015-05-07 15:59:34', 'Released.', '1', '2015-05-07', '0'), -('28', '1', '1', '1', '2015-05-07 16:01:00', NULL, '1', '2015-05-07', '0'); +('1', '18', '1', '1', '2016-05-05 14:08:02', NULL, '1', '2016-05-05', '0'), +('2', '25', '1', '1', '2016-05-05 14:08:14', NULL, '1', '2016-05-05', '0'), +('3', '30', '1', '1', '2016-05-05 14:09:54', NULL, '1', '2016-05-10', '0'), +('4', '13', '1', '1', '2016-05-05 14:09:55', NULL, '1', '2016-05-10', '0'), +('5', '10', '1', '1', '2016-05-05 14:09:55', NULL, '1', '2016-05-10', '0'), +('6', '12', '1', '1', '2016-05-05 14:09:55', NULL, '1', '2016-05-10', '0'), +('7', '26', '1', '1', '2016-05-05 14:18:49', 'Quick production.', '1', '2016-05-05', '0'), +('8', '18', '2', '1', '2016-05-05 14:22:32', NULL, '1', '2016-05-05', '0'), +('9', '25', '2', '1', '2016-05-05 14:22:32', NULL, '1', '2016-05-05', '0'), +('10', '20', '1', '1', '2016-05-05 14:22:32', NULL, '1', '2016-05-05', '0'), +('11', '30', '2', '1', '2016-05-07 07:55:15', NULL, '1', '2016-05-07', '0'), +('12', '13', '2', '1', '2016-05-07 07:55:16', NULL, '1', '2016-05-07', '0'), +('13', '10', '2', '1', '2016-05-07 07:55:16', NULL, '1', '2016-05-07', '0'), +('14', '12', '2', '1', '2016-05-07 07:55:16', NULL, '1', '2016-05-07', '0'), +('15', '30', '3', '1', '2016-05-07 08:08:24', NULL, '1', '2016-05-07', '0'), +('16', '30', '4', '1', '2016-05-07 09:18:44', NULL, '1', '2016-05-07', '0'), +('17', '30', '5', '1', '2016-05-07 11:42:41', NULL, '1', '2016-05-07', '0'), +('18', '13', '3', '1', '2016-05-07 11:42:41', NULL, '1', '2016-05-07', '0'), +('19', '10', '3', '1', '2016-05-07 11:42:41', NULL, '1', '2016-05-07', '0'), +('20', '30', '6', '1', '2016-05-07 14:02:35', NULL, '1', '2016-05-07', '0'), +('21', '30', '7', '1', '2016-05-07 14:05:38', NULL, '1', '2016-05-07', '0'), +('22', '13', '4', '1', '2016-05-07 14:05:38', NULL, '1', '2016-05-07', '0'), +('23', '10', '4', '1', '2016-05-07 14:05:38', NULL, '1', '2016-05-07', '0'), +('24', '12', '3', '1', '2016-05-07 14:05:38', NULL, '1', '2016-05-07', '0'), +('25', '26', '2', '1', '2016-05-07 15:59:34', NULL, '1', '2016-05-07', NULL), +('26', '26', '3', '1', '2016-05-07 15:59:01', NULL, '1', '2016-05-07', '0'), +('27', '26', '2', '1', '2016-05-07 15:59:34', 'Released.', '1', '2016-05-07', '0'), +('28', '1', '1', '1', '2016-05-07 16:01:00', NULL, '1', '2016-05-07', '0'); -- -------------------------------------------------------- @@ -181,10 +181,10 @@ CREATE TABLE IF NOT EXISTS `0_bank_trans` ( -- INSERT INTO `0_bank_trans` VALUES -('1', '12', '1', '2', '001/2015', '2015-05-10', '6240', '0', '0', '2', '1', NULL), -('2', '12', '2', '2', '002/2015', '2015-05-07', '300', '0', '0', '2', '1', NULL), -('3', '12', '3', '2', '003/2015', '2015-05-07', '0', '0', '0', '2', '1', NULL), -('4', '1', '1', '1', '001/2015', '2015-05-07', '-5', '0', '0', '0', 'Goods received', NULL); +('1', '12', '1', '2', '001/2016', '2016-05-10', '6240', '0', '0', '2', '1', NULL), +('2', '12', '2', '2', '002/2016', '2016-05-07', '300', '0', '0', '2', '1', NULL), +('3', '12', '3', '2', '003/2016', '2016-05-07', '0', '0', '0', '2', '1', NULL), +('4', '1', '1', '1', '001/2016', '2016-05-07', '-5', '0', '0', '0', 'Goods received', NULL); -- -------------------------------------------------------- @@ -421,11 +421,11 @@ CREATE TABLE IF NOT EXISTS `0_comments` ( -- INSERT INTO `0_comments` VALUES -('12', '1', '2015-05-10', 'Cash invoice 1'), -('12', '2', '2015-05-07', 'Cash invoice 2'), -('13', '4', '2015-05-07', 'Recurrent Invoice covers period 04/01/2015 - 04/07/2015.'), -('10', '4', '2015-05-07', 'Recurrent Invoice covers period 04/01/2015 - 04/07/2015.'), -('12', '3', '2015-05-07', 'Cash invoice 4'); +('12', '1', '2016-05-10', 'Cash invoice 1'), +('12', '2', '2016-05-07', 'Cash invoice 2'), +('13', '4', '2016-05-07', 'Recurrent Invoice covers period 04/01/2016 - 04/07/2016.'), +('10', '4', '2016-05-07', 'Recurrent Invoice covers period 04/01/2016 - 04/07/2016.'), +('12', '3', '2016-05-07', 'Cash invoice 4'); -- -------------------------------------------------------- @@ -605,9 +605,9 @@ CREATE TABLE IF NOT EXISTS `0_cust_allocations` ( -- INSERT INTO `0_cust_allocations` VALUES -('1', '1', '6240', '2015-05-10', '1', '12', '1', '10'), -('2', '1', '300', '2015-05-07', '2', '12', '2', '10'), -('3', '1', '0', '2015-05-07', '3', '12', '4', '10'); +('1', '1', '6240', '2016-05-10', '1', '12', '1', '10'), +('2', '1', '300', '2016-05-07', '2', '12', '2', '10'), +('3', '1', '0', '2016-05-07', '3', '12', '4', '10'); -- -------------------------------------------------------- @@ -730,17 +730,17 @@ CREATE TABLE IF NOT EXISTS `0_debtor_trans` ( INSERT INTO `0_debtor_trans` VALUES -('1', '10', '0', '1', '1', '2015-05-10', '2015-05-05', '001/2015', '1', '1', '6240', '0', '0', '0', '0', '6240', '0', '1', '1', '0', '0', '4', '1'), -('2', '10', '0', '1', '1', '2015-05-07', '2015-05-07', '002/2015', '1', '2', '300', '0', '0', '0', '0', '300', '0', '1', '1', '0', '0', '4', '1'), -('3', '10', '0', '2', '2', '2015-05-07', '2015-06-17', '003/2015', '1', '5', '267.14', '0', '0', '0', '0', '0', '0', '1.123', '1', '1', '0', '1', '1'), -('4', '10', '0', '1', '1', '2015-05-07', '2015-05-07', '004/2015', '1', '7', '0', '0', '0', '0', '0', '0', '0', '1', '1', '0', '0', '4', '1'), -('1', '12', '0', '1', '1', '2015-05-10', '0000-00-00', '001/2015', '0', '0', '6240', '0', '0', '0', '0', '6240', '0', '1', '0', '0', '0', NULL, '0'), -('2', '12', '0', '1', '1', '2015-05-07', '0000-00-00', '002/2015', '0', '0', '300', '0', '0', '0', '0', '300', '0', '1', '0', '0', '0', NULL, '0'), -('3', '12', '0', '1', '1', '2015-05-07', '0000-00-00', '003/2015', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', NULL, '0'), -('1', '13', '1', '1', '1', '2015-05-10', '2015-05-05', 'auto', '1', '1', '6240', '0', '0', '0', '0', '0', '0', '1', '1', '0', '0', '4', '1'), -('2', '13', '1', '1', '1', '2015-05-07', '2015-05-07', 'auto', '1', '2', '300', '0', '0', '0', '0', '0', '0', '1', '1', '0', '0', '4', '1'), -('3', '13', '1', '2', '2', '2015-05-07', '2015-06-17', 'auto', '1', '5', '267.14', '0', '0', '0', '0', '0', '0', '1.123', '1', '1', '0', '1', '1'), -('4', '13', '1', '1', '1', '2015-05-07', '2015-05-07', 'auto', '1', '7', '0', '0', '0', '0', '0', '0', '0', '1', '1', '0', '0', '4', '1'); +('1', '10', '0', '1', '1', '2016-05-10', '2016-05-05', '001/2016', '1', '1', '6240', '0', '0', '0', '0', '6240', '0', '1', '1', '0', '0', '4', '1'), +('2', '10', '0', '1', '1', '2016-05-07', '2016-05-07', '002/2016', '1', '2', '300', '0', '0', '0', '0', '300', '0', '1', '1', '0', '0', '4', '1'), +('3', '10', '0', '2', '2', '2016-05-07', '2016-06-17', '003/2016', '1', '5', '267.14', '0', '0', '0', '0', '0', '0', '1.123', '1', '1', '0', '1', '1'), +('4', '10', '0', '1', '1', '2016-05-07', '2016-05-07', '004/2016', '1', '7', '0', '0', '0', '0', '0', '0', '0', '1', '1', '0', '0', '4', '1'), +('1', '12', '0', '1', '1', '2016-05-10', '0000-00-00', '001/2016', '0', '0', '6240', '0', '0', '0', '0', '6240', '0', '1', '0', '0', '0', NULL, '0'), +('2', '12', '0', '1', '1', '2016-05-07', '0000-00-00', '002/2016', '0', '0', '300', '0', '0', '0', '0', '300', '0', '1', '0', '0', '0', NULL, '0'), +('3', '12', '0', '1', '1', '2016-05-07', '0000-00-00', '003/2016', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', NULL, '0'), +('1', '13', '1', '1', '1', '2016-05-10', '2016-05-05', 'auto', '1', '1', '6240', '0', '0', '0', '0', '0', '0', '1', '1', '0', '0', '4', '1'), +('2', '13', '1', '1', '1', '2016-05-07', '2016-05-07', 'auto', '1', '2', '300', '0', '0', '0', '0', '0', '0', '1', '1', '0', '0', '4', '1'), +('3', '13', '1', '2', '2', '2016-05-07', '2016-06-17', 'auto', '1', '5', '267.14', '0', '0', '0', '0', '0', '0', '1.123', '1', '1', '0', '1', '1'), +('4', '13', '1', '1', '1', '2016-05-07', '2016-05-07', 'auto', '1', '7', '0', '0', '0', '0', '0', '0', '0', '1', '1', '0', '0', '4', '1'); -- -------------------------------------------------------- @@ -811,7 +811,7 @@ CREATE TABLE IF NOT EXISTS `0_dimensions` ( -- Dumping data for table `0_dimensions` -- -INSERT INTO `0_dimensions` VALUES ('1', '001/2015', 'Cost Centre', '1', '0', '2015-05-05', '2015-05-25'); +INSERT INTO `0_dimensions` VALUES ('1', '001/2016', 'Cost Centre', '1', '0', '2016-05-05', '2016-05-25'); -- -------------------------------------------------------- @@ -834,7 +834,7 @@ CREATE TABLE IF NOT EXISTS `0_exchange_rates` ( -- Dumping data for table `0_exchange_rates` -- -INSERT INTO `0_exchange_rates` VALUES ('1', 'EUR', '1.123', '1.123', '2015-05-07'); +INSERT INTO `0_exchange_rates` VALUES ('1', 'EUR', '1.123', '1.123', '2016-05-07'); -- -------------------------------------------------------- @@ -857,8 +857,7 @@ CREATE TABLE IF NOT EXISTS `0_fiscal_year` ( -- Dumping data for table `0_fiscal_year` -- -INSERT INTO `0_fiscal_year` VALUES (1, '2015-01-01', '2015-12-31', 0); -INSERT INTO `0_fiscal_year` VALUES (2, '2016-01-01', '2016-12-31', 0); +INSERT INTO `0_fiscal_year` VALUES (1, '2016-01-01', '2016-12-31', 0); -- -------------------------------------------------------- @@ -892,44 +891,44 @@ CREATE TABLE IF NOT EXISTS `0_gl_trans` ( -- INSERT INTO `0_gl_trans` VALUES -('1', '25', '1', '2015-05-05', '1510', '101', '20000', '0', '0', NULL, NULL), -('2', '25', '1', '2015-05-05', '1510', '102', '15000', '0', '0', NULL, NULL), -('3', '25', '1', '2015-05-05', '1510', '103', '1000', '0', '0', NULL, NULL), -('4', '25', '1', '2015-05-05', '1550', '', '-36000', '0', '0', NULL, NULL), -('5', '13', '1', '2015-05-10', '5010', '', '4000', '0', '0', NULL, NULL), -('6', '13', '1', '2015-05-10', '1510', '', '-4000', '0', '0', NULL, NULL), -('7', '10', '1', '2015-05-10', '4010', '', '-5714.29', '0', '0', NULL, NULL), -('8', '10', '1', '2015-05-10', '4010', '', '-228.57', '0', '0', NULL, NULL), -('9', '10', '1', '2015-05-10', '1200', '', '6240', '0', '0', '2', '1'), -('10', '10', '1', '2015-05-10', '2150', '', '-297.14', '0', '0', NULL, NULL), -('11', '12', '1', '2015-05-10', '1065', '', '6240', '0', '0', NULL, NULL), -('12', '12', '1', '2015-05-10', '1200', '', '-6240', '0', '0', '2', '1'), -('13', '26', '1', '2015-05-05', '1510', '1 * iPad Air 2 16GB', '-400', '0', '0', NULL, NULL), -('14', '26', '1', '2015-05-05', '1510', '1 * iPhone 6 64GB', '-300', '0', '0', NULL, NULL), -('15', '26', '1', '2015-05-05', '1510', '1 * iPhone Cover Case', '-20', '0', '0', NULL, NULL), -('16', '26', '1', '2015-05-05', '1510', 'Produced 2 * AP Surf Set', '720', '0', '0', NULL, NULL), -('17', '25', '2', '2015-05-05', '1510', '101', '3000', '0', '0', NULL, NULL), -('18', '25', '2', '2015-05-05', '1550', '', '-3000', '0', '0', NULL, NULL), -('19', '20', '1', '2015-05-05', '2150', '', '150', '0', '0', NULL, NULL), -('20', '20', '1', '2015-05-05', '2100', '', '-3150', '0', '0', '3', '1'), -('21', '20', '1', '2015-05-05', '1550', '', '3000', '0', '0', NULL, NULL), -('22', '13', '2', '2015-05-07', '5010', '', '200', '0', '0', NULL, NULL), -('23', '13', '2', '2015-05-07', '1510', '', '-200', '0', '0', NULL, NULL), -('24', '10', '2', '2015-05-07', '4010', '', '-285.71', '0', '0', NULL, NULL), -('25', '10', '2', '2015-05-07', '1200', '', '300', '0', '0', '2', '1'), -('26', '10', '2', '2015-05-07', '2150', '', '-14.29', '0', '0', NULL, NULL), -('27', '12', '2', '2015-05-07', '1065', '', '300', '0', '0', NULL, NULL), -('28', '12', '2', '2015-05-07', '1200', '', '-300', '0', '0', '2', '1'), -('29', '13', '3', '2015-05-07', '5010', '', '150', '1', '0', NULL, NULL), -('30', '13', '3', '2015-05-07', '1510', '', '-150', '0', '0', NULL, NULL), -('31', '13', '3', '2015-05-07', '5010', '', '10', '1', '0', NULL, NULL), -('32', '13', '3', '2015-05-07', '1510', '', '-10', '0', '0', NULL, NULL), -('33', '10', '3', '2015-05-07', '4010', '', '-250', '1', '0', NULL, NULL), -('34', '10', '3', '2015-05-07', '4010', '', '-50', '1', '0', NULL, NULL), -('35', '10', '3', '2015-05-07', '1200', '', '300', '0', '0', '2', '2'), -('36', '12', '3', '2015-05-07', '1065', '', '0', '0', '0', NULL, NULL), -('37', '1', '1', '2015-05-07', '5010', '', '5', '1', '0', NULL, NULL), -('38', '1', '1', '2015-05-07', '1060', '', '-5', '0', '0', NULL, NULL); +('1', '25', '1', '2016-05-05', '1510', '101', '20000', '0', '0', NULL, NULL), +('2', '25', '1', '2016-05-05', '1510', '102', '15000', '0', '0', NULL, NULL), +('3', '25', '1', '2016-05-05', '1510', '103', '1000', '0', '0', NULL, NULL), +('4', '25', '1', '2016-05-05', '1550', '', '-36000', '0', '0', NULL, NULL), +('5', '13', '1', '2016-05-10', '5010', '', '4000', '0', '0', NULL, NULL), +('6', '13', '1', '2016-05-10', '1510', '', '-4000', '0', '0', NULL, NULL), +('7', '10', '1', '2016-05-10', '4010', '', '-5714.29', '0', '0', NULL, NULL), +('8', '10', '1', '2016-05-10', '4010', '', '-228.57', '0', '0', NULL, NULL), +('9', '10', '1', '2016-05-10', '1200', '', '6240', '0', '0', '2', '1'), +('10', '10', '1', '2016-05-10', '2150', '', '-297.14', '0', '0', NULL, NULL), +('11', '12', '1', '2016-05-10', '1065', '', '6240', '0', '0', NULL, NULL), +('12', '12', '1', '2016-05-10', '1200', '', '-6240', '0', '0', '2', '1'), +('13', '26', '1', '2016-05-05', '1510', '1 * iPad Air 2 16GB', '-400', '0', '0', NULL, NULL), +('14', '26', '1', '2016-05-05', '1510', '1 * iPhone 6 64GB', '-300', '0', '0', NULL, NULL), +('15', '26', '1', '2016-05-05', '1510', '1 * iPhone Cover Case', '-20', '0', '0', NULL, NULL), +('16', '26', '1', '2016-05-05', '1510', 'Produced 2 * AP Surf Set', '720', '0', '0', NULL, NULL), +('17', '25', '2', '2016-05-05', '1510', '101', '3000', '0', '0', NULL, NULL), +('18', '25', '2', '2016-05-05', '1550', '', '-3000', '0', '0', NULL, NULL), +('19', '20', '1', '2016-05-05', '2150', '', '150', '0', '0', NULL, NULL), +('20', '20', '1', '2016-05-05', '2100', '', '-3150', '0', '0', '3', '1'), +('21', '20', '1', '2016-05-05', '1550', '', '3000', '0', '0', NULL, NULL), +('22', '13', '2', '2016-05-07', '5010', '', '200', '0', '0', NULL, NULL), +('23', '13', '2', '2016-05-07', '1510', '', '-200', '0', '0', NULL, NULL), +('24', '10', '2', '2016-05-07', '4010', '', '-285.71', '0', '0', NULL, NULL), +('25', '10', '2', '2016-05-07', '1200', '', '300', '0', '0', '2', '1'), +('26', '10', '2', '2016-05-07', '2150', '', '-14.29', '0', '0', NULL, NULL), +('27', '12', '2', '2016-05-07', '1065', '', '300', '0', '0', NULL, NULL), +('28', '12', '2', '2016-05-07', '1200', '', '-300', '0', '0', '2', '1'), +('29', '13', '3', '2016-05-07', '5010', '', '150', '1', '0', NULL, NULL), +('30', '13', '3', '2016-05-07', '1510', '', '-150', '0', '0', NULL, NULL), +('31', '13', '3', '2016-05-07', '5010', '', '10', '1', '0', NULL, NULL), +('32', '13', '3', '2016-05-07', '1510', '', '-10', '0', '0', NULL, NULL), +('33', '10', '3', '2016-05-07', '4010', '', '-250', '1', '0', NULL, NULL), +('34', '10', '3', '2016-05-07', '4010', '', '-50', '1', '0', NULL, NULL), +('35', '10', '3', '2016-05-07', '1200', '', '300', '0', '0', '2', '2'), +('36', '12', '3', '2016-05-07', '1065', '', '0', '0', '0', NULL, NULL), +('37', '1', '1', '2016-05-07', '5010', '', '5', '1', '0', NULL, NULL), +('38', '1', '1', '2016-05-07', '1060', '', '-5', '0', '0', NULL, NULL); -- -------------------------------------------------------- @@ -956,8 +955,8 @@ CREATE TABLE IF NOT EXISTS `0_grn_batch` ( -- INSERT INTO `0_grn_batch` VALUES -('1', '1', '1', '001/2015', '2015-05-05', 'DEF', '1'), -('2', '1', '2', 'auto', '2015-05-05', 'DEF', '1'); +('1', '1', '1', '001/2016', '2016-05-05', 'DEF', '1'), +('2', '1', '2', 'auto', '2016-05-05', 'DEF', '1'); -- -------------------------------------------------------- @@ -1352,8 +1351,8 @@ CREATE TABLE IF NOT EXISTS `0_purch_orders` ( -- INSERT INTO `0_purch_orders` VALUES -('1', '1', NULL, '2015-05-05', '001/2015', NULL, 'DEF', 'N/A', '37800', '0', '0', '0'), -('2', '1', NULL, '2015-05-05', 'auto', 'rr4', 'DEF', 'N/A', '3150', '0', '0', '0'); +('1', '1', NULL, '2016-05-05', '001/2016', NULL, 'DEF', 'N/A', '37800', '0', '0', '0'), +('2', '1', NULL, '2016-05-05', 'auto', 'rr4', 'DEF', 'N/A', '3150', '0', '0', '0'); -- -------------------------------------------------------- @@ -1384,10 +1383,10 @@ CREATE TABLE IF NOT EXISTS `0_purch_order_details` ( -- INSERT INTO `0_purch_order_details` VALUES -('1', '1', '101', 'iPad Air 2 16GB', '2015-05-15', '0', '200', '200', '200', '100', '100'), -('2', '1', '102', 'iPhone 6 64GB', '2015-05-15', '0', '150', '150', '150', '100', '100'), -('3', '1', '103', 'iPhone Cover Case', '2015-05-15', '0', '10', '10', '10', '100', '100'), -('4', '2', '101', 'iPad Air 2 16GB', '2015-05-05', '15', '200', '200', '200', '15', '15'); +('1', '1', '101', 'iPad Air 2 16GB', '2016-05-15', '0', '200', '200', '200', '100', '100'), +('2', '1', '102', 'iPhone 6 64GB', '2016-05-15', '0', '150', '150', '150', '100', '100'), +('3', '1', '103', 'iPhone Cover Case', '2016-05-15', '0', '10', '10', '10', '100', '100'), +('4', '2', '101', 'iPad Air 2 16GB', '2016-05-05', '15', '200', '200', '200', '15', '15'); -- -------------------------------------------------------- @@ -1473,7 +1472,7 @@ CREATE TABLE IF NOT EXISTS `0_recurrent_invoices` ( -- Dumping data for table `0_recurrent_invoices` -- -INSERT INTO `0_recurrent_invoices` VALUES ('1', 'Weekly Maintenance', '6', '1', '1', '7', '0', '2015-04-01', '2020-05-07', '2015-04-08'); +INSERT INTO `0_recurrent_invoices` VALUES ('1', 'Weekly Maintenance', '6', '1', '1', '7', '0', '2016-04-01', '2020-05-07', '2016-04-08'); -- -------------------------------------------------------- @@ -1543,24 +1542,24 @@ CREATE TABLE IF NOT EXISTS `0_refs` ( -- INSERT INTO `0_refs` VALUES -('1', '1', '001/2015'), -('1', '10', '001/2015'), -('2', '10', '002/2015'), -('3', '10', '003/2015'), -('4', '10', '004/2015'), -('1', '12', '001/2015'), -('2', '12', '002/2015'), -('3', '12', '003/2015'), -('1', '18', '001/2015'), -('1', '20', '001/2015'), -('1', '25', '001/2015'), -('1', '26', '001/2015'), -('2', '26', '002/2015'), -('3', '26', '003/2015'), -('3', '30', '001/2015'), -('4', '30', '002/2015'), -('6', '30', '003/2015'), -('1', '40', '001/2015'); +('1', '1', '001/2016'), +('1', '10', '001/2016'), +('2', '10', '002/2016'), +('3', '10', '003/2016'), +('4', '10', '004/2016'), +('1', '12', '001/2016'), +('2', '12', '002/2016'), +('3', '12', '003/2016'), +('1', '18', '001/2016'), +('1', '20', '001/2016'), +('1', '25', '001/2016'), +('1', '26', '001/2016'), +('2', '26', '002/2016'), +('3', '26', '003/2016'), +('3', '30', '001/2016'), +('4', '30', '002/2016'), +('6', '30', '003/2016'), +('1', '40', '001/2016'); -- -------------------------------------------------------- @@ -1628,13 +1627,13 @@ CREATE TABLE IF NOT EXISTS `0_sales_orders` ( -- INSERT INTO `0_sales_orders` VALUES -('1', '30', '1', '0', '1', '1', 'auto', '', NULL, '2015-05-10', '1', '1', 'N/A', NULL, NULL, 'Donald Easter LLC', '0', 'DEF', '2015-05-05', '4', '6240', '0', '0'), -('2', '30', '1', '0', '1', '1', 'auto', '', NULL, '2015-05-07', '1', '1', 'N/A', NULL, NULL, 'Donald Easter LLC', '0', 'DEF', '2015-05-07', '4', '300', '0', '0'), -('3', '30', '0', '0', '1', '1', '001/2015', '', NULL, '2015-05-07', '1', '1', 'N/A', NULL, NULL, 'Donald Easter LLC', '0', 'DEF', '2015-05-08', '4', '300', '0', '0'), -('4', '30', '0', '0', '2', '2', '002/2015', '', NULL, '2015-05-07', '1', '1', 'N/A', NULL, NULL, 'MoneyMaker Ltd.', '0', 'DEF', '2015-05-08', '1', '267.14', '0', '0'), -('5', '30', '1', '0', '2', '2', 'auto', '', NULL, '2015-05-07', '1', '1', 'N/A', NULL, NULL, 'MoneyMaker Ltd.', '0', 'DEF', '2015-06-17', '1', '267.14', '0', '0'), -('6', '30', '0', '1', '1', '1', '003/2015', '', NULL, '2015-05-07', '1', '1', 'N/A', NULL, NULL, 'Donald Easter LLC', '0', 'DEF', '2015-05-08', '4', '450', '0', '0'), -('7', '30', '1', '0', '1', '1', 'auto', '', 'Recurrent Invoice covers period 04/01/2015 - 04/07/2015.', '2015-05-07', '1', '1', 'N/A', NULL, NULL, 'Donald Easter LLC', '0', 'DEF', '2015-05-07', '4', '0', '0', '0'); +('1', '30', '1', '0', '1', '1', 'auto', '', NULL, '2016-05-10', '1', '1', 'N/A', NULL, NULL, 'Donald Easter LLC', '0', 'DEF', '2016-05-05', '4', '6240', '0', '0'), +('2', '30', '1', '0', '1', '1', 'auto', '', NULL, '2016-05-07', '1', '1', 'N/A', NULL, NULL, 'Donald Easter LLC', '0', 'DEF', '2016-05-07', '4', '300', '0', '0'), +('3', '30', '0', '0', '1', '1', '001/2016', '', NULL, '2016-05-07', '1', '1', 'N/A', NULL, NULL, 'Donald Easter LLC', '0', 'DEF', '2016-05-08', '4', '300', '0', '0'), +('4', '30', '0', '0', '2', '2', '002/2016', '', NULL, '2016-05-07', '1', '1', 'N/A', NULL, NULL, 'MoneyMaker Ltd.', '0', 'DEF', '2016-05-08', '1', '267.14', '0', '0'), +('5', '30', '1', '0', '2', '2', 'auto', '', NULL, '2016-05-07', '1', '1', 'N/A', NULL, NULL, 'MoneyMaker Ltd.', '0', 'DEF', '2016-06-17', '1', '267.14', '0', '0'), +('6', '30', '0', '1', '1', '1', '003/2016', '', NULL, '2016-05-07', '1', '1', 'N/A', NULL, NULL, 'Donald Easter LLC', '0', 'DEF', '2016-05-08', '4', '450', '0', '0'), +('7', '30', '1', '0', '1', '1', 'auto', '', 'Recurrent Invoice covers period 04/01/2016 - 04/07/2016.', '2016-05-07', '1', '1', 'N/A', NULL, NULL, 'Donald Easter LLC', '0', 'DEF', '2016-05-07', '4', '0', '0', '0'); -- -------------------------------------------------------- @@ -1933,21 +1932,21 @@ CREATE TABLE `0_stock_moves` ( -- INSERT INTO `0_stock_moves` VALUES -('1', '1', '101', '25', 'DEF', '2015-05-05', '200', '', '100', '200'), -('2', '1', '102', '25', 'DEF', '2015-05-05', '150', '', '100', '150'), -('3', '1', '103', '25', 'DEF', '2015-05-05', '10', '', '100', '10'), -('4', '1', '101', '13', 'DEF', '2015-05-10', '300', 'auto', '-20', '200'), -('5', '1', '301', '13', 'DEF', '2015-05-10', '80', 'auto', '-3', '0'), -('6', '1', '101', '26', 'DEF', '2015-05-05', '200', '001/2015', '-2', '200'), -('7', '1', '102', '26', 'DEF', '2015-05-05', '150', '001/2015', '-2', '150'), -('8', '1', '103', '26', 'DEF', '2015-05-05', '10', '001/2015', '-2', '10'), -('9', '1', '301', '26', 'DEF', '2015-05-05', '0', '001/2015', '-2', '0'), -('10', '1', '201', '26', 'DEF', '2015-05-05', '0', '001/2015', '2', '0'), -('11', '2', '101', '25', 'DEF', '2015-05-05', '200', '', '15', '200'), -('12', '2', '101', '13', 'DEF', '2015-05-07', '300', 'auto', '-1', '200'), -('13', '3', '102', '13', 'DEF', '2015-05-07', '222.62', 'auto', '-1', '150'), -('14', '3', '103', '13', 'DEF', '2015-05-07', '44.52', 'auto', '-1', '10'), -('15', '4', '202', '13', 'DEF', '2015-05-07', '0', 'auto', '-5', '0'); +('1', '1', '101', '25', 'DEF', '2016-05-05', '200', '', '100', '200'), +('2', '1', '102', '25', 'DEF', '2016-05-05', '150', '', '100', '150'), +('3', '1', '103', '25', 'DEF', '2016-05-05', '10', '', '100', '10'), +('4', '1', '101', '13', 'DEF', '2016-05-10', '300', 'auto', '-20', '200'), +('5', '1', '301', '13', 'DEF', '2016-05-10', '80', 'auto', '-3', '0'), +('6', '1', '101', '26', 'DEF', '2016-05-05', '200', '001/2016', '-2', '200'), +('7', '1', '102', '26', 'DEF', '2016-05-05', '150', '001/2016', '-2', '150'), +('8', '1', '103', '26', 'DEF', '2016-05-05', '10', '001/2016', '-2', '10'), +('9', '1', '301', '26', 'DEF', '2016-05-05', '0', '001/2016', '-2', '0'), +('10', '1', '201', '26', 'DEF', '2016-05-05', '0', '001/2016', '2', '0'), +('11', '2', '101', '25', 'DEF', '2016-05-05', '200', '', '15', '200'), +('12', '2', '101', '13', 'DEF', '2016-05-07', '300', 'auto', '-1', '200'), +('13', '3', '102', '13', 'DEF', '2016-05-07', '222.62', 'auto', '-1', '150'), +('14', '3', '103', '13', 'DEF', '2016-05-07', '44.52', 'auto', '-1', '10'), +('15', '4', '202', '13', 'DEF', '2016-05-07', '0', 'auto', '-5', '0'); -- -------------------------------------------------------- @@ -2080,7 +2079,7 @@ CREATE TABLE IF NOT EXISTS `0_supp_trans` ( -- -INSERT INTO `0_supp_trans` VALUES ('1', '20', '1', '001/2015', 'rr4', '2015-05-05', '2015-05-15', '3000', '0', '150', '1', '0', '0'); +INSERT INTO `0_supp_trans` VALUES ('1', '20', '1', '001/2016', 'rr4', '2016-05-05', '2016-05-15', '3000', '0', '150', '1', '0', '0'); -- -------------------------------------------------------- @@ -2308,13 +2307,13 @@ CREATE TABLE IF NOT EXISTS `0_trans_tax_details` ( -- INSERT INTO `0_trans_tax_details` VALUES -('1', '13', '1', '2015-05-10', '1', '5', '1', '1', '5942.86', '297.14', 'auto', NULL), -('2', '10', '1', '2015-05-10', '1', '5', '1', '1', '5942.86', '297.14', '001/2015', '0'), -('3', '20', '1', '2015-05-05', '1', '5', '1', '0', '3000', '150', 'rr4', '1'), -('4', '13', '2', '2015-05-07', '1', '5', '1', '1', '285.71', '14.29', 'auto', NULL), -('5', '10', '2', '2015-05-07', '1', '5', '1', '1', '285.71', '14.29', '002/2015', '0'), -('6', '13', '3', '2015-05-07', '0', '0', '1.123', '1', '267.14', '0', 'auto', NULL), -('7', '10', '3', '2015-05-07', '0', '0', '1.123', '1', '267.14', '0', '003/2015', '0'); +('1', '13', '1', '2016-05-10', '1', '5', '1', '1', '5942.86', '297.14', 'auto', NULL), +('2', '10', '1', '2016-05-10', '1', '5', '1', '1', '5942.86', '297.14', '001/2016', '0'), +('3', '20', '1', '2016-05-05', '1', '5', '1', '0', '3000', '150', 'rr4', '1'), +('4', '13', '2', '2016-05-07', '1', '5', '1', '1', '285.71', '14.29', 'auto', NULL), +('5', '10', '2', '2016-05-07', '1', '5', '1', '1', '285.71', '14.29', '002/2016', '0'), +('6', '13', '3', '2016-05-07', '0', '0', '1.123', '1', '267.14', '0', 'auto', NULL), +('7', '10', '3', '2016-05-07', '0', '0', '1.123', '1', '267.14', '0', '003/2016', '0'); -- -------------------------------------------------------- @@ -2388,7 +2387,7 @@ CREATE TABLE IF NOT EXISTS `0_users` ( -- Dumping data for table `0_users` -- -INSERT INTO `0_users` VALUES (1, 'admin', '5f4dcc3b5aa765d61d8327deb882cf99', 'Administrator', 2, '', 'adm@example.com', 'C', 0, 0, 0, 0, 'default', 'Letter', 2, 2, 4, 1, 1, 0, 0, '2015-05-07 13:58:33', 10, 1, 1, '1', 1, 0, 'orders', 30, 0, 1, 0, 0, 0); +INSERT INTO `0_users` VALUES (1, 'admin', '5f4dcc3b5aa765d61d8327deb882cf99', 'Administrator', 2, '', 'adm@example.com', 'C', 0, 0, 0, 0, 'default', 'Letter', 2, 2, 4, 1, 1, 0, 0, '2016-05-07 13:58:33', 10, 1, 1, '1', 1, 0, 'orders', 30, 0, 1, 0, 0, 0); -- -------------------------------------------------------- @@ -2461,9 +2460,9 @@ CREATE TABLE IF NOT EXISTS `0_workorders` ( -- INSERT INTO `0_workorders` VALUES -('1', '001/2015', 'DEF', '2', '201', '2015-05-05', '0', '2015-05-05', '2015-05-05', '2', '1', '1', '0'), -('2', '002/2015', 'DEF', '5', '201', '2015-05-07', '2', '2015-05-27', '2015-05-07', '0', '0', '1', '0'), -('3', '003/2015', 'DEF', '5', '201', '2015-05-07', '2', '2015-05-27', '0000-00-00', '0', '0', '0', '0'); +('1', '001/2016', 'DEF', '2', '201', '2016-05-05', '0', '2016-05-05', '2016-05-05', '2', '1', '1', '0'), +('2', '002/2016', 'DEF', '5', '201', '2016-05-07', '2', '2016-05-27', '2016-05-07', '0', '0', '1', '0'), +('3', '003/2016', 'DEF', '5', '201', '2016-05-07', '2', '2016-05-27', '0000-00-00', '0', '0', '0', '0'); -- -------------------------------------------------------- diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql index 26802544..56f5b5f1 100644 --- a/sql/en_US-new.sql +++ b/sql/en_US-new.sql @@ -3,7 +3,7 @@ -- http://www.phpmyadmin.net -- -- Host: localhost --- Generation Time: Sep 26, 2014 at 11:37 AM +-- Generation Time: Sep 26, 2015 at 11:37 AM -- Server version: 5.0.51 -- PHP Version: 5.2.6-1+lenny2 @@ -746,7 +746,7 @@ CREATE TABLE IF NOT EXISTS `0_fiscal_year` ( -- Dumping data for table `0_fiscal_year` -- -INSERT INTO `0_fiscal_year` VALUES (1, '2015-01-01', '2015-12-31', 0); +INSERT INTO `0_fiscal_year` VALUES (1, '2016-01-01', '2016-12-31', 0); -- -------------------------------------------------------- diff --git a/version.php b/version.php index c2d45728..0879b0ed 100644 --- a/version.php +++ b/version.php @@ -6,7 +6,7 @@ // Versions used by source/database version compatibility checks. Do not change. $db_version = "2.4.1"; -$src_version = "2.4.RC1"; +$src_version = "2.4.1"; // application version - can be overriden in config.php $version = isset($SysPrefs->version) ? $SysPrefs->version : $src_version; -- 2.30.2