Fixed conflict merge

This commit is contained in:
Akhilesh Darjee
2013-06-20 15:22:04 +05:30
43 changed files with 862 additions and 91 deletions

View File

@@ -180,6 +180,16 @@ wn.module_page["Selling"] = [
route: "query-report/Customers Not Buying Since Long Time",
doctype: "Sales Order"
},
{
"label":wn._("Quotation Trend"),
route: "query-report/Quotation Trends",
doctype: "Quotation"
},
{
"label":wn._("Sales Order Trend"),
route: "query-report/Sales Order Trends",
doctype: "Sales Order"
},
]
}
]