Merge branch 'add_invoice_tax' of dam35/coin into master

coin/billing/models.py

@@ -156,6 +156,13 @@ class Invoice(models.Model):
         return total.quantize(Decimal('0.01'))
     amount.short_description = 'Montant'
 
+    def amount_before_tax(self):
+        total = Decimal('0.0')
+        for detail in self.details.all():
+            total += detail.amount
+        return total.quantize(Decimal('0.01'))
+    amount.short_description = 'Montant HT'
+
     def amount_paid(self):
         """
         Calcul le montant payé de la facture en fonction des éléments

coin/billing/templates/billing/invoice_pdf.html

@@ -82,6 +82,7 @@
   .cell-label {width: 70%;}
   .cell-quantity {width: 5%;}
   .cell-amount {width: 10%;}
+  .cell-tax {width: 5%;}
   .cell-total {width: 15%;}
 
   /* details cell style */
@@ -91,8 +92,10 @@
   .cell-quantity {
     text-align: center;
   }
-  .cell--money {
+  .cell--money, 
+  .cell-tax {
     text-align: right;
+    white-space: nowrap;
   }
 
   .cell-label p + p {
@@ -158,7 +161,8 @@
       <tr>
         <th class="cell-label cell--empty"></th>
         <th class="cell-quantity">Quantité</th>
-        <th class="cell-amount cell--money">PU</th>
+        <th class="cell-amount cell--money">PU (HT)</th>
+        <th class="cell-label cell-tax">TVA</th>
         <th class="cell-total cell--money">Total</th>
       </tr>
     </thead>
@@ -181,14 +185,22 @@
         </td>
         <td class="cell-quantity">{{ detail.quantity }}</td>
         <td class="cell-amount cell--money">{{ detail.amount }}€</td>
+        <td class="cell-tax">{{ detail.tax }}%</td>
         <td class="cell-total cell--money">{{ detail.total }}€</td>
       </tr>
       {% endfor %}
+      
       <tr>
         <td class="cell-result cell--empty"></td>
-        <td class="cell-result result-label" colspan="2">Total TTC</td>
+        <td class="result-label " colspan="3">Total HT</td>
+        <td class="cell--money ">{{ invoice.amount_before_tax }}€</td>
+      </tr>
+      <tr>
+        <td class="cell-result cell--empty"></td>
+        <td class="cell-result result-label" colspan="3">Total TTC</td>
         <td class="cell-result result-total cell--money">{{ invoice.amount }}€</td>
       </tr>
+       
     </tbody>
   </table>
 

coin/billing/tests.py

@@ -114,6 +114,46 @@ class BillingInvoiceCreationTests(TestCase):
                          datetime.date(2014, 4, 1))
         self.assertEqual(invoice_test_2.details.first().period_to,
                          datetime.date(2014, 5, 31))
+                         
+    def test_invoice_amount(self):
+        invoice = Invoice(member=self.member)
+        invoice.save()
+
+        invoice.details.create(label=self.offer.name,
+                               amount=100,
+                               offersubscription=self.subscription,
+                               period_from=datetime.date(2014, 1, 1),
+                               period_to=datetime.date(2014, 3, 31),
+                               tax=0)
+
+        invoice.details.create(label=self.offer.name,
+                               amount=10,
+                               offersubscription=self.subscription,
+                               period_from=datetime.date(2014, 6, 1),
+                               period_to=datetime.date(2014, 8, 31),
+                               tax=10)
+        
+        self.assertEqual(invoice.amount(), 111)
+
+    def test_invoice_amount_before_tax(self):
+        invoice = Invoice(member=self.member)
+        invoice.save()
+
+        invoice.details.create(label=self.offer.name,
+                               amount=100,
+                               offersubscription=self.subscription,
+                               period_from=datetime.date(2014, 1, 1),
+                               period_to=datetime.date(2014, 3, 31),
+                               tax=0)
+
+        invoice.details.create(label=self.offer.name,
+                               amount=10,
+                               offersubscription=self.subscription,
+                               period_from=datetime.date(2014, 6, 1),
+                               period_to=datetime.date(2014, 8, 31),
+                               tax=10)
+        
+        self.assertEqual(invoice.amount_before_tax(), 110)
 
     def test_non_billable_offer_isnt_charged(self):
         """