Merge pull request #312 from saurabh6790/master
updated accounts_controller.py, buying_controller.py, selling_controller.py
This commit is contained in:
		
						commit
						2d12a42145
					
				| @ -22,6 +22,10 @@ from webnotes.utils import flt | |||||||
| from utilities.transaction_base import TransactionBase | from utilities.transaction_base import TransactionBase | ||||||
| 
 | 
 | ||||||
| class AccountsController(TransactionBase): | class AccountsController(TransactionBase): | ||||||
|  | 	def validate(self): | ||||||
|  | 		if self.meta.get_field("grand_total"): | ||||||
|  | 			self.validate_value("grand_total", ">=", 0) | ||||||
|  | 
 | ||||||
| 	def get_gl_dict(self, args, cancel=None): | 	def get_gl_dict(self, args, cancel=None): | ||||||
| 		"""this method populates the common properties of a gl entry record""" | 		"""this method populates the common properties of a gl entry record""" | ||||||
| 		if cancel is None: | 		if cancel is None: | ||||||
|  | |||||||
| @ -28,6 +28,7 @@ from controllers.stock_controller import StockController | |||||||
| 
 | 
 | ||||||
| class BuyingController(StockController): | class BuyingController(StockController): | ||||||
| 	def validate(self): | 	def validate(self): | ||||||
|  | 		super(BuyingController, self).validate() | ||||||
| 		if self.meta.get_field("currency"): | 		if self.meta.get_field("currency"): | ||||||
| 			self.company_currency = get_company_currency(self.doc.company) | 			self.company_currency = get_company_currency(self.doc.company) | ||||||
| 			self.validate_conversion_rate("currency", "conversion_rate") | 			self.validate_conversion_rate("currency", "conversion_rate") | ||||||
|  | |||||||
| @ -23,6 +23,7 @@ from controllers.stock_controller import StockController | |||||||
| 
 | 
 | ||||||
| class SellingController(StockController): | class SellingController(StockController): | ||||||
| 	def validate(self): | 	def validate(self): | ||||||
|  | 		super(SellingController, self).validate() | ||||||
| 		self.set_total_in_words() | 		self.set_total_in_words() | ||||||
| 		 | 		 | ||||||
| 	def set_total_in_words(self): | 	def set_total_in_words(self): | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user