Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
mbauskar 2017-06-22 17:00:25 +05:30
commit bbe9bccc1a
6 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

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

4
erpnext/accounts/page/pos/pos.js
View File

@ -1484,7 +1484,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
print_dialog: function () { print_dialog: function () {
var me = this; var me = this;
this.frappe.msgprint = frappe.msgprint( this.msgprint = frappe.msgprint(
`<a class="btn btn-primary print_doc" `<a class="btn btn-primary print_doc"
style="margin-right: 5px;">${__('Print')}</a> style="margin-right: 5px;">${__('Print')}</a>
<a class="btn btn-default new_doc">${__('New')}</a>`); <a class="btn btn-default new_doc">${__('New')}</a>`);
@ -1495,7 +1495,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
}) })
$('.new_doc').click(function () { $('.new_doc').click(function () {
me.frappe.msgprint.hide() me.msgprint.hide()
me.make_new_cart() me.make_new_cart()
}) })
}, },

2
erpnext/crm/doctype/lead/lead.json
View File

@ -1144,7 +1144,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2017-06-13 14:29:12.567700", "modified": "2017-06-22 14:29:12.700000",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "CRM", "module": "CRM",
"name": "Lead", "name": "Lead",

3
erpnext/patches.txt
View File

@ -405,4 +405,5 @@ erpnext.patches.v8_0.move_account_head_from_account_to_warehouse_for_inventory
erpnext.patches.v8_0.change_in_words_varchar_length erpnext.patches.v8_0.change_in_words_varchar_length
erpnext.patches.v8_0.create_domain_docs #16-05-2017 erpnext.patches.v8_0.create_domain_docs #16-05-2017
erpnext.patches.v8_0.update_sales_cost_in_project erpnext.patches.v8_0.update_sales_cost_in_project
erpnext.patches.v8_0.save_system_settings erpnext.patches.v8_0.save_system_settings
erpnext.patches.v8_1.delete_deprecated_reports

0
erpnext/patches/v8_1/__init__.py Normal file
View File

15
erpnext/patches/v8_1/delete_deprecated_reports.py Normal file
View File

@ -0,0 +1,15 @@
# Copyright (c) 2017, Frappe and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
def execute():
""" delete deprecated reports """
reports = ["Monthly Salary Register", "Customer Addresses And Contacts",
"Supplier Addresses And Contacts"]
for report in reports:
if frappe.db.exists("Report", report):
frappe.delete_doc("Report", report, ignore_permissions=True)