X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fmanage%2Fsuppliers.php;fp=purchasing%2Fmanage%2Fsuppliers.php;h=bc8f3f28ccde84a6f9bd29a7ed815311fff9c54e;hb=1571869d54be48452fdbe08f25130972ff0a7b5a;hp=35ba173d69aba02efd1b3e04fae0d4c0b7fa6f9d;hpb=327bdb5d6f9a11274f0bedd20e6c9d39276a5f8f;p=fa-stable.git

diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php
index 35ba173d..bc8f3f28 100644
--- a/purchasing/manage/suppliers.php
+++ b/purchasing/manage/suppliers.php
@@ -61,6 +61,7 @@ function supplier_settings(&$supplier_id)
 		$_POST['credit_limit']  = price_format($myrow["credit_limit"]);
 		$_POST['tax_group_id'] = $myrow["tax_group_id"];
 		$_POST['tax_included'] = $myrow["tax_included"];
+		$_POST['tax_algorithm'] = $myrow["tax_algorithm"];
 		$_POST['payable_account']  = $myrow["payable_account"];
 		$_POST['purchase_account']  = $myrow["purchase_account"];
 		$_POST['payment_discount_account'] = $myrow["payment_discount_account"];
@@ -74,6 +75,7 @@ function supplier_settings(&$supplier_id)
 		$_POST['dimension_id'] = 0;
 		$_POST['dimension2_id'] = 0;
 		$_POST['tax_included'] = 0;
+		$_POST['tax_algorithm'] = 1;
 		$_POST['sales_type'] = -1;
 		$_POST['gst_no'] = $_POST['bank_account'] = '';
 		$_POST['payment_terms']  = '';
@@ -111,7 +113,7 @@ function supplier_settings(&$supplier_id)
 	payment_terms_list_row(_("Payment Terms:"), 'payment_terms', null);
 	//
 	// tax_included option from supplier record is used directly in update_average_cost() function,
-	// therefore we can't edit the option after any transaction waas done for the supplier.
+	// therefore we can't edit the option after any transaction was done for the supplier.
 	//
 	if (is_new_supplier($supplier_id))
 		check_row(_("Prices contain tax included:"), 'tax_included');
@@ -119,6 +121,10 @@ function supplier_settings(&$supplier_id)
 		hidden('tax_included');
 		label_row(_("Prices contain tax included:"), $_POST['tax_included'] ? _('Yes') : _('No'));
 	}
+	tax_algorithm_list_row(_("Tax Calculation Algorithm:"), 'tax_algorithm', null);
+
+	if (!$supplier_id) table_section(2);
+
 	table_section_title(_("Accounts"));
 	gl_all_accounts_list_row(_("Accounts Payable Account:"), 'payable_account', $_POST['payable_account']);
 	gl_all_accounts_list_row(_("Purchase Account:"), 'purchase_account', $_POST['purchase_account'],
@@ -128,9 +134,11 @@ function supplier_settings(&$supplier_id)
 		table_section_title(_("Contact Data"));
 		text_row(_("Phone Number:"), 'phone', null, 32, 30);
 		text_row(_("Secondary Phone Number:"), 'phone2', null, 32, 30);
+		table_section_title(_("Contact Data"));
+		text_row(_("Fax Number:"), 'fax', null, 32, 30);
+		email_row(_("E-mail:"), 'email', null, 35, 55);
+		languages_list_row(_("Document Language:"), 'rep_lang', null, _('System default'));
 	}
-
-	table_section(2);
 	$dim = get_company_pref('use_dimension');
 	if ($dim >= 1)
 	{
@@ -143,6 +151,7 @@ function supplier_settings(&$supplier_id)
 		hidden('dimension_id', 0);
 	if ($dim < 2)
 		hidden('dimension2_id', 0);
+	table_section(2);
 
 
 	table_section_title(_("Addresses"));
@@ -153,13 +162,6 @@ function supplier_settings(&$supplier_id)
 	textarea_row(_("General Notes:"), 'notes', null, 35, 5);
 	if ($supplier_id)
 		record_status_list_row(_("Supplier status:"), 'inactive');
-	else {
-		table_section_title(_("Contact Data"));
-		text_row(_("Contact Person:"), 'contact', null, 42, 40);
-		text_row(_("Fax Number:"), 'fax', null, 32, 30);
-		email_row(_("E-mail:"), 'email', null, 35, 55);
-		languages_list_row(_("Document Language:"), 'rep_lang', null, _('System default'));
-	}
 	end_outer_table(1);
 
 	div_start('controls');
@@ -214,7 +216,7 @@ if (isset($_POST['submit']))
 				$_POST['website'], $_POST['supp_account_no'], $_POST['bank_account'], 
 				input_num('credit_limit', 0), $_POST['dimension_id'], $_POST['dimension2_id'], $_POST['curr_code'],
 				$_POST['payment_terms'], $_POST['payable_account'], $_POST['purchase_account'], $_POST['payment_discount_account'],
-				$_POST['notes'], $_POST['tax_group_id'], get_post('tax_included', 0));
+				$_POST['notes'], $_POST['tax_group_id'], get_post('tax_included', 0), get_post('tax_algorithm'));
 			update_record_status($_POST['supplier_id'], $_POST['inactive'],
 				'suppliers', 'supplier_id');
 
@@ -227,7 +229,7 @@ if (isset($_POST['submit']))
 				$_POST['gst_no'], $_POST['website'], $_POST['supp_account_no'], $_POST['bank_account'], 
 				input_num('credit_limit',0), $_POST['dimension_id'], $_POST['dimension2_id'],
 				$_POST['curr_code'], $_POST['payment_terms'], $_POST['payable_account'], $_POST['purchase_account'],
-				$_POST['payment_discount_account'], $_POST['notes'], $_POST['tax_group_id'], check_value('tax_included'));
+				$_POST['payment_discount_account'], $_POST['notes'], $_POST['tax_group_id'], check_value('tax_included'), get_post('tax_algorithm'));
 
 			$supplier_id = $_POST['supplier_id'] = db_insert_id();