X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_invoice_db.inc;h=49f9252f4808696fa57fe4ddd1a1c32a6d6454a6;hb=d6ccc05f1d97979ee67c33451fdfd9cf5f124bb9;hp=3fd2aa09d99f7044338893624e30c70352deb4ae;hpb=146f7f65af4a1212c74d5105b1a572104526e852;p=fa-stable.git diff --git a/sales/includes/db/sales_invoice_db.inc b/sales/includes/db/sales_invoice_db.inc index 3fd2aa09..49f9252f 100644 --- a/sales/includes/db/sales_invoice_db.inc +++ b/sales/includes/db/sales_invoice_db.inc @@ -1,144 +1,146 @@ trans_no)==1) { + + $del = $cart->trans_no; + if(is_array($del)) $del = $del[0]; + $sql = 'UPDATE debtor_trans SET trans_link = ' . $del . + ' WHERE type=10 AND trans_no='.$invoice; + db_query($sql, 'Invoice link cannot be updated'); + + foreach($cart->line_items as $line) { + if($line->quantity!=$line->qty_dispatched) { + // this is partial invoice + return 1; + } + } + + } -// $bo_policy = 0, cancel remaining quantities on order -// = 1, backorder remaining quantities + $sql = 'UPDATE debtor_trans SET trans_link = ' . $invoice . + ' WHERE type=13 AND ('; + + $deliveries = $cart->trans_no; + + foreach($deliveries as $key=>$del) + $deliveries[$key] = 'trans_no='.$del; + $sql .= implode(' OR ', $deliveries) . ')'; + + db_query($sql, 'Delivery links cannot be updated'); + return 0; // batch or complete invoice +} -function add_sales_invoice(&$invoice, $date_, $due_date, $sales_order, $tax_group_id, - $charge_shipping, $location, $ship_via, $sales_type, $reference, $memo_, $bo_policy) +function add_sales_invoice(&$cart, $date_, $due_date, $tax_group_id, + $charge_shipping, $location, $ship_via, $sales_type, $reference, $memo_) { begin_transaction(); - + $company_data = get_company_prefs(); - - $branch_data = get_branch_accounts($invoice->Branch); - - $invoice_items_total = $invoice->get_items_total_dispatch($tax_group_id); - + + $branch_data = get_branch_accounts($cart->Branch); + + $cart_items_total = $cart->get_items_total_dispatch($tax_group_id); + + $delivery_no = $cart->trans_no; + if(is_array($delivery_no)) $delivery_no = 0; + $tax_total = 0; - $taxes = $invoice->get_taxes($tax_group_id, $charge_shipping); + $taxes = $cart->get_taxes($tax_group_id, $charge_shipping); foreach ($taxes as $taxitem) $tax_total += $taxitem['Value']; /*Now insert the debtor_trans */ + $sales_order=$cart->order_no; + if(is_array($sales_order)) $sales_order = $sales_order[0]; // assume all crucial SO data are same for every delivery - $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); + $invoice_no = add_customer_trans(10, $cart->customer_id, $cart->Branch, $date_, + $reference, $cart_items_total, 0, $tax_total, $charge_shipping, + $sales_type, $sales_order, $delivery_no, $ship_via, $due_date); - // If balance of the order cancelled update sales order details quantity. - foreach ($invoice->line_items as $order_line) + set_invoice_links($cart,$invoice_no); + + // If balance of the order cancelled update sales order details quantity. + foreach ($cart->line_items as $delivery_line) { - if ($order_line->qty_dispatched != 0) + if ($delivery_line->qty_dispatched != 0) { - - $line_taxfree_price = $order_line->taxfree_price($tax_group_id); - $line_tax = $order_line->full_price() - $line_taxfree_price; - - // Now update sales_order_details for the quantity invoiced - dispatch_sales_order_item($sales_order, $order_line->id, - $order_line->qty_dispatched); - + + $line_taxfree_price = $delivery_line->taxfree_price($tax_group_id); + $line_tax = $delivery_line->full_price() - $line_taxfree_price; + + // Now update delivery items for the quantity invoiced + invoice_delivery_item($delivery_line->id,$delivery_line->qty_dispatched); + /* add invoice details and stock movements */ - $memo_ = ""; - 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); + add_customer_trans_detail_item(10, $invoice_no, $delivery_line->stock_id, + $delivery_line->item_description, $location, $date_, + -$delivery_line->qty_dispatched, $line_taxfree_price, $line_tax, + $delivery_line->discount_percent, $reference, $delivery_line->standard_cost); + + $stock_gl_code = get_stock_gl_code($delivery_line->stock_id); - $stock_gl_code = get_stock_gl_code($order_line->stock_id); - - /* insert gl_trans to credit stock and debit cost of sales at standard cost*/ - if ($order_line->standard_cost != 0) - { - - /*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"); - - /*now the stock entry*/ - //$stock_gl_code = get_stock_gl_code($order_line->stock_id); - - 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"); - - } /* end of if GL and stock integrated and standard cost !=0 */ - - if ($order_line->price != 0) + if ($delivery_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"); - - if ($order_line->discount_percent != 0) + + 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 * $delivery_line->qty_dispatched), + $cart->customer_id, "The sales price GL posting could not be inserted"); + + if ($delivery_line->discount_percent != 0) { - - add_gl_trans_customer(10, $invoice_no, $date_, - $branch_data["sales_discount_account"], $stock_gl_code["dimension_id"], + + 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"); + ($line_taxfree_price * $delivery_line->qty_dispatched * $delivery_line->discount_percent), + $cart->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) + if (($cart_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), - $invoice->customer_id, "The total debtor GL posting could not be inserted"); + ($cart_items_total + $charge_shipping + $tax_total), + $cart->customer_id, "The total debtor GL posting could not be inserted"); } - if ($charge_shipping != 0) + if ($charge_shipping != 0) { - add_gl_trans_customer(10, $invoice_no, $date_, $company_data["freight_act"], 0, 0, - (-$charge_shipping), $invoice->customer_id, - "The freight GL posting could not be inserted"); + (-$charge_shipping), $cart->customer_id, + "The freight GL posting could not be inserted"); } - - foreach ($taxes as $taxitem) + + foreach ($taxes as $taxitem) { - if ($taxitem['Value'] != 0) + 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']); - + $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, + (-$taxitem['Value']), $cart->customer_id, "A tax GL posting could not be inserted"); - } - } - - add_comments(10, $invoice_no, $date_, $memo_); - + } + } + + add_comments(10, $invoice_no, $date_, $memo_); + add_forms_for_sys_type(10, $invoice_no, $location); - - references::save_last($reference, 10); - - commit_transaction(); - + + references::save_last($reference, 10); + + commit_transaction(); + return $invoice_no; } @@ -147,42 +149,51 @@ function add_sales_invoice(&$invoice, $date_, $due_date, $sales_order, $tax_grou function void_sales_invoice($type, $type_no) { begin_transaction(); - + void_bank_trans($type, $type_no, true); void_gl_trans($type, $type_no, true); - - // for invoices and credits related to invoices, + + // 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) + + $delivery = get_customer_trans_link($type, $type_no); + + if ($delivery) { while ($row = db_fetch($items_result)) { - dispatch_sales_order_item($order, $row["id"], $row["quantity"]); + invoice_delivery_item($row['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_customer_trans_tax_details($type, $type_no); + void_cust_allocations($type, $type_no); - + // do this last because other voidings can depend on it - especially voiding // DO NOT MOVE THIS ABOVE VOIDING or we can end up with trans with alloc < 0 - void_customer_trans($type, $type_no); - - commit_transaction(); + void_customer_trans($type, $type_no); + + commit_transaction(); } //-------------------------------------------------------------------------------------------------- +function invoice_delivery_item($id, $qty_dispatched) +{ + $sql = "UPDATE ".TB_PREF."debtor_trans_details "; + $sql .= "SET qty_done = qty_done - $qty_dispatched "; + $sql .= " WHERE id=$id"; +// AND debtor_trans_type = 13 +// AND debtor_trans_no = $delivery_no +// AND stock_id = '$stock_id'"; - + db_query($sql, "The sales delivery detail record could not be updated"); +} ?> \ No newline at end of file