Merge branch 'develop'

video help page on report builder and shopping cart

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.12.4'
+__version__ = '6.14.0'

erpnext/accounts/doctype/account/account.json

@@ -25,6 +25,7 @@
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -46,6 +47,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -71,6 +73,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -95,6 +98,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -120,6 +124,7 @@
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -143,6 +148,7 @@
    "options": "\nAsset\nLiability\nIncome\nExpense\nEquity", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -166,6 +172,7 @@
    "options": "\nBalance Sheet\nProfit and Loss", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -191,6 +198,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -212,6 +220,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -238,6 +247,7 @@
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -261,9 +271,10 @@
    "no_copy": 0, 
    "oldfieldname": "account_type", 
    "oldfieldtype": "Select", 
-   "options": "\nBank\nCash\nTax\nChargeable\nWarehouse\nReceivable\nPayable\nEquity\nFixed Asset\nCost of Goods Sold\nExpense Account\nRound Off\nIncome Account\nStock Received But Not Billed\nExpenses Included In Valuation\nStock Adjustment\nStock\nTemporary", 
+   "options": "\nBank\nCash\nDepreciation\nTax\nChargeable\nWarehouse\nReceivable\nPayable\nEquity\nFixed Asset\nCost of Goods Sold\nExpense Account\nRound Off\nIncome Account\nStock Received But Not Billed\nExpenses Included In Valuation\nStock Adjustment\nStock\nTemporary", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -289,6 +300,7 @@
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -315,6 +327,7 @@
    "options": "No\nYes", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -338,6 +351,7 @@
    "options": "Warehouse", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -361,6 +375,7 @@
    "options": "\nDebit\nCredit", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -383,6 +398,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -405,6 +421,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -427,6 +444,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -445,7 +463,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:41.535663", 
+ "modified": "2015-12-12 10:19:54.365839", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Account", 

erpnext/accounts/doctype/account/account.py

@@ -199,6 +199,10 @@ class Account(Document):
 
 			if val != [self.is_group, self.root_type, self.company]:
 				throw(_("""Merging is only possible if following properties are same in both records. Is Group, Root Type, Company"""))
+				
+			if self.is_group and frappe.db.get_value("Account", new, "parent_account") == old:
+				frappe.db.set_value("Account", new, "parent_account", 
+					frappe.db.get_value("Account", old, "parent_account"))
 
 		return new_account
 

erpnext/accounts/doctype/account/chart_of_accounts/verified/gt_cuentas_plantilla.json

@@ -11,7 +11,10 @@
           "IVA por Cobrar": {},
           "Retenciones de IVA recibidas": {}
         },
-        "Inventario": {}
+        "Inventario": {
+          "is_group": 1,
+          "account_type": "Stock"
+        }
       },
       "No Corriente": {
         "Activos Fijos": {},

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json

@@ -1153,6 +1153,31 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "base_discount_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Additional Discount Amount (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
@@ -1176,6 +1201,30 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "additional_discount_percentage", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Additional Discount Percentage", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
@@ -1201,31 +1250,6 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "base_discount_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Additional Discount Amount (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
@@ -2463,7 +2487,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2015-12-01 00:49:02.736868", 
+ "modified": "2015-12-17 16:18:58.177334", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice", 

erpnext/accounts/doctype/sales_invoice/pos.py

@@ -52,4 +52,5 @@ def get_items(price_list, sales_or_purchase, item=None):
 			{condition}
 		order by
 			{order_by}
-			i.name""".format(condition=condition, order_by=order_by), args, as_dict=1)
+			i.name
+		limit 24""".format(condition=condition, order_by=order_by), args, as_dict=1)

erpnext/accounts/page/accounts_browser/accounts_browser.js

