X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_invoice_db.inc;h=8270ea6eaf3f92c2d9d7f9cc72f4556fece6dfd5;hb=ce71d30f1c18212a6571cf6286c72b20171a8840;hp=3fd2aa09d99f7044338893624e30c70352deb4ae;hpb=217f175953339fd10cd5aee5942cc263a4092323;p=fa-stable.git diff --git a/sales/includes/db/sales_invoice_db.inc b/sales/includes/db/sales_invoice_db.inc index 3fd2aa09..8270ea6e 100644 --- a/sales/includes/db/sales_invoice_db.inc +++ b/sales/includes/db/sales_invoice_db.inc @@ -1,141 +1,153 @@ Branch); - - $invoice_items_total = $invoice->get_items_total_dispatch($tax_group_id); + $trans_no = $invoice->trans_no; + if (is_array($trans_no)) + $trans_no = key($trans_no); - $tax_total = 0; - $taxes = $invoice->get_taxes($tax_group_id, $charge_shipping); - foreach ($taxes as $taxitem) - $tax_total += $taxitem['Value']; + $date_ = $invoice->document_date; + $charge_shipping =$invoice->freight_cost; - /*Now insert the debtor_trans */ + begin_transaction(); - $invoice_no = add_customer_trans(10, $invoice->customer_id, $invoice->Branch, $date_, - $reference, $invoice_items_total, 0, $tax_total, $charge_shipping, - $sales_type, $sales_order, $ship_via, $due_date); + $company_data = get_company_prefs(); - // If balance of the order cancelled update sales order details quantity. - foreach ($invoice->line_items as $order_line) - { + $branch_data = get_branch_accounts($invoice->Branch); - if ($order_line->qty_dispatched != 0) - { + // offer price values without freight costs + $items_total = $invoice->get_items_total_dispatch(); + $freight_tax = $invoice->get_shipping_tax(); - $line_taxfree_price = $order_line->taxfree_price($tax_group_id); - $line_tax = $order_line->full_price() - $line_taxfree_price; + $delivery_no = $invoice->src_docs; + if (is_array($delivery_no)) + $delivery_no = 0; - // Now update sales_order_details for the quantity invoiced - dispatch_sales_order_item($sales_order, $order_line->id, - $order_line->qty_dispatched); + update_customer_trans_version(get_parent_type(10), $invoice->src_docs); - /* add invoice details and stock movements */ - $memo_ = ""; + $ov_gst = 0; + $taxes = $invoice->get_taxes(); // all taxes with freight_tax - add_customer_trans_detail_item(10, $invoice_no, $order_line->stock_id, - $order_line->item_description, $location, $date_, - -$order_line->qty_dispatched, $line_taxfree_price, $line_tax, - $order_line->discount_percent, $memo_, $order_line->standard_cost); + foreach ($taxes as $taxitem) { + $ov_gst += $taxitem['Value']; + } - $stock_gl_code = get_stock_gl_code($order_line->stock_id); + if($invoice->tax_included==0) { + $items_added_tax = $ov_gst-$freight_tax; + $freight_added_tax = $freight_tax; + } else { + $items_added_tax = 0; + $freight_added_tax = 0; + } + // 2006-06-14. If the Customer Branch AR Account is set to a Bank Account, + // the transaction will be settled at once. + if (is_bank_account($branch_data['receivables_account'])) + $alloc = $items_total + $items_added_tax + $invoice->freight_cost + $freight_added_tax; + else + $alloc = 0; + + /* Insert/update the debtor_trans */ + $sales_order = $invoice->order_no; + if (is_array($sales_order)) + $sales_order = $sales_order[0]; // assume all crucial SO data are same for every delivery + + $invoice_no = write_customer_trans(10, $trans_no, $invoice->customer_id, + $invoice->Branch, $date_, $invoice->reference, $items_total, 0, + $items_added_tax, $invoice->freight_cost, $freight_added_tax, + $invoice->sales_type, $sales_order, $delivery_no, + $invoice->ship_via, $invoice->due_date, $alloc); // 2008-06-14 extra $alloc + + if ($trans_no == 0) { + $invoice->trans_no = array($invoice_no=>0); + set_document_parent($invoice); + } else { + delete_comments(10, $invoice_no); + void_gl_trans(10, $invoice_no, true); + void_cust_allocations(10, $invoice_no); // ? + void_customer_trans_tax_details(10, $invoice_no); + } - /* insert gl_trans to credit stock and debit cost of sales at standard cost*/ - if ($order_line->standard_cost != 0) - { + foreach ($invoice->line_items as $invoice_line) { - /*first the cost of sales entry*/ - add_gl_trans_std_cost(10, $invoice_no, $date_, $stock_gl_code["cogs_account"], - $stock_gl_code["dimension_id"], $stock_gl_code["dimension2_id"], "", - $order_line->standard_cost * $order_line->qty_dispatched, - payment_person_types::customer(), $invoice->customer_id, - "The cost of sales GL posting could not be inserted"); + $line_taxfree_price = get_tax_free_price_for_item($invoice_line->stock_id, + $invoice_line->price, 0, $invoice->tax_included, + $invoice->tax_group_array); - /*now the stock entry*/ - //$stock_gl_code = get_stock_gl_code($order_line->stock_id); + $line_tax = get_full_price_for_item($invoice_line->stock_id, + $invoice_line->price, 0, $invoice->tax_included, + $invoice->tax_group_array) - $line_taxfree_price; - add_gl_trans_std_cost(10, $invoice_no, $date_, $stock_gl_code["inventory_account"], 0, 0, "", - (-$order_line->standard_cost * $order_line->qty_dispatched), - payment_person_types::customer(), $invoice->customer_id, - "The stock side of the cost of sales GL posting could not be inserted"); + write_customer_trans_detail_item(10, $invoice_no, $invoice_line->stock_id, + $invoice_line->item_description, $invoice_line->qty_dispatched, + $invoice_line->line_price(), $line_tax, $invoice_line->discount_percent, + $invoice_line->standard_cost, + $trans_no ? $invoice_line->id : 0); - } /* end of if GL and stock integrated and standard cost !=0 */ + // Update delivery items for the quantity invoiced + if ($invoice_line->qty_old != $invoice_line->qty_dispatched) + update_parent_line(10, $invoice_line->id, ($invoice_line->qty_dispatched-$invoice_line->qty_old)); - if ($order_line->price != 0) - { + if ($invoice_line->qty_dispatched != 0) { + $stock_gl_code = get_stock_gl_code($invoice_line->stock_id); + // 2008-06-14. If there is a Branch Sales Account, then override with this, + // else take the Item Sales Account + if ($branch_data['sales_account'] != "") + $sales_account = $branch_data['sales_account']; + else + $sales_account = $stock_gl_code['sales_account']; + if ($invoice_line->line_price() != 0) { //Post sales transaction to GL credit sales - add_gl_trans_customer(10, $invoice_no, $date_, $stock_gl_code["sales_account"], - $stock_gl_code["dimension_id"], $stock_gl_code["dimension2_id"], - (-$line_taxfree_price * $order_line->qty_dispatched), - $invoice->customer_id, "The sales price GL posting could not be inserted"); + add_gl_trans_customer(10, $invoice_no, $date_, $sales_account, + $stock_gl_code["dimension_id"], $stock_gl_code["dimension2_id"], + (-$line_taxfree_price * $invoice_line->qty_dispatched), + $invoice->customer_id, "The sales price GL posting could not be inserted"); - if ($order_line->discount_percent != 0) - { + if ($invoice_line->discount_percent != 0) { - add_gl_trans_customer(10, $invoice_no, $date_, - $branch_data["sales_discount_account"], $stock_gl_code["dimension_id"], - $stock_gl_code["dimension2_id"], - ($line_taxfree_price * $order_line->qty_dispatched * $order_line->discount_percent), - $invoice->customer_id, "The sales discount GL posting could not be inserted"); + add_gl_trans_customer(10, $invoice_no, $date_, + $branch_data["sales_discount_account"], $stock_gl_code["dimension_id"], + $stock_gl_code["dimension2_id"], + ($line_taxfree_price * $invoice_line->qty_dispatched * $invoice_line->discount_percent), + $invoice->customer_id, "The sales discount GL posting could not be inserted"); } /*end of if discount !=0 */ - } /*end of if sales integrated with debtors */ - + } } /*quantity dispatched is more than 0 */ - } /*end of order_line loop */ - - - if ($bo_policy == 0) - { - // if cancelling any remaining quantities - close_sales_order($sales_order); - } + } /*end of delivery_line loop */ /*Post debtors transaction to GL debit debtors, credit freight re-charged and credit sales */ - if (($invoice_items_total + $charge_shipping + $tax_total) != 0) - { - - add_gl_trans_customer(10, $invoice_no, $date_, $branch_data["receivables_account"], 0, 0, - ($invoice_items_total + $charge_shipping + $tax_total), + if (($items_total + $charge_shipping) != 0) { + add_gl_trans_customer(10, $invoice_no, $date_, $branch_data["receivables_account"], 0, 0, + ($items_total + $charge_shipping + $items_added_tax + $freight_added_tax), $invoice->customer_id, "The total debtor GL posting could not be inserted"); } - - if ($charge_shipping != 0) - { - - add_gl_trans_customer(10, $invoice_no, $date_, $company_data["freight_act"], 0, 0, - (-$charge_shipping), $invoice->customer_id, + if ($charge_shipping != 0) { + add_gl_trans_customer(10, $invoice_no, $date_, $company_data["freight_act"], 0, 0, + -$invoice->get_tax_free_shipping(), $invoice->customer_id, "The freight GL posting could not be inserted"); } - - foreach ($taxes as $taxitem) - { - if ($taxitem['Value'] != 0) - { + // post all taxes + foreach ($taxes as $taxitem) { + if ($taxitem['Value'] != 0) { add_customer_trans_tax_detail_item(10, $invoice_no, $taxitem['tax_type_id'], - $taxitem['rate'], $taxitem['included_in_price'], $taxitem['Value']); - - add_gl_trans_customer(10, $invoice_no, $date_, $taxitem['sales_gl_code'], 0, 0, - (-$taxitem['Value']), $invoice->customer_id, - "A tax GL posting could not be inserted"); - } - } + $taxitem['rate'], $invoice->tax_included, $taxitem['Value']); - add_comments(10, $invoice_no, $date_, $memo_); + add_gl_trans_customer(10, $invoice_no, $date_, $taxitem['sales_gl_code'], 0, 0, + (-$taxitem['Value']), $invoice->customer_id, + "A tax GL posting could not be inserted"); + } + } - add_forms_for_sys_type(10, $invoice_no, $location); + add_comments(10, $invoice_no, $date_, $invoice->Comments); - references::save_last($reference, 10); + if ($trans_no == 0) { + references::save_last($invoice->reference, 10); + } commit_transaction(); @@ -155,13 +167,11 @@ function void_sales_invoice($type, $type_no) // 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); + $delivery = get_customer_trans_link($type, $type_no); - if ($order) - { - while ($row = db_fetch($items_result)) - { - dispatch_sales_order_item($order, $row["id"], $row["quantity"]); + if ($delivery) { + while ($row = db_fetch($items_result)) { + update_parent_line(10, $row['id'], -$row['quantity']); } } @@ -179,10 +189,4 @@ function void_sales_invoice($type, $type_no) commit_transaction(); } -//-------------------------------------------------------------------------------------------------- - - - - - ?> \ No newline at end of file