projects
/
fa-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a1362f3
)
0001501: Price null when editing an order with a price list
author
Joe Hunt
<joe.hunt.consulting@gmail.com>
Sun, 8 Apr 2012 13:02:00 +0000
(15:02 +0200)
committer
Joe Hunt
<joe.hunt.consulting@gmail.com>
Sun, 8 Apr 2012 13:02:00 +0000
(15:02 +0200)
sales/includes/db/sales_order_db.inc
patch
|
blob
|
history
diff --git
a/sales/includes/db/sales_order_db.inc
b/sales/includes/db/sales_order_db.inc
index e4eaa5c15a4d69908b393cad61ea32a49e6feb6b..ab7f560035275b0317f6d2762647895102500f77 100644
(file)
--- a/
sales/includes/db/sales_order_db.inc
+++ b/
sales/includes/db/sales_order_db.inc
@@
-283,7
+283,8
@@
function get_sales_order_header($order_no, $trans_type)
."stype.sales_type, "
."stype.id AS sales_type_id, "
."stype.tax_included, "
."stype.sales_type, "
."stype.id AS sales_type_id, "
."stype.tax_included, "
- ."ship.shipper_name, "
+ ."stype.factor, "
+ ."ship.shipper_name, "
."tax_group.name AS tax_group_name , "
."tax_group.id AS tax_group_id, "
."cust.tax_id "
."tax_group.name AS tax_group_name , "
."tax_group.id AS tax_group_id, "
."cust.tax_id "
@@
-357,7
+358,7
@@
function read_sales_order($order_no, &$order, $trans_type)
$myrow["tax_group_name"], $myrow["contact_phone"]);
$order->set_sales_type($myrow["sales_type_id"], $myrow["sales_type"],
$myrow["tax_group_name"], $myrow["contact_phone"]);
$order->set_sales_type($myrow["sales_type_id"], $myrow["sales_type"],
- $myrow["tax_included"],
0
); // no default price calculations on edit
+ $myrow["tax_included"],
$myrow["factor"]
); // no default price calculations on edit
$order->set_location($myrow["from_stk_loc"], $myrow["location_name"]);
$order->set_location($myrow["from_stk_loc"], $myrow["location_name"]);