Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: usage of modified ordering #40705

Merged
merged 1 commit into from Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions erpnext/controllers/website_list_for_contact.py
Expand Up @@ -35,7 +35,7 @@ def get_webform_list_context(module):


def get_webform_transaction_list(
doctype, txt=None, filters=None, limit_start=0, limit_page_length=20, order_by="modified"
doctype, txt=None, filters=None, limit_start=0, limit_page_length=20, order_by="creation"
):
"""Get List of transactions for custom doctypes"""
from frappe.www.list import get_list
Expand All @@ -59,7 +59,7 @@ def get_webform_transaction_list(
limit_page_length,
ignore_permissions=False,
fields=None,
order_by="modified",
order_by="creation",
)


Expand All @@ -69,7 +69,7 @@ def get_transaction_list(
filters=None,
limit_start=0,
limit_page_length=20,
order_by="modified",
order_by="creation",
custom=False,
):
user = frappe.session.user
Expand Down Expand Up @@ -117,7 +117,7 @@ def get_transaction_list(
limit_page_length,
fields="name",
ignore_permissions=ignore_permissions,
order_by="modified desc",
order_by="creation desc",
)

if custom:
Expand Down Expand Up @@ -151,7 +151,7 @@ def get_list_for_transactions(
limit_start=limit_start,
limit_page_length=limit_page_length,
ignore_permissions=ignore_permissions,
order_by="modified desc",
order_by="creation desc",
):
data.append(d)

Expand Down Expand Up @@ -182,7 +182,7 @@ def get_list_for_transactions(
def rfq_transaction_list(parties_doctype, doctype, parties, limit_start, limit_page_length):
data = frappe.db.sql(
"""select distinct parent as name, supplier from `tab{doctype}`
where supplier = '{supplier}' and docstatus=1 order by modified desc limit {start}, {len}""".format(
where supplier = '{supplier}' and docstatus=1 order by creation desc limit {start}, {len}""".format(
doctype=parties_doctype, supplier=parties[0], start=limit_start, len=limit_page_length
),
as_dict=1,
Expand Down
2 changes: 1 addition & 1 deletion erpnext/crm/doctype/utils.py
Expand Up @@ -28,7 +28,7 @@ def get_last_interaction(contact=None, lead=None):
FROM `tabCommunication`
WHERE `sent_or_received`='Received'
AND ({})
ORDER BY `modified`
ORDER BY `creation`
LIMIT 1
""".format(
query_condition
Expand Down
Expand Up @@ -52,7 +52,7 @@ def clear_old_logs(days=None):
frappe.db.delete(
table,
filters=(
(table.modified < (Now() - Interval(days=days))) & (table.update_type == "Update Cost")
(table.creation < (Now() - Interval(days=days))) & (table.update_type == "Update Cost")
),
)

Expand Down
2 changes: 1 addition & 1 deletion erpnext/projects/doctype/project/project.py
Expand Up @@ -368,7 +368,7 @@ def get_timeline_data(doctype: str, name: str) -> dict[int, int]:


def get_project_list(
doctype, txt, filters, limit_start, limit_page_length=20, order_by="modified"
doctype, txt, filters, limit_start, limit_page_length=20, order_by="creation"
):
customers, suppliers = get_customers_suppliers("Project", frappe.session.user)

Expand Down
2 changes: 1 addition & 1 deletion erpnext/projects/doctype/timesheet/timesheet.py
Expand Up @@ -479,7 +479,7 @@ def get_events(start, end, filters=None):


def get_timesheets_list(
doctype, txt, filters, limit_start, limit_page_length=20, order_by="modified"
doctype, txt, filters, limit_start, limit_page_length=20, order_by="creation"
):
user = frappe.session.user
# find customer name from contact.
Expand Down
4 changes: 2 additions & 2 deletions erpnext/setup/doctype/email_digest/email_digest.py
Expand Up @@ -277,7 +277,7 @@ def get_issue_list(self, user_id=None):
issue_list = frappe.db.sql(
"""select *
from `tabIssue` where status in ("Replied","Open")
order by modified asc limit 10""",
order by creation asc limit 10""",
as_dict=True,
)

Expand All @@ -301,7 +301,7 @@ def get_project_list(self, user_id=None):
project_list = frappe.db.sql(
"""select *
from `tabProject` where status='Open' and project_type='External'
order by modified asc limit 10""",
order by creation asc limit 10""",
as_dict=True,
)

Expand Down
Expand Up @@ -63,7 +63,7 @@ def clear_old_logs(days=None):
frappe.db.delete(
table,
filters=(
(table.modified < (Now() - Interval(days=days)))
(table.creation < (Now() - Interval(days=days)))
& (table.status.isin(["Completed", "Skipped"]))
),
)
Expand Down
Expand Up @@ -99,7 +99,7 @@ def test_clear_old_logs(self):
).insert(ignore_permissions=True)

repost_doc.load_from_db()
repost_doc.modified = add_days(now(), days=-i * 10)
repost_doc.creation = add_days(now(), days=-i * 10)
repost_doc.db_update_all()

logs = frappe.get_all("Repost Item Valuation", filters={"status": "Skipped"})
Expand Down
2 changes: 1 addition & 1 deletion erpnext/tests/test_webform.py
Expand Up @@ -47,7 +47,7 @@ def get_data():
webform_list_contexts = frappe.get_hooks("webform_list_context")
if webform_list_contexts:
context = frappe._dict(frappe.get_attr(webform_list_contexts[0])("Buying") or {})
kwargs = dict(doctype="Order Assignment", order_by="modified desc")
kwargs = dict(doctype="Order Assignment", order_by="creation desc")
return context.get_list(**kwargs)


Expand Down
2 changes: 1 addition & 1 deletion erpnext/tests/test_zform_loads.py
Expand Up @@ -17,7 +17,7 @@ def test_load(self):
)

for doctype in doctypes:
last_doc = frappe.db.get_value(doctype, {}, "name", order_by="modified desc")
last_doc = frappe.db.get_value(doctype, {}, "name", order_by="creation desc")
if not last_doc:
continue
with self.subTest(msg=f"Loading {doctype} - {last_doc}", doctype=doctype, last_doc=last_doc):
Expand Down
2 changes: 1 addition & 1 deletion erpnext/www/support/index.py
Expand Up @@ -76,7 +76,7 @@ def get_help_article_list():
"Help Article",
fields="*",
filters={"category": category.name, "published": 1},
order_by="modified desc",
order_by="creation desc",
limit=5,
)
if help_articles:
Expand Down