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

frappe/frappe#478, more changes, removed bean

Browse Source
This commit is contained in:
Rushabh Mehta
2014-04-03 14:30:42 +05:30
parent d36cb5c812
commit f14b809ab5
59 changed files with 243 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
erpnext/controllers/accounts_controller.py
View File

@@ -86,15 +86,16 @@ class AccountsController(TransactionBase):
def set_missing_item_details(self):
"""set missing item values"""
from erpnext.stock.get_item_details import get_item_details
for item in self.get(self.fname):
if item.get("item_code"):
args = item.fields.copy()
args.update(self.fields)
ret = get_item_details(args)
for fieldname, value in ret.items():
if self.meta.get_field(fieldname, parentfield=self.fname) and \
item.get(fieldname) is None and value is not None:
item.set(fieldname, value)
if hasattr(self, "fname"):
for item in self.get(self.fname):
if item.get("item_code"):
args = item.as_dict()
args.update(self.as_dict())
ret = get_item_details(args)
for fieldname, value in ret.items():
if self.meta.get_field(fieldname, parentfield=self.fname) and \
item.get(fieldname) is None and value is not None:
item.set(fieldname, value)
def set_taxes(self, tax_parentfield, tax_master_field):
if not self.meta.get_field(tax_parentfield):

4
erpnext/controllers/selling_controller.py
View File

@@ -32,12 +32,12 @@ class SellingController(StockController):
self.set_taxes("other_charges", "taxes_and_charges")
def set_missing_lead_customer_details(self):
if self.customer:
if getattr(self, "customer", None):
from erpnext.accounts.party import _get_party_details
self.update_if_missing(_get_party_details(self.customer,
ignore_permissions=self.ignore_permissions))
elif self.lead:
elif getattr(self, "lead", None):
from erpnext.selling.doctype.lead.lead import get_lead_details
self.update_if_missing(get_lead_details(self.lead))