projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added POS and cash sale support.
[fa-stable.git]
/
sales
/
includes
/
db
/
sales_order_db.inc
diff --git
a/sales/includes/db/sales_order_db.inc
b/sales/includes/db/sales_order_db.inc
index 34e4ad9d89b3c0ed8e1a74f95910a3db1d9bc179..25e39abf579fb66c7da65065ffd856a96d810421 100644
(file)
--- a/
sales/includes/db/sales_order_db.inc
+++ b/
sales/includes/db/sales_order_db.inc
@@
-60,7
+60,7
@@
function add_sales_order(&$order)
db_escape($order->Comments) .",'" .
date2sql($order->document_date) . "', " .
db_escape($order->sales_type) . ", " .
db_escape($order->Comments) .",'" .
date2sql($order->document_date) . "', " .
db_escape($order->sales_type) . ", " .
-
$_POST['ship_via']
."," .
+
db_escape($order->ship_via)
."," .
db_escape($order->deliver_to) . "," .
db_escape($order->delivery_address) . ", " .
db_escape($order->phone) . ", " .
db_escape($order->deliver_to) . "," .
db_escape($order->delivery_address) . ", " .
db_escape($order->phone) . ", " .
@@
-454,7
+454,8
@@
function get_customer_to_order($customer_id) {
.TB_PREF."sales_types.tax_included, "
.TB_PREF."sales_types.factor, "
.TB_PREF."debtors_master.curr_code, "
.TB_PREF."sales_types.tax_included, "
.TB_PREF."sales_types.factor, "
.TB_PREF."debtors_master.curr_code, "
- .TB_PREF."debtors_master.discount
+ .TB_PREF."debtors_master.discount,"
+ .TB_PREF."debtors_master.pymt_discount
FROM ".TB_PREF."debtors_master, "
.TB_PREF."credit_status, "
.TB_PREF."sales_types
FROM ".TB_PREF."debtors_master, "
.TB_PREF."credit_status, "
.TB_PREF."sales_types