Merge branch 'develop'

[fix] Payment Reconciliation in multi-currency

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.4.1'
+__version__ = '6.4.3'

erpnext/accounts/doctype/fiscal_year/test_records.json

@@ -1,32 +1,38 @@
 [
  {
-  "doctype": "Fiscal Year", 
-  "year": "_Test Fiscal Year 2012", 
-  "year_end_date": "2012-12-31", 
+  "doctype": "Fiscal Year",
+  "year": "_Test Fiscal Year 2012",
+  "year_end_date": "2012-12-31",
   "year_start_date": "2012-01-01"
- }, 
+ },
  {
-  "doctype": "Fiscal Year", 
-  "year": "_Test Fiscal Year 2013", 
-  "year_end_date": "2013-12-31", 
+  "doctype": "Fiscal Year",
+  "year": "_Test Fiscal Year 2013",
+  "year_end_date": "2013-12-31",
   "year_start_date": "2013-01-01"
- }, 
+ },
  {
-  "doctype": "Fiscal Year", 
-  "year": "_Test Fiscal Year 2014", 
-  "year_end_date": "2014-12-31", 
+  "doctype": "Fiscal Year",
+  "year": "_Test Fiscal Year 2014",
+  "year_end_date": "2014-12-31",
   "year_start_date": "2014-01-01"
- }, 
+ },
  {
-  "doctype": "Fiscal Year", 
-  "year": "_Test Fiscal Year 2015", 
-  "year_end_date": "2015-12-31", 
+  "doctype": "Fiscal Year",
+  "year": "_Test Fiscal Year 2015",
+  "year_end_date": "2015-12-31",
   "year_start_date": "2015-01-01"
- }, 
+ },
  {
-  "doctype": "Fiscal Year", 
-  "year": "_Test Fiscal Year 2016", 
-  "year_end_date": "2016-12-31", 
+  "doctype": "Fiscal Year",
+  "year": "_Test Fiscal Year 2016",
+  "year_end_date": "2016-12-31",
   "year_start_date": "2016-01-01"
+ },
+ {
+  "doctype": "Fiscal Year",
+  "year": "_Test Fiscal Year 2017",
+  "year_end_date": "2017-12-31",
+  "year_start_date": "2017-01-01"
  }
-]
+]

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js

@@ -74,21 +74,7 @@ erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.ext
 			doc: me.frm.doc,
 			method: 'get_unreconciled_entries',
 			callback: function(r, rt) {
-				var invoices = [];
-
-				$.each(me.frm.doc.invoices || [], function(i, row) {
-					if (row.invoice_number && !inList(invoices, row.invoice_number))
-						invoices.push(row.invoice_type + " | " + row.invoice_number);
-				});
-
-				frappe.meta.get_docfield("Payment Reconciliation Payment", "invoice_number",
-					me.frm.doc.name).options = invoices.join("\n");
-
-				$.each(me.frm.doc.payments || [], function(i, p) {
-					if(!inList(invoices, cstr(p.invoice_number))) p.invoice_number = null;
-				});
-
-				refresh_field("payments");
+				me.set_invoice_options();
 			}
 		});
 
@@ -98,8 +84,29 @@ erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.ext
 		var me = this;
 		return this.frm.call({
 			doc: me.frm.doc,
-			method: 'reconcile'
+			method: 'reconcile',
+			callback: function(r, rt) {
+				me.set_invoice_options();
+			}
 		});
+	},
+	
+	set_invoice_options: function() {
+		var invoices = [];
+
+		$.each(me.frm.doc.invoices || [], function(i, row) {
+			if (row.invoice_number && !inList(invoices, row.invoice_number))
+				invoices.push(row.invoice_type + " | " + row.invoice_number);
+		});
+
+		frappe.meta.get_docfield("Payment Reconciliation Payment", "invoice_number",
+			me.frm.doc.name).options = invoices.join("\n");
+
+		$.each(me.frm.doc.payments || [], function(i, p) {
+			if(!inList(invoices, cstr(p.invoice_number))) p.invoice_number = null;
+		});
+
+		refresh_field("payments");
 	}
 
 });

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py

