projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes in main trunk up to 2.0.6 (see CHANGELOG)
[fa-stable.git]
/
sales
/
includes
/
db
/
sales_delivery_db.inc
diff --git
a/sales/includes/db/sales_delivery_db.inc
b/sales/includes/db/sales_delivery_db.inc
index f2237dbd9fe0f6e21aef534990784543ae1a672c..2c80d46e89d3c67dbec454b093acc4c324d3297b 100644
(file)
--- a/
sales/includes/db/sales_delivery_db.inc
+++ b/
sales/includes/db/sales_delivery_db.inc
@@
-31,7
+31,7
@@
function write_sales_delivery(&$delivery,$bo_policy)
$delivery->freight_cost,
$delivery->tax_included ? 0 : $freight_tax,
$delivery->sales_type, $delivery->order_no, 0,
$delivery->freight_cost,
$delivery->tax_included ? 0 : $freight_tax,
$delivery->sales_type, $delivery->order_no, 0,
- $delivery->ship_via, $delivery->due_date, 0, $delivery->dimension_id, $delivery->dimension2_id);
+ $delivery->ship_via, $delivery->due_date, 0,
0,
$delivery->dimension_id, $delivery->dimension2_id);
if ($trans_no == 0) {
$delivery->trans_no = array($delivery_no=>0);
if ($trans_no == 0) {
$delivery->trans_no = array($delivery_no=>0);
@@
-81,8
+81,10
@@
function write_sales_delivery(&$delivery,$bo_policy)
/*first the cost of sales entry*/
// 2008-08-01. If there is a Customer Dimension, then override with this,
// else take the Item Dimension (if any)
/*first the cost of sales entry*/
// 2008-08-01. If there is a Customer Dimension, then override with this,
// else take the Item Dimension (if any)
- $dim = ($delivery->dimension_id > 0 ? $delivery->dimension_id : ($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_code["dimension_id"]));
- $dim2 = ($delivery->dimension2_id > 0 ? $delivery->dimension2_id : ($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_code["dimension2_id"]));
+ $dim = ($delivery->dimension_id != $customer['dimension_id'] ? $delivery->dimension_id :
+ ($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_code["dimension_id"]));
+ $dim2 = ($delivery->dimension2_id != $customer['dimension2_id'] ? $delivery->dimension2_id :
+ ($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_code["dimension2_id"]));
add_gl_trans_std_cost(13, $delivery_no,
$delivery->document_date, $stock_gl_code["cogs_account"], $dim, $dim2, "",
add_gl_trans_std_cost(13, $delivery_no,
$delivery->document_date, $stock_gl_code["cogs_account"], $dim, $dim2, "",