Fixed conflict

This commit is contained in:
Nabin Hait
2015-09-09 18:45:41 +05:30
93 changed files with 2707 additions and 2657 deletions

View File

@@ -32,10 +32,6 @@ class SellingController(StockController):
self.validate_max_discount()
check_active_sales_items(self)
def check_credit_limit(self):
from erpnext.selling.doctype.customer.customer import check_credit_limit
check_credit_limit(self.customer, self.company)
def set_missing_values(self, for_validate=False):
super(SellingController, self).set_missing_values(for_validate)