nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-23 20:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

frappe/frappe#478

Browse Source
This commit is contained in:
Rushabh Mehta
2014-03-28 16:44:37 +05:30
parent 43405203b2
commit b385ecf65e
83 changed files with 349 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/controllers/accounts_controller.py
View File

@@ -118,7 +118,7 @@ class AccountsController(TransactionBase):
tax_doctype = self.meta.get_field(tax_parentfield).options
from frappe.model import default_fields
tax_master = frappe.bean(tax_master_doctype, self.get(tax_master_field))
tax_master = frappe.get_doc(tax_master_doctype, self.get(tax_master_field))
for i, tax in enumerate(tax_master.get(tax_parentfield)):
for fieldname in default_fields:

6
erpnext/controllers/selling_controller.py
View File

@@ -35,7 +35,7 @@ class SellingController(StockController):
if self.customer:
from erpnext.accounts.party import _get_party_details
self.update_if_missing(_get_party_details(self.customer,
ignore_permissions=self.bean.ignore_permissions))
ignore_permissions=self.ignore_permissions))
elif self.lead:
from erpnext.selling.doctype.lead.lead import get_lead_details
@@ -47,7 +47,7 @@ class SellingController(StockController):
def apply_shipping_rule(self):
if self.shipping_rule:
shipping_rule = frappe.bean("Shipping Rule", self.shipping_rule)
shipping_rule = frappe.get_doc("Shipping Rule", self.shipping_rule)
value = self.net_total
# TODO
@@ -274,7 +274,7 @@ class SellingController(StockController):
total_outstanding = total_outstanding[0][0] if total_outstanding else 0
outstanding_including_current = flt(total_outstanding) + flt(grand_total)
frappe.bean('Account', customer_account).run_method("check_credit_limit",
frappe.get_doc('Account', customer_account).run_method("check_credit_limit",
outstanding_including_current)
def validate_max_discount(self):