X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_delivery_db.inc;h=8276eb5113d335a30e46aa0c9d61cbb51fd2c7f5;hb=203767c14f89edb2740c8ca1dcbba0e55468aa3e;hp=c592373fa642f90078d4b296c175bf5752cfa3d3;hpb=e30f1ccaf56aef1e3126aa8e047160b895bd97b7;p=fa-stable.git diff --git a/sales/includes/db/sales_delivery_db.inc b/sales/includes/db/sales_delivery_db.inc index c592373f..8276eb51 100644 --- a/sales/includes/db/sales_delivery_db.inc +++ b/sales/includes/db/sales_delivery_db.inc @@ -1,16 +1,32 @@ . +***********************************************************************/ //----------------------------------------------------------------------------- // insert/update sales delivery // function write_sales_delivery(&$delivery,$bo_policy) { + global $Refs; $trans_no = $delivery->trans_no; if (is_array($trans_no)) $trans_no = key($trans_no); begin_transaction(); + $delivery->bo_policy = $bo_policy; + hook_db_prewrite($delivery, ST_CUSTDELIVERY); $customer = get_customer($delivery->customer_id); + + add_new_exchange_rate($customer['curr_code'], $delivery->document_date, $delivery->ex_rate); + $delivery_items_total = $delivery->get_items_total_dispatch(); $freight_tax = $delivery->get_shipping_tax(); @@ -21,27 +37,39 @@ function write_sales_delivery(&$delivery,$bo_policy) $taxes = $delivery->get_taxes(); // all taxes with freight_tax foreach ($taxes as $taxitem) { + $taxitem['Value'] = round2($taxitem['Value'], user_price_dec()); $tax_total += $taxitem['Value']; } /* Insert/update the debtor_trans */ - $delivery_no = write_customer_trans(13, $trans_no, $delivery->customer_id, + $delivery_no = write_customer_trans(ST_CUSTDELIVERY, $trans_no, $delivery->customer_id, $delivery->Branch, $delivery->document_date, $delivery->reference, $delivery_items_total, 0, $delivery->tax_included ? 0 : $tax_total-$freight_tax, $delivery->freight_cost, $delivery->tax_included ? 0 : $freight_tax, - $delivery->sales_type, $delivery->order_no, 0, - $delivery->ship_via, $delivery->due_date); + $delivery->sales_type, $delivery->order_no, + $delivery->ship_via, $delivery->due_date, 0, 0, $delivery->dimension_id, + $delivery->dimension2_id, $delivery->payment, $delivery->tax_included, $delivery->prep_amount); if ($trans_no == 0) { $delivery->trans_no = array($delivery_no=>0); } else { - void_gl_trans(13, $delivery_no, true); - void_stock_move(13, $delivery_no); - delete_comments(13, $delivery_no); + move_trans_attachments(ST_CUSTDELIVERY, $trans_no, $delivery_no); + void_gl_trans(ST_CUSTDELIVERY, $delivery_no, true); + void_stock_move(ST_CUSTDELIVERY, $delivery_no); + void_trans_tax_details(ST_CUSTDELIVERY, $delivery_no); + delete_comments(ST_CUSTDELIVERY, $delivery_no); + } + + + // for prepaid delivery repost income from deffered account + if ($delivery->is_prepaid()) + { + $branch_data = get_branch_accounts($delivery->Branch); + $total = 0; } + foreach ($delivery->line_items as $line_no => $delivery_line) { - foreach ($delivery->line_items as $delivery_line) { $line_price = $delivery_line->line_price(); $line_taxfree_price = get_tax_free_price_for_item($delivery_line->stock_id, $delivery_line->price, 0, $delivery->tax_included, @@ -50,59 +78,105 @@ function write_sales_delivery(&$delivery,$bo_policy) $line_tax = get_full_price_for_item($delivery_line->stock_id, $delivery_line->price, 0, $delivery->tax_included, $delivery->tax_group_array) - $line_taxfree_price; - if ($trans_no != 0) // Inserted 2008-09-25 Joe Hunt - $delivery_line->standard_cost = get_standard_cost($delivery_line->stock_id); + $delivery_line->standard_cost = get_unit_cost($delivery_line->stock_id); /* add delivery details for all lines */ - write_customer_trans_detail_item(13, $delivery_no, $delivery_line->stock_id, + write_customer_trans_detail_item(ST_CUSTDELIVERY, $delivery_no, $delivery_line->stock_id, $delivery_line->item_description, $delivery_line->qty_dispatched, $delivery_line->line_price(), $line_tax, - $delivery_line->discount_percent, $delivery_line->standard_cost, + $delivery_line->discount_percent, $delivery_line->standard_cost, $delivery_line->src_id, $trans_no ? $delivery_line->id : 0); // Now update sales_order_details for the quantity delivered if ($delivery_line->qty_old != $delivery_line->qty_dispatched) - update_parent_line(13, $delivery_line->id, + update_parent_line(ST_CUSTDELIVERY, $delivery_line->src_id, $delivery_line->qty_dispatched-$delivery_line->qty_old); if ($delivery_line->qty_dispatched != 0) { - add_stock_move_customer(13, $delivery_line->stock_id, $delivery_no, + add_stock_move(ST_CUSTDELIVERY, $delivery_line->stock_id, $delivery_no, $delivery->Location, $delivery->document_date, $delivery->reference, - -$delivery_line->qty_dispatched, $delivery_line->standard_cost,1, - $line_price, $delivery_line->discount_percent); + -$delivery_line->qty_dispatched, $delivery_line->standard_cost, + $line_price*(1-$delivery_line->discount_percent)); + $mb_flag = get_mb_flag($delivery_line->stock_id); + + if (is_fixed_asset($mb_flag)) { + $sql = "UPDATE ".TB_PREF."stock_master SET inactive=1, material_cost=0 + WHERE stock_id=".db_escape($delivery_line->stock_id); + db_query($sql,"The cost details for the fixed asset could not be updated"); + } $stock_gl_code = get_stock_gl_code($delivery_line->stock_id); + // If there is a Customer Dimension, then override with this, + // else take the Item Dimension (if any) + $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"])); + if ($delivery->is_prepaid()) + { + $sales_account = ($branch_data['sales_account'] != "" ? $branch_data['sales_account'] : $stock_gl_code['sales_account']); + + $total += add_gl_trans_customer(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date, $sales_account, $dim, $dim2, + -$line_taxfree_price*$delivery_line->qty_dispatched, // FIXME - calculation order should be exactly like in invoice to minimalize roundings + $delivery->customer_id, "The sales price GL posting could not be inserted"); + } /* insert gl_trans to credit stock and debit cost of sales at standard cost*/ - if ($delivery_line->standard_cost != 0) { - - /*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 = ($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_code["dimension_id"]); - $dim2 = ($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, "", - $delivery_line->standard_cost * $delivery_line->qty_dispatched, - payment_person_types::customer(), $delivery->customer_id, - "The cost of sales GL posting could not be inserted"); - - /*now the stock entry*/ - //$stock_gl_code = get_stock_gl_code($order_line->stock_id); - - add_gl_trans_std_cost(13, $delivery_no, $delivery->document_date, - $stock_gl_code["inventory_account"], 0, 0, "", - (-$delivery_line->standard_cost * $delivery_line->qty_dispatched), - payment_person_types::customer(), $delivery->customer_id, - "The stock side of the cost of sales GL posting could not be inserted"); + + if (is_inventory_item($delivery_line->stock_id)) { + // Fixed Assets + if ($delivery->fixed_asset) { + $fa_purchase_cost = get_purchase_cost($delivery_line->stock_id); + $fa_depreciation = $fa_purchase_cost - $delivery_line->standard_cost; + /*first remove depreciation*/ + add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, + $delivery->document_date, $stock_gl_code["adjustment_account"], $dim, $dim2, "", + $fa_depreciation, + PT_CUSTOMER, $delivery->customer_id, + "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, "", + -$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, "", + ($fa_purchase_cost - $fa_depreciation), + PT_CUSTOMER, $delivery->customer_id, + "The stock side of the cost of sales GL posting could not be inserted"); + } + // Invetory Items + else if ($delivery_line->standard_cost != 0) { + /*first the cost of sales entry*/ + add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, + $delivery->document_date, $stock_gl_code["cogs_account"], $dim, $dim2, "", + $delivery_line->standard_cost * $delivery_line->qty_dispatched, + PT_CUSTOMER, $delivery->customer_id, + "The cost of sales GL posting could not be inserted"); + + /*now the stock entry*/ + add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date, + $stock_gl_code["inventory_account"], 0, 0, "", + (-$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"); + } } /* end of if GL and stock integrated and standard cost !=0 */ } /*quantity dispatched is more than 0 */ } /*end of order_line loop */ + if ($delivery->is_prepaid()) + { + $deferred_act = get_company_pref('deferred_income_act'); + add_gl_trans_customer(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date, $deferred_act, 0, 0, + -$total, $delivery->customer_id, "The deferred income GL posting could not be inserted"); + } + if ($bo_policy == 0) { // if cancelling any remaining quantities close_sales_order($delivery->order_no); @@ -110,30 +184,46 @@ function write_sales_delivery(&$delivery,$bo_policy) // taxes - this is for printing purposes foreach ($taxes as $taxitem) { - if ($taxitem['Value'] != 0) { - add_customer_trans_tax_detail_item(13, $delivery_no, $taxitem['tax_type_id'], - $taxitem['rate'], $delivery->tax_included, $taxitem['Value']); + if ($taxitem['Net'] != 0) { + $ex_rate = get_exchange_rate_from_home_currency(get_customer_currency($delivery->customer_id), $delivery->document_date); + add_trans_tax_details(ST_CUSTDELIVERY, $delivery_no, $taxitem['tax_type_id'], + $taxitem['rate'], $delivery->tax_included, $taxitem['Value'], + $taxitem['Net'], $ex_rate, $delivery->document_date, $delivery->reference, null); } } - add_comments(13, $delivery_no, $delivery->document_date, $delivery->Comments); + add_comments(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date, $delivery->Comments); if ($trans_no == 0) { - if ($delivery->reference!='auto') - references::save_last($delivery->reference, 13); + $Refs->save(ST_CUSTDELIVERY, $delivery_no, $delivery->reference); } - + hook_db_postwrite($delivery, ST_CUSTDELIVERY); commit_transaction(); return $delivery_no; } +//-------------------------------------------------------------------------------------------------- +function adjust_shipping_charge(&$delivery, $trans_no) +{ + $sql = "SELECT sum(ov_freight) as freight FROM ".TB_PREF."debtor_trans WHERE order_ = $trans_no AND type = " . ST_CUSTDELIVERY . " AND debtor_no = " . $delivery->customer_id; + $result = db_query($sql, "Can not find delivery notes"); + $row = db_fetch_row($result); + if (!$row[0]) $freight = 0; + else $freight = $row[0]; + if ($freight < $delivery->freight_cost) $delivery->freight_cost = $delivery->freight_cost - $freight; + else $delivery->freight_cost = 0; +} + //-------------------------------------------------------------------------------------------------- -function void_sales_delivery($type, $type_no) +function void_sales_delivery($type, $type_no, $transactions=true) { - begin_transaction(); + if ($transactions) + begin_transaction(); + hook_db_prevoid($type, $type_no); + void_gl_trans($type, $type_no, true); // reverse all the changes in the sales order @@ -142,17 +232,16 @@ function void_sales_delivery($type, $type_no) $order = get_customer_trans_order($type, $type_no); if ($order) { - $order_items = get_sales_order_details($order); + $auto = (get_reference(ST_SALESORDER, $order) == "auto"); while ($row = db_fetch($items_result)) { - $order_line = db_fetch($order_items); - update_parent_line(13, $order_line['id'], -$row['quantity']); + update_parent_line(ST_CUSTDELIVERY, $row['src_id'], -$row['quantity'], $auto); } } // clear details after they've been reversed in the sales order void_customer_trans_details($type, $type_no); - void_customer_trans_tax_details($type, $type_no); + void_trans_tax_details($type, $type_no); void_cust_allocations($type, $type_no); @@ -160,6 +249,7 @@ function void_sales_delivery($type, $type_no) // DO NOT MOVE THIS ABOVE VOIDING or we can end up with trans with alloc < 0 void_customer_trans($type, $type_no); - commit_transaction(); + if ($transactions) + commit_transaction(); } -?> \ No newline at end of file +