mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-04 12:49:10 +00:00
feat(accounts): add Stock Delivered But Not Billed account type and defaults
This commit is contained in:
committed by
kavin-114
parent
bb5d4d8682
commit
8596d98ac4
@@ -126,7 +126,7 @@
|
|||||||
"label": "Account Type",
|
"label": "Account Type",
|
||||||
"oldfieldname": "account_type",
|
"oldfieldname": "account_type",
|
||||||
"oldfieldtype": "Select",
|
"oldfieldtype": "Select",
|
||||||
"options": "\nAccumulated Depreciation\nAsset Received But Not Billed\nBank\nCash\nChargeable\nCapital Work in Progress\nCost of Goods Sold\nCurrent Asset\nCurrent Liability\nDepreciation\nDirect Expense\nDirect Income\nEquity\nExpense Account\nExpenses Included In Asset Valuation\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nIndirect Expense\nIndirect Income\nLiability\nPayable\nReceivable\nRound Off\nRound Off for Opening\nStock\nStock Adjustment\nStock Received But Not Billed\nService Received But Not Billed\nTax\nTemporary",
|
"options": "\nAccumulated Depreciation\nAsset Received But Not Billed\nBank\nCash\nChargeable\nCapital Work in Progress\nCost of Goods Sold\nCurrent Asset\nCurrent Liability\nDepreciation\nDirect Expense\nDirect Income\nEquity\nExpense Account\nExpenses Included In Asset Valuation\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nIndirect Expense\nIndirect Income\nLiability\nPayable\nReceivable\nRound Off\nRound Off for Opening\nStock\nStock Adjustment\nStock Received But Not Billed\nStock Delivered But Not Billed\nService Received But Not Billed\nTax\nTemporary",
|
||||||
"search_index": 1
|
"search_index": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -65,6 +65,7 @@ class Account(NestedSet):
|
|||||||
"Stock",
|
"Stock",
|
||||||
"Stock Adjustment",
|
"Stock Adjustment",
|
||||||
"Stock Received But Not Billed",
|
"Stock Received But Not Billed",
|
||||||
|
"Stock Delivered But Not Billed",
|
||||||
"Service Received But Not Billed",
|
"Service Received But Not Billed",
|
||||||
"Tax",
|
"Tax",
|
||||||
"Temporary",
|
"Temporary",
|
||||||
@@ -673,6 +674,7 @@ def get_company_default_account_fields():
|
|||||||
"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": "Stock Received But Not Billed Account",
|
"stock_received_but_not_billed": "Stock Received But Not Billed Account",
|
||||||
|
"stock_delivered_but_not_billed": "Stock Delivered But Not Billed Account",
|
||||||
"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_discount_account": "Default Payment Discount Account",
|
"default_discount_account": "Default Payment Discount Account",
|
||||||
|
|||||||
@@ -378,6 +378,9 @@
|
|||||||
"Passifs de stock": {
|
"Passifs de stock": {
|
||||||
"Stock re\u00e7u non factur\u00e9": {
|
"Stock re\u00e7u non factur\u00e9": {
|
||||||
"account_type": "Stock Received But Not Billed"
|
"account_type": "Stock Received But Not Billed"
|
||||||
|
},
|
||||||
|
"Stock livr\u00e9 non factur\u00e9": {
|
||||||
|
"account_type": "Stock Delivered But Not Billed"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Provision pour vacances et cong\u00e9s": {},
|
"Provision pour vacances et cong\u00e9s": {},
|
||||||
|
|||||||
@@ -221,6 +221,10 @@
|
|||||||
"account_number": "1702",
|
"account_number": "1702",
|
||||||
"account_type": "Stock Received But Not Billed"
|
"account_type": "Stock Received But Not Billed"
|
||||||
},
|
},
|
||||||
|
"Warenausgangs-Verrechnungskonto": {
|
||||||
|
"account_number": "1703",
|
||||||
|
"account_type": "Stock Delivered But Not Billed"
|
||||||
|
},
|
||||||
"Verbindlichkeiten aus Lohn und Gehalt": {
|
"Verbindlichkeiten aus Lohn und Gehalt": {
|
||||||
"account_number": "1740",
|
"account_number": "1740",
|
||||||
"account_type": "Payable"
|
"account_type": "Payable"
|
||||||
|
|||||||
@@ -1144,6 +1144,10 @@
|
|||||||
"Wareneingangs-Verrechnungskonto" : {
|
"Wareneingangs-Verrechnungskonto" : {
|
||||||
"account_number": "70001",
|
"account_number": "70001",
|
||||||
"account_type": "Stock Received But Not Billed"
|
"account_type": "Stock Received But Not Billed"
|
||||||
|
},
|
||||||
|
"Warenausgangs-Verrechnungskonto" : {
|
||||||
|
"account_number": "70002",
|
||||||
|
"account_type": "Stock Delivered But Not Billed"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Verb. aus Lieferungen und Leistungen": {
|
"Verb. aus Lieferungen und Leistungen": {
|
||||||
|
|||||||
@@ -1076,6 +1076,9 @@
|
|||||||
"account_type": "Stock Received But Not Billed",
|
"account_type": "Stock Received But Not Billed",
|
||||||
"account_number": "4088"
|
"account_number": "4088"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"Stock livr\u00e9 non factur\u00e9": {
|
||||||
|
"account_type": "Stock Delivered But Not Billed"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"41-Clients et comptes rattach\u00e9s (PASSIF)": {
|
"41-Clients et comptes rattach\u00e9s (PASSIF)": {
|
||||||
|
|||||||
@@ -1589,6 +1589,9 @@
|
|||||||
"account_type": "Stock Received But Not Billed",
|
"account_type": "Stock Received But Not Billed",
|
||||||
"account_number": "4088"
|
"account_number": "4088"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"Stock livr\u00e9 non factur\u00e9": {
|
||||||
|
"account_type": "Stock Delivered But Not Billed"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"41-Clients et comptes rattach\u00e9s (PASSIF)": {
|
"41-Clients et comptes rattach\u00e9s (PASSIF)": {
|
||||||
|
|||||||
@@ -1592,6 +1592,9 @@
|
|||||||
"account_number": "4088"
|
"account_number": "4088"
|
||||||
},
|
},
|
||||||
"account_number": "408"
|
"account_number": "408"
|
||||||
|
},
|
||||||
|
"Stock livr\u00e9 non factur\u00e9": {
|
||||||
|
"account_type": "Stock Delivered But Not Billed"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"41-Clients et comptes rattach\u00e9s (PASSIF)": {
|
"41-Clients et comptes rattach\u00e9s (PASSIF)": {
|
||||||
|
|||||||
@@ -805,6 +805,9 @@
|
|||||||
},
|
},
|
||||||
"account_type": "Stock Received But Not Billed"
|
"account_type": "Stock Received But Not Billed"
|
||||||
},
|
},
|
||||||
|
"Stock livr\u00e9 non factur\u00e9": {
|
||||||
|
"account_type": "Stock Delivered But Not Billed"
|
||||||
|
},
|
||||||
"account_type": "Payable"
|
"account_type": "Payable"
|
||||||
},
|
},
|
||||||
"41-Clients et comptes rattach\u00e9s (PASSIF)": {
|
"41-Clients et comptes rattach\u00e9s (PASSIF)": {
|
||||||
|
|||||||
@@ -1520,6 +1520,9 @@
|
|||||||
"account_number": "4088"
|
"account_number": "4088"
|
||||||
},
|
},
|
||||||
"account_number": "408"
|
"account_number": "408"
|
||||||
|
},
|
||||||
|
"Stock livr\u00e9 non factur\u00e9": {
|
||||||
|
"account_type": "Stock Delivered But Not Billed"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"41-Clients et comptes rattach\u00e9s (PASSIF)": {
|
"41-Clients et comptes rattach\u00e9s (PASSIF)": {
|
||||||
|
|||||||
@@ -162,6 +162,10 @@ def get():
|
|||||||
"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",
|
||||||
|
},
|
||||||
_("Asset Received But Not Billed"): {
|
_("Asset Received But Not Billed"): {
|
||||||
"account_type": "Asset Received But Not Billed",
|
"account_type": "Asset Received But Not Billed",
|
||||||
"account_category": "Trade Payables",
|
"account_category": "Trade Payables",
|
||||||
|
|||||||
@@ -281,6 +281,11 @@ def get():
|
|||||||
"account_number": "2211",
|
"account_number": "2211",
|
||||||
"account_category": "Trade Payables",
|
"account_category": "Trade Payables",
|
||||||
},
|
},
|
||||||
|
_("Stock Delivered But Not Billed"): {
|
||||||
|
"account_type": "Stock Delivered But Not Billed",
|
||||||
|
"account_number": "2212",
|
||||||
|
"account_category": "Trade Payables",
|
||||||
|
},
|
||||||
"account_number": "2200",
|
"account_number": "2200",
|
||||||
},
|
},
|
||||||
_("Duties and Taxes"): {
|
_("Duties and Taxes"): {
|
||||||
|
|||||||
Reference in New Issue
Block a user