Rearrange To/From, Recurring Type field for better UX

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json

@@ -780,6 +780,18 @@
    "permlevel": 0, 
    "print_hide": 1
   }, 
+  {
+   "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", 
@@ -800,18 +812,6 @@
    "no_copy": 1, 
    "permlevel": 0
   }, 
-  {
-   "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", 
@@ -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", 

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", 
+   "description": "Select the period when the invoice will be generated automatically", 
-   "fieldname": "to_date", 
+   "fieldname": "recurring_type", 
-   "fieldtype": "Date", 
+   "fieldtype": "Select", 
-   "label": "To Date", 
+   "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", 
+   "description": "End date of current invoice's period", 
-   "fieldname": "recurring_type", 
+   "fieldname": "to_date", 
-   "fieldtype": "Select", 
+   "fieldtype": "Date", 
-   "label": "Recurring Type", 
+   "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", 

erpnext/buying/doctype/purchase_order/purchase_order.json

@@ -677,6 +677,16 @@
    "permlevel": 0, 
    "print_hide": 1
   }, 
+  {
+   "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", 
@@ -697,16 +707,6 @@
    "no_copy": 1, 
    "permlevel": 0
   }, 
-  {
-   "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", 
@@ -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", 

erpnext/selling/doctype/sales_order/sales_order.json

@@ -921,6 +921,18 @@
    "permlevel": 0, 
    "print_hide": 1
   }, 
+  {
+   "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", 
@@ -941,18 +953,6 @@
    "no_copy": 1, 
    "permlevel": 0
   }, 
-  {
-   "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", 
@@ -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",