Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import django_ledger.io.io_core
import uuid
from django.db import migrations, models
from django_ledger.io.io_core import get_localdate


class Migration(migrations.Migration):
Expand Down Expand Up @@ -37,8 +38,8 @@ class Migration(migrations.Migration):
('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)),
('receipt_number', models.CharField(max_length=255, verbose_name='Receipt Number')),
('receipt_date', models.DateField(verbose_name='Receipt Date')),
('receipt_type', models.CharField(choices=[('sales', 'Sales Receipt'), ('customer_refund', 'Sales Refund'), ('expense', 'Expense Receipt'), ('expense_refund', 'Expense Refund'), ('transfer', 'Transfer Receipt')], verbose_name='Receipt Type')),
('receipt_date', models.DateField(verbose_name='Receipt Date', default=get_localdate, null=True)),
('receipt_type', models.CharField(max_length=15, choices=[('sales', 'Sales Receipt'), ('customer_refund', 'Sales Refund'), ('expense', 'Expense Receipt'), ('expense_refund', 'Expense Refund'), ('transfer', 'Transfer Receipt')], verbose_name='Receipt Type')),
('amount', models.DecimalField(decimal_places=2, help_text='Amount of the receipt.', max_digits=20, validators=[django.core.validators.MinValueValidator(0)], verbose_name='Receipt Amount')),
('charge_account', models.ForeignKey(help_text='The financial account (cash or credit) where this transaction was made.', on_delete=django.db.models.deletion.PROTECT, related_name='charge_receiptmodel_set', to='django_ledger.accountmodel', verbose_name='Charge Account')),
('customer_model', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='django_ledger.customermodel', verbose_name='Customer Model')),
Expand All @@ -53,4 +54,4 @@ class Migration(migrations.Migration):
},
bases=(models.Model, django_ledger.io.io_core.IOMixIn),
),
]
]
9 changes: 7 additions & 2 deletions django_ledger/models/receipt.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,13 @@ class ReceiptModelAbstract(CreateUpdateMixIn, MarkdownNotesMixIn, IOMixIn):

uuid = models.UUIDField(default=uuid4, editable=False, primary_key=True)
receipt_number = models.CharField(_('Receipt Number'), max_length=255)
receipt_date = models.DateField(_('Receipt Date'))
receipt_type = models.CharField(choices=RECEIPT_TYPES, max_length=15, verbose_name=_('Receipt Type'))
receipt_date = models.DateField(_('Receipt Date'), default=localdate, null=True)
receipt_type = models.CharField(
choices=RECEIPT_TYPES,
max_length=15,
verbose_name=_('Receipt Type'),
default=SALES_RECEIPT,
)

ledger_model = models.ForeignKey(
'django_ledger.LedgerModel',
Expand Down