v0.4.3.2

Create a Bill directly from PO
Markdown PO Notes & MixIn
PO Create/Update Validation
Removed vendor from PO model.
Removed for_inventory field of PO Model.
Pipfile update
Migrations reset

Author: elarroba

Pipfile

@@ -8,6 +8,7 @@ django = ">=3.2"
 django-mptt = ">=0.11.0"
 ofxtools = ">=0.8.21"
 jsonschema = ">=3.2.0"
+markdown = ">=3.3.4"
 
 [dev-packages]
 sphinx = "~=3.4.1"

Pipfile.lock

@@ -47,8 +47,8 @@ output __(help needed!)__.
 * Client proposals & estimates.
 * User preferences and settings & account creation views.
 * Update package and code documentation.
-### Version 0.9
 
+### Version 0.9
 * Enable Hierarchical Entity structures via MPTT.
 * Consolidated financial statements.
 * Intercompany transactions.

ROADMAP.md

@@ -9,7 +9,7 @@
 default_app_config = 'django_ledger.apps.DjangoLedgerConfig'
 
 """Django Ledger"""
-__version__ = '0.4.3.1'
+__version__ = '0.4.3.2'
 __license__ = 'GPLv3 License'
 
 __author__ = 'Miguel Sanda'

django_ledger/__init__.py

@@ -173,26 +173,13 @@ def __init__(self, *args, entity_slug, bill_pk, user_model, **kwargs):
         self.BILL_PK = bill_pk
         self.ENTITY_SLUG = entity_slug
 
