projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging changes form main trunk 2.2.5-2.2.6
[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 de50c6aad94a789b3f3fc06de79486a9c0353807..fd6dd9856f8f72e659c524e286280f882c189b87 100644
(file)
--- a/
sales/includes/db/sales_order_db.inc
+++ b/
sales/includes/db/sales_order_db.inc
@@
-128,6
+128,8
@@
function delete_sales_order($order_no, $trans_type)
.db_escape($order_no) . " AND trans_type=".db_escape($trans_type);
db_query($sql, "order Detail Delete");
.db_escape($order_no) . " AND trans_type=".db_escape($trans_type);
db_query($sql, "order Detail Delete");
+ delete_reference($trans_type, $order_no);
+
add_audit_trail($trans_type, $order_no, Today(), _("Deleted."));
commit_transaction();
}
add_audit_trail($trans_type, $order_no, Today(), _("Deleted."));
commit_transaction();
}
@@
-221,10
+223,11
@@
function update_sales_order($order)
}
}
$sql = "INSERT INTO ".TB_PREF."sales_order_details
}
}
$sql = "INSERT INTO ".TB_PREF."sales_order_details
- (order_no, trans_type, stk_code, description, unit_price, quantity,
+ (
id,
order_no, trans_type, stk_code, description, unit_price, quantity,
discount_percent, qty_sent)
VALUES (";
discount_percent, qty_sent)
VALUES (";
- $sql .= $order_no . ",".$order->trans_type.","
+ $sql .= db_escape($line->id ? $line->id : 0) . ","
+ .$order_no . ",".$order->trans_type.","
.db_escape($line->stock_id) . ","
.db_escape($line->item_description) . ", "
.db_escape($line->price) . ", "
.db_escape($line->stock_id) . ","
.db_escape($line->item_description) . ", "
.db_escape($line->price) . ", "