X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_invoice_db.inc;h=c4e97e4c6dd84545f5585e26fda8105c00f997c3;hb=ddadb47f2620ce6902ad4694ce6512568862ba05;hp=c4303fc60561f2b14ae2b3bba9d1217c8a1d859f;hpb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;p=fa-stable.git

diff --git a/sales/includes/db/sales_invoice_db.inc b/sales/includes/db/sales_invoice_db.inc
index c4303fc6..c4e97e4c 100644
--- a/sales/includes/db/sales_invoice_db.inc
+++ b/sales/includes/db/sales_invoice_db.inc
@@ -1,10 +1,20 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 //-----------------------------------------------------------------------------
 //	Add or update Sales Invoice
 //
 function write_sales_invoice(&$invoice)
 {
+	global $Refs;
 
 	$trans_no = $invoice->trans_no;
 	if (is_array($trans_no))
@@ -29,12 +39,13 @@ function write_sales_invoice(&$invoice)
 	if (is_array($delivery_no))
 		$delivery_no = 0;
 
-	update_customer_trans_version(get_parent_type(10), $invoice->src_docs);
+	update_customer_trans_version(get_parent_type(ST_SALESINVOICE), $invoice->src_docs);
 
 	$ov_gst = 0;
 	$taxes = $invoice->get_taxes(); // all taxes with freight_tax
 
 	foreach ($taxes as $taxitem) {
+		$taxitem['Value'] =  round2($taxitem['Value'], user_price_dec());
 		$ov_gst +=  $taxitem['Value'];
 	}
 
@@ -57,22 +68,23 @@ function write_sales_invoice(&$invoice)
 	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_no = write_customer_trans(ST_SALESINVOICE, $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
+		$invoice->ship_via, $invoice->due_date, $alloc, 0, $invoice->dimension_id, $invoice->dimension2_id); 
+		// 2008-06-14 extra $alloc, 2008-11-12 added dimension_id Joe Hunt
 
 	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);
+		delete_comments(ST_SALESINVOICE, $invoice_no);
+		void_gl_trans(ST_SALESINVOICE, $invoice_no, true);
+		void_cust_allocations(ST_SALESINVOICE, $invoice_no); // ?
+		void_trans_tax_details(ST_SALESINVOICE, $invoice_no);
 	}
