Merge pull request #4088 from anandpdoshi/address-contact-permissions
Apply permissions on address and contact based on permissions of Customer, Supplier
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
index d95c3bf..8396ce5 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@@ -141,10 +141,7 @@
def reconcile(self, args):
for e in self.get('payments'):
- if not e.invoice_number:
- frappe.throw(_("Row {0}: Please select Invoice Number for reconcilation").format(e.idx))
-
- if " | " in e.invoice_number:
+ if e.invoice_number and " | " in e.invoice_number:
e.invoice_type, e.invoice_number = e.invoice_number.split(" | ")
self.get_invoice_entries()
diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
index f8146d1..ddb8236 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -286,7 +286,7 @@
"no_copy": 0,
"permlevel": 0,
"precision": "",
- "print_hide": 1,
+ "print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -309,7 +309,7 @@
"options": "image",
"permlevel": 0,
"precision": "",
- "print_hide": 0,
+ "print_hide": 1,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -909,7 +909,7 @@
"is_submittable": 0,
"issingle": 0,
"istable": 1,
- "modified": "2015-08-27 03:30:49.875635",
+ "modified": "2015-09-30 02:11:55.081524",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Entry Detail",