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 57832f4b345..ddc9b573c78 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 @@ -17,6 +17,7 @@ "accounting_dimensions_section", "cost_center", "dimension_col_break", + "project", "section_break_8", "rate", "section_break_9", @@ -95,6 +96,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 decf4cf7539..9c67d0ccff5 100644 --- a/erpnext/accounts/doctype/loyalty_program/loyalty_program.json +++ b/erpnext/accounts/doctype/loyalty_program/loyalty_program.json @@ -25,6 +25,7 @@ "accounting_dimensions_section", "cost_center", "dimension_col_break", + "project", "help_section", "loyalty_program_help" ], @@ -144,6 +145,12 @@ { "fieldname": "dimension_col_break", "fieldtype": "Column Break" + }, + { + "fieldname": "project", + "fieldtype": "Link", + "label": "Project", + "options": "Project" } ], "links": [], 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 bf3a4e5f127..deeee72c18a 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 @@ -14,6 +14,7 @@ "accounting_dimensions_section", "cost_center", "dimension_col_break", + "project", "section_break_4", "invoices" ], @@ -63,6 +64,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 387c7d0b806..bb087f16587 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", @@ -194,6 +195,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 361c78a42da..0719727a272 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 @@ -23,6 +23,7 @@ "accounting_dimensions_section", "cost_center", "dimension_col_break", + "project", "section_break_9", "account_currency", "net_amount", @@ -214,6 +215,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 4e6df608741..f740a6ba936 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 @@ -17,6 +17,7 @@ "accounting_dimensions_section", "cost_center", "dimension_col_break", + "project", "section_break_8", "rate", "section_break_9", @@ -191,6 +192,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 e3f7d0fba29..bec4b94b82d 100644 --- a/erpnext/accounts/doctype/shipping_rule/shipping_rule.json +++ b/erpnext/accounts/doctype/shipping_rule/shipping_rule.json @@ -18,6 +18,7 @@ "accounting_dimensions_section", "cost_center", "dimension_col_break", + "project", "shipping_amount_section", "calculate_based_on", "column_break_8", @@ -138,6 +139,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 296424a550c..338818b58a0 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.py +++ b/erpnext/accounts/report/general_ledger/general_ledger.py @@ -667,7 +667,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 708455dbaf1..57642e41472 100644 --- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.json +++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.json @@ -41,6 +41,7 @@ "accounting_dimensions_section", "cost_center", "dimension_col_break", + "project", "target_fixed_asset_account" ], "fields": [ @@ -275,6 +276,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 456e83b512f..93cfa8e5073 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",