diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json index 153b8d89e4..7e374002f2 100755 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +++ b/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", diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 21c96e745d..e9bb996f76 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 8380e864c6..f072b65a46 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/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", diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 5af9a26ed9..69693a7bed 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/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",