@@ -3,11 +3,8 @@
 
 from __future__ import unicode_literals
 import frappe
-
 from frappe.utils import flt
-
 from frappe import msgprint, _
-
 from frappe.model.document import Document
 
 class PaymentReconciliation(Document):
@@ -17,7 +14,8 @@ class PaymentReconciliation(Document):
 
 	def get_jv_entries(self):
 		self.check_mandatory_to_fetch()
-		dr_or_cr = "credit" if self.party_type == "Customer" else "debit"
+		dr_or_cr = "credit_in_account_currency" if self.party_type == "Customer" \
+			else "debit_in_account_currency"
 
 		cond = self.check_condition(dr_or_cr)
 
@@ -68,7 +66,7 @@ class PaymentReconciliation(Document):
 	def get_invoice_entries(self):
 		#Fetch JVs, Sales and Purchase Invoices for 'invoices' to reconcile against
 		non_reconciled_invoices = []
-		dr_or_cr = "debit" if self.party_type == "Customer" else "credit"
+		dr_or_cr = "debit_in_account_currency" if self.party_type == "Customer" else "credit_in_account_currency"
 		cond = self.check_condition(dr_or_cr)
 
 		invoice_list = frappe.db.sql("""
@@ -106,13 +104,15 @@ class PaymentReconciliation(Document):
 					and account = %(account)s and {0} > 0
 					and against_voucher_type = %(against_voucher_type)s
 					and ifnull(against_voucher, '') = %(against_voucher)s
-			""".format("credit" if self.party_type == "Customer" else "debit"), {
-				"party_type": self.party_type,
-				"party": self.party,
-				"account": self.receivable_payable_account,
-				"against_voucher_type": d.voucher_type,
-				"against_voucher": d.voucher_no
-			})
+			""".format("credit_in_account_currency" if self.party_type == "Customer" 
+				else "debit_in_account_currency"), {
+					"party_type": self.party_type,
+					"party": self.party,
+					"account": self.receivable_payable_account,
+					"against_voucher_type": d.voucher_type,
+					"against_voucher": d.voucher_no
+				}
+			)
 
 			payment_amount = payment_amount[0][0] if payment_amount else 0
 
@@ -141,12 +141,14 @@ class PaymentReconciliation(Document):
 
 	def reconcile(self, args):
 		for e in self.get('payments'):
+			e.invoice_type = None
 			if e.invoice_number and " | " in e.invoice_number:
 				e.invoice_type, e.invoice_number = e.invoice_number.split(" | ")
 
 		self.get_invoice_entries()
 		self.validate_invoice()
-		dr_or_cr = "credit" if self.party_type == "Customer" else "debit"
+		dr_or_cr = "credit_in_account_currency" if self.party_type == "Customer" \
+			else "debit_in_account_currency"
 		lst = []
 		for e in self.get('payments'):
 			if e.invoice_number and e.allocated_amount:

erpnext/accounts/doctype/payment_tool/payment_tool.js

@@ -141,7 +141,10 @@ frappe.ui.form.on("Payment Tool", "get_outstanding_vouchers", function(frm) {
 					c.against_voucher_no = d.voucher_no;
 					c.total_amount = d.invoice_amount;
 					c.outstanding_amount = d.outstanding_amount;
-					c.payment_amount = d.outstanding_amount;
+
+					if (frm.doc.set_payment_amount) {
+						c.payment_amount = d.outstanding_amount;
+					}
 				});
 			}
 			refresh_field("vouchers");

erpnext/accounts/doctype/payment_tool/payment_tool.json

@@ -185,6 +185,28 @@
    "set_only_once": 0, 
    "unique": 0
   }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "set_payment_amount", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Set Payment Amount = Outstanding Amount", 
+   "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, 
@@ -474,7 +496,7 @@
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
- "modified": "2015-08-31 18:58:21.813054", 
+ "modified": "2015-10-01 09:43:24.199025", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Tool", 

erpnext/accounts/report/accounts_receivable/accounts_receivable.py

@@ -40,6 +40,13 @@ class ReceivablePayableReport(object):
 
 		columns += [_("Age (Days)") + "::80"]
 
+		if not "range1" in self.filters:
+			self.filters["range1"] = "30"
+		if not "range2" in self.filters:
+			self.filters["range2"] = "60"
+		if not "range3" in self.filters:
+			self.filters["range3"] = "90"
+
 		for label in ("0-{range1}".format(**self.filters),
 			"{range1}-{range2}".format(**self.filters),
 			"{range2}-{range3}".format(**self.filters),
@@ -75,9 +82,9 @@ class ReceivablePayableReport(object):
 		voucher_details = self.get_voucher_details(args.get("party_type"))
 
 		future_vouchers = self.get_entries_after(self.filters.report_date, args.get("party_type"))
-		
+
 		company_currency = frappe.db.get_value("Company", self.filters.get("company"), "default_currency")
-		
+
 		data = []
 		for gle in self.get_entries_till(self.filters.report_date, args.get("party_type")):
 			if self.is_receivable_or_payable(gle, dr_or_cr, future_vouchers):
@@ -117,7 +124,7 @@ class ReceivablePayableReport(object):
 						row += [self.get_territory(gle.party)]
 					if args.get("party_type") == "Supplier":
 						row += [self.get_supplier_type(gle.party)]
-						
+
 					if self.filters.get(scrub(args.get("party_type"))):
 						row.append(gle.account_currency)
 					else:
@@ -209,7 +216,7 @@ class ReceivablePayableReport(object):
 			self.gl_entries = frappe.db.sql("""select name, posting_date, account, party_type, party,
 				voucher_type, voucher_no, against_voucher_type, against_voucher, account_currency, remarks, {0}
 				from `tabGL Entry`