@@ -146,7 +146,7 @@ erpnext.AccountsChart = Class.extend({
 					label: __("Rename"),
 					click: function(node) {
 						frappe.model.rename_doc(me.ctype, node.label, function(new_name) {
-							node.reload();
+							node.reload_parent();
 						});
 					},
 					btnClass: "hidden-xs"
@@ -166,8 +166,8 @@ erpnext.AccountsChart = Class.extend({
 				var dr_or_cr = node.data.balance < 0 ? "Cr" : "Dr";
 				if (me.ctype == 'Account' && node.data && node.data.balance!==undefined) {
 					$('<span class="balance-area pull-right text-muted small">'
-						+ (node.data.balance_in_account_currency ? 
-							(format_currency(Math.abs(node.data.balance_in_account_currency), 
+						+ (node.data.balance_in_account_currency ?
+							(format_currency(Math.abs(node.data.balance_in_account_currency),
 								node.data.account_currency) + " / ") : "")
 						+ format_currency(Math.abs(node.data.balance), node.data.company_currency)
 						+ " " + dr_or_cr
@@ -219,7 +219,7 @@ erpnext.AccountsChart = Class.extend({
 					description: __("Optional. This setting will be used to filter in various transactions.") },
 				{fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate')},
 				{fieldtype:'Link', fieldname:'warehouse', label:__('Warehouse'), options:"Warehouse"},
-				{fieldtype:'Link', fieldname:'account_currency', label:__('Currency'), options:"Currency", 
+				{fieldtype:'Link', fieldname:'account_currency', label:__('Currency'), options:"Currency",
 					description: __("Optional. Sets company's default currency, if not specified.")}
 			]
 		})
@@ -243,7 +243,7 @@ erpnext.AccountsChart = Class.extend({
 			$(fd.tax_rate.wrapper).toggle(fd.account_type.get_value()==='Tax');
 			$(fd.warehouse.wrapper).toggle(fd.account_type.get_value()==='Warehouse');
 		})
-		
+
 		// root type if root
 		$(fd.root_type.wrapper).toggle(node.root);
 
@@ -261,7 +261,7 @@ erpnext.AccountsChart = Class.extend({
 			var node = me.tree.get_selected_node();
 			v.parent_account = node.label;
 			v.company = me.company;
-			
+
 			if(node.root) {
 				v.is_root = true;
 				v.parent_account = null;
@@ -278,7 +278,7 @@ erpnext.AccountsChart = Class.extend({
 					if(node.expanded) {
 						node.toggle_node();
 					}
-					node.reload();
+					node.load();
 				}
 			});
 		});
@@ -324,7 +324,7 @@ erpnext.AccountsChart = Class.extend({
 					if(node.expanded) {
 						node.toggle_node();
 					}
-					node.reload();
+					node.load();
 				}
 			});
 		});

erpnext/accounts/page/accounts_browser/accounts_browser.py

@@ -18,29 +18,31 @@ def get_companies():
 def get_children():
 	args = frappe.local.form_dict
 	ctype, company = args['ctype'], args['comp']
+	fieldname = frappe.db.escape(ctype.lower().replace(' ','_'))
+	doctype = frappe.db.escape(ctype)
 
 	# root
 	if args['parent'] in ("Accounts", "Cost Centers"):
-		select_cond = ", root_type, report_type, account_currency" if ctype=="Account" else ""
+		fields = ", root_type, report_type, account_currency" if ctype=="Account" else ""
 		acc = frappe.db.sql(""" select
-			name as value, is_group as expandable %s
-			from `tab%s`
-			where ifnull(`parent_%s`,'') = ''
+			name as value, is_group as expandable {fields}
+			from `tab{doctype}`
+			where ifnull(`parent_{fieldname}`,'') = ''
 			and `company` = %s	and docstatus<2
-			order by name""" % (select_cond, frappe.db.escape(ctype), frappe.db.escape(ctype.lower().replace(' ','_')), '%s'),
+			order by name""".format(fields=fields, fieldname = fieldname, doctype=doctype),
 				company, as_dict=1)
 
 		if args["parent"]=="Accounts":
 			sort_root_accounts(acc)
 	else:
 		# other
-		select_cond = ", account_currency" if ctype=="Account" else ""
+		fields = ", account_currency" if ctype=="Account" else ""
 		acc = frappe.db.sql("""select
-			name as value, is_group as expandable %s
-	 		from `tab%s`
-			where ifnull(`parent_%s`,'') = %s
+			name as value, is_group as expandable, parent_{fieldname} as parent {fields}
+	 		from `tab{doctype}`
+			where ifnull(`parent_{fieldname}`,'') = %s
 			and docstatus<2
-			order by name""" % (select_cond, frappe.db.escape(ctype), frappe.db.escape(ctype.lower().replace(' ','_')), '%s'),
+			order by name""".format(fields=fields, fieldname=fieldname, doctype=doctype),
 				args['parent'], as_dict=1)
 
 	if ctype == 'Account':
@@ -48,7 +50,7 @@ def get_children():
 		for each in acc:
 			each["company_currency"] = company_currency
 			each["balance"] = flt(get_balance_on(each.get("value"), in_account_currency=False))
-			
+
 			if each.account_currency != company_currency:
 				each["balance_in_account_currency"] = flt(get_balance_on(each.get("value")))
 

erpnext/accounts/report/accounts_receivable/accounts_receivable.py

@@ -24,7 +24,7 @@ class ReceivablePayableReport(object):
 		if party_naming_by == "Naming Series":
 			columns += [args.get("party_type") + " Name::110"]
 
-		columns += [_("Voucher Type") + "::110", _("Voucher No") + ":Dynamic Link/Voucher Type:120",
+		columns += [_("Voucher Type") + "::110", _("Voucher No") + ":Dynamic Link/"+_("Voucher Type")+":120",
 			_("Due Date") + ":Date:80"]
 
 		if args.get("party_type") == "Supplier":

erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html

@@ -2,7 +2,7 @@
 	{%= frappe.boot.letter_heads[frappe.defaults.get_default("letter_head")] %}
 </div>
 <h2 class="text-center">{%= __("Bank Reconciliation Statement") %}</h2>
-<h4 class="text-center">{%= filters.account && (filters.account + ", ")  || "" %} {%= filters.company %}</h4>
+<h4 class="text-center">{%= filters.account %}</h4>
 <hr>
 <table class="table table-bordered">
 	<thead>
@@ -16,31 +16,31 @@
 	</thead>
 	<tbody>
 		{% for(var i=0, l=data.length; i<l; i++) { %}
-			{% if (data[i][__("Posting Date")]) { %}
+			{% if (data[i]["posting_date"]) { %}
 			<tr>
-				<td>{%= dateutil.str_to_user(data[i][__("Posting Date")]) %}</td>
-				<td>{%= data[i][__("Journal Entry")] %}</td>
-				<td>{%= __("Against") %}: {%= data[i][__("Against Account")] %}
-					{% if (data[i][__("Reference")]) { %}
-						<br>{%= __("Reference") %}: {%= data[i][__("Reference")] %}
-						{% if (data[i][__("Ref Date")]) { %}
-							<br>{%= __("Reference Date") %}: {%= dateutil.str_to_user(data[i][__("Ref Date")]) %}
+				<td>{%= dateutil.str_to_user(data[i]["posting_date"]) %}</td>
+				<td>{%= data[i]["journal_entry"] %}</td>
+				<td>{%= __("Against") %}: {%= data[i]["against_account"] %}
+					{% if (data[i]["reference"]) { %}
+						<br>{%= __("Reference") %}: {%= data[i]["reference"] %}
+						{% if (data[i]["ref_date"]) { %}
+							<br>{%= __("Reference Date") %}: {%= dateutil.str_to_user(data[i]["ref_date"]) %}
 						{% } %}
 					{% } %}
-					{% if (data[i][__("Clearance Date")]) { %}
-						<br>{%= __("Clearance Date") %}: {%= dateutil.str_to_user(data[i][__("Clearance Date")]) %}
+					{% if (data[i]["clearance_date"]) { %}
+						<br>{%= __("Clearance Date") %}: {%= dateutil.str_to_user(data[i]["clearance_date"]) %}
 					{% } %}
 				</td>
-				<td style="text-align: right">{%= format_currency(data[i][__("Debit")]) %}</td>
-				<td style="text-align: right">{%= format_currency(data[i][__("Credit")]) %}</td>
+				<td style="text-align: right">{%= format_currency(data[i]["debit"]) %}</td>
+				<td style="text-align: right">{%= format_currency(data[i]["credit"]) %}</td>
 			</tr>
 			{% } else { %}
 			<tr>
 				<td></td>
 				<td></td>
-				<td>{%= data[i][__("Journal Entry")] %}</td>
-				<td style="text-align: right">{%= format_currency(data[i][__("Debit")]) %}</td>
-				<td style="text-align: right">{%= format_currency(data[i][__("Credit")]) %}</td>
+				<td>{%= data[i]["journal_entry"] %}</td>
+				<td style="text-align: right">{%= format_currency(data[i]["debit"]) %}</td>
+				<td style="text-align: right">{%= format_currency(data[i]["credit"]) %}</td>
 			</tr>
 			{% } %}
 		{% } %}

erpnext/accounts/report/cash_flow/cash_flow.js

@@ -0,0 +1,6 @@
+// Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.require("assets/erpnext/js/financial_statements.js");
+
+frappe.query_reports["Cash Flow"] = erpnext.financial_statements;

erpnext/accounts/report/cash_flow/cash_flow.json

@@ -0,0 +1,18 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2015-12-12 10:22:45.383203", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "modified": "2015-12-12 10:22:45.383203", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Cash Flow", 
+ "owner": "Administrator", 
+ "ref_doctype": "GL Entry", 
+ "report_name": "Cash Flow", 
+ "report_type": "Script Report"
+}

erpnext/accounts/report/cash_flow/cash_flow.py

@@ -0,0 +1,134 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from erpnext.accounts.report.financial_statements import (get_period_list, get_columns, get_data)
+from erpnext.accounts.report.profit_and_loss_statement.profit_and_loss_statement import get_net_profit_loss
+
+
+def execute(filters=None):
+	period_list = get_period_list(filters.fiscal_year, filters.periodicity)
+
+	operation_accounts = {
+		"section_name": "Operations",
+		"section_footer": _("Net Cash from Operations"),
+		"section_header": _("Cash Flow from Operations"),
+		"account_types": [
+			{"account_type": "Depreciation", "label": _("Depreciation")},
+			{"account_type": "Receivable", "label": _("Net Change in Accounts Receivable")},
+			{"account_type": "Payable", "label": _("Net Change in Accounts Payable")},
+			{"account_type": "Warehouse", "label": _("Net Change in Inventory")}
+		]
+	}
+
+	investing_accounts = {
+		"section_name": "Investing",
+		"section_footer": _("Net Cash from Investing"),
+		"section_header": _("Cash Flow from Investing"),
+		"account_types": [
+			{"account_type": "Fixed Asset", "label": _("Net Change in Fixed Asset")}
+		]
+	}
+
+	financing_accounts = {
+		"section_name": "Financing",
+		"section_footer": _("Net Cash from Financing"),
+		"section_header": _("Cash Flow from Financing"),
+		"account_types": [
+			{"account_type": "Equity", "label": _("Net Change in Equity")}
+		]
+	}
+
+	# combine all cash flow accounts for iteration
+	cash_flow_accounts = []
+	cash_flow_accounts.append(operation_accounts)
+	cash_flow_accounts.append(investing_accounts)
+	cash_flow_accounts.append(financing_accounts)
+
+	# compute net profit / loss
+	income = get_data(filters.company, "Income", "Credit", period_list, ignore_closing_entries=True)
+	expense = get_data(filters.company, "Expense", "Debit", period_list, ignore_closing_entries=True)
+	net_profit_loss = get_net_profit_loss(income, expense, period_list)
+
+	data = []
+
+	for cash_flow_account in cash_flow_accounts:
+
+		section_data = []
+		data.append({
+			"account_name": cash_flow_account['section_header'], 
+			"parent_account": None,
+			"indent": 0.0, 
+			"account": cash_flow_account['section_header']
+		})
+
+		if len(data) == 1:
+			# add first net income in operations section
+			if net_profit_loss:
+				net_profit_loss.update({
+					"indent": 1, 
+					"parent_account": operation_accounts['section_header']
+				})
+				data.append(net_profit_loss)
+				section_data.append(net_profit_loss)
+
+		for account in cash_flow_account['account_types']:
+			account_data = get_account_type_based_data(filters.company, account['account_type'], period_list)
+			account_data.update({
+				"account_name": account['label'], 
+				"indent": 1,
+				"parent_account": cash_flow_account['section_header']
+			})
+			data.append(account_data)
+			section_data.append(account_data)
+
+		add_total_row_account(data, section_data, cash_flow_account['section_footer'], period_list)
+
+	add_total_row_account(data, data, _("Net Change in Cash"), period_list)
+	columns = get_columns(period_list)
+
+	return columns, data
+
+
+def get_account_type_based_data(company, account_type, period_list):
+	data = {}
+	for period in period_list:
+		gl_sum = frappe.db.sql_list("""
+			select sum(credit) - sum(debit)
+			from `tabGL Entry`
+			where company=%s and posting_date >= %s and posting_date <= %s 
+				and voucher_type != 'Period Closing Voucher'
+				and account in ( SELECT name FROM tabAccount WHERE account_type = %s)
+		""", (company, period['from_date'], period['to_date'], account_type))
+		
+		if gl_sum and gl_sum[0]:
+			amount = gl_sum[0]
+			if account_type == "Depreciation":
+				amount *= -1
+		else:
+			amount = 0
+		
+		data.update({
+			"from_date": period['from_date'], 
+			"to_date": period['to_date'], 
+			period["key"]: amount
+		})
+	return data
+
+
+def add_total_row_account(out, data, label, period_list):
+	total_row = {
+		"account_name": "'" + _("{0}").format(label) + "'",
+		"account": None
+	}
+
+	for row in data:
+		if row.get("parent_account"):
+			for period in period_list:
+				total_row.setdefault(period.key, 0.0)
+				total_row[period.key] += row.get(period.key, 0.0)
+
+	out.append(total_row)
+	out.append({})

erpnext/accounts/report/financial_statements.py

@@ -257,4 +257,4 @@ def get_columns(period_list):
 			"width": 150
 		})
 
-	return columns
+	return columns

erpnext/accounts/report/general_ledger/general_ledger.py

@@ -85,7 +85,7 @@ def get_columns(filters):
 		]
 
 	columns += [
-		_("Voucher Type") + "::120", _("Voucher No") + ":Dynamic Link/Voucher Type:160",
+		_("Voucher Type") + "::120", _("Voucher No") + ":Dynamic Link/"+_("Voucher Type")+":160",
 		_("Against Account") + "::120", _("Party Type") + "::80", _("Party") + "::150",
 		_("Cost Center") + ":Link/Cost Center:100", _("Remarks") + "::400"
 	]
@@ -178,7 +178,8 @@ def get_data_with_opening_closing(filters, account_details, gl_entries):
 
 	else:
 		for gl in gl_entries:
-			if gl.posting_date >= getdate(filters.from_date) and gl.posting_date <= getdate(filters.to_date):
+			if gl.posting_date >= getdate(filters.from_date) and gl.posting_date <= getdate(filters.to_date) \
+					and gl.is_opening == "No":
 				data.append(gl)
 
 

erpnext/buying/doctype/purchase_common/purchase_common.js

@@ -59,7 +59,8 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
 		this.frm.toggle_display("supplier_name",
 			(this.supplier_name && this.frm.doc.supplier_name!==this.frm.doc.supplier));
 
-		if(this.frm.doctype==="Purchase Order" || this.frm.doctype==="Material Request") {
+		if(this.frm.docstatus==0 &&
+			(this.frm.doctype==="Purchase Order" || this.frm.doctype==="Material Request")) {
 			this.set_from_product_bundle();
 		}
 

erpnext/buying/doctype/purchase_order/purchase_order.json

@@ -1349,6 +1349,31 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "base_discount_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Additional Discount Amount (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
@@ -1372,6 +1397,30 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "additional_discount_percentage", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Additional Discount Percentage", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
@@ -1397,31 +1446,6 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "base_discount_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Additional Discount Amount (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
@@ -2434,7 +2458,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-12-01 00:48:11.749313", 
+ "modified": "2015-12-17 16:18:39.096762", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order", 

erpnext/buying/doctype/purchase_order/purchase_order.py

@@ -159,6 +159,7 @@ class PurchaseOrder(BuyingController):
 	def on_cancel(self):
 		if self.has_drop_ship_item():
 			self.update_status_updater()
+			self.update_delivered_qty_in_sales_order()
 
 		pc_obj = frappe.get_doc('Purchase Common')
 		self.check_for_stopped_or_closed_status(pc_obj)
@@ -216,7 +217,7 @@ class PurchaseOrder(BuyingController):
 
 		for so_name in sales_orders_to_update:
 			so = frappe.get_doc("Sales Order", so_name)
-			so.update_delivery_status(self.name)
+			so.update_delivery_status()
 			so.set_status(update=True)
 			so.notify_update()
 

erpnext/buying/doctype/supplier/supplier.json

@@ -27,6 +27,7 @@
    "options": "icon-user", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -52,6 +53,7 @@
    "options": "SUPP-", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -76,6 +78,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -97,6 +100,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -123,6 +127,7 @@
    "options": "Supplier Type", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -146,6 +151,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -168,6 +174,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -191,6 +198,7 @@
    "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -214,51 +222,7 @@
    "options": "Price List", 
    "permlevel": 0, 
    "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_10", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "default_taxes_and_charges", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Taxes and Charges", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Purchase Taxes and Charges Template", 
-   "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -281,6 +245,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -306,6 +271,7 @@
    "options": "icon-map-marker", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -328,6 +294,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -349,6 +316,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -372,6 +340,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -395,6 +364,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -420,6 +390,7 @@
    "options": "Party Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -443,6 +414,7 @@
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -468,6 +440,7 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -493,6 +466,7 @@
    "oldfieldtype": "Code", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -516,6 +490,7 @@
    "options": "Communication", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -534,7 +509,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:58.500467", 
+ "modified": "2015-12-08 12:52:56.827461", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier", 

erpnext/buying/doctype/supplier_quotation/supplier_quotation.json

@@ -1080,6 +1080,31 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "base_discount_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Additional Discount Amount (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
@@ -1103,6 +1128,30 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "additional_discount_percentage", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Additional Discount Percentage", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
@@ -1128,31 +1177,6 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "base_discount_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Additional Discount Amount (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
@@ -1690,7 +1714,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2015-12-01 00:48:50.969833", 
+ "modified": "2015-12-17 16:18:29.855942", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier Quotation", 

erpnext/change_log/v6/v6_12_9.md

@@ -0,0 +1,2 @@
+- Task status will be automatically set to "Overdue" when it crosses expected end date.
+- Task notification will only be for overdue tasks, not open tasks.

erpnext/change_log/v6/v6_13_1.md

@@ -0,0 +1 @@
+- [ERPNext Manual in German](http://frappe.github.io/erpnext/user/manual/de/) contributed by [CWT Connector & Wire Technology GmbH](http://www.cwt-assembly.com/)

erpnext/change_log/v6/v6_14_0.md

@@ -0,0 +1,7 @@
+- **Cash Flow Report**
+	- Thank you [Chris Ian Fiel](https://discuss.erpnext.com/users/ccfiel/activity) for this much needed report!
+	- You can access this report from *Accounts > Main Reports > Cash Flow*
+- **Additional Discount Percentage**
+	- Enter a percentage value to calculate Additional Discount Amount
+	- Apply such a discount in the POS screen
+	- Available in all Selling and Buying transactions

erpnext/config/accounts.py

@@ -229,6 +229,12 @@ def get_data():
 					"doctype": "GL Entry",
 					"is_query_report": True
 				},
+				{
+					"type": "report",
+					"name": "Cash Flow",
+					"doctype": "GL Entry",
+					"is_query_report": True
+				},
 				{
 					"type": "report",
 					"name": "Profit and Loss Statement",

erpnext/config/learn.py

@@ -57,6 +57,16 @@ def get_data():
 					"label": _("Workflow"),
 					"youtube_id": "yObJUg9FxFs"
 				},
+				{
+					"type": "help",
+					"label": _("Email Account"),
+					"youtube_id": "YFYe0DrB95o"
+				},
+				{
+					"type": "help",
+					"label": _("File Manager"),
+					"youtube_id": "4-osLW3E_Rk"
+				},
 			]
 		},
 		{
@@ -76,7 +86,12 @@ def get_data():
 					"type": "help",
 					"label": _("Opening Accounting Balance"),
 					"youtube_id": "kdgM20Q-q68"
-				}
+				},
+				{
+					"type": "help",
+					"label": _("Advance Payments"),
+					"youtube_id": "J46-6qtyZ9U"
+				},
 			]
 		},
 		{
@@ -111,7 +126,17 @@ def get_data():
 					"type": "help",
 					"label": _("Point-of-Sale"),
 					"youtube_id": "4WkelWkbP_c"
-				}
+				},
+				{
+					"type": "help",
+					"label": _("Product Bundle"),
+					"youtube_id": "yk-7kPrRyRRc"
+				},
+				{
+					"type": "help",
+					"label": _("Drop Ship"),
+					"youtube_id": "hUc0hu_XLdo"
+				},
 			]
 		},
 		{
@@ -152,6 +177,11 @@ def get_data():
 					"label": _("Managing Subcontracting"),
 					"youtube_id": "ThiMCC2DtKo"
 				},
+				{
+					"type": "help",
+					"label": _("Quality Inspection"),
+					"youtube_id": "WmtcF3Y40Fs"
+				},
 			]
 		},
 		{
@@ -235,4 +265,14 @@ def get_data():
 				},
 			]
 		},
