nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-18 19:07:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-28124

Browse Source
This commit is contained in:
Ankush Menat
2021-11-25 17:48:37 +05:30
parent ccb8defc0b fbfaf75b66
commit 12e1d169d0
2166 changed files with 1 additions and 3207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/controllers/accounts_controller.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

1
erpnext/controllers/buying_controller.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 ValidationError, _, msgprint

1
erpnext/controllers/item_variant.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
import json

1
erpnext/controllers/print_settings.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
def set_print_templates_for_item_table(doc, settings):

1
erpnext/controllers/queries.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
from collections import defaultdict

1
erpnext/controllers/sales_and_purchase_return.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/controllers/selling_controller.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 _, bold, throw

1
erpnext/controllers/status_updater.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/controllers/taxes_and_totals.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

1
erpnext/controllers/tests/test_item_variant.py
View File

@@ -1,4 +1,3 @@
from __future__ import unicode_literals
import json
import unittest

1
erpnext/controllers/tests/test_mapper.py
View File

@@ -1,4 +1,3 @@
from __future__ import unicode_literals
import json
import unittest

1
erpnext/controllers/tests/test_qty_based_taxes.py
View File

@@ -1,4 +1,3 @@
from __future__ import print_function, unicode_literals
import unittest
from uuid import uuid4 as _uuid4

1
erpnext/controllers/trends.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/controllers/website_list_for_contact.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