erpnext/foundation
1
0
Fork 0
mirror of https://github.com/erpnext/foundation.git synced 2026-10-16 18:00:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #477 from erpnext/compatibility-fixes

Browse Source 
fix: Compatibility fixes for Frappe v13, develop & Py3
This commit is contained in:
gavin
2021-12-01 12:05:31 +05:30
committed by GitHub
parent 92353efe4e 60813b63ac
commit c655827798
36 changed files with 4 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
foundation/erpnext_foundation/doctype/bounty/bounty.py
View File

@@ -5,7 +5,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from frappe.model.document import Document from frappe.model.document import Document
from frappe.website.utils import get_comment_list
from frappe.utils import date_diff, nowdate, fmt_money, add_months from frappe.utils import date_diff, nowdate, fmt_money, add_months
from frappe.website.utils import get_comment_list from frappe.website.utils import get_comment_list

1
foundation/erpnext_foundation/doctype/bounty/test_bounty.py
View File

@@ -3,7 +3,6 @@
# See license.txt # See license.txt
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
import unittest import unittest
class TestBounty(unittest.TestCase): class TestBounty(unittest.TestCase):

1
foundation/erpnext_foundation/doctype/conference_participant/test_conference_participant.py
View File

@@ -3,7 +3,6 @@
# See license.txt # See license.txt
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
import unittest import unittest
class TestConferenceParticipant(unittest.TestCase): class TestConferenceParticipant(unittest.TestCase):

1
foundation/erpnext_foundation/doctype/conference_settings/conference_settings.py
View File

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

1
foundation/erpnext_foundation/doctype/conference_talk_proposal/test_conference_talk_proposal.py
View File

@@ -3,7 +3,6 @@
# See license.txt # See license.txt
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
import unittest import unittest
class TestConferenceTalkProposal(unittest.TestCase): class TestConferenceTalkProposal(unittest.TestCase):

1
foundation/erpnext_foundation/doctype/developer_sprint/test_developer_sprint.py
View File

@@ -3,7 +3,6 @@
# See license.txt # See license.txt
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
import unittest import unittest
class TestDeveloperSprint(unittest.TestCase): class TestDeveloperSprint(unittest.TestCase):

4
foundation/erpnext_foundation/doctype/esoc_applicant/esoc_applicant.py
View File

@@ -14,8 +14,8 @@ class ESoCApplicant(Document):
self.validate_agreement_check() self.validate_agreement_check()
def validate_email_type(self, email): def validate_email_type(self, email):
from frappe.utils import validate_email_add from frappe.utils import validate_email_address
validate_email_add(email.strip(), True) validate_email_address(email.strip(), True)
def validate_dob(self): def validate_dob(self):
from frappe.utils import now_datetime, getdate from frappe.utils import now_datetime, getdate

1
foundation/erpnext_foundation/doctype/esoc_project_detail/esoc_project_detail.py
View File

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

1
foundation/erpnext_foundation/doctype/foundation_fellowship/test_foundation_fellowship.py
View File

@@ -3,7 +3,6 @@
# See license.txt # See license.txt
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
import unittest import unittest
class TestFoundationFellowship(unittest.TestCase): class TestFoundationFellowship(unittest.TestCase):

2
foundation/erpnext_foundation/doctype/foundation_project/foundation_project.py
View File

@@ -5,7 +5,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
# import frappe # import frappe
from frappe.model.document import Document from frappe.model.document import Document
from frappe.website.render import clear_cache as clear_website_cache from frappe.website.utils import clear_cache as clear_website_cache
class FoundationProject(Document): class FoundationProject(Document):
def validate(self): def validate(self):

1
foundation/erpnext_foundation/doctype/frappe_app/frappe_app.py
View File

@@ -3,7 +3,6 @@
# For license information, please see license.txt # For license information, please see license.txt
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
from frappe.website.website_generator import WebsiteGenerator from frappe.website.website_generator import WebsiteGenerator
class FrappeApp(WebsiteGenerator): class FrappeApp(WebsiteGenerator):

1
foundation/erpnext_foundation/doctype/frappe_app/test_frappe_app.py
View File

@@ -3,7 +3,6 @@
# See license.txt # See license.txt
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
import unittest import unittest
class TestFrappeApp(unittest.TestCase): class TestFrappeApp(unittest.TestCase):

1
foundation/erpnext_foundation/doctype/portal_event/portal_event.py
View File

@@ -3,7 +3,6 @@
# For license information, please see license.txt # For license information, please see license.txt
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
from frappe.website.website_generator import WebsiteGenerator from frappe.website.website_generator import WebsiteGenerator

1
foundation/erpnext_foundation/doctype/portal_event/test_portal_event.py
View File

@@ -3,7 +3,6 @@
# See license.txt # See license.txt
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
import unittest import unittest
# test_records = frappe.get_test_records('Portal Event') # test_records = frappe.get_test_records('Portal Event')

1
foundation/erpnext_foundation/doctype/portal_job/test_portal_job.py
View File

@@ -3,7 +3,6 @@
# See license.txt # See license.txt
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
import unittest import unittest
# test_records = frappe.get_test_records('Portal Job') # test_records = frappe.get_test_records('Portal Job')

2
foundation/erpnext_foundation/doctype/service_provider/service_provider.py
View File

@@ -25,6 +25,6 @@ def get_last_login_diff(user):
Returns difference between todays date and last login date Returns difference between todays date and last login date
""" """
last_login = frappe.db.get_value("User", user, ["last_login"]) last_login = frappe.db.get_value("User", user, ["last_login"])
for x in xrange(1,10): for x in range(1,10):
print((get_datetime() - get_datetime(last_login)).days, user) print((get_datetime() - get_datetime(last_login)).days, user)
return (get_datetime() - get_datetime(last_login)).days return (get_datetime() - get_datetime(last_login)).days

1
foundation/erpnext_foundation/doctype/service_provider/test_service_provider.py
View File

@@ -3,7 +3,6 @@
# See license.txt # See license.txt
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
import unittest import unittest
# test_records = frappe.get_test_records('Service Provider') # test_records = frappe.get_test_records('Service Provider')

1
foundation/erpnext_foundation/notification/conference_ticket_confirmation/conference_ticket_confirmation.py
View File

@@ -1,6 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
def get_context(context): def get_context(context):
# do your magic here # do your magic here

1
foundation/erpnext_foundation/web_form/add_edit_app/add_edit_app.py
View File

@@ -1,6 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
def get_context(context): def get_context(context):
# do your magic here # do your magic here

1
foundation/erpnext_foundation/web_form/add_event/add_event.py
View File

@@ -1,6 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
def get_context(context): def get_context(context):
# do your magic here # do your magic here

1
foundation/erpnext_foundation/web_form/apply_for_esoc/apply_for_esoc.py
View File

@@ -1,6 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
def get_context(context): def get_context(context):
# do your magic here # do your magic here

1
foundation/erpnext_foundation/web_form/back_this_bounty/back_this_bounty.py
View File

@@ -1,6 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
def get_context(context): def get_context(context):
# do your magic here # do your magic here

1
foundation/erpnext_foundation/web_form/back_this_bounty_usd/back_this_bounty_usd.py
View File

@@ -1,6 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
def get_context(context): def get_context(context):
# do your magic here # do your magic here

1
foundation/erpnext_foundation/web_form/buy_tickets_inr/buy_tickets_inr.py
View File

@@ -1,6 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
def get_context(context): def get_context(context):
# do your magic here # do your magic here

1
foundation/erpnext_foundation/web_form/buy_tickets_paypal/buy_tickets_paypal.py
View File

@@ -1,6 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
def get_context(context): def get_context(context):
# do your magic here # do your magic here

1
foundation/erpnext_foundation/web_form/conference_talk_proposal/conference_talk_proposal.py
View File

@@ -1,6 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
def get_context(context): def get_context(context):
# do your magic here # do your magic here

1
foundation/erpnext_foundation/web_form/developer_sprint/developer_sprint.py
View File

@@ -1,6 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
def get_context(context): def get_context(context):
# do your magic here # do your magic here

1
foundation/erpnext_foundation/web_form/jobs/jobs.py
View File

@@ -1,6 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
def get_context(context): def get_context(context):
# do your magic here # do your magic here

1
foundation/erpnext_foundation/web_form/memberships/memberships.py
View File

@@ -1,7 +1,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
import datetime
from frappe.utils import fmt_money from frappe.utils import fmt_money
def get_context(context): def get_context(context):

1
foundation/erpnext_foundation/web_form/memberships_usd/memberships_usd.py
View File

@@ -1,6 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
def get_context(context): def get_context(context):
# do your magic here # do your magic here

1
foundation/erpnext_foundation/web_form/request_a_call/request_a_call.py
View File

@@ -1,6 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
def get_context(context): def get_context(context):
# do your magic here # do your magic here

1
foundation/erpnext_foundation/web_form/service_provider/service_provider.py
View File

@@ -1,6 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
def get_context(context): def get_context(context):
# do your magic here # do your magic here

1
foundation/erpnext_foundation/web_form/start_a_new_bounty/start_a_new_bounty.py
View File

@@ -1,6 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe
def get_context(context): def get_context(context):
# do your magic here # do your magic here

1
foundation/migrate.py
View File

@@ -1,4 +1,3 @@
import frappe
def migrate(): def migrate():
pass pass

1
foundation/www/conf/2019/talks.py
View File

@@ -1,4 +1,3 @@
import frappe
def get_context(context): def get_context(context):
context.schedules = [ context.schedules = [

1
foundation/www/members/setup_payment.py
View File

@@ -1,5 +1,4 @@
import frappe import frappe
import foundation
no_cache = 1 no_cache = 1
def get_context(context): def get_context(context):