added reimbursement field in add bill form

ihatemoney/forms.py

@@ -325,6 +325,7 @@ class BillForm(FlaskForm):
     what = StringField(_("What?"), validators=[DataRequired()])
     payer = SelectField(_("Who paid?"), validators=[DataRequired()], coerce=int)
     amount = CalculatorStringField(_("How much?"), validators=[DataRequired()])
+    is_reimbursement = BooleanField("Reimbursement", default=False)
     currency_helper = CurrencyConverter()
     original_currency = SelectField(_("Currency"), validators=[DataRequired()])
     external_link = URLField(
@@ -344,6 +345,7 @@ class BillForm(FlaskForm):
             amount=float(self.amount.data),
             date=self.date.data,
             external_link=self.external_link.data,
+            is_reimbursement=self.is_reimbursement.data,
             original_currency=str(self.original_currency.data),
             owers=Person.query.get_by_ids(self.payed_for.data, project),
             payer_id=self.payer.data,

ihatemoney/models.py

@@ -159,6 +159,11 @@ class Project(db.Model):
         monthly = defaultdict(lambda: defaultdict(float))
         for bill in self.get_bills_unordered().all():
             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

ihatemoney/templates/forms.html

@@ -166,6 +166,7 @@
     {{ input(form.date, inline=True) }}
     {{ input(form.what, inline=True) }}
     {{ input(form.payer, inline=True, class="form-control custom-select") }}
+    {{ input(form.is_reimbursement, inline=True) }}
     <div data-toggle="tooltip" data-placement="top" title='{{ _("Simple operations are allowed, e.g. (18+36.2)/3") }}'>
         {{ input(form.amount, inline=True) }}
     </div>

ihatemoney/templates/settle_bills.html

@@ -16,6 +16,11 @@
             <td>{{ bill.ower }}</td>
             <td>{{ bill.receiver }}</td>
             <td>{{ bill.amount|currency }}</td>
+            <!-- <td>
+                <a href="{{ url_for('.settle') }}" class="btn btn-primary " data-toggle="modal" data-keyboard="false" data-target="#bill-form">
+                    Settle
+                </a>
+            </td> -->
     </tr>
     {% endfor %}
     </tbody>

ihatemoney/web.py

@@ -747,6 +747,28 @@ def add_bill():
 
     return render_template("add_bill.html", form=form)
 
+@main.route("/<project_id>/settle_bills/add", methods=["GET", "POST"])
+def settle():
+    form = get_billform_for(g.project)
+    if request.method == "POST":
+        if form.validate():
+            # save last selected payer in session
+            session["last_selected_payer"] = form.payer.data
+            session.update()
+
+            db.session.add(form.export(g.project))
+            db.session.commit()
+
+            flash(_("The bill has been added"))
+
+            args = {}
+            if form.submit2.data:
+                args["add_bill"] = True
+
+            return redirect(url_for(".list_bills", **args))
+
+    return render_template("add_bill.html", form=form)
+
 
 @main.route("/<project_id>/delete/<int:bill_id>", methods=["POST"])
 def delete_bill(bill_id):