-				where docstatus < 2 and party_type=%s and ifnull(party, '') != '' {1} 
+				where docstatus < 2 and party_type=%s and ifnull(party, '') != '' {1}
 				order by posting_date, party"""
 				.format(select_fields, conditions), values, as_dict=True)
 

erpnext/accounts/report/general_ledger/general_ledger.py

@@ -161,40 +161,26 @@ def get_data_with_opening_closing(filters, account_details, gl_entries):
 		for acc, acc_dict in gle_map.items():
 			if acc_dict.entries:
 				# Opening for individual ledger, if grouped by account
-				if filters.get("group_by_account"):
-					data.append(get_balance_row(_("Opening"), acc_dict.opening,
-						acc_dict.opening_in_account_currency))
+				data.append(get_balance_row(_("Opening"), acc_dict.opening,
+					acc_dict.opening_in_account_currency))
 
 				data += acc_dict.entries
 
 				# Totals and closing for individual ledger, if grouped by account
-				if filters.get("group_by_account"):
-					account_closing = acc_dict.opening + acc_dict.total_debit - acc_dict.total_credit
-					account_closing_in_account_currency = acc_dict.opening_in_account_currency \
-						+ acc_dict.total_debit_in_account_currency - acc_dict.total_credit_in_account_currency
+				account_closing = acc_dict.opening + acc_dict.total_debit - acc_dict.total_credit
+				account_closing_in_account_currency = acc_dict.opening_in_account_currency \
+					+ acc_dict.total_debit_in_account_currency - acc_dict.total_credit_in_account_currency
 
-					data += [{"account": "'" + _("Totals") + "'", "debit": acc_dict.total_debit,
-						"credit": acc_dict.total_credit},
-						get_balance_row(_("Closing (Opening + Totals)"),
-							account_closing, account_closing_in_account_currency), {}]
+				data += [{"account": "'" + _("Totals") + "'", "debit": acc_dict.total_debit,
+					"credit": acc_dict.total_credit},
+					get_balance_row(_("Closing (Opening + Totals)"),
+						account_closing, account_closing_in_account_currency), {}]
 
 	else:
-		from_date, to_date = getdate(filters.from_date), getdate(filters.to_date)
-		opening_debit = opening_credit = 0.0
-
 		for gl in gl_entries:
-			if gl.posting_date < from_date:
-				opening_debit += flt(gl.debit, 3)
-				opening_credit += flt(gl.credit, 3)
-			else:
+			if gl.posting_date >= getdate(filters.from_date) and gl.posting_date <= getdate(filters.to_date):
 				data.append(gl)
 
-	if not (filters.get("account") or filters.get("party")):
-		data = [{
-			"account": "'" + _("Opening") + "'",
-			"debit": opening_debit,
-			"credit": opening_credit
-		}] + data
 
 	# Total debit and credit between from and to date
 	if total_debit or total_credit:

erpnext/accounts/utils.py

@@ -198,6 +198,8 @@ def update_against_doc(d, jv_obj):
 	"""
 	jv_detail = jv_obj.get("accounts", {"name": d["voucher_detail_no"]})[0]
 	jv_detail.set(d["dr_or_cr"], d["allocated_amt"])
