nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-22 14:39:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove all six compat code

Browse Source
This commit is contained in:
Ankush Menat
2021-11-04 19:48:32 +05:30
parent 56a25a0c4f
commit 8fe5feb6a4
420 changed files with 179 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/selling/report/address_and_contacts/address_and_contacts.py
View File

@@ -3,8 +3,6 @@
import frappe
from six import iteritems
from six.moves import range
field_map = {
"Contact": [ "first_name", "last_name", "phone", "mobile_no", "email_id", "is_primary_contact" ],
@@ -66,7 +64,7 @@ def get_party_addresses_and_contact(party_type, party, party_group):
party_details = get_party_details(party_type, party_list, "Address", party_details)
party_details = get_party_details(party_type, party_list, "Contact", party_details)
for party, details in iteritems(party_details):
for party, details in party_details.items():
addresses = details.get("address", [])
contacts = details.get("contact", [])
if not any([addresses, contacts]):

3
erpnext/selling/report/sales_analytics/sales_analytics.py
View File

@@ -5,7 +5,6 @@
import frappe
from frappe import _, scrub
from frappe.utils import add_days, add_to_date, flt, getdate
from six import iteritems
from erpnext.accounts.utils import get_fiscal_year
@@ -226,7 +225,7 @@ class Analytics(object):
self.data = []
self.get_periodic_data()
for entity, period_data in iteritems(self.entity_periodic_data):
for entity, period_data in self.entity_periodic_data.items():
row = {
"entity": entity,
"entity_name": self.entity_names.get(entity) if hasattr(self, 'entity_names') else None