Merge branch 'v11-pre-release' into version-11

bumped to version 11.1.71
fix(init): bump version to 11.1.70 (#19986 )
2026-06-26 04:18:35 +00:00 · 2019-12-18 13:59:59 +05:30 · 2019-12-18 14:19:59 +05:50 · 2019-12-18 13:58:01 +05:30 · 2019-12-18 13:56:34 +05:30 · 2019-12-10 12:14:58 +05:30
22 changed files with 1790 additions and 1576 deletions
--- a/erpnext/init.py
+++ b/erpnext/init.py
@@ -5,7 +5,7 @@ import frappe
 from erpnext.hooks import regional_overrides
 from frappe.utils import getdate

-__version__ = '11.1.68'
+__version__ = '11.1.71'

 def get_default_company(user=None):
 	'''Get default company for user'''
@@ -144,4 +144,4 @@ def is_member():
 	last_membership = get_last_membership()
 	if last_membership and getdate(last_membership.to_date) > getdate():
 		return True
-	return False
+	return False
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ae_uae_chart_template_standard.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ae_uae_chart_template_standard.json
@@ -1,465 +1,466 @@
 {
-    "country_code": "ae", 
-    "name": "U.A.E - Chart of Accounts", 
+    "country_code": "ae",
+    "name": "U.A.E - Chart of Accounts",
    "tree": {
        "Assets": {
            "Current Assets": {
                "Accounts Receivable": {
                    "Corporate Credit Cards": {
                        "account_type": "Receivable"
-                    }, 
+                    },
                    "Other Receivable": {
                        "Accrued Rebates Due from Suppliers": {
                            "account_type": "Receivable"
-                        }, 
-                        "Accured Income from Suppliers": {
+                        },
+                        "Accrued Income from Suppliers": {
                            "account_type": "Receivable"
-                        }, 
+                        },
                        "Other Debtors": {
                            "account_type": "Receivable"
-                        }, 
+                        },
                        "account_type": "Receivable"
-                    }, 
+                    },
                    "Post Dated Cheques Received": {
                        "account_type": "Receivable"
-                    }, 
+                    },
                    "Staff Receivable": {
                        "account_type": "Receivable"
-                    }, 
+                    },
                    "Trade Receivable": {
                        "account_type": "Receivable"
-                    }, 
+                    },
                    "Trade in Opening Fees": {
                        "account_type": "Receivable"
-                    }, 
+                    },
                    "account_type": "Receivable"
-                }, 
+                },
                "Cash in Hand & Banks": {
                    "Banks": {
-                        "Bank Margin On LC & LG": {}, 
-                        "Banks Blocked Deposits": {}, 
-                        "Banks Call Deposit Accounts": {}, 
+                        "Bank Margin On LC & LG": {},
+                        "Banks Blocked Deposits": {},
+                        "Banks Call Deposit Accounts": {},
                        "Banks Current Accounts": {
                            "account_type": "Bank"
-                        }, 
+                        },
                        "account_type": "Bank"
-                    }, 
+                    },
                    "Cash in Hand": {
                        "Cash in Safe": {
                            "Main Safe": {
                                "account_type": "Cash"
-                            }, 
+                            },
                            "Main Safe - Foreign Currency": {
                                "account_type": "Cash"
                            }
-                        }, 
+                        },
                        "Petty Cash": {
                            "Petty Cash - Admininistration": {
                                "account_type": "Cash"
-                            }, 
+                            },
                            "Petty Cash - Others": {
                                "account_type": "Cash"
                            }
-                        }, 
+                        },
                        "account_type": "Cash"
-                    }, 
+                    },
                    "Cash in Transit": {
                        "Credit Cards": {
                            "Gateway Credit Cards": {
                                "account_type": "Bank"
-                            }, 
+                            },
                            "Manual Visa & Master Cards": {
                                "account_type": "Bank"
-                            }, 
+                            },
                            "PayPal Account": {
                                "account_type": "Bank"
-                            }, 
+                            },
                            "Visa & Master Credit Cards": {
                                "account_type": "Bank"
                            }
                        }
                    }
-                }, 
+                },
                "Inventory": {
                    "Consigned Stock": {
-                        "Handling Difference in Inventory": {
-                            "account_type": "Stock Adjustment"
-                        }, 
-                        "Items Delivered to Customs on temprary Base": {}
-                    }, 
+                        "Handling Difference in Inventory": {},
+                        "Items Delivered to Customs on temporary Base": {}
+                    },
                    "Stock in Hand": {
                        "account_type": "Stock"
                    }
-                }, 
-                "Perliminary and Preoperating Expenses": {
+                },
+                "Preliminary and Preoperating Expenses": {
                    "Preoperating Expenses": {}
-                }, 
+                },
                "Prepayments & Deposits": {
                    "Deposits": {
-                        "Deposit - Office Rent": {}, 
-                        "Deposit Others": {}, 
-                        "Deposit to Immigration (Visa)": {}, 
+                        "Deposit - Office Rent": {},
+                        "Deposit Others": {},
+                        "Deposit to Immigration (Visa)": {},
                        "Deposits - Customs": {}
-                    }, 
+                    },
                    "Prepaid Taxes": {
-                        "Sales Taxes Receivables": {}, 
+                        "Sales Taxes Receivables": {},
                        "Withholding Tax Receivables": {}
-                    }, 
+                    },
                    "Prepayments": {
-                        "Other Prepayments": {}, 
-                        "PrePaid Advertisement Expenses": {}, 
-                        "Prepaid Bank Guarantee": {}, 
-                        "Prepaid Consultancy Fees": {}, 
-                        "Prepaid Employees Housing": {}, 
-                        "Prepaid Finance charge for Loans": {}, 
-                        "Prepaid Legal Fees": {}, 
-                        "Prepaid License Fees": {}, 
-                        "Prepaid Life Insurance": {}, 
-                        "Prepaid Maintenance": {}, 
-                        "Prepaid Medical Insurance": {}, 
-                        "Prepaid Office Rent": {}, 
-                        "Prepaid Other Insurance": {}, 
-                        "Prepaid Schooling Fees": {}, 
-                        "Prepaid Site Hosting Fees": {}, 
+                        "Other Prepayments": {},
+                        "PrePaid Advertisement Expenses": {},
+                        "Prepaid Bank Guarantee": {},
+                        "Prepaid Consultancy Fees": {},
+                        "Prepaid Employees Housing": {},
+                        "Prepaid Finance charge for Loans": {},
+                        "Prepaid Legal Fees": {},
+                        "Prepaid License Fees": {},
+                        "Prepaid Life Insurance": {},
+                        "Prepaid Maintenance": {},
+                        "Prepaid Medical Insurance": {},
+                        "Prepaid Office Rent": {},
+                        "Prepaid Other Insurance": {},
+                        "Prepaid Schooling Fees": {},
+                        "Prepaid Site Hosting Fees": {},
                        "Prepaid Sponsorship Fees": {}
                    }
                }
