| 
							
						 | 
						
							
							
							
							
								
							
							
								3752438630
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/fix_city' into production
							
							
							
							
							
						 | 
						
							2025-10-28 13:06:56 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								c58ccb3977
								
							
						 | 
						
							
							
								
								fix city in queryset.
							
							
							
							
							
						 | 
						
							2025-10-28 12:42:19 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								1b37aa1522
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/Add_field' into production
							
							
							
							
							
						 | 
						
							2025-10-27 09:16:12 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								c90e19daaa
								
							
						 | 
						
							
							
								
								Add field to installation report
							
							
							
							
							
						 | 
						
							2025-10-27 09:12:05 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								71ca2e58e3
								
							
						 | 
						
							
							
								
								add defualt filter for nassab
							
							
							
							
							
						 | 
						
							2025-10-15 15:13:28 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								d3857d37c5
								
							
						 | 
						
							
							
								
								Merge branch 'main' of ssh://git.poraab.com/aminhashemi92/shafafiyat into production
							
							
							
							
							
						 | 
						
							2025-10-10 11:58:34 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								0f66e897a1
								
							
						 | 
						
							
							
								
								fix invoice in admin
							
							
							
							
							
						 | 
						
							2025-10-09 22:43:59 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								b1423f0a07
								
							
						 | 
						
							
							
								
								login logo
							
							
							
							
							
						 | 
						
							2025-10-09 20:57:20 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								e2e4a6dad8
								
							
						 | 
						
							
							
								
								add logo and fix sign. in print
							
							
							
							
							
						 | 
						
							2025-10-09 18:53:46 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								10810f8700
								
							
						 | 
						
							
							
								
								fix prints
							
							
							
							
							
						 | 
						
							2025-10-09 16:17:01 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								6367d34f0c
								
							
						 | 
						
							
							
								
								fix auto complete final invoice
							
							
							
							
							
						 | 
						
							2025-10-09 14:37:59 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								23f50aacd4
								
							
						 | 
						
							
							
								
								fix permission to see certificate
							
							
							
							
							
						 | 
						
							2025-10-09 13:29:48 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								7c2a1ebc7a
								
							
						 | 
						
							
							
								
								fix reset to final invoice when add or delete special item
							
							
							
							
							
						 | 
						
							2025-10-09 13:01:37 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								129500bc1d
								
							
						 | 
						
							
							
								
								fix callibration to accept 0.0001
							
							
							
							
							
						 | 
						
							2025-10-09 12:38:28 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								ef0779de6a
								
							
						 | 
						
							
							
								
								unqiue hologram code
							
							
							
							
							
						 | 
						
							2025-10-09 12:10:57 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								328c657e0f
								
							
						 | 
						
							
							
								
								add loader on uploading installation report
							
							
							
							
							
						 | 
						
							2025-10-09 11:45:59 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								a819e841f9
								
							
						 | 
						
							
							
								
								fix next step in quote payments approved.
							
							
							
							
							
						 | 
						
							2025-10-09 11:34:29 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								db61f35711
								
							
						 | 
						
							
							
								
								add approve need to request list
							
							
							
							
							
						 | 
						
							2025-10-09 11:24:00 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								bb1b1a8ebf
								
							
						 | 
						
							
							
								
								initially make meterplus.ir ready for production
							
							
							
							
							
						 | 
						
							2025-10-08 14:04:58 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								672e26c89d
								
							
						 | 
						
							
							
								
								remove sqlite
							
							
							
							
							
						 | 
						
							2025-10-07 15:33:35 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								21e76f8f55
								
							
						 | 
						
							
							
								
								update gitignore for db separated version
							
							
							
							
							
						 | 
						
							2025-10-07 15:30:14 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								9815aa4c73
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin' into shafafiyat/production
							
							
							
							
							
						 | 
						
							2025-10-07 14:30:50 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								a195e0b6fc
								
							
						 | 
						
							
							
								
								add db
							
							
							
							
							
						 | 
						
							2025-10-07 12:57:06 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								2a59c1acb5
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin' into shafafiyat/production
							
							
							
							
							
						 | 
						
							2025-10-07 10:21:43 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								92ad9ee301
								
							
						 | 
						
							
							
								
								add migration files
							
							
							
							
							
						 | 
						
							2025-10-07 10:20:57 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								9daec9c8f1
								
							
						 | 
						
							
							
								
								next step only in not edit mode
							
							
							
							
							
						 | 
						
							2025-10-07 08:33:21 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								68cf7761d7
								
							
						 | 
						
							
							
								
								add meter model for smart meter
							
							
							
							
							
						 | 
						
							2025-10-07 08:31:40 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								02415f4dee
								
							
						 | 
						
							
							
								
								change to rial
							
							
							
							
							
						 | 
						
							2025-10-07 08:01:58 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								dd64b7b47c
								
							
						 | 
						
							
							
								
								fix quote payments show
							
							
							
							
							
						 | 
						
							2025-10-07 07:59:52 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								169a9bd624
								
							
						 | 
						
							
							
								
								fix force approve and vat show
							
							
							
							
							
						 | 
						
							2025-10-07 07:45:09 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								65cc48769d
								
							
						 | 
						
							
							
								
								fix price seperation
							
							
							
							
							
						 | 
						
							2025-10-07 07:08:23 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								b406f1d7c4
								
							
						 | 
						
							
							
								
								fix price seperation
							
							
							
							
							
						 | 
						
							2025-10-07 07:08:03 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								0d48e7281a
								
							
						 | 
						
							
							
								
								fix price seperation
							
							
							
							
							
						 | 
						
							2025-10-07 07:07:55 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								916c66a281
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin' into shafafiyat/production
							
							
							
							
							
						 | 
						
							2025-10-04 14:23:27 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								d22473e14a
								
							
						 | 
						
							
							
								
								add requiered field
							
							
							
							
							
						 | 
						
							2025-10-04 14:18:21 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								001dc313f6
								
							
						 | 
						
							
							
								
								add requiered field
							
							
							
							
							
						 | 
						
							2025-10-04 14:05:33 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								241f56f550
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin' into shafafiyat/production
							
							
							
							
							
						 | 
						
							2025-10-04 13:13:38 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								c76de99e84
								
							
						 | 
						
							
							
								
								fix approval user in execl
							
							
							
							
							
						 | 
						
							2025-10-04 12:23:37 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								dd37ac3720
								
							
						 | 
						
							
							
								
								fix final invoice and certificatre
							
							
							
							
							
						 | 
						
							2025-10-04 12:01:37 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								0cfa86bde3
								
							
						 | 
						
							
							
								
								fix approvals after rejection
							
							
							
							
							
						 | 
						
							2025-10-04 11:23:31 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								f853ad9784
								
							
						 | 
						
							
							
								
								main flow checked
							
							
							
							
							
						 | 
						
							2025-10-03 21:56:25 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								42971c5e58
								
							
						 | 
						
							
							
								
								add openpyxl to requirements
							
							
							
							
							
						 | 
						
							2025-09-30 13:21:52 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								494b7743e9
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin' into shafafiyat/production
							
							
							
							
							
						 | 
						
							2025-09-30 13:19:05 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								b5bf3a5dbe
								
							
						 | 
						
							
							
								
								huge fix
							
							
							
							
							
						 | 
						
							2025-09-29 17:38:11 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								37a5953134
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin' into shafafiyat/production
							
							
							
							
							
						 | 
						
							2025-09-14 16:49:00 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								810c87e2e0
								
							
						 | 
						
							
							
								
								Add well and customer detail modal
							
							
							
							
							
						 | 
						
							2025-09-14 13:44:03 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								896d66e801
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin' into shafafiyat/production
							
							
							
							
							
						 | 
						
							2025-09-14 11:57:22 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								4df61c8a01
								
							
						 | 
						
							
							
								
								fix customer and well form
							
							
							
							
							
						 | 
						
							2025-09-14 11:44:03 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								af3b043a46
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main' into shafafiyat/production
							
							
							
							
							
						 | 
						
							2025-09-13 21:33:32 +03:30 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								20c5f13ea0
								
							
						 | 
						
							
							
								
								remove db for upcoming db
							
							
							
							
							
						 | 
						
							2025-09-13 21:30:20 +03:30 | 
						
						
							
							
							
							
								
							
							
						 |