Compare commits

..

No commits in common. "4487ba68f5d07355a2c1b8735be5d01b9da41c1a" and "719f7af485fbf746aa50eee51ba2784d44406cfb" have entirely different histories.

3 changed files with 3 additions and 5 deletions

1
.gitignore vendored
View File

@ -7,7 +7,6 @@ __pycache__
**/*/__pycache__ **/*/__pycache__
inventory/__pycache__ inventory/__pycache__
db.sqlite db.sqlite
dbtest.sqlite3
db.sqlite3 db.sqlite3
db.sqlite3.backup db.sqlite3.backup
db.sqlite* db.sqlite*

View File

View File

@ -888,10 +888,10 @@ class CarFinance(models.Model):
max_digits=14, decimal_places=2, verbose_name=_("Cost Price") max_digits=14, decimal_places=2, verbose_name=_("Cost Price")
) )
selling_price = models.DecimalField( selling_price = models.DecimalField(
max_digits=14, decimal_places=2, verbose_name=_("Selling Price"),default=Decimal("0.00") max_digits=14, decimal_places=2, verbose_name=_("Selling Price")
) )
marked_price = models.DecimalField( marked_price = models.DecimalField(
max_digits=14, decimal_places=2, verbose_name=_("Marked Price"),default=Decimal("0.00") max_digits=14, decimal_places=2, verbose_name=_("Marked Price")
) )
discount_amount = models.DecimalField( discount_amount = models.DecimalField(
max_digits=14, max_digits=14,
@ -2627,7 +2627,7 @@ class SaleOrder(models.Model):
blank=True, blank=True,
) )
comments = models.TextField(blank=True, null=True) comments = models.TextField(blank=True, null=True)
formatted_order_id = models.CharField(max_length=10, unique=True, editable=False) formatted_order_id = models.CharField(max_length=20, unique=True, editable=False)
# Status and Dates # Status and Dates
status = models.CharField( status = models.CharField(
@ -2957,7 +2957,6 @@ class CustomGroup(models.Model):
"itemmodel", "itemmodel",
"invoicemodel", "invoicemodel",
"vendormodel", "vendormodel",
"journalentrymodel", "journalentrymodel",
"purchaseordermodel", "purchaseordermodel",
"estimatemodel", "estimatemodel",