X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_delivery_db.inc;h=334badaa6e4cce2cfd7ee19997d82f485e0f49bb;hb=303eb17e9cdd9702eee9fdfcaee51e654a1da541;hp=b50d418aef579b5880b2637bb226d26062c97e99;hpb=7a50c189ea995d5fe6785feb7710c00396065d2b;p=fa-stable.git diff --git a/sales/includes/db/sales_delivery_db.inc b/sales/includes/db/sales_delivery_db.inc index b50d418a..334badaa 100644 --- a/sales/includes/db/sales_delivery_db.inc +++ b/sales/includes/db/sales_delivery_db.inc @@ -1,15 +1,27 @@ . +***********************************************************************/ //----------------------------------------------------------------------------- // 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(); + $customer = get_customer($delivery->customer_id); $delivery_items_total = $delivery->get_items_total_dispatch(); $freight_tax = $delivery->get_shipping_tax(); @@ -20,27 +32,31 @@ 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->default_sales_type, $delivery->order_no, 0, - $delivery->ship_via, $delivery->due_date); + $delivery->sales_type, $delivery->order_no, 0, + $delivery->ship_via, $delivery->due_date, 0, 0, $delivery->dimension_id, + $delivery->dimension2_id, $delivery->payment); 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); + 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); } - foreach ($delivery->line_items as $delivery_line) { + foreach ($delivery->line_items as $line_no => $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, @@ -49,8 +65,11 @@ 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); + /* 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, @@ -58,11 +77,11 @@ function write_sales_delivery(&$delivery,$bo_policy) // 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_customer(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); @@ -74,20 +93,25 @@ function write_sales_delivery(&$delivery,$bo_policy) if ($delivery_line->standard_cost != 0) { /*first the cost of sales entry*/ - add_gl_trans_std_cost(13, $delivery_no, - $delivery->document_date, $stock_gl_code["cogs_account"], - $stock_gl_code["dimension_id"], $stock_gl_code["dimension2_id"], "", + // 2008-08-01. 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"])); + + 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, - payment_person_types::customer(), $delivery->customer_id, + PT_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, + 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), - payment_person_types::customer(), $delivery->customer_id, + 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 */ @@ -102,17 +126,18 @@ 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 ); } } - 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); } commit_transaction(); @@ -128,22 +153,23 @@ function void_sales_delivery($type, $type_no) void_gl_trans($type, $type_no, true); - // for invoices and credits related to invoices, // reverse all the changes in the sales order $items_result = get_customer_trans_details($type, $type_no); $order = get_customer_trans_order($type, $type_no); if ($order) { + $order_items = get_sales_order_details($order, ST_SALESORDER); while ($row = db_fetch($items_result)) { - update_parent_line(13, $row['id'], -$row['quantity']); + $order_line = db_fetch($order_items); + update_parent_line(ST_CUSTDELIVERY, $order_line['id'], -$row['quantity']); } } // 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);