Sagar Sharma 
							
						 
					 
					
						
						
						
						
							
						
						
							fa2290657a 
							
						 
					 
					
						
						
							
							fix: add validation for non-stock item in SCR  
						
						
						
						
					 
					
						2022-09-30 16:18:15 +05:30 
						 
				 
			
				
					
						
							
							
								rohitwaghchaure 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							10b7592d14 
							
						 
					 
					
						
						
							
							Merge pull request  #32414  from rohitwaghchaure/consider-searchfields-as-per-customize-form  
						
						... 
						
						
						
						fix: searchfields as per customize form not working for Item 
						
						
					 
					
						2022-09-29 14:51:55 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Waghchaure 
							
						 
					 
					
						
						
						
						
							
						
						
							fd889fd29a 
							
						 
					 
					
						
						
							
							fix: searchfields as per customize form not working for Item  
						
						
						
						
					 
					
						2022-09-28 23:00:45 +05:30 
						 
				 
			
				
					
						
							
							
								Sagar Sharma 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a145d1065a 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into fix/stock-entry/supplied-items  
						
						
						
						
					 
					
						2022-09-28 16:55:57 +05:30 
						 
				 
			
				
					
						
							
							
								Sagar Sharma 
							
						 
					 
					
						
						
						
						
							
						
						
							ac7409bbf3 
							
						 
					 
					
						
						
							
							fix: supplied items added twice in Stock Entry  
						
						
						
						
					 
					
						2022-09-28 16:46:48 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6145013f30 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into fix_asset_scrap_and_sale_dep  
						
						
						
						
					 
					
						2022-09-27 15:56:39 +05:30 
						 
				 
			
				
					
						
							
							
								ruthra kumar 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6e65f01ede 
							
						 
					 
					
						
						
							
							Merge pull request  #32296  from ruthra-kumar/amount_in_words_for_debit_note  
						
						... 
						
						
						
						fix: get amount in words for debit note 
						
						
					 
					
						2022-09-20 18:09:33 +05:30 
						 
				 
			
				
					
						
							
							
								ruthra kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							70f6484d9d 
							
						 
					 
					
						
						
							
							fix: get amount in words for debit note  
						
						
						
						
					 
					
						2022-09-20 17:32:23 +05:30 
						 
				 
			
				
					
						
							
							
								Sagar Sharma 
							
						 
					 
					
						
						
						
						
							
						
						
							3a9c08e7c9 
							
						 
					 
					
						
						
							
							fix: po_detail or sco_rm_detail not getting set while while mapping SE  
						
						
						
						
					 
					
						2022-09-19 18:47:46 +05:30 
						 
				 
			
				
					
						
							
							
								rohitwaghchaure 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3c01bf3a12 
							
						 
					 
					
						
						
							
							Merge pull request  #32238  from rohitwaghchaure/fix-pricing-rules-issues  
						
						... 
						
						
						
						fix: suggestion threshold label and rule was not working for other item with min and max amount 
						
						
					 
					
						2022-09-17 12:11:24 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Waghchaure 
							
						 
					 
					
						
						
						
						
							
						
						
							f5bd3fa952 
							
						 
					 
					
						
						
							
							fix: suggestion threshold label and rule was not working for other items with min and max amount  
						
						
						
						
					 
					
						2022-09-16 16:03:08 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0d732609f0 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into consider-posting-time-for-internal-po  
						
						
						
						
					 
					
						2022-09-15 17:42:26 +05:30 
						 
				 
			
				
					
						
							
							
								anandbaburajan 
							
						 
					 
					
						
						
						
						
							
						
						
							ff5cad1cd6 
							
						 
					 
					
						
						
							
							fix: calculate depreciation properly on asset sale entry and scrap entry  
						
						
						
						
					 
					
						2022-09-15 13:15:34 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Waghchaure 
							
						 
					 
					
						
						
						
						
							
						
						
							cb763938dc 
							
						 
					 
					
						
						
							
							fix: consider posting time for internal transfer PO  
						
						
						
						
					 
					
						2022-09-15 11:48:43 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							e24a4b18c4 
							
						 
					 
					
						
						
							
							Merge branch 'SaiFi0102-asset-capitalization' into develop  
						
						
						
						
					 
					
						2022-09-13 15:00:21 +05:30 
						 
				 
			
				
					
						
							
							
								Raffael Meyer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e00ece7a78 
							
						 
					 
					
						
						
							
							fix: remove EmployeeBoardingController ( #32139 )  
						
						... 
						
						
						
						fix: remove employee boarding controller
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> 
						
						
					 
					
						2022-09-13 02:00:04 +05:30 
						 
				 
			
				
					
						
							
							
								Deepesh Garg 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6b94b5334c 
							
						 
					 
					
						
						
							
							Merge pull request  #32144  from deepeshgarg007/internal_purchase_invoice_rate  
						
						... 
						
						
						
						fix: Rate for internal PI have non stock UOM items 
						
						
					 
					
						2022-09-12 09:09:43 +05:30 
						 
				 
			
				
					
						
							
							
								ruthra kumar 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4576c1ebc3 
							
						 
					 
					
						
						
							
							Merge pull request  #32137  from ruthra-kumar/delete_payment_ledger_entries_on_src_doc_delete  
						
						... 
						
						
						
						refactor(minor): delete linked payment ledger entries on source doc deletion 
						
						
					 
					
						2022-09-11 11:21:24 +05:30 
						 
				 
			
				
					
						
							
							
								ruthra kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							70313df531 
							
						 
					 
					
						
						
							
							fix: delete linked payment ledger entries no source doc deletion  
						
						
						
						
					 
					
						2022-09-10 09:30:45 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							fefe95052d 
							
						 
					 
					
						
						
							
							fix: resolved merge conflict  
						
						
						
						
					 
					
						2022-09-09 14:40:36 +05:30 
						 
				 
			
				
					
						
							
							
								Deepesh Garg 
							
						 
					 
					
						
						
						
						
							
						
						
							0f655e4430 
							
						 
					 
					
						
						
							
							fix: Rate for internal PI have non stock UOM items  
						
						
						
						
					 
					
						2022-09-09 12:40:57 +05:30 
						 
				 
			
				
					
						
							
							
								Sagar Sharma 
							
						 
					 
					
						
						
						
						
							
						
						
							ccb2889cac 
							
						 
					 
					
						
						
							
							fix: SCO Supplied Items returned-qty  
						
						
						
						
					 
					
						2022-09-08 18:15:45 +05:30 
						 
				 
			
				
					
						
							
							
								Sagar Sharma 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f19049e643 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into fix/subcontracting-receipt/gl-entries  
						
						
						
						
					 
					
						2022-09-07 14:55:56 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Waghchaure 
							
						 
					 
					
						
						
						
						
							
						
						
							b4a102d119 
							
						 
					 
					
						
						
							
							fix: internal transfer flow  
						
						
						
						
					 
					
						2022-09-07 12:48:18 +05:30 
						 
				 
			
				
					
						
							
							
								Sagar Sharma 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							008542b715 
							
						 
					 
					
						
						
							
							fix: AD not getting copied from SCO while creating a Material Transfer ( #32106 )  
						
						
						
						
					 
					
						2022-09-07 10:15:43 +05:30 
						 
				 
			
				
					
						
							
							
								rohitwaghchaure 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c6380a25d6 
							
						 
					 
					
						
						
							
							Merge pull request  #32063  from rohitwaghchaure/fixed-fetch-from-parent  
						
						... 
						
						
						
						fix: inventory dimension issues 
						
						
					 
					
						2022-09-06 10:45:36 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Waghchaure 
							
						 
					 
					
						
						
						
						
							
						
						
							75fcab04b1 
							
						 
					 
					
						
						
							
							test: test cases for PI and DN  
						
						
						
						
					 
					
						2022-09-06 01:42:57 +05:30 
						 
				 
			
				
					
						
							
							
								Deepesh Garg 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1a61d4e8a8 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into fix-consolidation-precision-error  
						
						
						
						
					 
					
						2022-09-04 13:18:10 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Waghchaure 
							
						 
					 
					
						
						
						
						
							
						
						
							237299948a 
							
						 
					 
					
						
						
							
							fix: fetch from parent not working for custom field  
						
						
						
						
					 
					
						2022-09-03 17:27:00 +05:30 
						 
				 
			
				
					
						
							
							
								Deepesh Garg 
							
						 
					 
					
						
						
						
						
							
						
						
							318da16b99 
							
						 
					 
					
						
						
							
							fix: Rounded total for cash and non trade discount invoices  
						
						
						
						
					 
					
						2022-08-29 14:18:39 +05:30 
						 
				 
			
				
					
						
							
							
								Deepesh Garg 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e9b0c7177f 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into fix-consolidation-precision-error  
						
						
						
						
					 
					
						2022-08-25 11:41:20 +05:30 
						 
				 
			
				
					
						
							
							
								Deepesh Garg 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9fd0c25c9f 
							
						 
					 
					
						
						
							
							Merge pull request  #31910  from deepeshgarg007/cash_and_non_trade_discount_fix  
						
						... 
						
						
						
						fix: Cash and non trade discount calculation 
						
						
					 
					
						2022-08-23 10:19:09 +05:30 
						 
				 
			
				
					
						
							
							
								Sagar Sharma 
							
						 
					 
					
						
						
						
						
							
						
						
							2effbb55ae 
							
						 
					 
					
						
						
							
							test: Add test case for Subcontracting Receipt GL Entries  
						
						
						
						
					 
					
						2022-08-22 22:14:56 +05:30 
						 
				 
			
				
					
						
							
							
								Deepesh Garg 
							
						 
					 
					
						
						
						
						
							
						
						
							ae3dce0cbd 
							
						 
					 
					
						
						
							
							fix: Test cases  
						
						
						
						
					 
					
						2022-08-22 08:57:58 +05:30 
						 
				 
			
				
					
						
							
							
								Sagar Sharma 
							
						 
					 
					
						
						
						
						
							
						
						
							f4673941e0 
							
						 
					 
					
						
						
							
							chore: move function "add_gl_entry" from purchase_receipt.py to stock_controller.py  
						
						
						
						
					 
					
						2022-08-21 21:26:06 +05:30 
						 
				 
			
				
					
						
							
							
								Deepesh Garg 
							
						 
					 
					
						
						
						
						
							
						
						
							3b15966cc9 
							
						 
					 
					
						
						
							
							fix: Cash and non trade discount calculation  
						
						
						
						
					 
					
						2022-08-21 17:51:05 +05:30 
						 
				 
			
				
					
						
							
							
								Sagar Sharma 
							
						 
					 
					
						
						
						
						
							
						
						
							c247cf728c 
							
						 
					 
					
						
						
							
							chore: add test for additional-cost  
						
						
						
						
					 
					
						2022-08-19 11:46:36 +05:30 
						 
				 
			
				
					
						
							
							
								Sagar Sharma 
							
						 
					 
					
						
						
						
						
							
						
						
							addd7347d8 
							
						 
					 
					
						
						
							
							fix: test "test_pending_and_received_qty"  
						
						
						
						
					 
					
						2022-08-19 11:46:27 +05:30 
						 
				 
			
				
					
						
							
							
								Sagar Sharma 
							
						 
					 
					
						
						
						
						
							
						
						
							ea82fe5bc2 
							
						 
					 
					
						
						
							
							chore: move "set_missing_values_in_additional_costs" from SCO to SC"  
						
						
						
						
					 
					
						2022-08-18 17:20:22 +05:30 
						 
				 
			
				
					
						
							
							
								Sagar Sharma 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2d04e71412 
							
						 
					 
					
						
						
							
							fix: Make expense account editable in Subcontracting Receipt Item ( #31848 )  
						
						
						
						
					 
					
						2022-08-17 15:57:41 +05:30 
						 
				 
			
				
					
						
							
							
								rohitwaghchaure 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							396667b702 
							
						 
					 
					
						
						
							
							Merge pull request  #31860  from rohitwaghchaure/delete-custom-fields-on-dimension-delete  
						
						... 
						
						
						
						fix: delete custom fields on deletion of inventory dimension 
						
						
					 
					
						2022-08-17 15:43:54 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Waghchaure 
							
						 
					 
					
						
						
						
						
							
						
						
							0b39a0123e 
							
						 
					 
					
						
						
							
							fix: delete custom fields on deletion of inventory dimension  
						
						
						
						
					 
					
						2022-08-17 14:55:02 +05:30 
						 
				 
			
				
					
						
							
							
								rohitwaghchaure 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							dd08045f28 
							
						 
					 
					
						
						
							
							Merge pull request  #31863  from rohitwaghchaure/allow-to-make-material-issue  
						
						... 
						
						
						
						fix: not able to issue expired batches 
						
						
					 
					
						2022-08-17 14:45:14 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Waghchaure 
							
						 
					 
					
						
						
						
						
							
						
						
							795c94384a 
							
						 
					 
					
						
						
							
							fix: not able to issue expired batches  
						
						
						
						
					 
					
						2022-08-17 14:03:55 +05:30 
						 
				 
			
				
					
						
							
							
								Saqib Ansari 
							
						 
					 
					
						
						
						
						
							
						
						
							33762dbbac 
							
						 
					 
					
						
						
							
							fix(pos): error while consolidating pos invoices  
						
						
						
						
					 
					
						2022-08-10 14:17:28 +05:30 
						 
				 
			
				
					
						
							
							
								rohitwaghchaure 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e93a1cc02e 
							
						 
					 
					
						
						
							
							Merge pull request  #31804  from rohitwaghchaure/fixed-incorret-incoming-rate-for-internal-suppliier  
						
						... 
						
						
						
						fix: incorrect incoming rate set for inter transfer purchase receipt 
						
						
					 
					
						2022-08-09 16:00:31 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Waghchaure 
							
						 
					 
					
						
						
						
						
							
						
						
							ddd24ea8c8 
							
						 
					 
					
						
						
							
							fix: incorrect incoming rate set for inter transfer purchase receipt  
						
						
						
						
					 
					
						2022-08-09 14:50:20 +05:30 
						 
				 
			
				
					
						
							
							
								Sagar Vora 
							
						 
					 
					
						
						
						
						
							
						
						
							a3625b3817 
							
						 
					 
					
						
						
							
							fix: set billing_address for purchases in get_party_details  
						
						
						
						
					 
					
						2022-08-08 06:04:10 +00:00 
						 
				 
			
				
					
						
							
							
								Sagar Vora 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9baa222976 
							
						 
					 
					
						
						
							
							fix: specify allowed doctype in queries ( #31761 )  
						
						
						
						
					 
					
						2022-08-03 11:12:30 +05:30 
						 
				 
			
				
					
						
							
							
								mergify[bot] 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							89f516c32b 
							
						 
					 
					
						
						
							
							fix: assign duplicate_items_msg outside conditional (backport  #31639 ) ( #31650 )  
						
						... 
						
						
						
						fix: assign duplicate_items_msg outside conditional (#31639 )
duplicate_items_msg was defined inside if the statement  of stock_item so when duplicate was found in non_stock_item it raised referenced before assignment
(cherry picked from commit 8e23c6ad69dee213f0252d2b231317490fab760f)
Co-authored-by: Maharshi Patel <39730881+maharshivpatel@users.noreply.github.com> 
						
						
					 
					
						2022-07-21 13:57:03 +05:30