+		{
+			"label": _("Website"),
+			"items": [
+				{
+					"type": "help",
+					"label": _("Publish Items on Website"),
+					"youtube_id": "W31LBBNzbgc"
+				},
+			]
+		},
 	]

erpnext/controllers/status_updater.py

@@ -76,10 +76,10 @@ class StatusUpdater(Document):
 		self.update_qty()
 		self.validate_qty()
 
-	def set_status(self, update=False, status=None):
+	def set_status(self, update=False, status=None, update_modified=True):
 		if self.is_new():
 			return
-
+				
 		if self.doctype in status_map:
 			_status = self.status
 
@@ -102,9 +102,10 @@ class StatusUpdater(Document):
 
 			if self.status != _status and self.status not in ("Submitted", "Cancelled"):
 				self.add_comment("Label", _(self.status))
-
+			
 			if update:
-				frappe.db.set_value(self.doctype, self.name, "status", self.status)
+				frappe.db.set_value(self.doctype, self.name, "status", self.status, 
+					update_modified=update_modified)
 
 	def validate_qty(self):
 		"""Validates qty at row level"""

erpnext/controllers/taxes_and_totals.py

@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import json
 import frappe
-from frappe import _
+from frappe import _, scrub
 from frappe.utils import cint, flt, rounded
 from erpnext.setup.utils import get_company_currency
 from erpnext.controllers.accounts_controller import validate_conversion_rate, \
@@ -20,6 +20,7 @@ class calculate_taxes_and_totals(object):
 		self._calculate()
 
 		if self.doc.meta.get_field("discount_amount"):
+			self.set_discount_amount()
 			self.apply_discount_amount()
 
 		if self.doc.doctype in ["Sales Invoice", "Purchase Invoice"]:
@@ -325,6 +326,11 @@ class calculate_taxes_and_totals(object):
 	def _cleanup(self):
 		for tax in self.doc.get("taxes"):
 			tax.item_wise_tax_detail = json.dumps(tax.item_wise_tax_detail, separators=(',', ':'))
+			
+	def set_discount_amount(self):
+		if not self.doc.discount_amount and self.doc.additional_discount_percentage:
+			self.doc.discount_amount = flt(flt(self.doc.get(scrub(self.doc.apply_discount_on))) 
+				* self.doc.additional_discount_percentage / 100, self.doc.precision("discount_amount"))
 
 	def apply_discount_amount(self):
 		if self.doc.discount_amount:

erpnext/docs/current/api/buying/print_format/drop_shipping/index.txt

@@ -1 +0,0 @@
-erpnext.buying.print_format.drop_shipping

erpnext/docs/current/api/buying/print_format/drop_shipping_format/erpnext.buying.print_format.drop_shipping_format.html

@@ -1,10 +1,10 @@
-<!-- title: erpnext.buying.print_format.drop_shipping --><div class="dev-header">
+<!-- title: erpnext.buying.print_format.drop_shipping_format --><div class="dev-header">
 
 <a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
 	Version 6.x.x</a>
 
 
-	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/buying/print_format/drop_shipping.py"
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/buying/print_format/drop_shipping_format.py"
 		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
 
 </div>

erpnext/docs/current/api/buying/print_format/drop_shipping_format/index.html

@@ -1,4 +1,4 @@
-<!-- title: drop_shipping -->
+<!-- title: drop_shipping_format -->
 
 
 <div class="dev-header">
@@ -7,7 +7,7 @@
 	Version 6.x.x</a>
 
 
-	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/drop_shipping"
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/drop_shipping_format"
 		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
 
 </div>

erpnext/docs/current/api/buying/print_format/drop_shipping_format/index.txt

@@ -0,0 +1 @@
+erpnext.buying.print_format.drop_shipping_format

erpnext/docs/current/api/controllers/erpnext.controllers.status_updater.html

@@ -75,7 +75,7 @@ Installation Note: Update Installed Qty, Update Percent Qty and Validate over in
         <a name="set_status" href="#set_status" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>
 		<b>set_status</b>
-        <i class="text-muted">(self, update=False, status=None)</i>
+        <i class="text-muted">(self, update=False, status=None, update_modified=True)</i>
     </p>
 	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
 </div>

erpnext/docs/current/api/controllers/erpnext.controllers.taxes_and_totals.html

@@ -335,6 +335,20 @@ from tax inclusive amount</p>
         
     
     
+	<p class="docs-attr-name">
+        <a name="set_discount_amount" href="#set_discount_amount" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_discount_amount</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
 	<p class="docs-attr-name">
         <a name="set_item_wise_tax" href="#set_item_wise_tax" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>

erpnext/docs/current/api/shopping_cart/erpnext.shopping_cart.cart.html

