Merge pull request #5413 from kressi/patch-1
[doc] fixed typo
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
index e2e21fa..5c82142 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
@@ -6,7 +6,7 @@
from frappe.utils import cstr
from unidecode import unidecode
-def create_charts(chart_name, company, ignore_permissions=False):
+def create_charts(chart_name, company):
chart = get_chart(chart_name)
if chart:
@@ -44,7 +44,7 @@
if root_account or frappe.local.flags.allow_unverified_charts:
account.flags.ignore_mandatory = True
- account.flags.ignore_permissions = ignore_permissions
+ account.flags.ignore_permissions = True
account.insert()
diff --git a/erpnext/accounts/doctype/asset/asset.json b/erpnext/accounts/doctype/asset/asset.json
index c272a58..fa53aed 100644
--- a/erpnext/accounts/doctype/asset/asset.json
+++ b/erpnext/accounts/doctype/asset/asset.json
@@ -3,6 +3,7 @@
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:asset_name",
+ "beta": 0,
"creation": "2016-03-01 17:01:27.920130",
"custom": 0,
"docstatus": 0,
@@ -738,7 +739,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-04-22 11:15:40.055518",
+ "modified": "2016-05-30 18:09:56.158782",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Asset",
diff --git a/erpnext/accounts/doctype/budget_account/budget_account.json b/erpnext/accounts/doctype/budget_account/budget_account.json
index 43dbbd9..e27af68 100644
--- a/erpnext/accounts/doctype/budget_account/budget_account.json
+++ b/erpnext/accounts/doctype/budget_account/budget_account.json
@@ -39,30 +39,6 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
- "fieldname": "column_break_2",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
"fieldname": "budget_amount",
"fieldtype": "Currency",
"hidden": 0,
@@ -94,7 +70,7 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2016-05-16 11:55:29.586591",
+ "modified": "2016-05-30 17:57:03.483750",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Budget Account",
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index 87942e5..40386e0 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -728,8 +728,9 @@
amount_field: abs(against_jv_amount)
}
elif args.get("doctype") in ("Sales Invoice", "Purchase Invoice"):
+ party_type = "Customer" if args.get("doctype") == "Sales Invoice" else "Supplier"
invoice = frappe.db.get_value(args["doctype"], args["docname"],
- ["outstanding_amount", "conversion_rate"], as_dict=1)
+ ["outstanding_amount", "conversion_rate", scrub(party_type)], as_dict=1)
exchange_rate = invoice.conversion_rate if (args.get("account_currency") != company_currency) else 1
@@ -742,7 +743,9 @@
return {
amount_field: abs(flt(invoice.outstanding_amount)),
- "exchange_rate": exchange_rate
+ "exchange_rate": exchange_rate,
+ "party_type": party_type,
+ "party": invoice.get(scrub(party_type))
}
@frappe.whitelist()
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 3b78683..27f1394 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -7,7 +7,6 @@
from frappe.utils import nowdate, cstr, flt, cint, now, getdate
from frappe import throw, _
from frappe.utils import formatdate
-import frappe.desk.reportview
# imported to enable erpnext.accounts.utils.get_account_currency
from erpnext.accounts.doctype.account.account import get_account_currency
@@ -128,20 +127,20 @@
if not args:
args = frappe.local.form_dict
args.pop("cmd")
-
+
ac = frappe.new_doc("Account")
-
+
if args.get("ignore_permissions"):
ac.flags.ignore_permissions = True
args.pop("ignore_permissions")
-
+
ac.update(args)
ac.old_parent = ""
ac.freeze_account = "No"
if cint(ac.get("is_root")):
ac.parent_account = None
- ac.flags.ignore_mandatory = True
-
+ ac.flags.ignore_mandatory = True
+
ac.insert()
return ac.name
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index ac266f5..a471911 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -966,6 +966,9 @@
},
setup_item_selector: function() {
+ // TODO: remove item selector
+
+ return;
if(!this.item_selector) {
this.item_selector = new erpnext.ItemSelector({frm: this.frm});
}
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index 22a33d0..7da7c25 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -98,7 +98,7 @@
"company": self.name,
"create_account_under": stock_group
})
- warehouse.flags.ignore_permissions = self.flags.ignore_permissions
+ warehouse.flags.ignore_permissions = True
warehouse.insert()
def create_default_accounts(self):
@@ -106,7 +106,7 @@
self.chart_of_accounts = "Standard"
from erpnext.accounts.doctype.account.chart_of_accounts.chart_of_accounts import create_charts
- create_charts(self.chart_of_accounts, self.name, self.flags.ignore_permissions)
+ create_charts(self.chart_of_accounts, self.name)
frappe.db.set(self, "default_receivable_account", frappe.db.get_value("Account",
{"company": self.name, "account_type": "Receivable", "is_group": 0}))
diff --git a/erpnext/stock/dashboard/item_dashboard.js b/erpnext/stock/dashboard/item_dashboard.js
index 99edb0f..1c7e504 100644
--- a/erpnext/stock/dashboard/item_dashboard.js
+++ b/erpnext/stock/dashboard/item_dashboard.js
@@ -79,6 +79,7 @@
},
get_item_dashboard_data: function(data, max_count, show_item) {
if(!max_count) max_count = 0;
+ if(!data) data = [];
data.forEach(function(d) {
d.actual_or_pending = d.projected_qty + d.reserved_qty + d.reserved_qty_for_production;
d.pending_qty = 0;
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index 9e48fed..bd2ada9 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -487,56 +487,59 @@
for variant_of in frappe.get_all("Item", filters={"variant_of": self.name}):
frappe.delete_doc("Item", variant_of.name)
- def before_rename(self, olddn, newdn, merge=False):
+ def before_rename(self, old_name, new_name, merge=False):
+ if self.item_name==old_name:
+ self.item_name=new_name
+
if merge:
# Validate properties before merging
- if not frappe.db.exists("Item", newdn):
- frappe.throw(_("Item {0} does not exist").format(newdn))
+ if not frappe.db.exists("Item", new_name):
+ frappe.throw(_("Item {0} does not exist").format(new_name))
field_list = ["stock_uom", "is_stock_item", "has_serial_no", "has_batch_no"]
- new_properties = [cstr(d) for d in frappe.db.get_value("Item", newdn, field_list)]
+ new_properties = [cstr(d) for d in frappe.db.get_value("Item", new_name, field_list)]
if new_properties != [cstr(self.get(fld)) for fld in field_list]:
frappe.throw(_("To merge, following properties must be same for both items")
+ ": \n" + ", ".join([self.meta.get_label(fld) for fld in field_list]))
- frappe.db.sql("delete from `tabBin` where item_code=%s", olddn)
+ frappe.db.sql("delete from `tabBin` where item_code=%s", old_name)
- def after_rename(self, olddn, newdn, merge):
- super(Item, self).after_rename(olddn, newdn, merge)
+ def after_rename(self, old_name, new_name, merge):
+ super(Item, self).after_rename(old_name, new_name, merge)
if self.page_name:
invalidate_cache_for_item(self)
clear_cache(self.page_name)
- frappe.db.set_value("Item", newdn, "item_code", newdn)
+ frappe.db.set_value("Item", new_name, "item_code", new_name)
if merge:
- self.set_last_purchase_rate(newdn)
- self.recalculate_bin_qty(newdn)
+ self.set_last_purchase_rate(new_name)
+ self.recalculate_bin_qty(new_name)
for dt in ("Sales Taxes and Charges", "Purchase Taxes and Charges"):
for d in frappe.db.sql("""select name, item_wise_tax_detail from `tab{0}`
where ifnull(item_wise_tax_detail, '') != ''""".format(dt), as_dict=1):
item_wise_tax_detail = json.loads(d.item_wise_tax_detail)
- if olddn in item_wise_tax_detail:
- item_wise_tax_detail[newdn] = item_wise_tax_detail[olddn]
- item_wise_tax_detail.pop(olddn)
+ if old_name in item_wise_tax_detail:
+ item_wise_tax_detail[new_name] = item_wise_tax_detail[old_name]
+ item_wise_tax_detail.pop(old_name)
frappe.db.set_value(dt, d.name, "item_wise_tax_detail",
json.dumps(item_wise_tax_detail), update_modified=False)
- def set_last_purchase_rate(self, newdn):
- last_purchase_rate = get_last_purchase_details(newdn).get("base_rate", 0)
- frappe.db.set_value("Item", newdn, "last_purchase_rate", last_purchase_rate)
+ def set_last_purchase_rate(self, new_name):
+ last_purchase_rate = get_last_purchase_details(new_name).get("base_rate", 0)
+ frappe.db.set_value("Item", new_name, "last_purchase_rate", last_purchase_rate)
- def recalculate_bin_qty(self, newdn):
+ def recalculate_bin_qty(self, new_name):
from erpnext.stock.stock_balance import repost_stock
frappe.db.auto_commit_on_many_writes = 1
existing_allow_negative_stock = frappe.db.get_value("Stock Settings", None, "allow_negative_stock")
frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
for warehouse in frappe.db.sql("select name from `tabWarehouse`"):
- repost_stock(newdn, warehouse[0])
+ repost_stock(new_name, warehouse[0])
frappe.db.set_value("Stock Settings", None, "allow_negative_stock", existing_allow_negative_stock)
frappe.db.auto_commit_on_many_writes = 0
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index 737902b..69d9a76 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -67,7 +67,7 @@
}
});
- if(!this.item_selector) {
+ if(!this.item_selector && false) {
this.item_selector = new erpnext.ItemSelector({frm: this.frm});
}
},