mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-27 17:04:47 +00:00
feat(company): add Stock Delivered But Not Billed account configuration
This commit is contained in:
committed by
kavin-114
parent
8ea7efc01d
commit
bb5d4d8682
@@ -223,6 +223,10 @@
|
|||||||
"Stock Received But Not Billed": {
|
"Stock Received But Not Billed": {
|
||||||
"account_type": "Stock Received But Not Billed",
|
"account_type": "Stock Received But Not Billed",
|
||||||
"account_category": "Trade Payables"
|
"account_category": "Trade Payables"
|
||||||
|
},
|
||||||
|
"Stock Delivered But Not Billed": {
|
||||||
|
"account_type": "Stock Delivered But Not Billed",
|
||||||
|
"account_category": "Trade Payables"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Duties and Taxes": {
|
"Duties and Taxes": {
|
||||||
|
|||||||
@@ -336,6 +336,10 @@ erpnext.company.setup_queries = function (frm) {
|
|||||||
"stock_received_but_not_billed",
|
"stock_received_but_not_billed",
|
||||||
{ root_type: "Liability", account_type: "Stock Received But Not Billed" },
|
{ root_type: "Liability", account_type: "Stock Received But Not Billed" },
|
||||||
],
|
],
|
||||||
|
[
|
||||||
|
"stock_delivered_but_not_billed",
|
||||||
|
{ root_type: "Liability", account_type: "Stock Delivered But Not Billed" },
|
||||||
|
],
|
||||||
[
|
[
|
||||||
"service_received_but_not_billed",
|
"service_received_but_not_billed",
|
||||||
{ root_type: "Liability", account_type: "Service Received But Not Billed" },
|
{ root_type: "Liability", account_type: "Service Received But Not Billed" },
|
||||||
|
|||||||
@@ -130,6 +130,8 @@
|
|||||||
"column_break_32",
|
"column_break_32",
|
||||||
"stock_adjustment_account",
|
"stock_adjustment_account",
|
||||||
"stock_received_but_not_billed",
|
"stock_received_but_not_billed",
|
||||||
|
"stock_delivered_but_not_billed",
|
||||||
|
"disable_sdbnb_in_sr",
|
||||||
"default_provisional_account",
|
"default_provisional_account",
|
||||||
"default_in_transit_warehouse",
|
"default_in_transit_warehouse",
|
||||||
"manufacturing_section",
|
"manufacturing_section",
|
||||||
@@ -979,6 +981,21 @@
|
|||||||
{
|
{
|
||||||
"fieldname": "column_break_zqmp",
|
"fieldname": "column_break_zqmp",
|
||||||
"fieldtype": "Column Break"
|
"fieldtype": "Column Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"default": "0",
|
||||||
|
"fieldname": "disable_sdbnb_in_sr",
|
||||||
|
"fieldtype": "Check",
|
||||||
|
"label": "Disable Stock Delivered But Not Billed in Sales Return",
|
||||||
|
"no_copy": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "stock_delivered_but_not_billed",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"ignore_user_permissions": 1,
|
||||||
|
"label": "Stock Delivered But Not Billed",
|
||||||
|
"no_copy": 1,
|
||||||
|
"options": "Account"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"grid_page_length": 50,
|
"grid_page_length": 50,
|
||||||
|
|||||||
@@ -88,6 +88,7 @@ class Company(NestedSet):
|
|||||||
default_wip_warehouse: DF.Link | None
|
default_wip_warehouse: DF.Link | None
|
||||||
depreciation_cost_center: DF.Link | None
|
depreciation_cost_center: DF.Link | None
|
||||||
depreciation_expense_account: DF.Link | None
|
depreciation_expense_account: DF.Link | None
|
||||||
|
disable_sdbnb_in_sr: DF.Check
|
||||||
disposal_account: DF.Link | None
|
disposal_account: DF.Link | None
|
||||||
domain: DF.Data | None
|
domain: DF.Data | None
|
||||||
email: DF.Data | None
|
email: DF.Data | None
|
||||||
@@ -122,6 +123,7 @@ class Company(NestedSet):
|
|||||||
series_for_depreciation_entry: DF.Data | None
|
series_for_depreciation_entry: DF.Data | None
|
||||||
service_expense_account: DF.Link | None
|
service_expense_account: DF.Link | None
|
||||||
stock_adjustment_account: DF.Link | None
|
stock_adjustment_account: DF.Link | None
|
||||||
|
stock_delivered_but_not_billed: DF.Link | None
|
||||||
stock_received_but_not_billed: DF.Link | None
|
stock_received_but_not_billed: DF.Link | None
|
||||||
submit_err_jv: DF.Check
|
submit_err_jv: DF.Check
|
||||||
tax_id: DF.Data | None
|
tax_id: DF.Data | None
|
||||||
@@ -251,6 +253,7 @@ class Company(NestedSet):
|
|||||||
["Default Expense Account", "default_expense_account"],
|
["Default Expense Account", "default_expense_account"],
|
||||||
["Default Income Account", "default_income_account"],
|
["Default Income Account", "default_income_account"],
|
||||||
["Stock Received But Not Billed Account", "stock_received_but_not_billed"],
|
["Stock Received But Not Billed Account", "stock_received_but_not_billed"],
|
||||||
|
["Stock Delivered But Not Billed Account", "stock_delivered_but_not_billed"],
|
||||||
["Stock Adjustment Account", "stock_adjustment_account"],
|
["Stock Adjustment Account", "stock_adjustment_account"],
|
||||||
["Write Off Account", "write_off_account"],
|
["Write Off Account", "write_off_account"],
|
||||||
["Default Payment Discount Account", "default_discount_account"],
|
["Default Payment Discount Account", "default_discount_account"],
|
||||||
@@ -632,6 +635,7 @@ class Company(NestedSet):
|
|||||||
default_accounts.update(
|
default_accounts.update(
|
||||||
{
|
{
|
||||||
"stock_received_but_not_billed": "Stock Received But Not Billed",
|
"stock_received_but_not_billed": "Stock Received But Not Billed",
|
||||||
|
"stock_delivered_but_not_billed": "Stock Delivered But Not Billed",
|
||||||
"default_inventory_account": "Stock",
|
"default_inventory_account": "Stock",
|
||||||
"stock_adjustment_account": "Stock Adjustment",
|
"stock_adjustment_account": "Stock Adjustment",
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -79,6 +79,7 @@ class TestCompany(ERPNextTestSuite):
|
|||||||
"Receivable",
|
"Receivable",
|
||||||
"Stock Adjustment",
|
"Stock Adjustment",
|
||||||
"Stock Received But Not Billed",
|
"Stock Received But Not Billed",
|
||||||
|
"Stock Delivered But Not Billed",
|
||||||
"Bank",
|
"Bank",
|
||||||
"Cash",
|
"Cash",
|
||||||
"Stock",
|
"Stock",
|
||||||
|
|||||||
Reference in New Issue
Block a user