nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-22 22:49: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

3
erpnext/crm/doctype/contract_template/contract_template.py
View File

@@ -7,7 +7,6 @@ import json
import frappe
from frappe.model.document import Document
from frappe.utils.jinja import validate_template
from six import string_types
class ContractTemplate(Document):
@@ -17,7 +16,7 @@ class ContractTemplate(Document):
@frappe.whitelist()
def get_contract_template(template_name, doc):
if isinstance(doc, string_types):
if isinstance(doc, str):
doc = json.loads(doc)
contract_template = frappe.get_doc("Contract Template", template_name)

2
erpnext/crm/doctype/lead/lead_dashboard.py
View File

@@ -1,5 +1,3 @@
def get_data():
return {
'fieldname': 'lead',

2
erpnext/crm/doctype/opportunity/opportunity_dashboard.py
View File

@@ -1,5 +1,3 @@
def get_data():
return {
'fieldname': 'opportunity',

1
erpnext/crm/doctype/utils.py
View File

@@ -1,4 +1,3 @@
import frappe

5
erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py
View File

@@ -6,7 +6,6 @@ import frappe
import pandas
from frappe import _
from frappe.utils import flt
from six import iteritems
from erpnext.setup.utils import get_exchange_rate
@@ -126,7 +125,7 @@ class OpportunitySummaryBySalesStage(object):
self.data = []
self.get_formatted_data()
for based_on,data in iteritems(self.formatted_data):
for based_on,data in self.formatted_data.items():
row_based_on={
'Opportunity Owner': 'opportunity_owner',
'Source': 'source',
@@ -251,4 +250,4 @@ class OpportunitySummaryBySalesStage(object):
if data.get('currency') != default_currency:
opportunity_currency = data.get('currency')
value = self.currency_conversion(opportunity_currency,default_currency)
data['amount'] = data['amount'] * value
data['amount'] = data['amount'] * value

5
erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py
View File

@@ -9,7 +9,6 @@ import pandas
from dateutil.relativedelta import relativedelta
from frappe import _
from frappe.utils import cint, flt
from six import iteritems
from erpnext.setup.utils import get_exchange_rate
@@ -295,7 +294,7 @@ class SalesPipelineAnalytics(object):
def append_data(self, pipeline_by, period_by):
self.data = []
for pipeline,period_data in iteritems(self.periodic_data):
for pipeline,period_data in self.periodic_data.items():
row = {pipeline_by : pipeline}
for info in self.query_result:
if self.filters.get('range') == 'Monthly':
@@ -330,4 +329,4 @@ class SalesPipelineAnalytics(object):
if data.get('currency') != default_currency:
opportunity_currency = data.get('currency')
value = self.get_currency_rate(opportunity_currency,default_currency)
data['amount'] = data['amount'] * value
data['amount'] = data['amount'] * value