Ameya Shenoy 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							873e28d9b8 
							
						 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						
						
						
					 
					
						2018-06-06 05:53:19 +00:00 
						 
				 
			
				
					
						
							
							
								Zarrar 
							
						 
					 
					
						
						
						
						
							
						
						
							fc03a0463c 
							
						 
					 
					
						
						
							
							[Fix] Validate items for saleable, purchaseable or subcontractable in transactions ( #14316 )  
						
						... 
						
						
						
						* validate items to see if they are saleable
* check if items are subcontractable or saleable
* improvise name,error message and code
Validate type function validates item if they are of proper type for that transaction and throws descriptive error. 
						
						
					 
					
						2018-06-04 12:52:52 +05:30 
						 
				 
			
				
					
						
							
							
								Manas Solanki 
							
						 
					 
					
						
						
						
						
							
						
						
							5b93562ce3 
							
						 
					 
					
						
						
							
							create default on making of invoice  
						
						
						
						
					 
					
						2018-05-16 17:44:51 +05:30 
						 
				 
			
				
					
						
							
							
								Manas Solanki 
							
						 
					 
					
						
						
						
						
							
						
						
							e3bb1d0e3b 
							
						 
					 
					
						
						
							
							more fixes for the item defaults  
						
						
						
						
					 
					
						2018-05-16 17:14:59 +05:30 
						 
				 
			
				
					
						
							
							
								Manas Solanki 
							
						 
					 
					
						
						
						
						
							
						
						
							64614374d8 
							
						 
					 
					
						
						
							
							fix codacy  
						
						
						
						
					 
					
						2018-05-16 13:00:56 +05:30 
						 
				 
			
				
					
						
							
							
								Manas Solanki 
							
						 
					 
					
						
						
						
						
							
						
						
							bbd8508783 
							
						 
					 
					
						
						
							
							optimize the patch  
						
						
						
						
					 
					
						2018-05-16 13:00:56 +05:30 
						 
				 
			
				
					
						
							
							
								Shreya 
							
						 
					 
					
						
						
						
						
							
						
						
							4d347b1ca0 
							
						 
					 
					
						
						
							
							travis fix  
						
						
						
						
					 
					
						2018-03-19 17:31:19 +05:30 
						 
				 
			
				
					
						
							
							
								Shreya 
							
						 
					 
					
						
						
						
						
							
						
						
							f7b39438d2 
							
						 
					 
					
						
						
							
							travis fix  
						
						
						
						
					 
					
						2018-03-19 14:19:55 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							1e4cfb4bf5 
							
						 
					 
					
						
						
							
							Fixes in setting po nos manually in sales invoice  
						
						
						
						
					 
					
						2018-03-15 12:27:24 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							96f4b22589 
							
						 
					 
					
						
						
							
							Set po nos in DN and SI ( #13290 )  
						
						
						
						
					 
					
						2018-03-13 15:46:59 +05:30 
						 
				 
			
				
					
						
							
							
								rohitwaghchaure 
							
						 
					 
					
						
						
						
						
							
						
						
							45ac31ab93 
							
						 
					 
					
						
						
							
							[Fix] Not able to save sales order ( #12851 )  
						
						
						
						
					 
					
						2018-02-12 11:27:37 +05:30 
						 
				 
			
				
					
						
							
							
								Vishal Dhayagude 
							
						 
					 
					
						
						
						
						
							
						
						
							cce29fabf4 
							
						 
					 
					
						
						
							
							[fix]  validation between Selling Price and Valuation Rate should not be validated in the Sales Return entry ( #12767 )  
						
						
						
						
					 
					
						2018-02-05 12:25:51 +05:30 
						 
				 
			
				
					
						
							
							
								rohitwaghchaure 
							
						 
					 
					
						
						
						
						
							
						
						
							bf4c114c58 
							
						 
					 
					
						
						
							
							[Enhance] Provision to show inclusive tax in print ( #12345 )  
						
						... 
						
						
						
						* [Enhance] Provision to show inclusive tax in print
* POS Print format 
						
						
					 
					
						2018-01-08 15:20:15 +05:30 
						 
				 
			
				
					
						
							
							
								rohitwaghchaure 
							
						 
					 
					
						
						
						
						
							
						
						
							ce8adecbad 
							
						 
					 
					
						
						
							
							Incoming rate fixes ( #11986 )  
						
						
						
						
					 
					
						2017-12-15 12:13:50 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							30dc9a14c6 
							
						 
					 
					
						
						
							
							[feature] [refactor] Shipping Rule for Buying + Refactor ( #11628 )  
						
						... 
						
						
						
						* Shipping rule for Buying
* [refactor] shipping rule 
						
						
					 
					
						2017-11-17 14:31:09 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							877e1bb377 
							
						 
					 
					
						
						
							
							Post GL Entry based on rounded total in Sales/Purchase Invoice ( #11542 )  
						
						
						
						
					 
					
						2017-11-17 12:27:43 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							7eba1a35d3 
							
						 
					 
					
						
						
							
							Controller init args fix ( #11015 )  
						
						... 
						
						
						
						* Controller init args fix
* cleanup useless code 
						
						
					 
					
						2017-10-02 15:59:27 +05:30 
						 
				 
			
				
					
						
							
							
								Saurabh 
							
						 
					 
					
						
						
						
						
							
						
						
							d7e1869a70 
							
						 
					 
					
						
						
							
							[fix] if item code not exists then exclude item in validate_selling_price ( #10800 )  
						
						
						
						
					 
					
						2017-09-18 15:43:35 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							45dce89cae 
							
						 
					 
					
						
						
							
							Print Settings for printing taxes with zero amount ( #10782 )  
						
						... 
						
						
						
						* Print Settings for printing taxes with zero amount
* added __init__.py file to patch module v8_9 
						
						
					 
					
						2017-09-14 15:17:38 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							42343bbc2c 
							
						 
					 
					
						
						
							
							Selling price validation against last purchase rate / valuation rate ( #8702 )  
						
						
						
						
					 
					
						2017-05-05 17:23:17 +05:30 
						 
				 
			
				
					
						
							
							
								mbauskar 
							
						 
					 
					
						
						
						
						
							
						
						
							9e9d242a24 
							
						 
					 
					
						
						
							
							[minor] fixes in test cases and added the test case for multiple uom in selling  
						
						
						
						
					 
					
						2017-04-19 21:05:37 +05:30 
						 
				 
			
				
					
						
							
							
								mbauskar 
							
						 
					 
					
						
						
						
						
							
						
						
							287fe81329 
							
						 
					 
					
						
						
							
							[minor] calculate price list rate based on items uom  
						
						
						
						
					 
					
						2017-04-19 21:05:37 +05:30 
						 
				 
			
				
					
						
							
							
								mbauskar 
							
						 
					 
					
						
						
						
						
							
						
						
							e471b02172 
							
						 
					 
					
						
						
							
							[minor] if packed item warehouse not found then set the parent item warehouse to packed items  
						
						
						
						
					 
					
						2017-04-12 18:51:01 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							cc8b2b2fdb 
							
						 
					 
					
						
						
							
							[fix] [refactor] demo for v8 and remove purchase common  
						
						
						
						
					 
					
						2017-03-31 17:36:48 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							e68f32cf19 
							
						 
					 
					
						
						
							
							UOM Conversion in selling  
						
						
						
						
					 
					
						2017-03-06 16:41:13 +05:30 
						 
				 
			
				
					
						
							
							
								Kanchan Chauhan 
							
						 
					 
					
						
						
						
						
							
						
						
							5a980ac87a 
							
						 
					 
					
						
						
							
							UOM Conversion in Selling  
						
						
						
						
					 
					
						2017-03-06 16:41:12 +05:30 
						 
				 
			
				
					
						
							
							
								mbauskar 
							
						 
					 
					
						
						
						
						
							
						
						
							e9747a8a6e 
							
						 
					 
					
						
						
							
							[minor] fixes in validate selling price  
						
						
						
						
					 
					
						2016-11-16 17:19:47 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							9f26bc16b7 
							
						 
					 
					
						
						
							
							Update selling_controller.py  
						
						
						
						
					 
					
						2016-10-20 16:45:53 +05:30 
						 
				 
			
				
					
						
							
							
								shreyas 
							
						 
					 
					
						
						
						
						
							
						
						
							e8aaa92816 
							
						 
					 
					
						
						
							
							[Minor] Some more fixes to the code  
						
						
						
						
					 
					
						2016-10-20 15:57:45 +05:30 
						 
				 
			
				
					
						
							
							
								shreyas 
							
						 
					 
					
						
						
						
						
							
						
						
							edcba51c8b 
							
						 
					 
					
						
						
							
							[Fix] Added check to validate selling price against valuation rate  
						
						
						
						
					 
					
						2016-10-20 15:57:45 +05:30 
						 
				 
			
				
					
						
							
							
								shreyas 
							
						 
					 
					
						
						
						
						
							
						
						
							1cfe2d7b45 
							
						 
					 
					
						
						
							
							[Minor] Validate purchase price against selling price  
						
						
						
						
					 
					
						2016-10-20 15:57:45 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Waghchaure 
							
						 
					 
					
						
						
						
						
							
						
						
							7d5298997b 
							
						 
					 
					
						
						
							
							Documentation for payments  
						
						
						
						
					 
					
						2016-10-06 16:49:39 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							14aa9c5320 
							
						 
					 
					
						
						
							
							[fix] Cleanup and fixes in update stock feature in Purchase Invoice  
						
						
						
						
					 
					
						2016-04-18 16:59:47 +05:30 
						 
				 
			
				
					
						
							
							
								Umair Sayyed 
							
						 
					 
					
						
						
						
						
							
						
						
							72534deea2 
							
						 
					 
					
						
						
							
							removed Is Sales Item and Is Purchase Item  
						
						
						
						
					 
					
						2016-04-15 12:57:00 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							2f957f27b0 
							
						 
					 
					
						
						
							
							[fix] apply Tax Rule for lead  
						
						
						
						
					 
					
						2016-04-08 17:43:08 +05:30 
						 
				 
			
				
					
						
							
							
								Saurabh 
							
						 
					 
					
						
						
						
						
							
						
						
							d313553ae3 
							
						 
					 
					
						
						
							
							[enhancement] get valuation rate and gross profit on sales order item  
						
						
						
						
					 
					
						2016-03-09 15:42:00 +05:30 
						 
				 
			
				
					
						
							
							
								patilsangram 
							
						 
					 
					
						
						
						
						
							
						
						
							bf2b511988 
							
						 
					 
					
						
						
							
							[Removed Stop Button from SO and PO]  
						
						
						
						
					 
					
						2016-02-22 16:24:23 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							01de945388 
							
						 
					 
					
						
						
							
							[cleanup] Removed 'Is Service Item' checkbox and filters  
						
						... 
						
						
						
						'Is Service Item' checkbox only worked for filtering Items in Maintenance Schedule and Maintenance Visit, and validating that Items in a Maintenance type Order were of type 'Service'. However, it doesn't fit an actual use case where any Sales Item could be given for Maintenance, making the checkbox an unnecessary addition. 
						
						
					 
					
						2016-01-26 16:22:51 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							602e8253be 
							
						 
					 
					
						
						
							
							[enhancement] Int, Currency, Float, Percent as not null and default to 0  
						
						
						
						
					 
					
						2015-11-19 13:23:36 +05:30 
						 
				 
			
				
					
						
							
							
								Saurabh 
							
						 
					 
					
						
						
						
						
							
						
						
							8a8ef85174 
							
						 
					 
					
						
						
							
							[fixes] reviwe fixes  
						
						
						
						
					 
					
						2015-10-29 19:43:33 +05:30 
						 
				 
			
				
					
						
							
							
								Saurabh 
							
						 
					 
					
						
						
						
						
							
						
						
							e930f0f74e 
							
						 
					 
					
						
						
							
							[fixes] filter on supplier list for DropShip, checking closed status  
						
						
						
						
					 
					
						2015-10-29 19:43:33 +05:30 
						 
				 
			
				
					
						
							
							
								Saurabh 
							
						 
					 
					
						
						
						
						
							
						
						
							5b7e9a1c94 
							
						 
					 
					
						
						
							
							[minor fixes]  
						
						
						
						
					 
					
						2015-10-29 19:43:31 +05:30 
						 
				 
			
				
					
						
							
							
								Saurabh 
							
						 
					 
					
						
						
						
						
							
						
						
							c306b21415 
							
						 
					 
					
						
						
							
							[merge fixes]  
						
						
						
						
					 
					
						2015-10-29 19:43:31 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							b445be3552 
							
						 
					 
					
						
						
							
							Test case for delivery to target warehouse  
						
						
						
						
					 
					
						2015-10-13 15:46:42 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							c865f229fb 
							
						 
					 
					
						
						
							
							Target Warehouse in Delivery Note and Sales Invoice and removed Serial No status  
						
						
						
						
					 
					
						2015-10-13 15:46:42 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							cd103c05d6 
							
						 
					 
					
						
						
							
							Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order  
						
						
						
						
					 
					
						2015-09-08 19:24:35 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							1f94fa25a8 
							
						 
					 
					
						
						
							
							Update delivered / ordered qty in sales/purchase order from return entry  
						
						... 
						
						
						
						Reserved Qty logic cleaned up 
						
						
					 
					
						2015-08-25 14:11:12 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							1826791891 
							
						 
					 
					
						
						
							
							[fix][patch] Reserved Qty logic fixed and reposted for existing items  
						
						
						
						
					 
					
						2015-08-19 11:00:00 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							453cc374d4 
							
						 
					 
					
						
						
							
							- Fixed logic of reserved qty calculation while delivered product bundle via Sales Invoice  
						
						... 
						
						
						
						- Delete stock ledger entries on cancellation of Sales Invoice while product bundle delivered
- Make packing list on validate 
						
						
					 
					
						2015-07-29 15:59:57 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							1e8025b327 
							
						 
					 
					
						
						
							
							[cleanup] yes/no selects changed to checks in Item  
						
						
						
						
					 
					
						2015-07-29 11:38:33 +05:30