Rearrange To/From, Recurring Type field for better UX
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 153b8d8..7e37400 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -783,6 +783,18 @@
{
"allow_on_submit": 1,
"depends_on": "eval:doc.is_recurring==1",
+ "description": "Select the period when the invoice will be generated automatically",
+ "fieldname": "recurring_type",
+ "fieldtype": "Select",
+ "label": "Recurring Type",
+ "no_copy": 1,
+ "options": "Monthly\nQuarterly\nHalf-yearly\nYearly",
+ "permlevel": 0,
+ "print_hide": 1
+ },
+ {
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
"description": "Start date of current invoice's period",
"fieldname": "from_date",
"fieldtype": "Date",
@@ -803,18 +815,6 @@
{
"allow_on_submit": 1,
"depends_on": "eval:doc.is_recurring==1",
- "description": "Select the period when the invoice will be generated automatically",
- "fieldname": "recurring_type",
- "fieldtype": "Select",
- "label": "Recurring Type",
- "no_copy": 1,
- "options": "Monthly\nQuarterly\nHalf-yearly\nYearly",
- "permlevel": 0,
- "print_hide": 1
- },
- {
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
"description": "The day of the month on which auto invoice will be generated e.g. 05, 28 etc",
"fieldname": "repeat_on_day_of_month",
"fieldtype": "Int",
@@ -878,7 +878,7 @@
"icon": "icon-file-text",
"idx": 1,
"is_submittable": 1,
- "modified": "2014-10-06 12:57:32.064210",
+ "modified": "2014-10-08 14:23:20.234176",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice",
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 21c96e7..e9bb996 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -1074,13 +1074,14 @@
{
"allow_on_submit": 1,
"depends_on": "eval:doc.is_recurring==1",
- "description": "End date of current invoice's period",
- "fieldname": "to_date",
- "fieldtype": "Date",
- "label": "To Date",
+ "description": "Select the period when the invoice will be generated automatically",
+ "fieldname": "recurring_type",
+ "fieldtype": "Select",
+ "label": "Recurring Type",
"no_copy": 1,
+ "options": "\nMonthly\nQuarterly\nHalf-yearly\nYearly",
"permlevel": 0,
- "print_hide": 0,
+ "print_hide": 1,
"read_only": 0
},
{
@@ -1098,14 +1099,13 @@
{
"allow_on_submit": 1,
"depends_on": "eval:doc.is_recurring==1",
- "description": "Select the period when the invoice will be generated automatically",
- "fieldname": "recurring_type",
- "fieldtype": "Select",
- "label": "Recurring Type",
+ "description": "End date of current invoice's period",
+ "fieldname": "to_date",
+ "fieldtype": "Date",
+ "label": "To Date",
"no_copy": 1,
- "options": "\nMonthly\nQuarterly\nHalf-yearly\nYearly",
"permlevel": 0,
- "print_hide": 1,
+ "print_hide": 0,
"read_only": 0
},
{
@@ -1192,7 +1192,7 @@
"icon": "icon-file-text",
"idx": 1,
"is_submittable": 1,
- "modified": "2014-10-06 12:54:42.549361",
+ "modified": "2014-10-08 14:23:05.034326",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice",
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index 8380e86..f072b65 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -680,6 +680,16 @@
{
"allow_on_submit": 1,
"depends_on": "eval:doc.is_recurring==1",
+ "fieldname": "recurring_type",
+ "fieldtype": "Select",
+ "label": "Recurring Type",
+ "no_copy": 1,
+ "options": "Monthly\nQuarterly\nHalf-yearly\nYearly",
+ "permlevel": 0
+ },
+ {
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
"description": "Start date of current order's period",
"fieldname": "from_date",
"fieldtype": "Date",
@@ -700,16 +710,6 @@
{
"allow_on_submit": 1,
"depends_on": "eval:doc.is_recurring==1",
- "fieldname": "recurring_type",
- "fieldtype": "Select",
- "label": "Recurring Type",
- "no_copy": 1,
- "options": "Monthly\nQuarterly\nHalf-yearly\nYearly",
- "permlevel": 0
- },
- {
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
"description": "The day of the month on which auto order will be generated e.g. 05, 28 etc",
"fieldname": "repeat_on_day_of_month",
"fieldtype": "Int",
@@ -772,7 +772,7 @@
"icon": "icon-file-text",
"idx": 1,
"is_submittable": 1,
- "modified": "2014-10-06 12:16:44.453946",
+ "modified": "2014-10-08 14:23:29.718779",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order",
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 5af9a26..69693a7 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -924,6 +924,18 @@
{
"allow_on_submit": 1,
"depends_on": "eval:doc.is_recurring==1",
+ "description": "Select the period when the invoice will be generated automatically",
+ "fieldname": "recurring_type",
+ "fieldtype": "Select",
+ "label": "Recurring Type",
+ "no_copy": 1,
+ "options": "\nMonthly\nQuarterly\nHalf-yearly\nYearly",
+ "permlevel": 0,
+ "print_hide": 1
+ },
+ {
+ "allow_on_submit": 1,
+ "depends_on": "eval:doc.is_recurring==1",
"description": "Start date of current order's period",
"fieldname": "from_date",
"fieldtype": "Date",
@@ -944,18 +956,6 @@
{
"allow_on_submit": 1,
"depends_on": "eval:doc.is_recurring==1",
- "description": "Select the period when the invoice will be generated automatically",
- "fieldname": "recurring_type",
- "fieldtype": "Select",
- "label": "Recurring Type",
- "no_copy": 1,
- "options": "\nMonthly\nQuarterly\nHalf-yearly\nYearly",
- "permlevel": 0,
- "print_hide": 1
- },
- {
- "allow_on_submit": 1,
- "depends_on": "eval:doc.is_recurring==1",
"description": "The day of the month on which auto order will be generated e.g. 05, 28 etc ",
"fieldname": "repeat_on_day_of_month",
"fieldtype": "Int",
@@ -1020,7 +1020,7 @@
"idx": 1,
"is_submittable": 1,
"issingle": 0,
- "modified": "2014-10-06 12:16:41.256013",
+ "modified": "2014-10-08 14:22:44.717108",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",