Merge branch 'master' into develop

erpnext/__init__.py

@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = '8.0.46'
+__version__ = '8.0.47'
 
 
 def get_default_company(user=None):

erpnext/accounts/doctype/sales_invoice/pos.py

@@ -198,7 +198,7 @@ def get_contacts(customers):
 		customers = [frappe._dict({'name': customers})]
 
 	for data in customers:
-		contact = frappe.db.sql(""" select email_id, phone from `tabContact` 
+		contact = frappe.db.sql(""" select email_id, phone, mobile_no from `tabContact` 
 			where is_primary_contact =1 and name in
 			(select parent from `tabDynamic Link` where link_doctype = 'Customer' and link_name = %s
 			and parenttype = 'Contact')""", data.name, as_dict=1)
@@ -320,6 +320,7 @@ def make_invoice(doc_list={}, email_queue_list={}, customers_list={}):
 				si_doc = frappe.new_doc('Sales Invoice')
 				si_doc.offline_pos_name = name
 				si_doc.update(doc)
+				si_doc.set_posting_time = 1
 				si_doc.customer = get_customer_id(doc)
 				si_doc.due_date = doc.get('posting_date')
 				submit_invoice(si_doc, name, doc)

erpnext/accounts/page/pos/pos.js

@@ -717,7 +717,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 					item = this.get_item(item.value);
 					var searchtext =
 						Object.keys(item)
-							.filter(key => ['customer_name', 'customer_group', 'value', 'label', 'email_id', 'phone'].includes(key))
+							.filter(key => ['customer_name', 'customer_group', 'value', 'label', 'email_id', 'phone', 'mobile_no'].includes(key))
 							.map(key => item[key])
 							.join(" ")
 							.toLowerCase();
@@ -795,6 +795,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 				customer_group: c.customer_group,
 				territory: c.territory,
 				phone: contact ? contact["phone"] : '',
+				mobile_no: contact ? contact["mobile_no"] : '',
 				email_id: contact ? contact["email_id"] : ''
 			}
 		});

erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py

@@ -17,9 +17,11 @@ class AccountsReceivableSummary(ReceivablePayableReport):
 		if party_naming_by == "Naming Series":
 			columns += [ args.get("party_type") + " Name::140"]
 
+		credit_debit_label = _("Credit Note Amt") if args.get('party_type') == 'Customer' else _("Debit Note Amt")
 		columns += [
 			_("Total Invoiced Amt") + ":Currency/currency:140",
 			_("Total Paid Amt") + ":Currency/currency:140",
+			credit_debit_label + ":Currency/currency:140",
 			_("Total Outstanding Amt") + ":Currency/currency:160",
 			"0-" + str(self.filters.range1) + ":Currency/currency:100",
 			str(self.filters.range1) + "-" + str(self.filters.range2) + ":Currency/currency:100",
@@ -56,7 +58,7 @@ class AccountsReceivableSummary(ReceivablePayableReport):
 				row += [self.get_party_name(args.get("party_type"), party)]
 
 			row += [
-				party_dict.invoiced_amt, party_dict.paid_amt, party_dict.outstanding_amt,
+				party_dict.invoiced_amt, party_dict.paid_amt, party_dict.credit_amt, party_dict.outstanding_amt,
 				party_dict.range1, party_dict.range2, party_dict.range3, party_dict.range4,
 			]
 
@@ -77,6 +79,7 @@ class AccountsReceivableSummary(ReceivablePayableReport):
 				frappe._dict({
 					"invoiced_amt": 0,
 					"paid_amt": 0,
+					"credit_amt": 0,
 					"outstanding_amt": 0,
 					"range1": 0,
 					"range2": 0,
@@ -104,7 +107,7 @@ class AccountsReceivableSummary(ReceivablePayableReport):
 		if args.get("party_type") == "Supplier":
 			cols += ["bill_no", "bill_date"]
 
-		cols += ["invoiced_amt", "paid_amt",
+		cols += ["invoiced_amt", "paid_amt", "credit_amt",
 		"outstanding_amt", "age", "range1", "range2", "range3", "range4", "currency"]
 
 		if args.get("party_type") == "Supplier":

erpnext/templates/includes/projects/project_timesheets.html

@@ -5,7 +5,7 @@
 			<div class='col-xs-9'>
 				<span class="indicator {{ "blue" if timesheet.info.status=="Submitted" else "red" if timesheet.info.status=="Draft" else "darkgrey" }}" title="{{ timesheet.info.status }}"  > {{ timesheet.info.name }} </span> 
 				<div class="small text-muted item-timestamp">
-				{{ __("From") }} {{ frappe.format_date(timesheet.from_time) }} {{ __("to") }} {{ frappe.format_date(timesheet.to_time) }}
+				{{ _("From") }} {{ frappe.format_date(timesheet.from_time) }} {{ _("to") }} {{ frappe.format_date(timesheet.to_time) }}
 			</div>
 			</div>
 				<div class='col-xs-1 gravatar-top'>