Merge branch 'mlh_jzjx_project' into 'master'

bug

See merge request !31

roke_product_income_expense/controller/main.py

@@ -71,7 +71,7 @@ class ProductIncomeExpenseIframe(http.Controller):
                                machinery_type = %s,
                                expenditure = %s,
                                customer = %s,
-                               balance = %s,
+                               balance = %s
                          WHERE id = %s
                     """, (
                         data["business_date"], data["abstract"], data["income"],