| 
						
					 | 
					
						
						
							
						
						1f26f94d96
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/fillingDealsFromExcelFile' into excelMerge
						
						
						
						
						
						
					 | 
					
						2025-01-10 14:36:26 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e65ca07acc
					 | 
					
						
						
							
							feat: disabling accounting for deals and groups
						
						
						
						
						
						
					 | 
					
						2025-01-03 20:46:48 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2abc198a39
					 | 
					
						
						
							
							feat: filling deals from excel file
						
						
						
						
						
						
					 | 
					
						2024-12-25 21:14:00 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3234eb7bea
					 | 
					
						
						
							
							fix: total prices in deal summaries
						
						
						
						
						
						
					 | 
					
						2024-12-24 00:26:49 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e8af9f2237
					 | 
					
						
						
							
							fix: renamed assignments table to deal_employees
						
						
						
						
						
						
					 | 
					
						2024-12-20 12:54:46 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c65ca39d08
					 | 
					
						
						
							
							feat: assignment of employees to deals
						
						
						
						
						
						
					 | 
					
						2024-12-20 00:27:26 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						144811ec87
					 | 
					
						
						
							
							feat: departments and department sections
						
						
						
						
						
						
					 | 
					
						2024-12-17 12:42:41 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e5712224e1
					 | 
					
						
						
							
							feat: income
						
						
						
						
						
						
					 | 
					
						2024-12-12 20:23:19 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						daa34b2808
					 | 
					
						
						
							
							feat: hide statistics, work time, expenses and finances from regular users
						
						
						
						
						
						
					 | 
					
						2024-12-09 20:16:28 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						863dd226c3
					 | 
					
						
						
							
							feat: pallets and boxes for deals
						
						
						
						
						
						
					 | 
					
						2024-12-09 16:45:10 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d56e292276
					 | 
					
						
						
							
							feat: passport images for user
						
						
						
						
						
						
					 | 
					
						2024-12-04 20:20:03 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9a6fc3fdd7
					 | 
					
						
						
							
							feat: work shift pauses
						
						
						
						
						
						
					 | 
					
						2024-12-04 11:00:00 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0f885804e9
					 | 
					
						
						
							
							fix: get managers fix
						
						
						
						
						
						
					 | 
					
						2024-11-30 18:52:24 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d8b2e43add
					 | 
					
						
						
							
							fix: statistics profit dates fix
						
						
						
						
						
						
					 | 
					
						2024-11-29 19:42:48 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bf4fb2b3af
					 | 
					
						
						
							
							feat: inn strip
						
						
						
						
						
						
					 | 
					
						2024-11-29 13:57:02 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						96998a4c05
					 | 
					
						
						
							
							feat: work shifts history
						
						
						
						
						
						
					 | 
					
						2024-11-28 18:00:53 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						41c54d7bb7
					 | 
					
						
						
							
							feat: set deal status completed after completing
						
						
						
						
						
						
					 | 
					
						2024-11-27 20:26:22 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c913336ade
					 | 
					
						
						
							
							fix: fix pagination info schema and expense router responses
						
						
						
						
						
						
					 | 
					
						2024-11-27 17:00:49 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						88ce256850
					 | 
					
						
						
							
							feat: tags for expenses, filters by tags in statistics
						
						
						
						
						
						
					 | 
					
						2024-11-27 15:49:33 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						48c88cb93a
					 | 
					
						
						
							
							feat: additional expenses
						
						
						
						
						
						
					 | 
					
						2024-11-26 01:36:59 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						81d5261af1
					 | 
					
						
						
							
							feat: expenses in statistics
						
						
						
						
						
						
					 | 
					
						2024-11-24 19:22:38 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0adc36827a
					 | 
					
						
						
							
							fix: creating time record only if worked more than 1 minute
						
						
						
						
						
						
					 | 
					
						2024-11-22 22:10:07 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						42a193dae7
					 | 
					
						
						
							
							feat: time tracking in minutes
						
						
						
						
						
						
					 | 
					
						2024-11-22 21:34:17 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8652d31f6d
					 | 
					
						
						
							
							feat: patronymic and passport data for user
						
						
						
						
						
						
					 | 
					
						2024-11-22 15:12:35 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e36fad70c5
					 | 
					
						
						
							
							feat: filtering and grouping by manager
						
						
						
						
						
						
					 | 
					
						2024-11-21 18:10:37 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8733e6d94b
					 | 
					
						
						
							
							feat: filters for profit statistics table
						
						
						
						
						
						
					 | 
					
						2024-11-21 17:26:17 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c9be4f098e
					 | 
					
						
						
							
							fix: govnocode in the deal manager update
						
						
						
						
						
						
					 | 
					
						2024-11-21 08:17:39 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0c5eca6cc4
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/statistics'
						
						
						
						
						
						
						
						# Conflicts:
#	main.py
#	routers/__init__.py
#	schemas/deal.py 
						
						
					 | 
					
						2024-11-21 01:36:26 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e873325c34
					 | 
					
						
						
							
							fix: forbidden starting and finishing shifts for deleted users
						
						
						
						
						
						
					 | 
					
						2024-11-20 13:29:45 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9707faf60c
					 | 
					
						
						
							
							feat: work shifts by QR codes
						
						
						
						
						
						
					 | 
					
						2024-11-20 13:04:52 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						915206d969
					 | 
					
						
						
							
							feat: setting manager for a deal
						
						
						
						
						
						
					 | 
					
						2024-11-17 13:54:51 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3dbbae2173
					 | 
					
						
						
							
							feat: profit table and division of charts in statistics
						
						
						
						
						
						
					 | 
					
						2024-11-17 00:59:36 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						29211dd442
					 | 
					
						
						
							
							feat: locking group with bill request
						
						
						
						
						
						
					 | 
					
						2024-11-15 21:01:30 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0dd3c50be8
					 | 
					
						
						
							
							feat: deleting groups of deals
						
						
						
						
						
						
					 | 
					
						2024-11-15 20:34:48 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e2d35fb7c4
					 | 
					
						
						
							
							feat: billing for groups of deals
						
						
						
						
						
						
					 | 
					
						2024-11-15 20:27:16 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3453c394e5
					 | 
					
						
						
							
							feat: profit chart in statistics
						
						
						
						
						
						
					 | 
					
						2024-11-15 15:16:51 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bbe9832923
					 | 
					
						
						
							
							feat: complete group of deals
						
						
						
						
						
						
					 | 
					
						2024-11-12 14:28:04 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1dde0089b9
					 | 
					
						
						
							
							feat: new stuff
						
						
						
						
						
						
					 | 
					
						2024-11-12 12:03:46 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						58814def8c
					 | 
					
						
						
							
							feat: new stuff
						
						
						
						
						
						
					 | 
					
						2024-11-12 11:54:09 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1e260f2e42
					 | 
					
						
						
							
							feat: new stuff
						
						
						
						
						
						
					 | 
					
						2024-11-12 11:49:44 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b98e98cabd
					 | 
					
						
						
							
							fix: oleg fix
						
						
						
						
						
						
					 | 
					
						2024-11-11 13:08:58 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						eff71b3570
					 | 
					
						
						
							
							feat: bill of payment for a group of deals
						
						
						
						
						
						
					 | 
					
						2024-11-10 16:55:06 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ab31c7c195
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/productComment'
						
						
						
						
						
						
					 | 
					
						2024-11-09 08:35:38 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						25e6cf0e7e
					 | 
					
						
						
							
							feat: deal group
						
						
						
						
						
						
					 | 
					
						2024-11-08 15:58:41 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						151c7767b1
					 | 
					
						
						
							
							feat: deal products comments
						
						
						
						
						
						
					 | 
					
						2024-11-07 21:34:24 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fced9b8101
					 | 
					
						
						
							
							fix: uploading barcode pdf files instead of images
						
						
						
						
						
						
					 | 
					
						2024-11-06 15:35:28 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bd499fc602
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/productBarcodeImages'
						
						
						
						
						
						
					 | 
					
						2024-11-05 00:04:21 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						25060322a1
					 | 
					
						
						
							
							feat: pdf generation using product barcode images
						
						
						
						
						
						
					 | 
					
						2024-11-02 00:53:45 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5ed42d99dc
					 | 
					
						
						
							
							feat: CRUD for product barcode images
						
						
						
						
						
						
					 | 
					
						2024-11-01 17:23:58 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						67b500761c
					 | 
					
						
						
							
							feat: products table in bill of payment
						
						
						
						
						
						
					 | 
					
						2024-10-30 16:29:45 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |