Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Labels: Use Date instead of Posting Date

Browse Source
This commit is contained in:
Anand Doshi 2014-07-31 14:31:03 +05:30
parent 1483e9d8d2
commit fbe37c9158
10 changed files with 95 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

@ -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",

2
erpnext/accounts/doctype/sales_invoice/sales_invoice.js
View File

@ -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']

156
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@ -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",

4
erpnext/buying/doctype/purchase_order/purchase_order.json
View File

@ -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",

4
erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
View File

@ -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",

4
erpnext/selling/doctype/quotation/quotation.json
View File

@ -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",

4
erpnext/selling/doctype/sales_order/sales_order.json
View File

@ -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",

3
erpnext/selling/doctype/sales_order_item/sales_order_item.json
View File

@ -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",

4
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@ -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",

4
erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
View File

@ -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",