Bug. GL Dimensions should also be included on balance accounts in sales order deliver...

diff --git a/inventory/includes/db/items_adjust_db.inc b/inventory/includes/db/items_adjust_db.inc
index 7dc541032cf69ad9e3890fd6d2307e326bdf19cd..4ccb4c3a0f672354835e4bff4cffc24aa004439e 100644 (file)
--- a/inventory/includes/db/items_adjust_db.inc
+++ b/inventory/includes/db/items_adjust_db.inc
@@ -123,12 +123,12 @@ function add_stock_adjustment_item($adj_id, $stock_id, $location, $date_, $refer
                add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_,
                        $stock_gl_codes['adjustment_account'], $stock_gl_codes['dimension_id'], $stock_gl_codes['dimension2_id'], $memo_, $adj_value  );
 
-               add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_, $stock_gl_codes['inventory_account'], 0, 0, $memo_, $inv_value);
+               add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_, $stock_gl_codes['inventory_account'], $stock_gl_codes['dimension_id'], $stock_gl_codes['dimension2_id'], $memo_, $inv_value);
        }
 
        if (is_fixed_asset($mb_flag)) {
                // Additional gl entry for fixed asset.
                $grn_act = get_company_pref('default_loss_on_asset_disposal_act');
-               add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_, $grn_act, 0, 0, $memo_, ($standard_cost * -($quantity)));
+               add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_, $grn_act, $stock_gl_codes['dimension_id'], $stock_gl_codes['dimension2_id'], $memo_, ($standard_cost * -($quantity)));
        }
 }

diff --git a/sales/includes/db/sales_delivery_db.inc b/sales/includes/db/sales_delivery_db.inc
index ebb04860299d45042031b5e2ba1eee61f06efe8e..c36e226826c05455799dc9c71beb1ecba735a4e3 100644 (file)
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -137,13 +137,13 @@ function write_sales_delivery(&$delivery,$bo_policy)
                                                "The cost of sales GL posting could not be inserted");
                                        /*then remove asset*/
                                        add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date,
-                                               $stock_gl_code["inventory_account"], 0, 0, "",
+                                               $stock_gl_code["inventory_account"], $dim, $dim2, "",
                                                -$fa_purchase_cost,
                                                PT_CUSTOMER, $delivery->customer_id,
                                                "The stock side of the cost of sales GL posting could not be inserted");
                                        /*finally adjust sales account with the remaining*/
                                        add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date,
-                                               $stock_gl_code["cogs_account"], 0, 0, "",
+                                               $stock_gl_code["cogs_account"], $dim, $dim2, "",
                                                ($fa_purchase_cost - $fa_depreciation),
                                                PT_CUSTOMER, $delivery->customer_id,
                                                "The stock side of the cost of sales GL posting could not be inserted");
@@ -159,7 +159,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
 
                                        /*now the stock entry*/
                                        add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date,
-                                               $stock_gl_code["inventory_account"], 0, 0, "",
+                                               $stock_gl_code["inventory_account"], $dim, $dim2, "",
                                                (-$delivery_line->standard_cost * $delivery_line->qty_dispatched),
                                                PT_CUSTOMER, $delivery->customer_id,
                                                "The stock side of the cost of sales GL posting could not be inserted");