-            }, 
+            },
            "Long Term Assets": {
                "Fixed Assets": {
                    "Accumulated Depreciation": {
                        "Acc. Depreciation of Motor Vehicles": {
                            "account_type": "Accumulated Depreciation"
-                        }, 
+                        },
                        "Acc. Deprn.Computer Hardware & Software": {
                            "account_type": "Accumulated Depreciation"
-                        }, 
+                        },
                        "Acc.Deprn.of Furniture & Office Equipment": {
                            "account_type": "Accumulated Depreciation"
-                        }, 
+                        },
                        "Amortisation on Leasehold Improvement": {
                            "account_type": "Accumulated Depreciation"
-                        }, 
+                        },
                        "account_type": "Accumulated Depreciation"
-                    }, 
+                    },
                    "Fixed Assets (Cost Price)": {
                        "Computer Hardware & Software": {
                            "account_type": "Fixed Asset"
-                        }, 
+                        },
                        "Furniture and Equipment": {
                            "account_type": "Fixed Asset"
-                        }, 
-                        "Leasehold Improvement": {}, 
-                        "Motor Vehicules": {
+                        },
+                        "Leasehold Improvement": {},
+                        "Motor Vehicles": {
                            "account_type": "Fixed Asset"
-                        }, 
-                        "Work In Progrees": {}, 
+                        },
+                        "Work In Progress": {},
                        "account_type": "Fixed Asset"
                    }
-                }, 
+                },
                "Intangible Assets": {
-                    "Computer Card Renewal": {}, 
-                    "Dispoal of Outlets": {}, 
+                    "Computer Card Renewal": {},
+                    "Disposal of Outlets": {},
                    "Registration of Trademarks": {}
-                }, 
-                "Intercompany Accounts": {}, 
+                },
+                "Intercompany Accounts": {},
                "Investments": {
                    "Investments in Subsidiaries": {}
                }
-            }, 
+            },
            "root_type": "Asset"
-        }, 
+        },
        "Closing And Temporary Accounts": {
            "Closing Accounts": {
                "Closing Account": {}
-            }, 
+            },
            "root_type": "Liability"
-        }, 
+        },
        "Expenses": {
            "Commercial Expenses": {
-                "Consultancy Fees": {}, 
+                "Consultancy Fees": {},
                "Provision for Doubtful Debts": {}
-            }, 
+            },
            "Cost of Sale": {
                "Cost Of Goods Sold": {
-                    "Cost Of Goods Sold I/C Sales": {}, 
+                    "Cost Of Goods Sold I/C Sales": {},
                    "Cost of Goods Sold in Trading": {
                        "account_type": "Cost of Goods Sold"
-                    }, 
+                    },
                    "account_type": "Cost of Goods Sold"
-                }, 
+                },
                "Expenses Included In Valuation": {
                    "account_type": "Expenses Included In Valuation"
+                },
+                "Stock Adjustment": {
+                    "account_type": "Stock Adjustment"
                }
-            }, 
+            },
            "Depreciation": {
                "Depreciation & Amortization": {
-                    "Amortization on Leasehold Improvement": {}, 
+                    "Amortization on Leasehold Improvement": {},
                    "Depreciation Of Computer Hard & Soft": {
                        "account_type": "Depreciation"
-                    }, 
+                    },
                    "Depreciation Of Furniture & Office Equipment\n\t\t\t": {
                        "account_type": "Depreciation"
-                    }, 
+                    },
                    "Depreciation Of Motor Vehicles": {
                        "account_type": "Depreciation"
                    }
                }
-            }, 
+            },
            "Direct Expenses": {
                "Financial Charges": {
-                    "Air Miles Card Charges": {}, 
-                    "Amex Credit Cards Charges": {}, 
-                    "Bank Finance & Loan Charges": {}, 
-                    "Credit Card Charges": {}, 
-                    "Credit Card Swipe Charges": {}, 
+                    "Air Miles Card Charges": {},
+                    "Amex Credit Cards Charges": {},
+                    "Bank Finance & Loan Charges": {},
+                    "Credit Card Charges": {},
+                    "Credit Card Swipe Charges": {},
                    "PayPal Charges": {}
                }
-            }, 
+            },
            "MISC Charges": {
                "Other Charges": {
-                    "Captial Loss": {
-                        "Disposal of Business Branch": {}, 
-                        "Loss On Fixed Assets Disposal": {}, 
+                    "Capital Loss": {
+                        "Disposal of Business Branch": {},
+                        "Loss On Fixed Assets Disposal": {},
                        "Loss on Difference on Exchange": {}
-                    }, 
+                    },
                    "Other Non Operating Exp": {
                        "Other Non Operating Expenses": {}
-                    }, 
+                    },
                    "Previous Year Adjustments": {
                        "Previous Year Adjustments Account": {}
-                    }, 
+                    },
                    "Royalty Fees": {
                        "Royalty to Parent Co.": {}
-                    }, 
+                    },
                    "Tax / Zakat Expenses": {
                        "Income Tax": {
                            "account_type": "Tax"
-                        }, 
-                        "Zakat": {}, 
+                        },
+                        "Zakat": {},
                        "account_type": "Tax"
                    }
                }
