Fixed merge conflict

This commit is contained in:
Nabin Hait
2016-11-21 19:13:22 +05:30
45 changed files with 798 additions and 248 deletions

View File

@@ -371,6 +371,12 @@ def get_data():
"doctype": "GL Entry",
"is_query_report": True,
},
{
"type": "report",
"name": "Profitability Analysis",
"doctype": "GL Entry",
"is_query_report": True,
},
{
"type": "report",
"name": "Payment Period Based On Invoice Date",