Commit 029ca507 authored by Patrick's avatar Patrick

On the preparation list, (1) show an classement number before the customer...

On the preparation list, (1) show an classement number before the customer name to ease the preparation and (2) show the customer's mail in a format which let's copy paste them to a mail client.
parent aca1624f
......@@ -50,7 +50,7 @@ def email_order(permanence_id, all_producers=True, closed_deliveries_id=None, pr
# At least one order
group_wb = xlsx_order.export_customer_label(
permanence, deliveries_id=closed_deliveries_id, wb=group_wb
permanence=permanence, deliveries_id=closed_deliveries_id, wb=group_wb
)
group_wb = xlsx_order.export_preparation(
permanence=permanence, deliveries_id=closed_deliveries_id, wb=group_wb
......
......@@ -111,6 +111,7 @@ class Customer(models.Model):
is_active = models.BooleanField(_("is_active"), default=True)
may_order = models.BooleanField(_("may_order"), default=True)
valid_email = models.NullBooleanField(_("valid_email"), default=None)
preparation_order = models.IntegerField(null=True, blank=True, default=0)
def get_admin_date_balance(self):
return timezone.now().date()
......
......@@ -61,10 +61,6 @@ class CustomerInvoice(models.Model):
_("Total vat"),
help_text=_('Vat part of the total purchased'),
default=DECIMAL_ZERO, max_digits=9, decimal_places=4)
# total_compensation = ModelMoneyField(
# _("Total compensation"),
# help_text=_('Compensation part of the total purchased'),
# default=DECIMAL_ZERO, max_digits=9, decimal_places=4)
total_deposit = ModelMoneyField(
_("deposit"),
help_text=_('deposit to add to the original unit price'),
......@@ -77,19 +73,11 @@ class CustomerInvoice(models.Model):
_("Total vat"),
help_text=_('vat to add'),
default=DECIMAL_ZERO, max_digits=9, decimal_places=4)
# delta_compensation = ModelMoneyField(
# _("Total compensation"),
# help_text=_('compensation to add'),
# default=DECIMAL_ZERO, max_digits=9, decimal_places=4)
delta_transport = ModelMoneyField(
_("Delivery point transport"),
help_text=_("transport to add"),
default=DECIMAL_ZERO, max_digits=5, decimal_places=2,
validators=[MinValueValidator(0)])
# delta_deposit = ModelMoneyField(
# _("deposit"),
# help_text=_('deposit to add'),
# default=DECIMAL_ZERO, max_digits=8, decimal_places=2)
bank_amount_in = ModelMoneyField(
_("bank_amount_in"), help_text=_('payment_on_the_account'),
max_digits=8, decimal_places=2, default=DECIMAL_ZERO)
......
This diff is collapsed.
Django==1.9.11
Django==1.9.12
Django-Select2==5.8.9
Pillow==3.4.2
Unidecode==0.04.19
......@@ -21,12 +21,11 @@ django-parler==1.6.5
django-polymorphic==1.0.2
django-reversion==1.10.2
django-sekizai==0.10.0
django-treebeard==4.0.1
django-treebeard==4.1.0
djangocms-admin-style==0.2.8
djangocms-attributes-field==0.1.2
# djangocms-cascade==0.11.0
https://github.com/jrief/djangocms-cascade/archive/master.zip
# djangocms-text-ckeditor==3.0.1
https://github.com/jrief/djangocms-cascade/archive/compat-ckeditor-3.2.zip
djangocms-text-ckeditor==3.3.1
djangorestframework==3.4.7
easy-thumbnails==2.3
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment