Commit 3255e05b by 夏超

[fix] 玖姿问题

parent 1f6dd5e8
...@@ -73,10 +73,10 @@ class ProductIncomeExpenseIframe(http.Controller): ...@@ -73,10 +73,10 @@ class ProductIncomeExpenseIframe(http.Controller):
"business_date": v.business_date and v.business_date.strftime('%Y-%m-%d'), "business_date": v.business_date and v.business_date.strftime('%Y-%m-%d'),
"abstract": v.abstract or "", "abstract": v.abstract or "",
"customer": v.customer or "", "customer": v.customer or "",
"income": v.income or 0, "income": round(v.income, 2) or 0,
"machinery_type": v.machinery_type or "其他", "machinery_type": v.machinery_type or "其他",
"expenditure": v.expenditure or 0, "expenditure": round(v.expenditure) or 0,
"balance": v.balance or 0, "balance": round(v.balance, 2) or 0,
"user_name": v.create_uid.name or "", "user_name": v.create_uid.name or "",
"create_date": (v.create_date + datetime.timedelta(hours=8)).strftime('%Y-%m-%d %H:%M'), "create_date": (v.create_date + datetime.timedelta(hours=8)).strftime('%Y-%m-%d %H:%M'),
}) })
......
...@@ -31,6 +31,6 @@ class ProductIncomeExpense(models.Model): ...@@ -31,6 +31,6 @@ class ProductIncomeExpense(models.Model):
("id", "!=", v.id) ("id", "!=", v.id)
], limit=1, order="business_date desc, create_date desc") ], limit=1, order="business_date desc, create_date desc")
if not last_data: if not last_data:
v.balance = 0 + v.income - v.expenditure v.balance = round(0 + v.income - v.expenditure, 2)
else: else:
v.balance = last_data.balance + v.income - v.expenditure v.balance = round(last_data.balance + v.income - v.expenditure, 2)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment