| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4e5365b946
					 | 
					
						
						
							
							feat: return barcodes to a document
						
						
						
						
						
						
					 | 
					
						2024-10-03 16:08:17 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0a34addae1
					 | 
					
						
						
							
							feat: barcodes removal in deal document
						
						
						
						
						
						
					 | 
					
						2024-10-03 10:04:51 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						64dd40a072
					 | 
					
						
						
							
							fix: copy price
						
						
						
						
						
						
					 | 
					
						2024-10-02 10:17:18 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ca6e7d5b37
					 | 
					
						
						
							
							feat: executors and grouping by article in deal document
						
						
						
						
						
						
					 | 
					
						2024-10-02 02:40:54 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						766ded04a5
					 | 
					
						
						
							
							fix: untest
						
						
						
						
						
						
					 | 
					
						2024-09-30 23:06:52 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8bf956201a
					 | 
					
						
						
							
							fix: temp
						
						
						
						
						
						
					 | 
					
						2024-09-30 22:57:47 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						db71481da8
					 | 
					
						
						
							
							fix: new deal statuses, delivery date, receiving slot date
						
						
						
						
						
						
					 | 
					
						2024-09-30 22:53:49 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						590042521d
					 | 
					
						
						
							
							fix: new deal statuses, delivery date, receiving slot date
						
						
						
						
						
						
					 | 
					
						2024-09-30 08:49:19 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						61d379e7dc
					 | 
					
						
						
							
							feat: spacers between barcodes of diff products, avoid product cut in deal document, deal document refactoring
						
						
						
						
						
						
					 | 
					
						2024-09-30 01:36:31 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						413d8755cc
					 | 
					
						
						
							
							fix: response schema for deal barcodes pdf end-point
						
						
						
						
						
						
					 | 
					
						2024-09-28 20:16:53 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						489f65a087
					 | 
					
						
						
							
							feat: end-point for pdf of all deal's barcodes, client and marketplace info in bill of payment
						
						
						
						
						
						
					 | 
					
						2024-09-28 19:38:06 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d9c43624c0
					 | 
					
						
						
							
							feat: serbin's tg id, bigger font size for page counter
						
						
						
						
						
						
					 | 
					
						2024-09-28 00:19:08 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6f2c4b0672
					 | 
					
						
						
							
							feat: page numbers, deal id on each page, avoid breaks after product header in deal document
						
						
						
						
						
						
					 | 
					
						2024-09-27 16:03:44 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						91cf44f3ae
					 | 
					
						
						
							
							fix: removed crap, category on service and deal
						
						
						
						
						
						
					 | 
					
						2024-09-27 04:50:01 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5df64d4916
					 | 
					
						
						
							
							feat: price of services over one product in deal document
						
						
						
						
						
						
					 | 
					
						2024-09-24 21:55:22 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0e54b0edd3
					 | 
					
						
						
							
							fix: wb barcodes
						
						
						
						
						
						
					 | 
					
						2024-09-23 20:19:36 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0b1395f86d
					 | 
					
						
						
							
							feat: marina added
						
						
						
						
						
						
					 | 
					
						2024-09-23 13:21:27 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						52681f3f61
					 | 
					
						
						
							
							fix: added default product image, removed empty tables prints, fixed barcode output
						
						
						
						
						
						
					 | 
					
						2024-09-23 01:24:43 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						973351a3af
					 | 
					
						
						
							
							fix: font downloading by url replaced with base64
						
						
						
						
						
						
					 | 
					
						2024-09-22 23:06:07 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bc12448d03
					 | 
					
						
						
							
							fix: JsBarcode removed
						
						
						
						
						
						
					 | 
					
						2024-09-20 20:15:18 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e6cb771db0
					 | 
					
						
						
							
							fix: bill of payment generation refactoring
						
						
						
						
						
						
					 | 
					
						2024-09-20 20:14:02 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5316f7f9ce
					 | 
					
						
						
							
							feat: end-point for deal document generation
						
						
						
						
						
						
					 | 
					
						2024-09-20 20:02:17 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						03aba9649a
					 | 
					
						
						
							
							fix: inline styles to classes
						
						
						
						
						
						
					 | 
					
						2024-09-12 00:52:00 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						15bb43e89d
					 | 
					
						
						
							
							feat: kal
						
						
						
						
						
						
					 | 
					
						2024-09-11 23:32:33 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a1dc08d69c
					 | 
					
						
						
							
							feat: kal
						
						
						
						
						
						
					 | 
					
						2024-09-11 23:31:49 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a6476173ea
					 | 
					
						
						
							
							feat: oleg gone away
						
						
						
						
						
						
					 | 
					
						2024-09-11 23:20:04 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1386005aee
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/detached'
						
						
						
						
						
						
						
						# Conflicts:
#	templates/documents/bill-of-payment.html 
						
						
					 | 
					
						2024-09-11 23:12:11 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						689eacf227
					 | 
					
						
						
							
							feat: oleg gone away
						
						
						
						
						
						
					 | 
					
						2024-09-11 23:11:34 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						394b58c0ff
					 | 
					
						
						
							
							feat: oleg gone away
						
						
						
						
						
						
					 | 
					
						2024-09-11 22:42:03 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						78c1311533
					 | 
					
						
						
							
							feat: oleg gone away
						
						
						
						
						
						
					 | 
					
						2024-09-11 22:30:13 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a0d71550f3
					 | 
					
						
						
							
							feat: oleg gone away
						
						
						
						
						
						
					 | 
					
						2024-09-11 22:25:58 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						237e7aab41
					 | 
					
						
						
							
							feat: oleg gone away
						
						
						
						
						
						
					 | 
					
						2024-09-11 22:21:33 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						44880433a4
					 | 
					
						
						
							
							feat: fix border
						
						
						
						
						
						
					 | 
					
						2024-09-11 22:20:56 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |