nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 18:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rename checkbox and translations

Browse Source 
- rename checkbox and make it
 - added translation text for labels
 - fixes for linter error

(cherry picked from commit 9ec8841b91)
This commit is contained in:
ruthra
2021-12-14 20:59:14 +05:30
committed by mergify-bot
parent 804f2ccf3d
commit 74ac5e7829
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py
View File

@@ -2,7 +2,7 @@
# License: MIT. See LICENSE # License: MIT. See LICENSE
import frappe import frappe
from frappe import qb from frappe import _, qb
from frappe.query_builder import Column, functions from frappe.query_builder import Column, functions
from frappe.utils import add_days, date_diff, flt, get_first_day, get_last_day, rounded from frappe.utils import add_days, date_diff, flt, get_first_day, get_last_day, rounded
@@ -352,11 +352,15 @@ class Deferred_Revenue_and_Expense_Report(object):
def get_columns(self): def get_columns(self):
columns = [] columns = []
columns.append({"label": "Name", "fieldname": "name", "fieldtype": "Data", "read_only": 1}) columns.append({"label": _("Name"), "fieldname": "name", "fieldtype": "Data", "read_only": 1})
for period in self.period_list: for period in self.period_list:
columns.append( columns.append(
{"label": period.label, "fieldname": period.key, "fieldtype": "Currency", "read_only": 1,} {
) "label": _(period.label),
"fieldname": period.key,
"fieldtype": "Currency",
"read_only": 1,
})
return columns return columns
def generate_report_data(self): def generate_report_data(self):
@@ -393,8 +397,7 @@ class Deferred_Revenue_and_Expense_Report(object):
"name": "Actual Posting", "name": "Actual Posting",
"chartType": "bar", "chartType": "bar",
"values": [x.actual for x in self.period_total], "values": [x.actual for x in self.period_total],
}, }
{"name": "Expected", "chartType": "line", "values": [x.total for x in self.period_total],},
], ],
}, },
"type": "axis-mixed", "type": "axis-mixed",
@@ -403,6 +406,13 @@ class Deferred_Revenue_and_Expense_Report(object):
"barOptions": {"stacked": False, "spaceRatio": 0.5}, "barOptions": {"stacked": False, "spaceRatio": 0.5},
} }
if self.filters.with_upcoming_postings:
chart["data"]["datasets"].append({
"name": "Expected",
"chartType": "line",
"values": [x.total for x in self.period_total]
})
return chart return chart
def run(self, *args, **kwargs): def run(self, *args, **kwargs):

4
erpnext/accounts/report/deferred_revenue_and_expense/test_deferred_revenue_and_expense.py
View File

@@ -1,9 +1,8 @@
import datetime
import unittest import unittest
import frappe import frappe
from frappe import qb from frappe import qb
from frappe.utils import add_months, nowdate from frappe.utils import nowdate
from erpnext.accounts.doctype.account.test_account import create_account from erpnext.accounts.doctype.account.test_account import create_account
from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
@@ -123,6 +122,7 @@ class TestDeferredRevenueAndExpense(unittest.TestCase):
supplier = create_supplier( supplier = create_supplier(
supplier_name="_Test Furniture Supplier", supplier_group="Local", supplier_type="Company" supplier_name="_Test Furniture Supplier", supplier_group="Local", supplier_type="Company"
) )
supplier.save()
item = create_item( item = create_item(
"_Test Office Desk", "_Test Office Desk",