faktura xls

project/docs/models/faktura.py

@@ -17,6 +17,28 @@ class Faktura(BaseInvoiceModel, SignedStatusFieldMixin, InvoiceFieldMixin):
     sender = models.ForeignKey(Client, related_name='sender_fakturas', blank=True, null=True, verbose_name=u'Отправитель')
     receiver = models.ForeignKey(Client, related_name='receiver_fakturas', blank=True, null=True, verbose_name=u'Получатель')
 
+    def get_consignor_and_address(self):
+        """Отправитель и адрес
+        """ 
+
+        if self.user_is_sender:
+            print '%s, %s' % (self.user.profile.get_company_name(), self.user.profile.address)
+            print self.user.profile.get_company_name(), self.user.profile.address
+            return u'%s, %s' % (self.user.profile.get_company_name(), self.user.profile.address)
+        elif self.sender:
+            return '%s, %s' % self.sender.name, self.sender.address
+        else:
+            return u''
+
+    def get_receiver_and_address(self):
+        """Получатель и адрес
+        """ 
+        if self.receiver:
+            #return self.user
+            return '%s, %s' % (self.receiver.name, self.receiver.address)
+        else:
+            return u''
+
     class Meta(BaseInvoiceModel.Meta):
         verbose_name = u'Фактура'
         verbose_name_plural = u'Фактуры'

project/docs/views/base_views.py

@@ -663,7 +663,7 @@ class BaseItemsViews(BaseViews):
             if hasattr(obj, 'receiver') and hasattr(obj, 'sender'):
                 if obj.receiver == obj.client:
                     receiver_choice = 'he_is'
-                elif obj.sender:
+                elif obj.receiver:
                     receiver_choice = 'another'
                 else:
                     receiver_choice = 'nobody'
@@ -693,6 +693,8 @@ class BaseItemsViews(BaseViews):
             elif sender == 'nobody':
                 new_obj.user_is_sender = False
                 new_obj.sender = None
+            elif sender == 'another':
+                new_obj.user_is_sender = False
             new_obj.save()
 
             # сохранить табличную часть

project/templates/docs/parts/form_client_choices.html

@@ -1,4 +1,4 @@
 <p>{{ label }}</p>
 <input type="radio" name="{{ client_group|default:'client_group' }}" value="he_is"{% if default == 'he_is' %} checked{% endif %}> {{ label1|default:'Он же' }}<br>
 <input type="radio" name="{{ client_group|default:'client_group' }}" value="another"{% if default == 'another' %} checked{% endif %}>{{ label2|default:'Стороннее лицо' }}<br>
-<input type="radio" name="{{ client_group|default:'client_group' }}" value="nobody"{% if default == 'nobody' %} checked{% endif %}> Не указывать
+<input type="radio" name="{{ client_group|default:'client_group' }}" value="nobody"{% if default == 'nobody' %} checked{% endif %}> Не указывать