-        items_qs_exp = ItemModel.objects.expenses(
-            entity_slug=self.ENTITY_SLUG,
-            user_model=self.USER_MODEL
-        )
-
-        items_qs_inv = ItemModel.objects.inventory(
+        items_qs = ItemModel.objects.for_bill(
             entity_slug=self.ENTITY_SLUG,
             user_model=self.USER_MODEL
         )
 
         for form in self.forms:
-            po_model = form.instance.po_model
-            if po_model:
-                if po_model.for_inventory:
-                    form.fields['item_model'].queryset = items_qs_inv
-                else:
-                    form.fields['item_model'].queryset = items_qs_exp
-            else:
-                form.fields['item_model'].queryset = items_qs_exp
-
+            form.fields['item_model'].queryset = items_qs
 
 
 BillItemFormset = modelformset_factory(

django_ledger/forms/bill.py

@@ -6,7 +6,7 @@
 Miguel Sanda <msanda@arrobalytics.com>
 """
 from django.forms import (ModelForm, DateInput, TextInput, Select, BaseModelFormSet,
-                          modelformset_factory, Textarea, BooleanField, HiddenInput)
+                          modelformset_factory, Textarea, BooleanField, ValidationError)
 from django.utils.translation import gettext_lazy as _
 
 from django_ledger.models import (ItemModel, PurchaseOrderModel, ItemThroughModel)
@@ -24,7 +24,6 @@ class Meta:
         fields = [
             'po_date',
             'po_title',
-            'for_inventory'
         ]
         widgets = {
             'po_date': DateInput(attrs={
@@ -47,14 +46,18 @@ def __init__(self, *args, entity_slug, user_model, **kwargs):
         self.ENTITY_SLUG = entity_slug
         self.USER_MODEL = user_model
 
+        if self.initial['po_status'] == PurchaseOrderModel.PO_STATUS_APPROVED:
+            self.fields['po_status'].disabled = True
+        else:
+            self.fields['fulfilled'].disabled = True
+
     class Meta:
         model = PurchaseOrderModel
         fields = [
             'po_date',
             'po_title',
             'po_status',
-            'po_notes',
-            'vendor',
+            'markdown_notes',
             'fulfillment_date',
             'fulfilled'
         ]
@@ -73,15 +76,38 @@ class Meta:
                 'class': DJANGO_LEDGER_FORM_INPUT_CLASSES,
                 'placeholder': _('PO Date (YYYY-MM-DD)...')
             }),
-            'po_notes': Textarea(attrs={
+            'markdown_notes': Textarea(attrs={
                 'class': 'textarea'
             })
         }
         labels = {
             'po_status': _('PO Status'),
-            'fulfilled': _('Is Fulfilled?')
+            'fulfilled': _('Mark as Fulfilled'),
+            'markdown_notes': _('PO Notes')
         }
 
+    def clean(self):
+        is_fulfilled = self.cleaned_data['fulfilled']
+        new_status = self.cleaned_data['po_status']
+
+        if 'fulfilled' in self.changed_data:
+            if not is_fulfilled:
+                raise ValidationError(
+                    message=f'Cannot change fulfilled status to False after being fulfilled once.'
+                )
+            if new_status != PurchaseOrderModel.PO_STATUS_APPROVED:
+                raise ValidationError(
+                    message=f'Cannot fulfill a PO that has not been approved.'
+                )
+
+        if 'po_status' in self.changed_data:
+            if new_status != PurchaseOrderModel.PO_STATUS_APPROVED:
+                initial_status = self.initial['po_status']
+                raise ValidationError(
+                    message=f'Cannot change form status to {new_status} '
+                            f'from {initial_status}'
+                )
+
 
 class PurchaseOrderItemForm(ModelForm):
     create_bill = BooleanField(required=False)
@@ -114,6 +140,21 @@ class Meta:
             })
         }
 
+    def clean_po_item_status(self):
+        po_item_status = self.cleaned_data['po_item_status']
+        if 'po_item_status' in self.changed_data:
+            po_model: PurchaseOrderModel = getattr(self, 'PO_MODEL')
+            if po_model.po_status == po_model.PO_STATUS_APPROVED:
+                if not po_item_status:
+                    raise ValidationError('Cannot assign null status to approved PO.')
+                if all([
+                    self.instance.bill_model_id,
+                    po_item_status == ItemThroughModel.STATUS_NOT_ORDERED
+                ]):
+                    raise ValidationError('Cannot assign not ordered status to a billed item. '
+                                          'Void or delete bill first')
+        return po_item_status
+
 
 class BasePurchaseOrderItemFormset(BaseModelFormSet):
 
@@ -123,30 +164,40 @@ def __init__(self, *args, entity_slug, user_model, po_model: PurchaseOrderModel,
         self.ENTITY_SLUG = entity_slug
         self.PO_MODEL = po_model
 
-        if self.PO_MODEL.for_inventory:
-            items_qs = ItemModel.objects.inventory(
-                entity_slug=self.ENTITY_SLUG,
-                user_model=self.USER_MODEL
-            )
-        else:
-            items_qs = ItemModel.objects.expenses(
-                entity_slug=self.ENTITY_SLUG,
-                user_model=self.USER_MODEL
-            )
+        items_qs = ItemModel.objects.for_po(
+            entity_slug=self.ENTITY_SLUG,
+            user_model=self.USER_MODEL
+        )
 
-        self.LN = len(items_qs)  # evaluate the QS and cache results...
         for form in self.forms:
+            form.PO_MODEL = self.PO_MODEL
             form.fields['item_model'].queryset = items_qs
             if self.PO_MODEL.po_status != PurchaseOrderModel.PO_STATUS_APPROVED:
-                form.fields['po_item_status'].widget.attrs['disabled'] = True
+                form.fields['po_item_status'].disabled = True
             else:
                 form.fields['po_item_status'].widget.attrs['class'] += form.instance.get_status_css_class()
-
-
-PurchaseOrderItemFormset = modelformset_factory(
-    model=ItemThroughModel,
-    form=PurchaseOrderItemForm,
-    formset=BasePurchaseOrderItemFormset,
-    can_delete=True,
-    extra=5
-)
+                if form.instance.po_item_status == ItemThroughModel.STATUS_RECEIVED:
+                    form.fields['po_item_status'].disabled = True
+
+                form.fields['unit_cost'].disabled = True
+                form.fields['quantity'].disabled = True
+                form.fields['entity_unit'].disabled = True
+                form.fields['item_model'].disabled = True
+
+
+def get_po_item_formset(po_model: PurchaseOrderModel):
+    if po_model.po_status != PurchaseOrderModel.PO_STATUS_APPROVED:
+        return modelformset_factory(
+            model=ItemThroughModel,
+            form=PurchaseOrderItemForm,
+            formset=BasePurchaseOrderItemFormset,
+            can_delete=True,
+            extra=5
+        )
+    return modelformset_factory(
+        model=ItemThroughModel,
+        form=PurchaseOrderItemForm,
+        formset=BasePurchaseOrderItemFormset,
+        can_delete=False,
+        extra=0
+    )

django_ledger/forms/purchase_order.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.2.3 on 2021-06-08 11:56
+# Generated by Django 3.2.4 on 2021-06-18 03:34
 
 from django.conf import settings
 import django.core.validators
@@ -378,20 +378,18 @@ class Migration(migrations.Migration):
             fields=[
                 ('created', models.DateTimeField(auto_now_add=True)),
                 ('updated', models.DateTimeField(auto_now=True, null=True)),
+                ('markdown_notes', models.TextField(blank=True, null=True, verbose_name='Markdown Notes')),
                 ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
                 ('po_number', models.SlugField(max_length=20, unique=True, verbose_name='Purchase Order Number')),
                 ('po_date', models.DateField(verbose_name='Purchase Order Date')),
                 ('po_title', models.CharField(max_length=250, verbose_name='Purchase Order Title')),
-                ('po_notes', models.TextField(blank=True, null=True, verbose_name='Notes')),
                 ('po_status', models.CharField(choices=[('draft', 'Draft'), ('in_review', 'In Review'), ('approved', 'Approved')], default='draft', max_length=10)),
                 ('po_amount', models.DecimalField(decimal_places=2, default=0, max_digits=20, verbose_name='Purchase Order Amount')),
                 ('po_amount_received', models.DecimalField(decimal_places=2, default=0, max_digits=20, verbose_name='Received Amount')),
-                ('for_inventory', models.BooleanField(verbose_name='Inventory Purchase?')),
                 ('fulfilled', models.BooleanField(default=False, verbose_name='Is Fulfilled')),
                 ('fulfillment_date', models.DateField(blank=True, null=True, verbose_name='Fulfillment Date')),
                 ('entity', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='django_ledger.entitymodel', verbose_name='Entity')),
                 ('po_items', models.ManyToManyField(through='django_ledger.ItemThroughModel', to='django_ledger.ItemModel', verbose_name='Purchase Order Items')),
-                ('vendor', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='django_ledger.vendormodel')),
             ],
             options={
                 'abstract': False,

django_ledger/migrations/0001_initial.py

@@ -70,6 +70,7 @@ class BillModelAbstract(AccruableItemMixIn, CreateUpdateMixIn):
     IS_DEBIT_BALANCE = False
     ALLOW_MIGRATE = True
 
+    # todo: add markdown mixin...
     uuid = models.UUIDField(default=uuid4, editable=False, primary_key=True)
     bill_number = models.SlugField(max_length=20, unique=True, verbose_name=_('Bill Number'))
     xref = models.SlugField(null=True, blank=True, verbose_name=_('External Reference Number'))

django_ledger/models/bill.py

@@ -69,6 +69,7 @@ class InvoiceModelAbstract(AccruableItemMixIn, CreateUpdateMixIn):
     IS_DEBIT_BALANCE = True
     REL_NAME_PREFIX = 'invoice'
 
+    # todo: add markdown mixin...
     uuid = models.UUIDField(default=uuid4, editable=False, primary_key=True)
     invoice_number = models.SlugField(max_length=20, unique=True, verbose_name=_('Invoice Number'))
     customer = models.ForeignKey('django_ledger.CustomerModel',