nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-25 04:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into currency-exchange-settings

Browse Source
This commit is contained in:
Dany Robert
2021-11-06 09:59:00 +05:30
committed by GitHub
parent 4716523c77 aed45f22f4
commit 01e7076b65
1978 changed files with 192 additions and 3553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/setup/default_energy_point_rules.py
View File

@@ -1,5 +1,3 @@
from __future__ import unicode_literals
from frappe import _
doctype_rule_map = {

2
erpnext/setup/default_success_action.py
View File

@@ -1,5 +1,3 @@
from __future__ import unicode_literals
from frappe import _
doctype_list = [

1
erpnext/setup/doctype/__init__.py
View File

@@ -1 +0,0 @@
from __future__ import unicode_literals

1
erpnext/setup/doctype/authorization_control/__init__.py
View File

@@ -1 +0,0 @@
from __future__ import unicode_literals

1
erpnext/setup/doctype/authorization_control/authorization_control.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
from frappe import _, session

1
erpnext/setup/doctype/authorization_rule/__init__.py
View File

@@ -1 +0,0 @@
from __future__ import unicode_literals

1
erpnext/setup/doctype/authorization_rule/authorization_rule.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
from frappe import _

2
erpnext/setup/doctype/authorization_rule/test_authorization_rule.py
View File

@@ -1,7 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
from __future__ import unicode_literals
import unittest

1
erpnext/setup/doctype/brand/__init__.py
View File

@@ -1 +0,0 @@
from __future__ import unicode_literals

1
erpnext/setup/doctype/brand/brand.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import copy

1
erpnext/setup/doctype/brand/test_brand.py
View File

@@ -1,6 +1,5 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe

1
erpnext/setup/doctype/company/__init__.py
View File

@@ -1 +0,0 @@
from __future__ import unicode_literals

5
erpnext/setup/doctype/company/company.py
View File

@@ -1,9 +1,7 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import functools
import json
import os
@@ -14,7 +12,6 @@ from frappe.cache_manager import clear_defaults_cache
from frappe.contacts.address_and_contact import load_address_and_contact
from frappe.utils import cint, formatdate, get_timestamp, today
from frappe.utils.nestedset import NestedSet
from past.builtins import cmp
from erpnext.accounts.doctype.account.account import get_account_currency
from erpnext.setup.setup_wizard.operations.taxes_setup import setup_taxes_and_charges
@@ -584,7 +581,7 @@ def get_default_company_address(name, sort_key='is_primary_address', existing_ad
return existing_address
if out:
return sorted(out, key = functools.cmp_to_key(lambda x,y: cmp(y[1], x[1])))[0][0]
return min(out, key=lambda x: x[1])[0] # find min by sort_key
else:
return None

2
erpnext/setup/doctype/company/company_dashboard.py
View File

@@ -1,5 +1,3 @@
from __future__ import unicode_literals
from frappe import _

1
erpnext/setup/doctype/company/test_company.py
View File

@@ -1,6 +1,5 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import json
import unittest

1
erpnext/setup/doctype/currency_exchange/currency_exchange.py
View File

@@ -3,7 +3,6 @@
# For license information, please see license.txt
from __future__ import unicode_literals
from frappe import _, throw
from frappe.model.document import Document

1
erpnext/setup/doctype/customer_group/__init__.py
View File

@@ -1 +0,0 @@
from __future__ import unicode_literals

1
erpnext/setup/doctype/customer_group/customer_group.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
from frappe import _

1
erpnext/setup/doctype/customer_group/test_customer_group.py
View File

@@ -1,6 +1,5 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
test_ignore = ["Price List"]

1
erpnext/setup/doctype/email_digest/__init__.py
View File

@@ -1 +0,0 @@
from __future__ import unicode_literals

1
erpnext/setup/doctype/email_digest/email_digest.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
from datetime import timedelta

3
erpnext/setup/doctype/email_digest/quotes.py
View File

@@ -1,6 +1,3 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
import random

2
erpnext/setup/doctype/email_digest/test_email_digest.py
View File

@@ -1,7 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
from __future__ import unicode_literals
import unittest

2
erpnext/setup/doctype/email_digest_recipient/email_digest_recipient.py
View File

@@ -1,8 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
from __future__ import unicode_literals
# import frappe
from frappe.model.document import Document

1
erpnext/setup/doctype/global_defaults/__init__.py
View File

@@ -1 +0,0 @@
from __future__ import unicode_literals

1
erpnext/setup/doctype/global_defaults/global_defaults.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
"""Global Defaults"""
import frappe

2
erpnext/setup/doctype/global_defaults/test_global_defaults.py
View File

@@ -1,7 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
from __future__ import unicode_literals
import unittest

1
erpnext/setup/doctype/item_group/__init__.py
View File

@@ -1 +0,0 @@
from __future__ import unicode_literals

1
erpnext/setup/doctype/item_group/item_group.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import copy

1
erpnext/setup/doctype/item_group/test_item_group.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import print_function, unicode_literals
import unittest

1
erpnext/setup/doctype/naming_series/__init__.py
View File

@@ -1 +0,0 @@
from __future__ import unicode_literals

1
erpnext/setup/doctype/naming_series/naming_series.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
from frappe import _, msgprint, throw

2
erpnext/setup/doctype/party_type/party_type.py
View File

@@ -1,8 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2015, Frappe Technologies and contributors
# For license information, please see license.txt
from __future__ import unicode_literals
import frappe
from frappe.model.document import Document

2
erpnext/setup/doctype/party_type/test_party_type.py
View File

@@ -1,7 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
from __future__ import unicode_literals
import unittest

1
erpnext/setup/doctype/print_heading/__init__.py
View File

@@ -1 +0,0 @@
from __future__ import unicode_literals

1
erpnext/setup/doctype/print_heading/print_heading.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
from frappe.model.document import Document

1
erpnext/setup/doctype/print_heading/test_print_heading.py
View File

@@ -1,6 +1,5 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe

1
erpnext/setup/doctype/quotation_lost_reason/__init__.py
View File

@@ -1 +0,0 @@
from __future__ import unicode_literals

1
erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
from frappe.model.document import Document

1
erpnext/setup/doctype/quotation_lost_reason/test_quotation_lost_reason.py
View File

@@ -1,6 +1,5 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe

2
erpnext/setup/doctype/quotation_lost_reason_detail/quotation_lost_reason_detail.py
View File

@@ -1,8 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
from __future__ import unicode_literals
# import frappe
from frappe.model.document import Document

1
erpnext/setup/doctype/sales_partner/__init__.py
View File

@@ -1 +0,0 @@
from __future__ import unicode_literals

1
erpnext/setup/doctype/sales_partner/sales_partner.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
from frappe.contacts.address_and_contact import load_address_and_contact

1
erpnext/setup/doctype/sales_partner/test_sales_partner.py
View File

@@ -1,6 +1,5 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe

1
erpnext/setup/doctype/sales_person/__init__.py
View File

@@ -1 +0,0 @@
from __future__ import unicode_literals

1
erpnext/setup/doctype/sales_person/sales_person.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
from frappe import _

2
erpnext/setup/doctype/sales_person/sales_person_dashboard.py
View File

@@ -1,5 +1,3 @@
from __future__ import unicode_literals
from frappe import _

1
erpnext/setup/doctype/sales_person/test_sales_person.py
View File

@@ -1,6 +1,5 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
test_dependencies = ["Employee"]

1
erpnext/setup/doctype/supplier_group/__init__.py
View File

@@ -1 +0,0 @@
from __future__ import unicode_literals

2
erpnext/setup/doctype/supplier_group/supplier_group.py
View File

@@ -1,8 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
from __future__ import unicode_literals
import frappe
from frappe.utils.nestedset import NestedSet, get_root_of

2
erpnext/setup/doctype/supplier_group/test_supplier_group.py
View File

@@ -1,7 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
from __future__ import unicode_literals
import frappe

1
erpnext/setup/doctype/target_detail/__init__.py
View File

@@ -1 +0,0 @@
from __future__ import unicode_literals

1
erpnext/setup/doctype/target_detail/target_detail.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
from frappe.model.document import Document

1
erpnext/setup/doctype/terms_and_conditions/__init__.py
View File

@@ -1 +0,0 @@
from __future__ import unicode_literals

4
erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import json
@@ -10,7 +9,6 @@ from frappe import _, throw
from frappe.model.document import Document
from frappe.utils import cint
from frappe.utils.jinja import validate_template
from six import string_types
class TermsandConditions(Document):
@@ -22,7 +20,7 @@ class TermsandConditions(Document):
@frappe.whitelist()
def get_terms_and_conditions(template_name, doc):
if isinstance(doc, string_types):
if isinstance(doc, str):
doc = json.loads(doc)
terms_and_conditions = frappe.get_doc("Terms and Conditions", template_name)

1
erpnext/setup/doctype/terms_and_conditions/test_terms_and_conditions.py
View File

@@ -1,6 +1,5 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe

1
erpnext/setup/doctype/territory/__init__.py
View File

@@ -1 +0,0 @@
from __future__ import unicode_literals

1
erpnext/setup/doctype/territory/territory.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
from frappe import _

1
erpnext/setup/doctype/territory/test_territory.py
View File

@@ -1,6 +1,5 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe

2
erpnext/setup/doctype/transaction_deletion_record/test_transaction_deletion_record.py
View File

@@ -1,7 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
from __future__ import unicode_literals
import unittest

2
erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py
View File

@@ -1,8 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
from __future__ import unicode_literals
import frappe
from frappe import _

2
erpnext/setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.py
View File

@@ -1,8 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
from __future__ import unicode_literals
# import frappe
from frappe.model.document import Document

1
erpnext/setup/doctype/uom/__init__.py
View File

@@ -1 +0,0 @@
from __future__ import unicode_literals

1
erpnext/setup/doctype/uom/test_uom.py
View File

@@ -1,6 +1,5 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe

1
erpnext/setup/doctype/uom/uom.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
from frappe.model.document import Document

2
erpnext/setup/doctype/uom_conversion_factor/test_uom_conversion_factor.py
View File

@@ -1,7 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
from __future__ import unicode_literals
import unittest

2
erpnext/setup/doctype/uom_conversion_factor/uom_conversion_factor.py
View File

@@ -1,8 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
from __future__ import unicode_literals
from frappe.model.document import Document

1
erpnext/setup/doctype/website_item_group/website_item_group.py
View File

@@ -3,7 +3,6 @@
# For license information, please see license.txt
from __future__ import unicode_literals
from frappe.model.document import Document

8
erpnext/setup/install.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import print_function, unicode_literals
import frappe
from frappe import _
@@ -9,7 +8,6 @@ from frappe.custom.doctype.custom_field.custom_field import create_custom_field
from frappe.desk.page.setup_wizard.setup_wizard import add_all_roles_to
from frappe.installer import update_site_config
from frappe.utils import cint
from six import iteritems
from erpnext.accounts.doctype.cash_flow_mapper.default_cash_flow_mapper import DEFAULT_MAPPERS
from erpnext.setup.default_energy_point_rules import get_default_energy_point_rules
@@ -183,12 +181,12 @@ def add_non_standard_user_types():
user_types = get_user_types_data()
user_type_limit = {}
for user_type, data in iteritems(user_types):
for user_type, data in user_types.items():
user_type_limit.setdefault(frappe.scrub(user_type), 10)
update_site_config('user_type_doctype_limit', user_type_limit)
for user_type, data in iteritems(user_types):
for user_type, data in user_types.items():
create_custom_role(data)
create_user_type(user_type, data)
@@ -238,7 +236,7 @@ def create_user_type(user_type, data):
doc.save(ignore_permissions=True)
def create_role_permissions_for_doctype(doc, data):
for doctype, perms in iteritems(data.get('doctypes')):
for doctype, perms in data.get('doctypes').items():
args = {'document_type': doctype}
for perm in perms:
args[perm] = 1

1
erpnext/setup/page/__init__.py
View File

@@ -1 +0,0 @@
from __future__ import unicode_literals

2
erpnext/setup/setup_wizard/data/dashboard_charts.py
View File

@@ -1,5 +1,3 @@
from __future__ import unicode_literals
import json
import frappe

2
erpnext/setup/setup_wizard/data/industry_type.py
View File

@@ -1,5 +1,3 @@
from __future__ import unicode_literals
from frappe import _

1
erpnext/setup/setup_wizard/operations/company_setup.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
from frappe import _
from frappe.utils import cstr, getdate

1
erpnext/setup/setup_wizard/operations/default_website.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
from frappe import _

1
erpnext/setup/setup_wizard/operations/defaults_setup.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
from frappe import _
from frappe.utils import cstr, getdate

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

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import json
import os

1
erpnext/setup/setup_wizard/operations/sample_data.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import json
import os

1
erpnext/setup/setup_wizard/operations/taxes_setup.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import os
import json

1
erpnext/setup/setup_wizard/setup_wizard.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
from frappe import _

2
erpnext/setup/setup_wizard/utils.py
View File

@@ -1,5 +1,3 @@
from __future__ import unicode_literals
import json
import os

1
erpnext/setup/utils.py
View File

@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
from frappe import _