mirror of
https://github.com/frappe/erpnext.git
synced 2026-09-17 10:36:31 +00:00
* fix: exclude landed cost from purchase expense GL entries * feat: book expenses added to stock GL entries for stock vouchers * test: enable stock expense gl entries flag for purchase expense test
This commit is contained in:
@@ -307,6 +307,8 @@ erpnext.company.setup_queries = function (frm) {
|
||||
["default_advance_received_account", { root_type: "Liability", account_type: "Receivable" }],
|
||||
["default_advance_paid_account", { root_type: "Asset", account_type: "Payable" }],
|
||||
["service_expense_account", { root_type: "Expense" }],
|
||||
["expenses_added_to_stock_account", { root_type: "Expense" }],
|
||||
["expenses_added_to_stock_contra_account", { root_type: "Expense" }],
|
||||
],
|
||||
function (i, v) {
|
||||
erpnext.company.set_custom_query(frm, v);
|
||||
|
||||
@@ -117,6 +117,10 @@
|
||||
"service_expense_account",
|
||||
"column_break_ereg",
|
||||
"purchase_expense_contra_account",
|
||||
"stock_expense_section",
|
||||
"expenses_added_to_stock_account",
|
||||
"column_break_gthb",
|
||||
"expenses_added_to_stock_contra_account",
|
||||
"stock_tab",
|
||||
"auto_accounting_for_stock_settings",
|
||||
"enable_perpetual_inventory",
|
||||
@@ -824,6 +828,27 @@
|
||||
"fieldtype": "Tab Break",
|
||||
"label": "Buying and Selling"
|
||||
},
|
||||
{
|
||||
"fieldname": "stock_expense_section",
|
||||
"fieldtype": "Section Break",
|
||||
"label": "Stock Expense"
|
||||
},
|
||||
{
|
||||
"fieldname": "expenses_added_to_stock_account",
|
||||
"fieldtype": "Link",
|
||||
"label": "Expenses Added To Stock Account",
|
||||
"options": "Account"
|
||||
},
|
||||
{
|
||||
"fieldname": "column_break_gthb",
|
||||
"fieldtype": "Column Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "expenses_added_to_stock_contra_account",
|
||||
"fieldtype": "Link",
|
||||
"label": "Expenses Added To Stock Contra Account",
|
||||
"options": "Account"
|
||||
},
|
||||
{
|
||||
"fieldname": "stock_tab",
|
||||
"fieldtype": "Tab Break",
|
||||
|
||||
@@ -98,6 +98,8 @@ class Company(NestedSet):
|
||||
exception_budget_approver_role: DF.Link | None
|
||||
exchange_gain_loss_account: DF.Link | None
|
||||
existing_company: DF.Link | None
|
||||
expenses_added_to_stock_account: DF.Link | None
|
||||
expenses_added_to_stock_contra_account: DF.Link | None
|
||||
fax: DF.Data | None
|
||||
is_group: DF.Check
|
||||
lft: DF.Int
|
||||
|
||||
Reference in New Issue
Block a user