-            }, 
+            },
            "Share Resources": {
                "Share Resource Expenses Account": {}
-            }, 
+            },
            "Store Operating Expenses": {
                "Selling, General & Admin Expenses": {
                    "Advertising Expenses": {
                        "Other - Advertising Expenses": {}
-                    }, 
+                    },
                    "Bank & Finance Charges": {
                        "Other Bank Charges": {}
-                    }, 
+                    },
                    "Communications": {
-                        "Courrier": {}, 
-                        "Others - Communication": {}, 
-                        "Telephone": {}, 
+                        "Courier": {},
+                        "Others - Communication": {},
+                        "Telephone": {},
                        "Web Site Hosting Fees": {}
-                    }, 
+                    },
                    "Office & Various Expenses": {
-                        "Cleaning": {}, 
-                        "Convoyance Expenses": {}, 
-                        "Gifts & Donations": {}, 
-                        "Insurance": {}, 
-                        "Kitchen and Buffet Expenses": {}, 
-                        "Maintenance": {}, 
-                        "Others - Office Various Expenses": {}, 
-                        "Security & Guard": {}, 
-                        "Stationary From Suppliers": {}, 
-                        "Stationary Out Of Stock": {}, 
-                        "Subscriptions": {}, 
-                        "Training": {}, 
+                        "Cleaning": {},
+                        "Conveyance Expenses": {},
+                        "Gifts & Donations": {},
+                        "Insurance": {},
+                        "Kitchen and Buffet Expenses": {},
+                        "Maintenance": {},
+                        "Others - Office Various Expenses": {},
+                        "Security & Guard": {},
+                        "Stationary From Suppliers": {},
+                        "Stationary Out Of Stock": {},
+                        "Subscriptions": {},
+                        "Training": {},
                        "Vehicle Expenses": {}
-                    }, 
+                    },
                    "Personnel Cost": {
-                        "Basic Salary": {}, 
-                        "End Of Service Indemnity": {}, 
-                        "Housing Allowance": {}, 
-                        "Leave Salary": {}, 
-                        "Leave Ticket": {}, 
-                        "Life Insurance": {}, 
-                        "Medical Insurance": {}, 
-                        "Personnel Cost Others": {}, 
-                        "Sales Commission": {}, 
-                        "Staff School Allowances": {}, 
-                        "Transportation Allowance": {}, 
-                        "Uniform": {}, 
+                        "Basic Salary": {},
+                        "End Of Service Indemnity": {},
+                        "Housing Allowance": {},
+                        "Leave Salary": {},
+                        "Leave Ticket": {},
+                        "Life Insurance": {},
+                        "Medical Insurance": {},
+                        "Personnel Cost Others": {},
+                        "Sales Commission": {},
+                        "Staff School Allowances": {},
+                        "Transportation Allowance": {},
+                        "Uniform": {},
                        "Visa Expenses": {}
-                    }, 
+                    },
                    "Professional & Legal Fees": {
-                        "Audit Fees": {}, 
-                        "Legal fees": {}, 
-                        "Others - Professional Fees": {}, 
-                        "Sponsorship Fees": {}, 
+                        "Audit Fees": {},
+                        "Legal fees": {},
+                        "Others - Professional Fees": {},
+                        "Sponsorship Fees": {},
                        "Trade License Fees": {}
-                    }, 
+                    },
                    "Provision & Write Off": {
-                        "Amortisation of Preoperating Expenses": {}, 
-                        "Cash Shortage": {}, 
-                        "Others - Provision & Write off": {}, 
-                        "Write Off Inventory": {}, 
+                        "Amortisation of Preoperating Expenses": {},
+                        "Cash Shortage": {},
+                        "Others - Provision & Write off": {},
+                        "Write Off Inventory": {},
                        "Write Off Receivables & Payables": {}
-                    }, 
+                    },
                    "Rent Expenses": {
-                        "Office Rent": {}, 
+                        "Office Rent": {},
                        "Warehouse Rent": {}
-                    }, 
+                    },
                    "Travel Expenses": {
-                        "Air tickets": {}, 
-                        "Hotel": {}, 
-                        "Meals": {}, 
-                        "Others": {}, 
+                        "Air tickets": {},
+                        "Hotel": {},
+                        "Meals": {},
+                        "Others": {},
                        "Per Diem": {}
-                    }, 
+                    },
                    "Utilities": {
-                        "Other Utility Cahrges": {}, 
+                        "Other Utility Cahrges": {},
                        "Water & Electricity": {}
                    }
                }
-            }, 
+            },
            "root_type": "Expense"
-        }, 
+        },
        "Liabilities": {
            "Current Liabilities": {
                "Accounts Payable": {
                    "Payables": {
                        "Advance Paybale to Suppliers": {
                            "account_type": "Payable"
-                        }, 
+                        },
                        "Consigned Payable": {
                            "account_type": "Payable"
-                        }, 
+                        },
                        "Other Payable": {
                            "account_type": "Payable"
-                        }, 
+                        },
                        "Post Dated Cheques Paid": {
                            "account_type": "Payable"
-                        }, 
-                        "Staff Payable": {}, 
+                        },
+                        "Staff Payable": {},
                        "Suppliers Price Protection": {
                            "account_type": "Payable"
-                        }, 
+                        },
                        "Trade Payable": {
                            "account_type": "Payable"
-                        }, 
+                        },
                        "account_type": "Payable"
                    }
-                }, 
+                },
                "Accruals & Provisions": {
                    "Accruals": {
                        "Accrued Personnel Cost": {
-                            "Accrued - Commissions": {}, 
-                            "Accrued - Leave Salary": {}, 
-                            "Accrued - Leave Tickets": {}, 
-                            "Accrued - Salaries": {}, 
-                            "Accrued Other Personnel Cost": {}, 
-                            "Accrued Salaries Increment": {}, 
+                            "Accrued - Commissions": {},
+                            "Accrued - Leave Salary": {},
+                            "Accrued - Leave Tickets": {},
+                            "Accrued - Salaries": {},
+                            "Accrued Other Personnel Cost": {},
+                            "Accrued Salaries Increment": {},
                            "Accrued-Staff Bonus": {}
                        }
-                    }, 
+                    },
                    "Accrued Expenses": {
                        "Accrued Other Expenses": {
-                            "Accrued - Audit Fees": {}, 
-                            "Accrued - Office Rent": {}, 
-                            "Accrued - Sponsorship": {}, 
-                            "Accrued - Telephone": {}, 
-                            "Accrued - Utilities": {}, 
+                            "Accrued - Audit Fees": {},
+                            "Accrued - Office Rent": {},
+                            "Accrued - Sponsorship": {},
+                            "Accrued - Telephone": {},
+                            "Accrued - Utilities": {},
                            "Accrued Others": {}
                        }
-                    }, 
+                    },
                    "Other Current Liabilities": {
-                        "Accrued Dubai Customs": {}, 
-                        "Deferred income": {}, 
+                        "Accrued Dubai Customs": {},
+                        "Deferred income": {},
                        "Shipping & Handling": {}
-                    }, 
+                    },
                    "Provisions": {
                        "Tax Payables": {
-                            "Income Tax Payable": {}, 
-                            "Sales Tax Payable": {}, 
+                            "Income Tax Payable": {},
+                            "Sales Tax Payable": {},
                            "Withholding Tax Payable": {}
                        }
-                    }, 
+                    },
                    "Short Term Loan": {}
-                }, 
+                },
                "Duties and Taxes": {
-                    "account_type": "Tax", 
+                    "account_type": "Tax",
                    "is_group": 1
-                }, 
+                },
                "Reservations & Credit Notes": {
                    "Credit Notes": {
-                        "Credit Notes to Customers": {}, 
+                        "Credit Notes to Customers": {},
                        "Reservations": {}
                    }
-                }, 
+                },
                "Stock Liabilities": {
                    "Stock Received But Not Billed": {
                        "account_type": "Stock Received But Not Billed"
                    }
-                }, 
+                },
                "Unearned Income": {}
-            }, 
+            },
            "Long Term Liabilities": {
                "Long Term Loans & Provisions": {}
-            }, 
+            },
            "root_type": "Liability"
-        }, 
+        },
        "Revenue": {
            "Direct Revenue": {
                "Other Direct Revenue": {
                    "Other Revenue - Operating": {
-                        "Advertising Income": {}, 
-                        "Branding Income": {}, 
-                        "Early Setmt Margin from Suppliers": {}, 
-                        "Marketing Rebate from Suppliers": {}, 
-                        "Rebate from Suppliers": {}, 
-                        "Service Income": {}, 
+                        "Advertising Income": {},
+                        "Branding Income": {},
+                        "Early Setmt Margin from Suppliers": {},
+                        "Marketing Rebate from Suppliers": {},
+                        "Rebate from Suppliers": {},
+                        "Service Income": {},
                        "Space Rental Income": {}
                    }
                }
-            }, 
+            },
            "Indirect Revenue": {
                "Other Indirect Revenue": {
-                    "Capital Gain": {}, 
-                    "Excess In Till": {}, 
-                    "Gain On Difference Of Exchange": {}, 
-                    "Management Consultancy Fees": {}, 
+                    "Capital Gain": {},
+                    "Excess In Till": {},
+                    "Gain On Difference Of Exchange": {},
+                    "Management Consultancy Fees": {},
                    "Other Income": {}
-                }, 
+                },
                "Other Revenue - Non Operating": {
-                    "Interest Revenue": {}, 
-                    "Interest from FD": {}, 
-                    "Products Listing Fees from Suppliers": {}, 
+                    "Interest Revenue": {},
+                    "Interest from FD": {},
+                    "Products Listing Fees from Suppliers": {},
                    "Trade Opening Fees from suppliers": {}
                }
