almet/ihatemoney
1
0
Fork 0
mirror of https://github.com/spiral-project/ihatemoney.git synced 2025-04-30 18:22:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:FlowingCloudRTL/ihatemoney

Browse source
This commit is contained in:
MelodyZhangYiqun 2022-12-12 19:05:26 -05:00
commit 9d4873ed6e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ihatemoney/models.py
View file

@ -78,7 +78,7 @@ class Project(db.Model):
("Expense", "Expense"), ("Expense", "Expense"),
("Reimbursement", "Reimbursement"), ("Reimbursement", "Reimbursement"),
("Transfer", "Transfer"), ("Transfer", "Transfer"),
] ]
@property @property
def _to_serialize(self): def _to_serialize(self):

4
ihatemoney/tests/import_test.py
View file

@ -401,7 +401,7 @@ class ExportTestCase(IhatemoneyTestCase):
resp = self.client.get("/raclette/export/bills.csv") resp = self.client.get("/raclette/export/bills.csv")
expected = [ expected = [
"date,what,bill_type,amount,currency,payer_name,payer_weight,owers", "date,what,bill_type,amount,currency,payer_name,payer_weight,owers",
"2017-01-01,refund,Refund,XXX,13.33,tata,1.0,fred", "2017-01-01,refund,Reimbursement,XXX,13.33,tata,1.0,fred",
'2016-12-31,red wine,Expense,XXX,200.0,fred,1.0,"zorglub, tata"', '2016-12-31,red wine,Expense,XXX,200.0,fred,1.0,"zorglub, tata"',
'2016-12-31,à raclette,Expense,10.0,XXX,zorglub,2.0,"zorglub, fred, tata, pépé"', '2016-12-31,à raclette,Expense,10.0,XXX,zorglub,2.0,"zorglub, fred, tata, pépé"',
] ]
@ -541,7 +541,7 @@ class ExportTestCase(IhatemoneyTestCase):
resp = self.client.get("/raclette/export/bills.csv") resp = self.client.get("/raclette/export/bills.csv")
expected = [ expected = [
"date,what,bill_type,amount,currency,payer_name,payer_weight,owers", "date,what,bill_type,amount,currency,payer_name,payer_weight,owers",
"2017-01-01,refund,Refund,13.33,EUR,tata,1.0,fred", "2017-01-01,refund,Reimbursement,13.33,EUR,tata,1.0,fred",
'2016-12-31,poutine from Québec,Expense,100.0,CAD,fred,1.0,"zorglub, tata"', '2016-12-31,poutine from Québec,Expense,100.0,CAD,fred,1.0,"zorglub, tata"',
'2016-12-31,à raclette,Expense,10.0,EUR,zorglub,2.0,"zorglub, fred, tata, pépé"', '2016-12-31,à raclette,Expense,10.0,EUR,zorglub,2.0,"zorglub, fred, tata, pépé"',
] ]