resolved merge conflicts

erpnext/__init__.py

@@ -4,7 +4,7 @@ import inspect
 import frappe
 from erpnext.hooks import regional_overrides
 
-__version__ = '8.5.2'
+__version__ = '8.5.3'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json

@@ -1516,6 +1516,36 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "sec_tax_breakup", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Tax Breakup", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
@@ -1523,7 +1553,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "other_charges_calculation", 
-   "fieldtype": "HTML", 
+   "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -1533,12 +1563,12 @@
    "in_standard_filter": 0, 
    "label": "Taxes and Charges Calculation", 
    "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
    "oldfieldtype": "HTML", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -3767,7 +3797,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-06-29 10:48:09.707735", 
+ "modified": "2017-07-19 13:53:48.673757", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice", 

erpnext/buying/doctype/purchase_order/purchase_order.json

@@ -1546,6 +1546,36 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "sec_tax_breakup", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Tax Breakup", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
@@ -1553,7 +1583,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "other_charges_calculation", 
-   "fieldtype": "HTML", 
+   "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -1568,7 +1598,7 @@
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -3305,7 +3335,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-06-13 14:29:21.066814", 
+ "modified": "2017-07-19 14:03:51.838328", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order", 

erpnext/buying/doctype/supplier_quotation/supplier_quotation.json

@@ -1120,6 +1120,36 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "tax_breakup", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Tax Breakup", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
@@ -1127,7 +1157,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "other_charges_calculation", 
-   "fieldtype": "HTML", 
+   "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -1142,7 +1172,7 @@
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2217,7 +2247,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-06-13 14:28:54.466450", 
+ "modified": "2017-07-19 13:51:18.929697", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier Quotation", 

erpnext/controllers/taxes_and_totals.py

@@ -509,28 +509,31 @@ class calculate_taxes_and_totals(object):
 		return rate_with_margin
 
 	def set_item_wise_tax_breakup(self):
-		if not self.doc.taxes:
+		self.doc.other_charges_calculation = get_itemised_tax_breakup_html(self.doc)
-			return
-		frappe.flags.company = self.doc.company
 		
