From 49bea53e765ef3c86cfa3f44c9f0710376ec5a02 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Mon, 18 Jun 2012 21:13:16 +0200 Subject: [PATCH] Further fixes to prepayment mode (updated init scripts and sql query in get_sales_order_header) --- sales/includes/db/sales_order_db.inc | 4 ++-- sql/en_US-demo.sql | 11 ++++++----- sql/en_US-new.sql | 1 + 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sales/includes/db/sales_order_db.inc b/sales/includes/db/sales_order_db.inc index 1c363a6c..5c72a6e4 100644 --- a/sales/includes/db/sales_order_db.inc +++ b/sales/includes/db/sales_order_db.inc @@ -304,10 +304,10 @@ function get_sales_order_header($order_no, $trans_type) ."sorder.prep_amount>0 as prepaid" ." FROM ".TB_PREF."sales_orders sorder LEFT JOIN (SELECT trans_no_to, sum(amt) ord_allocs FROM ".TB_PREF."cust_allocations - WHERE trans_type_to=".ST_SALESORDER." AND trans_no_to=".db_escape($order_no).") + WHERE trans_type_to=".ST_SALESORDER." AND trans_no_to=".db_escape($order_no)." GROUP BY trans_no_to) allocs ON sorder.trans_type=".ST_SALESORDER." AND allocs.trans_no_to=sorder.order_no LEFT JOIN (SELECT order_, sum(alloc) inv_allocs FROM ".TB_PREF."debtor_trans - WHERE type=".ST_SALESINVOICE." AND order_=".db_escape($order_no).") + WHERE type=".ST_SALESINVOICE." AND order_=".db_escape($order_no)." GROUP BY order_) inv ON sorder.trans_type=".ST_SALESORDER." AND inv.order_=sorder.order_no," .TB_PREF."debtors_master cust," .TB_PREF."sales_types stype, " diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql index a9b83ffa..a31f788f 100644 --- a/sql/en_US-demo.sql +++ b/sql/en_US-demo.sql @@ -1580,6 +1580,7 @@ CREATE TABLE IF NOT EXISTS `0_sales_order_details` ( `qty_sent` double NOT NULL default '0', `unit_price` double NOT NULL default '0', `quantity` double NOT NULL default '0', + `invoiced` double NOT NULL DEFAULT '0', `discount_percent` double NOT NULL default '0', PRIMARY KEY (`id`), KEY `sorder` (`trans_type`,`order_no`), @@ -1590,11 +1591,11 @@ CREATE TABLE IF NOT EXISTS `0_sales_order_details` ( -- Dumping data for table `0_sales_order_details` -- -INSERT INTO `0_sales_order_details` VALUES(1, 1, 30, '102', '17inch VGA Monitor', 2, 30.4, 2, 0); -INSERT INTO `0_sales_order_details` VALUES(2, 2, 30, '102', '17inch VGA Monitor', 1, 50, 1, 0); -INSERT INTO `0_sales_order_details` VALUES(3, 3, 30, '102', '17inch VGA Monitor', 1, 35.89, 1, 0); -INSERT INTO `0_sales_order_details` VALUES(4, 4, 30, '102', '17inch VGA Monitor', 0, 21.28, 2, 0); -INSERT INTO `0_sales_order_details` VALUES(5, 5, 30, '102', '17inch VGA Monitor', 1, 50, 1, 0); +INSERT INTO `0_sales_order_details` VALUES(1, 1, 30, '102', '17inch VGA Monitor', 2, 30.4, 2, 0, 0); +INSERT INTO `0_sales_order_details` VALUES(2, 2, 30, '102', '17inch VGA Monitor', 1, 50, 1, 0, 0); +INSERT INTO `0_sales_order_details` VALUES(3, 3, 30, '102', '17inch VGA Monitor', 1, 35.89, 1, 0, 0); +INSERT INTO `0_sales_order_details` VALUES(4, 4, 30, '102', '17inch VGA Monitor', 0, 21.28, 2, 0, 0); +INSERT INTO `0_sales_order_details` VALUES(5, 5, 30, '102', '17inch VGA Monitor', 1, 50, 1, 0, 0); -- -------------------------------------------------------- diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql index 092833a0..e27a55b4 100644 --- a/sql/en_US-new.sql +++ b/sql/en_US-new.sql @@ -1397,6 +1397,7 @@ CREATE TABLE IF NOT EXISTS `0_sales_order_details` ( `qty_sent` double NOT NULL default '0', `unit_price` double NOT NULL default '0', `quantity` double NOT NULL default '0', + `invoiced` double NOT NULL DEFAULT '0', `discount_percent` double NOT NULL default '0', PRIMARY KEY (`id`), KEY `sorder` (`trans_type`,`order_no`), -- 2.30.2