+	jv_detail.set('debit' if d['dr_or_cr']=='debit_in_account_currency' else 'credit', 
+		d["allocated_amt"]*flt(jv_detail.exchange_rate))
 
 	original_reference_type = jv_detail.reference_type
 	original_reference_name = jv_detail.reference_name
@@ -210,6 +212,9 @@ def update_against_doc(d, jv_obj):
 			select cost_center, balance, against_account, is_advance, account_type, exchange_rate
 			from `tabJournal Entry Account` where name = %s
 		""", d['voucher_detail_no'], as_dict=True)
+		
+		amount_in_account_currency = flt(d['unadjusted_amt']) - flt(d['allocated_amt'])
+		amount_in_company_currency = amount_in_account_currency * flt(jvd[0]['exchange_rate'])
 
 		# new entry with balance amount
 		ch = jv_obj.append("accounts")
@@ -220,8 +225,14 @@ def update_against_doc(d, jv_obj):
 		ch.party = d["party"]
 		ch.cost_center = cstr(jvd[0]["cost_center"])
 		ch.balance = flt(jvd[0]["balance"])
-		ch.set(d['dr_or_cr'], flt(d['unadjusted_amt']) - flt(d['allocated_amt']))
-		ch.set(d['dr_or_cr']== 'debit' and 'credit' or 'debit', 0)
+		
+		ch.set(d['dr_or_cr'], amount_in_account_currency)
+		ch.set('debit' if d['dr_or_cr']=='debit_in_account_currency' else 'credit', amount_in_company_currency)
+		
+		ch.set('credit_in_account_currency' if d['dr_or_cr']== 'debit_in_account_currency' 
+			else 'debit_in_account_currency', 0)
+		ch.set('credit' if d['dr_or_cr']== 'debit_in_account_currency' else 'debit', 0)
+		
 		ch.against_account = cstr(jvd[0]["against_account"])
 		ch.reference_type = original_reference_type
 		ch.reference_name = original_reference_name

erpnext/controllers/accounts_controller.py

@@ -428,7 +428,10 @@ class AccountsController(TransactionBase):
 			if party_type and party:
 				party_account_currency = get_party_account_currency(party_type, party, self.company)
 
-				if party_account_currency != self.company_currency and self.currency != party_account_currency:
+				if (party_account_currency
+					and party_account_currency != self.company_currency
+					and self.currency != party_account_currency):
+
 					frappe.throw(_("Accounting Entry for {0}: {1} can only be made in currency: {2}")
 						.format(party_type, party, party_account_currency), InvalidCurrency)
 

erpnext/crm/doctype/lead/lead.py

@@ -58,12 +58,12 @@ class Lead(SellingController):
 	def check_email_id_is_unique(self):
 		if self.email_id:
 			# validate email is unique
-			email_list = frappe.db.sql("""select name from tabLead where email_id=%s""",
-				self.email_id)
-			email_list = [e[0] for e in email_list if e[0]!=self.name]
-			if len(email_list) > 1:
-				frappe.throw(_("Email id must be unique, already exists for {0}").format(comma_and(email_list)),
-					frappe.DuplicateEntryError)
+			duplicate_leads = frappe.db.sql_list("""select name from tabLead 
+				where email_id=%s and name!=%s""", (self.email_id, self.name))
+
+			if duplicate_leads:
+				frappe.throw(_("Email id must be unique, already exists for {0}")
+					.format(comma_and(duplicate_leads)), frappe.DuplicateEntryError)
 
 	def on_trash(self):
 		frappe.db.sql("""update `tabIssue` set lead='' where lead=%s""",

erpnext/hooks.py

@@ -29,7 +29,7 @@ blogs.
 """
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "6.4.1"
+app_version = "6.4.3"
 github_link = "https://github.com/frappe/erpnext"
 
 error_report_email = "support@erpnext.com"

erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py

@@ -5,6 +5,7 @@ from __future__ import unicode_literals
 import frappe
 from frappe.utils import cstr, cint
 from frappe import msgprint, _
+from calendar import monthrange
 
 def execute(filters=None):
 	if not filters: filters = {}
@@ -73,23 +74,17 @@ def get_conditions(filters):
 		msgprint(_("Please select month and year"), raise_exception=1)
 
 	filters["month"] = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov",
-		"Dec"].index(filters["month"]) + 1
+		"Dec"].index(filters.month) + 1
 
-	from frappe.model.document import Document
-	fiscal_years = frappe.get_doc("Fiscal Year",filters["fiscal_year"])
-	import datetime
-	year_start = fiscal_years.year_start_date.strftime("%Y")
-	year_end = fiscal_years.year_end_date.strftime("%Y")
-	dt_test = datetime.datetime.strptime(year_end + "-" + str(100+int(filters["month"]))[2:3] + "-01", "%Y-%m-%d")
-	date_test = datetime.date(dt_test.year, dt_test.month, dt_test.day)
-	if date_test > fiscal_years.year_end_date:
-		year_target = year_start
+	year_start_date, year_end_date = frappe.db.get_value("Fiscal Year", filters.fiscal_year, 
+		["year_start_date", "year_end_date"])
+		
+	if filters.month >= year_start_date.strftime("%m"):
+		year = year_start_date.strftime("%Y")
 	else:
-		year_target = year_end
-
-	from calendar import monthrange
-	filters["total_days_in_month"] = monthrange(cint(year_target),
-		filters["month"])[1]
+		year = year_end_date.strftime("%Y")
+	
+	filters["total_days_in_month"] = monthrange(cint(year), filters.month)[1]
 
 	conditions = " and month(att_date) = %(month)s and fiscal_year = %(fiscal_year)s"
 

erpnext/selling/doctype/customer/customer.js

@@ -17,7 +17,6 @@ frappe.ui.form.on("Customer", "refresh", function(frm) {
 	}
 
 	var grid = cur_frm.get_field("sales_team").grid;
-	grid.set_column_disp("allocated_percentage", false);
 	grid.set_column_disp("allocated_amount", false);
 	grid.set_column_disp("incentives", false);
 
@@ -101,11 +100,11 @@ cur_frm.fields_dict['accounts'].grid.get_field('account').get_query = function(d
 		'company': d.company,
 		"is_group": 0
 	};
-	
+
 	if(doc.party_account_currency) {
 		$.extend(filters, {"account_currency": doc.party_account_currency});
 	}
-		
+
 	return {
 		filters: filters
 	}

erpnext/utilities/address_and_contact.py

@@ -53,13 +53,23 @@ def get_permission_query_conditions(doctype):
 	if not links.get("not_permitted_links"):
 		# when everything is permitted, don't add additional condition
 		return ""
+		
+	elif not links.get("permitted_links"):
+		conditions = []
+		
+		# when everything is not permitted
+		for df in links.get("not_permitted_links"):
+			# like ifnull(customer, '')='' and ifnull(supplier, '')=''
+			conditions.append("ifnull(`tab{doctype}`.`{fieldname}`, '')=''".format(doctype=doctype, fieldname=df.fieldname))
+			
+		return "( " + " and ".join(conditions) + " )"
 
 	else:
 		conditions = []
 
 		for df in links.get("permitted_links"):
 			# like ifnull(customer, '')!='' or ifnull(supplier, '')!=''
-			conditions.append("ifnull(`tab{doctype}`.`{fieldname}`, '')!=''".format(doctype=doctype, fieldname=df.fieldname))
+			conditions.append("ifnull(`tab{doctype}`.`{fieldname}`, '')!=''".format(doctype=doctype, fieldname=df.fieldname))			
 
 		return "( " + " or ".join(conditions) + " )"
 

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "6.4.1"
+version = "6.4.3"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()