diff --git a/erpnext/accounts/doctype/budget/budget.py b/erpnext/accounts/doctype/budget/budget.py index 529401c84be..2488dd68cab 100644 --- a/erpnext/accounts/doctype/budget/budget.py +++ b/erpnext/accounts/doctype/budget/budget.py @@ -51,6 +51,9 @@ class Budget(Document): def validate_expense_against_budget(args): args = frappe._dict(args) + if not args.cost_center: + return + if frappe.db.get_value("Account", {"name": args.account, "root_type": "Expense"}): cc_lft, cc_rgt = frappe.db.get_value("Cost Center", args.cost_center, ["lft", "rgt"]) diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js index 8da1332ff1d..de85621a640 100644 --- a/erpnext/accounts/page/pos/pos.js +++ b/erpnext/accounts/page/pos/pos.js @@ -667,7 +667,6 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ show_items_in_item_cart: function() { var me = this; var $items = this.wrapper.find(".items").empty(); - me.frm.doc.net_total = 0.0 $.each(this.frm.doc.items|| [], function(i, d) { $(frappe.render_template("pos_bill_item", { item_code: d.item_code, diff --git a/erpnext/accounts/party_status.py b/erpnext/accounts/party_status.py index 68b48184e79..6d9efb190b6 100644 --- a/erpnext/accounts/party_status.py +++ b/erpnext/accounts/party_status.py @@ -55,7 +55,6 @@ def notify_status(doc, method=None): if party.status == 'Open': # may be open elsewhere, check # default status - party.status = status update_status(party) party.update_modified() diff --git a/erpnext/patches.txt b/erpnext/patches.txt index c6910c7c3e3..aec1863ab4e 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -268,7 +268,7 @@ erpnext.patches.v6_20x.remove_fiscal_year_from_holiday_list erpnext.patches.v6_24.map_customer_address_to_shipping_address_on_po erpnext.patches.v6_27.fix_recurring_order_status erpnext.patches.v6_20x.update_product_bundle_description -erpnext.patches.v7_0.update_party_status +erpnext.patches.v7_0.update_party_status #2016-09-22 erpnext.patches.v7_0.update_item_projected erpnext.patches.v7_0.remove_features_setup erpnext.patches.v7_0.update_home_page diff --git a/erpnext/patches/v7_0/convert_timelog_to_timesheet.py b/erpnext/patches/v7_0/convert_timelog_to_timesheet.py index 16b2aec4cdd..2ca72b4b486 100644 --- a/erpnext/patches/v7_0/convert_timelog_to_timesheet.py +++ b/erpnext/patches/v7_0/convert_timelog_to_timesheet.py @@ -28,6 +28,7 @@ def execute(): time_sheet.update_cost() time_sheet.calculate_total_amounts() time_sheet.flags.ignore_validate = True + time_sheet.flags.ignore_links = True time_sheet.save(ignore_permissions=True) # To ignore validate_mandatory_fields function diff --git a/erpnext/patches/v7_0/convert_timelogbatch_to_timesheet.py b/erpnext/patches/v7_0/convert_timelogbatch_to_timesheet.py index 0eff8d4c5b6..a7cb0d74ce1 100644 --- a/erpnext/patches/v7_0/convert_timelogbatch_to_timesheet.py +++ b/erpnext/patches/v7_0/convert_timelogbatch_to_timesheet.py @@ -17,10 +17,10 @@ def execute(): add_timesheet_detail(time_sheet, args) time_sheet.docstatus = tlb.docstatus + time_sheet.flags.ignore_links = True time_sheet.save(ignore_permissions=True) def get_timesheet_data(data): - time_log = frappe.get_all('Time Log', fields=["*"], - filters = {'name': data.time_log})[0] - - return get_timelog_data(time_log) \ No newline at end of file + time_log = frappe.get_all('Time Log', fields=["*"], filters = {'name': data.time_log}) + if time_log: + return get_timelog_data(time_log[0]) \ No newline at end of file diff --git a/erpnext/patches/v7_0/move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet.py b/erpnext/patches/v7_0/move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet.py index 033295554e1..727a44ee284 100644 --- a/erpnext/patches/v7_0/move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet.py +++ b/erpnext/patches/v7_0/move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet.py @@ -5,6 +5,8 @@ def execute(): frappe.reload_doc('accounts', 'doctype', 'sales_invoice_payment') for time_sheet in frappe.db.sql(""" select sales_invoice, name, total_billable_amount from `tabTimesheet` where sales_invoice is not null and docstatus < 2""", as_dict=True): + if not frappe.db.exists('Sales Invoice', time_sheet.sales_invoice): + continue si_doc = frappe.get_doc('Sales Invoice', time_sheet.sales_invoice) ts = si_doc.append('timesheets',{}) ts.time_sheet = time_sheet.name diff --git a/erpnext/patches/v7_0/remove_features_setup.py b/erpnext/patches/v7_0/remove_features_setup.py index 60d19265a06..596f7a9dcf6 100644 --- a/erpnext/patches/v7_0/remove_features_setup.py +++ b/erpnext/patches/v7_0/remove_features_setup.py @@ -7,6 +7,8 @@ def execute(): frappe.reload_doctype('Stock Settings') stock_settings = frappe.get_doc('Stock Settings', 'Stock Settings') stock_settings.show_barcode_field = cint(frappe.db.get_value("Features Setup", None, "fs_item_barcode")) + if not frappe.db.exists("UOM", stock_settings.stock_uom): + stock_settings.stock_uom = None stock_settings.save() create_compact_item_print_custom_field() diff --git a/erpnext/patches/v7_0/setup_account_table_for_expense_claim_type_if_exists.py b/erpnext/patches/v7_0/setup_account_table_for_expense_claim_type_if_exists.py index 96224909aea..c5657079b33 100644 --- a/erpnext/patches/v7_0/setup_account_table_for_expense_claim_type_if_exists.py +++ b/erpnext/patches/v7_0/setup_account_table_for_expense_claim_type_if_exists.py @@ -16,4 +16,5 @@ def execute(): "company": frappe.db.get_value("Account", expense_claim_type.default_account, "company"), "default_account": expense_claim_type.default_account, }) + doc.flags.ignore_mandatory = True doc.save(ignore_permissions=True) \ No newline at end of file diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index 34cbbae31bd..a928a9a6b3e 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -668,6 +668,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ me._set_values_for_item_list(r.message); if(item) me.set_gross_profit(item); if(calculate_taxes_and_totals) me.calculate_taxes_and_totals(); + if(me.frm.doc.apply_discount_on) me.frm.trigger("apply_discount_on") } } }); diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index ced36791c02..0435141d530 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -553,6 +553,9 @@ def get_events(start, end, filters=None): def make_purchase_order_for_drop_shipment(source_name, for_supplier, target_doc=None): def set_missing_values(source, target): target.supplier = for_supplier + target.apply_discount_on = "" + target.additional_discount_percentage = 0.0 + target.discount_amount = 0.0 default_price_list = frappe.get_value("Supplier", for_supplier, "default_price_list") if default_price_list: diff --git a/erpnext/stock/doctype/warehouse/warehouse.py b/erpnext/stock/doctype/warehouse/warehouse.py index e371d7013e9..f657ebf23b2 100644 --- a/erpnext/stock/doctype/warehouse/warehouse.py +++ b/erpnext/stock/doctype/warehouse/warehouse.py @@ -71,7 +71,7 @@ class Warehouse(NestedSet): "freeze_account": "No" }) ac_doc.flags.ignore_permissions = True - + ac_doc.flags.ignore_mandatory = True try: ac_doc.insert() msgprint(_("Account head {0} created").format(ac_doc.name))