NPO-Accounting/import2ledger Changeset - ba3b9ef93c69

Changeset - ba3b9ef93c69

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Brett Smith - 6 years ago 2018-09-28 12:47:02
brettcsmith@brettcsmith.org

nbpy2017: Actually count the quantity listed on invoices.

3 files changed with 13 insertions and 13 deletions:

import2ledger/importers/nbpy2017.py

tests/data/imports.yml

tests/data/nbpy2017c.html

0 comments (0 inline, 0 general)

import2ledger/importers/nbpy2017.py

➞

Show inline comments

@@ ... / @@ -85,15 +85,15 @@ class Invoice2017: @@
             if qty is None:
                 continue
             total = strparse.currency_decimal(total)
             self.amount += total
             if description.startswith('Ticket - '):
                 if total > 0:
-                    self.tickets_sold += 1
+                    self.tickets_sold += int(qty)
             elif description.startswith('T-Shirt - '):
-                self.shirts_sold += 1
+                self.shirts_sold += int(qty)
             elif description.startswith('Early Bird ('):
                 self.ticket_rate = self.DISCOUNT_TICKET_RATE
     def _read_invoice_activity(self, table, first_row_text, rows_text):
         self.actions = [{
             'date': self.invoice_date,

tests/data/imports.yml

➞

Show inline comments

@@ ... / @@ -235,28 +235,28 @@ @@
 - source: nbpy2017c.html
   importer: nbpy2017.InvoiceImporter
   expect:
     - payee: Python Person C
       ledger template: nbpy2017 invoice ledger entry
       date: !!python/object/apply:datetime.date [2017, 9, 5]
-      amount: !!python/object/apply:decimal.Decimal ["30.00"]
+      amount: !!python/object/apply:decimal.Decimal ["60.00"]
       tickets_sold: !!python/object/apply:decimal.Decimal ["0"]
       ticket_rate: !!python/object/apply:decimal.Decimal ["42.50"]
-      shirts_sold: !!python/object/apply:decimal.Decimal ["1"]
+      shirts_sold: !!python/object/apply:decimal.Decimal ["2"]
       shirt_rate: !!python/object/apply:decimal.Decimal ["25.50"]
       status: Invoice
       currency: USD
       invoice_date: !!python/object/apply:datetime.date [2017, 9, 5]
       invoice_id: "11"
     - payee: Python Person C
       ledger template: nbpy2017 payment ledger entry
       date: !!python/object/apply:datetime.date [2017, 9, 5]
-      amount: !!python/object/apply:decimal.Decimal ["30.00"]
+      amount: !!python/object/apply:decimal.Decimal ["60.00"]
       tickets_sold: !!python/object/apply:decimal.Decimal ["0"]
       ticket_rate: !!python/object/apply:decimal.Decimal ["42.50"]
-      shirts_sold: !!python/object/apply:decimal.Decimal ["1"]
+      shirts_sold: !!python/object/apply:decimal.Decimal ["2"]
       shirt_rate: !!python/object/apply:decimal.Decimal ["25.50"]
       status: Payment
       currency: USD
       invoice_date: !!python/object/apply:datetime.date [2017, 9, 5]
       payment_id: ch_daer0ahwoh9oDeiqu2eimoD7
       stripe_id: ch_daer0ahwoh9oDeiqu2eimoD7

tests/data/nbpy2017c.html

➞

Show inline comments

@@ ... / @@ -176,29 +176,29 @@ @@
             <td class="text-right">1</td>
             <td class="text-right">$0.00</td>
             <td class="text-right">$0.00</td>
           </tr>
           <tr>
             <td>T-Shirt - Men&#39;s/Straight Cut Size M</td>
             <td class="text-right">1</td>
             <td class="text-right">$30.00</td>
             <td class="text-right">2</td>
             <td class="text-right">$30.00</td>
             <td class="text-right">$60.00</td>
           </tr>
           <tr>
             <td>Tutorials - Notify me when tutorials are open</td>
             <td class="text-right">1</td>
             <td class="text-right">$-0.00</td>
             <td class="text-right">$-0.00</td>
           </tr>
         <tr>
           <th colspan="3">TOTAL</th>
-          <td class="text-right">$30.00</td>
+          <td class="text-right">$60.00</td>
         </tr>
     <tr>
       <td colspan="3">Includes donation eligible for tax deduction in the USA:</td>
-      <td class="text-right">$4.25</td>
+      <td class="text-right">$9.00</td>
     </tr>
       </table>
     </div>
     <div class="panel panel-info">
       <div class="panel-heading">
         <h3 class="panel-title">Balance</h3>
@@ ... / @@ -207,13 +207,13 @@ @@
         <tr>
           <td colspan="3">Total payments:</td>
           <td class="text-right">$0</td>
         </tr>
         <tr>
           <td colspan="3">Balance due:</td>
-          <td class="text-right">$30.00</td>
+          <td class="text-right">$60.00</td>
         </tr>
       </table>
     </div>
       <div class="panel panel-info">
         <div class="panel-heading">
           <h4 class="panel-title">Payments received</h4>
@@ ... / @@ -224,18 +224,18 @@ @@
       <th>Reference</th>
       <th>Amount</th>
     </tr>
       <tr>
         <td>Sept. 5, 2017, 9:14 p.m.</td>
         <td>Paid with Stripe reference: ch_daer0ahwoh9oDeiqu2eimoD7</td>
-        <td>30.00</td>
+        <td>60.00</td>
       </tr>
       <tr>
         <td>Sept. 8, 2017, 3:20 p.m.</td>
         <td>Generated credit note 31</td>
-        <td>-30.00</td>
+        <td>-60.00</td>
       </tr>
   </table>
       </div>
     <div class="panel panel-default">
         <div class="panel-heading">
           <h3 class="panel-title">

0 comments (0 inline, 0 general)