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

Merge branch 'staging-fixes' into staging

Browse Source
This commit is contained in:
Ameya Shenoy 2018-10-04 13:14:29 +00:00
commit c4ebbd1322
No known key found for this signature in database
GPG Key ID: AC016A555657D0A3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/hooks.py
View File

@ -12,7 +12,7 @@ app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext" source_link = "https://github.com/frappe/erpnext"
develop_version = '11.x.x-develop' develop_version = '11.x.x-develop'
staging_version = '11.0.3-beta.3' staging_version = '11.0.3-beta.4'
error_report_email = "support@erpnext.com" error_report_email = "support@erpnext.com"

2
erpnext/setup/setup_wizard/operations/install_fixtures.py
View File

@ -320,7 +320,7 @@ def add_sale_stages():
{"doctype": "Sales Stage", "stage_name": _("Proposal/Price Quote")}, {"doctype": "Sales Stage", "stage_name": _("Proposal/Price Quote")},
{"doctype": "Sales Stage", "stage_name": _("Negotiation/Review")} {"doctype": "Sales Stage", "stage_name": _("Negotiation/Review")}
] ]
make_fixture_records(records) make_fixture_records(records)
def make_fixture_records(records): def make_fixture_records(records):
from frappe.modules import scrub from frappe.modules import scrub