From ed37cef32a7a5a6bb16b8adef5af7d0b8f7c8063 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 9 Sep 2014 12:38:21 +0530 Subject: [PATCH] [refactor modules] --- .../job_applicant/get_job_applications.py | 2 +- erpnext/hr/doctype/salary_slip/salary_slip.py | 2 +- ...ix_naming_series_records_lost_by_reload.py | 2 +- ...custom_fields_for_india_specific_fields.py | 2 +- erpnext/patches/v4_0/import_country_codes.py | 2 +- .../v4_0/set_naming_series_property_setter.py | 2 +- .../patches/v4_2/add_currency_turkish_lira.py | 2 +- erpnext/selling/doctype/lead/get_leads.py | 2 +- .../doctype/backup_manager/backup_manager.py | 2 +- erpnext/setup/doctype/country/README.md | 1 - erpnext/setup/doctype/country/__init__.py | 1 - erpnext/setup/doctype/country/country.json | 107 ---------------- erpnext/setup/doctype/country/country.py | 10 -- erpnext/setup/doctype/country/test_country.py | 6 - .../setup/doctype/country/test_records.json | 6 - erpnext/setup/doctype/currency/README.md | 1 - erpnext/setup/doctype/currency/__init__.py | 1 - erpnext/setup/doctype/currency/currency.js | 9 -- erpnext/setup/doctype/currency/currency.json | 117 ------------------ erpnext/setup/doctype/currency/currency.py | 21 ---- .../setup/doctype/currency/test_currency.py | 7 -- .../setup/doctype/currency/test_records.json | 1 - .../doctype/email_digest/email_digest.py | 2 +- .../global_defaults/global_defaults.py | 2 +- .../doctype/naming_series/naming_series.py | 2 +- erpnext/setup/install.py | 33 ----- .../setup/page/setup_wizard/setup_wizard.py | 2 +- erpnext/stock/utils.py | 2 +- .../support/doctype/newsletter/newsletter.py | 2 +- .../support_email_settings.py | 2 +- .../support_ticket/get_support_mails.py | 4 +- 31 files changed, 18 insertions(+), 339 deletions(-) delete mode 100644 erpnext/setup/doctype/country/README.md delete mode 100644 erpnext/setup/doctype/country/__init__.py delete mode 100644 erpnext/setup/doctype/country/country.json delete mode 100644 erpnext/setup/doctype/country/country.py delete mode 100644 erpnext/setup/doctype/country/test_country.py delete mode 100644 erpnext/setup/doctype/country/test_records.json delete mode 100644 erpnext/setup/doctype/currency/README.md delete mode 100644 erpnext/setup/doctype/currency/__init__.py delete mode 100644 erpnext/setup/doctype/currency/currency.js delete mode 100644 erpnext/setup/doctype/currency/currency.json delete mode 100644 erpnext/setup/doctype/currency/currency.py delete mode 100644 erpnext/setup/doctype/currency/test_currency.py delete mode 100644 erpnext/setup/doctype/currency/test_records.json diff --git a/erpnext/hr/doctype/job_applicant/get_job_applications.py b/erpnext/hr/doctype/job_applicant/get_job_applications.py index e4a8d70cf5..f34f4818da 100644 --- a/erpnext/hr/doctype/job_applicant/get_job_applications.py +++ b/erpnext/hr/doctype/job_applicant/get_job_applications.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import frappe from frappe.utils import cstr, cint -from frappe.utils.email_lib.receive import POP3Mailbox +from frappe.email.receive import POP3Mailbox from frappe.core.doctype.communication.communication import _make class JobsMailbox(POP3Mailbox): diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py index 7c905a666c..638500b996 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/salary_slip.py @@ -185,7 +185,7 @@ class SalarySlip(TransactionBase): def send_mail_funct(self): - from frappe.utils.email_lib import sendmail + from frappe.email import sendmail receiver = frappe.db.get_value("Employee", self.employee, "company_email") if receiver: diff --git a/erpnext/patches/repair_tools/fix_naming_series_records_lost_by_reload.py b/erpnext/patches/repair_tools/fix_naming_series_records_lost_by_reload.py index 981ffd0c29..36fa277dea 100644 --- a/erpnext/patches/repair_tools/fix_naming_series_records_lost_by_reload.py +++ b/erpnext/patches/repair_tools/fix_naming_series_records_lost_by_reload.py @@ -7,7 +7,7 @@ import json import re from frappe.model.naming import make_autoname from frappe.utils import cint -from frappe.utils.email_lib import sendmail_to_system_managers +from frappe.email import sendmail_to_system_managers doctype_series_map = { 'Attendance': 'ATT-', diff --git a/erpnext/patches/v4_0/create_custom_fields_for_india_specific_fields.py b/erpnext/patches/v4_0/create_custom_fields_for_india_specific_fields.py index 9b07000554..5bca5e6962 100644 --- a/erpnext/patches/v4_0/create_custom_fields_for_india_specific_fields.py +++ b/erpnext/patches/v4_0/create_custom_fields_for_india_specific_fields.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import frappe -from frappe.core.doctype.custom_field.custom_field import create_custom_field_if_values_exist +from frappe.custom.doctype.custom_field.custom_field import create_custom_field_if_values_exist def execute(): frappe.reload_doc("stock", "doctype", "purchase_receipt") diff --git a/erpnext/patches/v4_0/import_country_codes.py b/erpnext/patches/v4_0/import_country_codes.py index 4d1177ed5d..e2e9f9d1f4 100644 --- a/erpnext/patches/v4_0/import_country_codes.py +++ b/erpnext/patches/v4_0/import_country_codes.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import frappe -from frappe.country_info import get_all +from frappe.geo.country_info import get_all from erpnext.setup.install import import_country_and_currency def execute(): diff --git a/erpnext/patches/v4_0/set_naming_series_property_setter.py b/erpnext/patches/v4_0/set_naming_series_property_setter.py index 7161492cfa..ffbfc24320 100644 --- a/erpnext/patches/v4_0/set_naming_series_property_setter.py +++ b/erpnext/patches/v4_0/set_naming_series_property_setter.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import frappe -from frappe.core.doctype.property_setter.property_setter import make_property_setter +from frappe.custom.doctype.property_setter.property_setter import make_property_setter doctype_series_map = { 'Attendance': 'ATT-', diff --git a/erpnext/patches/v4_2/add_currency_turkish_lira.py b/erpnext/patches/v4_2/add_currency_turkish_lira.py index f547661937..d768d58f3b 100644 --- a/erpnext/patches/v4_2/add_currency_turkish_lira.py +++ b/erpnext/patches/v4_2/add_currency_turkish_lira.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import frappe -from frappe.country_info import get_country_info +from frappe.geo.country_info import get_country_info from erpnext.setup.install import add_country_and_currency def execute(): diff --git a/erpnext/selling/doctype/lead/get_leads.py b/erpnext/selling/doctype/lead/get_leads.py index b765db6237..a79ca6010e 100644 --- a/erpnext/selling/doctype/lead/get_leads.py +++ b/erpnext/selling/doctype/lead/get_leads.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import frappe from frappe.utils import cstr, cint -from frappe.utils.email_lib.receive import POP3Mailbox +from frappe.email.receive import POP3Mailbox from frappe.core.doctype.communication.communication import _make def add_sales_communication(subject, content, sender, real_name, mail=None, diff --git a/erpnext/setup/doctype/backup_manager/backup_manager.py b/erpnext/setup/doctype/backup_manager/backup_manager.py index ff4e115077..99cae9aa75 100644 --- a/erpnext/setup/doctype/backup_manager/backup_manager.py +++ b/erpnext/setup/doctype/backup_manager/backup_manager.py @@ -57,7 +57,7 @@ def take_backups_gdrive(): send_email(False, "Google Drive", error_message) def send_email(success, service_name, error_status=None): - from frappe.utils.email_lib import sendmail + from frappe.email import sendmail if success: subject = "Backup Upload Successful" message ="""

Backup Uploaded Successfully

Hi there, this is just to inform you diff --git a/erpnext/setup/doctype/country/README.md b/erpnext/setup/doctype/country/README.md deleted file mode 100644 index 0e3f46cddc..0000000000 --- a/erpnext/setup/doctype/country/README.md +++ /dev/null @@ -1 +0,0 @@ -Country Master. \ No newline at end of file diff --git a/erpnext/setup/doctype/country/__init__.py b/erpnext/setup/doctype/country/__init__.py deleted file mode 100644 index baffc48825..0000000000 --- a/erpnext/setup/doctype/country/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/erpnext/setup/doctype/country/country.json b/erpnext/setup/doctype/country/country.json deleted file mode 100644 index 1798ca1893..0000000000 --- a/erpnext/setup/doctype/country/country.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "allow_import": 1, - "autoname": "field:country_name", - "creation": "2013-01-19 10:23:30", - "docstatus": 0, - "doctype": "DocType", - "document_type": "Master", - "fields": [ - { - "fieldname": "country_name", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Country Name", - "oldfieldname": "country_name", - "oldfieldtype": "Data", - "permlevel": 0, - "reqd": 1 - }, - { - "fieldname": "date_format", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Date Format", - "permlevel": 0 - }, - { - "fieldname": "time_zones", - "fieldtype": "Text", - "in_list_view": 1, - "label": "Time Zones", - "permlevel": 0 - }, - { - "fieldname": "code", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Code", - "permlevel": 0 - } - ], - "icon": "icon-globe", - "idx": 1, - "in_create": 0, - "modified": "2014-05-27 03:49:08.984710", - "modified_by": "Administrator", - "module": "Setup", - "name": "Country", - "owner": "Administrator", - "permissions": [ - { - "amend": 0, - "create": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Sales Master Manager", - "submit": 0, - "write": 1 - }, - { - "create": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Purchase Master Manager", - "submit": 0, - "write": 1 - }, - { - "apply_user_permissions": 1, - "create": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "HR User", - "submit": 0, - "write": 1 - }, - { - "create": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "HR Manager", - "submit": 0, - "write": 1 - }, - { - "apply_user_permissions": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "All" - } - ], - "read_only": 0 -} \ No newline at end of file diff --git a/erpnext/setup/doctype/country/country.py b/erpnext/setup/doctype/country/country.py deleted file mode 100644 index 5e16f51f8f..0000000000 --- a/erpnext/setup/doctype/country/country.py +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors -# License: GNU General Public License v3. See license.txt - -from __future__ import unicode_literals -import frappe - -from frappe.model.document import Document - -class Country(Document): - pass \ No newline at end of file diff --git a/erpnext/setup/doctype/country/test_country.py b/erpnext/setup/doctype/country/test_country.py deleted file mode 100644 index b2610667af..0000000000 --- a/erpnext/setup/doctype/country/test_country.py +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors -# License: GNU General Public License v3. See license.txt - - -import frappe -test_records = frappe.get_test_records('Country') \ No newline at end of file diff --git a/erpnext/setup/doctype/country/test_records.json b/erpnext/setup/doctype/country/test_records.json deleted file mode 100644 index 5a7c8a5568..0000000000 --- a/erpnext/setup/doctype/country/test_records.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "country_name": "_Test Country", - "doctype": "Country" - } -] \ No newline at end of file diff --git a/erpnext/setup/doctype/currency/README.md b/erpnext/setup/doctype/currency/README.md deleted file mode 100644 index 3e1558e9d7..0000000000 --- a/erpnext/setup/doctype/currency/README.md +++ /dev/null @@ -1 +0,0 @@ -Currency Master with details about abbreviation, symbol etc. \ No newline at end of file diff --git a/erpnext/setup/doctype/currency/__init__.py b/erpnext/setup/doctype/currency/__init__.py deleted file mode 100644 index baffc48825..0000000000 --- a/erpnext/setup/doctype/currency/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/erpnext/setup/doctype/currency/currency.js b/erpnext/setup/doctype/currency/currency.js deleted file mode 100644 index 79343e9ae6..0000000000 --- a/erpnext/setup/doctype/currency/currency.js +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors -// License: GNU General Public License v3. See license.txt - -cur_frm.cscript.refresh = function(doc) { - cur_frm.set_intro(""); - if(!cur_frm.doc.enabled) { - cur_frm.set_intro(__("This Currency is disabled. Enable to use in transactions")) - } -} \ No newline at end of file diff --git a/erpnext/setup/doctype/currency/currency.json b/erpnext/setup/doctype/currency/currency.json deleted file mode 100644 index ee7be19a53..0000000000 --- a/erpnext/setup/doctype/currency/currency.json +++ /dev/null @@ -1,117 +0,0 @@ -{ - "autoname": "field:currency_name", - "creation": "2013-01-28 10:06:02", - "description": "**Currency** Master", - "docstatus": 0, - "doctype": "DocType", - "fields": [ - { - "fieldname": "currency_name", - "fieldtype": "Data", - "label": "Currency Name", - "oldfieldname": "currency_name", - "oldfieldtype": "Data", - "permlevel": 0, - "reqd": 1 - }, - { - "fieldname": "enabled", - "fieldtype": "Check", - "in_list_view": 1, - "label": "Enabled", - "permlevel": 0 - }, - { - "description": "Sub-currency. For e.g. \"Cent\"", - "fieldname": "fraction", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Fraction", - "permlevel": 0 - }, - { - "description": "1 Currency = [?] Fraction\nFor e.g. 1 USD = 100 Cent", - "fieldname": "fraction_units", - "fieldtype": "Int", - "in_list_view": 1, - "label": "Fraction Units", - "permlevel": 0 - }, - { - "description": "A symbol for this currency. For e.g. $", - "fieldname": "symbol", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Symbol", - "permlevel": 0 - }, - { - "description": "How should this currency be formatted? If not set, will use system defaults", - "fieldname": "number_format", - "fieldtype": "Select", - "in_list_view": 1, - "label": "Number Format", - "options": "\n#,###.##\n#.###,##\n# ###.##\n# ###,##\n#'###.##\n#, ###.##\n#,##,###.##\n#,###.###\n#.###\n#,###", - "permlevel": 0 - } - ], - "icon": "icon-bitcoin", - "idx": 1, - "in_create": 0, - "modified": "2014-06-18 03:49:09.038451", - "modified_by": "Administrator", - "module": "Setup", - "name": "Currency", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Accounts Manager", - "submit": 0, - "write": 1 - }, - { - "amend": 0, - "create": 1, - "delete": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Sales Master Manager", - "submit": 0, - "write": 1 - }, - { - "amend": 0, - "create": 1, - "delete": 0, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Purchase Master Manager", - "submit": 0, - "write": 1 - }, - { - "apply_user_permissions": 1, - "delete": 0, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "All" - } - ], - "read_only": 0 -} diff --git a/erpnext/setup/doctype/currency/currency.py b/erpnext/setup/doctype/currency/currency.py deleted file mode 100644 index abfbe1930c..0000000000 --- a/erpnext/setup/doctype/currency/currency.py +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors -# License: GNU General Public License v3. See license.txt - -from __future__ import unicode_literals -import frappe -from frappe import throw, _ - -from frappe.model.document import Document - -class Currency(Document): - def validate(self): - frappe.clear_cache() - -def validate_conversion_rate(currency, conversion_rate, conversion_rate_label, company): - """common validation for currency and price list currency""" - - company_currency = frappe.db.get_value("Company", company, "default_currency") - - if not conversion_rate: - throw(_("{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.").format( - conversion_rate_label, currency, company_currency)) diff --git a/erpnext/setup/doctype/currency/test_currency.py b/erpnext/setup/doctype/currency/test_currency.py deleted file mode 100644 index f0c6cee260..0000000000 --- a/erpnext/setup/doctype/currency/test_currency.py +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors -# License: GNU General Public License v3. See license.txt - -# pre loaded - -import frappe -test_records = frappe.get_test_records('Currency') \ No newline at end of file diff --git a/erpnext/setup/doctype/currency/test_records.json b/erpnext/setup/doctype/currency/test_records.json deleted file mode 100644 index 0637a088a0..0000000000 --- a/erpnext/setup/doctype/currency/test_records.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py index 59a42cbbaf..90ea22f0c5 100644 --- a/erpnext/setup/doctype/email_digest/email_digest.py +++ b/erpnext/setup/doctype/email_digest/email_digest.py @@ -9,7 +9,7 @@ from frappe.utils import fmt_money, formatdate, now_datetime, cstr, esc, \ from frappe.utils.dateutils import datetime_in_user_format from datetime import timedelta from dateutil.relativedelta import relativedelta -from frappe.utils.email_lib import sendmail +from frappe.email import sendmail from frappe.core.doctype.user.user import STANDARD_USERS content_sequence = [ diff --git a/erpnext/setup/doctype/global_defaults/global_defaults.py b/erpnext/setup/doctype/global_defaults/global_defaults.py index a8905f1262..e67ba44438 100644 --- a/erpnext/setup/doctype/global_defaults/global_defaults.py +++ b/erpnext/setup/doctype/global_defaults/global_defaults.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals import frappe import frappe.defaults from frappe.utils import cint -from frappe.core.doctype.property_setter.property_setter import make_property_setter +from frappe.custom.doctype.property_setter.property_setter import make_property_setter keydict = { # "key in defaults": "key in Global Defaults" diff --git a/erpnext/setup/doctype/naming_series/naming_series.py b/erpnext/setup/doctype/naming_series/naming_series.py index cb0d43780f..92781390fc 100644 --- a/erpnext/setup/doctype/naming_series/naming_series.py +++ b/erpnext/setup/doctype/naming_series/naming_series.py @@ -135,7 +135,7 @@ class NamingSeries(Document): msgprint(_("Please select prefix first")) def set_by_naming_series(doctype, fieldname, naming_series, hide_name_field=True): - from frappe.core.doctype.property_setter.property_setter import make_property_setter + from frappe.custom.doctype.property_setter.property_setter import make_property_setter if naming_series: make_property_setter(doctype, "naming_series", "hidden", 0, "Check") make_property_setter(doctype, "naming_series", "reqd", 1, "Check") diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py index 0e8e58d957..93f4ad55ec 100644 --- a/erpnext/setup/install.py +++ b/erpnext/setup/install.py @@ -13,7 +13,6 @@ default_mail_footer = """