Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/patches/january_2013/remove_support_search_criteria.py b/patches/january_2013/remove_support_search_criteria.py
new file mode 100644
index 0000000..0443afe
--- /dev/null
+++ b/patches/january_2013/remove_support_search_criteria.py
@@ -0,0 +1,4 @@
+import webnotes
+def execute():
+ for sc in ["warranty-amc_expiry_details", "warranty-amc_summary"]:
+ webnotes.delete_doc("Search Criteria", sc)
\ No newline at end of file
diff --git a/patches/patch_list.py b/patches/patch_list.py
index 08f0253..2dd37ec 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -574,4 +574,8 @@
'patch_module': 'patches.january_2013',
'patch_file': 'deprecate_stock_search_criteria',
},
+ {
+ 'patch_module': 'patches.january_2013',
+ 'patch_file': 'remove_support_search_criteria',
+ },
]
\ No newline at end of file
diff --git a/stock/report/serial_no_status/__init__.py b/stock/report/serial_no_status/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/stock/report/serial_no_status/__init__.py
diff --git a/stock/report/serial_no_status/serial_no_status.txt b/stock/report/serial_no_status/serial_no_status.txt
new file mode 100644
index 0000000..19db65e
--- /dev/null
+++ b/stock/report/serial_no_status/serial_no_status.txt
@@ -0,0 +1,19 @@
+[
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2013-01-04 12:00:54",
+ "modified_by": "Administrator",
+ "modified": "2013-01-04 12:02:29"
+ },
+ {
+ "name": "__common__",
+ "ref_doctype": "Serial No",
+ "doctype": "Report",
+ "json": "{\"filters\":[],\"columns\":[[\"name\",\"Serial No\"],[\"item_code\",\"Serial No\"],[\"warehouse\",\"Serial No\"],[\"status\",\"Serial No\"],[\"item_name\",\"Serial No\"],[\"description\",\"Serial No\"],[\"item_group\",\"Serial No\"],[\"brand\",\"Serial No\"],[\"purchase_document_no\",\"Serial No\"],[\"purchase_date\",\"Serial No\"],[\"customer\",\"Serial No\"],[\"customer_name\",\"Serial No\"],[\"purchase_rate\",\"Serial No\"],[\"delivery_document_no\",\"Serial No\"],[\"delivery_date\",\"Serial No\"],[\"supplier\",\"Serial No\"],[\"supplier_name\",\"Serial No\"]],\"sort_by\":\"Serial No.name\",\"sort_order\":\"desc\",\"sort_by_next\":\"\",\"sort_order_next\":\"desc\"}"
+ },
+ {
+ "name": "Serial No Status",
+ "doctype": "Report"
+ }
+]
\ No newline at end of file
diff --git a/support/report/__init__.py b/support/report/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/support/report/__init__.py
diff --git a/support/report/serial_no_service_contract_expiry/__init__.py b/support/report/serial_no_service_contract_expiry/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/support/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/support/report/serial_no_service_contract_expiry/serial_no_service_contract_expiry.txt
new file mode 100644
index 0000000..45e01b9
--- /dev/null
+++ b/support/report/serial_no_service_contract_expiry/serial_no_service_contract_expiry.txt
@@ -0,0 +1,19 @@
+[
+ {
+ "owner": "Administrator",
+ "docstatus": 0,
+ "creation": "2013-01-03 18:11:00",
+ "modified_by": "Administrator",
+ "modified": "2013-01-03 18:12:28"
+ },
+ {
+ "name": "__common__",
+ "ref_doctype": "Serial No",
+ "doctype": "Report",
+ "json": "{\"filters\":[[\"Serial No\",\"status\",\"=\",\"Delivered\"]],\"columns\":[[\"name\",\"Serial No\"],[\"item_code\",\"Serial No\"],[\"amc_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.amc_expiry_date\",\"sort_order\":\"asc\",\"sort_by_next\":\"\",\"sort_order_next\":\"desc\"}"
+ },
+ {
+ "name": "Serial No Service Contract Expiry",
+ "doctype": "Report"
+ }
+]
\ No newline at end of file
diff --git a/support/report/serial_no_warranty_expiry/__init__.py b/support/report/serial_no_warranty_expiry/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/support/report/serial_no_warranty_expiry/__init__.py
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
new file mode 100644
index 0000000..4b6c4be
--- /dev/null
+++ b/support/report/serial_no_warranty_expiry/serial_no_warranty_expiry.txt
@@ -0,0 +1,19 @@
+[
+ {
+ "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