From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Tue, 25 Nov 2008 10:53:04 +0000 (+0000)
Subject: Additional conflict fixes after merge.
X-Git-Tag: v2.4.2~19^2~1717
X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=d2bd6087025dfd8497777f6ce2305ff98879473a

Additional conflict fixes after merge.
---

d2bd6087025dfd8497777f6ce2305ff98879473a
diff --cc sales/includes/db/cust_trans_db.inc
index 6f536ca0,6f536ca0..089ba61a
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@@ -79,7 -79,7 +79,7 @@@ function get_customer_trans_version($ty
  function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
  	$date_, $reference, $Total, $discount=0, $Tax=0, $Freight=0, $FreightTax=0,
  	$sales_type=0, $order_no=0, $trans_link=0, $ship_via=0, $due_date="",
--	$AllocAmt=0, $dimension_id=0, $dimension2_id=0)
++	$AllocAmt=0, $rate=0, $dimension_id=0, $dimension2_id=0)
  {
  
  	$curr = get_customer_currency($debtor_no);
diff --cc sales/includes/db/sales_credit_db.inc
index ed22cba2,ed22cba2..94dbe8a2
--- a/sales/includes/db/sales_credit_db.inc
+++ b/sales/includes/db/sales_credit_db.inc
@@@ -61,7 -61,7 +61,7 @@@ function write_credit_note($credit_note
  		$credit_note->freight_cost, $freight_added_tax,
  		$credit_note->sales_type,
  		$credit_note->order_no, $credit_invoice, $credit_note->ship_via,
--		null, $alloc, $credit_note->dimension_id, $credit_note->dimension2_id); 
++		null, $alloc, 0, $credit_note->dimension_id, $credit_note->dimension2_id); 
  		// 2008-06-14 extra $alloc, 2008-11-12 dimension_id Joe Hunt
  
  	if ($trans_no==0) {
diff --cc sales/includes/db/sales_delivery_db.inc
index 5d72855f,5d72855f..2c80d46e
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@@ -31,7 -31,7 +31,7 @@@ function write_sales_delivery(&$deliver
  		$delivery->freight_cost,
  		$delivery->tax_included ? 0 : $freight_tax,
  		$delivery->sales_type, $delivery->order_no, 0,
--		$delivery->ship_via, $delivery->due_date, 0, $delivery->dimension_id, $delivery->dimension2_id);
++		$delivery->ship_via, $delivery->due_date, 0, 0, $delivery->dimension_id, $delivery->dimension2_id);
  
  	if ($trans_no == 0) {
  		$delivery->trans_no = array($delivery_no=>0);
diff --cc sales/includes/db/sales_invoice_db.inc
index 0c145715,0c145715..31f7a1a2
--- a/sales/includes/db/sales_invoice_db.inc
+++ b/sales/includes/db/sales_invoice_db.inc
@@@ -61,7 -61,7 +61,7 @@@ function write_sales_invoice(&$invoice
  		$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, $invoice->dimension_id, $invoice->dimension2_id); 
++		$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) {