Additional conflict fixes after merge.

diff --cc sales/includes/db/cust_trans_db.inc
index 6f536ca0cd150b5c43dec60e145ffb09bcc2c535,6f536ca0cd150b5c43dec60e145ffb09bcc2c535..089ba61a6e8a36e8f67152150506d02e0e79fb07
--- 1/sales/includes/db/cust_trans_db.inc
--- 2/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 ed22cba2bec1d56cea3332349c3b1202e421209d,ed22cba2bec1d56cea3332349c3b1202e421209d..94dbe8a235b291a0edd7becd0f4ad331772b0b59
--- 1/sales/includes/db/sales_credit_db.inc
--- 2/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 5d72855f350d349f08afd1da7ed884652019d820,5d72855f350d349f08afd1da7ed884652019d820..2c80d46e89d3c67dbec454b093acc4c324d3297b
--- 1/sales/includes/db/sales_delivery_db.inc
--- 2/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 0c1457158a86e10e62f5887038e7a709d85c3476,0c1457158a86e10e62f5887038e7a709d85c3476..31f7a1a222ca776b9f1a4d444151b6491ef02b8b
--- 1/sales/includes/db/sales_invoice_db.inc
--- 2/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) {