diff --git a/erpnext/accounts/doctype/subscription/subscription.py b/erpnext/accounts/doctype/subscription/subscription.py index 8a6953ad80ad..62555b4e0cb2 100644 --- a/erpnext/accounts/doctype/subscription/subscription.py +++ b/erpnext/accounts/doctype/subscription/subscription.py @@ -771,6 +771,16 @@ def process(data): frappe.log_error(title=f"Error al procesar la Suscripción {subscription.name}", message=frappe.get_traceback()) subscription.run_trigger("error") frappe.db.commit() + except Exception: + frappe.db.rollback() + frappe.db.begin() + frappe.log_error(title=f"Error al procesar la Suscripción {data.get('name')}", message=frappe.get_traceback()) + try: + subscription = frappe.get_doc('Subscription', data['name']) + subscription.run_trigger("error") + except Exception: + pass + frappe.db.commit() def debe_asignar_cae(comprobante): @@ -874,4 +884,14 @@ def get_subscription_updates(name): frappe.db.begin() frappe.log_error(title=f"Error al procesar la Suscripción {subscription.name}", message=frappe.get_traceback()) subscription.run_trigger("error") - frappe.db.commit() \ No newline at end of file + frappe.db.commit() + except Exception: + frappe.db.rollback() + frappe.db.begin() + frappe.log_error(title=f"Error al procesar la Suscripción {name}", message=frappe.get_traceback()) + try: + subscription = frappe.get_doc('Subscription', name) + subscription.run_trigger("error") + except Exception: + pass + frappe.db.commit() \ No newline at end of file diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js index 4a0bc3e98f8c..3fc9a6ddc820 100755 --- a/erpnext/public/js/utils.js +++ b/erpnext/public/js/utils.js @@ -130,7 +130,7 @@ $.extend(erpnext.utils, { }, add_indicator_for_multicompany: function(frm, info) { - frm.dashboard.stats_area.removeClass('hidden'); + frm.dashboard.stats_area.show(); frm.dashboard.stats_area_row.addClass('flex'); frm.dashboard.stats_area_row.css('flex-wrap', 'wrap'); diff --git a/erpnext/selling/report/sales_analytics/sales_analytics.json b/erpnext/selling/report/sales_analytics/sales_analytics.json index 5d72dfa79cd9..8f6e0553a91a 100644 --- a/erpnext/selling/report/sales_analytics/sales_analytics.json +++ b/erpnext/selling/report/sales_analytics/sales_analytics.json @@ -1,13 +1,13 @@ { "add_total_row": 1, "creation": "2018-09-21 12:46:29.451048", - "disable_prepared_report": 0, + "disable_prepared_report": 1, "disabled": 0, "docstatus": 0, "doctype": "Report", "idx": 0, "is_standard": "Yes", - "modified": "2020-06-20 17:41:03.132101", + "modified": "2020-06-20 17:42:03.132101", "modified_by": "Administrator", "module": "Selling", "name": "Sales Analytics",