diff --git a/erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json b/erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json index 544f4fd6640..8ea57191024 100644 --- a/erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json +++ b/erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json @@ -16,6 +16,7 @@ "accounting_dimensions_section", "cost_center", "dimension_col_break", + "project", "section_break_8", "rate", "section_break_9", @@ -92,6 +93,13 @@ "fieldname": "dimension_col_break", "fieldtype": "Column Break" }, + { + "allow_on_submit": 1, + "fieldname": "project", + "fieldtype": "Link", + "label": "Project", + "options": "Project" + }, { "fieldname": "section_break_8", "fieldtype": "Section Break" diff --git a/erpnext/accounts/doctype/loyalty_program/loyalty_program.json b/erpnext/accounts/doctype/loyalty_program/loyalty_program.json index f4eb500b1b6..6a0c7d4ab70 100644 --- a/erpnext/accounts/doctype/loyalty_program/loyalty_program.json +++ b/erpnext/accounts/doctype/loyalty_program/loyalty_program.json @@ -24,6 +24,7 @@ "accounting_dimensions_section", "cost_center", "dimension_col_break", + "project", "help_section", "loyalty_program_help" ], @@ -143,6 +144,12 @@ { "fieldname": "dimension_col_break", "fieldtype": "Column Break" + }, + { + "fieldname": "project", + "fieldtype": "Link", + "label": "Project", + "options": "Project" } ], "modified": "2019-05-26 09:11:46.120251", diff --git a/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json b/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json index daee8f8c1ab..5a43e1dbf3d 100644 --- a/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json +++ b/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json @@ -13,6 +13,7 @@ "accounting_dimensions_section", "cost_center", "dimension_col_break", + "project", "section_break_4", "invoices" ], @@ -62,6 +63,12 @@ "label": "Cost Center", "options": "Cost Center" }, + { + "fieldname": "project", + "fieldtype": "Link", + "label": "Project", + "options": "Project" + }, { "collapsible": 1, "fieldname": "accounting_dimensions_section", diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json index 219d6089a57..a0e9183f7ba 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json +++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json @@ -28,6 +28,7 @@ "accounting_dimensions_section", "cost_center", "dimension_col_break", + "project", "sec_break1", "invoice_name", "invoices", @@ -193,6 +194,12 @@ "label": "Cost Center", "options": "Cost Center" }, + { + "fieldname": "project", + "fieldtype": "Link", + "label": "Project", + "options": "Project" + }, { "depends_on": "eval:doc.party", "description": "Only 'Payment Entries' made against this advance account are supported.", diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json index 008d63ae76f..ea26d2b5460 100644 --- a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json +++ b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json @@ -22,6 +22,7 @@ "accounting_dimensions_section", "cost_center", "dimension_col_break", + "project", "section_break_9", "account_currency", "tax_amount", @@ -211,6 +212,13 @@ "fieldname": "dimension_col_break", "fieldtype": "Column Break" }, + { + "allow_on_submit": 1, + "fieldname": "project", + "fieldtype": "Link", + "label": "Project", + "options": "Project" + }, { "default": "0", "depends_on": "eval:['Purchase Taxes and Charges Template', 'Payment Entry'].includes(parent.doctype)", diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json index 9e0a7983b74..8f7b1ece3c7 100644 --- a/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json +++ b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json @@ -16,6 +16,7 @@ "accounting_dimensions_section", "cost_center", "dimension_col_break", + "project", "section_break_8", "rate", "section_break_9", @@ -188,6 +189,13 @@ "fieldname": "dimension_col_break", "fieldtype": "Column Break" }, + { + "allow_on_submit": 1, + "fieldname": "project", + "fieldtype": "Link", + "label": "Project", + "options": "Project" + }, { "default": "0", "depends_on": "eval:['Sales Taxes and Charges Template', 'Payment Entry'].includes(parent.doctype)", diff --git a/erpnext/accounts/doctype/shipping_rule/shipping_rule.json b/erpnext/accounts/doctype/shipping_rule/shipping_rule.json index 1b71db69eb5..8277c92d829 100644 --- a/erpnext/accounts/doctype/shipping_rule/shipping_rule.json +++ b/erpnext/accounts/doctype/shipping_rule/shipping_rule.json @@ -16,6 +16,7 @@ "accounting_dimensions_section", "cost_center", "dimension_col_break", + "project", "shipping_amount_section", "calculate_based_on", "column_break_8", @@ -136,6 +137,12 @@ { "fieldname": "dimension_col_break", "fieldtype": "Column Break" + }, + { + "fieldname": "project", + "fieldtype": "Link", + "label": "Project", + "options": "Project" } ], "icon": "fa fa-truck", diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py index 94331ef1b92..7c6c809b939 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.py +++ b/erpnext/accounts/report/general_ledger/general_ledger.py @@ -645,7 +645,7 @@ def get_columns(filters): "options": "GL Entry", "hidden": 1, }, - {"label": _("Posting Date"), "fieldname": "posting_date", "fieldtype": "Date", "width": 100}, + {"label": _("Posting Date"), "fieldname": "posting_date", "fieldtype": "Date", "width": 120}, { "label": _("Account"), "fieldname": "account", diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.json b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.json index a6796e55f82..c2de548b2de 100644 --- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.json +++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.json @@ -44,6 +44,7 @@ "accounting_dimensions_section", "cost_center", "dimension_col_break", + "project", "target_fixed_asset_account" ], "fields": [ @@ -288,6 +289,12 @@ "label": "Cost Center", "options": "Cost Center" }, + { + "fieldname": "project", + "fieldtype": "Link", + "label": "Project", + "options": "Project" + }, { "fieldname": "dimension_col_break", "fieldtype": "Column Break" diff --git a/erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json b/erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json index ebaaffbad15..98275acaef4 100644 --- a/erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json +++ b/erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json @@ -18,6 +18,7 @@ "accounting_dimensions_section", "cost_center", "dimension_col_break", + "project", "fixed_asset_account" ], "fields": [ @@ -98,6 +99,13 @@ "fieldname": "dimension_col_break", "fieldtype": "Column Break" }, + { + "allow_on_submit": 1, + "fieldname": "project", + "fieldtype": "Link", + "label": "Project", + "options": "Project" + }, { "fieldname": "finance_book", "fieldtype": "Link",