X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fmanage%2Fsuppliers.php;h=a2c2b450b15a1e0dd001a9156cbc3eb4ab76c7ac;hb=5089910120614dfb8b76a0271b43739f90f38b01;hp=b2ad33c7f47d370fbef07571f553fe9a32f3bf0b;hpb=bd3023c1b5e64429043358a691b3aae20eb54c09;p=fa-stable.git

diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php
index b2ad33c7..a2c2b450 100644
--- a/purchasing/manage/suppliers.php
+++ b/purchasing/manage/suppliers.php
@@ -54,6 +54,7 @@ function supplier_settings(&$supplier_id)
 		$_POST['payment_terms']  = $myrow["payment_terms"];
 		$_POST['credit_limit']  = price_format($myrow["credit_limit"]);
 		$_POST['tax_group_id'] = $myrow["tax_group_id"];
+		$_POST['tax_included'] = $myrow["tax_included"];
 		$_POST['payable_account']  = $myrow["payable_account"];
 		$_POST['purchase_account']  = $myrow["purchase_account"];
 		$_POST['payment_discount_account'] = $myrow["payment_discount_account"];
@@ -66,6 +67,7 @@ function supplier_settings(&$supplier_id)
 			$_POST['tax_group_id'] = $_POST['website'] = $_POST['supp_account_no'] = $_POST['notes'] = '';
 		$_POST['dimension_id'] = 0;
 		$_POST['dimension2_id'] = 0;
+		$_POST['tax_included'] = 0;
 		$_POST['sales_type'] = -1;
 		$_POST['gst_no'] = $_POST['bank_account'] = '';
 		$_POST['payment_terms']  = '';
@@ -74,7 +76,7 @@ function supplier_settings(&$supplier_id)
 		$company_record = get_company_prefs();
 		$_POST['curr_code']  = $company_record["curr_default"];
 		$_POST['payable_account'] = $company_record["creditors_act"];
-		$_POST['purchase_account'] = $company_record["default_cogs_act"];
+		$_POST['purchase_account'] = ''; // default/item's cogs account
 		$_POST['payment_discount_account'] = $company_record['pyt_discount_act'];
 	}
 
@@ -85,7 +87,7 @@ function supplier_settings(&$supplier_id)
 
 	text_row(_("GSTNo:"), 'gst_no', null, 42, 40);
 	link_row(_("Website:"), 'website', null, 35, 55);
-	if ($supplier_id) 
+	if ($supplier_id && !is_new_supplier($supplier_id)) 
 	{
 		label_row(_("Supplier's Currency:"), $_POST['curr_code']);
 		hidden('curr_code', $_POST['curr_code']);
@@ -110,10 +112,20 @@ function supplier_settings(&$supplier_id)
 	text_row(_("Bank Name/Account:"), 'bank_account', null, 42, 40);
 	amount_row(_("Credit Limit:"), 'credit_limit', null);
 	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.
+	//
+	if (is_new_supplier($supplier_id))
+		check_row(_("Prices contain tax included:"), 'tax_included');
+	else {
+		hidden('tax_included');
+		label_row(_("Prices contain tax included:"), $_POST['tax_included'] ? _('Yes') : _('No'));
+	}
 	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']);
+	gl_all_accounts_list_row(_("Purchase Account:"), 'purchase_account', $_POST['purchase_account'],
+		false, false, _("Use Item Inventory/COGS Account"));
 	gl_all_accounts_list_row(_("Purchase Discount Account:"), 'payment_discount_account', $_POST['payment_discount_account']);
 
 	table_section(2);
@@ -194,7 +206,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']);
+				$_POST['notes'], $_POST['tax_group_id'], @$_POST['tax_included']);
 			update_record_status($_POST['supplier_id'], $_POST['inactive'],
 				'suppliers', 'supplier_id');
 
@@ -207,7 +219,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']);
+				$_POST['payment_discount_account'], $_POST['notes'], $_POST['tax_group_id'], check_value('tax_included'));
 
 			$supplier_id = $_POST['supplier_id'] = db_insert_id();
 
@@ -283,8 +295,8 @@ if (!$supplier_id)
 	unset($_POST['_tabs_sel']); // force settings tab for new customer
 
 tabbed_content_start('tabs', array(
-		'settings' => array('&General settings', $supplier_id),
-		'contacts' => array('&Contacts', $supplier_id),
+		'settings' => array(_('&General settings'), $supplier_id),
+		'contacts' => array(_('&Contacts'), $supplier_id),
 	));
 	
 	switch (get_post('_tabs_sel')) {