diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 27348bbdfea..8f82fc6284a 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -786,6 +786,7 @@ def get_income_account(doctype, txt, searchfield, start, page_len, filters): @frappe.whitelist() def make_delivery_note(source_name, target_doc=None): def set_missing_values(source, target): + target.ignore_pricing_rule = 1 target.run_method("set_missing_values") target.run_method("calculate_taxes_and_totals") diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.js b/erpnext/accounts/page/accounts_browser/accounts_browser.js index 5fe1618c2ac..ba8d747d723 100644 --- a/erpnext/accounts/page/accounts_browser/accounts_browser.js +++ b/erpnext/accounts/page/accounts_browser/accounts_browser.js @@ -25,16 +25,16 @@ pscript['onload_Accounts Browser'] = function(wrapper){ '
  • '+__('To add child nodes, explore tree and click on the node under which you want to add more nodes.')+'
  • '+ '
  • '+ __('Accounting Entries can be made against leaf nodes, called')+ - '' +__('Ledgers')+'.'+ __('Entries against') + - '' +__('Groups') + ''+ __('are not allowed.')+ + ' ' +__('Ledgers')+'. '+ __('Entries against ') + + '' +__('Groups') + ' '+ __('are not allowed.')+ '
  • '+ '
  • '+__('Please do NOT create Account (Ledgers) for Customers and Suppliers. They are created directly from the Customer / Supplier masters.')+'
  • '+ '
  • '+ - ''+__('To create a Bank Account:')+''+ + ''+__('To create a Bank Account')+': '+ __('Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account Ledger (by clicking on Add Child) of type "Bank"')+ '
  • '+ '
  • '+ - ''+__('To create a Tax Account:')+''+ + ''+__('To create a Tax Account') +': '+ __('Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account Ledger (by clicking on Add Child) of type "Tax" and do mention the Tax rate.')+ '
  • '+ ''+ diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 35ee608754d..c29f2d81caf 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -69,7 +69,7 @@ erpnext.patches.v4_1.fix_jv_remarks erpnext.patches.v4_1.fix_sales_order_delivered_status erpnext.patches.v4_1.fix_delivery_and_billing_status execute:frappe.db.sql("update `tabAccount` set root_type='Liability' where root_type='Income' and report_type='Balance Sheet'") -execute:frappe.delete_doc("DocType", "Payment to Invoice Matching Tool") -execute:frappe.delete_doc("DocType", "Payment to Invoice Matching Tool Detail") +execute:frappe.delete_doc("DocType", "Payment to Invoice Matching Tool") # 29-07-2014 +execute:frappe.delete_doc("DocType", "Payment to Invoice Matching Tool Detail") # 29-07-2014 execute:frappe.delete_doc("Page", "trial-balance") #2014-07-22 erpnext.patches.v4_2.delete_old_print_formats #2014-07-29 diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py index df3fef437bb..0e92b5d4710 100644 --- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py @@ -74,14 +74,14 @@ class StockLedgerEntry(Document): if stock_frozen_upto: stock_auth_role = frappe.db.get_value('Stock Settings', None,'stock_auth_role') if getdate(self.posting_date) <= getdate(stock_frozen_upto) and not stock_auth_role in frappe.user.get_roles(): - frappe.throw(_("Entries before {0} are frozen").format(formatdate(stock_frozen_upto)), StockFreezeError) + frappe.throw(_("Stock transactions before {0} are frozen").format(formatdate(stock_frozen_upto)), StockFreezeError) stock_frozen_upto_days = int(frappe.db.get_value('Stock Settings', None, 'stock_frozen_upto_days') or 0) if stock_frozen_upto_days: stock_auth_role = frappe.db.get_value('Stock Settings', None,'stock_auth_role') older_than_x_days_ago = (add_days(getdate(self.posting_date), stock_frozen_upto_days) <= date.today()) if older_than_x_days_ago and not stock_auth_role in frappe.user.get_roles(): - frappe.throw(_("Not allowed to update entries older than {0}").format(stock_frozen_upto_days), StockFreezeError) + frappe.throw(_("Not allowed to update stock transactions older than {0}").format(stock_frozen_upto_days), StockFreezeError) def scrub_posting_time(self): if not self.posting_time or self.posting_time == '00:0':