From fbe37c9158899146b403a6f1efa2d0d1a351a130 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 31 Jul 2014 14:31:03 +0530 Subject: [PATCH] Labels: Use Date instead of Posting Date --- .../purchase_invoice/purchase_invoice.json | 4 +- .../doctype/sales_invoice/sales_invoice.js | 2 +- .../doctype/sales_invoice/sales_invoice.json | 156 +++++++++--------- .../purchase_order/purchase_order.json | 4 +- .../supplier_quotation.json | 4 +- .../selling/doctype/quotation/quotation.json | 4 +- .../doctype/sales_order/sales_order.json | 4 +- .../sales_order_item/sales_order_item.json | 3 +- .../doctype/delivery_note/delivery_note.json | 4 +- .../purchase_receipt/purchase_receipt.json | 4 +- 10 files changed, 95 insertions(+), 94 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json index 6bb8cfbf43..3a3b1a9b92 100755 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -106,7 +106,7 @@ "fieldname": "posting_date", "fieldtype": "Date", "in_filter": 1, - "label": "Posting Date", + "label": "Date", "no_copy": 0, "oldfieldname": "posting_date", "oldfieldtype": "Date", @@ -753,7 +753,7 @@ "icon": "icon-file-text", "idx": 1, "is_submittable": 1, - "modified": "2014-07-30 03:37:31.282665", + "modified": "2014-07-31 04:59:24.939856", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice", diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index 698200f617..06a496a9b6 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -226,7 +226,7 @@ cur_frm.cscript.hide_fields = function(doc) { par_flds = ['project_name', 'due_date', 'is_opening', 'source', 'total_advance', 'gross_profit', 'gross_profit_percent', 'get_advances_received', 'advance_adjustment_details', 'sales_partner', 'commission_rate', - 'total_commission', 'advances']; + 'total_commission', 'advances', 'invoice_period_from_date', 'invoice_period_to_date']; item_flds_normal = ['sales_order', 'delivery_note'] diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 7265fc6d7f..726aa439bd 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -86,6 +86,17 @@ "print_hide": 1, "read_only": 1 }, + { + "fieldname": "mode_of_payment", + "fieldtype": "Link", + "label": "Mode of Payment", + "no_copy": 0, + "oldfieldname": "mode_of_payment", + "oldfieldtype": "Select", + "options": "Mode of Payment", + "permlevel": 0, + "read_only": 0 + }, { "fieldname": "column_break1", "fieldtype": "Column Break", @@ -103,19 +114,6 @@ "print_hide": 1, "read_only": 0 }, - { - "fieldname": "amended_from", - "fieldtype": "Link", - "ignore_user_permissions": 1, - "label": "Amended From", - "no_copy": 1, - "oldfieldname": "amended_from", - "oldfieldtype": "Link", - "options": "Sales Invoice", - "permlevel": 0, - "print_hide": 1, - "read_only": 1 - }, { "fieldname": "company", "fieldtype": "Link", @@ -130,12 +128,25 @@ "reqd": 1, "search_index": 0 }, + { + "fieldname": "amended_from", + "fieldtype": "Link", + "ignore_user_permissions": 1, + "label": "Amended From", + "no_copy": 1, + "oldfieldname": "amended_from", + "oldfieldtype": "Link", + "options": "Sales Invoice", + "permlevel": 0, + "print_hide": 1, + "read_only": 1 + }, { "default": "Today", "fieldname": "posting_date", "fieldtype": "Date", "in_filter": 1, - "label": "Posting Date", + "label": "Date", "no_copy": 1, "oldfieldname": "posting_date", "oldfieldtype": "Date", @@ -159,14 +170,27 @@ "search_index": 0 }, { - "fieldname": "mode_of_payment", - "fieldtype": "Link", - "label": "Mode of Payment", - "no_copy": 0, - "oldfieldname": "mode_of_payment", - "oldfieldtype": "Select", - "options": "Mode of Payment", + "allow_on_submit": 1, + "depends_on": "", + "description": "Start date of current invoice's period", + "fieldname": "invoice_period_from_date", + "fieldtype": "Date", + "label": "Invoice Period From", + "no_copy": 1, "permlevel": 0, + "print_hide": 0, + "read_only": 0 + }, + { + "allow_on_submit": 1, + "depends_on": "", + "description": "End date of current invoice's period", + "fieldname": "invoice_period_to_date", + "fieldtype": "Date", + "label": "Invoice Period To", + "no_copy": 1, + "permlevel": 0, + "print_hide": 0, "read_only": 0 }, { @@ -1092,62 +1116,6 @@ "print_hide": 1, "read_only": 0 }, - { - "allow_on_submit": 1, - "depends_on": "eval:doc.convert_into_recurring_invoice==1", - "description": "Start date of current invoice's period", - "fieldname": "invoice_period_from_date", - "fieldtype": "Date", - "label": "Invoice Period From Date", - "no_copy": 1, - "permlevel": 0, - "print_hide": 1, - "read_only": 0 - }, - { - "allow_on_submit": 1, - "depends_on": "eval:doc.convert_into_recurring_invoice==1", - "description": "End date of current invoice's period", - "fieldname": "invoice_period_to_date", - "fieldtype": "Date", - "label": "Invoice Period To Date", - "no_copy": 1, - "permlevel": 0, - "print_hide": 1, - "read_only": 0 - }, - { - "fieldname": "column_break12", - "fieldtype": "Column Break", - "no_copy": 0, - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "width": "50%" - }, - { - "allow_on_submit": 1, - "depends_on": "eval:doc.convert_into_recurring_invoice==1", - "description": "Enter email id separated by commas, invoice will be mailed automatically on particular date", - "fieldname": "notification_email_address", - "fieldtype": "Small Text", - "label": "Notification Email Address", - "no_copy": 1, - "permlevel": 0, - "print_hide": 1, - "read_only": 0 - }, - { - "depends_on": "eval:doc.convert_into_recurring_invoice==1", - "description": "The unique id for tracking all recurring invoices.\u00a0It is generated on submit.", - "fieldname": "recurring_id", - "fieldtype": "Data", - "label": "Recurring Id", - "no_copy": 1, - "permlevel": 0, - "print_hide": 1, - "read_only": 1 - }, { "depends_on": "eval:doc.convert_into_recurring_invoice==1", "description": "The date on which next invoice will be generated. It is generated on submit.\n", @@ -1171,6 +1139,38 @@ "print_hide": 1, "read_only": 0 }, + { + "fieldname": "column_break12", + "fieldtype": "Column Break", + "no_copy": 0, + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "width": "50%" + }, + { + "depends_on": "eval:doc.convert_into_recurring_invoice==1", + "description": "The unique id for tracking all recurring invoices.\u00a0It is generated on submit.", + "fieldname": "recurring_id", + "fieldtype": "Data", + "label": "Recurring Id", + "no_copy": 1, + "permlevel": 0, + "print_hide": 1, + "read_only": 1 + }, + { + "allow_on_submit": 1, + "depends_on": "eval:doc.convert_into_recurring_invoice==1", + "description": "Enter email id separated by commas, invoice will be mailed automatically on particular date", + "fieldname": "notification_email_address", + "fieldtype": "Small Text", + "label": "Notification Email Address", + "no_copy": 1, + "permlevel": 0, + "print_hide": 1, + "read_only": 0 + }, { "fieldname": "against_income_account", "fieldtype": "Small Text", @@ -1188,7 +1188,7 @@ "icon": "icon-file-text", "idx": 1, "is_submittable": 1, - "modified": "2014-07-30 03:37:32.821442", + "modified": "2014-07-31 04:59:22.564878", "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 e761c183ca..f6ae167107 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -95,7 +95,7 @@ "fieldname": "transaction_date", "fieldtype": "Date", "in_filter": 1, - "label": "Purchase Order Date", + "label": "Date", "oldfieldname": "transaction_date", "oldfieldtype": "Date", "permlevel": 0, @@ -645,7 +645,7 @@ "icon": "icon-file-text", "idx": 1, "is_submittable": 1, - "modified": "2014-07-30 03:37:33.378776", + "modified": "2014-07-31 04:59:24.561351", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order", diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json index f5aa34fa95..235e4ebbc9 100644 --- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json @@ -95,7 +95,7 @@ "fieldname": "transaction_date", "fieldtype": "Date", "in_filter": 1, - "label": "Quotation Date", + "label": "Date", "oldfieldname": "transaction_date", "oldfieldtype": "Date", "permlevel": 0, @@ -571,7 +571,7 @@ "icon": "icon-shopping-cart", "idx": 1, "is_submittable": 1, - "modified": "2014-07-30 03:37:33.735264", + "modified": "2014-07-31 04:59:24.134759", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Quotation", diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json index 9515121f5e..f1cc5dc9aa 100644 --- a/erpnext/selling/doctype/quotation/quotation.json +++ b/erpnext/selling/doctype/quotation/quotation.json @@ -172,7 +172,7 @@ "fieldname": "transaction_date", "fieldtype": "Date", "in_filter": 1, - "label": "Quotation Date", + "label": "Date", "no_copy": 1, "oldfieldname": "transaction_date", "oldfieldtype": "Date", @@ -827,7 +827,7 @@ "idx": 1, "is_submittable": 1, "max_attachments": 1, - "modified": "2014-07-30 03:37:34.071896", + "modified": "2014-07-31 04:59:20.653769", "modified_by": "Administrator", "module": "Selling", "name": "Quotation", diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index b83dfb20e3..4abb8f6275 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -145,7 +145,7 @@ "fieldname": "transaction_date", "fieldtype": "Date", "in_filter": 1, - "label": "Sales Order Date", + "label": "Date", "no_copy": 1, "oldfieldname": "transaction_date", "oldfieldtype": "Date", @@ -889,7 +889,7 @@ "idx": 1, "is_submittable": 1, "issingle": 0, - "modified": "2014-07-30 03:37:34.478139", + "modified": "2014-07-31 04:59:21.856833", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json index 582792f791..eb0c024723 100644 --- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json +++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json @@ -414,6 +414,7 @@ "report_hide": 1 }, { + "description": "Used for Production Plan", "fieldname": "transaction_date", "fieldtype": "Date", "hidden": 1, @@ -431,7 +432,7 @@ ], "idx": 1, "istable": 1, - "modified": "2014-07-24 05:55:46.672279", + "modified": "2014-07-31 04:55:10.143164", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order Item", diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json index f3d3d8c3ba..c1ddb8af5e 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.json +++ b/erpnext/stock/doctype/delivery_note/delivery_note.json @@ -164,7 +164,7 @@ "fieldname": "posting_date", "fieldtype": "Date", "in_filter": 1, - "label": "Posting Date", + "label": "Date", "no_copy": 1, "oldfieldname": "posting_date", "oldfieldtype": "Date", @@ -1009,7 +1009,7 @@ "idx": 1, "in_create": 0, "is_submittable": 1, - "modified": "2014-07-30 03:37:31.908351", + "modified": "2014-07-31 04:59:23.236970", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note", diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json index 272cc6e2ed..7d823c21b0 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -104,7 +104,7 @@ "fieldname": "posting_date", "fieldtype": "Date", "in_filter": 1, - "label": "Posting Date", + "label": "Date", "no_copy": 1, "oldfieldname": "posting_date", "oldfieldtype": "Date", @@ -762,7 +762,7 @@ "icon": "icon-truck", "idx": 1, "is_submittable": 1, - "modified": "2014-07-30 03:37:32.389734", + "modified": "2014-07-31 04:59:25.379024", "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt",