vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(conflicts): fix conflicts'

Browse source
This commit is contained in:
Rushabh Mehta 2022-04-18 15:47:05 +05:30
parent 57a55e4225
commit d55986d56d
4 changed files with 4 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
frappe/desk/doctype/system_console/system_console.json
View file

@ -1,11 +1,7 @@
{
"actions": [
{
<<<<<<< HEAD
"action": "app/console-log",
=======
"action": "/app/console-log",
>>>>>>> 6d82805831 (feat(minor): Add document reference to Error Log and doc.log_error)
"action_type": "Route",
"label": "Logs"
},
@ -90,11 +86,7 @@
"index_web_pages_for_search": 1,
"issingle": 1,
"links": [],
<<<<<<< HEAD
"modified": "2022-04-09 16:35:32.345542",
=======
"modified": "2022-04-15 14:15:58.398590",
>>>>>>> 6d82805831 (feat(minor): Add document reference to Error Log and doc.log_error)
"modified_by": "Administrator",
"module": "Desk",
"name": "System Console",
@ -114,4 +106,4 @@
"sort_order": "DESC",
"states": [],
"track_changes": 1
}
}

2
frappe/desk/query_report.py
View file

@ -314,7 +314,7 @@ def get_prepared_report_result(report, filters, dn="", user=None):
latest_report_data = {"columns": columns, "result": data}
except Exception:
doc.log_error(frappe.get_traceback())
doc.log_error("Prepared report failed")
frappe.delete_doc("Prepared Report", doc.name)
frappe.db.commit()
doc = None

10
frappe/email/doctype/newsletter/newsletter.py
View file

@ -338,16 +338,8 @@ def send_scheduled_email():
frappe.db.rollback()
# wasn't able to send emails :(
<<<<<<< HEAD
frappe.db.set_value("Newsletter", newsletter, "email_sent", 0)
message = (
f"Newsletter {newsletter} failed to send" "\n\n" f"Traceback: {frappe.get_traceback()}"
)
frappe.log_error(title="Send Newsletter", message=message)
=======
frappe.db.set_value("Newsletter", newsletter_name, "email_sent", 0)
newsletter.log_error('Failed to send newsletter')
>>>>>>> 6d82805831 (feat(minor): Add document reference to Error Log and doc.log_error)
newsletter.log_error("Failed to send newsletter")
if not frappe.flags.in_test:
frappe.db.commit()

6
frappe/social/doctype/energy_point_rule/energy_point_rule.py
View file

@ -57,11 +57,7 @@ class EnergyPointRule(Document):
self.apply_only_once,
)
except Exception as e:
<<<<<<< HEAD
frappe.log_error(frappe.get_traceback(), "apply_energy_point")
=======
self.log_error('Energy points failed')
>>>>>>> 6d82805831 (feat(minor): Add document reference to Error Log and doc.log_error)
self.log_error("Energy points failed")
def rule_condition_satisfied(self, doc):
if self.for_doc_event == "New":