Merge branch 'master' into front-end

ihatemoney/migrations/versions/2dcb0c0048dc_autologger.py

@@ -28,6 +28,7 @@ def upgrade():
             "external_link", sa.UnicodeText(), autoincrement=False, nullable=True
         ),
         sa.Column("archive", sa.Integer(), autoincrement=False, nullable=True),
+        sa.Column("is_reimbursement", sa.Boolean(), nullable=True),
         sa.Column(
             "transaction_id", sa.BigInteger(), autoincrement=False, nullable=False
         ),

ihatemoney/migrations/versions/b9a10d5d63ce_.py

@@ -49,6 +49,7 @@ def upgrade():
         sa.Column("date", sa.Date(), nullable=True),
         sa.Column("what", sa.UnicodeText(), nullable=True),
         sa.Column("archive", sa.Integer(), nullable=True),
+        sa.Column("is_reimbursement", sa.Boolean(), nullable=True),
         sa.ForeignKeyConstraint(["archive"], ["archive.id"]),
         sa.ForeignKeyConstraint(["payer_id"], ["person.id"]),
         sa.PrimaryKeyConstraint("id"),

ihatemoney/models.py

@@ -158,13 +158,10 @@ class Project(db.Model):
         """
         monthly = defaultdict(lambda: defaultdict(float))
         for bill in self.get_bills_unordered().all():
-<<<<<<< Updated upstream
             monthly[bill.date.year][bill.date.month] += bill.converted_amount
-=======
             if (bill.is_reimbursement == False):
             # if (not bill.what.startswith("R-")):
                 monthly[bill.date.year][bill.date.month] += bill.converted_amount
->>>>>>> Stashed changes
         return monthly
 
     @property
@@ -683,6 +680,7 @@ class Bill(db.Model):
 
     original_currency = db.Column(db.String(3))
     converted_amount = db.Column(db.Float)
+    is_reimbursement = db.Column(db.Boolean)
 
     archive = db.Column(db.Integer, db.ForeignKey("archive.id"))
 
@@ -698,6 +696,7 @@ class Bill(db.Model):
         payer_id: int = None,
         project_default_currency: str = "",
         what: str = "",
+        is_reimbursement:bool = False
     ):
         super().__init__()
         self.amount = amount
@@ -707,6 +706,7 @@ class Bill(db.Model):
         self.owers = owers
         self.payer_id = payer_id
         self.what = what
+        self.is_reimbursement = is_reimbursement
         self.converted_amount = self.currency_helper.exchange_currency(
             self.amount, self.original_currency, project_default_currency
         )
@@ -724,6 +724,7 @@ class Bill(db.Model):
             "external_link": self.external_link,
             "original_currency": self.original_currency,
             "converted_amount": self.converted_amount,
+            "is_reimbursement": self.is_reimbursement,
         }
 
     def pay_each_default(self, amount):