-            }, 
+            },
            "Sales": {
                "Sales from Other Regions": {
                    "Sales from Other Region": {}
-                }, 
+                },
                "Sales of same region": {
-                    "Management Consultancy Fees 1": {}, 
-                    "Sales Account": {}, 
+                    "Management Consultancy Fees 1": {},
+                    "Sales Account": {},
                    "Sales of I/C": {}
                }
-            }, 
+            },
            "root_type": "Income"
-        }, 
+        },
        "Share Holder Equity": {
            "Capital": {
-                "Contributed Capital": {}, 
-                "Share Capital": {}, 
-                "Shareholders Current A/c": {}, 
-                "Sub Ordinated Loan": {}, 
+                "Contributed Capital": {},
+                "Share Capital": {},
+                "Shareholders Current A/c": {},
+                "Sub Ordinated Loan": {},
                "Treasury Stocks": {}
-            }, 
+            },
            "Retained Earnings": {
-                "Current Year Results": {}, 
-                "Dividends Paid": {}, 
+                "Current Year Results": {},
+                "Dividends Paid": {},
                "Previous Years Results": {}
-            }, 
-            "account_type": "Equity", 
+            },
+            "account_type": "Equity",
            "root_type": "Equity"
        }
    }
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -92,10 +92,10 @@ frappe.ui.form.on("Journal Entry", {
 	multi_currency: function(frm) {
 		erpnext.journal_entry.toggle_fields_based_on_currency(frm);
 	},
-	
+
 	posting_date: function(frm) {
 		if(!frm.doc.multi_currency || !frm.doc.posting_date) return;
-		
+
 		$.each(frm.doc.accounts || [], function(i, row) {
 			erpnext.journal_entry.set_exchange_rate(frm, row.doctype, row.name);
 		})
@@ -234,7 +234,7 @@ erpnext.accounts.JournalEntry = frappe.ui.form.Controller.extend({

 				out.filters.push([jvd.reference_type, "per_billed", "<", 100]);
 			}
-			
+
 			if(jvd.party_type && jvd.party) {
 				var party_field = "";
 				if(jvd.reference_type.indexOf("Sales")===0) {
@@ -382,7 +382,7 @@ cur_frm.cscript.voucher_type = function(doc, cdt, cdn) {
 		});
 		refresh_field("accounts");
 	}
-	
+
 	if((!(doc.accounts || []).length) || ((doc.accounts || []).length==1 && !doc.accounts[0].account)) {
 		if(in_list(["Bank Entry", "Cash Entry"], doc.voucher_type)) {
 			return frappe.call({
@@ -390,7 +390,7 @@ cur_frm.cscript.voucher_type = function(doc, cdt, cdn) {
 				method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_default_bank_cash_account",
 				args: {
 					"account_type": (doc.voucher_type=="Bank Entry" ?
-						"Bank" : (doc.voucher_type=="Cash" ? "Cash" : null)),
+						"Bank" : (doc.voucher_type=="Cash Entry" ? "Cash" : null)),
 					"company": doc.company
 				},
 				callback: function(r) {
@@ -442,7 +442,7 @@ frappe.ui.form.on("Journal Entry Account", {
 	account: function(frm, dt, dn) {
 		erpnext.journal_entry.set_account_balance(frm, dt, dn);
 	},
-	
+
 	debit_in_account_currency: function(frm, cdt, cdn) {
 		erpnext.journal_entry.set_exchange_rate(frm, cdt, cdn);
 	},
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -250,7 +250,7 @@ class PurchaseInvoice(BuyingController):
 	def set_against_expense_account(self):
 		against_accounts = []
 		for item in self.get("items"):
-			if item.expense_account not in against_accounts:
+			if item.expense_account and (item.expense_account not in against_accounts):
 				against_accounts.append(item.expense_account)

 		self.against_expense_account = ",".join(against_accounts)
@@ -750,7 +750,11 @@ class PurchaseInvoice(BuyingController):
 			)

 	def make_gle_for_rounding_adjustment(self, gl_entries):
-		if self.rounding_adjustment:
+		# if rounding adjustment in small and conversion rate is also small then
+		# base_rounding_adjustment may become zero due to small precision
+		# eg: rounding_adjustment = 0.01 and exchange rate = 0.05 and precision of base_rounding_adjustment is 2
+		#	then base_rounding_adjustment becomes zero and error is thrown in GL Entry
+		if self.rounding_adjustment and self.base_rounding_adjustment:
 			round_off_account, round_off_cost_center = \
 				get_round_off_account_and_cost_center(self.company)

--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -944,7 +944,7 @@ class SalesInvoice(SellingController):
 			)

 	def make_gle_for_rounding_adjustment(self, gl_entries):
-		if flt(self.rounding_adjustment, self.precision("rounding_adjustment")):
+		if flt(self.rounding_adjustment, self.precision("rounding_adjustment")) and self.base_rounding_adjustment:
 			round_off_account, round_off_cost_center = \
 				get_round_off_account_and_cost_center(self.company)

@@ -1039,13 +1039,18 @@ class SalesInvoice(SellingController):
 				continue

 			for serial_no in item.serial_no.split("\n"):
-				sales_invoice, item_code = frappe.db.get_value("Serial No", serial_no,
-					["sales_invoice", "item_code"])
-				if sales_invoice and item_code == item.item_code and self.name != sales_invoice:
-					sales_invoice_company = frappe.db.get_value("Sales Invoice", sales_invoice, "company")
+				serial_no_details = frappe.db.get_value("Serial No", serial_no,
+					["sales_invoice", "item_code"], as_dict=1)
+
+				if not serial_no_details:
+					continue
+
+				if serial_no_details.sales_invoice and serial_no_details.item_code == item.item_code \
+					and self.name != serial_no_details.sales_invoice:
+					sales_invoice_company = frappe.db.get_value("Sales Invoice", serial_no_details.sales_invoice, "company")
 					if sales_invoice_company == self.company:
 						frappe.throw(_("Serial Number: {0} is already referenced in Sales Invoice: {1}"
-							.format(serial_no, sales_invoice)))
+							.format(serial_no, serial_no_details.sales_invoice)))

 	def update_project(self):
 		if self.project:
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -59,6 +59,7 @@ class ReceivablePayableReport(object):

 	def get_data(self):
 		self.get_gl_entries()
+		self.get_sales_invoices_or_customers_based_on_sales_person()
 		self.voucher_balance = OrderedDict()
 		self.init_voucher_balance() # invoiced, paid, credit_note, outstanding

@@ -102,12 +103,18 @@ class ReceivablePayableReport(object):

 	def get_invoices(self, gle):
 		if gle.voucher_type in ('Sales Invoice', 'Purchase Invoice'):
-			self.invoices.add(gle.voucher_no)
+			if self.filters.get("sales_person"):
+				if gle.voucher_no in self.sales_person_records.get("Sales Invoice", []) \
+					or gle.party in self.sales_person_records.get("Customer", []):
+						self.invoices.add(gle.voucher_no)
+			else:
+				self.invoices.add(gle.voucher_no)

 	def update_voucher_balance(self, gle):
 		# get the row where this balance needs to be updated
 		# if its a payment, it will return the linked invoice or will be considered as advance
 		row = self.get_voucher_balance(gle)
+		if not row: return
 		# gle_balance will be the total "debit - credit" for receivable type reports and
 		# and vice-versa for payable type reports
 		gle_balance = self.get_gle_balance(gle)
@@ -128,8 +135,13 @@ class ReceivablePayableReport(object):
 				row.paid -= gle_balance

 	def get_voucher_balance(self, gle):
-		voucher_balance = None
+		if self.filters.get("sales_person"):
+			against_voucher = gle.against_voucher or gle.voucher_no
+			if not (gle.party in self.sales_person_records.get("Customer", []) or \
+				against_voucher in self.sales_person_records.get("Sales Invoice", [])):
+					return

+		voucher_balance = None
 		if gle.against_voucher:
 			# find invoice
 			against_voucher = gle.against_voucher
@@ -511,6 +523,22 @@ class ReceivablePayableReport(object):
 			order by posting_date, party"""
 			.format(select_fields, conditions), values, as_dict=True)

+	def get_sales_invoices_or_customers_based_on_sales_person(self):
+		if self.filters.get("sales_person"):
+			lft, rgt = frappe.db.get_value("Sales Person",
+				self.filters.get("sales_person"), ["lft", "rgt"])
+
+			records = frappe.db.sql("""
+				select distinct parent, parenttype
+				from `tabSales Team` steam
+				where parenttype in ('Customer', 'Sales Invoice')
+					and exists(select name from `tabSales Person` where lft >= %s and rgt <= %s and name = steam.sales_person)
+			""", (lft, rgt), as_dict=1)
+
+			self.sales_person_records = frappe._dict()
+			for d in records:
+				self.sales_person_records.setdefault(d.parenttype, set()).add(d.parent)
+
 	def prepare_conditions(self):
 		conditions = [""]
 		values = [self.party_type, self.filters.report_date]
@@ -561,16 +589,6 @@ class ReceivablePayableReport(object):
 			conditions.append("party in (select name from tabCustomer where default_sales_partner=%s)")
 			values.append(self.filters.get("sales_partner"))

-		if self.filters.get("sales_person"):
-			lft, rgt = frappe.db.get_value("Sales Person",
-				self.filters.get("sales_person"), ["lft", "rgt"])
-
-			conditions.append("""exists(select name from `tabSales Team` steam where
-				steam.sales_person in (select name from `tabSales Person` where lft >= {0} and rgt <= {1})
-				and ((steam.parent = voucher_no and steam.parenttype = voucher_type)
-					or (steam.parent = against_voucher and steam.parenttype = against_voucher_type)
-					or (steam.parent = party and steam.parenttype = 'Customer')))""".format(lft, rgt))
-
 	def add_supplier_filters(self, conditions, values):
 		if self.filters.get("supplier_group"):
 			conditions.append("""party in (select name from tabSupplier
--- a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
+++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
@@ -36,7 +36,7 @@ class AccountsReceivableSummary(ReceivablePayableReport):
 			self.filters.report_date) or {}

 		for party, party_dict in iteritems(self.party_total):
-			if party_dict.outstanding <= 0:
+			if party_dict.outstanding == 0:
 				continue

 			row = frappe._dict()
@@ -135,4 +135,4 @@ class AccountsReceivableSummary(ReceivablePayableReport):
 			"{range2}-{range3}".format(range2=cint(self.filters["range2"])+ 1, range3=self.filters["range3"]),
 			"{range3}-{range4}".format(range3=cint(self.filters["range3"])+ 1, range4=self.filters["range4"]),
 			"{range4}-{above}".format(range4=cint(self.filters["range4"])+ 1, above=_("Above"))]):
-				self.add_column(label=label, fieldname='range' + str(i+1))
+				self.add_column(label=label, fieldname='range' + str(i+1))
--- a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py
+++ b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py
@@ -18,14 +18,17 @@ def execute(filters=None):
 	return columns, data

 def get_data(filters, show_party_name):
-	party_name_field = "{0}_name".format(frappe.scrub(filters.get('party_type')))
+	if filters.get('party_type') in ('Customer', 'Supplier', 'Employee', 'Member'):
+		party_name_field = "{0}_name".format(frappe.scrub(filters.get('party_type')))
 	if filters.get('party_type') == 'Student':
 		party_name_field = 'first_name'
 	elif filters.get('party_type') == 'Shareholder':
 		party_name_field = 'title'
+	else:
+		party_name_field = 'name'

 	party_filters = {"name": filters.get("party")} if filters.get("party") else {}
-	parties = frappe.get_all(filters.get("party_type"), fields = ["name", party_name_field], 
+	parties = frappe.get_all(filters.get("party_type"), fields = ["name", party_name_field],
 		filters = party_filters, order_by="name")
 	company_currency = frappe.get_cached_value('Company',  filters.company,  "default_currency")
 	opening_balances = get_opening_balances(filters)
@@ -70,7 +73,7 @@ def get_data(filters, show_party_name):
 		# totals
 		for col in total_row:
 			total_row[col] += row.get(col)
-		
+
 		row.update({
 			"currency": company_currency
 		})
@@ -78,7 +81,7 @@ def get_data(filters, show_party_name):
 		has_value = False
 		if (opening_debit or opening_credit or debit or credit or closing_debit or closing_credit):
 			has_value  =True
-		
+
 		if cint(filters.show_zero_values) or has_value:
 			data.append(row)

@@ -94,9 +97,9 @@ def get_data(filters, show_party_name):

 def get_opening_balances(filters):
 	gle = frappe.db.sql("""
-		select party, sum(debit) as opening_debit, sum(credit) as opening_credit 
+		select party, sum(debit) as opening_debit, sum(credit) as opening_credit
 		from `tabGL Entry`
-		where company=%(company)s 
+		where company=%(company)s
 			and ifnull(party_type, '') = %(party_type)s and ifnull(party, '') != ''
 			and (posting_date < %(from_date)s or ifnull(is_opening, 'No') = 'Yes')
 		group by party""", {
@@ -114,11 +117,11 @@ def get_opening_balances(filters):

 def get_balances_within_period(filters):
 	gle = frappe.db.sql("""
-		select party, sum(debit) as debit, sum(credit) as credit 
+		select party, sum(debit) as debit, sum(credit) as credit
 		from `tabGL Entry`
-		where company=%(company)s 
+		where company=%(company)s
 			and ifnull(party_type, '') = %(party_type)s and ifnull(party, '') != ''
-			and posting_date >= %(from_date)s and posting_date <= %(to_date)s 
+			and posting_date >= %(from_date)s and posting_date <= %(to_date)s
 			and ifnull(is_opening, 'No') = 'No'
 		group by party""", {
 			"company": filters.company,
--- a/erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json
+++ b/erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -375,9 +375,10 @@ class AccountsController(TransactionBase):
 		return gl_dict

 	def validate_qty_is_not_zero(self):
-		for item in self.items:
-			if not item.qty:
-				frappe.throw(_("Item quantity can not be zero"))
+		if self.doctype != "Purchase Receipt":
+			for item in self.items:
+				if not item.qty:
+					frappe.throw(_("Item quantity can not be zero"))

 	def validate_account_currency(self, account, account_currency=None):
 		valid_currency = [self.company_currency]
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -159,8 +159,12 @@ def item_query(doctype, txt, searchfield, start, page_len, filters, as_dict=Fals
 	if "description" in searchfields:
 		searchfields.remove("description")

-	columns = [field for field in searchfields if not field in ["name", "item_group", "description"]]
-	columns = ", ".join(columns)
+	columns = ''
+	extra_searchfields = [field for field in searchfields
+		if field not in ["name", "item_group", "description"]]
+
+	if extra_searchfields:
+		columns = ", " + ", ".join(extra_searchfields)

 	searchfields = searchfields + [field for field in[searchfield or "name", "item_code", "item_group", "item_name"]
 		if not field in searchfields]
@@ -176,7 +180,7 @@ def item_query(doctype, txt, searchfield, start, page_len, filters, as_dict=Fals
 			concat(substr(tabItem.item_name, 1, 40), "..."), item_name) as item_name,
 		tabItem.item_group,
 		if(length(tabItem.description) > 40, \
-			concat(substr(tabItem.description, 1, 40), "..."), description) as description,
+			concat(substr(tabItem.description, 1, 40), "..."), description) as description
 		{columns}
 		from tabItem
 		where tabItem.docstatus < 2
--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py
@@ -72,7 +72,7 @@ def validate_returned_items(doc):

 	items_returned = False
 	for d in doc.get("items"):
-		if d.item_code and (flt(d.qty) < 0 or d.get('received_qty') < 0):
+		if d.item_code and (flt(d.qty) < 0 or flt(d.get('received_qty')) < 0):
 			if d.item_code not in valid_items:
 				frappe.throw(_("Row # {0}: Returned Item {1} does not exists in {2} {3}")
 					.format(d.idx, d.item_code, doc.doctype, doc.return_against))
--- a/erpnext/manufacturing/doctype/work_order/work_order.js
+++ b/erpnext/manufacturing/doctype/work_order/work_order.js
@@ -371,6 +371,11 @@ frappe.ui.form.on("Work Order", {
 				}
 			});
 		}
+	},
+
+	additional_operating_cost: function(frm) {
+		erpnext.work_order.calculate_cost(frm.doc);
+		erpnext.work_order.calculate_total_cost(frm);
 	}
 });

@@ -507,8 +512,7 @@ erpnext.work_order = {
 	},

 	calculate_total_cost: function(frm) {
-		var variable_cost = frm.doc.actual_operating_cost ?
-			flt(frm.doc.actual_operating_cost) : flt(frm.doc.planned_operating_cost)
+		let variable_cost = flt(frm.doc.actual_operating_cost) || flt(frm.doc.planned_operating_cost);
 		frm.set_value("total_operating_cost", (flt(frm.doc.additional_operating_cost) + variable_cost))
 	},

--- a/erpnext/projects/doctype/timesheet/timesheet.py
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -191,6 +191,9 @@ class Timesheet(Document):
 			}, as_dict=True)
 		# check internal overlap
 		for time_log in self.time_logs:
+			if not (time_log.from_time and time_log.to_time
+				and args.from_time and args.to_time): continue
+
 			if (fieldname != 'workstation' or args.get(fieldname) == time_log.get(fieldname)) and \
 				args.idx != time_log.idx and ((args.from_time > time_log.from_time and args.from_time < time_log.to_time) or
 				(args.to_time > time_log.from_time and args.to_time < time_log.to_time) or
--- a/erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py
+++ b/erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py
@@ -7,7 +7,7 @@ from frappe.utils import flt

 def execute(filters=None):
 	if not filters: filters = {}
-	
+
 	columns = get_columns()
 	iwq_map = get_item_warehouse_quantity_map()
 	item_map = get_item_details()
@@ -15,22 +15,23 @@ def execute(filters=None):
 	for sbom, warehouse in iwq_map.items():
 		total = 0
 		total_qty = 0
-		
+
 		for wh, item_qty in warehouse.items():
 			total += 1
-			row = [sbom, item_map.get(sbom).item_name, item_map.get(sbom).description, 
-					item_map.get(sbom).stock_uom, wh]
-			available_qty = item_qty
-			total_qty += flt(available_qty)
-			row += [available_qty]
-			
-			if available_qty:
-				data.append(row)
-				if (total == len(warehouse)):
-					row = ["", "", "Total", "", "", total_qty]
+			if item_map.get(sbom):
+				row = [sbom, item_map.get(sbom).item_name, item_map.get(sbom).description,
+						item_map.get(sbom).stock_uom, wh]
+				available_qty = item_qty
+				total_qty += flt(available_qty)
+				row += [available_qty]
+
+				if available_qty:
 					data.append(row)
+					if (total == len(warehouse)):
+						row = ["", "", "Total", "", "", total_qty]
+						data.append(row)
 	return columns, data
-		
+
 def get_columns():
 	columns = ["Item Code:Link/Item:100", "Item Name::100", "Description::120", \
 				"UOM:Link/UOM:80", "Warehouse:Link/Warehouse:100", "Quantity::100"]
--- a/erpnext/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -284,7 +284,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
 					child: item,
 					args: {
 						"batch_no": item.batch_no,
-						"stock_qty": item.stock_qty,
+						"stock_qty": item.stock_qty || item.qty, //if stock_qty field is not available, fetch qty (in case of Packed Items table)
 						"warehouse": item.warehouse,
 						"item_code": item.item_code,
 						"has_serial_no": has_serial_no
--- a/erpnext/shopping_cart/cart.py
+++ b/erpnext/shopping_cart/cart.py
@@ -66,6 +66,7 @@ def place_order():

 	from erpnext.selling.doctype.quotation.quotation import _make_sales_order
 	sales_order = frappe.get_doc(_make_sales_order(quotation.name, ignore_permissions=True))
+	sales_order.payment_schedule = []

 	if not cart_settings.allow_items_not_in_stock:
 		for item in sales_order.get("items"):
--- a/erpnext/stock/doctype/packed_item/packed_item.json
+++ b/erpnext/stock/doctype/packed_item/packed_item.json
@@ -1,5 +1,7 @@
 {
 "allow_copy": 0, 
+ "allow_events_in_timeline": 0, 
+ "allow_guest_to_view": 0, 
 "allow_import": 0, 
 "allow_rename": 0, 
 "beta": 0, 
@@ -11,10 +13,13 @@
 "engine": "InnoDB", 
 "fields": [
  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "fetch_if_empty": 0, 
   "fieldname": "parent_item", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -39,13 +44,17 @@
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
+   "translatable": 0, 
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "fetch_if_empty": 0, 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -70,13 +79,17 @@
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
+   "translatable": 0, 
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "fetch_if_empty": 0, 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
   "hidden": 0, 
@@ -100,13 +113,17 @@
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
+   "translatable": 0, 
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "fetch_if_empty": 0, 
   "fieldname": "column_break_5", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -128,13 +145,17 @@
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
+   "translatable": 0, 
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "fetch_if_empty": 0, 
   "fieldname": "description", 
   "fieldtype": "Text Editor", 
   "hidden": 0, 
@@ -159,14 +180,18 @@
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
+   "translatable": 0, 
   "unique": 0, 
   "width": "300px"
  }, 
  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "fetch_if_empty": 0, 
   "fieldname": "section_break_6", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -188,13 +213,17 @@
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
+   "translatable": 0, 
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "fetch_if_empty": 0, 
   "fieldname": "warehouse", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -219,13 +248,17 @@
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
+   "translatable": 0, 
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "fetch_if_empty": 0, 
   "fieldname": "target_warehouse", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -249,13 +282,17 @@
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
+   "translatable": 0, 
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "fetch_if_empty": 0, 
   "fieldname": "column_break_9", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -277,13 +314,17 @@
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
+   "translatable": 0, 
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "fetch_if_empty": 0, 
   "fieldname": "qty", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -307,13 +348,17 @@
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
+   "translatable": 0, 
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "fetch_if_empty": 0, 
   "fieldname": "section_break_9", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -335,13 +380,17 @@
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
+   "translatable": 0, 
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "fetch_if_empty": 0, 
   "fieldname": "serial_no", 
   "fieldtype": "Text", 
   "hidden": 0, 
@@ -363,13 +412,17 @@
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
+   "translatable": 0, 
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "fetch_if_empty": 0, 
   "fieldname": "column_break_11", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -391,13 +444,17 @@
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
+   "translatable": 0, 
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "fetch_if_empty": 0, 
   "fieldname": "batch_no", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -420,13 +477,51 @@
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
+   "translatable": 0, 
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "depends_on": "batch_no", 
+   "fetch_if_empty": 0, 
+   "fieldname": "actual_batch_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Actual Batch Quantity", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_if_empty": 0, 
   "fieldname": "section_break_13", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -448,13 +543,17 @@
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
+   "translatable": 0, 
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "fetch_if_empty": 0, 
   "fieldname": "actual_qty", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -478,13 +577,17 @@
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
+   "translatable": 0, 
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "fetch_if_empty": 0, 
   "fieldname": "projected_qty", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -508,13 +611,17 @@
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
+   "translatable": 0, 
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "fetch_if_empty": 0, 
   "fieldname": "column_break_16", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
@@ -536,13 +643,17 @@
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
+   "translatable": 0, 
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "fetch_if_empty": 0, 
   "fieldname": "uom", 
   "fieldtype": "Link", 
   "hidden": 0, 
@@ -567,13 +678,17 @@
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
+   "translatable": 0, 
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
   "allow_on_submit": 1, 
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "fetch_if_empty": 0, 
   "fieldname": "page_break", 
   "fieldtype": "Check", 
   "hidden": 0, 
@@ -597,13 +712,17 @@
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
+   "translatable": 0, 
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "fetch_if_empty": 0, 
   "fieldname": "prevdoc_doctype", 
   "fieldtype": "Data", 
   "hidden": 1, 
@@ -627,13 +746,17 @@
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
+   "translatable": 0, 
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "fetch_if_empty": 0, 
   "fieldname": "parent_detail_docname", 
   "fieldtype": "Data", 
   "hidden": 1, 
@@ -657,20 +780,21 @@
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
+   "translatable": 0, 
   "unique": 0
  }
 ], 
+ "has_web_view": 0, 
 "hide_heading": 0, 
 "hide_toolbar": 0, 
 "idx": 1, 
 "image_view": 0, 
 "in_create": 0, 
-
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
 "max_attachments": 0, 
- "modified": "2017-02-20 13:27:37.569945", 
+ "modified": "2019-11-27 11:18:18.598759", 
 "modified_by": "Administrator", 
 "module": "Stock", 
 "name": "Packed Item", 
@@ -681,5 +805,6 @@
 "read_only_onload": 0, 
 "show_name_in_global_search": 0, 
 "track_changes": 1, 
- "track_seen": 0
+ "track_seen": 0, 
+ "track_views": 0
 }
--- a/erpnext/stock/doctype/packed_item/packed_item.py
+++ b/erpnext/stock/doctype/packed_item/packed_item.py
@@ -65,7 +65,7 @@ def update_packing_list_item(doc, packing_item_code, qty, main_item_row, descrip
 	pi.actual_qty = flt(bin.get("actual_qty"))
 	pi.projected_qty = flt(bin.get("projected_qty"))

-	if old_packed_items_map:
+	if old_packed_items_map and old_packed_items_map.get((packing_item_code, main_item_row.item_code)):
 		pi.batch_no = old_packed_items_map.get((packing_item_code, main_item_row.item_code))[0].batch_no
 		pi.serial_no = old_packed_items_map.get((packing_item_code, main_item_row.item_code))[0].serial_no
 		pi.warehouse = old_packed_items_map.get((packing_item_code, main_item_row.item_code))[0].warehouse
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -27,6 +27,12 @@ frappe.ui.form.on("Purchase Receipt", {
 			}
 		});

+		frm.set_query("taxes_and_charges", function() {
+			return {
+				filters: {'company': frm.doc.company }
+			}
+		});
+
 	},
 	onload: function(frm) {
 		erpnext.queries.setup_queries(frm, "Warehouse", function() {
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
--- a/erpnext/stock/report/stock_balance/stock_balance.py
+++ b/erpnext/stock/report/stock_balance/stock_balance.py
@@ -261,7 +261,7 @@ def validate_filters(filters):
 	if not (filters.get("item_code") or filters.get("warehouse")):
 		sle_count = flt(frappe.db.sql("""select count(name) from `tabStock Ledger Entry`""")[0][0])
 		if sle_count > 500000:
-			frappe.throw(_("Please set filter based on Item or Warehouse"))
+			frappe.throw(_("Please set filter based on Item or Warehouse due to a large amount of entries."))

 def get_variants_attributes():
 	'''Return all item variant attributes.'''
Author	SHA1	Message	Date
Sahil Khan	b4ce43306b	Merge branch 'v11-pre-release' into version-11	2019-12-18 13:59:59 +05:30
Sahil Khan	85a9f55fa7	bumped to version 11.1.71	2019-12-18 14:19:59 +05:50
Suraj Shetty	596c0d2060	fix(init): bump version to 11.1.70 (#19986 ) fix(init): bump version to 11.1.70	2019-12-18 13:58:01 +05:30
sahil28297	723421f375	fix(init): bump version to 11.1.70	2019-12-18 13:56:34 +05:30
Deepesh Garg	f9297416f2	fix: Append expense account only if expense account exists (#19882 )	2019-12-10 12:14:58 +05:30
Nabin Hait	a8d2916e61	Merge branch 'version-11' into version-11-hotfix	2019-12-09 18:08:05 +05:30
Deepesh Garg	0f70f20ec5	Merge pull request #19866 from nextchamp-saqib/ux-fix fix: tax templates from all companies fetching in receipt	2019-12-09 17:59:44 +05:30
thefalconx33	73d9d8fec9	fix: tax templates from all companies fetching in receipt	2019-12-09 13:59:50 +05:30
Deepesh Garg	c4756e938f	fix: Rounding Adjustment GL entry fix (#19840 ) * fix: Rounding Adjustment GL entry fix * fix: Spacing in tab * fix: Comment fix	2019-12-09 13:03:18 +05:30
Deepesh Garg	faa5d90f1b	fix: NoneType' object has no attribute '__getitem__' (#19861 )	2019-12-09 11:28:38 +05:30
rohitwaghchaure	3b37a109c5	Merge pull request #19852 from rohitwaghchaure/fixed_timesheet_overlap_issue_v11_hotfix fix: timesheet overlap error	2019-12-07 14:10:35 +05:30
Rohit Waghchaure	ab4aa53f52	fix: timesheet overlap error	2019-12-07 13:28:09 +05:30
Nabin Hait	3483426fe7	optimize: Optimization of Receivable report filtered based on sales person (#19795 )	2019-12-04 15:30:48 +05:30
Deepesh Garg	3039094737	fix: Party name field in trial balacne for party report (#19791 )	2019-12-03 16:30:16 +05:30
Nabin Hait	e21602d432	Update accounts_receivable_summary.py	2019-12-03 16:22:22 +05:30
Marica	6067ef3c49	fix: Item qty cannot be zero in Purchase Receipt (#19781 )	2019-12-03 12:45:28 +05:30
Deepesh Garg	b78128a7fe	Merge pull request #19767 from deepeshgarg007/avaiable_stock_for_v11 fix: Available stock for packing item report	2019-12-02 11:57:07 +05:30
deepeshgarg007	c8cbb87168	fix: Available stock for packing item report	2019-12-01 22:17:46 +05:30
Deepesh Garg	aed8aeb83a	fix: Account type in Handling Difference in Inventory account (#19675 ) * fix: Account type in Handling Difference in Inventory account * fix: Add Stock Adjustment account * fix: Rename account to stock adjustment	2019-11-28 18:29:26 +05:30
Saqib	fa47445e11	fix: due date before posting date for items added to cart yesterday (#19680 )	2019-11-28 18:27:55 +05:30
Marica	0220acf100	fix: Changed type of column 'serial_no' in Stock Ledger Entry (#19705 )	2019-11-28 18:20:57 +05:30
Marica	0fe8f8e6d9	fix: get_batch_qty_and_serial_no() requires argument 'stock_qty' (#19699 )	2019-11-27 15:51:12 +05:30
rohitwaghchaure	f87b766a26	Merge pull request #19688 from deepeshgarg007/sales_invoice_serial_no fix: Serial no validation against sales invoice	2019-11-27 11:59:46 +05:30
deepeshgarg007	2262e5d443	fix: Validation msg	2019-11-26 16:15:05 +05:30
deepeshgarg007	b9cad8d891	fix: Serial no validation against sales invoice	2019-11-26 15:27:54 +05:30
Marica	dafdc6035a	fix: Validation Error message on Prepared Report. (#19640 ) Give the user the reason why he has to use filters.	2019-11-22 14:38:53 +05:30
Marica	c8369c10ff	fix: Get Current Stock button in Purhase Receipt not working (#19653 ) - Current Stock visible in grid view within Supplied Items table of Purchase Receipt	2019-11-22 13:33:11 +05:30
Deepesh Garg	08b8ed5ca6	Merge pull request #19635 from ruchamahabal/fix_cash_entry_v11 fix(minor): default Cash Entry account not getting fetched in Journal Entry (v11)	2019-11-20 22:02:48 +05:30
Rucha Mahabal	6cefdb40d1	fix(Journal Entry): default Cash Entry account not getting fetched	2019-11-20 20:13:04 +05:30
Rohit Waghchaure	3ad65ec57d	fix: code cleanup	2019-11-20 13:24:53 +05:30
rohitwaghchaure	364332bcfe	Update queries.py	2019-11-20 13:24:44 +05:30
Rohit Waghchaure	9965f443ee	fix: not able to select item in sales order	2019-11-20 13:24:34 +05:30
rohitwaghchaure	d87d644dc2	Merge pull request #19621 from rohitwaghchaure/not_able_to_select_item_in_the_sales_order_hotfix fix: not able to select item in sales order	2019-11-19 19:40:29 +05:30
rohitwaghchaure	eeab3128aa	Merge pull request #19623 from rohitwaghchaure/code_cleanup_sales_invoice_credit_note_hotfix fix: code cleanup	2019-11-19 19:39:36 +05:30
Rohit Waghchaure	7b2cec8da2	fix: code cleanup	2019-11-19 19:27:31 +05:30
rohitwaghchaure	6e3cbd8698	Update queries.py	2019-11-19 19:26:31 +05:30
Rohit Waghchaure	b5e1f846ce	fix: not able to select item in sales order	2019-11-19 19:08:44 +05:30
rohitwaghchaure	9c7a33405d	Merge pull request #19024 from Alchez/v11-work-order-bugs fix: Work Order operating cost re-calculation on client-side (v11)	2019-11-15 11:18:39 +05:30
Rohan	1b9a55e766	Merge branch 'version-11-hotfix' into v11-work-order-bugs	2019-11-13 13:08:59 +05:30
Rohan	4a79072c71	Merge branch 'version-11-hotfix' into v11-work-order-bugs	2019-11-06 11:39:11 +05:30
Rohan	f2dc89c7a0	Merge branch 'version-11-hotfix' into v11-work-order-bugs	2019-10-29 11:25:40 +05:30
Rohan	dd3cd6e2ba	Merge branch 'version-11-hotfix' into v11-work-order-bugs	2019-10-22 17:11:39 +05:30
Rohan	529b465337	Merge branch 'version-11-hotfix' into v11-work-order-bugs	2019-10-16 15:11:45 +05:30
Rohan	85be3ec796	Merge branch 'version-11-hotfix' into v11-work-order-bugs	2019-10-11 12:50:28 +05:30
Rohan	43a0161257	Merge branch 'version-11-hotfix' into v11-work-order-bugs	2019-10-04 13:13:06 +05:30
Rohan	ce60dc3ea3	Merge branch 'version-11-hotfix' into v11-work-order-bugs	2019-09-25 14:45:21 +05:30
Rohan	b23da53fee	Merge branch 'version-11-hotfix' into v11-work-order-bugs	2019-09-18 13:24:25 +05:30
Rohan	d37a30fc47	fix: operating cost calculation in JS	2019-09-12 16:12:48 +05:30