Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1740 from nabinhait/v4-hotfix

Browse Source 
fixes
This commit is contained in:
Anand Doshi 2014-06-04 11:56:42 +05:30
commit 7a3885863c
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/account/account.json
View File

@ -80,6 +80,7 @@
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "Account", "options": "Account",
"permlevel": 0, "permlevel": 0,
"reqd": 1,
"search_index": 1 "search_index": 1
}, },
{ {
@ -209,7 +210,7 @@
"icon": "icon-money", "icon": "icon-money",
"idx": 1, "idx": 1,
"in_create": 1, "in_create": 1,
"modified": "2014-05-21 11:42:47.255511", "modified": "2014-06-03 18:27:58.109303",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Account", "name": "Account",

2
erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
View File

@ -22,7 +22,7 @@ def execute(filters=None):
total_debit += flt(d[4]) total_debit += flt(d[4])
total_credit += flt(d[5]) total_credit += flt(d[5])
bank_bal = flt(balance_as_per_company) + flt(total_debit) - flt(total_credit) bank_bal = flt(balance_as_per_company) - flt(total_debit) + flt(total_credit)
data += [ data += [
get_balance_row("Balance as per company books", balance_as_per_company), get_balance_row("Balance as per company books", balance_as_per_company),

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

@ -91,6 +91,8 @@ class Company(Document):
for d in self.fld_dict.keys(): for d in self.fld_dict.keys():
account.set(d, (d == 'parent_account' and lst[self.fld_dict[d]]) and lst[self.fld_dict[d]] +' - '+ self.abbr or lst[self.fld_dict[d]]) account.set(d, (d == 'parent_account' and lst[self.fld_dict[d]]) and lst[self.fld_dict[d]] +' - '+ self.abbr or lst[self.fld_dict[d]])
if not account.parent_account:
account.ignore_mandatory = True
account.insert() account.insert()
def set_default_accounts(self): def set_default_accounts(self):

3
erpnext/stock/doctype/warehouse/warehouse.py
View File

@ -38,8 +38,7 @@ class Warehouse(Document):
def create_account_head(self): def create_account_head(self):
if cint(frappe.defaults.get_global_default("auto_accounting_for_stock")): if cint(frappe.defaults.get_global_default("auto_accounting_for_stock")):
if not frappe.db.get_value("Account", {"account_type": "Warehouse", if not frappe.db.get_value("Account", {"account_type": "Warehouse",
"master_name": self.name}) and not frappe.db.get_value("Account", "master_name": self.name}):
{"account_name": self.warehouse_name}):
if self.get("__islocal") or not frappe.db.get_value( if self.get("__islocal") or not frappe.db.get_value(
"Stock Ledger Entry", {"warehouse": self.name}): "Stock Ledger Entry", {"warehouse": self.name}):
self.validate_parent_account() self.validate_parent_account()

1
erpnext/stock/get_item_details.py
View File

@ -255,6 +255,7 @@ def apply_pricing_rule(args):
args = frappe._dict(args) args = frappe._dict(args)
out = frappe._dict() out = frappe._dict()
if not args.get("item_code"): return
if not args.get("item_group") or not args.get("brand"): if not args.get("item_group") or not args.get("brand"):
args.item_group, args.brand = frappe.db.get_value("Item", args.item_group, args.brand = frappe.db.get_value("Item",