X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Finvoice_ui.inc;h=fafe4c5d79159ab9152b65d058b2d000b4eb6ae3;hb=fc24ee893402902fc58632dabb5d7c2594e191d0;hp=67a02e668b110fb7a1db73a2019e86d8fed820db;hpb=728bdff94ba97da2509ddd12e641dde5d1fbe9f8;p=fa-stable.git

diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index 67a02e66..fafe4c5d 100644
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -19,6 +19,10 @@ function copy_from_trans(&$supp_trans)
 	$_POST['supp_reference'] = $supp_trans->supp_reference;
 	$_POST['reference'] = $supp_trans->reference;
 	$_POST['supplier_id'] = $supp_trans->supplier_id;
+	$_POST['_ex_rate'] = $supp_trans->ex_rate;
+	if (isset($supp_trans->tax_overrides))
+	    foreach($supp_trans->tax_overrides as $id => $value)
+		    $_POST['mantax'][$id] = price_format($value);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -30,8 +34,17 @@ function copy_to_trans(&$supp_trans)
 	$supp_trans->due_date = $_POST['due_date'];
 	$supp_trans->supp_reference = $_POST['supp_reference'];
 	$supp_trans->reference = $_POST['reference'];
+	$supp_trans->ex_rate = input_num('_ex_rate', null);
+
+	$supp_trans->ov_amount = $supp_trans->ov_discount = 0; /* for starters */
+    if (isset($_POST['mantax'])) {
+		foreach($_POST['mantax'] as $id => $tax) {
+	    	$supp_trans->tax_overrides[$id] = user_numeric($_POST['mantax'][$id]);
+	    	}
+	}
+	else
+		unset($supp_trans->tax_overrides);
 
-	$supp_trans->ov_amount = 0; /* for starters */
 	if (count($supp_trans->grn_items) > 0)
 	{
 		foreach ( $supp_trans->grn_items as $grn)
@@ -61,7 +74,7 @@ function invoice_header(&$supp_trans)
 	if (!isset($_POST['tran_date']))
 		copy_from_trans($supp_trans);
 
-	start_outer_table(TABLESTYLE2, "width=95%");
+	start_outer_table(TABLESTYLE2, "width='95%'");
 
 	table_section(1);
 
@@ -69,7 +82,7 @@ function invoice_header(&$supp_trans)
 	{
 		$trans = get_supp_trans($_POST['invoice_no'], ST_SUPPINVOICE);
 		$_POST['supplier_id'] = $trans['supplier_id'];
-		$supp = $trans['supplier_name'] . " - " . $trans['SupplierCurrCode'];
+		$supp = $trans['supplier_name'] . " - " . $trans['curr_code'];
 		label_row(_("Supplier:"), $supp.hidden('supplier_id', $_POST['supplier_id'], false));
 	}	
 	else
@@ -124,7 +137,7 @@ function invoice_header(&$supp_trans)
 	if ($supplier_currency != $company_currency)
 	{
         label_row(_("Supplier's Currency:"), "<b>" . $supplier_currency . "</b>");
-		exchange_rate_display($supplier_currency, $company_currency, $_POST['tran_date']);
+		exchange_rate_display($company_currency, $supplier_currency, $_POST['tran_date']);
 	}
 
   	label_row(_("Tax Group:"), $supp_trans->tax_description);
@@ -141,11 +154,11 @@ function invoice_totals(&$supp_trans)
 
 	$dim = get_company_pref('use_dimension');
  	$colspan = ($dim == 2 ? 7 : ($dim == 1 ? 6 : 5));
-   	start_table(TABLESTYLE, "width=95%");
+   	start_table(TABLESTYLE, "width='95%'");
    	label_row(_("Sub-total:"), price_format( $supp_trans->ov_amount), "colspan=$colspan align=right", "align=right");
 
     $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id);
-    $tax_total = display_edit_tax_items($taxes, $colspan, $supp_trans->tax_included);
+    $tax_total = display_edit_tax_items($taxes, $colspan, $supp_trans->tax_included, 0, true);
 
     $display_total = price_format($supp_trans->ov_amount + $tax_total);
 
@@ -208,7 +221,7 @@ function display_gl_items(&$supp_trans, $mode=0)
 	else
 		$heading = _("GL Items for this Credit Note");
 
-	start_outer_table(TABLESTYLE, "width=95%");
+	start_outer_table(TABLESTYLE, "width='95%'");
 
 	if ($mode == 1)
 	{
@@ -238,7 +251,7 @@ function display_gl_items(&$supp_trans, $mode=0)
 	end_outer_table(0, false);
 
 	div_start('gl_items');
-	start_table(TABLESTYLE, "width=95%");
+	start_table(TABLESTYLE, "width='95%'");
 
 	$dim = get_company_pref('use_dimension');
 	if ($dim == 2)
@@ -419,7 +432,7 @@ function display_grn_items(&$supp_trans, $mode=0)
     if (($mode == 2  || $mode == 3) && count($supp_trans->grn_items) == 0)
     	return 0;
 
-	start_outer_table("style='border:1px solid #cccccc;' width=95%");
+	start_outer_table("style='border:1px solid #cccccc;' width='95%'");
 
 	$heading2 = "";
 	if ($mode == 1)
@@ -458,14 +471,14 @@ function display_grn_items(&$supp_trans, $mode=0)
 		{
 			display_note($heading2, 0, 0, "class='overduefg'");
 		}	
-		echo "</td><td width=10% align='right'>";
+		echo "</td><td width='10%' align='right'>";
 		submit('InvGRNAll', _("Add All Items"), true, false,true);
 	}	
 
 	end_outer_table(0, false);
 
   	div_start('grn_items');
-	start_table(TABLESTYLE, "width=95%");
+	start_table(TABLESTYLE, "width='95%'");
 	if ($mode == 1)
 	{
     	$th = array(_("Delivery"), _("P.O."), _("Item"), _("Description"),