diff --git a/api/__pycache__/settings.cpython-312.pyc b/api/__pycache__/settings.cpython-312.pyc index 616382cf..ca73c951 100644 Binary files a/api/__pycache__/settings.cpython-312.pyc and b/api/__pycache__/settings.cpython-312.pyc differ diff --git a/api/__pycache__/urls.cpython-312.pyc b/api/__pycache__/urls.cpython-312.pyc index 0037f260..cef44bf9 100644 Binary files a/api/__pycache__/urls.cpython-312.pyc and b/api/__pycache__/urls.cpython-312.pyc differ diff --git a/app/__pycache__/document_generator.cpython-312.pyc b/app/__pycache__/document_generator.cpython-312.pyc index 98f68219..c52c6c0c 100644 Binary files a/app/__pycache__/document_generator.cpython-312.pyc and b/app/__pycache__/document_generator.cpython-312.pyc differ diff --git a/app/__pycache__/models.cpython-312.pyc b/app/__pycache__/models.cpython-312.pyc index 009000fd..9f9f940b 100644 Binary files a/app/__pycache__/models.cpython-312.pyc and b/app/__pycache__/models.cpython-312.pyc differ diff --git a/app/__pycache__/payment.cpython-312.pyc b/app/__pycache__/payment.cpython-312.pyc index d3cf6285..909e0b17 100644 Binary files a/app/__pycache__/payment.cpython-312.pyc and b/app/__pycache__/payment.cpython-312.pyc differ diff --git a/app/__pycache__/workflow_actions.cpython-312.pyc b/app/__pycache__/workflow_actions.cpython-312.pyc index bab6dbe3..645a5d26 100644 Binary files a/app/__pycache__/workflow_actions.cpython-312.pyc and b/app/__pycache__/workflow_actions.cpython-312.pyc differ diff --git a/app/__pycache__/workflow_engine.cpython-312.pyc b/app/__pycache__/workflow_engine.cpython-312.pyc index 29a0856c..3248b3e9 100644 Binary files a/app/__pycache__/workflow_engine.cpython-312.pyc and b/app/__pycache__/workflow_engine.cpython-312.pyc differ diff --git a/app/__pycache__/workflow_utils.cpython-312.pyc b/app/__pycache__/workflow_utils.cpython-312.pyc index deafc6e1..f8d5fe3f 100644 Binary files a/app/__pycache__/workflow_utils.cpython-312.pyc and b/app/__pycache__/workflow_utils.cpython-312.pyc differ diff --git a/app/migrations/0348_remove_payment_schedule_entry.py b/app/migrations/0348_remove_payment_schedule_entry.py new file mode 100644 index 00000000..442ed189 --- /dev/null +++ b/app/migrations/0348_remove_payment_schedule_entry.py @@ -0,0 +1,17 @@ +# Generated by Django 5.1.7 on 2026-01-06 02:47 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('app', '0347_merge_20260105_1342'), + ] + + operations = [ + migrations.RemoveField( + model_name='payment_schedule', + name='entry', + ), + ] diff --git a/app/migrations/0349_internal_entry_allocation_amount_and_more.py b/app/migrations/0349_internal_entry_allocation_amount_and_more.py new file mode 100644 index 00000000..98d02c77 --- /dev/null +++ b/app/migrations/0349_internal_entry_allocation_amount_and_more.py @@ -0,0 +1,28 @@ +# Generated by Django 5.1.7 on 2026-01-06 02:56 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('app', '0348_remove_payment_schedule_entry'), + ] + + operations = [ + migrations.AddField( + model_name='internal_entry', + name='allocation_amount', + field=models.DecimalField(decimal_places=2, max_digits=15, null=True), + ), + migrations.AddField( + model_name='internal_entry', + name='allocation_detail', + field=models.JSONField(null=True), + ), + migrations.AddField( + model_name='payment_schedule', + name='entry', + field=models.JSONField(null=True), + ), + ] diff --git a/app/models.py b/app/models.py index 619b2e9e..2ca1fcd9 100644 --- a/app/models.py +++ b/app/models.py @@ -1615,6 +1615,8 @@ class Internal_Entry(AutoCodeModel): ref = models.CharField(max_length=30, null=True) customer = models.ForeignKey(Customer, null=True, related_name='+', on_delete=models.PROTECT) product = models.ForeignKey(Product, null=True, related_name='+', on_delete=models.PROTECT) + allocation_amount = models.DecimalField(null=True, max_digits=15, decimal_places=2) + allocation_detail = models.JSONField(null=True) create_time = models.DateTimeField(null=True, auto_now_add=True) update_time = models.DateTimeField(null=True, auto_now=True) @@ -1647,7 +1649,7 @@ class Payment_Schedule(AutoCodeModel): type = models.ForeignKey(Payment_Type, null=False, related_name='+', on_delete=models.PROTECT) status = models.ForeignKey(Payment_Status, null=False, related_name='+', on_delete=models.PROTECT) updater = models.ForeignKey(User, null=False, related_name='+', on_delete=models.PROTECT) - entry = models.ForeignKey(Internal_Entry, null=True, related_name='+', on_delete=models.PROTECT) + entry = models.JSONField(null=True) detail = models.JSONField(null=True) ovd_days = models.IntegerField(null=True) penalty_amount = models.DecimalField(null=True, max_digits=15, decimal_places=2)