From 773e686fb1875b5bfeb823a637c860fc70d82a6b Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 26 Sep 2017 12:41:43 +0530 Subject: [PATCH 1/5] change log for version 9 --- erpnext/change_log/v9/v9_0_0.md | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/erpnext/change_log/v9/v9_0_0.md b/erpnext/change_log/v9/v9_0_0.md index fb6ae61e07..5d91ea9f4e 100644 --- a/erpnext/change_log/v9/v9_0_0.md +++ b/erpnext/change_log/v9/v9_0_0.md @@ -1,4 +1,4 @@ -#### POS +- POS - Online & Offline - Now user has an option to enable or disable Offline POS mode from POS Settings - Provision to select the Item's serial number from the dropdown while adding item in the cart - Indicator for stock availability in Online POS Mode. @@ -6,3 +6,25 @@ #### Subscription - Setup recurring documents using **Subscription** - User can schedule the subscription for doctypes other than Sales Invoice, Purchase Invoice etc. + +#### Healthcare Domain +- Clinic / Practice Management + - Patient + - Physician, Physician scheduling + - Appointment + - Vital Signs + - Consultation + - Medical Code Standards + - Patient Medical Record +- Laboratory + - Sample Collection + - Lab Test +- Patient Portal + +#### School Fees Management +- Fee Structure +- Fee Schedule +- Payment against Fees + +#### Setup Wizard +- Broken into 2 parts with a fresh looks \ No newline at end of file From ada8ba96b31ca144a993d5557d3144227194a333 Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Tue, 26 Sep 2017 13:07:24 +0530 Subject: [PATCH 2/5] [setup] remove translations from action name (#10911) --- erpnext/patches.txt | 2 +- .../v8_9/add_setup_progress_actions.py | 20 +++++++++---------- .../setup/setup_wizard/install_fixtures.py | 20 +++++++++---------- erpnext/utilities/user_progress.py | 18 ++++++++--------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 4b0c538f89..19d713e5c7 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -436,7 +436,7 @@ erpnext.patches.v8_7.add_more_gst_fields erpnext.patches.v8_7.fix_purchase_receipt_status erpnext.patches.v8_6.rename_bom_update_tool erpnext.patches.v8_7.set_offline_in_pos_settings #11-09-17 -erpnext.patches.v8_9.add_setup_progress_actions #08-09-2017 +erpnext.patches.v8_9.add_setup_progress_actions #08-09-2017 #26-09-2017 erpnext.patches.v8_9.rename_company_sales_target_field erpnext.patches.v8_8.set_bom_rate_as_per_uom erpnext.patches.v9_0.remove_subscription_module diff --git a/erpnext/patches/v8_9/add_setup_progress_actions.py b/erpnext/patches/v8_9/add_setup_progress_actions.py index 97d2d1450a..dbd0face7b 100644 --- a/erpnext/patches/v8_9/add_setup_progress_actions.py +++ b/erpnext/patches/v8_9/add_setup_progress_actions.py @@ -9,27 +9,27 @@ def execute(): frappe.reload_doc("setup", "doctype", "setup_progress_action") actions = [ - {"action_name": _("Add Company"), "action_doctype": "Company", "min_doc_count": 1, "is_completed": 1, + {"action_name": "Add Company", "action_doctype": "Company", "min_doc_count": 1, "is_completed": 1, "domains": '[]' }, - {"action_name": _("Set Sales Target"), "action_doctype": "Company", "min_doc_count": 99, + {"action_name": "Set Sales Target", "action_doctype": "Company", "min_doc_count": 99, "action_document": frappe.defaults.get_defaults().get("company") or '', "action_field": "monthly_sales_target", "is_completed": 0, "domains": '["Manufacturing", "Services", "Retail", "Distribution"]' }, - {"action_name": _("Add Customers"), "action_doctype": "Customer", "min_doc_count": 1, "is_completed": 0, + {"action_name": "Add Customers", "action_doctype": "Customer", "min_doc_count": 1, "is_completed": 0, "domains": '["Manufacturing", "Services", "Retail", "Distribution"]' }, - {"action_name": _("Add Suppliers"), "action_doctype": "Supplier", "min_doc_count": 1, "is_completed": 0, + {"action_name": "Add Suppliers", "action_doctype": "Supplier", "min_doc_count": 1, "is_completed": 0, "domains": '["Manufacturing", "Services", "Retail", "Distribution"]' }, - {"action_name": _("Add Products"), "action_doctype": "Item", "min_doc_count": 1, "is_completed": 0, + {"action_name": "Add Products", "action_doctype": "Item", "min_doc_count": 1, "is_completed": 0, "domains": '["Manufacturing", "Services", "Retail", "Distribution"]' }, - {"action_name": _("Add Programs"), "action_doctype": "Program", "min_doc_count": 1, "is_completed": 0, + {"action_name": "Add Programs", "action_doctype": "Program", "min_doc_count": 1, "is_completed": 0, "domains": '["Education"]' }, - {"action_name": _("Add Instructors"), "action_doctype": "Instructor", "min_doc_count": 1, "is_completed": 0, + {"action_name": "Add Instructors", "action_doctype": "Instructor", "min_doc_count": 1, "is_completed": 0, "domains": '["Education"]' }, - {"action_name": _("Add Courses"), "action_doctype": "Course", "min_doc_count": 1, "is_completed": 0, + {"action_name": "Add Courses", "action_doctype": "Course", "min_doc_count": 1, "is_completed": 0, "domains": '["Education"]' }, - {"action_name": _("Add Rooms"), "action_doctype": "Room", "min_doc_count": 1, "is_completed": 0, + {"action_name": "Add Rooms", "action_doctype": "Room", "min_doc_count": 1, "is_completed": 0, "domains": '["Education"]' }, - {"action_name": _("Add Users"), "action_doctype": "User", "min_doc_count": 4, "is_completed": 0, + {"action_name": "Add Users", "action_doctype": "User", "min_doc_count": 4, "is_completed": 0, "domains": '[]' } ] diff --git a/erpnext/setup/setup_wizard/install_fixtures.py b/erpnext/setup/setup_wizard/install_fixtures.py index 67d7e932b8..e6a4a81959 100644 --- a/erpnext/setup/setup_wizard/install_fixtures.py +++ b/erpnext/setup/setup_wizard/install_fixtures.py @@ -23,27 +23,27 @@ def install(country=None): # Setup Progress {'doctype': "Setup Progress", "actions": [ - {"action_name": _("Add Company"), "action_doctype": "Company", "min_doc_count": 1, "is_completed": 1, + {"action_name": "Add Company", "action_doctype": "Company", "min_doc_count": 1, "is_completed": 1, "domains": '[]' }, - {"action_name": _("Set Sales Target"), "action_doctype": "Company", "min_doc_count": 99, + {"action_name": "Set Sales Target", "action_doctype": "Company", "min_doc_count": 99, "action_document": frappe.defaults.get_defaults().get("company") or '', "action_field": "monthly_sales_target", "is_completed": 0, "domains": '["Manufacturing", "Services", "Retail", "Distribution"]' }, - {"action_name": _("Add Customers"), "action_doctype": "Customer", "min_doc_count": 1, "is_completed": 0, + {"action_name": "Add Customers", "action_doctype": "Customer", "min_doc_count": 1, "is_completed": 0, "domains": '["Manufacturing", "Services", "Retail", "Distribution"]' }, - {"action_name": _("Add Suppliers"), "action_doctype": "Supplier", "min_doc_count": 1, "is_completed": 0, + {"action_name": "Add Suppliers", "action_doctype": "Supplier", "min_doc_count": 1, "is_completed": 0, "domains": '["Manufacturing", "Services", "Retail", "Distribution"]' }, - {"action_name": _("Add Products"), "action_doctype": "Item", "min_doc_count": 1, "is_completed": 0, + {"action_name": "Add Products", "action_doctype": "Item", "min_doc_count": 1, "is_completed": 0, "domains": '["Manufacturing", "Services", "Retail", "Distribution"]' }, - {"action_name": _("Add Programs"), "action_doctype": "Program", "min_doc_count": 1, "is_completed": 0, + {"action_name": "Add Programs", "action_doctype": "Program", "min_doc_count": 1, "is_completed": 0, "domains": '["Education"]' }, - {"action_name": _("Add Instructors"), "action_doctype": "Instructor", "min_doc_count": 1, "is_completed": 0, + {"action_name": "Add Instructors", "action_doctype": "Instructor", "min_doc_count": 1, "is_completed": 0, "domains": '["Education"]' }, - {"action_name": _("Add Courses"), "action_doctype": "Course", "min_doc_count": 1, "is_completed": 0, + {"action_name": "Add Courses", "action_doctype": "Course", "min_doc_count": 1, "is_completed": 0, "domains": '["Education"]' }, - {"action_name": _("Add Rooms"), "action_doctype": "Room", "min_doc_count": 1, "is_completed": 0, + {"action_name": "Add Rooms", "action_doctype": "Room", "min_doc_count": 1, "is_completed": 0, "domains": '["Education"]' }, - {"action_name": _("Add Users"), "action_doctype": "User", "min_doc_count": 4, "is_completed": 0, + {"action_name": "Add Users", "action_doctype": "User", "min_doc_count": 4, "is_completed": 0, "domains": '[]' } ]}, diff --git a/erpnext/utilities/user_progress.py b/erpnext/utilities/user_progress.py index 6a2ec4b483..250951159a 100644 --- a/erpnext/utilities/user_progress.py +++ b/erpnext/utilities/user_progress.py @@ -20,7 +20,7 @@ def get_slide_settings(): # Initial state of slides return [ frappe._dict( - action_name=_('Add Company'), + action_name='Add Company', title=_("Setup Company") if domain != 'Education' else _("Setup Institution"), help=_('Setup your ' + ('company' if domain != 'Education' else 'institution') + ' and brand.'), # image_src="/assets/erpnext/images/illustrations/shop.jpg", @@ -58,7 +58,7 @@ def get_slide_settings(): ] ), frappe._dict( - action_name=_('Add Customers'), + action_name='Add Customers', domains=('Manufacturing', 'Services', 'Retail', 'Distribution'), title=_("Add Customers"), help=_("List a few of your customers. They could be organizations or individuals."), @@ -82,7 +82,7 @@ def get_slide_settings(): ] ), frappe._dict( - action_name=_('Add Suppliers'), + action_name='Add Suppliers', domains=('Manufacturing', 'Services', 'Retail', 'Distribution'), icon="fa fa-group", title=_("Your Suppliers"), @@ -111,7 +111,7 @@ def get_slide_settings(): ] ), frappe._dict( - action_name=_('Add Products'), + action_name='Add Products', domains=['Manufacturing', 'Services', 'Retail', 'Distribution'], icon="fa fa-barcode", title=_("Your Products or Services"), @@ -142,7 +142,7 @@ def get_slide_settings(): # School slides begin frappe._dict( - action_name=_('Add Programs'), + action_name='Add Programs', domains=("Education"), title=_("Program"), help=_("Example: Masters in Computer Science"), @@ -163,7 +163,7 @@ def get_slide_settings(): ), frappe._dict( - action_name=_('Add Courses'), + action_name='Add Courses', domains=["Education"], title=_("Course"), help=_("Example: Basic Mathematics"), @@ -183,7 +183,7 @@ def get_slide_settings(): ] ), frappe._dict( - action_name=_('Add Instructors'), + action_name='Add Instructors', domains=["Education"], title=_("Instructor"), help=_("People who teach at your organisation"), @@ -203,7 +203,7 @@ def get_slide_settings(): ] ), frappe._dict( - action_name=_('Add Rooms'), + action_name='Add Rooms', domains=["Education"], title=_("Room"), help=_("Classrooms/ Laboratories etc where lectures can be scheduled."), @@ -222,7 +222,7 @@ def get_slide_settings(): # School slides end frappe._dict( - action_name=_('Add Users'), + action_name='Add Users', title=_("Add Users"), help=_("Add users to your organization, other than yourself."), fields=[ From d4c2d77bba2152acf7bcf144a987559c3abe405a Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 26 Sep 2017 13:27:06 +0530 Subject: [PATCH 3/5] [fix] POS not working if user clicks on back button from form view (#10912) --- erpnext/selling/page/point_of_sale/point_of_sale.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.js b/erpnext/selling/page/point_of_sale/point_of_sale.js index d4b7eba107..ec1a292621 100644 --- a/erpnext/selling/page/point_of_sale/point_of_sale.js +++ b/erpnext/selling/page/point_of_sale/point_of_sale.js @@ -20,6 +20,10 @@ frappe.pages['point-of-sale'].on_page_load = function(wrapper) { }); }; +frappe.pages['point-of-sale'].refresh = function(wrapper) { + cur_frm = wrapper.pos.frm; +} + erpnext.pos.PointOfSale = class PointOfSale { constructor(wrapper) { this.wrapper = $(wrapper).find('.layout-main-section'); @@ -478,6 +482,8 @@ class POSCart { } update_taxes_and_totals() { + if (!this.frm.doc.taxes) { return; } + const currency = this.frm.doc.currency; this.frm.refresh_field('taxes'); From b0ba55e52fa6d9b12e4b00dd3ce0848e393d2fda Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 26 Sep 2017 15:56:47 +0530 Subject: [PATCH 4/5] Set bill no while making payment entry from purchase invoice --- erpnext/accounts/doctype/payment_entry/payment_entry.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index 31869fb99c..9d24261038 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -765,6 +765,7 @@ def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount= pe.append("references", { "reference_doctype": dt, "reference_name": dn, + "bill_no": doc.get("bill_no"), "due_date": doc.get("due_date"), "total_amount": grand_total, "outstanding_amount": outstanding_amount, From c0b4f0e81b0fcbb93ded697d341411bee3ac7df9 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 26 Sep 2017 16:29:12 +0600 Subject: [PATCH 5/5] bumped to version 9.0.0 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index f327404c5b..514e5b3df5 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -4,7 +4,7 @@ import inspect import frappe from erpnext.hooks import regional_overrides -__version__ = '8.11.6' +__version__ = '9.0.0' def get_default_company(user=None): '''Get default company for user'''