Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/accounts/utils/__init__.py b/accounts/utils/__init__.py
index c4a0042..8ad1899 100644
--- a/accounts/utils/__init__.py
+++ b/accounts/utils/__init__.py
@@ -28,8 +28,8 @@
subdate(adddate(year_start_date, interval 1 year), interval 1 day)
as year_end_date
from `tabFiscal Year`
- where %s >= year_start_date and %s < adddate(year_start_date, interval 1 year)""",
- (date, date))
+ where %s >= year_start_date and %s < adddate(year_start_date, interval 1 year)
+ order by year_start_date desc""", (date, date))
if not fy:
error_msg = """%s not in any Fiscal Year""" % formatdate(date)
diff --git a/support/report/serial_no_service_contract_expiry/__init__.py b/stock/report/serial_no_service_contract_expiry/__init__.py
similarity index 100%
rename from support/report/serial_no_service_contract_expiry/__init__.py
rename to stock/report/serial_no_service_contract_expiry/__init__.py
diff --git a/support/report/serial_no_service_contract_expiry/serial_no_service_contract_expiry.txt b/stock/report/serial_no_service_contract_expiry/serial_no_service_contract_expiry.txt
similarity index 100%
rename from support/report/serial_no_service_contract_expiry/serial_no_service_contract_expiry.txt
rename to stock/report/serial_no_service_contract_expiry/serial_no_service_contract_expiry.txt
diff --git a/support/report/serial_no_warranty_expiry/__init__.py b/stock/report/serial_no_warranty_expiry/__init__.py
similarity index 100%
rename from support/report/serial_no_warranty_expiry/__init__.py
rename to stock/report/serial_no_warranty_expiry/__init__.py
diff --git a/stock/report/serial_no_warranty_expiry/serial_no_warranty_expiry.txt b/stock/report/serial_no_warranty_expiry/serial_no_warranty_expiry.txt
new file mode 100644
index 0000000..603e988
--- /dev/null
+++ b/stock/report/serial_no_warranty_expiry/serial_no_warranty_expiry.txt
@@ -0,0 +1,19 @@
+[
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2013-01-04 13:57:25",
+ "modified_by": "Administrator",
+ "modified": "2013-01-07 13:22:26"
+ },
+ {
+ "name": "__common__",
+ "ref_doctype": "Serial No",
+ "doctype": "Report",
+ "json": "{\"filters\":[[\"Serial No\",\"status\",\"=\",\"Delivered\"]],\"columns\":[[\"name\",\"Serial No\"],[\"item_code\",\"Serial No\"],[\"warranty_expiry_date\",\"Serial No\"],[\"warranty_period\",\"Serial No\"],[\"maintenance_status\",\"Serial No\"],[\"purchase_document_no\",\"Serial No\"],[\"purchase_date\",\"Serial No\"],[\"supplier\",\"Serial No\"],[\"supplier_name\",\"Serial No\"],[\"delivery_document_no\",\"Serial No\"],[\"delivery_date\",\"Serial No\"],[\"customer\",\"Serial No\"],[\"customer_name\",\"Serial No\"],[\"item_name\",\"Serial No\"],[\"description\",\"Serial No\"],[\"item_group\",\"Serial No\"],[\"brand\",\"Serial No\"]],\"sort_by\":\"Serial No.warranty_expiry_date\",\"sort_order\":\"asc\",\"sort_by_next\":\"\",\"sort_order_next\":\"asc\"}"
+ },
+ {
+ "name": "Serial No Warranty Expiry",
+ "doctype": "Report"
+ }
+]
\ No newline at end of file
diff --git a/support/report/__init__.py b/support/report/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/support/report/__init__.py
+++ /dev/null
diff --git a/support/report/serial_no_warranty_expiry/serial_no_warranty_expiry.txt b/support/report/serial_no_warranty_expiry/serial_no_warranty_expiry.txt
deleted file mode 100644
index 4b6c4be..0000000
--- a/support/report/serial_no_warranty_expiry/serial_no_warranty_expiry.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-[
- {
- "owner": "Administrator",
- "docstatus": 0,
- "creation": "2013-01-03 17:24:01",
- "modified_by": "Administrator",
- "modified": "2013-01-03 17:35:42"
- },
- {
- "name": "__common__",
- "ref_doctype": "Serial No",
- "doctype": "Report",
- "json": "{\"filters\":[[\"Serial No\",\"status\",\"=\",\"Delivered\"]],\"columns\":[[\"name\",\"Serial No\"],[\"item_code\",\"Serial No\"],[\"warranty_expiry_date\",\"Serial No\"],[\"maintenance_status\",\"Serial No\"],[\"delivery_document_no\",\"Serial No\"],[\"customer\",\"Serial No\"],[\"customer_name\",\"Serial No\"],[\"item_name\",\"Serial No\"],[\"description\",\"Serial No\"],[\"item_group\",\"Serial No\"],[\"brand\",\"Serial No\"]],\"sort_by\":\"Serial No.warranty_expiry_date\",\"sort_order\":\"asc\",\"sort_by_next\":\"\",\"sort_order_next\":\"asc\"}"
- },
- {
- "name": "Serial No Warranty Expiry",
- "doctype": "Report"
- }
-]
\ No newline at end of file