@@ -278,6 +278,22 @@
         
     
     
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.cart.set_customer_in_address" href="#erpnext.shopping_cart.cart.set_customer_in_address" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.cart.<b>set_customer_in_address</b>
+        <i class="text-muted">(doc, method=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
 	<p class="docs-attr-name">
         <a name="erpnext.shopping_cart.cart.set_price_list_and_rate" href="#erpnext.shopping_cart.cart.set_price_list_and_rate" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>

erpnext/docs/current/api/stock/erpnext.stock.utils.html

@@ -79,7 +79,9 @@
 	
         
     
-    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.utils.get_incoming_rate</code>
+    </p>
 	<p class="docs-attr-name">
         <a name="erpnext.stock.utils.get_incoming_rate" href="#erpnext.stock.utils.get_incoming_rate" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>

erpnext/docs/current/index.html

@@ -35,7 +35,7 @@
 			Version
 		</td>
 		<td>
-			<code>6.12.3</code>
+			<code>6.13.1</code>
 		</td>
 	</tr>
 </table>

erpnext/docs/current/models/accounts/account.html

@@ -26,7 +26,7 @@ Heads (or groups) against which Accounting Entries are made and balances are mai
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>
@@ -210,6 +210,7 @@ Profit and Loss</pre>
                 <pre>
 Bank
 Cash
+Depreciation
 Tax
 Chargeable
 Warehouse

erpnext/docs/current/models/accounts/accounts_settings.html

@@ -24,7 +24,7 @@ Settings for Accounts
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/bank_reconciliation.html

@@ -24,7 +24,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/bank_reconciliation_detail.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>
@@ -159,6 +159,18 @@
             <td></td>
         </tr>
         
+        <tr >
+            <td>10</td>
+            <td ><code>data_10</code></td>
+            <td >
+                Data</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
     </tbody>
 </table>
 

erpnext/docs/current/models/accounts/budget_detail.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/c_form.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/c_form_invoice_detail.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/cost_center.html

@@ -26,7 +26,7 @@ Track separate Income and Expense for product verticals or divisions.
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/fiscal_year.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/fiscal_year_company.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/gl_entry.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/journal_entry.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/journal_entry_account.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/mode_of_payment.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/mode_of_payment_account.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/monthly_distribution.html

@@ -28,7 +28,7 @@ To distribute a budget using this distribution, set this **Monthly Distribution*
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/monthly_distribution_percentage.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/party_account.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/payment_reconciliation.html

@@ -24,7 +24,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/payment_reconciliation_invoice.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/payment_reconciliation_payment.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/payment_tool.html

@@ -24,7 +24,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/payment_tool_detail.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/period_closing_voucher.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/pos_profile.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/pricing_rule.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/purchase_invoice.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>
@@ -429,20 +429,8 @@ PINV-RET-</pre>
             </td>
         </tr>
         
-        <tr >
-            <td>27</td>
-            <td ><code>get_items_from_product_bundle</code></td>
-            <td >
-                Button</td>
-            <td >
-                Get Items from Product Bundle
-                
-            </td>
-            <td></td>
-        </tr>
-        
         <tr class="info">
-            <td>28</td>
+            <td>27</td>
             <td ><code>section_break_26</code></td>
             <td >
                 Section Break</td>
@@ -454,7 +442,7 @@ PINV-RET-</pre>
         </tr>
         
         <tr >
-            <td>29</td>
+            <td>28</td>
             <td ><code>base_total</code></td>
             <td >
                 Currency</td>
@@ -468,7 +456,7 @@ PINV-RET-</pre>
         </tr>
         
         <tr >
-            <td>30</td>
+            <td>29</td>
             <td ><code>base_net_total</code></td>
             <td >
                 Currency</td>
@@ -482,7 +470,7 @@ PINV-RET-</pre>
         </tr>
         
         <tr >
-            <td>31</td>
+            <td>30</td>
             <td ><code>column_break_28</code></td>
             <td class="info">
                 Column Break</td>
@@ -494,7 +482,7 @@ PINV-RET-</pre>
         </tr>
         
         <tr >
-            <td>32</td>
+            <td>31</td>
             <td ><code>total</code></td>
             <td >
                 Currency</td>
@@ -508,7 +496,7 @@ PINV-RET-</pre>
         </tr>
         
         <tr >
-            <td>33</td>
+            <td>32</td>
             <td ><code>net_total</code></td>
             <td >
                 Currency</td>
@@ -522,7 +510,7 @@ PINV-RET-</pre>
         </tr>
         
         <tr class="info">
-            <td>34</td>
+            <td>33</td>
             <td ><code>taxes_section</code></td>
             <td >
                 Section Break</td>
@@ -536,7 +524,7 @@ PINV-RET-</pre>
         </tr>
         
         <tr >
-            <td>35</td>
+            <td>34</td>
             <td ><code>taxes_and_charges</code></td>
             <td >
                 Link</td>
@@ -557,7 +545,7 @@ PINV-RET-</pre>
         </tr>
         
         <tr >
-            <td>36</td>
+            <td>35</td>
             <td ><code>taxes</code></td>
             <td >
                 Table</td>
@@ -578,7 +566,7 @@ PINV-RET-</pre>
         </tr>
         
         <tr >
-            <td>37</td>
+            <td>36</td>
             <td ><code>other_charges_calculation</code></td>
             <td >
                 HTML</td>
@@ -590,7 +578,7 @@ PINV-RET-</pre>
         </tr>
         
         <tr class="info">
-            <td>38</td>
+            <td>37</td>
             <td ><code>totals</code></td>
             <td >
                 Section Break</td>
@@ -604,7 +592,7 @@ PINV-RET-</pre>
         </tr>
         
         <tr >
-            <td>39</td>
+            <td>38</td>
             <td ><code>base_taxes_and_charges_added</code></td>
             <td >
                 Currency</td>
@@ -618,7 +606,7 @@ PINV-RET-</pre>
         </tr>
         
         <tr >
-            <td>40</td>
+            <td>39</td>
             <td ><code>base_taxes_and_charges_deducted</code></td>
             <td >
                 Currency</td>
@@ -632,7 +620,7 @@ PINV-RET-</pre>
         </tr>
         
         <tr >
-            <td>41</td>
+            <td>40</td>
             <td ><code>base_total_taxes_and_charges</code></td>
             <td >
                 Currency</td>
@@ -646,7 +634,7 @@ PINV-RET-</pre>
         </tr>
         
         <tr >
-            <td>42</td>
+            <td>41</td>
             <td ><code>column_break_40</code></td>
             <td class="info">
                 Column Break</td>
@@ -658,7 +646,7 @@ PINV-RET-</pre>
         </tr>
         
         <tr >
-            <td>43</td>
+            <td>42</td>
             <td ><code>taxes_and_charges_added</code></td>
             <td >
                 Currency</td>
@@ -672,7 +660,7 @@ PINV-RET-</pre>
         </tr>
         
         <tr >
-            <td>44</td>
+            <td>43</td>
             <td ><code>taxes_and_charges_deducted</code></td>
             <td >
                 Currency</td>
@@ -686,7 +674,7 @@ PINV-RET-</pre>
         </tr>
         
         <tr >
-            <td>45</td>
+            <td>44</td>
             <td ><code>total_taxes_and_charges</code></td>
             <td >
                 Currency</td>
@@ -700,7 +688,7 @@ PINV-RET-</pre>
         </tr>
         
         <tr class="info">
-            <td>46</td>
+            <td>45</td>
             <td ><code>section_break_44</code></td>
             <td >
                 Section Break</td>
@@ -712,7 +700,7 @@ PINV-RET-</pre>
         </tr>
         
         <tr >
-            <td>47</td>
+            <td>46</td>
             <td ><code>apply_discount_on</code></td>
             <td >
                 Select</td>
@@ -727,6 +715,20 @@ Net Total</pre>
             </td>
         </tr>
         
+        <tr >
+            <td>47</td>
+            <td ><code>base_discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
         <tr >
             <td>48</td>
             <td ><code>column_break_46</code></td>
@@ -741,6 +743,18 @@ Net Total</pre>
         
         <tr >
             <td>49</td>
+            <td ><code>additional_discount_percentage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Additional Discount Percentage
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>50</td>
             <td ><code>discount_amount</code></td>
             <td >
                 Currency</td>
@@ -753,20 +767,6 @@ Net Total</pre>
             </td>
         </tr>
         
-        <tr >
-            <td>50</td>
-            <td ><code>base_discount_amount</code></td>
-            <td >
-                Currency</td>
-            <td >
-                Additional Discount Amount (Company Currency)
-                
-            </td>
-            <td>
-                <pre>Company:company:default_currency</pre>
-            </td>
-        </tr>
-        
         <tr class="info">
             <td>51</td>
             <td ><code>section_break_49</code></td>

erpnext/docs/current/models/accounts/purchase_invoice_advance.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/purchase_invoice_item.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/purchase_taxes_and_charges.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/purchase_taxes_and_charges_template.html

@@ -46,7 +46,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>
@@ -235,15 +235,6 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
 			
         
 			
-            <li>
-
-
-<a href="https://frappe.github.io/erpnext/current/models/buying/supplier">Supplier</a>
-
-</li>
-			
-        
-			
             <li>
 
 

erpnext/docs/current/models/accounts/sales_invoice.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>
@@ -810,32 +810,6 @@ Net Total</pre>
         
         <tr >
             <td>53</td>
-            <td ><code>column_break_51</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>54</td>
-            <td ><code>discount_amount</code></td>
-            <td >
-                Currency</td>
-            <td >
-                Additional Discount Amount
-                
-            </td>
-            <td>
-                <pre>currency</pre>
-            </td>
-        </tr>
-        
-        <tr >
-            <td>55</td>
             <td ><code>base_discount_amount</code></td>
             <td >
                 Currency</td>
@@ -848,8 +822,46 @@ Net Total</pre>
             </td>
         </tr>
         
-        <tr class="info">
+        <tr >
+            <td>54</td>
+            <td ><code>column_break_51</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>55</td>
+            <td ><code>additional_discount_percentage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Additional Discount Percentage
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
             <td>56</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>57</td>
             <td ><code>totals</code></td>
             <td >
                 Section Break</td>
@@ -863,7 +875,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>57</td>
+            <td>58</td>
             <td class="danger" title="Mandatory"><code>base_grand_total</code></td>
             <td >
                 Currency</td>
@@ -877,7 +889,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>58</td>
+            <td>59</td>
             <td ><code>base_rounded_total</code></td>
             <td >
                 Currency</td>
@@ -891,7 +903,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>59</td>
+            <td>60</td>
             <td ><code>base_in_words</code></td>
             <td >
                 Data</td>
@@ -904,7 +916,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>60</td>
+            <td>61</td>
             <td ><code>column_break5</code></td>
             <td class="info">
                 Column Break</td>
@@ -916,7 +928,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>61</td>
+            <td>62</td>
             <td class="danger" title="Mandatory"><code>grand_total</code></td>
             <td >
                 Currency</td>
@@ -930,7 +942,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>62</td>
+            <td>63</td>
             <td ><code>rounded_total</code></td>
             <td >
                 Currency</td>
@@ -944,7 +956,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>63</td>
+            <td>64</td>
             <td ><code>in_words</code></td>
             <td >
                 Data</td>
@@ -956,7 +968,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>64</td>
+            <td>65</td>
             <td ><code>total_advance</code></td>
             <td >
                 Currency</td>
@@ -970,7 +982,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>65</td>
+            <td>66</td>
             <td ><code>outstanding_amount</code></td>
             <td >
                 Currency</td>
@@ -984,7 +996,7 @@ Net Total</pre>
         </tr>
         
         <tr class="info">
-            <td>66</td>
+            <td>67</td>
             <td ><code>advances_section</code></td>
             <td >
                 Section Break</td>
@@ -998,7 +1010,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>67</td>
+            <td>68</td>
             <td ><code>get_advances_received</code></td>
             <td >
                 Button</td>
@@ -1012,7 +1024,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>68</td>
+            <td>69</td>
             <td ><code>advances</code></td>
             <td >
                 Table</td>
@@ -1033,7 +1045,7 @@ Net Total</pre>
         </tr>
         
         <tr class="info">
-            <td>69</td>
+            <td>70</td>
             <td ><code>payments_section</code></td>
             <td >
                 Section Break</td>
@@ -1047,7 +1059,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>70</td>
+            <td>71</td>
             <td ><code>mode_of_payment</code></td>
             <td >
                 Link</td>
@@ -1068,7 +1080,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>71</td>
+            <td>72</td>
             <td ><code>cash_bank_account</code></td>
             <td >
                 Link</td>
@@ -1089,7 +1101,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>72</td>
+            <td>73</td>
             <td ><code>column_break3</code></td>
             <td class="info">
                 Column Break</td>
@@ -1101,7 +1113,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>73</td>
+            <td>74</td>
             <td ><code>paid_amount</code></td>
             <td >
                 Currency</td>
@@ -1115,7 +1127,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>74</td>
+            <td>75</td>
             <td ><code>base_paid_amount</code></td>
             <td >
                 Currency</td>
@@ -1129,7 +1141,7 @@ Net Total</pre>
         </tr>
         
         <tr class="info">
-            <td>75</td>
+            <td>76</td>
             <td ><code>column_break4</code></td>
             <td >
                 Section Break</td>
@@ -1141,7 +1153,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>76</td>
+            <td>77</td>
             <td ><code>write_off_amount</code></td>
             <td >
                 Currency</td>
@@ -1155,7 +1167,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>77</td>
+            <td>78</td>
             <td ><code>base_write_off_amount</code></td>
             <td >
                 Currency</td>
@@ -1169,7 +1181,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>78</td>
+            <td>79</td>
             <td ><code>write_off_outstanding_amount_automatically</code></td>
             <td >
                 Check</td>
@@ -1181,7 +1193,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>79</td>
+            <td>80</td>
             <td ><code>column_break_74</code></td>
             <td class="info">
                 Column Break</td>
@@ -1193,7 +1205,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>80</td>
+            <td>81</td>
             <td ><code>write_off_account</code></td>
             <td >
                 Link</td>
@@ -1214,7 +1226,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>81</td>
+            <td>82</td>
             <td ><code>write_off_cost_center</code></td>
             <td >
                 Link</td>
@@ -1235,7 +1247,7 @@ Net Total</pre>
         </tr>
         
         <tr class="info">
-            <td>82</td>
+            <td>83</td>
             <td ><code>terms_section_break</code></td>
             <td >
                 Section Break</td>
@@ -1247,7 +1259,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>83</td>
+            <td>84</td>
             <td ><code>tc_name</code></td>
             <td >
                 Link</td>
@@ -1268,7 +1280,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>84</td>
+            <td>85</td>
             <td ><code>terms</code></td>
             <td >
                 Text Editor</td>
@@ -1280,7 +1292,7 @@ Net Total</pre>
         </tr>
         
         <tr class="info">
-            <td>85</td>
+            <td>86</td>
             <td ><code>edit_printing_settings</code></td>
             <td >
                 Section Break</td>
@@ -1292,7 +1304,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>86</td>
+            <td>87</td>
             <td ><code>letter_head</code></td>
             <td >
                 Link</td>
@@ -1313,7 +1325,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>87</td>
+            <td>88</td>
             <td ><code>column_break_84</code></td>
             <td class="info">
                 Column Break</td>
@@ -1325,7 +1337,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>88</td>
+            <td>89</td>
             <td ><code>select_print_heading</code></td>
             <td >
                 Link</td>
@@ -1346,7 +1358,7 @@ Net Total</pre>
         </tr>
         
         <tr class="info">
-            <td>89</td>
+            <td>90</td>
             <td ><code>contact_section</code></td>
             <td >
                 Section Break</td>
@@ -1360,7 +1372,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>90</td>
+            <td>91</td>
             <td ><code>project_name</code></td>
             <td >
                 Link</td>
@@ -1381,7 +1393,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>91</td>
+            <td>92</td>
             <td class="danger" title="Mandatory"><code>territory</code></td>
             <td >
                 Link</td>
@@ -1402,7 +1414,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>92</td>
+            <td>93</td>
             <td ><code>customer_group</code></td>
             <td >
                 Link</td>
@@ -1423,7 +1435,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>93</td>
+            <td>94</td>
             <td ><code>col_break23</code></td>
             <td class="info">
                 Column Break</td>
@@ -1435,7 +1447,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>94</td>
+            <td>95</td>
             <td ><code>customer_address</code></td>
             <td >
                 Link</td>
@@ -1456,7 +1468,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>95</td>
+            <td>96</td>
             <td ><code>contact_person</code></td>
             <td >
                 Link</td>
@@ -1477,7 +1489,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>96</td>
+            <td>97</td>
             <td ><code>campaign</code></td>
             <td >
                 Link</td>
@@ -1498,7 +1510,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>97</td>
+            <td>98</td>
             <td ><code>source</code></td>
             <td >
                 Select</td>
@@ -1521,7 +1533,7 @@ Campaign</pre>
         </tr>
         
         <tr class="info">
-            <td>98</td>
+            <td>99</td>
             <td ><code>more_info</code></td>
             <td >
                 Section Break</td>
@@ -1535,7 +1547,7 @@ Campaign</pre>
         </tr>
         
         <tr >
-            <td>99</td>
+            <td>100</td>
             <td class="danger" title="Mandatory"><code>debit_to</code></td>
             <td >
                 Link</td>
@@ -1556,7 +1568,7 @@ Campaign</pre>
         </tr>
         
         <tr >
-            <td>100</td>
+            <td>101</td>
             <td ><code>party_account_currency</code></td>
             <td >
                 Link</td>
@@ -1577,7 +1589,7 @@ Campaign</pre>
         </tr>
         
         <tr >
-            <td>101</td>
+            <td>102</td>
             <td ><code>is_opening</code></td>
             <td >
                 Select</td>
@@ -1592,7 +1604,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>102</td>
+            <td>103</td>
             <td ><code>c_form_applicable</code></td>
             <td >
                 Select</td>
@@ -1607,7 +1619,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>103</td>
+            <td>104</td>
             <td ><code>c_form_no</code></td>
             <td >
                 Link</td>
@@ -1628,7 +1640,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>104</td>
+            <td>105</td>
             <td ><code>column_break8</code></td>
             <td class="info">
                 Column Break</td>
@@ -1640,7 +1652,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>105</td>
+            <td>106</td>
             <td ><code>posting_time</code></td>
             <td >
                 Time</td>
@@ -1652,7 +1664,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>106</td>
+            <td>107</td>
             <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
             <td >
                 Link</td>
@@ -1673,7 +1685,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>107</td>
+            <td>108</td>
             <td ><code>remarks</code></td>
             <td >
                 Small Text</td>
@@ -1685,7 +1697,7 @@ Yes</pre>
         </tr>
         
         <tr class="info">
-            <td>108</td>
+            <td>109</td>
             <td ><code>sales_team_section_break</code></td>
             <td >
                 Section Break</td>
@@ -1699,7 +1711,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>109</td>
+            <td>110</td>
             <td ><code>sales_partner</code></td>
             <td >
                 Link</td>
@@ -1720,7 +1732,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>110</td>
+            <td>111</td>
             <td ><code>column_break10</code></td>
             <td class="info">
                 Column Break</td>
@@ -1732,7 +1744,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>111</td>
+            <td>112</td>
             <td ><code>commission_rate</code></td>
             <td >
                 Float</td>
@@ -1744,7 +1756,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>112</td>
+            <td>113</td>
             <td ><code>total_commission</code></td>
             <td >
                 Currency</td>
@@ -1758,7 +1770,7 @@ Yes</pre>
         </tr>
         
         <tr class="info">
-            <td>113</td>
+            <td>114</td>
             <td ><code>section_break2</code></td>
             <td >
                 Section Break</td>
@@ -1770,7 +1782,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>114</td>
+            <td>115</td>
             <td ><code>sales_team</code></td>
             <td >
                 Table</td>
@@ -1791,7 +1803,7 @@ Yes</pre>
         </tr>
         
         <tr class="info">
-            <td>115</td>
+            <td>116</td>
             <td ><code>recurring_invoice</code></td>
             <td >
                 Section Break</td>
@@ -1805,7 +1817,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>116</td>
+            <td>117</td>
             <td ><code>column_break11</code></td>
             <td class="info">
                 Column Break</td>
@@ -1817,7 +1829,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>117</td>
+            <td>118</td>
             <td ><code>is_recurring</code></td>
             <td >
                 Check</td>
@@ -1830,7 +1842,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>118</td>
+            <td>119</td>
             <td ><code>recurring_type</code></td>
             <td >
                 Select</td>
@@ -1849,7 +1861,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>119</td>
+            <td>120</td>
             <td ><code>from_date</code></td>
             <td >
                 Date</td>
@@ -1862,7 +1874,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>120</td>
+            <td>121</td>
             <td ><code>to_date</code></td>
             <td >
                 Date</td>
@@ -1875,7 +1887,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>121</td>
+            <td>122</td>
             <td ><code>repeat_on_day_of_month</code></td>
             <td >
                 Int</td>
@@ -1888,7 +1900,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>122</td>
+            <td>123</td>
             <td ><code>end_date</code></td>
             <td >
                 Date</td>
@@ -1901,7 +1913,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>123</td>
+            <td>124</td>
             <td ><code>column_break12</code></td>
             <td class="info">
                 Column Break</td>
@@ -1913,7 +1925,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>124</td>
+            <td>125</td>
             <td ><code>next_date</code></td>
             <td >
                 Date</td>
@@ -1927,7 +1939,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>125</td>
+            <td>126</td>
             <td ><code>recurring_id</code></td>
             <td >
                 Data</td>
@@ -1940,7 +1952,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>126</td>
+            <td>127</td>
             <td ><code>notification_email_address</code></td>
             <td >
                 Small Text</td>
@@ -1953,7 +1965,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>127</td>
+            <td>128</td>
             <td ><code>recurring_print_format</code></td>
             <td >
                 Link</td>
@@ -1974,7 +1986,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>128</td>
+            <td>129</td>
             <td ><code>against_income_account</code></td>
             <td >
                 Small Text</td>
@@ -2475,6 +2487,20 @@ Yearly</pre>
         
     
     
+	<p class="docs-attr-name">
+        <a name="validate_dropship_item" href="#validate_dropship_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_dropship_item</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
 	<p class="docs-attr-name">
         <a name="validate_fixed_asset_account" href="#validate_fixed_asset_account" class="text-muted small">
             <i class="icon-link small" style="color: #ccc;"></i></a>

erpnext/docs/current/models/accounts/sales_invoice_advance.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/sales_invoice_item.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/sales_taxes_and_charges.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/sales_taxes_and_charges_template.html

@@ -45,7 +45,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>
@@ -227,15 +227,6 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
             <li>
 
 
-<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
-
-</li>
-			
-        
-			
-            <li>
-
-
 <a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
 
 </li>

erpnext/docs/current/models/accounts/shipping_rule.html

@@ -26,7 +26,7 @@ Specify conditions to calculate shipping amount
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/shipping_rule_condition.html

@@ -26,7 +26,7 @@ A condition for a Shipping Rule
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/shipping_rule_country.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/accounts/tax_rule.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/buying/buying_settings.html

@@ -24,7 +24,7 @@ Settings for Buying Module
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/buying/purchase_common.html

@@ -24,7 +24,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/buying/purchase_order.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>
@@ -547,32 +547,8 @@ Yes</pre>
             </td>
         </tr>
         
-        <tr >
-            <td>35</td>
-            <td ><code>get_last_purchase_rate</code></td>
-            <td >
-                Button</td>
-            <td >
-                Get Last Purchase Rate
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>36</td>
-            <td ><code>get_items_from_product_bundle</code></td>
-            <td >
-                Button</td>
-            <td >
-                Get Items from Product Bundle
-                
-            </td>
-            <td></td>
-        </tr>
-        
         <tr class="info">
-            <td>37</td>
+            <td>35</td>
             <td ><code>sb_last_purchase</code></td>
             <td >
                 Section Break</td>
@@ -584,7 +560,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>38</td>
+            <td>36</td>
             <td ><code>base_total</code></td>
             <td >
                 Currency</td>
@@ -598,7 +574,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>39</td>
+            <td>37</td>
             <td ><code>base_net_total</code></td>
             <td >
                 Currency</td>
@@ -612,7 +588,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>40</td>
+            <td>38</td>
             <td ><code>column_break_26</code></td>
             <td class="info">
                 Column Break</td>
@@ -624,7 +600,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>41</td>
+            <td>39</td>
             <td ><code>total</code></td>
             <td >
                 Currency</td>
@@ -638,7 +614,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>42</td>
+            <td>40</td>
             <td ><code>net_total</code></td>
             <td >
                 Currency</td>
@@ -652,7 +628,7 @@ Yes</pre>
         </tr>
         
         <tr class="info">
-            <td>43</td>
+            <td>41</td>
             <td ><code>taxes_section</code></td>
             <td >
                 Section Break</td>
@@ -666,7 +642,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>44</td>
+            <td>42</td>
             <td ><code>taxes_and_charges</code></td>
             <td >
                 Link</td>
@@ -687,7 +663,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>45</td>
+            <td>43</td>
             <td ><code>taxes</code></td>
             <td >
                 Table</td>
@@ -708,7 +684,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>46</td>
+            <td>44</td>
             <td ><code>other_charges_calculation</code></td>
             <td >
                 HTML</td>
@@ -720,7 +696,7 @@ Yes</pre>
         </tr>
         
         <tr class="info">
-            <td>47</td>
+            <td>45</td>
             <td ><code>totals</code></td>
             <td >
                 Section Break</td>
@@ -734,7 +710,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>48</td>
+            <td>46</td>
             <td ><code>base_taxes_and_charges_added</code></td>
             <td >
                 Currency</td>
@@ -748,7 +724,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>49</td>
+            <td>47</td>
             <td ><code>base_taxes_and_charges_deducted</code></td>
             <td >
                 Currency</td>
@@ -762,7 +738,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>50</td>
+            <td>48</td>
             <td ><code>base_total_taxes_and_charges</code></td>
             <td >
                 Currency</td>
@@ -776,7 +752,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>51</td>
+            <td>49</td>
             <td ><code>column_break_39</code></td>
             <td class="info">
                 Column Break</td>
@@ -788,7 +764,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>52</td>
+            <td>50</td>
             <td ><code>taxes_and_charges_added</code></td>
             <td >
                 Currency</td>
@@ -802,7 +778,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>53</td>
+            <td>51</td>
             <td ><code>taxes_and_charges_deducted</code></td>
             <td >
                 Currency</td>
@@ -816,7 +792,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>54</td>
+            <td>52</td>
             <td ><code>total_taxes_and_charges</code></td>
             <td >
                 Currency</td>
@@ -830,7 +806,7 @@ Yes</pre>
         </tr>
         
         <tr class="info">
-            <td>55</td>
+            <td>53</td>
             <td ><code>discount_section</code></td>
             <td >
                 Section Break</td>
@@ -842,7 +818,7 @@ Yes</pre>
         </tr>
         
         <tr >
-            <td>56</td>
+            <td>54</td>
             <td ><code>apply_discount_on</code></td>
             <td >
                 Select</td>
@@ -858,7 +834,21 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>57</td>
+            <td>55</td>
+            <td ><code>base_discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>56</td>
             <td ><code>column_break_45</code></td>
             <td class="info">
                 Column Break</td>
@@ -869,6 +859,18 @@ Net Total</pre>
             <td></td>
         </tr>
         
+        <tr >
+            <td>57</td>
+            <td ><code>additional_discount_percentage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Additional Discount Percentage
+                
+            </td>
+            <td></td>
+        </tr>
+        
         <tr >
             <td>58</td>
             <td ><code>discount_amount</code></td>
@@ -883,22 +885,8 @@ Net Total</pre>
             </td>
         </tr>
         
-        <tr >
-            <td>59</td>
-            <td ><code>base_discount_amount</code></td>
-            <td >
-                Currency</td>
-            <td >
-                Additional Discount Amount (Company Currency)
-                
-            </td>
-            <td>
-                <pre>Company:company:default_currency</pre>
-            </td>
-        </tr>
-        
         <tr class="info">
-            <td>60</td>
+            <td>59</td>
             <td ><code>totals_section</code></td>
             <td >
                 Section Break</td>
@@ -910,7 +898,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>61</td>
+            <td>60</td>
             <td ><code>base_grand_total</code></td>
             <td >
                 Currency</td>
@@ -924,7 +912,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>62</td>
+            <td>61</td>
             <td ><code>base_in_words</code></td>
             <td >
                 Data</td>
@@ -937,7 +925,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>63</td>
+            <td>62</td>
             <td ><code>base_rounded_total</code></td>
             <td >
                 Currency</td>
@@ -951,7 +939,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>64</td>
+            <td>63</td>
             <td ><code>advance_paid</code></td>
             <td >
                 Currency</td>
@@ -963,7 +951,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>65</td>
+            <td>64</td>
             <td ><code>column_break4</code></td>
             <td class="info">
                 Column Break</td>
@@ -975,7 +963,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>66</td>
+            <td>65</td>
             <td ><code>grand_total</code></td>
             <td >
                 Currency</td>
@@ -989,7 +977,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>67</td>
+            <td>66</td>
             <td ><code>in_words</code></td>
             <td >
                 Data</td>
@@ -1001,7 +989,7 @@ Net Total</pre>
         </tr>
         
         <tr class="info">
-            <td>68</td>
+            <td>67</td>
             <td ><code>terms_section_break</code></td>
             <td >
                 Section Break</td>
@@ -1015,7 +1003,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>69</td>
+            <td>68</td>
             <td ><code>tc_name</code></td>
             <td >
                 Link</td>
@@ -1036,7 +1024,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>70</td>
+            <td>69</td>
             <td ><code>terms</code></td>
             <td >
                 Text Editor</td>
@@ -1048,7 +1036,7 @@ Net Total</pre>
         </tr>
         
         <tr class="info">
-            <td>71</td>
+            <td>70</td>
             <td ><code>contact_section</code></td>
             <td >
                 Section Break</td>
@@ -1062,7 +1050,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>72</td>
+            <td>71</td>
             <td ><code>supplier_address</code></td>
             <td >
                 Link</td>
@@ -1083,7 +1071,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>73</td>
+            <td>72</td>
             <td ><code>cb_contact</code></td>
             <td class="info">
                 Column Break</td>
@@ -1095,7 +1083,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>74</td>
+            <td>73</td>
             <td ><code>contact_person</code></td>
             <td >
                 Link</td>
@@ -1116,7 +1104,7 @@ Net Total</pre>
         </tr>
         
         <tr class="info">
-            <td>75</td>
+            <td>74</td>
             <td ><code>more_info</code></td>
             <td >
                 Section Break</td>
@@ -1128,7 +1116,7 @@ Net Total</pre>
         </tr>
         
         <tr >
-            <td>76</td>
+            <td>75</td>
             <td class="danger" title="Mandatory"><code>status</code></td>
             <td >
                 Select</td>
@@ -1151,7 +1139,7 @@ Delivered</pre>
         </tr>
         
         <tr >
-            <td>77</td>
+            <td>76</td>
             <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
             <td >
                 Link</td>
@@ -1172,7 +1160,7 @@ Delivered</pre>
         </tr>
         
         <tr >
-            <td>78</td>
+            <td>77</td>
             <td ><code>ref_sq</code></td>
             <td >
                 Data</td>
@@ -1184,7 +1172,7 @@ Delivered</pre>
         </tr>
         
         <tr >
-            <td>79</td>
+            <td>78</td>
             <td ><code>column_break_74</code></td>
             <td class="info">
                 Column Break</td>
@@ -1196,7 +1184,7 @@ Delivered</pre>
         </tr>
         
         <tr >
-            <td>80</td>
+            <td>79</td>
             <td ><code>per_received</code></td>
             <td >
                 Percent</td>
@@ -1208,7 +1196,7 @@ Delivered</pre>
         </tr>
         
         <tr >
-            <td>81</td>
+            <td>80</td>
             <td ><code>per_billed</code></td>
             <td >
                 Percent</td>
@@ -1220,7 +1208,7 @@ Delivered</pre>
         </tr>
         
         <tr class="info">
-            <td>82</td>
+            <td>81</td>
             <td ><code>column_break5</code></td>
             <td >
                 Section Break</td>
@@ -1232,7 +1220,7 @@ Delivered</pre>
         </tr>
         
         <tr >
-            <td>83</td>
+            <td>82</td>
             <td ><code>letter_head</code></td>
             <td >
                 Link</td>
@@ -1253,7 +1241,7 @@ Delivered</pre>
         </tr>
         
         <tr >
-            <td>84</td>
+            <td>83</td>
             <td ><code>select_print_heading</code></td>
             <td >
                 Link</td>
@@ -1274,7 +1262,7 @@ Delivered</pre>
         </tr>
         
         <tr class="info">
-            <td>85</td>
+            <td>84</td>
             <td ><code>raw_material_details</code></td>
             <td >
                 Section Break</td>
@@ -1288,7 +1276,7 @@ Delivered</pre>
         </tr>
         
         <tr >
-            <td>86</td>
+            <td>85</td>
             <td ><code>supplied_items</code></td>
             <td >
                 Table</td>
@@ -1309,7 +1297,7 @@ Delivered</pre>
         </tr>
         
         <tr class="info">
-            <td>87</td>
+            <td>86</td>
             <td ><code>recurring_order</code></td>
             <td >
                 Section Break</td>
@@ -1323,7 +1311,7 @@ Delivered</pre>
         </tr>
         
         <tr >
-            <td>88</td>
+            <td>87</td>
             <td ><code>column_break</code></td>
             <td class="info">
                 Column Break</td>
@@ -1335,7 +1323,7 @@ Delivered</pre>
         </tr>
         
         <tr >
-            <td>89</td>
+            <td>88</td>
             <td ><code>is_recurring</code></td>
             <td >
                 Check</td>
@@ -1347,7 +1335,7 @@ Delivered</pre>
         </tr>
         
         <tr >
-            <td>90</td>
+            <td>89</td>
             <td ><code>recurring_type</code></td>
             <td >
                 Select</td>
@@ -1364,7 +1352,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>91</td>
+            <td>90</td>
             <td ><code>from_date</code></td>
             <td >
                 Date</td>
@@ -1377,7 +1365,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>92</td>
+            <td>91</td>
             <td ><code>to_date</code></td>
             <td >
                 Date</td>
@@ -1390,7 +1378,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>93</td>
+            <td>92</td>
             <td ><code>repeat_on_day_of_month</code></td>
             <td >
                 Int</td>
@@ -1403,7 +1391,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>94</td>
+            <td>93</td>
             <td ><code>end_date</code></td>
             <td >
                 Date</td>
@@ -1416,7 +1404,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>95</td>
+            <td>94</td>
             <td ><code>column_break83</code></td>
             <td class="info">
                 Column Break</td>
@@ -1428,7 +1416,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>96</td>
+            <td>95</td>
             <td ><code>next_date</code></td>
             <td >
                 Date</td>
@@ -1441,7 +1429,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>97</td>
+            <td>96</td>
             <td ><code>recurring_id</code></td>
             <td >
                 Data</td>
@@ -1453,7 +1441,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>98</td>
+            <td>97</td>
             <td ><code>notification_email_address</code></td>
             <td >
                 Small Text</td>
@@ -1466,7 +1454,7 @@ Yearly</pre>
         </tr>
         
         <tr >
-            <td>99</td>
+            <td>98</td>
             <td ><code>recurring_print_format</code></td>
             <td >
                 Link</td>

erpnext/docs/current/models/buying/purchase_order_item.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/buying/purchase_order_item_supplied.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/buying/purchase_receipt_item_supplied.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/buying/quality_inspection.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/buying/quality_inspection_reading.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/buying/supplier.html

@@ -26,7 +26,7 @@ Supplier of Goods or Services.
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>
@@ -179,39 +179,6 @@ Supplier of Goods or Services.
         
         <tr >
             <td>10</td>
-            <td ><code>column_break_10</code></td>
-            <td class="info">
-                Column Break</td>
-            <td >
-                
-                
-            </td>
-            <td></td>
-        </tr>
-        
-        <tr >
-            <td>11</td>
-            <td ><code>default_taxes_and_charges</code></td>
-            <td >
-                Link</td>
-            <td >
-                Taxes and Charges
-                
-            </td>
-            <td>
-                
-                
-
-
-<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_taxes_and_charges_template">Purchase Taxes and Charges Template</a>
-
-
-                
-            </td>
-        </tr>
-        
-        <tr >
-            <td>12</td>
             <td ><code>credit_days</code></td>
             <td >
                 Int</td>
@@ -223,7 +190,7 @@ Supplier of Goods or Services.
         </tr>
         
         <tr class="info">
-            <td>13</td>
+            <td>11</td>
             <td ><code>address_contacts</code></td>
             <td >
                 Section Break</td>
@@ -237,7 +204,7 @@ Supplier of Goods or Services.
         </tr>
         
         <tr >
-            <td>14</td>
+            <td>12</td>
             <td ><code>address_html</code></td>
             <td >
                 HTML</td>
@@ -249,7 +216,7 @@ Supplier of Goods or Services.
         </tr>
         
         <tr >
-            <td>15</td>
+            <td>13</td>
             <td ><code>column_break1</code></td>
             <td class="info">
                 Column Break</td>
@@ -261,7 +228,7 @@ Supplier of Goods or Services.
         </tr>
         
         <tr >
-            <td>16</td>
+            <td>14</td>
             <td ><code>contact_html</code></td>
             <td >
                 HTML</td>
@@ -273,7 +240,7 @@ Supplier of Goods or Services.
         </tr>
         
         <tr class="info">
-            <td>17</td>
+            <td>15</td>
             <td ><code>default_payable_accounts</code></td>
             <td >
                 Section Break</td>
@@ -285,7 +252,7 @@ Supplier of Goods or Services.
         </tr>
         
         <tr >
-            <td>18</td>
+            <td>16</td>
             <td ><code>accounts</code></td>
             <td >
                 Table</td>
@@ -307,7 +274,7 @@ Supplier of Goods or Services.
         </tr>
         
         <tr class="info">
-            <td>19</td>
+            <td>17</td>
             <td ><code>column_break2</code></td>
             <td >
                 Section Break</td>
@@ -319,7 +286,7 @@ Supplier of Goods or Services.
         </tr>
         
         <tr >
-            <td>20</td>
+            <td>18</td>
             <td ><code>website</code></td>
             <td >
                 Data</td>
@@ -331,7 +298,7 @@ Supplier of Goods or Services.
         </tr>
         
         <tr >
-            <td>21</td>
+            <td>19</td>
             <td ><code>supplier_details</code></td>
             <td >
                 Text</td>
@@ -344,7 +311,7 @@ Supplier of Goods or Services.
         </tr>
         
         <tr >
-            <td>22</td>
+            <td>20</td>
             <td ><code>communications</code></td>
             <td >
                 Table</td>

erpnext/docs/current/models/buying/supplier_quotation.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>
@@ -385,20 +385,8 @@
             </td>
         </tr>
         
-        <tr >
-            <td>24</td>
-            <td ><code>get_items_from_product_bundle</code></td>
-            <td >
-                Button</td>
-            <td >
-                Get Items from Product Bundle
-                
-            </td>
-            <td></td>
-        </tr>
-        
         <tr class="info">
-            <td>25</td>
+            <td>24</td>
             <td ><code>section_break_22</code></td>
             <td >
                 Section Break</td>
@@ -410,7 +398,7 @@
         </tr>
         
         <tr >
-            <td>26</td>
+            <td>25</td>
             <td ><code>base_total</code></td>
             <td >
                 Currency</td>
@@ -424,7 +412,7 @@
         </tr>
         
         <tr >
-            <td>27</td>
+            <td>26</td>
             <td ><code>base_net_total</code></td>
             <td >
                 Currency</td>
@@ -438,7 +426,7 @@
         </tr>
         
         <tr >
-            <td>28</td>
+            <td>27</td>
             <td ><code>column_break_24</code></td>
             <td class="info">
                 Column Break</td>
@@ -450,7 +438,7 @@
         </tr>
         
         <tr >
-            <td>29</td>
+            <td>28</td>
             <td ><code>total</code></td>
             <td >
                 Currency</td>
@@ -464,7 +452,7 @@
         </tr>
         
         <tr >
-            <td>30</td>
+            <td>29</td>
             <td ><code>net_total</code></td>
             <td >
                 Currency</td>
@@ -478,7 +466,7 @@
         </tr>
         
         <tr class="info">
-            <td>31</td>
+            <td>30</td>
             <td ><code>taxes_section</code></td>
             <td >
                 Section Break</td>
@@ -492,7 +480,7 @@
         </tr>
         
         <tr >
-            <td>32</td>
+            <td>31</td>
             <td ><code>taxes_and_charges</code></td>
             <td >
                 Link</td>
@@ -513,7 +501,7 @@
         </tr>
         
         <tr >
-            <td>33</td>
+            <td>32</td>
             <td ><code>taxes</code></td>
             <td >
                 Table</td>
@@ -534,7 +522,7 @@
         </tr>
         
         <tr >
-            <td>34</td>
+            <td>33</td>
             <td ><code>other_charges_calculation</code></td>
             <td >
                 HTML</td>
@@ -546,7 +534,7 @@
         </tr>
         
         <tr class="info">
-            <td>35</td>
+            <td>34</td>
             <td ><code>totals</code></td>
             <td >
                 Section Break</td>
@@ -560,7 +548,7 @@
         </tr>
         
         <tr >
-            <td>36</td>
+            <td>35</td>
             <td ><code>base_taxes_and_charges_added</code></td>
             <td >
                 Currency</td>
@@ -574,7 +562,7 @@
         </tr>
         
         <tr >
-            <td>37</td>
+            <td>36</td>
             <td ><code>base_taxes_and_charges_deducted</code></td>
             <td >
                 Currency</td>
@@ -588,7 +576,7 @@
         </tr>
         
         <tr >
-            <td>38</td>
+            <td>37</td>
             <td ><code>base_total_taxes_and_charges</code></td>
             <td >
                 Currency</td>
@@ -602,7 +590,7 @@
         </tr>
         
         <tr >
-            <td>39</td>
+            <td>38</td>
             <td ><code>column_break_37</code></td>
             <td class="info">
                 Column Break</td>
@@ -614,7 +602,7 @@
         </tr>
         
         <tr >
-            <td>40</td>
+            <td>39</td>
             <td ><code>taxes_and_charges_added</code></td>
             <td >
                 Currency</td>
@@ -628,7 +616,7 @@
         </tr>
         
         <tr >
-            <td>41</td>
+            <td>40</td>
             <td ><code>taxes_and_charges_deducted</code></td>
             <td >
                 Currency</td>
@@ -642,7 +630,7 @@
         </tr>
         
         <tr >
-            <td>42</td>
+            <td>41</td>
             <td ><code>total_taxes_and_charges</code></td>
             <td >
                 Currency</td>
@@ -656,7 +644,7 @@
         </tr>
         
         <tr class="info">
-            <td>43</td>
+            <td>42</td>
             <td ><code>section_break_41</code></td>
             <td >
                 Section Break</td>
@@ -668,7 +656,7 @@
         </tr>
         
         <tr >
-            <td>44</td>
+            <td>43</td>
             <td ><code>apply_discount_on</code></td>
             <td >
                 Select</td>
@@ -683,6 +671,20 @@ Net Total</pre>
             </td>
         </tr>
         
+        <tr >
+            <td>44</td>
+            <td ><code>base_discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
         <tr >
             <td>45</td>
             <td ><code>column_break_43</code></td>
@@ -697,6 +699,18 @@ Net Total</pre>
         
         <tr >
             <td>46</td>
+            <td ><code>additional_discount_percentage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Additional Discount Percentage
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>47</td>
             <td ><code>discount_amount</code></td>
             <td >
                 Currency</td>
@@ -709,20 +723,6 @@ Net Total</pre>
             </td>
         </tr>
         
-        <tr >
-            <td>47</td>
-            <td ><code>base_discount_amount</code></td>
-            <td >
-                Currency</td>
-            <td >
-                Additional Discount Amount (Company Currency)
-                
-            </td>
-            <td>
-                <pre>Company:company:default_currency</pre>
-            </td>
-        </tr>
-        
         <tr class="info">
             <td>48</td>
             <td ><code>section_break_46</code></td>

erpnext/docs/current/models/buying/supplier_quotation_item.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/crm/lead.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/crm/newsletter.html

@@ -26,7 +26,7 @@ Create and Send Newsletters
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/crm/newsletter_list.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/crm/newsletter_list_subscriber.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/crm/opportunity.html

@@ -26,7 +26,7 @@ Potential Sales Deal
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/crm/opportunity_item.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/home/index.html

@@ -1,19 +0,0 @@
-<!-- title: Module home -->
-
-
-<div class="dev-header">
-
-<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
-	Version 6.x.x</a>
-
-
-	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/home"
-		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
-
-</div>
-
-<h3>DocTypes for home</h3>
-
-{index}
-
-<!-- autodoc -->

erpnext/docs/current/models/hr/appraisal.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/hr/appraisal_goal.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/hr/appraisal_template.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>

erpnext/docs/current/models/hr/appraisal_template_goal.html

@@ -26,7 +26,7 @@
 
 <h3>Fields</h3>
 
-<table class="table table-bordered" style="table-layout: fixed;">
+<table class="table table-bordered">
     <thead>
         <tr>
             <th style="width: 5%">Sr</th>