| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						915a1d5f28
					 | 
					
						
						
							
							feat: tech specification for a group of deals
						
						
						
						
						
						
					 | 
					
						2024-11-10 15:32:58 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						30ec0528a4
					 | 
					
						
						
							
							fix: deals in DealGroup as list
						
						
						
						
						
						
					 | 
					
						2024-11-09 17:16:23 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6890d6b79c
					 | 
					
						
						
							
							refactoring of deal documents
						
						
						
						
						
						
					 | 
					
						2024-11-09 17:09:17 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b1034d437e
					 | 
					
						
						
							
							feat: deal group
						
						
						
						
						
						
					 | 
					
						2024-11-09 12:10:25 +03: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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4f9d55d2c6
					 | 
					
						
						
							
							quick fix
						
						
						
						
						
						
					 | 
					
						2024-11-06 10:29:13 +03: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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cbe3697f1b
					 | 
					
						
						
							
							fix: removed all prices from deal document
						
						
						
						
						
						
					 | 
					
						2024-10-29 02:45:23 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						750913d3a6
					 | 
					
						
						
							
							fix: removed price per product from deal document
						
						
						
						
						
						
					 | 
					
						2024-10-29 01:51:49 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fa33313068
					 | 
					
						
						
							
							feat: fix
						
						
						
						
						
						
					 | 
					
						2024-10-23 13:15:23 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9a12ddb6af
					 | 
					
						
						
							
							feat: total services amount and recalculating
						
						
						
						
						
						
					 | 
					
						2024-10-22 19:32:27 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4fa5c0d05b
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dealPrefilling'
						
						
						
						
						
						
					 | 
					
						2024-10-18 05:41:23 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e4d9b5ef16
					 | 
					
						
						
							
							feat: deal prefilling
						
						
						
						
						
						
					 | 
					
						2024-10-15 21:25:32 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						80b6dc3aec
					 | 
					
						
						
							
							feat: fix
						
						
						
						
						
						
					 | 
					
						2024-10-15 07:44:42 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cc6cae2b59
					 | 
					
						
						
							
							feat: fix
						
						
						
						
						
						
					 | 
					
						2024-10-15 07:44:26 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0407177085
					 | 
					
						
						
							
							feat: add comment, creating refactor
						
						
						
						
						
						
					 | 
					
						2024-10-15 07:41:24 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ab5fc94e1b
					 | 
					
						
						
							
							feat: servicex export
						
						
						
						
						
						
					 | 
					
						2024-10-11 21:38:33 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3db54fdb13
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2024-10-11 20:03:00 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8075ce04b0
					 | 
					
						
						
							
							feat: services excel
						
						
						
						
						
						
					 | 
					
						2024-10-11 20:02:04 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c5f7ce651f
					 | 
					
						
						
							
							feat: price list generator
						
						
						
						
						
						
					 | 
					
						2024-10-11 20:17:56 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1eb85279b5
					 | 
					
						
						
							
							feat: service category change rank fix
						
						
						
						
						
						
					 | 
					
						2024-10-10 01:13:30 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						eafd4c94f5
					 | 
					
						
						
							
							feat: service category deleting
						
						
						
						
						
						
					 | 
					
						2024-10-09 21:58:11 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4167640bd8
					 | 
					
						
						
							
							feat: service category deleting
						
						
						
						
						
						
					 | 
					
						2024-10-09 21:55:52 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4994f2c026
					 | 
					
						
						
							
							feat: service category deleting
						
						
						
						
						
						
					 | 
					
						2024-10-09 02:25:56 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7ee4ce36ce
					 | 
					
						
						
							
							feat: service deleting and rest categories placeholders
						
						
						
						
						
						
					 | 
					
						2024-10-09 02:02:26 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9a2ec02ac4
					 | 
					
						
						
							
							feat: crappy reordering
						
						
						
						
						
						
					 | 
					
						2024-10-08 00:03:55 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						aae7e96001
					 | 
					
						
						
							
							feat: crappy reordering
						
						
						
						
						
						
					 | 
					
						2024-10-07 23:42:37 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e153d4a1c0
					 | 
					
						
						
							
							feat: bigger product size
						
						
						
						
						
						
					 | 
					
						2024-10-06 13:07:08 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |