Merge branch develop into dimensions

erpnext/accounts/doctype/pricing_rule/pricing_rule.py

@@ -321,7 +321,7 @@ def set_discount_amount(rate, item_details):
 def remove_pricing_rule_for_item(pricing_rules, item_details, item_code=None):
 	from erpnext.accounts.doctype.pricing_rule.utils import get_apply_on_and_items
 	for d in pricing_rules.split(','):
-		if not d: continue
+		if not d or not frappe.db.exists("Pricing Rule", d): continue
 		pricing_rule = frappe.get_doc('Pricing Rule', d)
 
 		if pricing_rule.price_or_product_discount == 'Price':

erpnext/accounts/doctype/pricing_rule/utils.py

@@ -480,10 +480,10 @@ def apply_pricing_rule(doc, pr_doc, item_row, value, do_not_validate=False):
 	rule_applied = {}
 
 	for item in doc.get("items"):
-		if not item.pricing_rules:
-			item.pricing_rules = item_row.pricing_rules
-
 		if item.get(apply_on) in items:
+			if not item.pricing_rules:
+				item.pricing_rules = item_row.pricing_rules
+
 			for field in ['discount_percentage', 'discount_amount', 'rate']:
 				if not pr_doc.get(field): continue
 

erpnext/accounts/report/accounts_receivable/accounts_receivable.py

@@ -68,13 +68,13 @@ class ReceivablePayableReport(object):
 
 		if self.filters.based_on_payment_terms:
 			columns.append({
-				"label": "Payment Term",
+				"label": _("Payment Term"),
 				"fieldname": "payment_term",
 				"fieldtype": "Data",
 				"width": 120
 			})
 			columns.append({
-				"label": "Invoice Grand Total",
+				"label": _("Invoice Grand Total"),
 				"fieldname": "invoice_grand_total",
 				"fieldtype": "Currency",
 				"options": "currency",
@@ -83,7 +83,7 @@ class ReceivablePayableReport(object):
 
 		for label in ("Invoiced Amount", "Paid Amount", credit_or_debit_note, "Outstanding Amount"):
 			columns.append({
-				"label": label,
+				"label": _(label),
 				"fieldname": frappe.scrub(label),
 				"fieldtype": "Currency",
 				"options": "currency",

erpnext/buying/doctype/purchase_order/purchase_order.js

@@ -33,6 +33,14 @@ frappe.ui.form.on("Purchase Order", {
 				}
 			}
 		});
+
+		frm.set_query("expense_account", "items", function() {
+			return {
+				query: "erpnext.controllers.queries.get_expense_account",
+				filters: {'company': frm.doc.company}
+			}
+		});
+
 	},
 
 	refresh: function(frm) {

erpnext/config/getting_started.py

@@ -60,6 +60,13 @@ def get_data():
 					"description": _("Import Data from CSV / Excel files."),
 					"onboard": 1,
 				},
+				{
+					"type": "doctype",
+					"name": "Chart of Accounts Importer",
+					"labe": _("Chart Of Accounts Importer"),
+					"description": _("Import Chart Of Accounts from CSV / Excel files"),
+					"onboard": 1
+				},
 				{
 					"type": "doctype",
 					"name": "Letter Head",

erpnext/hr/doctype/vehicle/vehicle.py

@@ -11,4 +11,6 @@ from frappe.model.document import Document
 class Vehicle(Document):
 	def validate(self):
 		if getdate(self.start_date) > getdate(self.end_date):
-			frappe.throw(_("Insurance Start date should be less than Insurance End date"))
+			frappe.throw(_("Insurance Start date should be less than Insurance End date"))
+		if getdate(self.carbon_check_date) > getdate():
+			frappe.throw(_("Last carbon check date cannot be a future date"))

erpnext/public/js/payment/pos_payment.html

@@ -21,7 +21,7 @@
 	<hr>
 	<div class="row">
 		<div class="col-sm-6 ">
-			<div class ="row multimode-payments">
+			<div class ="row multimode-payments" style = "margin-right:10px">
 			</div>
 		</div>
 		<div class="col-sm-6 payment-toolbar">

erpnext/selling/report/sales_analytics/sales_analytics.json

@@ -1,5 +1,5 @@
 {
- "add_total_row": 1, 
+ "add_total_row": 0, 
  "creation": "2018-09-21 12:46:29.451048", 
  "disable_prepared_report": 0, 
  "disabled": 0, 
@@ -7,7 +7,7 @@
  "doctype": "Report", 
  "idx": 0, 
  "is_standard": "Yes", 
- "modified": "2019-02-12 14:30:40.043652", 
+ "modified": "2019-05-24 05:37:02.866139", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Analytics", 

erpnext/stock/doctype/purchase_receipt/purchase_receipt.js

@@ -10,7 +10,7 @@ frappe.ui.form.on("Purchase Receipt", {
 		frm.custom_make_buttons = {
 			'Stock Entry': 'Return',
 			'Purchase Invoice': 'Invoice'
-		}
+		};
 
 		frm.set_query("asset", "items", function() {
 			return {
@@ -18,7 +18,15 @@ frappe.ui.form.on("Purchase Receipt", {
 					"purchase_receipt": frm.doc.name
 				}
 			}
-		})
+		});
+
+		frm.set_query("expense_account", "items", function() {
+			return {
+				query: "erpnext.controllers.queries.get_expense_account",
+				filters: {'company': frm.doc.company}
+			}
+		});
+
 	},
 	onload: function(frm) {
 		erpnext.queries.setup_queries(frm, "Warehouse", function() {

erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json

@@ -4,6 +4,7 @@
  "doctype": "DocType",
  "document_type": "Document",
  "editable_grid": 1,
+ "engine": "InnoDB",
  "field_order": [
   "barcode",
   "section_break_2",
@@ -78,6 +79,10 @@
   "batch_no",
   "column_break_48",
   "rejected_serial_no",
+  "section_break_50",
+  "project",
+  "expense_account",
+  "cost_center",
   "col_break5",
   "allow_zero_valuation_rate",
   "bom",
@@ -771,18 +776,17 @@
    "label": "Material Request Item"
   },
   {
-   "fieldname": "accounting_dimensions_section",
+   "fieldname": "expense_account",
-   "fieldtype": "Section Break",
+   "fieldtype": "Link",
-   "label": "Accounting Dimensions"
+   "hidden": 1,
-  },
+   "label": "Expense Account",
-  {
+   "options": "Account",
-   "fieldname": "dimension_col_break",
+   "read_only": 1
-   "fieldtype": "Column Break"
   }
  ],
  "idx": 1,
  "istable": 1,
- "modified": "2019-05-25 22:01:46.674368",
+ "modified": "2019-05-30 18:09:21.648599",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Purchase Receipt Item",