X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_invoice_db.inc;h=387575d05b7d1d122f34733619733c9386eb3949;hb=a9d55e1c13cbd6a6305b9322ec8621a06516f9f3;hp=73338a4144a702e02f3a4214d7774d3db0934af1;hpb=3974cfebf97c03e07b0beb608ae63b84b1e0f908;p=fa-stable.git

diff --git a/sales/includes/db/sales_invoice_db.inc b/sales/includes/db/sales_invoice_db.inc
index 73338a41..387575d0 100644
--- a/sales/includes/db/sales_invoice_db.inc
+++ b/sales/includes/db/sales_invoice_db.inc
@@ -86,7 +86,6 @@ function write_sales_invoice(&$invoice)
 		$invoice->sales_type, $sales_order, $invoice->ship_via, 
 		$invoice->due_date, 0, 0, $invoice->dimension_id, 
 		$invoice->dimension2_id, $invoice->payment, $invoice->tax_included, $invoice->prep_amount); 
-		// 2008-06-14 extra $alloc, 2008-11-12 added dimension_id Joe Hunt
 
 	if ($trans_no == 0) {
 		$invoice->trans_no = array($invoice_no=>0);
@@ -127,11 +126,11 @@ function write_sales_invoice(&$invoice)
 			if ($invoice_line->line_price() != 0) {
 				//Post sales transaction to GL credit sales
 
-				// 2008-06-14. If there is a Branch Sales Account, then override with this,
+				// If there is a Branch Sales Account, then override with this,
 				// else take the Item Sales Account
 				if (!$invoice->is_prepaid())
 					$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,
+				// If there is a Customer Dimension, then override with this,
 				// else take the Item Dimension (if any)
 				$dim = ($invoice->dimension_id != $customer['dimension_id'] ? $invoice->dimension_id : 
 					($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_code["dimension_id"]));
@@ -169,8 +168,8 @@ function write_sales_invoice(&$invoice)
 		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, $date_, $prepaid_factor*$taxitem['Value']);
+				$taxitem['rate'], $invoice->tax_included, $prepaid_factor*$taxitem['Value'],
+				 $taxitem['Net'], $ex_rate, $date_, $invoice->reference, TR_OUTPUT);
 			if (isset($taxitem['sales_gl_code']))
 				$total += add_gl_trans_customer(ST_SALESINVOICE, $invoice_no, $date_, $taxitem['sales_gl_code'], 0, 0,
 					(-$taxitem['Value'])*$prepaid_factor, $invoice->customer_id,
@@ -195,26 +194,19 @@ function write_sales_invoice(&$invoice)
 			$discount = 0; // $invoice->cash_discount*$amount;
 			$pmtno = write_customer_payment(0, $invoice->customer_id, 
 				$invoice->Branch, $invoice->pos['pos_account'], $date_,
-				$Refs->get_next(ST_CUSTPAYMENT), $amount-$discount, $discount,
+				$Refs->get_next(ST_CUSTPAYMENT, null, array('customer' => $invoice->customer_id,
+					'branch' => $invoice->Branch, 'date' => $date_)),
+				$amount-$discount, $discount,
 				_('Cash invoice').' '.$invoice_no);
 			add_cust_allocation($amount, ST_CUSTPAYMENT, $pmtno, ST_SALESINVOICE, $invoice_no, $invoice->customer_id, $date_);
 
-			update_debtor_trans_allocation(ST_SALESINVOICE, $invoice_no);
-			update_debtor_trans_allocation(ST_CUSTPAYMENT, $pmtno);
+			update_debtor_trans_allocation(ST_SALESINVOICE, $invoice_no, $invoice->customer_id);
+			update_debtor_trans_allocation(ST_CUSTPAYMENT, $pmtno, $invoice->customer_id);
 		}
 	}
-//_vd($allocs);
 	reallocate_payments($invoice_no, ST_SALESINVOICE, $date_, $to_allocate, $allocs);
-//_vd(get_payments_for($sales_order, ST_SALESORDER));
-//_vd(get_payments_for($invoice_no, ST_SALESINVOICE));
-//_vd(get_gl(ST_SALESINVOICE, $invoice_no));
-//_vd(get_customer_trans($invoice_no, ST_SALESINVOICE));
-//_vd(get_sales_order_header($sales_order, ST_SALESORDER));
 	hook_db_postwrite($invoice, ST_SALESINVOICE);
-//$result = get_trans_tax_details(ST_SALESINVOICE, $invoice_no);
-//while($row=db_fetch($result))
-//	_vd($row);
-//exit;
+
 	commit_transaction();
 
 	return $invoice_no;