nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-13 17:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix] default account for manufacturing stock entry should be cogs

Browse Source
This commit is contained in:
Rushabh Mehta
2015-02-25 17:15:45 +05:30
parent 8f62e2448c
commit 66a92792b4
6 changed files with 60 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/setup/doctype/company/company.json
View File

@@ -188,7 +188,7 @@
"fieldname": "default_expense_account",
"fieldtype": "Link",
"ignore_user_permissions": 1,
"label": "Default Expense Account",
"label": "Default Cost of Goods Sold Account",
"no_copy": 1,
"options": "Account",
"permlevel": 0
@@ -399,7 +399,7 @@
],
"icon": "icon-building",
"idx": 1,
"modified": "2015-02-21 10:32:38.523900",
"modified": "2015-02-25 06:28:13.565128",
"modified_by": "Administrator",
"module": "Setup",
"name": "Company",

34
erpnext/setup/doctype/company/company.py
View File

@@ -106,28 +106,30 @@ class Company(Document):
account.insert()
def set_default_accounts(self):
def _set_default_account(fieldname, account_type):
if self.get(fieldname):
return
self._set_default_account("default_cash_account", "Cash")
self._set_default_account("default_bank_account", "Bank")
account = frappe.db.get_value("Account", {"account_type": account_type,
"group_or_ledger": "Ledger", "company": self.name})
if account:
self.db_set(fieldname, account)
_set_default_account("default_cash_account", "Cash")
_set_default_account("default_bank_account", "Bank")
if cint(frappe.db.get_value("Accounts Settings", None, "auto_accounting_for_stock")):
_set_default_account("stock_received_but_not_billed", "Stock Received But Not Billed")
_set_default_account("stock_adjustment_account", "Stock Adjustment")
_set_default_account("expenses_included_in_valuation", "Expenses Included In Valuation")
if cint(frappe.db.get_single_value("Accounts Settings", "auto_accounting_for_stock")):
self._set_default_account("stock_received_but_not_billed", "Stock Received But Not Billed")
self._set_default_account("stock_adjustment_account", "Stock Adjustment")
self._set_default_account("expenses_included_in_valuation", "Expenses Included In Valuation")
self._set_default_account("default_expense_account", "Cost of Goods Sold")
if not self.default_income_account:
self.db_set("default_income_account", frappe.db.get_value("Account",
{"account_name": _("Sales"), "company": self.name}))
def _set_default_account(self, fieldname, account_type):
if self.get(fieldname):
return
account = frappe.db.get_value("Account", {"account_type": account_type,
"group_or_ledger": "Ledger", "company": self.name})
if account:
self.db_set(fieldname, account)
def create_default_cost_center(self):
cc_list = [
{