-
+	$total = 0;
 	foreach ($invoice->line_items as $invoice_line) {
 
 		$line_taxfree_price = get_tax_free_price_for_item($invoice_line->stock_id,
@@ -83,7 +95,7 @@ function write_sales_invoice(&$invoice)
 			$invoice_line->price, 0, $invoice->tax_included,
 			$invoice->tax_group_array) - $line_taxfree_price;
 
-		write_customer_trans_detail_item(10, $invoice_no, $invoice_line->stock_id,
+		write_customer_trans_detail_item(ST_SALESINVOICE, $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,
@@ -91,7 +103,7 @@ function write_sales_invoice(&$invoice)
 
 		// Update delivery items for the quantity invoiced
 		if ($invoice_line->qty_old != $invoice_line->qty_dispatched)
-			update_parent_line(10, $invoice_line->src_id, ($invoice_line->qty_dispatched-$invoice_line->qty_old));
+			update_parent_line(ST_SALESINVOICE, $invoice_line->src_id, ($invoice_line->qty_dispatched-$invoice_line->qty_old));
 
 		if ($invoice_line->qty_dispatched != 0) {
 			$stock_gl_code = get_stock_gl_code($invoice_line->stock_id);
@@ -104,15 +116,17 @@ function write_sales_invoice(&$invoice)
 				$sales_account = ($branch_data['sales_account'] != "" ? $branch_data['sales_account'] : $stock_gl_code['sales_account']);
 				// 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_customer(10, $invoice_no, $date_, $sales_account, $dim, $dim2,
+				$dim = ($invoice->dimension_id != $customer['dimension_id'] ? $invoice->dimension_id : 
+					($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_code["dimension_id"]));
+				$dim2 = ($invoice->dimension2_id != $customer['dimension2_id'] ? $invoice->dimension2_id : 
+					($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_code["dimension2_id"]));
+				$total += add_gl_trans_customer(ST_SALESINVOICE, $invoice_no, $date_, $sales_account, $dim, $dim2,
 					(-$line_taxfree_price * $invoice_line->qty_dispatched),
 					$invoice->customer_id, "The sales price GL posting could not be inserted");
 
 				if ($invoice_line->discount_percent != 0) {
 
-					add_gl_trans_customer(10, $invoice_no, $date_,
+					$total += add_gl_trans_customer(ST_SALESINVOICE, $invoice_no, $date_,
 						$branch_data["sales_discount_account"], $dim, $dim2,
 						($line_taxfree_price * $invoice_line->qty_dispatched * $invoice_line->discount_percent),
 						$invoice->customer_id, "The sales discount GL posting could not be inserted");
@@ -121,35 +135,57 @@ function write_sales_invoice(&$invoice)
 		} /*quantity dispatched is more than 0 */
 	} /*end of delivery_line loop */
 
-	/*Post debtors transaction to GL debit debtors, credit freight re-charged and credit sales */
 	if (($items_total + $charge_shipping) != 0) {
-		add_gl_trans_customer(10, $invoice_no, $date_, $branch_data["receivables_account"], 0, 0,
+		$total += add_gl_trans_customer(ST_SALESINVOICE, $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,
+		$total += add_gl_trans_customer(ST_SALESINVOICE, $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");
 	}
 	// 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'], $invoice->tax_included, $taxitem['Value']);
 
-			add_gl_trans_customer(10, $invoice_no, $date_, $taxitem['sales_gl_code'], 0, 0,
+		if ($taxitem['Net'] != 0) {
+			$ex_rate = get_exchange_rate_from_home_currency(get_customer_currency($invoice->customer_id), $date_);
+			add_trans_tax_details(ST_SALESINVOICE, $invoice_no, $taxitem['tax_type_id'],
+				$taxitem['rate'], $invoice->tax_included, $taxitem['Value'],
+				 $taxitem['Net'], $ex_rate, $date_, $invoice->reference);
+
+			$total += add_gl_trans_customer(ST_SALESINVOICE, $invoice_no, $date_, $taxitem['sales_gl_code'], 0, 0,
 				(-$taxitem['Value']), $invoice->customer_id,
 				"A tax GL posting could not be inserted");
 		}
 	}
 
+	/*Post a balance post if $total != 0 */
+	add_gl_balance(ST_SALESINVOICE, $invoice_no, $date_, -$total, PT_CUSTOMER, $invoice->customer_id);	
+
 	add_comments(10, $invoice_no, $date_, $invoice->Comments);
 
 	if ($trans_no == 0) {
-		references::save_last($invoice->reference, 10);
+		$Refs->save(ST_SALESINVOICE, $invoice_no, $invoice->reference);
+		if ($invoice->cash) {
+			$amount = $items_total + $items_added_tax + $invoice->freight_cost 
+				+ $freight_added_tax;
+
+			// to use debtors.pmt_discount on cash sale:
+			// extend invoice entry page with final amount after discount 
+			// and change line below.
+			$discount = 0; // $invoice->cash_discount*$amount;
+			$pmtno = write_customer_payment(0, $invoice->customer_id, 
+				$invoice->Branch, $invoice->cash_account, $date_,
+				$Refs->get_next(ST_CUSTPAYMENT), $amount-$discount, $discount,
+				_('Cash invoice').' '.$invoice_no);
+			add_cust_allocation($amount, ST_CUSTPAYMENT, $pmtno, ST_SALESINVOICE, $invoice_no);
+
+			update_debtor_trans_allocation(ST_SALESINVOICE, $invoice_no, $amount);
+			update_debtor_trans_allocation(ST_CUSTPAYMENT, $pmtno, $amount);
+		}
 	}
-
 	commit_transaction();
 
 	return $invoice_no;
@@ -169,17 +205,17 @@ function void_sales_invoice($type, $type_no)
 
 	$deliveries = get_parent_trans($type, $type_no);
 
-	if (count($deliveries)) {
+	if ($deliveries !== 0) {
 		$srcdetails = get_customer_trans_details(get_parent_type($type), $deliveries);
 		while ($row = db_fetch($items_result)) {
 			$src_line = db_fetch($srcdetails);
-			update_parent_line(10, $src_line['id'], -$row['quantity']);
+			update_parent_line($type, $src_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);