Merge remote-tracking branch 'origin' into shafafiyat/production
This commit is contained in:
		
						commit
						9815aa4c73
					
				
					 3 changed files with 7 additions and 13 deletions
				
			
		
							
								
								
									
										4
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -9,8 +9,8 @@
 | 
				
			||||||
*.pyc
 | 
					*.pyc
 | 
				
			||||||
__pycache__/
 | 
					__pycache__/
 | 
				
			||||||
local_settings.py
 | 
					local_settings.py
 | 
				
			||||||
*.sqlite3
 | 
					#*.sqlite3
 | 
				
			||||||
db.sqlite3
 | 
					#db.sqlite3
 | 
				
			||||||
db.sqlite3-journal
 | 
					db.sqlite3-journal
 | 
				
			||||||
media
 | 
					media
 | 
				
			||||||
#static
 | 
					#static
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										
											BIN
										
									
								
								db.sqlite3
									
										
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								db.sqlite3
									
										
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							| 
						 | 
					@ -1,4 +1,4 @@
 | 
				
			||||||
# Generated by Django 5.2.5 on 2025-10-07 06:50
 | 
					# Generated by Django 5.2.4 on 2025-10-07 04:50
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from django.db import migrations, models
 | 
					from django.db import migrations, models
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,19 +6,13 @@ from django.db import migrations, models
 | 
				
			||||||
class Migration(migrations.Migration):
 | 
					class Migration(migrations.Migration):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    dependencies = [
 | 
					    dependencies = [
 | 
				
			||||||
        ("installations", "0006_alter_installationreport_exploitation_license_number"),
 | 
					        ('installations', '0006_alter_installationreport_exploitation_license_number'),
 | 
				
			||||||
    ]
 | 
					    ]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    operations = [
 | 
					    operations = [
 | 
				
			||||||
        migrations.AddField(
 | 
					        migrations.AddField(
 | 
				
			||||||
            model_name="installationreport",
 | 
					            model_name='installationreport',
 | 
				
			||||||
            name="meter_model",
 | 
					            name='meter_model',
 | 
				
			||||||
            field=models.CharField(
 | 
					            field=models.CharField(blank=True, choices=[('A', 'A'), ('B', 'B')], max_length=20, null=True, verbose_name='مدل کنتور'),
 | 
				
			||||||
                blank=True,
 | 
					 | 
				
			||||||
                choices=[("A", "A"), ("B", "B")],
 | 
					 | 
				
			||||||
                max_length=20,
 | 
					 | 
				
			||||||
                null=True,
 | 
					 | 
				
			||||||
                verbose_name="مدل کنتور",
 | 
					 | 
				
			||||||
            ),
 | 
					 | 
				
			||||||
        ),
 | 
					        ),
 | 
				
			||||||
    ]
 | 
					    ]
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue