From 113a0f4ffc2b8860505bcc26574e8b6e1dddab65 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Mon, 22 May 2017 14:45:02 +0200 Subject: [PATCH] Release 2.3.26 (Final) --- CHANGELOG.txt | 119 +++++++++++++++ sql/en_US-demo.sql | 369 ++++++++++++++++++++++----------------------- sql/en_US-new.sql | 5 +- version.php | 2 +- 4 files changed, 305 insertions(+), 190 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index c2ab2b08..d95dd280 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,122 @@ +2017-05-19 21:53:28 +0200 Joe Hunt +Sales type potential bug in tax_included (persistent on) +M sales/manage/sales_types.php + +2017-05-19 14:02:50 +0200 Joe Hunt +Deleted doc/CHANGELOG.old.txt. Not needed any more. +D doc/CHANGELOG.old.txt + +2017-05-19 12:25:49 +0200 Joe Hunt +0003761: Reorder email is not sent for items used work order. Fixed +M manufacturing/includes/db/work_orders_quick_db.inc + +2017-05-14 21:18:19 +0200 Joe Hunt +Optimized Inventory Valuation Reports, 301 and 308. +M reporting/rep301.php +M reporting/rep308.php + +2017-05-11 13:35:19 +0200 Joe Hunt +Customer/Supplier Balances Report | Allocated column not showing correctly. Fixed. +M reporting/rep101.php +M reporting/rep201.php + +2017-03-19 15:25:15 +0100 Janusz Dobrowolski +Additional fix to previous commit. +M reporting/prn_redirect.php + +2017-03-19 14:32:53 +0100 ApMuthu +Fixed problems with excel report generation. +M includes/main.inc +M reporting/prn_redirect.php + +2017-03-18 15:52:46 +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-18 15:52:40 +0100 Joe Hunt +Missing Changelog +A CHANGELOG.txt + +2017-01-18 15:45:47 +0100 Joe Hunt +Missing changelog. +D CHANGELOG.txt + +2017-01-18 15:32:57 +0100 Joe Hunt +Fixed an array_combine object issue. +M includes/ui/ui_lists.inc + +2016-12-23 08:56:18 +0100 Joe Hunt +Bug submitting forms in FA 2.3.x when checkbox field not changed. Fixed +M includes/ui/ui_input.inc + +2016-12-03 23:14:30 +0100 Joe Hunt +Rerun Items Summary Report fix +M reporting/rep309.php + +2016-11-29 16:19:27 +0100 Joe Hunt +Fixed A Bug in Item Sales Summary Report +M reporting/rep309.php + +2016-11-28 23:14:44 +0100 Joe Hunt +0003667: supplier payment link after entering supplier invoice result. Fixed. +M purchasing/supplier_invoice.php + +2016-11-14 12:15:42 +0100 Janusz Dobrowolski +Cleanup in sales_invoice_db.inc (obsolete parameteres in update_debtor_trans_allocation calls) +M sales/includes/db/sales_invoice_db.inc + +2016-07-26 07:39:50 +0200 Joe Hunt +Dimension is missing in Supplier Invoice View, GL Rows. +M purchasing/includes/db/invoice_db.inc + +2016-07-24 14:52:49 +0200 Joe Hunt +Minor bugs in deleting fiscal years. Apmuthu. +M admin/db/fiscalyears_db.inc + +2016-05-27 12:09:47 +0200 Joe Hunt +Rerun. Tabbed dialogs allowed non access pages. +M inventory/manage/items.php +M js/inserts.js +M purchasing/manage/suppliers.php +M sales/manage/customers.php + +2016-05-27 09:09:22 +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:28:03 +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:04 +0200 Janusz Dobrowolski +Fixed typo in last commit. +M gl/manage/bank_accounts.php + +2016-05-19 22:35:19 +0200 Janusz Dobrowolski +Fixed bug in Bank Accounts edition. +M gl/manage/bank_accounts.php + +2016-05-17 18:57:23 +0200 Janusz Dobrowolski +Fixed typos in some installer translation files. +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 + +2016-02-21 15:37:42 +0100 Joe Hunt +New CHANGELOG.txt +M CHANGELOG.txt + 2016-02-21 15:34:07 +0100 Joe Hunt Release 2.3.25. M version.php diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql index 28cdcb0c..b2abd8b9 100644 --- a/sql/en_US-demo.sql +++ b/sql/en_US-demo.sql @@ -3,7 +3,7 @@ -- http://www.phpmyadmin.net -- -- Host: localhost --- Generation Time: Sep 26, 2014 at 11:32 AM +-- Generation Time: Sep 26, 2015 at 11:32 AM -- Server version: 5.0.51 -- PHP Version: 5.2.6-1+lenny2 @@ -149,17 +149,17 @@ CREATE TABLE IF NOT EXISTS `0_bank_trans` ( -- Dumping data for table `0_bank_trans` -- -INSERT INTO `0_bank_trans` VALUES(1, 22, 4, '1', '1', '2014-06-21', -3465, 0, 0, 3, '2', NULL); -INSERT INTO `0_bank_trans` VALUES(2, 26, 1, '1', '', '2014-06-21', -10, 0, 0, 1, '1', NULL); -INSERT INTO `0_bank_trans` VALUES(3, 26, 1, '1', '', '2014-06-21', -20, 0, 0, 1, '0', NULL); -INSERT INTO `0_bank_trans` VALUES(4, 0, 18, '1', '1', '2014-02-20', 1000, 0, 0, 0, '', NULL); -INSERT INTO `0_bank_trans` VALUES(5, 0, 19, '1', '2', '2014-02-21', 4000, 0, 0, 0, '', NULL); -INSERT INTO `0_bank_trans` VALUES(6, 2, 5, '1', '1', '2014-06-21', 100, 0, 0, 4, '3', NULL); -INSERT INTO `0_bank_trans` VALUES(7, 1, 8, '1', '1', '2014-06-21', -50, 0, 0, 4, '1', NULL); -INSERT INTO `0_bank_trans` VALUES(8, 26, 5, '1', '', '2014-06-21', -10, 0, 0, 1, '1', NULL); -INSERT INTO `0_bank_trans` VALUES(9, 26, 5, '1', '', '2014-06-21', -20, 0, 0, 1, '0', NULL); -INSERT INTO `0_bank_trans` VALUES(10, 26, 7, '1', '', '2014-06-21', -10, 0, 0, 1, '1', NULL); -INSERT INTO `0_bank_trans` VALUES(11, 26, 7, '1', '', '2014-06-21', -20, 0, 0, 1, '0', NULL); +INSERT INTO `0_bank_trans` VALUES(1, 22, 4, '1', '1', '2016-06-21', -3465, 0, 0, 3, '2', NULL); +INSERT INTO `0_bank_trans` VALUES(2, 26, 1, '1', '', '2016-06-21', -10, 0, 0, 1, '1', NULL); +INSERT INTO `0_bank_trans` VALUES(3, 26, 1, '1', '', '2016-06-21', -20, 0, 0, 1, '0', NULL); +INSERT INTO `0_bank_trans` VALUES(4, 0, 18, '1', '1', '2016-02-20', 1000, 0, 0, 0, '', NULL); +INSERT INTO `0_bank_trans` VALUES(5, 0, 19, '1', '2', '2016-02-21', 4000, 0, 0, 0, '', NULL); +INSERT INTO `0_bank_trans` VALUES(6, 2, 5, '1', '1', '2016-06-21', 100, 0, 0, 4, '3', NULL); +INSERT INTO `0_bank_trans` VALUES(7, 1, 8, '1', '1', '2016-06-21', -50, 0, 0, 4, '1', NULL); +INSERT INTO `0_bank_trans` VALUES(8, 26, 5, '1', '', '2016-06-21', -10, 0, 0, 1, '1', NULL); +INSERT INTO `0_bank_trans` VALUES(9, 26, 5, '1', '', '2016-06-21', -20, 0, 0, 1, '0', NULL); +INSERT INTO `0_bank_trans` VALUES(10, 26, 7, '1', '', '2016-06-21', -10, 0, 0, 1, '1', NULL); +INSERT INTO `0_bank_trans` VALUES(11, 26, 7, '1', '', '2016-06-21', -20, 0, 0, 1, '0', NULL); -- -------------------------------------------------------- @@ -582,7 +582,7 @@ CREATE TABLE IF NOT EXISTS `0_cust_allocations` ( -- Dumping data for table `0_cust_allocations` -- -INSERT INTO `0_cust_allocations` VALUES(1, 37.68, '2014-06-21', 3, 11, 18, 10); +INSERT INTO `0_cust_allocations` VALUES(1, 37.68, '2016-06-21', 3, 11, 18, 10); -- -------------------------------------------------------- @@ -702,14 +702,14 @@ CREATE TABLE IF NOT EXISTS `0_debtor_trans` ( -- Dumping data for table `0_debtor_trans` -- -INSERT INTO `0_debtor_trans` VALUES(17, 10, 0, 2, 2, '2014-06-21', '2014-06-22', '1', 1, 2, 50, 2.5, 0, 0, 0, 0, 1, 1, 0, 0, 4); -INSERT INTO `0_debtor_trans` VALUES(18, 10, 1, 3, 3, '2014-06-21', '2014-07-01', '2', 2, 3, 35.89, 1.79, 0, 0, 0, 37.68, 1.3932, 1, 2, 0, 3); -INSERT INTO `0_debtor_trans` VALUES(19, 10, 0, 2, 2, '2014-06-21', '2014-06-22', '3', 1, 5, 50, 0, 5, 0, 0, 0, 1, 1, 0, 0, 4); -INSERT INTO `0_debtor_trans` VALUES(3, 11, 0, 3, 3, '2014-06-21', '0000-00-00', '1', 2, 3, 35.89, 1.79, 0, 0, 0, 37.68, 1.3932, 1, 2, 0, 3); -INSERT INTO `0_debtor_trans` VALUES(2, 13, 0, 1, 1, '2014-06-21', '2014-06-22', '1', 2, 1, 60.8, 0, 10, 0, 0, 0, 1.6445729799917, 1, 0, 0, 3); -INSERT INTO `0_debtor_trans` VALUES(3, 13, 1, 2, 2, '2014-06-21', '2014-06-22', 'auto', 1, 2, 50, 2.5, 0, 0, 0, 0, 1, 1, 0, 0, 4); -INSERT INTO `0_debtor_trans` VALUES(4, 13, 1, 3, 3, '2014-06-21', '2014-07-01', 'auto', 2, 3, 35.89, 1.79, 0, 0, 0, 0, 1.3932, 1, 2, 0, 3); -INSERT INTO `0_debtor_trans` VALUES(5, 13, 1, 2, 2, '2014-06-21', '2014-06-22', 'auto', 1, 5, 50, 0, 5, 0, 0, 0, 1, 1, 0, 0, 4); +INSERT INTO `0_debtor_trans` VALUES(17, 10, 0, 2, 2, '2016-06-21', '2016-06-22', '1', 1, 2, 50, 2.5, 0, 0, 0, 0, 1, 1, 0, 0, 4); +INSERT INTO `0_debtor_trans` VALUES(18, 10, 1, 3, 3, '2016-06-21', '2016-07-01', '2', 2, 3, 35.89, 1.79, 0, 0, 0, 37.68, 1.3932, 1, 2, 0, 3); +INSERT INTO `0_debtor_trans` VALUES(19, 10, 0, 2, 2, '2016-06-21', '2016-06-22', '3', 1, 5, 50, 0, 5, 0, 0, 0, 1, 1, 0, 0, 4); +INSERT INTO `0_debtor_trans` VALUES(3, 11, 0, 3, 3, '2016-06-21', '0000-00-00', '1', 2, 3, 35.89, 1.79, 0, 0, 0, 37.68, 1.3932, 1, 2, 0, 3); +INSERT INTO `0_debtor_trans` VALUES(2, 13, 0, 1, 1, '2016-06-21', '2016-06-22', '1', 2, 1, 60.8, 0, 10, 0, 0, 0, 1.6445729799917, 1, 0, 0, 3); +INSERT INTO `0_debtor_trans` VALUES(3, 13, 1, 2, 2, '2016-06-21', '2016-06-22', 'auto', 1, 2, 50, 2.5, 0, 0, 0, 0, 1, 1, 0, 0, 4); +INSERT INTO `0_debtor_trans` VALUES(4, 13, 1, 3, 3, '2016-06-21', '2016-07-01', 'auto', 2, 3, 35.89, 1.79, 0, 0, 0, 0, 1.3932, 1, 2, 0, 3); +INSERT INTO `0_debtor_trans` VALUES(5, 13, 1, 2, 2, '2016-06-21', '2016-06-22', 'auto', 1, 5, 50, 0, 5, 0, 0, 0, 1, 1, 0, 0, 4); -- -------------------------------------------------------- @@ -775,8 +775,8 @@ CREATE TABLE IF NOT EXISTS `0_dimensions` ( -- Dumping data for table `0_dimensions` -- -INSERT INTO `0_dimensions` VALUES(1, '1', 'Support', 1, 0, '2014-06-21', '2020-07-11'); -INSERT INTO `0_dimensions` VALUES(2, '2', 'Development', 1, 0, '2014-06-21', '2020-07-11'); +INSERT INTO `0_dimensions` VALUES(1, '1', 'Support', 1, 0, '2016-06-21', '2020-07-11'); +INSERT INTO `0_dimensions` VALUES(2, '2', 'Development', 1, 0, '2016-06-21', '2020-07-11'); -- -------------------------------------------------------- @@ -799,9 +799,9 @@ CREATE TABLE IF NOT EXISTS `0_exchange_rates` ( -- Dumping data for table `0_exchange_rates` -- -INSERT INTO `0_exchange_rates` VALUES(1, 'DKK', 0.18717252868313, 0.18717252868313, '2014-06-21'); -INSERT INTO `0_exchange_rates` VALUES(2, 'GBP', 1.6445729799917, 1.6445729799917, '2014-06-21'); -INSERT INTO `0_exchange_rates` VALUES(3, 'EUR', 1.3932, 1.3932, '2014-06-21'); +INSERT INTO `0_exchange_rates` VALUES(1, 'DKK', 0.18717252868313, 0.18717252868313, '2016-06-21'); +INSERT INTO `0_exchange_rates` VALUES(2, 'GBP', 1.6445729799917, 1.6445729799917, '2016-06-21'); +INSERT INTO `0_exchange_rates` VALUES(3, 'EUR', 1.3932, 1.3932, '2016-06-21'); -- -------------------------------------------------------- @@ -824,9 +824,6 @@ CREATE TABLE IF NOT EXISTS `0_fiscal_year` ( -- Dumping data for table `0_fiscal_year` -- -INSERT INTO `0_fiscal_year` VALUES(1, '2013-01-01', '2013-12-31', 0); -INSERT INTO `0_fiscal_year` VALUES(2, '2014-01-01', '2014-12-31', 0); -INSERT INTO `0_fiscal_year` VALUES(3, '2015-01-01', '2015-12-31', 0); INSERT INTO `0_fiscal_year` VALUES(4, '2016-01-01', '2016-12-31', 0); -- @@ -858,89 +855,89 @@ CREATE TABLE IF NOT EXISTS `0_gl_trans` ( -- Dumping data for table `0_gl_trans` -- -INSERT INTO `0_gl_trans` VALUES(1, 20, 7, '2014-06-21', '2100', '', -3465, 0, 0, 3, '2'); -INSERT INTO `0_gl_trans` VALUES(2, 20, 7, '2014-06-21', '1510', '', 1000, 0, 0, 3, '2'); -INSERT INTO `0_gl_trans` VALUES(3, 20, 7, '2014-06-21', '1510', '', 1100, 0, 0, 3, '2'); -INSERT INTO `0_gl_trans` VALUES(4, 20, 7, '2014-06-21', '1510', '', 1200, 0, 0, 3, '2'); -INSERT INTO `0_gl_trans` VALUES(5, 20, 7, '2014-06-21', '2150', '', 165, 0, 0, 3, '2'); -INSERT INTO `0_gl_trans` VALUES(6, 22, 4, '2014-06-21', '2100', '', 3465, 0, 0, 3, '2'); -INSERT INTO `0_gl_trans` VALUES(7, 22, 4, '2014-06-21', '1060', '', -3465, 0, 0, 3, '2'); -INSERT INTO `0_gl_trans` VALUES(8, 26, 1, '2014-06-21', '1510', '', -100, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(9, 26, 1, '2014-06-21', '1510', '', -110, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(10, 26, 1, '2014-06-21', '1510', '', -120, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(11, 26, 1, '2014-06-21', '1060', 'Overhead Cost', -10, 0, 0, 1, '1'); -INSERT INTO `0_gl_trans` VALUES(12, 26, 1, '2014-06-21', '1530', 'Overhead Cost', 10, 0, 0, 1, '1'); -INSERT INTO `0_gl_trans` VALUES(13, 26, 1, '2014-06-21', '1060', 'Labour Cost', -20, 0, 0, 1, '0'); -INSERT INTO `0_gl_trans` VALUES(14, 26, 1, '2014-06-21', '1530', 'Labour Cost', 20, 0, 0, 1, '0'); -INSERT INTO `0_gl_trans` VALUES(15, 26, 1, '2014-06-21', '1510', '', 330, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(16, 13, 2, '2014-06-21', '5010', '', 20, 0, 0, 2, '1'); -INSERT INTO `0_gl_trans` VALUES(17, 13, 2, '2014-06-21', '1510', '', -20, 0, 0, 2, '1'); -INSERT INTO `0_gl_trans` VALUES(18, 13, 3, '2014-06-21', '5010', '', 10, 0, 0, 2, '2'); -INSERT INTO `0_gl_trans` VALUES(19, 13, 3, '2014-06-21', '1510', '', -10, 0, 0, 2, '2'); -INSERT INTO `0_gl_trans` VALUES(20, 10, 17, '2014-06-21', '4010', '', -50, 0, 0, 2, '2'); -INSERT INTO `0_gl_trans` VALUES(21, 10, 17, '2014-06-21', '1200', '', 52.5, 0, 0, 2, '2'); -INSERT INTO `0_gl_trans` VALUES(22, 10, 17, '2014-06-21', '2150', '', -2.5, 0, 0, 2, '2'); -INSERT INTO `0_gl_trans` VALUES(23, 13, 4, '2014-06-21', '5010', '', 10, 2, 0, 2, '3'); -INSERT INTO `0_gl_trans` VALUES(24, 13, 4, '2014-06-21', '1510', '', -10, 0, 0, 2, '3'); -INSERT INTO `0_gl_trans` VALUES(25, 10, 18, '2014-06-21', '4010', '', -50, 2, 0, 2, '3'); -INSERT INTO `0_gl_trans` VALUES(26, 10, 18, '2014-06-21', '1200', '', 52.5, 0, 0, 2, '3'); -INSERT INTO `0_gl_trans` VALUES(27, 10, 18, '2014-06-21', '2150', '', -2.5, 0, 0, 2, '3'); -INSERT INTO `0_gl_trans` VALUES(28, 0, 18, '2014-02-20', '1060', '', 1000, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(29, 0, 18, '2014-02-20', '3350', '', -1000, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(30, 0, 19, '2014-02-21', '1060', '', 4000, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(31, 0, 19, '2014-02-21', '3350', '', -4000, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(32, 26, 3, '2014-06-21', '1510', '', -20, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(33, 26, 3, '2014-06-21', '1510', '', -22, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(34, 26, 3, '2014-06-21', '1510', '', -24, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(35, 26, 3, '2014-06-21', '1540', '', 66, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(36, 2, 5, '2014-06-21', '2150', 'Cash Sales', -4.76, 0, 0, 4, '3'); -INSERT INTO `0_gl_trans` VALUES(37, 2, 5, '2014-06-21', '4010', 'Cash Sales', -95.24, 0, 0, 4, '3'); -INSERT INTO `0_gl_trans` VALUES(38, 2, 5, '2014-06-21', '1060', '', 100, 0, 0, 4, '3'); -INSERT INTO `0_gl_trans` VALUES(39, 1, 8, '2014-06-21', '2150', 'Maintenance', 2.38, 0, 0, 4, '1'); -INSERT INTO `0_gl_trans` VALUES(40, 1, 8, '2014-06-21', '5765', 'Maintenance', 47.62, 0, 0, 4, '1'); -INSERT INTO `0_gl_trans` VALUES(41, 1, 8, '2014-06-21', '1060', '', -50, 0, 0, 4, '1'); -INSERT INTO `0_gl_trans` VALUES(42, 20, 8, '2014-06-21', '2100', '', -20, 0, 0, 3, '2'); -INSERT INTO `0_gl_trans` VALUES(43, 20, 8, '2014-06-21', '2150', '', 0.95, 0, 0, 3, '2'); -INSERT INTO `0_gl_trans` VALUES(44, 20, 8, '2014-06-21', '5780', '', 19.05, 0, 0, 3, '2'); -INSERT INTO `0_gl_trans` VALUES(45, 26, 4, '2014-06-21', '1510', '', -40, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(46, 26, 4, '2014-06-21', '1510', '', -44, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(47, 26, 4, '2014-06-21', '1510', '', -48, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(48, 26, 4, '2014-06-21', '1540', '', 132, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(49, 26, 2, '2014-06-21', '1510', '', -20, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(50, 26, 2, '2014-06-21', '1510', '', -22, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(51, 26, 2, '2014-06-21', '1510', '', -24, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(52, 26, 2, '2014-06-21', '1540', '', 66, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(53, 26, 5, '2014-06-21', '1510', '', -50, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(54, 26, 5, '2014-06-21', '1510', '', -55, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(55, 26, 5, '2014-06-21', '1510', '', -60, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(56, 26, 5, '2014-06-21', '1060', 'Overhead Cost', -10, 0, 0, 1, '1'); -INSERT INTO `0_gl_trans` VALUES(57, 26, 5, '2014-06-21', '1530', 'Overhead Cost', 10, 0, 0, 1, '1'); -INSERT INTO `0_gl_trans` VALUES(58, 26, 5, '2014-06-21', '1060', 'Labour Cost', -20, 0, 0, 1, '0'); -INSERT INTO `0_gl_trans` VALUES(59, 26, 5, '2014-06-21', '1530', 'Labour Cost', 20, 0, 0, 1, '0'); -INSERT INTO `0_gl_trans` VALUES(60, 26, 5, '2014-06-21', '1540', '', 165, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(61, 26, 6, '2014-06-21', '1510', '', 50, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(62, 26, 6, '2014-06-21', '1510', '', 55, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(63, 26, 6, '2014-06-21', '1510', '', 60, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(64, 26, 6, '2014-06-21', '1540', '', -165, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(65, 26, 7, '2014-06-21', '1510', '', 20, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(66, 26, 7, '2014-06-21', '1510', '', 22, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(67, 26, 7, '2014-06-21', '1510', '', 24, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(68, 26, 7, '2014-06-21', '1060', 'Overhead Cost', -10, 0, 0, 1, '1'); -INSERT INTO `0_gl_trans` VALUES(69, 26, 7, '2014-06-21', '1530', 'Overhead Cost', 10, 0, 0, 1, '1'); -INSERT INTO `0_gl_trans` VALUES(70, 26, 7, '2014-06-21', '1060', 'Labour Cost', -20, 0, 0, 1, '0'); -INSERT INTO `0_gl_trans` VALUES(71, 26, 7, '2014-06-21', '1530', 'Labour Cost', 20, 0, 0, 1, '0'); -INSERT INTO `0_gl_trans` VALUES(72, 26, 7, '2014-06-21', '1540', '', -66, 0, 0, NULL, ''); -INSERT INTO `0_gl_trans` VALUES(73, 13, 5, '2014-06-21', '5010', '', 10, 0, 0, 2, '2'); -INSERT INTO `0_gl_trans` VALUES(74, 13, 5, '2014-06-21', '1510', '', -10, 0, 0, 2, '2'); -INSERT INTO `0_gl_trans` VALUES(75, 10, 19, '2014-06-21', '4010', '', -47.62, 0, 0, 2, '2'); -INSERT INTO `0_gl_trans` VALUES(76, 10, 19, '2014-06-21', '1200', '', 55, 0, 0, 2, '2'); -INSERT INTO `0_gl_trans` VALUES(77, 10, 19, '2014-06-21', '4430', '', -5, 0, 0, 2, '2'); -INSERT INTO `0_gl_trans` VALUES(78, 10, 19, '2014-06-21', '2150', '', -2.38, 0, 0, 2, '2'); -INSERT INTO `0_gl_trans` VALUES(79, 11, 3, '2014-06-21', '5010', '', -10, 2, 0, 2, '3'); -INSERT INTO `0_gl_trans` VALUES(80, 11, 3, '2014-06-21', '1510', '', 10, 0, 0, 2, '3'); -INSERT INTO `0_gl_trans` VALUES(81, 11, 3, '2014-06-21', '4010', '', 50, 2, 0, 2, '3'); -INSERT INTO `0_gl_trans` VALUES(82, 11, 3, '2014-06-21', '1200', '', -52.5, 0, 0, 2, '3'); -INSERT INTO `0_gl_trans` VALUES(83, 11, 3, '2014-06-21', '2150', '', 2.5, 0, 0, 2, '3'); +INSERT INTO `0_gl_trans` VALUES(1, 20, 7, '2016-06-21', '2100', '', -3465, 0, 0, 3, '2'); +INSERT INTO `0_gl_trans` VALUES(2, 20, 7, '2016-06-21', '1510', '', 1000, 0, 0, 3, '2'); +INSERT INTO `0_gl_trans` VALUES(3, 20, 7, '2016-06-21', '1510', '', 1100, 0, 0, 3, '2'); +INSERT INTO `0_gl_trans` VALUES(4, 20, 7, '2016-06-21', '1510', '', 1200, 0, 0, 3, '2'); +INSERT INTO `0_gl_trans` VALUES(5, 20, 7, '2016-06-21', '2150', '', 165, 0, 0, 3, '2'); +INSERT INTO `0_gl_trans` VALUES(6, 22, 4, '2016-06-21', '2100', '', 3465, 0, 0, 3, '2'); +INSERT INTO `0_gl_trans` VALUES(7, 22, 4, '2016-06-21', '1060', '', -3465, 0, 0, 3, '2'); +INSERT INTO `0_gl_trans` VALUES(8, 26, 1, '2016-06-21', '1510', '', -100, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(9, 26, 1, '2016-06-21', '1510', '', -110, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(10, 26, 1, '2016-06-21', '1510', '', -120, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(11, 26, 1, '2016-06-21', '1060', 'Overhead Cost', -10, 0, 0, 1, '1'); +INSERT INTO `0_gl_trans` VALUES(12, 26, 1, '2016-06-21', '1530', 'Overhead Cost', 10, 0, 0, 1, '1'); +INSERT INTO `0_gl_trans` VALUES(13, 26, 1, '2016-06-21', '1060', 'Labour Cost', -20, 0, 0, 1, '0'); +INSERT INTO `0_gl_trans` VALUES(14, 26, 1, '2016-06-21', '1530', 'Labour Cost', 20, 0, 0, 1, '0'); +INSERT INTO `0_gl_trans` VALUES(15, 26, 1, '2016-06-21', '1510', '', 330, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(16, 13, 2, '2016-06-21', '5010', '', 20, 0, 0, 2, '1'); +INSERT INTO `0_gl_trans` VALUES(17, 13, 2, '2016-06-21', '1510', '', -20, 0, 0, 2, '1'); +INSERT INTO `0_gl_trans` VALUES(18, 13, 3, '2016-06-21', '5010', '', 10, 0, 0, 2, '2'); +INSERT INTO `0_gl_trans` VALUES(19, 13, 3, '2016-06-21', '1510', '', -10, 0, 0, 2, '2'); +INSERT INTO `0_gl_trans` VALUES(20, 10, 17, '2016-06-21', '4010', '', -50, 0, 0, 2, '2'); +INSERT INTO `0_gl_trans` VALUES(21, 10, 17, '2016-06-21', '1200', '', 52.5, 0, 0, 2, '2'); +INSERT INTO `0_gl_trans` VALUES(22, 10, 17, '2016-06-21', '2150', '', -2.5, 0, 0, 2, '2'); +INSERT INTO `0_gl_trans` VALUES(23, 13, 4, '2016-06-21', '5010', '', 10, 2, 0, 2, '3'); +INSERT INTO `0_gl_trans` VALUES(24, 13, 4, '2016-06-21', '1510', '', -10, 0, 0, 2, '3'); +INSERT INTO `0_gl_trans` VALUES(25, 10, 18, '2016-06-21', '4010', '', -50, 2, 0, 2, '3'); +INSERT INTO `0_gl_trans` VALUES(26, 10, 18, '2016-06-21', '1200', '', 52.5, 0, 0, 2, '3'); +INSERT INTO `0_gl_trans` VALUES(27, 10, 18, '2016-06-21', '2150', '', -2.5, 0, 0, 2, '3'); +INSERT INTO `0_gl_trans` VALUES(28, 0, 18, '2016-02-20', '1060', '', 1000, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(29, 0, 18, '2016-02-20', '3350', '', -1000, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(30, 0, 19, '2016-02-21', '1060', '', 4000, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(31, 0, 19, '2016-02-21', '3350', '', -4000, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(32, 26, 3, '2016-06-21', '1510', '', -20, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(33, 26, 3, '2016-06-21', '1510', '', -22, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(34, 26, 3, '2016-06-21', '1510', '', -24, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(35, 26, 3, '2016-06-21', '1540', '', 66, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(36, 2, 5, '2016-06-21', '2150', 'Cash Sales', -4.76, 0, 0, 4, '3'); +INSERT INTO `0_gl_trans` VALUES(37, 2, 5, '2016-06-21', '4010', 'Cash Sales', -95.24, 0, 0, 4, '3'); +INSERT INTO `0_gl_trans` VALUES(38, 2, 5, '2016-06-21', '1060', '', 100, 0, 0, 4, '3'); +INSERT INTO `0_gl_trans` VALUES(39, 1, 8, '2016-06-21', '2150', 'Maintenance', 2.38, 0, 0, 4, '1'); +INSERT INTO `0_gl_trans` VALUES(40, 1, 8, '2016-06-21', '5765', 'Maintenance', 47.62, 0, 0, 4, '1'); +INSERT INTO `0_gl_trans` VALUES(41, 1, 8, '2016-06-21', '1060', '', -50, 0, 0, 4, '1'); +INSERT INTO `0_gl_trans` VALUES(42, 20, 8, '2016-06-21', '2100', '', -20, 0, 0, 3, '2'); +INSERT INTO `0_gl_trans` VALUES(43, 20, 8, '2016-06-21', '2150', '', 0.95, 0, 0, 3, '2'); +INSERT INTO `0_gl_trans` VALUES(44, 20, 8, '2016-06-21', '5780', '', 19.05, 0, 0, 3, '2'); +INSERT INTO `0_gl_trans` VALUES(45, 26, 4, '2016-06-21', '1510', '', -40, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(46, 26, 4, '2016-06-21', '1510', '', -44, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(47, 26, 4, '2016-06-21', '1510', '', -48, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(48, 26, 4, '2016-06-21', '1540', '', 132, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(49, 26, 2, '2016-06-21', '1510', '', -20, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(50, 26, 2, '2016-06-21', '1510', '', -22, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(51, 26, 2, '2016-06-21', '1510', '', -24, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(52, 26, 2, '2016-06-21', '1540', '', 66, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(53, 26, 5, '2016-06-21', '1510', '', -50, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(54, 26, 5, '2016-06-21', '1510', '', -55, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(55, 26, 5, '2016-06-21', '1510', '', -60, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(56, 26, 5, '2016-06-21', '1060', 'Overhead Cost', -10, 0, 0, 1, '1'); +INSERT INTO `0_gl_trans` VALUES(57, 26, 5, '2016-06-21', '1530', 'Overhead Cost', 10, 0, 0, 1, '1'); +INSERT INTO `0_gl_trans` VALUES(58, 26, 5, '2016-06-21', '1060', 'Labour Cost', -20, 0, 0, 1, '0'); +INSERT INTO `0_gl_trans` VALUES(59, 26, 5, '2016-06-21', '1530', 'Labour Cost', 20, 0, 0, 1, '0'); +INSERT INTO `0_gl_trans` VALUES(60, 26, 5, '2016-06-21', '1540', '', 165, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(61, 26, 6, '2016-06-21', '1510', '', 50, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(62, 26, 6, '2016-06-21', '1510', '', 55, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(63, 26, 6, '2016-06-21', '1510', '', 60, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(64, 26, 6, '2016-06-21', '1540', '', -165, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(65, 26, 7, '2016-06-21', '1510', '', 20, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(66, 26, 7, '2016-06-21', '1510', '', 22, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(67, 26, 7, '2016-06-21', '1510', '', 24, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(68, 26, 7, '2016-06-21', '1060', 'Overhead Cost', -10, 0, 0, 1, '1'); +INSERT INTO `0_gl_trans` VALUES(69, 26, 7, '2016-06-21', '1530', 'Overhead Cost', 10, 0, 0, 1, '1'); +INSERT INTO `0_gl_trans` VALUES(70, 26, 7, '2016-06-21', '1060', 'Labour Cost', -20, 0, 0, 1, '0'); +INSERT INTO `0_gl_trans` VALUES(71, 26, 7, '2016-06-21', '1530', 'Labour Cost', 20, 0, 0, 1, '0'); +INSERT INTO `0_gl_trans` VALUES(72, 26, 7, '2016-06-21', '1540', '', -66, 0, 0, NULL, ''); +INSERT INTO `0_gl_trans` VALUES(73, 13, 5, '2016-06-21', '5010', '', 10, 0, 0, 2, '2'); +INSERT INTO `0_gl_trans` VALUES(74, 13, 5, '2016-06-21', '1510', '', -10, 0, 0, 2, '2'); +INSERT INTO `0_gl_trans` VALUES(75, 10, 19, '2016-06-21', '4010', '', -47.62, 0, 0, 2, '2'); +INSERT INTO `0_gl_trans` VALUES(76, 10, 19, '2016-06-21', '1200', '', 55, 0, 0, 2, '2'); +INSERT INTO `0_gl_trans` VALUES(77, 10, 19, '2016-06-21', '4430', '', -5, 0, 0, 2, '2'); +INSERT INTO `0_gl_trans` VALUES(78, 10, 19, '2016-06-21', '2150', '', -2.38, 0, 0, 2, '2'); +INSERT INTO `0_gl_trans` VALUES(79, 11, 3, '2016-06-21', '5010', '', -10, 2, 0, 2, '3'); +INSERT INTO `0_gl_trans` VALUES(80, 11, 3, '2016-06-21', '1510', '', 10, 0, 0, 2, '3'); +INSERT INTO `0_gl_trans` VALUES(81, 11, 3, '2016-06-21', '4010', '', 50, 2, 0, 2, '3'); +INSERT INTO `0_gl_trans` VALUES(82, 11, 3, '2016-06-21', '1200', '', -52.5, 0, 0, 2, '3'); +INSERT INTO `0_gl_trans` VALUES(83, 11, 3, '2016-06-21', '2150', '', 2.5, 0, 0, 2, '3'); -- -------------------------------------------------------- @@ -965,7 +962,7 @@ CREATE TABLE IF NOT EXISTS `0_grn_batch` ( -- Dumping data for table `0_grn_batch` -- -INSERT INTO `0_grn_batch` VALUES(1, 2, 1, '1', '2014-06-21', 'DEF'); +INSERT INTO `0_grn_batch` VALUES(1, 2, 1, '1', '2016-06-21', 'DEF'); -- -------------------------------------------------------- @@ -1343,8 +1340,8 @@ CREATE TABLE IF NOT EXISTS `0_purch_orders` ( -- Dumping data for table `0_purch_orders` -- -INSERT INTO `0_purch_orders` VALUES(1, 2, '', '2014-06-01', '1', '', 'DEF', 'Delivery 1\nDelivery 2\nDelivery 3', 0, 0); -INSERT INTO `0_purch_orders` VALUES(2, 3, '', '2014-06-21', '2', '', 'DEF', 'Delivery 1\nDelivery 2\nDelivery 3', 0, 0); +INSERT INTO `0_purch_orders` VALUES(1, 2, '', '2016-06-01', '1', '', 'DEF', 'Delivery 1\nDelivery 2\nDelivery 3', 0, 0); +INSERT INTO `0_purch_orders` VALUES(2, 3, '', '2016-06-21', '2', '', 'DEF', 'Delivery 1\nDelivery 2\nDelivery 3', 0, 0); -- -------------------------------------------------------- @@ -1373,11 +1370,11 @@ CREATE TABLE IF NOT EXISTS `0_purch_order_details` ( -- Dumping data for table `0_purch_order_details` -- -INSERT INTO `0_purch_order_details` VALUES(1, 1, '102', '17inch VGA Monitor', '2014-07-01', 100, 10, 10, 10, 100, 100); -INSERT INTO `0_purch_order_details` VALUES(2, 1, '103', '32MB VGA Card', '2014-07-01', 100, 11, 11, 11, 100, 100); -INSERT INTO `0_purch_order_details` VALUES(3, 1, '104', '52x CD Drive', '2014-07-01', 100, 12, 12, 12, 100, 100); -INSERT INTO `0_purch_order_details` VALUES(4, 2, '102', '17inch VGA Monitor', '2014-07-01', 0, 5, 0, 0, 1, 0); -INSERT INTO `0_purch_order_details` VALUES(5, 2, '103', '32MB VGA Card', '2014-07-01', 0, 5, 0, 0, 1, 0); +INSERT INTO `0_purch_order_details` VALUES(1, 1, '102', '17inch VGA Monitor', '2016-07-01', 100, 10, 10, 10, 100, 100); +INSERT INTO `0_purch_order_details` VALUES(2, 1, '103', '32MB VGA Card', '2016-07-01', 100, 11, 11, 11, 100, 100); +INSERT INTO `0_purch_order_details` VALUES(3, 1, '104', '52x CD Drive', '2016-07-01', 100, 12, 12, 12, 100, 100); +INSERT INTO `0_purch_order_details` VALUES(4, 2, '102', '17inch VGA Monitor', '2016-07-01', 0, 5, 0, 0, 1, 0); +INSERT INTO `0_purch_order_details` VALUES(5, 2, '103', '32MB VGA Card', '2016-07-01', 0, 5, 0, 0, 1, 0); -- -------------------------------------------------------- @@ -1547,11 +1544,11 @@ CREATE TABLE IF NOT EXISTS `0_sales_orders` ( -- Dumping data for table `0_sales_orders` -- -INSERT INTO `0_sales_orders` VALUES(1, 30, 1, 0, 1, 1, '1', '', '', '2014-06-21', 2, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Beefeater Ltd.', 10, 'DEF', '2014-06-22', 3, 0); -INSERT INTO `0_sales_orders` VALUES(2, 30, 1, 0, 2, 2, '2', '', '', '2014-06-21', 1, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Ghostbusters Corp.', 0, 'DEF', '2014-06-22', 4, 0); -INSERT INTO `0_sales_orders` VALUES(3, 30, 1, 0, 3, 3, '3', '', '', '2014-06-21', 2, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Brezan', 0, 'DEF', '2014-07-01', 3, 0); -INSERT INTO `0_sales_orders` VALUES(4, 30, 0, 0, 1, 1, '4', '', '', '2014-06-21', 2, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Beefeater Ltd.', 0, 'DEF', '2014-06-22', 3, 0); -INSERT INTO `0_sales_orders` VALUES(5, 30, 1, 0, 2, 2, '5', '', '', '2014-06-21', 1, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Ghostbusters Corp.', 5, 'DEF', '2014-06-22', 4, 0); +INSERT INTO `0_sales_orders` VALUES(1, 30, 1, 0, 1, 1, '1', '', '', '2016-06-21', 2, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Beefeater Ltd.', 10, 'DEF', '2016-06-22', 3, 0); +INSERT INTO `0_sales_orders` VALUES(2, 30, 1, 0, 2, 2, '2', '', '', '2016-06-21', 1, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Ghostbusters Corp.', 0, 'DEF', '2016-06-22', 4, 0); +INSERT INTO `0_sales_orders` VALUES(3, 30, 1, 0, 3, 3, '3', '', '', '2016-06-21', 2, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Brezan', 0, 'DEF', '2016-07-01', 3, 0); +INSERT INTO `0_sales_orders` VALUES(4, 30, 0, 0, 1, 1, '4', '', '', '2016-06-21', 2, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Beefeater Ltd.', 0, 'DEF', '2016-06-22', 3, 0); +INSERT INTO `0_sales_orders` VALUES(5, 30, 1, 0, 2, 2, '5', '', '', '2016-06-21', 1, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Ghostbusters Corp.', 5, 'DEF', '2016-06-22', 4, 0); -- -------------------------------------------------------- @@ -1819,42 +1816,42 @@ CREATE TABLE IF NOT EXISTS `0_stock_moves` ( -- Dumping data for table `0_stock_moves` -- -INSERT INTO `0_stock_moves` VALUES(1, 1, '102', 25, 'DEF', '2014-06-21', 2, 10, '', 100, 0, 10, 1); -INSERT INTO `0_stock_moves` VALUES(2, 1, '103', 25, 'DEF', '2014-06-21', 2, 11, '', 100, 0, 11, 1); -INSERT INTO `0_stock_moves` VALUES(3, 1, '104', 25, 'DEF', '2014-06-21', 2, 12, '', 100, 0, 12, 1); -INSERT INTO `0_stock_moves` VALUES(4, 1, '102', 26, 'DEF', '2014-06-21', 0, 0, '1', -10, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(5, 1, '103', 26, 'DEF', '2014-06-21', 0, 0, '1', -10, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(6, 1, '104', 26, 'DEF', '2014-06-21', 0, 0, '1', -10, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(7, 1, '3400', 26, 'DEF', '2014-06-21', 0, 0, '1', 10, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(8, 2, '102', 13, 'DEF', '2014-06-21', 0, 30.4, '1', -2, 0, 10, 1); -INSERT INTO `0_stock_moves` VALUES(9, 3, '102', 13, 'DEF', '2014-06-21', 0, 50, 'auto', -1, 0, 10, 1); -INSERT INTO `0_stock_moves` VALUES(10, 4, '102', 13, 'DEF', '2014-06-21', 0, 35.89, 'auto', -1, 0, 10, 1); -INSERT INTO `0_stock_moves` VALUES(11, 3, '102', 26, 'DEF', '2014-06-21', 0, 0, '3', -2, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(12, 3, '103', 26, 'DEF', '2014-06-21', 0, 0, '3', -2, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(13, 3, '104', 26, 'DEF', '2014-06-21', 0, 0, '3', -2, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(14, 3, '3400', 26, 'DEF', '2014-06-21', 0, 0, '3', 2, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(15, 4, '102', 26, 'DEF', '2014-06-21', 0, 0, '4', -4, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(16, 4, '103', 26, 'DEF', '2014-06-21', 0, 0, '4', -4, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(17, 4, '104', 26, 'DEF', '2014-06-21', 0, 0, '4', -4, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(18, 4, '3400', 26, 'DEF', '2014-06-21', 0, 0, '4', 4, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(19, 2, '102', 26, 'DEF', '2014-06-21', 0, 0, '', -2, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(20, 2, '103', 26, 'DEF', '2014-06-21', 0, 0, '', -2, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(21, 2, '104', 26, 'DEF', '2014-06-21', 0, 0, '', -2, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(22, 1, '3400', 29, 'DEF', '2014-06-21', 0, 0, '', 2, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(23, 5, '102', 26, 'DEF', '2014-06-21', 0, 0, '5', -5, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(24, 5, '103', 26, 'DEF', '2014-06-21', 0, 0, '5', -5, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(25, 5, '104', 26, 'DEF', '2014-06-21', 0, 0, '5', -5, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(26, 5, '3400', 26, 'DEF', '2014-06-21', 0, 0, '5', 5, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(27, 6, '102', 26, 'DEF', '2014-06-21', 0, 0, '6', 5, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(28, 6, '103', 26, 'DEF', '2014-06-21', 0, 0, '6', 5, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(29, 6, '104', 26, 'DEF', '2014-06-21', 0, 0, '6', 5, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(30, 6, '3400', 26, 'DEF', '2014-06-21', 0, 0, '6', -5, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(31, 7, '102', 26, 'DEF', '2014-06-21', 0, 0, '7', 2, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(32, 7, '103', 26, 'DEF', '2014-06-21', 0, 0, '7', 2, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(33, 7, '104', 26, 'DEF', '2014-06-21', 0, 0, '7', 2, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(34, 7, '3400', 26, 'DEF', '2014-06-21', 0, 0, '7', -2, 0, 0, 1); -INSERT INTO `0_stock_moves` VALUES(35, 5, '102', 13, 'DEF', '2014-06-21', 0, 50, 'auto', -1, 0, 10, 1); -INSERT INTO `0_stock_moves` VALUES(36, 3, '102', 11, 'DEF', '2014-06-21', 0, 37.68, 'Return Ex Inv: 18', 1, 0, 10, 0); +INSERT INTO `0_stock_moves` VALUES(1, 1, '102', 25, 'DEF', '2016-06-21', 2, 10, '', 100, 0, 10, 1); +INSERT INTO `0_stock_moves` VALUES(2, 1, '103', 25, 'DEF', '2016-06-21', 2, 11, '', 100, 0, 11, 1); +INSERT INTO `0_stock_moves` VALUES(3, 1, '104', 25, 'DEF', '2016-06-21', 2, 12, '', 100, 0, 12, 1); +INSERT INTO `0_stock_moves` VALUES(4, 1, '102', 26, 'DEF', '2016-06-21', 0, 0, '1', -10, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(5, 1, '103', 26, 'DEF', '2016-06-21', 0, 0, '1', -10, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(6, 1, '104', 26, 'DEF', '2016-06-21', 0, 0, '1', -10, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(7, 1, '3400', 26, 'DEF', '2016-06-21', 0, 0, '1', 10, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(8, 2, '102', 13, 'DEF', '2016-06-21', 0, 30.4, '1', -2, 0, 10, 1); +INSERT INTO `0_stock_moves` VALUES(9, 3, '102', 13, 'DEF', '2016-06-21', 0, 50, 'auto', -1, 0, 10, 1); +INSERT INTO `0_stock_moves` VALUES(10, 4, '102', 13, 'DEF', '2016-06-21', 0, 35.89, 'auto', -1, 0, 10, 1); +INSERT INTO `0_stock_moves` VALUES(11, 3, '102', 26, 'DEF', '2016-06-21', 0, 0, '3', -2, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(12, 3, '103', 26, 'DEF', '2016-06-21', 0, 0, '3', -2, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(13, 3, '104', 26, 'DEF', '2016-06-21', 0, 0, '3', -2, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(14, 3, '3400', 26, 'DEF', '2016-06-21', 0, 0, '3', 2, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(15, 4, '102', 26, 'DEF', '2016-06-21', 0, 0, '4', -4, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(16, 4, '103', 26, 'DEF', '2016-06-21', 0, 0, '4', -4, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(17, 4, '104', 26, 'DEF', '2016-06-21', 0, 0, '4', -4, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(18, 4, '3400', 26, 'DEF', '2016-06-21', 0, 0, '4', 4, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(19, 2, '102', 26, 'DEF', '2016-06-21', 0, 0, '', -2, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(20, 2, '103', 26, 'DEF', '2016-06-21', 0, 0, '', -2, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(21, 2, '104', 26, 'DEF', '2016-06-21', 0, 0, '', -2, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(22, 1, '3400', 29, 'DEF', '2016-06-21', 0, 0, '', 2, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(23, 5, '102', 26, 'DEF', '2016-06-21', 0, 0, '5', -5, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(24, 5, '103', 26, 'DEF', '2016-06-21', 0, 0, '5', -5, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(25, 5, '104', 26, 'DEF', '2016-06-21', 0, 0, '5', -5, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(26, 5, '3400', 26, 'DEF', '2016-06-21', 0, 0, '5', 5, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(27, 6, '102', 26, 'DEF', '2016-06-21', 0, 0, '6', 5, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(28, 6, '103', 26, 'DEF', '2016-06-21', 0, 0, '6', 5, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(29, 6, '104', 26, 'DEF', '2016-06-21', 0, 0, '6', 5, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(30, 6, '3400', 26, 'DEF', '2016-06-21', 0, 0, '6', -5, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(31, 7, '102', 26, 'DEF', '2016-06-21', 0, 0, '7', 2, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(32, 7, '103', 26, 'DEF', '2016-06-21', 0, 0, '7', 2, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(33, 7, '104', 26, 'DEF', '2016-06-21', 0, 0, '7', 2, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(34, 7, '3400', 26, 'DEF', '2016-06-21', 0, 0, '7', -2, 0, 0, 1); +INSERT INTO `0_stock_moves` VALUES(35, 5, '102', 13, 'DEF', '2016-06-21', 0, 50, 'auto', -1, 0, 10, 1); +INSERT INTO `0_stock_moves` VALUES(36, 3, '102', 11, 'DEF', '2016-06-21', 0, 37.68, 'Return Ex Inv: 18', 1, 0, 10, 0); -- -------------------------------------------------------- @@ -1922,7 +1919,7 @@ CREATE TABLE IF NOT EXISTS `0_supp_allocations` ( -- Dumping data for table `0_supp_allocations` -- -INSERT INTO `0_supp_allocations` VALUES(1, 3465, '2014-06-21', 4, 22, 7, 20); +INSERT INTO `0_supp_allocations` VALUES(1, 3465, '2016-06-21', 4, 22, 7, 20); -- -------------------------------------------------------- @@ -1990,9 +1987,9 @@ CREATE TABLE IF NOT EXISTS `0_supp_trans` ( -- Dumping data for table `0_supp_trans` -- -INSERT INTO `0_supp_trans` VALUES(7, 20, 2, '1', '5t', '2014-06-21', '2014-07-01', 3300, 0, 165, 1, 3465, 0); -INSERT INTO `0_supp_trans` VALUES(8, 20, 2, '2', 'cc', '2014-06-21', '2014-07-01', 20, 0, 0, 1, 0, 0); -INSERT INTO `0_supp_trans` VALUES(4, 22, 2, '1', '', '2014-06-21', '2014-06-21', -3465, 0, 0, 1, 3465, 0); +INSERT INTO `0_supp_trans` VALUES(7, 20, 2, '1', '5t', '2016-06-21', '2016-07-01', 3300, 0, 165, 1, 3465, 0); +INSERT INTO `0_supp_trans` VALUES(8, 20, 2, '2', 'cc', '2016-06-21', '2016-07-01', 20, 0, 0, 1, 0, 0); +INSERT INTO `0_supp_trans` VALUES(4, 22, 2, '1', '', '2016-06-21', '2016-06-21', -3465, 0, 0, 1, 3465, 0); -- -------------------------------------------------------- @@ -2243,17 +2240,17 @@ CREATE TABLE IF NOT EXISTS `0_trans_tax_details` ( -- Dumping data for table `0_trans_tax_details` -- -INSERT INTO `0_trans_tax_details` VALUES(1, 20, 7, '2014-06-21', 1, 5, 1, 0, 3300, 165, '5t'); -INSERT INTO `0_trans_tax_details` VALUES(2, 13, 3, '2014-06-21', 1, 5, 1, 0, 50, 2.5, 'auto'); -INSERT INTO `0_trans_tax_details` VALUES(3, 10, 17, '2014-06-21', 1, 5, 1, 0, 50, 2.5, '1'); -INSERT INTO `0_trans_tax_details` VALUES(4, 13, 4, '2014-06-21', 1, 5, 1.3932, 0, 35.89, 1.7945, 'auto'); -INSERT INTO `0_trans_tax_details` VALUES(5, 10, 18, '2014-06-21', 1, 5, 1.3932, 0, 35.89, 1.7945, '2'); -INSERT INTO `0_trans_tax_details` VALUES(6, 2, 5, '2014-06-21', 1, 5, 1, 0, 95.2, 4.76, ''); -INSERT INTO `0_trans_tax_details` VALUES(7, 1, 8, '2014-06-21', 1, 5, 1, 0, -47.6, -2.38, ''); -INSERT INTO `0_trans_tax_details` VALUES(8, 20, 8, '2014-06-21', 1, 5, 1, 0, -19, -0.95, 'cc'); -INSERT INTO `0_trans_tax_details` VALUES(9, 13, 5, '2014-06-21', 1, 5, 1, 1, 47.619047619048, 2.3809523809524, 'auto'); -INSERT INTO `0_trans_tax_details` VALUES(10, 10, 19, '2014-06-21', 1, 5, 1, 1, 47.619047619048, 2.3809523809524, '3'); -INSERT INTO `0_trans_tax_details` VALUES(11, 11, 3, '2014-06-21', 1, 5, 1.3932, 0, 35.89, 1.7945, '1'); +INSERT INTO `0_trans_tax_details` VALUES(1, 20, 7, '2016-06-21', 1, 5, 1, 0, 3300, 165, '5t'); +INSERT INTO `0_trans_tax_details` VALUES(2, 13, 3, '2016-06-21', 1, 5, 1, 0, 50, 2.5, 'auto'); +INSERT INTO `0_trans_tax_details` VALUES(3, 10, 17, '2016-06-21', 1, 5, 1, 0, 50, 2.5, '1'); +INSERT INTO `0_trans_tax_details` VALUES(4, 13, 4, '2016-06-21', 1, 5, 1.3932, 0, 35.89, 1.7945, 'auto'); +INSERT INTO `0_trans_tax_details` VALUES(5, 10, 18, '2016-06-21', 1, 5, 1.3932, 0, 35.89, 1.7945, '2'); +INSERT INTO `0_trans_tax_details` VALUES(6, 2, 5, '2016-06-21', 1, 5, 1, 0, 95.2, 4.76, ''); +INSERT INTO `0_trans_tax_details` VALUES(7, 1, 8, '2016-06-21', 1, 5, 1, 0, -47.6, -2.38, ''); +INSERT INTO `0_trans_tax_details` VALUES(8, 20, 8, '2016-06-21', 1, 5, 1, 0, -19, -0.95, 'cc'); +INSERT INTO `0_trans_tax_details` VALUES(9, 13, 5, '2016-06-21', 1, 5, 1, 1, 47.619047619048, 2.3809523809524, 'auto'); +INSERT INTO `0_trans_tax_details` VALUES(10, 10, 19, '2016-06-21', 1, 5, 1, 1, 47.619047619048, 2.3809523809524, '3'); +INSERT INTO `0_trans_tax_details` VALUES(11, 11, 3, '2016-06-21', 1, 5, 1.3932, 0, 35.89, 1.7945, '1'); -- -------------------------------------------------------- @@ -2323,8 +2320,8 @@ CREATE TABLE IF NOT EXISTS `0_users` ( -- Dumping data for table `0_users` -- -INSERT INTO `0_users` VALUES(1, 'admin', '5f4dcc3b5aa765d61d8327deb882cf99', 'Administrator', 2, '', 'adm@adm.com', 'en_US', 0, 0, 0, 0, 'default', 'Letter', 2, 2, 4, 1, 1, 0, 0, '2014-05-11 23:27:46', 10, 1, 1, '1', 1, 0, 'orders', 0); -INSERT INTO `0_users` VALUES(2, 'demouser', '5f4dcc3b5aa765d61d8327deb882cf99', 'Demo User', 9, '999-999-999', 'demo@demo.nu', 'en_US', 0, 0, 0, 0, 'default', 'Letter', 2, 2, 3, 1, 1, 0, 0, '2014-02-06 19:02:35', 10, 1, 1, '1', 1, 0, 'orders', 0); +INSERT INTO `0_users` VALUES(1, 'admin', '5f4dcc3b5aa765d61d8327deb882cf99', 'Administrator', 2, '', 'adm@adm.com', 'en_US', 0, 0, 0, 0, 'default', 'Letter', 2, 2, 4, 1, 1, 0, 0, '2016-05-11 23:27:46', 10, 1, 1, '1', 1, 0, 'orders', 0); +INSERT INTO `0_users` VALUES(2, 'demouser', '5f4dcc3b5aa765d61d8327deb882cf99', 'Demo User', 9, '999-999-999', 'demo@demo.nu', 'en_US', 0, 0, 0, 0, 'default', 'Letter', 2, 2, 3, 1, 1, 0, 0, '2016-02-06 19:02:35', 10, 1, 1, '1', 1, 0, 'orders', 0); -- -------------------------------------------------------- @@ -2397,13 +2394,13 @@ CREATE TABLE IF NOT EXISTS `0_workorders` ( -- Dumping data for table `0_workorders` -- -INSERT INTO `0_workorders` VALUES(1, '1', 'DEF', 10, '3400', '2014-06-21', 0, '2014-06-21', '2014-06-21', 10, 1, 1, 10); -INSERT INTO `0_workorders` VALUES(2, '2', 'DEF', 3, '3400', '2014-06-21', 2, '2014-07-11', '2014-06-21', 2, 0, 1, 0); -INSERT INTO `0_workorders` VALUES(3, '3', 'DEF', 2, '3400', '2014-06-21', 0, '2014-06-21', '2014-06-21', 2, 1, 1, 0); -INSERT INTO `0_workorders` VALUES(4, '4', 'DEF', 4, '3400', '2014-06-21', 0, '2014-06-21', '2014-06-21', 4, 1, 1, 0); -INSERT INTO `0_workorders` VALUES(5, '5', 'DEF', 5, '3400', '2014-06-21', 0, '2014-06-21', '2014-06-21', 5, 1, 1, 10); -INSERT INTO `0_workorders` VALUES(6, '6', 'DEF', -5, '3400', '2014-06-21', 1, '2014-06-21', '2014-06-21', -5, 1, 1, 0); -INSERT INTO `0_workorders` VALUES(7, '7', 'DEF', -2, '3400', '2014-06-21', 1, '2014-06-21', '2014-06-21', -2, 1, 1, 10); +INSERT INTO `0_workorders` VALUES(1, '1', 'DEF', 10, '3400', '2016-06-21', 0, '2016-06-21', '2016-06-21', 10, 1, 1, 10); +INSERT INTO `0_workorders` VALUES(2, '2', 'DEF', 3, '3400', '2016-06-21', 2, '2016-07-11', '2016-06-21', 2, 0, 1, 0); +INSERT INTO `0_workorders` VALUES(3, '3', 'DEF', 2, '3400', '2016-06-21', 0, '2016-06-21', '2016-06-21', 2, 1, 1, 0); +INSERT INTO `0_workorders` VALUES(4, '4', 'DEF', 4, '3400', '2016-06-21', 0, '2016-06-21', '2016-06-21', 4, 1, 1, 0); +INSERT INTO `0_workorders` VALUES(5, '5', 'DEF', 5, '3400', '2016-06-21', 0, '2016-06-21', '2016-06-21', 5, 1, 1, 10); +INSERT INTO `0_workorders` VALUES(6, '6', 'DEF', -5, '3400', '2016-06-21', 1, '2016-06-21', '2016-06-21', -5, 1, 1, 0); +INSERT INTO `0_workorders` VALUES(7, '7', 'DEF', -2, '3400', '2016-06-21', 1, '2016-06-21', '2016-06-21', -2, 1, 1, 10); -- -------------------------------------------------------- @@ -2469,7 +2466,7 @@ CREATE TABLE IF NOT EXISTS `0_wo_manufacture` ( -- Dumping data for table `0_wo_manufacture` -- -INSERT INTO `0_wo_manufacture` VALUES(1, '1', 2, 2, '2014-06-21'); +INSERT INTO `0_wo_manufacture` VALUES(1, '1', 2, 2, '2016-06-21'); -- -------------------------------------------------------- diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql index d0fabd3c..7fcdb114 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 @@ -762,8 +762,7 @@ CREATE TABLE IF NOT EXISTS `0_fiscal_year` ( -- Dumping data for table `0_fiscal_year` -- -INSERT INTO `0_fiscal_year` VALUES(1, '2013-01-01', '2013-12-31', 0); -INSERT INTO `0_fiscal_year` VALUES(2, '2014-01-01', '2014-12-31', 0); +INSERT INTO `0_fiscal_year` VALUES(2, '2016-01-01', '2016-12-31', 0); -- -- Table structure for table `0_gl_trans` diff --git a/version.php b/version.php index ecdc4a51..1d9ec373 100644 --- a/version.php +++ b/version.php @@ -9,7 +9,7 @@ $db_version = "2.3rc"; // application version - can be overriden in config.php if (!isset($version)) - $version = "2.3.25"; + $version = "2.3.26"; //====================================================================== // Extension packages repository settings -- 2.30.2