-		# get headers
+def get_itemised_tax_breakup_html(doc):
-		tax_accounts = list(set([d.description for d in self.doc.taxes]))
+	if not doc.taxes:
-		headers = get_itemised_tax_breakup_header(self.doc.doctype + " Item", tax_accounts)
+		return
-		
+	frappe.flags.company = doc.company
-		# get tax breakup data
+	
-		itemised_tax, itemised_taxable_amount = get_itemised_tax_breakup_data(self.doc)
+	# get headers
-		
+	tax_accounts = list(set([d.description for d in doc.taxes]))
-		frappe.flags.company = None
+	headers = get_itemised_tax_breakup_header(doc.doctype + " Item", tax_accounts)
-		
+	
-		self.doc.other_charges_calculation = frappe.render_template(
+	# get tax breakup data
-			"templates/includes/itemised_tax_breakup.html", dict(
+	itemised_tax, itemised_taxable_amount = get_itemised_tax_breakup_data(doc)
-				headers=headers,
+	
-				itemised_tax=itemised_tax,
+	frappe.flags.company = None
-				itemised_taxable_amount=itemised_taxable_amount,
+	
-				tax_accounts=tax_accounts,
+	return frappe.render_template(
-				company_currency=erpnext.get_company_currency(self.doc.company)
+		"templates/includes/itemised_tax_breakup.html", dict(
-			)
+			headers=headers,
+			itemised_tax=itemised_tax,
+			itemised_taxable_amount=itemised_taxable_amount,
+			tax_accounts=tax_accounts,
+			company_currency=erpnext.get_company_currency(doc.company)
 		)
+	)
 
 @erpnext.allow_regional
 def get_itemised_tax_breakup_header(item_doctype, tax_accounts):

erpnext/hr/doctype/leave_application/leave_application.py

@@ -412,7 +412,7 @@ def get_events(start, end, filters=None):
 		company=frappe.db.get_value("Global Defaults", None, "default_company")
 
 	from frappe.desk.reportview import get_filters_cond
-	conditions = get_filters_cond("Leave Application")
+	conditions = get_filters_cond("Leave Application", filters, [])
 
 	# show department leaves for employee
 	if "Employee" in frappe.get_roles():
@@ -435,7 +435,7 @@ def add_department_leaves(events, start, end, employee, company):
 	department_employees = frappe.db.sql_list("""select name from tabEmployee where department=%s
 		and company=%s""", (department, company))
 
-	match_conditions = "employee in (\"%s\")" % '", "'.join(department_employees)
+	match_conditions = "and employee in (\"%s\")" % '", "'.join(department_employees)
 	add_leaves(events, start, end, match_conditions=match_conditions)
 
 def add_leaves(events, start, end, match_conditions=None):
@@ -446,7 +446,7 @@ def add_leaves(events, start, end, match_conditions=None):
 		and docstatus < 2
 		and status!="Rejected" """
 	if match_conditions:
-		query += " and " + match_conditions
+		query += match_conditions
 
 	for d in frappe.db.sql(query, {"start":start, "end": end}, as_dict=True):
 		e = {

erpnext/patches.txt

@@ -422,4 +422,5 @@ erpnext.patches.v8_1.add_indexes_in_transaction_doctypes
 erpnext.patches.v8_3.set_restrict_to_domain_for_module_def
 erpnext.patches.v8_1.update_expense_claim_status
 erpnext.patches.v8_3.update_company_total_sales
-erpnext.patches.v8_1.set_delivery_date_in_so_item
+erpnext.patches.v8_1.set_delivery_date_in_so_item
+erpnext.patches.v8_5.fix_tax_breakup_for_non_invoice_docs

erpnext/patches/v8_5/fix_tax_breakup_for_non_invoice_docs.py

@@ -0,0 +1,47 @@
+import frappe
+from erpnext.regional.india.setup import make_custom_fields
+from erpnext.controllers.taxes_and_totals import get_itemised_tax_breakup_html
+
+def execute():
+	companies = [d.name for d in frappe.get_all('Company', filters = {'country': 'India'})]
+	if not companies:
+		return
+
+	make_custom_fields()
+
+	# update invoice copy value
+	values = ["Original for Recipient", "Duplicate for Transporter",
+		"Duplicate for Supplier", "Triplicate for Supplier"]
+	for d in values:
+		frappe.db.sql("update `tabSales Invoice` set invoice_copy=%s where invoice_copy=%s", (d, d))
+
+	# update tax breakup in transactions made after 1st July 2017
+	doctypes = ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice", 
+		"Supplier Quotation", "Purchase Order", "Purchase Receipt", "Purchase Invoice"]
+
+	for doctype in doctypes:
+		frappe.reload_doctype(doctype)
+
+		date_field = "posting_date"
+		if doctype in ["Quotation", "Sales Order", "Supplier Quotation", "Purchase Order"]:
+			date_field = "transaction_date"
+
+		records = [d.name for d in frappe.get_all(doctype, filters={
+			"docstatus": ["!=", 2],
+			date_field: [">=", "2017-07-01"],
+			"company": ["in", companies],
+			"total_taxes_and_charges": [">", 0],
+			"other_charges_calculation": ""
+		})]
+		if records:
+			frappe.db.sql("""
+				update `tab%s Item` dt_item
+				set gst_hsn_code = (select gst_hsn_code from tabItem where name=dt_item.item_code)
+				where parent in (%s)
+					and (gst_hsn_code is null or gst_hsn_code = '')
+			""" % (doctype, ', '.join(['%s']*len(records))), tuple(records))
+
+			for record in records:
+				doc = frappe.get_doc(doctype, record)
+				html = get_itemised_tax_breakup_html(doc)
+				doc.db_set("other_charges_calculation", html, update_modified=False)

erpnext/public/js/controllers/buying.js

@@ -228,6 +228,8 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
 				items: my_items
 			},
 			callback: function(r) {
+				if(r.exc) return;
+
 				var i = 0;
 				var item_length = cur_frm.doc.items.length;
 				while (i < item_length) {
@@ -244,35 +246,26 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
 							cur_frm.doc.items[i].qty = my_qty;
 
 							frappe.msgprint("Assigning " + d.mr_name + " to " + d.item_code + " (row " + cur_frm.doc.items[i].idx + ")");
-							if (qty > 0)
+							if (qty > 0) {
-							{
 								frappe.msgprint("Splitting " + qty + " units of " + d.item_code);
 								var newrow = frappe.model.add_child(cur_frm.doc, cur_frm.doc.items[i].doctype, "items");
 								item_length++;
 
-								for (var key in cur_frm.doc.items[i])
+								for (var key in cur_frm.doc.items[i]) {
-								{
 									newrow[key] = cur_frm.doc.items[i][key];
 								}
 
 								newrow.idx = item_length;
 								newrow["stock_qty"] = newrow.conversion_factor*qty;
 								newrow["qty"] = qty;
-
 								newrow["material_request"] = "";
 								newrow["material_request_item"] = "";
-
 							}
-
-
-
 						}
-
 					});
 					i++;
 				}
 				refresh_field("items");
-				//cur_frm.save();
 			}
 		});
 	}

erpnext/regional/india/setup.py

@@ -107,13 +107,15 @@ def make_custom_fields():
 				fieldtype='Data', insert_after='company_address',
 				options='company_address.gstin', print_hide=1),
 			dict(fieldname='invoice_copy', label='Invoice Copy',
-				fieldtype='Select', insert_after='project', print_hide=1, allow_on_submit=1,
+				fieldtype='Select', insert_after='select_print_heading', print_hide=1, allow_on_submit=1,
-				options='ORIGINAL FOR RECIPIENT\nDUPLICATE FOR TRANSPORTER\nDUPLICATE FOR SUPPLIER\nTRIPLICATE FOR SUPPLIER')
+				options='Original for Recipient\nDuplicate for Transporter\nDuplicate for Supplier\nTriplicate for Supplier')
 		],
 		'Item': [
 			dict(fieldname='gst_hsn_code', label='HSN/SAC',
 				fieldtype='Link', options='GST HSN Code', insert_after='item_group'),
 		],
+		'Quotation Item': [hsn_sac_field],
+		'Supplier Quotation Item': [hsn_sac_field],
 		'Sales Order Item': [hsn_sac_field],
 		'Delivery Note Item': [hsn_sac_field],
 		'Sales Invoice Item': [hsn_sac_field],
@@ -131,7 +133,7 @@ def make_custom_fields():
 				custom_field = frappe.get_doc("Custom Field", field)
 				custom_field.update(df)
 				custom_field.save()
-			
+
 def make_fixtures():
 	docs = [
 		{'doctype': 'Salary Component', 'salary_component': 'Professional Tax', 'description': 'Professional Tax', 'type': 'Deduction'},

erpnext/selling/doctype/quotation/quotation.json

@@ -1440,6 +1440,36 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "sec_tax_breakup", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Tax Breakup", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
@@ -1447,7 +1477,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "other_charges_calculation", 
-   "fieldtype": "HTML", 
+   "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -1457,12 +1487,12 @@
    "in_standard_filter": 0, 
    "label": "Taxes and Charges Calculation", 
    "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
    "oldfieldtype": "HTML", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2542,7 +2572,7 @@
  "istable": 0, 
  "max_attachments": 1, 
  "menu_index": 0, 
- "modified": "2017-06-13 14:29:18.553722", 
+ "modified": "2017-07-19 13:49:33.388736", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Quotation", 

erpnext/selling/doctype/sales_order/sales_order.json

@@ -1552,6 +1552,36 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "sec_tax_breakup", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Tax Breakup", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
@@ -1559,7 +1589,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "other_charges_calculation", 
-   "fieldtype": "HTML", 
+   "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -1569,12 +1599,12 @@
    "in_standard_filter": 0, 
    "label": "Taxes and Charges Calculation", 
    "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
    "oldfieldtype": "HTML", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -3629,7 +3659,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-07-17 18:23:36.023797", 
+ "modified": "2017-07-19 13:45:02.965353", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order", 

erpnext/selling/doctype/sales_order/sales_order.py

@@ -334,11 +334,12 @@ class SalesOrder(SellingController):
 			bom = frappe.get_all('BOM', dict(item=i.item_code, is_active=True),
 					order_by='is_default desc')
 			bom = bom[0].name if bom else None
+			stock_qty = i.qty if self.packed_items else i.stock_qty
 			items.append(dict(
 				item_code= i.item_code,
 				bom = bom,
 				warehouse = i.warehouse,
-				pending_qty= i.stock_qty - flt(frappe.db.sql('''select sum(qty) from `tabProduction Order`
+				pending_qty= stock_qty - flt(frappe.db.sql('''select sum(qty) from `tabProduction Order`
 					where production_item=%s and sales_order=%s''', (i.item_code, self.name))[0][0])
 			))
 

erpnext/stock/doctype/delivery_note/delivery_note.json

@@ -1682,6 +1682,36 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "sec_tax_breakup", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Tax Breakup", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
@@ -1689,7 +1719,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "other_charges_calculation", 
-   "fieldtype": "HTML", 
+   "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -1699,12 +1729,12 @@
    "in_standard_filter": 0, 
    "label": "Taxes and Charges Calculation", 
    "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
    "oldfieldtype": "HTML", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -3396,7 +3426,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-06-13 14:29:05.182585", 
+ "modified": "2017-07-19 13:48:09.630820", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note", 

erpnext/stock/doctype/purchase_receipt/purchase_receipt.json

@@ -1351,6 +1351,36 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "sec_tax_breakup", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Tax Breakup", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
@@ -1358,7 +1388,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "other_charges_calculation", 
-   "fieldtype": "HTML", 
+   "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -1368,12 +1398,12 @@
    "in_standard_filter": 0, 
    "label": "Taxes and Charges Calculation", 
    "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
    "oldfieldtype": "HTML", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2939,7 +2969,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-06-13 14:29:08.605354", 
+ "modified": "2017-07-19 13:52:37.058861", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Receipt",