Merge branch 'develop' into fix/github-issue/29006
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/hu_chart_of_accounts_for_microenterprises_with_account_number.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/hu_chart_of_accounts_for_microenterprises_with_account_number.json
new file mode 100644
index 0000000..2cd6c0f
--- /dev/null
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/hu_chart_of_accounts_for_microenterprises_with_account_number.json
@@ -0,0 +1,1654 @@
+{
+ "tree": {
+ "SZ\u00c1MLAOSZT\u00c1LY BEFEKTETETT ESZK\u00d6Z\u00d6K": {
+ "account_number": 1,
+ "root_type": "Asset",
+ "is_group": 1,
+ "IMMATERI\u00c1LIS JAVAK": {
+ "account_number": 11,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Vagyoni \u00e9rt\u00e9k\u0171 jogok": {
+ "account_number": 113,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Vagyoni \u00e9rt\u00e9k\u0171 jogok brutt\u00f3 \u00e9rt\u00e9ke": {
+ "account_number": 1131,
+ "root_type": "Asset"
+ },
+ "Vagyoni \u00e9rt\u00e9k\u0171 jogok terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 1138,
+ "root_type": "Asset"
+ },
+ "Vagyoni \u00e9rt\u00e9k\u0171 jogok terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {
+ "account_number": 1139,
+ "root_type": "Asset"
+ }
+ },
+ "Szellemi term\u00e9kek": {
+ "account_number": 114,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Szellemi term\u00e9kek brutt\u00f3 \u00e9rt\u00e9ke": {
+ "account_number": 1141,
+ "root_type": "Asset"
+ },
+ "Szellemi term\u00e9kek terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 1148,
+ "root_type": "Asset"
+ },
+ "Szellemi term\u00e9kek terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {
+ "account_number": 1149,
+ "root_type": "Asset"
+ }
+ },
+ "Kis \u00e9rt\u00e9k\u0171 immateri\u00e1lis javak": {
+ "account_number": 119,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Kis \u00e9rt\u00e9k\u0171 immateri\u00e1lis javak brutt\u00f3 \u00e9rt\u00e9ke": {
+ "account_number": 1191,
+ "root_type": "Asset"
+ },
+ "Kis \u00e9rt\u00e9k\u0171 immateri\u00e1lis javak terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {
+ "account_number": 1199,
+ "root_type": "Asset"
+ }
+ }
+ },
+ "INGATLANOK \u00c9S KAPCSOL\u00d3D\u00d3 VAGYONI \u00c9RT\u00c9K\u0170 JOGOK": {
+ "account_number": 12,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Telkek, f\u00f6ldter\u00fcletek": {
+ "account_number": 121,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Telkek, f\u00f6ldter\u00fcletek brutt\u00f3 \u00e9rt\u00e9ke": {
+ "account_number": 1211,
+ "root_type": "Asset"
+ },
+ "Telkek, f\u00f6ldter\u00fcletek terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 1218,
+ "root_type": "Asset"
+ },
+ "Telkek, f\u00f6ldter\u00fcletek terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {
+ "account_number": 1219,
+ "root_type": "Asset"
+ }
+ },
+ "Ingatlanokhoz kapcsol\u00f3d\u00f3 vagyoni \u00e9rt\u00e9k\u0171 jogok": {
+ "account_number": 122,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Ingatlanokhoz kapcsol\u00f3d\u00f3 vagyoni \u00e9rt\u00e9k\u0171 jogok brutt\u00f3 \u00e9rt\u00e9ke": {
+ "account_number": 1221,
+ "root_type": "Asset"
+ },
+ "Ingatlanokhoz kapcsol\u00f3d\u00f3 vagyoni \u00e9rt\u00e9k\u0171 jogok terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 1228,
+ "root_type": "Asset"
+ },
+ "Ingatlanokhoz kapcsol\u00f3d\u00f3 vagyoni \u00e9rt\u00e9k\u0171 jogok terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {
+ "account_number": 1229,
+ "root_type": "Asset"
+ }
+ },
+ "\u00c9p\u00fcletek, \u00e9p\u00fcletr\u00e9szek, tulajdoni h\u00e1nyadok": {
+ "account_number": 123,
+ "root_type": "Asset",
+ "is_group": 1,
+ "\u00c9p\u00fcletek, \u00e9p\u00fcletr\u00e9szek, tulajdoni h\u00e1nyadok brutt\u00f3 \u00e9rt\u00e9ke": {
+ "account_number": 1231,
+ "root_type": "Asset"
+ },
+ "\u00c9p\u00fcletek, \u00e9p\u00fcletr\u00e9szek, tulajdoni h\u00e1nyadok terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 1238,
+ "root_type": "Asset"
+ },
+ "\u00c9p\u00fcletek, \u00e9p\u00fcletr\u00e9szek, tulajdoni h\u00e1nyadok terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {
+ "account_number": 1239,
+ "root_type": "Asset"
+ }
+ },
+ "Egy\u00e9b ingatlanok": {
+ "account_number": 124,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Egy\u00e9b ingatlanok brutt\u00f3 \u00e9rt\u00e9ke": {
+ "account_number": 1241,
+ "root_type": "Asset"
+ },
+ "Egy\u00e9b ingatlanok terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 1248,
+ "root_type": "Asset"
+ },
+ "Egy\u00e9b ingatlanok terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {
+ "account_number": 1249,
+ "root_type": "Asset"
+ }
+ },
+ "Kis \u00e9rt\u00e9k\u0171 ingatlanok": {
+ "account_number": 129,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Kis \u00e9rt\u00e9k\u0171 ingatlanok brutt\u00f3 \u00e9rt\u00e9ke": {
+ "account_number": 1291,
+ "root_type": "Asset"
+ },
+ "Kis \u00e9rt\u00e9k\u0171 ingatlanok terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {
+ "account_number": 1299,
+ "root_type": "Asset"
+ }
+ }
+ },
+ "M\u0170SZAKI BERENDEZ\u00c9SEK, G\u00c9PEK, J\u00c1RM\u0170VEK": {
+ "account_number": 13,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Termel\u0151 g\u00e9pek, berendez\u00e9sek": {
+ "account_number": 131,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Termel\u0151 g\u00e9pek, berendez\u00e9sek brutt\u00f3 \u00e9rt\u00e9ke": {
+ "account_number": 1311,
+ "root_type": "Asset"
+ },
+ "Termel\u0151 g\u00e9pek, berendez\u00e9sek terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 1318,
+ "root_type": "Asset"
+ },
+ "Termel\u0151 g\u00e9pek, berendez\u00e9sek terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {
+ "account_number": 1319,
+ "root_type": "Asset"
+ }
+ },
+ "M\u0171szaki j\u00e1rm\u0171vek": {
+ "account_number": 132,
+ "root_type": "Asset",
+ "is_group": 1,
+ "M\u0171szaki j\u00e1rm\u0171vek brutt\u00f3 \u00e9rt\u00e9ke": {
+ "account_number": 1321,
+ "root_type": "Asset"
+ },
+ "M\u0171szaki j\u00e1rm\u0171vek terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 1328,
+ "root_type": "Asset"
+ },
+ "M\u0171szaki j\u00e1rm\u0171vek terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {
+ "account_number": 1329,
+ "root_type": "Asset"
+ }
+ },
+ "Ki nem emelt m\u0171szaki berendez\u00e9sek, g\u00e9pek, j\u00e1rm\u0171vek": {
+ "account_number": 133,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Ki nem emelt m\u0171szaki berendez\u00e9sek, g\u00e9pek, j\u00e1rm\u0171vek brutt\u00f3 \u00e9rt\u00e9ke": {
+ "account_number": 1331,
+ "root_type": "Asset"
+ },
+ "Ki nem emelt m\u0171szaki berendez\u00e9sek, g\u00e9pek, j\u00e1rm\u0171vek terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 1338,
+ "root_type": "Asset"
+ },
+ "Ki nem emelt m\u0171szaki berendez\u00e9sek, g\u00e9pek, j\u00e1rm\u0171vek terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {
+ "account_number": 1339,
+ "root_type": "Asset"
+ }
+ },
+ "Kis \u00e9rt\u00e9k\u0171 m\u0171szaki berendez\u00e9sek, g\u00e9pek, j\u00e1rm\u0171vek": {
+ "account_number": 139,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Kis \u00e9rt\u00e9k\u0171 m\u0171szaki berendez\u00e9sek, g\u00e9pek, j\u00e1rm\u0171vek brutt\u00f3 \u00e9rt\u00e9ke": {
+ "account_number": 1391,
+ "root_type": "Asset"
+ },
+ "Kis \u00e9rt\u00e9k\u0171 m\u0171szaki berendez\u00e9sek, g\u00e9pek, j\u00e1rm\u0171vek terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {
+ "account_number": 1399,
+ "root_type": "Asset"
+ }
+ }
+ },
+ "EGY\u00c9B BERENDEZ\u00c9SEK, FELSZEREL\u00c9SEK, J\u00c1RM\u0170VEK": {
+ "account_number": 14,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Egy\u00e9b (\u00fczemi \u00fczleti), berendez\u00e9sek, felszerel\u00e9sek": {
+ "account_number": 141,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Egy\u00e9b (\u00fczemi \u00fczleti), berendez\u00e9sek, felszerel\u00e9sek brutt\u00f3 \u00e9rt\u00e9ke": {
+ "account_number": 1411,
+ "root_type": "Asset"
+ },
+ "Egy\u00e9b (\u00fczemi \u00fczleti), berendez\u00e9sek, felszerel\u00e9sek terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 1418,
+ "root_type": "Asset"
+ },
+ "Egy\u00e9b (\u00fczemi \u00fczleti), berendez\u00e9sek, felszerel\u00e9sek terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {
+ "account_number": 1419,
+ "root_type": "Asset"
+ }
+ },
+ "Egy\u00e9b j\u00e1rm\u0171vek": {
+ "account_number": 142,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Egy\u00e9b j\u00e1rm\u0171vek brutt\u00f3 \u00e9rt\u00e9ke": {
+ "account_number": 1421,
+ "root_type": "Asset"
+ },
+ "Egy\u00e9b j\u00e1rm\u0171vek terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 1428,
+ "root_type": "Asset"
+ },
+ "Egy\u00e9b j\u00e1rm\u0171vek terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {
+ "account_number": 1429,
+ "root_type": "Asset"
+ }
+ },
+ "Irodai, igazgat\u00e1si berendez\u00e9sek \u00e9s felszerel\u00e9sek": {
+ "account_number": 143,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Irodai, igazgat\u00e1si berendez\u00e9sek \u00e9s felszerel\u00e9sek brutt\u00f3 \u00e9rt\u00e9ke": {
+ "account_number": 1431,
+ "root_type": "Asset"
+ },
+ "Irodai, igazgat\u00e1si berendez\u00e9sek \u00e9s felszerel\u00e9sek terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 1438,
+ "root_type": "Asset"
+ },
+ "Irodai, igazgat\u00e1si berendez\u00e9sek \u00e9s felszerel\u00e9sek terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {
+ "account_number": 1439,
+ "root_type": "Asset"
+ }
+ },
+ "Ki nem emelt egy\u00e9b berendez\u00e9sek, felszerel\u00e9sek": {
+ "account_number": 144,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Ki nem emelt egy\u00e9b berendez\u00e9sek, felszerel\u00e9sek brutt\u00f3 \u00e9rt\u00e9ke": {
+ "account_number": 1441,
+ "root_type": "Asset"
+ },
+ "Ki nem emelt egy\u00e9b berendez\u00e9sek, felszerel\u00e9sek terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 1448,
+ "root_type": "Asset"
+ },
+ "Ki nem emelt egy\u00e9b berendez\u00e9sek, felszerel\u00e9sek terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {
+ "account_number": 1449,
+ "root_type": "Asset"
+ }
+ },
+ "Kis \u00e9rt\u00e9k\u0171 egy\u00e9b berendez\u00e9sek, felszerel\u00e9sek, j\u00e1rm\u0171vek": {
+ "account_number": 149,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Kis \u00e9rt\u00e9k\u0171 egy\u00e9b berendez\u00e9sek, felszerel\u00e9sek, j\u00e1rm\u0171vek brutt\u00f3 \u00e9rt\u00e9ke": {
+ "account_number": 1491,
+ "root_type": "Asset"
+ },
+ "Kis \u00e9rt\u00e9k\u0171 egy\u00e9b berendez\u00e9sek, felszerel\u00e9sek, j\u00e1rm\u0171vek terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {
+ "account_number": 1499,
+ "root_type": "Asset"
+ }
+ }
+ },
+ "TENY\u00c9SZ\u00c1LLATOK": {
+ "account_number": 15,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Teny\u00e9szt\u00e9sben hasznos\u00edtott \u00e1llatok": {
+ "account_number": 151,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Teny\u00e9szt\u00e9sben hasznos\u00edtott \u00e1llatok brutt\u00f3 \u00e9rt\u00e9ke": {
+ "account_number": 1511,
+ "root_type": "Asset"
+ },
+ "Teny\u00e9szt\u00e9sben hasznos\u00edtott \u00e1llatok terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 1518,
+ "root_type": "Asset"
+ },
+ "Teny\u00e9szt\u00e9sben hasznos\u00edtott \u00e1llatok terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {
+ "account_number": 1519,
+ "root_type": "Asset"
+ }
+ },
+ "Ig\u00e1s\u00e1llatok": {
+ "account_number": 152,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Ig\u00e1s\u00e1llatok brutt\u00f3 \u00e9rt\u00e9ke": {
+ "account_number": 1521,
+ "root_type": "Asset"
+ },
+ "Ig\u00e1s\u00e1llatok terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 1528,
+ "root_type": "Asset"
+ },
+ "Ig\u00e1s\u00e1llatok terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {
+ "account_number": 1529,
+ "root_type": "Asset"
+ }
+ },
+ "Egy\u00e9b teny\u00e9sz\u00e1llatok": {
+ "account_number": 153,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Egy\u00e9b teny\u00e9sz\u00e1llatok brutt\u00f3 \u00e9rt\u00e9ke": {
+ "account_number": 1531,
+ "root_type": "Asset"
+ },
+ "Egy\u00e9b teny\u00e9sz\u00e1llatok terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 1538,
+ "root_type": "Asset"
+ },
+ "Egy\u00e9b teny\u00e9sz\u00e1llatok terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {
+ "account_number": 1539,
+ "root_type": "Asset"
+ }
+ },
+ "Kis \u00e9rt\u00e9k\u0171 teny\u00e9sz\u00e1llatok": {
+ "account_number": 159,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Kis \u00e9rt\u00e9k\u0171 teny\u00e9sz\u00e1llatok brutt\u00f3 \u00e9rt\u00e9ke": {
+ "account_number": 1591,
+ "root_type": "Asset"
+ },
+ "Kis \u00e9rt\u00e9k\u0171 teny\u00e9sz\u00e1llatok terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {
+ "account_number": 1599,
+ "root_type": "Asset"
+ }
+ }
+ },
+ "BERUH\u00c1Z\u00c1SOK, FEL\u00daJ\u00cdT\u00c1SOK": {
+ "account_number": 16,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Beruh\u00e1z\u00e1sok": {
+ "account_number": 161,
+ "root_type": "Asset"
+ },
+ "Fel\u00faj\u00edt\u00e1sok": {
+ "account_number": 162,
+ "root_type": "Asset"
+ },
+ "Beruh\u00e1z\u00e1sok, fel\u00faj\u00edt\u00e1sok terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 168,
+ "root_type": "Asset"
+ }
+ },
+ "TULAJDONI R\u00c9SZESED\u00c9ST JELENT\u0150 BEFEKTET\u00c9SEK (R\u00c9SZESED\u00c9SEK)": {
+ "account_number": 17,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Tart\u00f3s r\u00e9szesed\u00e9sek": {
+ "account_number": 171,
+ "root_type": "Asset"
+ },
+ "R\u00e9szesed\u00e9sek \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 179,
+ "root_type": "Asset"
+ }
+ },
+ "HITELVISZONYT MEGTESTES\u00cdT\u0150 \u00c9RT\u00c9KPAP\u00cdROK": {
+ "account_number": 18,
+ "root_type": "Asset",
+ "is_group": 1,
+ "\u00c1llamk\u00f6tv\u00e9nyek": {
+ "account_number": 181,
+ "root_type": "Asset"
+ },
+ "Tart\u00f3s diszkont \u00e9rt\u00e9kpap\u00edrok": {
+ "account_number": 182,
+ "root_type": "Asset"
+ },
+ "V\u00e1llalkoz\u00e1sok \u00e1ltal kibocs\u00e1tott tart\u00f3s \u00e9rt\u00e9kpap\u00edrok": {
+ "account_number": 183,
+ "root_type": "Asset"
+ },
+ "Egy\u00e9b hitelviszonyt megtestes\u00edt\u0151 \u00e9rt\u00e9kpap\u00edrok": {
+ "account_number": 184,
+ "root_type": "Asset"
+ },
+ "Tart\u00f3s \u00e9rt\u00e9kpap\u00edrok \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 189,
+ "root_type": "Asset"
+ }
+ },
+ "TART\u00d3SAN ADOTT K\u00d6LCS\u00d6N\u00d6K (tart\u00f3s bankbet\u00e9tek)": {
+ "account_number": 19,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Tart\u00f3san adott k\u00f6lcs\u00f6n\u00f6k": {
+ "account_number": 191,
+ "root_type": "Asset"
+ },
+ "Tart\u00f3s bankbet\u00e9tek": {
+ "account_number": 192,
+ "root_type": "Asset"
+ },
+ "Tart\u00f3san adott k\u00f6lcs\u00f6n\u00f6k (\u00e9s bankbet\u00e9tek) \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 199,
+ "root_type": "Asset"
+ }
+ }
+ },
+ "SZ\u00c1MLAOSZT\u00c1LY K\u00c9SZLETEK": {
+ "account_number": 2,
+ "root_type": "Asset",
+ "is_group": 1,
+ "ANYAGOK": {
+ "account_number": "21-22",
+ "root_type": "Asset",
+ "is_group": 1,
+ "Nyers \u00e9s alapanyagok": {
+ "account_number": 211,
+ "root_type": "Asset"
+ },
+ "Seg\u00e9danyagok": {
+ "account_number": 221,
+ "root_type": "Asset"
+ },
+ "\u00dczem \u00e9s f\u0171t\u0151anyagok": {
+ "account_number": 222,
+ "root_type": "Asset"
+ },
+ "Fenntart\u00e1si anyagok": {
+ "account_number": 223,
+ "root_type": "Asset"
+ },
+ "\u00c9p\u00edt\u00e9si anyagok": {
+ "account_number": 224,
+ "root_type": "Asset"
+ },
+ "Egy \u00e9ven bel\u00fcl elhaszn\u00e1l\u00f3d\u00f3 anyagi eszk\u00f6z\u00f6k": {
+ "account_number": 225,
+ "root_type": "Asset"
+ },
+ "T\u00e1rgyi eszk\u00f6z\u00f6k k\u00f6z\u00fcl \u00e1tsorolt anyagok": {
+ "account_number": 226,
+ "root_type": "Asset"
+ },
+ "Egy\u00e9b anyagok": {
+ "account_number": 227,
+ "root_type": "Asset"
+ },
+ "Anyagok \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 229,
+ "root_type": "Asset"
+ }
+ },
+ "BEFEJEZETLEN TERMEL\u00c9S \u00c9S F\u00c9LK\u00c9SZ TERM\u00c9KEK": {
+ "account_number": 23,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Befejezetlen termel\u00e9s": {
+ "account_number": 231,
+ "root_type": "Asset"
+ },
+ "F\u00e9lk\u00e9sz term\u00e9kek": {
+ "account_number": 232,
+ "root_type": "Asset"
+ },
+ "Befejezetlen termel\u00e9s \u00e9s f\u00e9lk\u00e9sz term\u00e9kek \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 239,
+ "root_type": "Asset"
+ }
+ },
+ "N\u00d6VEND\u00c9K, H\u00cdZ\u00d3 \u00c9S EGY\u00c9B \u00c1LLATOK": {
+ "account_number": 24,
+ "root_type": "Asset",
+ "is_group": 1,
+ "N\u00f6vend\u00e9k\u00e1llatok": {
+ "account_number": 241,
+ "root_type": "Asset"
+ },
+ "H\u00edz\u00f3\u00e1llatok": {
+ "account_number": 242,
+ "root_type": "Asset"
+ },
+ "Egy\u00e9b \u00e1llatok": {
+ "account_number": 243,
+ "root_type": "Asset"
+ },
+ "B\u00e9rbevett \u00e1llatok": {
+ "account_number": 244,
+ "root_type": "Asset"
+ },
+ "\u00c1llatok \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 249,
+ "root_type": "Asset"
+ }
+ },
+ "K\u00c9SZTERM\u00c9KEK": {
+ "account_number": 25,
+ "root_type": "Asset",
+ "is_group": 1,
+ "K\u00e9szterm\u00e9kek": {
+ "account_number": 251,
+ "root_type": "Asset"
+ },
+ "K\u00e9szterm\u00e9kek \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 259,
+ "root_type": "Asset"
+ }
+ },
+ "KERESKEDELMI \u00c1RUK": {
+ "account_number": 26,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Kereskedelmi \u00e1ruk": {
+ "account_number": 261,
+ "root_type": "Asset"
+ },
+ "Idegen helyen t\u00e1rolt, bizom\u00e1nyba \u00e1tadott \u00e1ruk": {
+ "account_number": 262,
+ "root_type": "Asset"
+ },
+ "T\u00e1rgyi eszk\u00f6z\u00f6k k\u00f6z\u00fcl \u00e1tsorolt \u00e1ruk": {
+ "account_number": 263,
+ "root_type": "Asset"
+ },
+ "Bels\u0151 (egys\u00e9gek, tev\u00e9kenys\u00e9gek k\u00f6z\u00f6tti) \u00e1tad\u00e1s\u00e1tv\u00e9tel \u00fctk\u00f6z\u0151sz\u00e1mla": {
+ "account_number": 264,
+ "root_type": "Asset"
+ },
+ "Kereskedelmi \u00e1ruk \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 269,
+ "root_type": "Asset"
+ }
+ },
+ "K\u00d6ZVET\u00cdTETT SZOLG\u00c1LTAT\u00c1SOK": {
+ "account_number": 27,
+ "root_type": "Asset",
+ "is_group": 1,
+ "K\u00f6zvet\u00edtett szolg\u00e1ltat\u00e1sok": {
+ "account_number": 271,
+ "root_type": "Asset"
+ },
+ "K\u00f6zvet\u00edtett szolg\u00e1ltat\u00e1sok \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 279,
+ "root_type": "Asset"
+ }
+ },
+ "BET\u00c9TD\u00cdJAS G\u00d6NGY\u00d6LEGEK": {
+ "account_number": 28,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Bet\u00e9td\u00edjas g\u00f6ngy\u00f6legek": {
+ "account_number": 281,
+ "root_type": "Asset"
+ },
+ "Bet\u00e9td\u00edjas g\u00f6ngy\u00f6legek \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
+ "account_number": 289,
+ "root_type": "Asset"
+ }
+ }
+ },
+ "SZ\u00c1MLAOSZT\u00c1LY K\u00d6VETEL\u00c9SEK, P\u00c9NZ\u00dcGYI ESZK\u00d6Z\u00d6K \u00c9S AKT\u00cdV ID\u0150BELI ELHAT\u00c1ROL\u00c1SOK": {
+ "account_number": 3,
+ "root_type": "Asset",
+ "is_group": 1,
+ "K\u00d6VETEL\u00c9SEK \u00c1RUSZ\u00c1LL\u00cdT\u00c1SB\u00d3L \u00c9S SZOLG\u00c1LTAT\u00c1SB\u00d3L (VEV\u0150K)": {
+ "account_number": 31,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Vev\u0151k\u00f6vetel\u00e9sek": {
+ "account_number": 311,
+ "root_type": "Asset"
+ },
+ "Vev\u0151k\u00f6vetel\u00e9sek \u00e9rt\u00e9kveszt\u00e9se": {
+ "account_number": 319,
+ "root_type": "Asset"
+ }
+ },
+ "K\u00d6VETEL\u00c9SEK TULAJDONOSSAL SZEMBEN": {
+ "account_number": 33,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Jegyzett, de m\u00e9g be nem fizetett t\u0151ke": {
+ "account_number": 331,
+ "root_type": "Asset"
+ }
+ },
+ "V\u00c1LT\u00d3K\u00d6VETEL\u00c9SEK": {
+ "account_number": 34,
+ "root_type": "Asset",
+ "is_group": 1,
+ "V\u00e1lt\u00f3k\u00f6vetel\u00e9sek": {
+ "account_number": 341,
+ "root_type": "Asset"
+ },
+ "V\u00e1lt\u00f3k\u00f6vetel\u00e9sek \u00e9rt\u00e9kveszt\u00e9se": {
+ "account_number": 349,
+ "root_type": "Asset"
+ }
+ },
+ "ADOTT EL\u0150LEGEK": {
+ "account_number": 35,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Immateri\u00e1lis javakra adott el\u0151legek": {
+ "account_number": 351,
+ "root_type": "Asset"
+ },
+ "Beruh\u00e1z\u00e1sokra adott el\u0151legek": {
+ "account_number": 352,
+ "root_type": "Asset"
+ },
+ "K\u00e9szletekre adott el\u0151legek": {
+ "account_number": 353,
+ "root_type": "Asset"
+ },
+ "Egy\u00e9b c\u00e9lra adott el\u0151legek": {
+ "account_number": 354,
+ "root_type": "Asset"
+ },
+ "Adott el\u0151legek \u00e9rt\u00e9kveszt\u00e9se": {
+ "account_number": 359,
+ "root_type": "Asset"
+ }
+ },
+ "EGY\u00c9B K\u00d6VETEL\u00c9SEK": {
+ "account_number": 36,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Munkav\u00e1llal\u00f3kkal szembeni k\u00f6vetel\u00e9sek": {
+ "account_number": 361,
+ "root_type": "Asset"
+ },
+ "K\u00f6lts\u00e9gvet\u00e9ssel szembeni k\u00f6vetel\u00e9sek": {
+ "account_number": 362,
+ "root_type": "Asset"
+ },
+ "R\u00f6vid lej\u00e1ratra k\u00f6lcs\u00f6nadott p\u00e9nzeszk\u00f6z\u00f6k": {
+ "account_number": 363,
+ "root_type": "Asset"
+ },
+ "R\u00e9szesed\u00e9sekkel, \u00e9rt\u00e9kpap\u00edrokkal kapcsolatos k\u00f6vetel\u00e9sek": {
+ "account_number": 364,
+ "root_type": "Asset"
+ },
+ "K\u00fcl\u00f6nf\u00e9le egy\u00e9b k\u00f6vetel\u00e9sek": {
+ "account_number": 365,
+ "root_type": "Asset"
+ },
+ "Egy\u00e9b k\u00f6vetel\u00e9sek \u00e9rt\u00e9kveszt\u00e9se": {
+ "account_number": 369,
+ "root_type": "Asset"
+ }
+ },
+ "\u00c9RT\u00c9KPAP\u00cdROK": {
+ "account_number": 37,
+ "root_type": "Asset",
+ "is_group": 1,
+ "R\u00e9szesed\u00e9sek": {
+ "account_number": 371,
+ "root_type": "Asset"
+ },
+ "Saj\u00e1t r\u00e9szv\u00e9nyek, saj\u00e1t \u00fczletr\u00e9szek": {
+ "account_number": 372,
+ "root_type": "Asset"
+ },
+ "Forgat\u00e1si c\u00e9l\u00fa hitelviszonyt megtestes\u00edt\u0151 \u00e9rt\u00e9kpap\u00edrok": {
+ "account_number": 373,
+ "root_type": "Asset"
+ },
+ "\u00c9rt\u00e9kpap\u00edr elsz\u00e1mol\u00e1si sz\u00e1mla": {
+ "account_number": 378,
+ "root_type": "Asset"
+ },
+ "\u00c9rt\u00e9kpap\u00edrok \u00e9rt\u00e9kveszt\u00e9se": {
+ "account_number": 379,
+ "root_type": "Asset"
+ }
+ },
+ "P\u00c9NZESZK\u00d6Z\u00d6K": {
+ "account_number": 38,
+ "root_type": "Asset",
+ "is_group": 1,
+ "P\u00e9nzt\u00e1r": {
+ "account_number": 381,
+ "root_type": "Asset"
+ },
+ "Valutap\u00e9nzt\u00e1r": {
+ "account_number": 382,
+ "root_type": "Asset"
+ },
+ "Csekkek": {
+ "account_number": 383,
+ "root_type": "Asset"
+ },
+ "Elsz\u00e1mol\u00e1si bet\u00e9tsz\u00e1mla": {
+ "account_number": 384,
+ "root_type": "Asset"
+ },
+ "Elk\u00fcl\u00f6n\u00edtett bet\u00e9tsz\u00e1mla": {
+ "account_number": 385,
+ "root_type": "Asset"
+ },
+ "Devizabet\u00e9tsz\u00e1mla": {
+ "account_number": 386,
+ "root_type": "Asset"
+ },
+ "Elektronikus p\u00e9nz": {
+ "account_number": 387,
+ "root_type": "Asset"
+ },
+ "\u00c1tvezet\u00e9si sz\u00e1mla": {
+ "account_number": 389,
+ "root_type": "Asset"
+ }
+ },
+ "AKT\u00cdV ID\u0150BELI ELHAT\u00c1ROL\u00c1SOK": {
+ "account_number": 39,
+ "root_type": "Asset",
+ "is_group": 1,
+ "Akt\u00edv id\u0151beli elhat\u00e1rol\u00e1sok": {
+ "account_number": 391,
+ "root_type": "Asset"
+ }
+ }
+ },
+ "SZ\u00c1MLAOSZT\u00c1LY FORR\u00c1SOK": {
+ "account_number": 4,
+ "root_type": "Liability",
+ "is_group": 1,
+ "SAJ\u00c1T T\u0150KE": {
+ "account_number": 41,
+ "root_type": "Liability",
+ "is_group": 1,
+ "account_type": "Equity",
+ "Jegyzett t\u0151ke": {
+ "account_number": 411,
+ "root_type": "Liability",
+ "account_type": "Equity"
+ },
+ "T\u0151ketartal\u00e9k": {
+ "account_number": 412,
+ "root_type": "Liability",
+ "account_type": "Equity"
+ },
+ "Eredm\u00e9nytartal\u00e9k": {
+ "account_number": 413,
+ "root_type": "Liability",
+ "account_type": "Equity"
+ },
+ "Lek\u00f6t\u00f6tt tartal\u00e9k": {
+ "account_number": 414,
+ "root_type": "Liability",
+ "account_type": "Equity"
+ },
+ "Ad\u00f3zott eredm\u00e9ny": {
+ "account_number": 419,
+ "root_type": "Liability",
+ "account_type": "Equity"
+ }
+ },
+ "C\u00c9LTARTAL\u00c9KOK": {
+ "account_number": 42,
+ "root_type": "Liability",
+ "is_group": 1,
+ "C\u00e9ltartal\u00e9k a v\u00e1rhat\u00f3 k\u00f6telezetts\u00e9gekre": {
+ "account_number": 421,
+ "root_type": "Liability"
+ }
+ },
+ "H\u00c1TRASOROLT K\u00d6TELEZETTS\u00c9GEK": {
+ "account_number": 43,
+ "root_type": "Liability",
+ "is_group": 1,
+ "H\u00e1trasorolt k\u00f6telezetts\u00e9gek": {
+ "account_number": 431,
+ "root_type": "Liability"
+ }
+ },
+ "HOSSZ\u00da LEJ\u00c1RAT\u00da K\u00d6TELEZETTS\u00c9GEK": {
+ "account_number": 44,
+ "root_type": "Liability",
+ "is_group": 1,
+ "Hossz\u00fa lej\u00e1ratra kapott k\u00f6lcs\u00f6n\u00f6k": {
+ "account_number": 441,
+ "root_type": "Liability"
+ },
+ "\u00c1tv\u00e1ltoztathat\u00f3 k\u00f6tv\u00e9nyek": {
+ "account_number": 442,
+ "root_type": "Liability"
+ },
+ "Tartoz\u00e1sok k\u00f6tv\u00e9nykibocs\u00e1t\u00e1sb\u00f3l": {
+ "account_number": 443,
+ "root_type": "Liability"
+ },
+ "Beruh\u00e1z\u00e1si \u00e9s fejleszt\u00e9si hitelek": {
+ "account_number": 444,
+ "root_type": "Liability"
+ },
+ "Egy\u00e9b hossz\u00fa lej\u00e1rat\u00fa hitelek": {
+ "account_number": 445,
+ "root_type": "Liability"
+ },
+ "P\u00e9nz\u00fcgyi l\u00edzing miatti k\u00f6telezetts\u00e9gek": {
+ "account_number": 446,
+ "root_type": "Liability"
+ },
+ "Egy\u00e9b hossz\u00fa lej\u00e1rat\u00fa k\u00f6telezetts\u00e9gek": {
+ "account_number": 449,
+ "root_type": "Liability"
+ }
+ },
+ "R\u00d6VID LEJ\u00c1RAT\u00da K\u00d6TELEZETTS\u00c9GEK": {
+ "account_number": "45-47",
+ "root_type": "Liability",
+ "is_group": 1,
+ "R\u00f6vid lej\u00e1rat\u00fa k\u00f6lcs\u00f6n\u00f6k": {
+ "account_number": 451,
+ "root_type": "Liability"
+ },
+ "R\u00f6vid lej\u00e1rat\u00fa hitelek": {
+ "account_number": 452,
+ "root_type": "Liability"
+ },
+ "Vev\u0151kt\u0151l kapott el\u0151legek": {
+ "account_number": 453,
+ "root_type": "Liability"
+ },
+ "K\u00f6telezetts\u00e9gek \u00e1rusz\u00e1ll\u00edt\u00e1sb\u00f3l \u00e9s szolg\u00e1ltat\u00e1sb\u00f3l (sz\u00e1ll\u00edt\u00f3k)": {
+ "account_number": 454,
+ "root_type": "Liability"
+ },
+ "Beruh\u00e1z\u00e1si sz\u00e1ll\u00edt\u00f3k": {
+ "account_number": 455,
+ "root_type": "Liability"
+ },
+ "Nem sz\u00e1ml\u00e1zott sz\u00e1ll\u00edt\u00f3k": {
+ "account_number": 456,
+ "root_type": "Liability"
+ },
+ "V\u00e1lt\u00f3tartoz\u00e1sok": {
+ "account_number": 457,
+ "root_type": "Liability"
+ },
+ "Eredm\u00e9nyt terhel\u0151 ad\u00f3k elsz\u00e1mol\u00e1sa": {
+ "account_number": 461,
+ "root_type": "Liability"
+ },
+ "Szem\u00e9lyi j\u00f6vedelemad\u00f3 (SZJA) elsz\u00e1mol\u00e1sa": {
+ "account_number": 462,
+ "root_type": "Liability"
+ },
+ "J\u00f6ved\u00e9ki ad\u00f3 elsz\u00e1mol\u00e1sa": {
+ "account_number": 463,
+ "root_type": "Liability"
+ },
+ "G\u00e9pj\u00e1rm\u0171 ad\u00f3 (c\u00e9gaut\u00f3ad\u00f3) elsz\u00e1mol\u00e1sa": {
+ "account_number": 464,
+ "root_type": "Liability"
+ },
+ "V\u00e1melsz\u00e1mol\u00e1si sz\u00e1mla": {
+ "account_number": 465,
+ "root_type": "Liability"
+ },
+ "El\u0151zetesen felsz\u00e1m\u00edtott \u00e1ltal\u00e1nos forgalmi ad\u00f3": {
+ "account_number": 466,
+ "root_type": "Liability"
+ },
+ "Fizetend\u0151 \u00e1ltal\u00e1nos forgalmi ad\u00f3": {
+ "account_number": 467,
+ "root_type": "Liability"
+ },
+ "\u00c1ltal\u00e1nos forgalmi ad\u00f3 elsz\u00e1mol\u00e1si sz\u00e1mla": {
+ "account_number": 468,
+ "root_type": "Liability"
+ },
+ "Helyi ad\u00f3k elsz\u00e1mol\u00e1si sz\u00e1mla": {
+ "account_number": 469,
+ "root_type": "Liability"
+ },
+ "J\u00f6vedelemelsz\u00e1mol\u00e1si sz\u00e1mla": {
+ "account_number": 471,
+ "root_type": "Liability"
+ },
+ "Fel nem vett j\u00e1rand\u00f3s\u00e1gok": {
+ "account_number": 472,
+ "root_type": "Liability"
+ },
+ "Szoci\u00e1lis hozz\u00e1j\u00e1rul\u00e1si ad\u00f3": {
+ "account_number": 473,
+ "root_type": "Liability"
+ },
+ "Szakk\u00e9pz\u00e9si hozz\u00e1j\u00e1rul\u00e1s": {
+ "account_number": 474,
+ "root_type": "Liability"
+ },
+ "Egy\u00e9b \u00e1llami ad\u00f3hat\u00f3s\u00e1ggal szembeni k\u00f6telezetts\u00e9g elsz\u00e1mol\u00e1sa": {
+ "account_number": 476,
+ "root_type": "Liability"
+ },
+ "R\u00f6vid lej\u00e1rat\u00fa egy\u00e9b k\u00f6telezetts\u00e9gek munkav\u00e1llal\u00f3kkal \u00e9s tulajdonosokkal szemben": {
+ "account_number": 477,
+ "root_type": "Liability"
+ },
+ "R\u00e9szesed\u00e9sekkel, \u00e9rt\u00e9kpap\u00edrokkal kapcsolatos k\u00f6telezetts\u00e9gek": {
+ "account_number": 478,
+ "root_type": "Liability"
+ },
+ "K\u00fcl\u00f6nf\u00e9le egy\u00e9b r\u00f6vid lej\u00e1rat\u00fa k\u00f6telezetts\u00e9gek": {
+ "account_number": 479,
+ "root_type": "Liability"
+ }
+ },
+ "PASSZ\u00cdV ID\u0150BELI ELHAT\u00c1ROL\u00c1SOK": {
+ "account_number": 48,
+ "root_type": "Liability",
+ "is_group": 1,
+ "Passz\u00edv id\u0151beli elhat\u00e1rol\u00e1sok": {
+ "account_number": 481,
+ "root_type": "Liability"
+ }
+ },
+ "\u00c9VI M\u00c9RLEGSZ\u00c1ML\u00c1K": {
+ "account_number": 49,
+ "root_type": "Liability",
+ "is_group": 1,
+ "Nyit\u00f3m\u00e9rleg sz\u00e1mla": {
+ "account_number": 491,
+ "root_type": "Liability"
+ },
+ "Z\u00e1r\u00f3m\u00e9rleg sz\u00e1mla": {
+ "account_number": 492,
+ "root_type": "Liability"
+ },
+ "Ad\u00f3zott eredm\u00e9ny elsz\u00e1mol\u00e1si sz\u00e1mla": {
+ "account_number": 493,
+ "root_type": "Liability"
+ }
+ }
+ },
+ "SZ\u00c1MLAOSZT\u00c1LY K\u00d6LTS\u00c9GNEMEK": {
+ "account_number": 5,
+ "root_type": "Expense",
+ "is_group": 1,
+ "ANYAGK\u00d6LTS\u00c9G": {
+ "account_number": 51,
+ "root_type": "Expense",
+ "is_group": 1,
+ "Alapanyagok k\u00f6lts\u00e9gei": {
+ "account_number": 511,
+ "root_type": "Expense"
+ },
+ "Egy \u00e9ven bel\u00fcl elhaszn\u00e1l\u00f3d\u00f3 anyagi eszk\u00f6z\u00f6k k\u00f6lts\u00e9gei": {
+ "account_number": 512,
+ "root_type": "Expense"
+ },
+ "Egy\u00e9b anyagk\u00f6lts\u00e9g": {
+ "account_number": 513,
+ "root_type": "Expense"
+ },
+ "Anyagk\u00f6lts\u00e9g megt\u00e9r\u00fcl\u00e9s": {
+ "account_number": 519,
+ "root_type": "Expense"
+ }
+ },
+ "IG\u00c9NYBE VETT SZOLG\u00c1LTAT\u00c1SOK K\u00d6LTS\u00c9GEI": {
+ "account_number": 52,
+ "root_type": "Expense",
+ "is_group": 1,
+ "Sz\u00e1ll\u00edt\u00e1srakod\u00e1s, rakt\u00e1roz\u00e1s k\u00f6lts\u00e9gei": {
+ "account_number": 521,
+ "root_type": "Expense"
+ },
+ "B\u00e9rleti d\u00edjak": {
+ "account_number": 522,
+ "root_type": "Expense"
+ },
+ "Karbantart\u00e1si k\u00f6lts\u00e9gek": {
+ "account_number": 523,
+ "root_type": "Expense"
+ },
+ "Hirdet\u00e9s, rekl\u00e1m, propaganda k\u00f6lts\u00e9gek": {
+ "account_number": 524,
+ "root_type": "Expense"
+ },
+ "Oktat\u00e1s \u00e9s tov\u00e1bbk\u00e9pz\u00e9s k\u00f6lts\u00e9gei": {
+ "account_number": 525,
+ "root_type": "Expense"
+ },
+ "Utaz\u00e1si \u00e9s kik\u00fcldet\u00e9si k\u00f6lts\u00e9gek (napid\u00edj n\u00e9lk\u00fcl)": {
+ "account_number": 526,
+ "root_type": "Expense"
+ },
+ "Ig\u00e9nybe vett egy\u00e9b szolg\u00e1ltat\u00e1sok k\u00f6lts\u00e9gei": {
+ "account_number": 529,
+ "root_type": "Expense"
+ }
+ },
+ "EGY\u00c9B SZOLG\u00c1LTAT\u00c1SOK K\u00d6LTS\u00c9GEI": {
+ "account_number": 53,
+ "root_type": "Expense",
+ "is_group": 1,
+ "Hat\u00f3s\u00e1gi igazgat\u00e1si, szolg\u00e1ltat\u00e1si d\u00edjak, illet\u00e9kek": {
+ "account_number": 531,
+ "root_type": "Expense"
+ },
+ "P\u00e9nz\u00fcgyi, befektet\u00e9si szolg\u00e1ltat\u00e1si d\u00edjak": {
+ "account_number": 532,
+ "root_type": "Expense"
+ },
+ "Biztos\u00edt\u00e1si d\u00edjak": {
+ "account_number": 533,
+ "root_type": "Expense"
+ },
+ "K\u00f6lts\u00e9gk\u00e9nt elsz\u00e1moland\u00f3 ad\u00f3k, j\u00e1rul\u00e9kok, term\u00e9kd\u00edjak": {
+ "account_number": 534,
+ "root_type": "Expense"
+ },
+ "K\u00fcl\u00f6nf\u00e9le egy\u00e9b szolg\u00e1ltat\u00e1sok k\u00f6lts\u00e9gei": {
+ "account_number": 539,
+ "root_type": "Expense"
+ }
+ },
+ "B\u00c9RK\u00d6LTS\u00c9G": {
+ "account_number": 54,
+ "root_type": "Expense",
+ "is_group": 1,
+ "B\u00e9rk\u00f6lts\u00e9g": {
+ "account_number": 541,
+ "root_type": "Expense"
+ }
+ },
+ "SZEM\u00c9LYI JELLEG\u0170 EGY\u00c9B KIFIZET\u00c9SEK": {
+ "account_number": 55,
+ "root_type": "Expense",
+ "is_group": 1,
+ "Munkav\u00e1llal\u00f3knak, tagoknak fizetett szem\u00e9lyi jelleg\u0171 kifizet\u00e9sek": {
+ "account_number": 551,
+ "root_type": "Expense"
+ },
+ "J\u00f3l\u00e9ti \u00e9s kultur\u00e1lis k\u00f6lts\u00e9gek": {
+ "account_number": 552,
+ "root_type": "Expense"
+ },
+ "Reprezent\u00e1ci\u00f3s k\u00f6lts\u00e9gek": {
+ "account_number": 553,
+ "root_type": "Expense"
+ },
+ "Egy\u00e9b szem\u00e9lyi jelleg\u0171 kifizet\u00e9sek": {
+ "account_number": 559,
+ "root_type": "Expense"
+ }
+ },
+ "B\u00c9RJ\u00c1RUL\u00c9KOK": {
+ "account_number": 56,
+ "root_type": "Expense",
+ "is_group": 1,
+ "Szoci\u00e1lis hozz\u00e1j\u00e1rul\u00e1si ad\u00f3": {
+ "account_number": 561,
+ "root_type": "Expense"
+ },
+ "Szakk\u00e9pz\u00e9si hozz\u00e1j\u00e1rul\u00e1s": {
+ "account_number": 563,
+ "root_type": "Expense"
+ },
+ "Egy\u00e9b b\u00e9rj\u00e1rul\u00e9kok": {
+ "account_number": 569,
+ "root_type": "Expense"
+ }
+ },
+ "\u00c9RT\u00c9KCS\u00d6KKEN\u00c9SI LE\u00cdR\u00c1S": {
+ "account_number": 57,
+ "root_type": "Expense",
+ "is_group": 1,
+ "Terv szerinti \u00e9rt\u00e9kcs\u00f6kken\u00e9si le\u00edr\u00e1s": {
+ "account_number": 571,
+ "root_type": "Expense"
+ },
+ "Kis \u00e9rt\u00e9k\u0171 eszk\u00f6z\u00f6k egy \u00f6sszegben elsz\u00e1molt \u00e9rt\u00e9kcs\u00f6kken\u00e9si le\u00edr\u00e1sa": {
+ "account_number": 572,
+ "root_type": "Expense"
+ }
+ },
+ "AKTIV\u00c1LT SAJ\u00c1T TELJES\u00cdTM\u00c9NYEK \u00c9RT\u00c9KE": {
+ "account_number": 58,
+ "root_type": "Expense",
+ "is_group": 1,
+ "Saj\u00e1t termel\u00e9s\u0171 k\u00e9szletek \u00e1llom\u00e1nyv\u00e1ltoz\u00e1sa": {
+ "account_number": 581,
+ "root_type": "Expense"
+ },
+ "Saj\u00e1t el\u0151\u00e1ll\u00edt\u00e1s\u00fa eszk\u00f6z\u00f6k aktiv\u00e1lt \u00e9rt\u00e9ke": {
+ "account_number": 582,
+ "root_type": "Expense"
+ },
+ "Aktiv\u00e1lt saj\u00e1t teljes\u00edtm\u00e9nyek \u00e1tvezet\u00e9si sz\u00e1mla": {
+ "account_number": 589,
+ "root_type": "Expense"
+ }
+ },
+ "K\u00d6LTS\u00c9GNEMEK \u00c1TVEZET\u00c9SE": {
+ "account_number": 59,
+ "root_type": "Expense",
+ "is_group": 1,
+ "K\u00f6lts\u00e9gnemek \u00e1tvezet\u00e9si sz\u00e1mla": {
+ "account_number": 599,
+ "root_type": "Expense"
+ }
+ }
+ },
+ "SZ\u00c1MLAOSZT\u00c1LY R\u00c1FORD\u00cdT\u00c1SOK": {
+ "account_number": 8,
+ "root_type": "Expense",
+ "is_group": 1,
+ "ANYAGJELLEG\u0170 R\u00c1FORD\u00cdT\u00c1SOK": {
+ "account_number": 81,
+ "root_type": "Expense",
+ "is_group": 1,
+ "Anyagk\u00f6lts\u00e9g": {
+ "account_number": 811,
+ "root_type": "Expense"
+ },
+ "Ig\u00e9nybe vett szolg\u00e1ltat\u00e1sok \u00e9rt\u00e9ke": {
+ "account_number": 812,
+ "root_type": "Expense"
+ },
+ "Egy\u00e9b szolg\u00e1ltat\u00e1sok \u00e9rt\u00e9ke": {
+ "account_number": 813,
+ "root_type": "Expense"
+ },
+ "Eladott \u00e1ruk beszerz\u00e9si \u00e9rt\u00e9ke": {
+ "account_number": 814,
+ "root_type": "Expense"
+ },
+ "Eladott (k\u00f6zvet\u00edtett) szolg\u00e1ltat\u00e1sok \u00e9rt\u00e9ke": {
+ "account_number": 815,
+ "root_type": "Expense"
+ }
+ },
+ "SZEM\u00c9LYI JELLEG\u0170 R\u00c1FORD\u00cdT\u00c1SOK": {
+ "account_number": 82,
+ "root_type": "Expense",
+ "is_group": 1,
+ "B\u00e9rk\u00f6lts\u00e9g": {
+ "account_number": 821,
+ "root_type": "Expense"
+ },
+ "Szem\u00e9lyi jelleg\u0171 egy\u00e9b kifizet\u00e9sek": {
+ "account_number": 822,
+ "root_type": "Expense"
+ },
+ "B\u00e9rj\u00e1rul\u00e9kok": {
+ "account_number": 823,
+ "root_type": "Expense"
+ }
+ },
+ "\u00c9RT\u00c9KCS\u00d6KKEN\u00c9SI LE\u00cdR\u00c1S": {
+ "account_number": 83,
+ "root_type": "Expense",
+ "is_group": 1,
+ "\u00c9rt\u00e9kcs\u00f6kken\u00e9si le\u00edr\u00e1s": {
+ "account_number": 831,
+ "root_type": "Expense"
+ }
+ },
+ "EGY\u00c9B R\u00c1FORD\u00cdT\u00c1SOK": {
+ "account_number": 86,
+ "root_type": "Expense",
+ "is_group": 1,
+ "Egy\u00e9b r\u00e1ford\u00edt\u00e1snak min\u0151s\u00fcl\u0151 \u00e9rt\u00e9kes\u00edt\u00e9sek": {
+ "account_number": 861,
+ "root_type": "Expense",
+ "is_group": 1,
+ "\u00c9rt\u00e9kes\u00edtett immateri\u00e1lis javak, t\u00e1rgyi eszk\u00f6z\u00f6k k\u00f6nyv szerinti \u00e9rt\u00e9ke": {
+ "account_number": 8611,
+ "root_type": "Expense"
+ },
+ "\u00c9rt\u00e9kes\u00edtett, \u00e1truh\u00e1zott (engedm\u00e9nyezett) k\u00f6vetel\u00e9sek k\u00f6nyv szerinti \u00e9rt\u00e9ke": {
+ "account_number": 8612,
+ "root_type": "Expense"
+ }
+ },
+ "Egy\u00e9b r\u00e1ford\u00edt\u00e1snak min\u0151s\u00fcl\u0151 eszk\u00f6z kivezet\u00e9sek": {
+ "account_number": 862,
+ "root_type": "Expense",
+ "is_group": 1,
+ "Hi\u00e1nyz\u00f3, megsemmis\u00fclt, kiselejtezett immateri\u00e1lis javak, t\u00e1rgyi eszk\u00f6z\u00f6k nett\u00f3 \u00e9rt\u00e9ke": {
+ "account_number": 8621,
+ "root_type": "Expense"
+ },
+ "Hi\u00e1nyz\u00f3, megsemmis\u00fclt, \u00e1llom\u00e1nyb\u00f3l kivezetett k\u00e9szletek k\u00f6nyv szerinti \u00e9rt\u00e9ke": {
+ "account_number": 8622,
+ "root_type": "Expense"
+ }
+ },
+ "Behajthatatlan k\u00f6vetel\u00e9sek le\u00edrt \u00f6sszege": {
+ "account_number": 863,
+ "root_type": "Expense"
+ },
+ "C\u00e9ltartal\u00e9k k\u00e9pz\u00e9s": {
+ "account_number": 864,
+ "root_type": "Expense"
+ },
+ "Ut\u00f3lag adott, nem sz\u00e1ml\u00e1zott engedm\u00e9ny": {
+ "account_number": 865,
+ "root_type": "Expense"
+ },
+ "Egy\u00e9b r\u00e1ford\u00edt\u00e1sk\u00e9nt elsz\u00e1molt ad\u00f3k, illet\u00e9kek, hozz\u00e1j\u00e1rul\u00e1sok": {
+ "account_number": 866,
+ "root_type": "Expense",
+ "is_group": 1,
+ "K\u00f6zponti k\u00f6lts\u00e9gvet\u00e9ssel elsz\u00e1molt ad\u00f3k, illet\u00e9kek, hozz\u00e1j\u00e1rul\u00e1sok": {
+ "account_number": 8661,
+ "root_type": "Expense"
+ },
+ "Helyi \u00f6nkorm\u00e1nyzatokkal elsz\u00e1molt ad\u00f3k, illet\u00e9kek, hozz\u00e1j\u00e1rul\u00e1sok": {
+ "account_number": 8662,
+ "root_type": "Expense"
+ },
+ "Elk\u00fcl\u00f6n\u00edtett \u00e1llami p\u00e9nzalapokkal elsz\u00e1molt ad\u00f3k, illet\u00e9kek, hozz\u00e1j\u00e1rul\u00e1sok": {
+ "account_number": 8663,
+ "root_type": "Expense"
+ },
+ "T\u00e1rsadalombiztos\u00edt\u00e1ssal elsz\u00e1molt ad\u00f3k, illet\u00e9kek, hozz\u00e1j\u00e1rul\u00e1sok": {
+ "account_number": 8664,
+ "root_type": "Expense"
+ },
+ "EU p\u00e9nz\u00fcgyi alapokkal elsz\u00e1molt ad\u00f3k, illet\u00e9kek, hozz\u00e1j\u00e1rul\u00e1sok": {
+ "account_number": 8665,
+ "root_type": "Expense"
+ },
+ "R\u00e1ford\u00edt\u00e1sk\u00e9nt elsz\u00e1molt egy\u00e9b ad\u00f3k \u00e9s ad\u00f3jelleg\u0171 t\u00e9telek": {
+ "account_number": 8666,
+ "root_type": "Expense"
+ }
+ },
+ "Egy\u00e9b r\u00e1ford\u00edt\u00e1sk\u00e9nt elsz\u00e1molt, ad\u00f3nak nem min\u0151s\u00fcl\u0151 kifizet\u00e9sek": {
+ "account_number": 867,
+ "root_type": "Expense",
+ "is_group": 1,
+ "K\u00e1resem\u00e9nnyel kapcsolatos fizetett, fizetend\u0151 \u00f6sszegek": {
+ "account_number": 8671,
+ "root_type": "Expense"
+ },
+ "K\u00f6lts\u00e9gek (r\u00e1f.) ellent\u00e9telez\u00e9s\u00e9re visszafizet\u00e9si k\u00f6telezetts\u00e9g n\u00e9lk\u00fcl adott t\u00e1mogat\u00e1s, v\u00e9glegesen \u00e1tadott p\u00e9nzeszk\u00f6z, juttat\u00e1s": {
+ "account_number": 8672,
+ "root_type": "Expense"
+ },
+ "Fejleszt\u00e9si c\u00e9lra, visszafizet\u00e9si k\u00f6telezetts\u00e9g n\u00e9lk\u00fcl adott t\u00e1mogat\u00e1s, juttat\u00e1s": {
+ "account_number": 8673,
+ "root_type": "Expense"
+ },
+ "Fejleszt\u00e9si c\u00e9lra kapott t\u00e1mogat\u00e1s visszafizetend\u0151 \u00f6sszege": {
+ "account_number": 8674,
+ "root_type": "Expense"
+ },
+ "Tao \u00e1ltal elismert b\u00edrs\u00e1gok, k\u00f6tb\u00e9rek, k\u00e9sedelmi kamatok, p\u00f3tl\u00e9kok, k\u00e1rt\u00e9r\u00edt\u00e9sek, s\u00e9relemd\u00edjak": {
+ "account_number": 8675,
+ "root_type": "Expense"
+ },
+ "Tao \u00e1ltal el nem ismert b\u00edrs\u00e1gok, k\u00f6tb\u00e9rek, k\u00e9sedelmi kamatok, p\u00f3tl\u00e9kok, k\u00e1rt\u00e9r\u00edt\u00e9sek, s\u00e9relemd\u00edjak": {
+ "account_number": 8676,
+ "root_type": "Expense"
+ }
+ },
+ "Terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9sek, \u00e9rt\u00e9kveszt\u00e9sek": {
+ "account_number": 868,
+ "root_type": "Expense",
+ "is_group": 1,
+ "Immateri\u00e1lis javak terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {
+ "account_number": 8681,
+ "root_type": "Expense"
+ },
+ "T\u00e1rgyi eszk\u00f6z\u00f6k terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9se": {
+ "account_number": 8682,
+ "root_type": "Expense"
+ },
+ "K\u00e9szletek \u00e9rt\u00e9kveszt\u00e9se": {
+ "account_number": 8683,
+ "root_type": "Expense"
+ },
+ "K\u00f6vetel\u00e9sek \u00e9rt\u00e9kveszt\u00e9se": {
+ "account_number": 8684,
+ "root_type": "Expense"
+ }
+ },
+ "K\u00fcl\u00f6nf\u00e9le egy\u00e9b r\u00e1ford\u00edt\u00e1sok": {
+ "account_number": 869,
+ "root_type": "Expense",
+ "is_group": 1,
+ "T\u00e1rsas\u00e1gba bevitt, \u00e9rt\u00e9kp. v. r\u00e9sz. nem min\u0151s\u00fcl\u0151 vagyont. k\u00f6nyv sz. \u00e9s l\u00e9tes\u00edt\u0151 o. meghat. \u00e9rt\u00e9k\u00e9nek vesztes\u00e9gjelleg\u0171 k\u00fcl.": {
+ "account_number": 8691,
+ "root_type": "Expense"
+ },
+ "Ellent\u00e9telez\u00e9s n\u00e9lk\u00fcl \u00e1tv\u00e1llalt k\u00f6telezetts\u00e9g szerz\u0151d\u00e9s szerinti \u00f6sszege": {
+ "account_number": 8692,
+ "root_type": "Expense"
+ },
+ "T\u00e9r\u00edt\u00e9s n\u00e9lk\u00fcl \u00e1tadott, r\u00e9szesed\u00e9snek vagy \u00e9rt\u00e9kpap\u00edrnak nem min\u0151s\u00fcl\u0151 eszk\u00f6z\u00f6k nyilv\u00e1ntart\u00e1s szerinti \u00e9rt\u00e9ke": {
+ "account_number": 8693,
+ "root_type": "Expense"
+ },
+ "T\u00e9r\u00edt\u00e9s n\u00e9lk\u00fcl ny\u00fajtott szolg\u00e1ltat\u00e1sok beker\u00fcl\u00e9si \u00e9rt\u00e9ke": {
+ "account_number": 8694,
+ "root_type": "Expense"
+ },
+ "Elengedett k\u00f6vetel\u00e9sek k\u00f6nyv szerinti \u00e9rt\u00e9ke": {
+ "account_number": 8695,
+ "root_type": "Expense"
+ },
+ "Egy\u00e9b, vagyoncs\u00f6kken\u00e9ssel j\u00e1r\u00f3 r\u00e1ford\u00edt\u00e1sok": {
+ "account_number": 8696,
+ "root_type": "Expense"
+ }
+ }
+ },
+ "P\u00c9NZ\u00dcGYI M\u0170VELETEK R\u00c1FORD\u00cdT\u00c1SAI": {
+ "account_number": 87,
+ "root_type": "Expense",
+ "is_group": 1,
+ "R\u00e9szesed\u00e9sekb\u0151l sz\u00e1rmaz\u00f3 r\u00e1ford\u00edt\u00e1sok, \u00e1rfolyamvesztes\u00e9gek": {
+ "account_number": 871,
+ "root_type": "Expense"
+ },
+ "Befektetett p\u00e9nz\u00fcgyi eszk\u00f6z\u00f6kb\u0151l (\u00e9rt\u00e9kpap\u00edrokb\u00f3l, k\u00f6lcs\u00f6n\u00f6kb\u0151l) sz\u00e1rmaz\u00f3 r\u00e1ford\u00edt\u00e1sok \u00e1rfolyamvesztes\u00e9gek": {
+ "account_number": 872,
+ "root_type": "Expense"
+ },
+ "Hitelint\u00e9zetnek fizetend\u0151 kamatok \u00e9s kamatjelleg\u0171 r\u00e1ford\u00edt\u00e1sok": {
+ "account_number": 873,
+ "root_type": "Expense"
+ },
+ "Nem hitelint\u00e9zetnek fizetend\u0151 kamatok \u00e9s kamatjelleg\u0171 r\u00e1ford\u00edt\u00e1sok": {
+ "account_number": 874,
+ "root_type": "Expense"
+ },
+ "R\u00e9szesed\u00e9sek, \u00e9rt\u00e9kpap\u00edrok, bankbet\u00e9tek \u00e9rt\u00e9kveszt\u00e9se \u00e9s vissza\u00edr\u00e1sa": {
+ "account_number": 875,
+ "root_type": "Expense",
+ "is_group": 1,
+ "R\u00e9szesed\u00e9sek, \u00e9rt\u00e9kpap\u00edrok, bankbet\u00e9tek \u00e9rt\u00e9kveszt\u00e9se": {
+ "account_number": 8751,
+ "root_type": "Expense"
+ },
+ "R\u00e9szesed\u00e9sek, \u00e9rt\u00e9kpap\u00edrok, bankbet\u00e9tek \u00e9rt\u00e9kveszt\u00e9s\u00e9nek vissza\u00edr\u00e1sa": {
+ "account_number": 8752,
+ "root_type": "Expense"
+ }
+ },
+ "K\u00fclf\u00f6ldi p\u00e9nz\u00e9rt\u00e9kre sz\u00f3l\u00f3 eszk\u00f6z\u00f6k \u00e9s k\u00f6telezetts\u00e9gek \u00e1rfolyamvesztes\u00e9gei": {
+ "account_number": 876,
+ "root_type": "Expense",
+ "is_group": 1,
+ "Deviza \u00e9s valutak\u00e9szletek forintra \u00e1tv\u00e1lt\u00e1s\u00e1nak \u00e1rfolyamvesztes\u00e9ge": {
+ "account_number": 8761,
+ "root_type": "Expense"
+ },
+ "K\u00fclf\u00f6ldi p\u00e9nz\u00e9rt\u00e9kre sz\u00f3l\u00f3 eszk\u00f6z\u00f6k \u00e9s k\u00f6telezetts\u00e9gek p\u00e9nz\u00fcgyileg rendezett \u00e1rfolyamvesztes\u00e9ge": {
+ "account_number": 8762,
+ "root_type": "Expense"
+ }
+ },
+ "P\u00e9nz\u00fcgyi m\u0171veletek egy\u00e9b r\u00e1ford\u00edt\u00e1sai": {
+ "account_number": 877,
+ "root_type": "Expense"
+ },
+ "P\u00e9nz\u00fcgyi rendez\u00e9shez kapcsol\u00f3d\u00f3an adott engedm\u00e9ny": {
+ "account_number": 878,
+ "root_type": "Expense"
+ },
+ "Egy\u00e9b vagyoncs\u00f6kken\u00e9ssel j\u00e1r\u00f3 p\u00e9nz\u00fcgyi r\u00e1ford\u00edt\u00e1sok": {
+ "account_number": 879,
+ "root_type": "Expense"
+ }
+ },
+ "EREDM\u00c9NYT TERHEL\u0150 AD\u00d3K": {
+ "account_number": 89,
+ "root_type": "Expense",
+ "is_group": 1,
+ "T\u00e1rsas\u00e1gi ad\u00f3": {
+ "account_number": 891,
+ "root_type": "Expense"
+ },
+ "Kisv\u00e1llalati ad\u00f3": {
+ "account_number": 893,
+ "root_type": "Expense"
+ },
+ "Eredm\u00e9nyt terhel\u0151 egy\u00e9b ad\u00f3k": {
+ "account_number": 899,
+ "root_type": "Expense"
+ }
+ }
+ },
+ "SZ\u00c1MLAOSZT\u00c1LY BEV\u00c9TELEK": {
+ "account_number": 9,
+ "root_type": "Income",
+ "is_group": 1,
+ "BELF\u00d6LDI \u00c9RT\u00c9KES\u00cdT\u00c9S \u00c1RBEV\u00c9TELE": {
+ "account_number": 91,
+ "root_type": "Income",
+ "is_group": 1,
+ "Belf\u00f6ldinek \u00e9rt\u00e9kes\u00edtett saj\u00e1t termel\u00e9s\u0171 k\u00e9szletek \u00e1rbev\u00e9tele": {
+ "account_number": 911,
+ "root_type": "Income"
+ },
+ "Belf\u00f6ldinek \u00e9rt\u00e9kes\u00edtett v\u00e1s\u00e1rolt k\u00e9szletek \u00e1rbev\u00e9tele": {
+ "account_number": 912,
+ "root_type": "Income"
+ },
+ "Belf\u00f6ldinek ny\u00fajtott szolg\u00e1ltat\u00e1sok \u00e1rbev\u00e9tele": {
+ "account_number": 913,
+ "root_type": "Income"
+ },
+ "Belf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9ssel kapcsolatos \u00e1rt\u00e1mogat\u00e1s": {
+ "account_number": 918,
+ "root_type": "Income"
+ },
+ "Egy\u00e9b belf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9s \u00e1rbev\u00e9tele": {
+ "account_number": 919,
+ "root_type": "Income"
+ }
+ },
+ "EXPORT\u00c9RT\u00c9KES\u00cdT\u00c9S \u00c1RBEV\u00c9TELE": {
+ "account_number": 92,
+ "root_type": "Income",
+ "is_group": 1,
+ "K\u00fclf\u00f6ldinek \u00e9rt\u00e9kes\u00edtett saj\u00e1t termel\u00e9s\u0171 k\u00e9szletek \u00e1rbev\u00e9tele": {
+ "account_number": 921,
+ "root_type": "Income"
+ },
+ "K\u00fclf\u00f6ldinek \u00e9rt\u00e9kes\u00edtett v\u00e1s\u00e1rolt k\u00e9szletek \u00e1rbev\u00e9tele": {
+ "account_number": 922,
+ "root_type": "Income"
+ },
+ "K\u00fclf\u00f6ldinek ny\u00fajtott szolg\u00e1ltat\u00e1sok \u00e1rbev\u00e9tele": {
+ "account_number": 923,
+ "root_type": "Income"
+ },
+ "K\u00fclf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9ssel kapcsolatos \u00e1rt\u00e1mogat\u00e1s": {
+ "account_number": 928,
+ "root_type": "Income"
+ },
+ "Egy\u00e9b k\u00fclf\u00f6ldi \u00e9rt\u00e9kes\u00edt\u00e9s \u00e1rbev\u00e9tele": {
+ "account_number": 929,
+ "root_type": "Income"
+ }
+ },
+ "EGY\u00c9B BEV\u00c9TELEK": {
+ "account_number": 96,
+ "root_type": "Income",
+ "is_group": 1,
+ "Egy\u00e9b bev\u00e9telnek min\u0151s\u00fcl\u0151 \u00e9rt\u00e9kes\u00edt\u00e9sek": {
+ "account_number": 961,
+ "root_type": "Income",
+ "is_group": 1,
+ "\u00c9rt\u00e9kes\u00edtett immateri\u00e1lis javak, t\u00e1rgyi eszk\u00f6z\u00f6k ellen\u00e9rt\u00e9ke": {
+ "account_number": 9611,
+ "root_type": "Income"
+ },
+ "\u00c9rt\u00e9kes\u00edtett, \u00e1truh\u00e1zott (engedm\u00e9nyezett) k\u00f6vetel\u00e9sek ellen\u00e9rt\u00e9ke": {
+ "account_number": 9612,
+ "root_type": "Income"
+ }
+ },
+ "K\u00f6vetel\u00e9s k\u00f6nyv szerinti \u00e9rt\u00e9k\u00e9t meghalad\u00f3an realiz\u00e1lt \u00f6sszeg": {
+ "account_number": 963,
+ "root_type": "Income"
+ },
+ "C\u00e9ltartal\u00e9k felold\u00e1s": {
+ "account_number": 964,
+ "root_type": "Income"
+ },
+ "Ut\u00f3lag kapott, nem sz\u00e1ml\u00e1zott engedm\u00e9ny": {
+ "account_number": 965,
+ "root_type": "Income"
+ },
+ "M\u0171k\u00f6d\u00e9si c\u00e9lra kapott t\u00e1mogat\u00e1s, juttat\u00e1s": {
+ "account_number": 966,
+ "root_type": "Income",
+ "is_group": 1,
+ "K\u00f6zponti k\u00f6lts\u00e9gvet\u00e9sb\u0151l kapott t\u00e1mogat\u00e1s, juttat\u00e1s": {
+ "account_number": 9661,
+ "root_type": "Income"
+ },
+ "Helyi \u00f6nkorm\u00e1nyzatokt\u00f3l kapott t\u00e1mogat\u00e1s, juttat\u00e1s": {
+ "account_number": 9662,
+ "root_type": "Income"
+ },
+ "Eur\u00f3pai Uni\u00f3t\u00f3l kapott t\u00e1mogat\u00e1s, juttat\u00e1s": {
+ "account_number": 9663,
+ "root_type": "Income"
+ },
+ "Egy\u00e9b forr\u00e1sb\u00f3l kapott t\u00e1mogat\u00e1s, juttat\u00e1s": {
+ "account_number": 9664,
+ "root_type": "Income"
+ }
+ },
+ "Egy\u00e9b bev\u00e9telk\u00e9nt elsz\u00e1molt p\u00e9nzbev\u00e9telek": {
+ "account_number": 967,
+ "root_type": "Income",
+ "is_group": 1,
+ "K\u00e1resem\u00e9nnyel kapcsolatos t\u00e9r\u00edt\u00e9sek": {
+ "account_number": 9671,
+ "root_type": "Income"
+ },
+ "K\u00f6lts\u00e9gek (r\u00e1ford\u00edt\u00e1sok) ellent\u00e9telez\u00e9s\u00e9re kapott t\u00e1mogat\u00e1s, juttat\u00e1s": {
+ "account_number": 9672,
+ "root_type": "Income"
+ },
+ "Fejleszt\u00e9si c\u00e9lra kapott t\u00e1mogat\u00e1s, juttat\u00e1s": {
+ "account_number": 9673,
+ "root_type": "Income"
+ },
+ "Kapott b\u00edrs\u00e1gok, k\u00f6tb\u00e9rek, fekb\u00e9rek, k\u00e9sedelmi kamatok, k\u00e1rt\u00e9r\u00edt\u00e9sek": {
+ "account_number": 9674,
+ "root_type": "Income"
+ }
+ },
+ "Terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9sek, \u00e9rt\u00e9kveszt\u00e9sek vissza\u00edr\u00e1sa": {
+ "account_number": 968,
+ "root_type": "Income",
+ "is_group": 1,
+ "Immateri\u00e1lis javak terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9s\u00e9nek vissza\u00edr\u00e1sa": {
+ "account_number": 9681,
+ "root_type": "Income"
+ },
+ "T\u00e1rgyi eszk\u00f6z\u00f6k terven fel\u00fcli \u00e9rt\u00e9kcs\u00f6kken\u00e9s\u00e9nek vissza\u00edr\u00e1sa": {
+ "account_number": 9682,
+ "root_type": "Income"
+ },
+ "K\u00e9szletek \u00e9rt\u00e9kveszt\u00e9s\u00e9nek vissza\u00edr\u00e1sa": {
+ "account_number": 9683,
+ "root_type": "Income"
+ },
+ "R\u00e9szesed\u00e9sek \u00e9rt\u00e9kveszt\u00e9s\u00e9nek vissza\u00edr\u00e1sa": {
+ "account_number": 9684,
+ "root_type": "Income"
+ }
+ },
+ "K\u00fcl\u00f6nf\u00e9le egy\u00e9b bev\u00e9telek": {
+ "account_number": 969,
+ "root_type": "Income",
+ "is_group": 1,
+ "Gazd. t\u00e1rs. bevitt, \u00e9rt\u00e9kp. v. r\u00e9sz. nem min\u0151s\u00fcl\u0151 vagyont. nyilv. sz. \u00e9rt. \u00e9s l\u00e9tes\u00edt\u0151 o. meghat. \u00e9rt. nyeres\u00e9gjelleg\u0171 k\u00fcl.": {
+ "account_number": 9691,
+ "root_type": "Income"
+ },
+ "El\u00e9v\u00fclt k\u00f6telezetts\u00e9g k\u00f6nyv szerinti \u00e9rt\u00e9ke": {
+ "account_number": 9692,
+ "root_type": "Income"
+ },
+ "T\u00e9r\u00edt\u00e9s n\u00e9lk\u00fcl \u00e1tvett, aj\u00e1nd\u00e9kk\u00e9nt, hagyat\u00e9kk\u00e9nt kapott, fellelt eszk\u00f6z\u00f6k piaci vagy jogszab\u00e1ly szerinti \u00e9rt\u00e9ke": {
+ "account_number": 9693,
+ "root_type": "Income"
+ },
+ "T\u00e9r\u00edt\u00e9s n\u00e9lk\u00fcl kapott szolg\u00e1ltat\u00e1sok piaci vagy jogszab\u00e1ly szerinti \u00e9rt\u00e9ke": {
+ "account_number": 9694,
+ "root_type": "Income"
+ },
+ "Elengedett \u00e9s ellent\u00e9telez\u00e9s n\u00e9lk\u00fcl \u00e1tv\u00e1llalt k\u00f6telezetts\u00e9g \u00e9rt\u00e9ke": {
+ "account_number": 9695,
+ "root_type": "Income"
+ },
+ "Egy\u00e9b, vagyonn\u00f6veked\u00e9ssel j\u00e1r\u00f3 bev\u00e9telek": {
+ "account_number": 9696,
+ "root_type": "Income"
+ }
+ }
+ },
+ "P\u00c9NZ\u00dcGYI M\u0170VELETEK BEV\u00c9TELEI": {
+ "account_number": 97,
+ "root_type": "Income",
+ "is_group": 1,
+ "R\u00e9szesed\u00e9sekb\u0151l sz\u00e1rmaz\u00f3 bev\u00e9telek, \u00e1rfolyamnyeres\u00e9gek": {
+ "account_number": 971,
+ "root_type": "Income"
+ },
+ "Befektetett p\u00e9nz\u00fcgyi eszk\u00f6z\u00f6kb\u0151l (\u00e9rt\u00e9kpap\u00edrokb\u00f3l, k\u00f6lcs\u00f6n\u00f6kb\u0151l) sz\u00e1rmaz\u00f3 bev\u00e9telek, \u00e1rfolyamnyeres\u00e9gek": {
+ "account_number": 972,
+ "root_type": "Income"
+ },
+ "Hitelint\u00e9zett\u0151l kapott kamatok \u00e9s kamatjelleg\u0171 bev\u00e9telek": {
+ "account_number": 973,
+ "root_type": "Income"
+ },
+ "Nem hitelint\u00e9zett\u0151l kapott kamatok \u00e9s kamatjelleg\u0171 bev\u00e9telek": {
+ "account_number": 974,
+ "root_type": "Income"
+ },
+ "Kapott (j\u00e1r\u00f3) osztal\u00e9k \u00e9s r\u00e9szesed\u00e9s": {
+ "account_number": 975,
+ "root_type": "Income"
+ },
+ "K\u00fclf\u00f6ldi p\u00e9nz\u00e9rt\u00e9kre sz\u00f3l\u00f3 eszk\u00f6z\u00f6k \u00e9s k\u00f6telezetts\u00e9gek \u00e1rfolyamnyeres\u00e9gei": {
+ "account_number": 976,
+ "root_type": "Income",
+ "is_group": 1,
+ "Deviza \u00e9s valutak\u00e9szletek forintra \u00e1tv\u00e1lt\u00e1s\u00e1nak \u00e1rfolyamnyeres\u00e9ge": {
+ "account_number": 9761,
+ "root_type": "Income"
+ },
+ "K\u00fclf\u00f6ldi p\u00e9nz\u00e9rt\u00e9kre sz\u00f3l\u00f3 eszk\u00f6z\u00f6k \u00e9s k\u00f6telezetts\u00e9gek p\u00e9nz\u00fcgyileg rendezett \u00e1rfolyamnyeres\u00e9ge": {
+ "account_number": 9762,
+ "root_type": "Income"
+ }
+ },
+ "P\u00e9nz\u00fcgyi m\u0171veletek egy\u00e9b bev\u00e9telei": {
+ "account_number": 977,
+ "root_type": "Income"
+ },
+ "P\u00e9nz\u00fcgyi rendez\u00e9shez kapcsol\u00f3d\u00f3an kapott engedm\u00e9ny": {
+ "account_number": 978,
+ "root_type": "Income"
+ },
+ "Egy\u00e9b vagyonn\u00f6veked\u00e9ssel j\u00e1r\u00f3 p\u00e9nz\u00fcgyi bev\u00e9telek": {
+ "account_number": 979,
+ "root_type": "Income"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js
index 46ba27c..28e79b5 100644
--- a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js
+++ b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js
@@ -12,6 +12,9 @@
},
};
});
+ let no_bank_transactions_text =
+ `<div class="text-muted text-center">${__("No Matching Bank Transactions Found")}</div>`
+ set_field_options("no_bank_transactions", no_bank_transactions_text);
},
onload: function (frm) {
diff --git a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json
index b643e6e..f666101 100644
--- a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json
+++ b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json
@@ -81,8 +81,7 @@
},
{
"fieldname": "no_bank_transactions",
- "fieldtype": "HTML",
- "options": "<div class=\"text-muted text-center\">No Matching Bank Transactions Found</div>"
+ "fieldtype": "HTML"
}
],
"hide_toolbar": 1,
@@ -109,4 +108,4 @@
"quick_entry": 1,
"sort_field": "modified",
"sort_order": "DESC"
-}
\ No newline at end of file
+}
diff --git a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js
index f745620..04af323 100644
--- a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js
+++ b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js
@@ -100,7 +100,7 @@
if (frm.doc.status.includes("Success")) {
frm.add_custom_button(
- __("Go to {0} List", [frm.doc.reference_doctype]),
+ __("Go to {0} List", [__(frm.doc.reference_doctype)]),
() => frappe.set_route("List", frm.doc.reference_doctype)
);
}
diff --git a/erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json b/erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
index 3f85668..4bb1865 100644
--- a/erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
+++ b/erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
@@ -8,6 +8,7 @@
"engine": "InnoDB",
"field_order": [
"barcode",
+ "has_item_scanned",
"item_code",
"col_break1",
"item_name",
@@ -808,11 +809,19 @@
"fieldtype": "Check",
"label": "Grant Commission",
"read_only": 1
+ },
+ {
+ "default": "0",
+ "depends_on": "barcode",
+ "fieldname": "has_item_scanned",
+ "fieldtype": "Check",
+ "label": "Has Item Scanned",
+ "read_only": 1
}
],
"istable": 1,
"links": [],
- "modified": "2021-10-05 12:23:47.506290",
+ "modified": "2022-11-02 12:52:39.125295",
"modified_by": "Administrator",
"module": "Accounts",
"name": "POS Invoice Item",
@@ -820,5 +829,6 @@
"owner": "Administrator",
"permissions": [],
"sort_field": "modified",
- "sort_order": "DESC"
+ "sort_order": "DESC",
+ "states": []
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index e73d602..370c0fc 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -57,6 +57,8 @@
"column_break_28",
"total",
"net_total",
+ "tax_withholding_net_total",
+ "base_tax_withholding_net_total",
"taxes_section",
"taxes_and_charges",
"column_break_58",
@@ -89,7 +91,6 @@
"section_break_44",
"apply_discount_on",
"base_discount_amount",
- "additional_discount_account",
"column_break_46",
"additional_discount_percentage",
"discount_amount",
@@ -1422,6 +1423,26 @@
"read_only": 1
},
{
+ "default": "0",
+ "fieldname": "tax_withholding_net_total",
+ "fieldtype": "Currency",
+ "hidden": 1,
+ "label": "Tax Withholding Net Total",
+ "no_copy": 1,
+ "options": "currency",
+ "read_only": 1
+ },
+ {
+ "fieldname": "base_tax_withholding_net_total",
+ "fieldtype": "Currency",
+ "hidden": 1,
+ "label": "Base Tax Withholding Net Total",
+ "no_copy": 1,
+ "options": "currency",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
"collapsible_depends_on": "tax_withheld_vouchers",
"fieldname": "tax_withheld_vouchers_section",
"fieldtype": "Section Break",
@@ -1519,7 +1540,7 @@
"idx": 204,
"is_submittable": 1,
"links": [],
- "modified": "2022-10-11 13:04:44.304389",
+ "modified": "2022-11-04 01:02:44.544878",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice",
diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
index a8f6f80..5c1cb0d 100644
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -40,6 +40,7 @@
"discount_amount",
"base_rate_with_margin",
"sec_break2",
+ "apply_tds",
"rate",
"amount",
"item_tax_template",
@@ -868,6 +869,12 @@
"label": "Product Bundle",
"options": "Product Bundle",
"read_only": 1
+ },
+ {
+ "default": "1",
+ "fieldname": "apply_tds",
+ "fieldtype": "Check",
+ "label": "Apply TDS"
}
],
"idx": 1,
diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
index 7f1a1ec..77055f9 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -8,6 +8,7 @@
"engine": "InnoDB",
"field_order": [
"barcode",
+ "has_item_scanned",
"item_code",
"col_break1",
"item_name",
@@ -872,12 +873,20 @@
"label": "Purchase Order Item",
"print_hide": 1,
"read_only": 1
+ },
+ {
+ "default": "0",
+ "depends_on": "barcode",
+ "fieldname": "has_item_scanned",
+ "fieldtype": "Check",
+ "label": "Has Item Scanned",
+ "read_only": 1
}
],
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2022-10-26 11:38:36.119339",
+ "modified": "2022-11-02 12:53:12.693217",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice Item",
diff --git a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
index 7eddd81..30ed91b 100644
--- a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
+++ b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
@@ -61,6 +61,9 @@
def get_party_tax_withholding_details(inv, tax_withholding_category=None):
+ if inv.doctype == "Payment Entry":
+ inv.tax_withholding_net_total = inv.net_total
+
pan_no = ""
parties = []
party_type, party = get_party_details(inv)
@@ -242,7 +245,7 @@
if party_type == "Supplier":
ldc = get_lower_deduction_certificate(tax_details, pan_no)
if tax_deducted:
- net_total = inv.net_total
+ net_total = inv.tax_withholding_net_total
if ldc:
tax_amount = get_tds_amount_from_ldc(
ldc, parties, pan_no, tax_details, posting_date, net_total
@@ -272,6 +275,11 @@
def get_invoice_vouchers(parties, tax_details, company, party_type="Supplier"):
doctype = "Purchase Invoice" if party_type == "Supplier" else "Sales Invoice"
+ field = (
+ "base_tax_withholding_net_total as base_net_total"
+ if party_type == "Supplier"
+ else "base_net_total"
+ )
voucher_wise_amount = {}
vouchers = []
@@ -288,7 +296,7 @@
{"apply_tds": 1, "tax_withholding_category": tax_details.get("tax_withholding_category")}
)
- invoices_details = frappe.get_all(doctype, filters=filters, fields=["name", "base_net_total"])
+ invoices_details = frappe.get_all(doctype, filters=filters, fields=["name", field])
for d in invoices_details:
vouchers.append(d.name)
@@ -392,7 +400,7 @@
tds_amount = 0
invoice_filters = {"name": ("in", vouchers), "docstatus": 1, "apply_tds": 1}
- field = "sum(net_total)"
+ field = "sum(tax_withholding_net_total)"
if cint(tax_details.consider_party_ledger_amount):
invoice_filters.pop("apply_tds", None)
@@ -415,12 +423,12 @@
)
supp_credit_amt += supp_jv_credit_amt
- supp_credit_amt += inv.net_total
+ supp_credit_amt += inv.tax_withholding_net_total
threshold = tax_details.get("threshold", 0)
cumulative_threshold = tax_details.get("cumulative_threshold", 0)
- if (threshold and inv.net_total >= threshold) or (
+ if (threshold and inv.tax_withholding_net_total >= threshold) or (
cumulative_threshold and supp_credit_amt >= cumulative_threshold
):
if (cumulative_threshold and supp_credit_amt >= cumulative_threshold) and cint(
@@ -428,11 +436,11 @@
):
# Get net total again as TDS is calculated on net total
# Grand is used to just check for threshold breach
- net_total = 0
- if vouchers:
- net_total = frappe.db.get_value("Purchase Invoice", invoice_filters, "sum(net_total)")
-
- net_total += inv.net_total
+ net_total = (
+ frappe.db.get_value("Purchase Invoice", invoice_filters, "sum(tax_withholding_net_total)")
+ or 0.0
+ )
+ net_total += inv.tax_withholding_net_total
supp_credit_amt = net_total - cumulative_threshold
if ldc and is_valid_certificate(
@@ -440,7 +448,7 @@
ldc.valid_upto,
inv.get("posting_date") or inv.get("transaction_date"),
tax_deducted,
- inv.net_total,
+ inv.tax_withholding_net_total,
ldc.certificate_limit,
):
tds_amount = get_ltds_amount(supp_credit_amt, 0, ldc.certificate_limit, ldc.rate, tax_details)
@@ -523,7 +531,7 @@
limit_consumed = frappe.db.get_value(
"Purchase Invoice",
{"supplier": ("in", parties), "apply_tds": 1, "docstatus": 1},
- "sum(net_total)",
+ "sum(tax_withholding_net_total)",
)
if is_valid_certificate(
diff --git a/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py b/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py
index e80fe11..40c732b 100644
--- a/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py
+++ b/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py
@@ -186,6 +186,46 @@
for d in reversed(invoices):
d.cancel()
+ def test_tds_calculation_on_net_total_partial_tds(self):
+ frappe.db.set_value(
+ "Supplier", "Test TDS Supplier4", "tax_withholding_category", "Cumulative Threshold TDS"
+ )
+ invoices = []
+
+ pi = create_purchase_invoice(supplier="Test TDS Supplier4", rate=20000, do_not_save=True)
+ pi.extend(
+ "items",
+ [
+ {
+ "doctype": "Purchase Invoice Item",
+ "item_code": frappe.db.get_value("Item", {"item_name": "TDS Item"}, "name"),
+ "qty": 1,
+ "rate": 20000,
+ "cost_center": "Main - _TC",
+ "expense_account": "Stock Received But Not Billed - _TC",
+ "apply_tds": 0,
+ },
+ {
+ "doctype": "Purchase Invoice Item",
+ "item_code": frappe.db.get_value("Item", {"item_name": "TDS Item"}, "name"),
+ "qty": 1,
+ "rate": 35000,
+ "cost_center": "Main - _TC",
+ "expense_account": "Stock Received But Not Billed - _TC",
+ "apply_tds": 1,
+ },
+ ],
+ )
+ pi.save()
+ pi.submit()
+ invoices.append(pi)
+
+ self.assertEqual(pi.taxes[0].tax_amount, 5500)
+
+ # cancel invoices to avoid clashing
+ for d in reversed(invoices):
+ d.cancel()
+
def test_multi_category_single_supplier(self):
frappe.db.set_value(
"Supplier", "Test TDS Supplier5", "tax_withholding_category", "Test Service Category"
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 7f5dc02..b1a4ebb 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -804,15 +804,12 @@
self.set("advances", [])
advance_allocated = 0
for d in res:
- if d.against_order:
- allocated_amount = flt(d.amount)
+ if self.get("party_account_currency") == self.company_currency:
+ amount = self.get("base_rounded_total") or self.base_grand_total
else:
- if self.get("party_account_currency") == self.company_currency:
- amount = self.get("base_rounded_total") or self.base_grand_total
- else:
- amount = self.get("rounded_total") or self.grand_total
+ amount = self.get("rounded_total") or self.grand_total
- allocated_amount = min(amount - advance_allocated, d.amount)
+ allocated_amount = min(amount - advance_allocated, d.amount)
advance_allocated += flt(allocated_amount)
advance_row = {
diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py
index 04a0dfa..0054edb 100644
--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py
@@ -503,7 +503,7 @@
doctype
+ " Item": {
"doctype": doctype + " Item",
- "field_map": {"serial_no": "serial_no", "batch_no": "batch_no"},
+ "field_map": {"serial_no": "serial_no", "batch_no": "batch_no", "bom": "bom"},
"postprocess": update_item,
},
"Payment Schedule": {"doctype": "Payment Schedule", "postprocess": update_terms},
diff --git a/erpnext/controllers/subcontracting_controller.py b/erpnext/controllers/subcontracting_controller.py
index aa4468c..8d67e30 100644
--- a/erpnext/controllers/subcontracting_controller.py
+++ b/erpnext/controllers/subcontracting_controller.py
@@ -89,6 +89,9 @@
if bom.item != item.item_code:
msg = f"Please select an valid BOM for Item {item.item_name}."
frappe.throw(_(msg))
+ else:
+ msg = f"Please select a BOM for Item {item.item_name}."
+ frappe.throw(_(msg))
def __get_data_before_save(self):
item_dict = {}
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index b5836c9..81de682 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -58,12 +58,25 @@
self.initialize_taxes()
self.determine_exclusive_rate()
self.calculate_net_total()
+ self.calculate_tax_withholding_net_total()
self.calculate_taxes()
self.manipulate_grand_total_for_inclusive_tax()
self.calculate_totals()
self._cleanup()
self.calculate_total_net_weight()
+ def calculate_tax_withholding_net_total(self):
+ if hasattr(self.doc, "tax_withholding_net_total"):
+ sum_net_amount = 0
+ sum_base_net_amount = 0
+ for item in self.doc.get("items"):
+ if hasattr(item, "apply_tds") and item.apply_tds:
+ sum_net_amount += item.net_amount
+ sum_base_net_amount += item.base_net_amount
+
+ self.doc.tax_withholding_net_total = sum_net_amount
+ self.doc.base_tax_withholding_net_total = sum_base_net_amount
+
def validate_item_tax_template(self):
for item in self.doc.get("items"):
if item.item_code and item.get("item_tax_template"):
diff --git a/erpnext/controllers/tests/test_subcontracting_controller.py b/erpnext/controllers/tests/test_subcontracting_controller.py
index 8490d14..0e6fe95 100644
--- a/erpnext/controllers/tests/test_subcontracting_controller.py
+++ b/erpnext/controllers/tests/test_subcontracting_controller.py
@@ -815,6 +815,7 @@
"item_name",
"qty",
"uom",
+ "bom",
"warehouse",
"stock_uom",
"subcontracting_order",
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 6bc17a3..f9ddb12 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -1,5 +1,3 @@
-from frappe import _
-
app_name = "erpnext"
app_title = "ERPNext"
app_publisher = "Frappe Technologies Pvt. Ltd."
@@ -94,7 +92,7 @@
{
"from_route": "/orders/<path:name>",
"to_route": "order",
- "defaults": {"doctype": "Sales Order", "parents": [{"label": _("Orders"), "route": "orders"}]},
+ "defaults": {"doctype": "Sales Order", "parents": [{"label": "Orders", "route": "orders"}]},
},
{"from_route": "/invoices", "to_route": "Sales Invoice"},
{
@@ -102,7 +100,7 @@
"to_route": "order",
"defaults": {
"doctype": "Sales Invoice",
- "parents": [{"label": _("Invoices"), "route": "invoices"}],
+ "parents": [{"label": "Invoices", "route": "invoices"}],
},
},
{"from_route": "/supplier-quotations", "to_route": "Supplier Quotation"},
@@ -111,7 +109,7 @@
"to_route": "order",
"defaults": {
"doctype": "Supplier Quotation",
- "parents": [{"label": _("Supplier Quotation"), "route": "supplier-quotations"}],
+ "parents": [{"label": "Supplier Quotation", "route": "supplier-quotations"}],
},
},
{"from_route": "/purchase-orders", "to_route": "Purchase Order"},
@@ -120,7 +118,7 @@
"to_route": "order",
"defaults": {
"doctype": "Purchase Order",
- "parents": [{"label": _("Purchase Order"), "route": "purchase-orders"}],
+ "parents": [{"label": "Purchase Order", "route": "purchase-orders"}],
},
},
{"from_route": "/purchase-invoices", "to_route": "Purchase Invoice"},
@@ -129,7 +127,7 @@
"to_route": "order",
"defaults": {
"doctype": "Purchase Invoice",
- "parents": [{"label": _("Purchase Invoice"), "route": "purchase-invoices"}],
+ "parents": [{"label": "Purchase Invoice", "route": "purchase-invoices"}],
},
},
{"from_route": "/quotations", "to_route": "Quotation"},
@@ -138,7 +136,7 @@
"to_route": "order",
"defaults": {
"doctype": "Quotation",
- "parents": [{"label": _("Quotations"), "route": "quotations"}],
+ "parents": [{"label": "Quotations", "route": "quotations"}],
},
},
{"from_route": "/shipments", "to_route": "Delivery Note"},
@@ -147,7 +145,7 @@
"to_route": "order",
"defaults": {
"doctype": "Delivery Note",
- "parents": [{"label": _("Shipments"), "route": "shipments"}],
+ "parents": [{"label": "Shipments", "route": "shipments"}],
},
},
{"from_route": "/rfq", "to_route": "Request for Quotation"},
@@ -156,14 +154,14 @@
"to_route": "rfq",
"defaults": {
"doctype": "Request for Quotation",
- "parents": [{"label": _("Request for Quotation"), "route": "rfq"}],
+ "parents": [{"label": "Request for Quotation", "route": "rfq"}],
},
},
{"from_route": "/addresses", "to_route": "Address"},
{
"from_route": "/addresses/<path:name>",
"to_route": "addresses",
- "defaults": {"doctype": "Address", "parents": [{"label": _("Addresses"), "route": "addresses"}]},
+ "defaults": {"doctype": "Address", "parents": [{"label": "Addresses", "route": "addresses"}]},
},
{"from_route": "/boms", "to_route": "BOM"},
{"from_route": "/timesheets", "to_route": "Timesheet"},
@@ -173,78 +171,78 @@
"to_route": "material_request_info",
"defaults": {
"doctype": "Material Request",
- "parents": [{"label": _("Material Request"), "route": "material-requests"}],
+ "parents": [{"label": "Material Request", "route": "material-requests"}],
},
},
{"from_route": "/project", "to_route": "Project"},
]
standard_portal_menu_items = [
- {"title": _("Projects"), "route": "/project", "reference_doctype": "Project"},
+ {"title": "Projects", "route": "/project", "reference_doctype": "Project"},
{
- "title": _("Request for Quotations"),
+ "title": "Request for Quotations",
"route": "/rfq",
"reference_doctype": "Request for Quotation",
"role": "Supplier",
},
{
- "title": _("Supplier Quotation"),
+ "title": "Supplier Quotation",
"route": "/supplier-quotations",
"reference_doctype": "Supplier Quotation",
"role": "Supplier",
},
{
- "title": _("Purchase Orders"),
+ "title": "Purchase Orders",
"route": "/purchase-orders",
"reference_doctype": "Purchase Order",
"role": "Supplier",
},
{
- "title": _("Purchase Invoices"),
+ "title": "Purchase Invoices",
"route": "/purchase-invoices",
"reference_doctype": "Purchase Invoice",
"role": "Supplier",
},
{
- "title": _("Quotations"),
+ "title": "Quotations",
"route": "/quotations",
"reference_doctype": "Quotation",
"role": "Customer",
},
{
- "title": _("Orders"),
+ "title": "Orders",
"route": "/orders",
"reference_doctype": "Sales Order",
"role": "Customer",
},
{
- "title": _("Invoices"),
+ "title": "Invoices",
"route": "/invoices",
"reference_doctype": "Sales Invoice",
"role": "Customer",
},
{
- "title": _("Shipments"),
+ "title": "Shipments",
"route": "/shipments",
"reference_doctype": "Delivery Note",
"role": "Customer",
},
- {"title": _("Issues"), "route": "/issues", "reference_doctype": "Issue", "role": "Customer"},
- {"title": _("Addresses"), "route": "/addresses", "reference_doctype": "Address"},
+ {"title": "Issues", "route": "/issues", "reference_doctype": "Issue", "role": "Customer"},
+ {"title": "Addresses", "route": "/addresses", "reference_doctype": "Address"},
{
- "title": _("Timesheets"),
+ "title": "Timesheets",
"route": "/timesheets",
"reference_doctype": "Timesheet",
"role": "Customer",
},
- {"title": _("Newsletter"), "route": "/newsletters", "reference_doctype": "Newsletter"},
+ {"title": "Newsletter", "route": "/newsletters", "reference_doctype": "Newsletter"},
{
- "title": _("Material Request"),
+ "title": "Material Request",
"route": "/material-requests",
"reference_doctype": "Material Request",
"role": "Customer",
},
- {"title": _("Appointment Booking"), "route": "/book_appointment"},
+ {"title": "Appointment Booking", "route": "/book_appointment"},
]
default_roles = [
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 6a8c21f..2624181 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -317,3 +317,4 @@
erpnext.patches.v14_0.migrate_remarks_from_gl_to_payment_ledger
erpnext.patches.v13_0.update_schedule_type_in_loans
erpnext.patches.v14_0.create_accounting_dimensions_for_asset_capitalization
+erpnext.patches.v14_0.update_tds_fields
diff --git a/erpnext/patches/v14_0/update_tds_fields.py b/erpnext/patches/v14_0/update_tds_fields.py
new file mode 100644
index 0000000..a333c5d
--- /dev/null
+++ b/erpnext/patches/v14_0/update_tds_fields.py
@@ -0,0 +1,29 @@
+import frappe
+from frappe.utils import nowdate
+
+from erpnext.accounts.utils import FiscalYearError, get_fiscal_year
+
+
+def execute():
+ # Only do for current fiscal year, no need to repost for all years
+ for company in frappe.get_all("Company"):
+ try:
+ fiscal_year_details = get_fiscal_year(date=nowdate(), company=company.name, as_dict=True)
+
+ purchase_invoice = frappe.qb.DocType("Purchase Invoice")
+
+ frappe.qb.update(purchase_invoice).set(
+ purchase_invoice.tax_withholding_net_total, purchase_invoice.net_total
+ ).set(
+ purchase_invoice.base_tax_withholding_net_total, purchase_invoice.base_net_total
+ ).where(
+ purchase_invoice.company == company.name
+ ).where(
+ purchase_invoice.apply_tds == 1
+ ).where(
+ purchase_invoice.posting_date >= fiscal_year_details.year_start_date
+ ).where(
+ purchase_invoice.docstatus == 1
+ ).run()
+ except FiscalYearError:
+ pass
diff --git a/erpnext/public/js/bank_reconciliation_tool/data_table_manager.js b/erpnext/public/js/bank_reconciliation_tool/data_table_manager.js
index 5bb58fa..9ef8ce6 100644
--- a/erpnext/public/js/bank_reconciliation_tool/data_table_manager.js
+++ b/erpnext/public/js/bank_reconciliation_tool/data_table_manager.js
@@ -30,28 +30,28 @@
get_dt_columns() {
this.columns = [
{
- name: "Date",
+ name: __("Date"),
editable: false,
width: 100,
},
{
- name: "Party Type",
+ name: __("Party Type"),
editable: false,
width: 95,
},
{
- name: "Party",
+ name: __("Party"),
editable: false,
width: 100,
},
{
- name: "Description",
+ name: __("Description"),
editable: false,
width: 350,
},
{
- name: "Deposit",
+ name: __("Deposit"),
editable: false,
width: 100,
format: (value) =>
@@ -60,7 +60,7 @@
"</span>",
},
{
- name: "Withdrawal",
+ name: __("Withdrawal"),
editable: false,
width: 100,
format: (value) =>
@@ -69,26 +69,26 @@
"</span>",
},
{
- name: "Unallocated Amount",
+ name: __("Unallocated Amount"),
editable: false,
width: 100,
format: (value) =>
- "<span style='color:blue;'>" +
+ "<span style='color:var(--blue-500);'>" +
format_currency(value, this.currency) +
"</span>",
},
{
- name: "Reference Number",
+ name: __("Reference Number"),
editable: false,
width: 140,
},
{
- name: "Actions",
+ name: __("Actions"),
editable: false,
sortable: false,
focusable: false,
dropdown: false,
- width: 80,
+ width: 100,
},
];
}
@@ -118,7 +118,7 @@
row["reference_number"],
`
<Button class="btn btn-primary btn-xs center" data-name = ${row["name"]} >
- Actions
+ ${__("Actions")}
</a>
`,
];
diff --git a/erpnext/public/js/bank_reconciliation_tool/dialog_manager.js b/erpnext/public/js/bank_reconciliation_tool/dialog_manager.js
index cb34c9b..ca01f68 100644
--- a/erpnext/public/js/bank_reconciliation_tool/dialog_manager.js
+++ b/erpnext/public/js/bank_reconciliation_tool/dialog_manager.js
@@ -87,33 +87,33 @@
get_dt_columns() {
this.columns = [
{
- name: "Document Type",
+ name: __("Document Type"),
editable: false,
width: 125,
},
{
- name: "Document Name",
+ name: __("Document Name"),
editable: false,
width: 150,
},
{
- name: "Reference Date",
+ name: __("Reference Date"),
editable: false,
width: 120,
},
{
- name: "Amount",
+ name: __("Amount"),
editable: false,
width: 100,
},
{
- name: "Party",
+ name: __("Party"),
editable: false,
width: 120,
},
{
- name: "Reference Number",
+ name: __("Reference Number"),
editable: false,
width: 140,
},
@@ -222,7 +222,7 @@
{
fieldtype: "HTML",
fieldname: "no_matching_vouchers",
- options: "<div class=\"text-muted text-center\">No Matching Vouchers Found</div>"
+ options: __("<div class=\"text-muted text-center\">{0}</div>", [__("No Matching Vouchers Found")])
},
{
fieldtype: "Section Break",
@@ -444,10 +444,7 @@
vouchers: vouchers,
},
callback: (response) => {
- const alert_string =
- "Bank Transaction " +
- this.bank_transaction.name +
- " Matched";
+ const alert_string = __("Bank Transaction {0} Matched", [this.bank_transaction.name]);
frappe.show_alert(alert_string);
this.update_dt_cards(response.message);
this.dialog.hide();
@@ -471,10 +468,7 @@
cost_center: values.cost_center,
},
callback: (response) => {
- const alert_string =
- "Bank Transaction " +
- this.bank_transaction.name +
- " added as Payment Entry";
+ const alert_string = __("Bank Transaction {0} added as Payment Entry", [this.bank_transaction.name]);
frappe.show_alert(alert_string);
this.update_dt_cards(response.message);
this.dialog.hide();
@@ -498,10 +492,7 @@
second_account: values.second_account,
},
callback: (response) => {
- const alert_string =
- "Bank Transaction " +
- this.bank_transaction.name +
- " added as Journal Entry";
+ const alert_string = __("Bank Transaction {0} added as Journal Entry", [this.bank_transaction.name]);
frappe.show_alert(alert_string);
this.update_dt_cards(response.message);
this.dialog.hide();
@@ -520,10 +511,7 @@
party: values.party,
},
callback: (response) => {
- const alert_string =
- "Bank Transaction " +
- this.bank_transaction.name +
- " updated";
+ const alert_string = __("Bank Transaction {0} updated", [this.bank_transaction.name]);
frappe.show_alert(alert_string);
this.update_dt_cards(response.message);
this.dialog.hide();
diff --git a/erpnext/public/js/bank_reconciliation_tool/number_card.js b/erpnext/public/js/bank_reconciliation_tool/number_card.js
index e10d109..7e1b269 100644
--- a/erpnext/public/js/bank_reconciliation_tool/number_card.js
+++ b/erpnext/public/js/bank_reconciliation_tool/number_card.js
@@ -15,20 +15,20 @@
var chart_data = [
{
value: this.bank_statement_closing_balance,
- label: "Closing Balance as per Bank Statement",
+ label: __("Closing Balance as per Bank Statement"),
datatype: "Currency",
currency: this.currency,
},
{
value: this.cleared_balance,
- label: "Closing Balance as per ERP",
+ label: __("Closing Balance as per ERP"),
datatype: "Currency",
currency: this.currency,
},
{
value:
this.bank_statement_closing_balance - this.cleared_balance,
- label: "Difference",
+ label: __("Difference"),
datatype: "Currency",
currency: this.currency,
},
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index dd957c7..46ac808 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -341,6 +341,7 @@
this.set_dynamic_labels();
this.setup_sms();
this.setup_quality_inspection();
+ this.validate_has_items();
}
scan_barcode() {
@@ -348,6 +349,12 @@
barcode_scanner.process_scan();
}
+ validate_has_items () {
+ let table = this.frm.doc.items;
+ this.frm.has_items = (table && table.length
+ && table[0].qty && table[0].item_code);
+ }
+
apply_default_taxes() {
var me = this;
var taxes_and_charges_field = frappe.meta.get_docfield(me.frm.doc.doctype, "taxes_and_charges",
@@ -1200,7 +1207,7 @@
"base_rounding_adjustment"], company_currency);
this.frm.set_currency_labels(["total", "net_total", "total_taxes_and_charges", "discount_amount",
- "grand_total", "taxes_and_charges_added", "taxes_and_charges_deducted",
+ "grand_total", "taxes_and_charges_added", "taxes_and_charges_deducted","tax_withholding_net_total",
"rounded_total", "in_words", "paid_amount", "write_off_amount", "operating_cost",
"scrap_material_cost", "rounding_adjustment", "raw_material_cost",
"total_cost"], this.frm.doc.currency);
@@ -1217,7 +1224,7 @@
}
// toggle fields
- this.frm.toggle_display(["conversion_rate", "base_total", "base_net_total",
+ this.frm.toggle_display(["conversion_rate", "base_total", "base_net_total", "base_tax_withholding_net_total",
"base_total_taxes_and_charges", "base_taxes_and_charges_added", "base_taxes_and_charges_deducted",
"base_grand_total", "base_rounded_total", "base_in_words", "base_discount_amount",
"base_paid_amount", "base_write_off_amount", "base_operating_cost", "base_raw_material_cost",
diff --git a/erpnext/public/js/utils/barcode_scanner.js b/erpnext/public/js/utils/barcode_scanner.js
index 83b108b..a4f74bd 100644
--- a/erpnext/public/js/utils/barcode_scanner.js
+++ b/erpnext/public/js/utils/barcode_scanner.js
@@ -47,42 +47,49 @@
return;
}
- frappe
- .call({
- method: this.scan_api,
- args: {
- search_value: input,
- },
- })
- .then((r) => {
- const data = r && r.message;
- if (!data || Object.keys(data).length === 0) {
- this.show_alert(__("Cannot find Item with this Barcode"), "red");
- this.clean_up();
- this.play_fail_sound();
- reject();
- return;
- }
+ this.scan_api_call(input, (r) => {
+ const data = r && r.message;
+ if (!data || Object.keys(data).length === 0) {
+ this.show_alert(__("Cannot find Item with this Barcode"), "red");
+ this.clean_up();
+ this.play_fail_sound();
+ reject();
+ return;
+ }
- me.update_table(data).then(row => {
- this.play_success_sound();
- resolve(row);
- }).catch(() => {
- this.play_fail_sound();
- reject();
- });
+ me.update_table(data).then(row => {
+ this.play_success_sound();
+ resolve(row);
+ }).catch(() => {
+ this.play_fail_sound();
+ reject();
});
+ });
});
}
+ scan_api_call(input, callback) {
+ frappe
+ .call({
+ method: this.scan_api,
+ args: {
+ search_value: input,
+ },
+ })
+ .then((r) => {
+ callback(r);
+ });
+ }
+
update_table(data) {
return new Promise((resolve, reject) => {
let cur_grid = this.frm.fields_dict[this.items_table_name].grid;
const {item_code, barcode, batch_no, serial_no, uom} = data;
- let row = this.get_row_to_modify_on_scan(item_code, batch_no, uom);
+ let row = this.get_row_to_modify_on_scan(item_code, batch_no, uom, barcode);
+ this.is_new_row = false;
if (!row) {
if (this.dont_allow_new_row) {
this.show_alert(__("Maximum quantity scanned for item {0}.", [item_code]), "red");
@@ -90,11 +97,13 @@
reject();
return;
}
+ this.is_new_row = true;
// add new row if new item/batch is scanned
row = frappe.model.add_child(this.frm.doc, cur_grid.doctype, this.items_table_name);
// trigger any row add triggers defined on child table.
this.frm.script_manager.trigger(`${this.items_table_name}_add`, row.doctype, row.name);
+ this.frm.has_items = false;
}
if (this.is_duplicate_serial_no(row, serial_no)) {
@@ -105,7 +114,7 @@
frappe.run_serially([
() => this.set_selector_trigger_flag(data),
- () => this.set_item(row, item_code).then(qty => {
+ () => this.set_item(row, item_code, barcode, batch_no, serial_no).then(qty => {
this.show_scan_message(row.idx, row.item_code, qty);
}),
() => this.set_barcode_uom(row, uom),
@@ -136,7 +145,7 @@
frappe.flags.hide_serial_batch_dialog = false;
}
- set_item(row, item_code) {
+ set_item(row, item_code, barcode, batch_no, serial_no) {
return new Promise(resolve => {
const increment = async (value = 1) => {
const item_data = {item_code: item_code};
@@ -149,12 +158,186 @@
frappe.prompt(__("Please enter quantity for item {0}", [item_code]), ({value}) => {
increment(value).then((value) => resolve(value));
});
+ } else if (this.frm.has_items) {
+ this.prepare_item_for_scan(row, item_code, barcode, batch_no, serial_no);
} else {
increment().then((value) => resolve(value));
}
});
}
+ prepare_item_for_scan(row, item_code, barcode, batch_no, serial_no) {
+ var me = this;
+ this.dialog = new frappe.ui.Dialog({
+ title: __("Scan barcode for item {0}", [item_code]),
+ fields: me.get_fields_for_dialog(row, item_code, barcode, batch_no, serial_no),
+ })
+
+ this.dialog.set_primary_action(__("Update"), () => {
+ const item_data = {item_code: item_code};
+ item_data[this.qty_field] = this.dialog.get_value("scanned_qty");
+ item_data["has_item_scanned"] = 1;
+
+ this.remaining_qty = flt(this.dialog.get_value("qty")) - flt(this.dialog.get_value("scanned_qty"));
+ frappe.model.set_value(row.doctype, row.name, item_data);
+
+ frappe.run_serially([
+ () => this.set_batch_no(row, this.dialog.get_value("batch_no")),
+ () => this.set_barcode(row, this.dialog.get_value("barcode")),
+ () => this.set_serial_no(row, this.dialog.get_value("serial_no")),
+ () => this.add_child_for_remaining_qty(row),
+ () => this.clean_up()
+ ]);
+
+ this.dialog.hide();
+ });
+
+ this.dialog.show();
+
+ this.$scan_btn = this.dialog.$wrapper.find(".link-btn");
+ this.$scan_btn.css("display", "inline");
+ }
+
+ get_fields_for_dialog(row, item_code, barcode, batch_no, serial_no) {
+ let fields = [
+ {
+ fieldtype: "Data",
+ fieldname: "barcode_scanner",
+ options: "Barcode",
+ label: __("Scan Barcode"),
+ onchange: (e) => {
+ if (!e) {
+ return;
+ }
+
+ if (e.target.value) {
+ this.scan_api_call(e.target.value, (r) => {
+ if (r.message) {
+ this.update_dialog_values(item_code, r);
+ }
+ })
+ }
+ }
+ },
+ {
+ fieldtype: "Section Break",
+ },
+ {
+ fieldtype: "Float",
+ fieldname: "qty",
+ label: __("Quantity to Scan"),
+ default: row[this.qty_field] || 1,
+ },
+ {
+ fieldtype: "Column Break",
+ fieldname: "column_break_1",
+ },
+ {
+ fieldtype: "Float",
+ read_only: 1,
+ fieldname: "scanned_qty",
+ label: __("Scanned Quantity"),
+ default: 1,
+ },
+ {
+ fieldtype: "Section Break",
+ }
+ ]
+
+ if (batch_no) {
+ fields.push({
+ fieldtype: "Link",
+ fieldname: "batch_no",
+ options: "Batch No",
+ label: __("Batch No"),
+ default: batch_no,
+ read_only: 1,
+ hidden: 1
+ });
+ }
+
+ if (serial_no) {
+ fields.push({
+ fieldtype: "Small Text",
+ fieldname: "serial_no",
+ label: __("Serial Nos"),
+ default: serial_no,
+ read_only: 1,
+ });
+ }
+
+ if (barcode) {
+ fields.push({
+ fieldtype: "Data",
+ fieldname: "barcode",
+ options: "Barcode",
+ label: __("Barcode"),
+ default: barcode,
+ read_only: 1,
+ hidden: 1
+ });
+ }
+
+ return fields;
+ }
+
+ update_dialog_values(scanned_item, r) {
+ const {item_code, barcode, batch_no, serial_no} = r.message;
+
+ this.dialog.set_value("barcode_scanner", "");
+ if (item_code === scanned_item &&
+ (this.dialog.get_value("barcode") === barcode || batch_no || serial_no)) {
+
+ if (batch_no) {
+ this.dialog.set_value("batch_no", batch_no);
+ }
+
+ if (serial_no) {
+
+ this.validate_duplicate_serial_no(serial_no);
+ let serial_nos = this.dialog.get_value("serial_no") + "\n" + serial_no;
+ this.dialog.set_value("serial_no", serial_nos);
+ }
+
+ let qty = flt(this.dialog.get_value("scanned_qty")) + 1.0;
+ this.dialog.set_value("scanned_qty", qty);
+ }
+ }
+
+ validate_duplicate_serial_no(serial_no) {
+ let serial_nos = this.dialog.get_value("serial_no") ?
+ this.dialog.get_value("serial_no").split("\n") : [];
+
+ if (in_list(serial_nos, serial_no)) {
+ frappe.throw(__("Serial No {0} already scanned", [serial_no]));
+ }
+ }
+
+ add_child_for_remaining_qty(prev_row) {
+ if (this.remaining_qty && this.remaining_qty >0) {
+ let cur_grid = this.frm.fields_dict[this.items_table_name].grid;
+ let row = frappe.model.add_child(this.frm.doc, cur_grid.doctype, this.items_table_name);
+
+ let ignore_fields = ["name", "idx", "batch_no", "barcode",
+ "received_qty", "serial_no", "has_item_scanned"];
+
+ for (let key in prev_row) {
+ if (in_list(ignore_fields, key)) {
+ continue;
+ }
+
+ row[key] = prev_row[key];
+ }
+
+ row[this.qty_field] = this.remaining_qty;
+ if (this.qty_field == "qty" && frappe.meta.has_field(row.doctype, "stock_qty")) {
+ row["stock_qty"] = this.remaining_qty * row.conversion_factor;
+ }
+
+ this.frm.script_manager.trigger("item_code", row.doctype, row.name);
+ }
+ }
+
async set_serial_no(row, serial_no) {
if (serial_no && frappe.meta.has_field(row.doctype, this.serial_no_field)) {
const existing_serial_nos = row[this.serial_no_field];
@@ -205,7 +388,7 @@
return is_duplicate;
}
- get_row_to_modify_on_scan(item_code, batch_no, uom) {
+ get_row_to_modify_on_scan(item_code, batch_no, uom, barcode) {
let cur_grid = this.frm.fields_dict[this.items_table_name].grid;
// Check if batch is scanned and table has batch no field
@@ -214,12 +397,14 @@
const matching_row = (row) => {
const item_match = row.item_code == item_code;
- const batch_match = row[this.batch_no_field] == batch_no;
+ const batch_match = (!row[this.batch_no_field] || row[this.batch_no_field] == batch_no);
const uom_match = !uom || row[this.uom_field] == uom;
const qty_in_limit = flt(row[this.qty_field]) < flt(row[this.max_qty_field]);
+ const item_scanned = row.has_item_scanned;
return item_match
&& uom_match
+ && !item_scanned
&& (!is_batch_no_scan || batch_match)
&& (!check_max_qty || qty_in_limit)
}
diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py
index dfa341b..e777f52 100644
--- a/erpnext/selling/doctype/sales_order/test_sales_order.py
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.py
@@ -1774,6 +1774,69 @@
sales_order.save()
self.assertEqual(sales_order.taxes[0].tax_amount, 0)
+ def test_sales_order_partial_advance_payment(self):
+ from erpnext.accounts.doctype.payment_entry.test_payment_entry import (
+ create_payment_entry,
+ get_payment_entry,
+ )
+ from erpnext.selling.doctype.customer.test_customer import get_customer_dict
+
+ # Make a customer
+ customer = get_customer_dict("QA Logistics")
+ frappe.get_doc(customer).insert()
+
+ # Make a Sales Order
+ so = make_sales_order(
+ customer="QA Logistics",
+ item_list=[
+ {"item_code": "_Test Item", "qty": 1, "rate": 200},
+ {"item_code": "_Test Item 2", "qty": 1, "rate": 300},
+ ],
+ )
+
+ # Create a advance payment against that Sales Order
+ pe = get_payment_entry("Sales Order", so.name, bank_account="_Test Bank - _TC")
+ pe.reference_no = "1"
+ pe.reference_date = nowdate()
+ pe.paid_from_account_currency = so.currency
+ pe.paid_to_account_currency = so.currency
+ pe.source_exchange_rate = 1
+ pe.target_exchange_rate = 1
+ pe.paid_amount = so.grand_total
+ pe.save(ignore_permissions=True)
+ pe.submit()
+
+ # Make standalone advance payment entry
+ create_payment_entry(
+ payment_type="Receive",
+ party_type="Customer",
+ party="QA Logistics",
+ paid_from="Debtors - _TC",
+ paid_to="_Test Bank - _TC",
+ save=1,
+ submit=1,
+ )
+
+ si = make_sales_invoice(so.name)
+
+ item = si.get("items")[1]
+ si.remove(item)
+
+ si.allocate_advances_automatically = 1
+ si.save()
+
+ self.assertEqual(len(si.get("advances")), 1)
+ self.assertEqual(si.get("advances")[0].allocated_amount, 200)
+ self.assertEqual(si.get("advances")[0].reference_name, pe.name)
+
+ si.submit()
+ pe.load_from_db()
+
+ self.assertEqual(pe.references[0].reference_name, si.name)
+ self.assertEqual(pe.references[0].allocated_amount, 200)
+ self.assertEqual(pe.references[1].reference_name, so.name)
+ self.assertEqual(pe.references[1].allocated_amount, 300)
+
def automatically_fetch_payment_terms(enable=1):
accounts_settings = frappe.get_doc("Accounts Settings")
diff --git a/erpnext/selling/page/point_of_sale/pos_controller.js b/erpnext/selling/page/point_of_sale/pos_controller.js
index 24375d8..595b919 100644
--- a/erpnext/selling/page/point_of_sale/pos_controller.js
+++ b/erpnext/selling/page/point_of_sale/pos_controller.js
@@ -67,7 +67,7 @@
{
fieldtype: 'Link', label: __('POS Profile'),
options: 'POS Profile', fieldname: 'pos_profile', reqd: 1,
- get_query: () => pos_profile_query,
+ get_query: () => pos_profile_query(),
onchange: () => fetch_pos_payment_methods()
},
{
@@ -101,9 +101,11 @@
primary_action_label: __('Submit')
});
dialog.show();
- const pos_profile_query = {
- query: 'erpnext.accounts.doctype.pos_profile.pos_profile.pos_profile_query',
- filters: { company: dialog.fields_dict.company.get_value() }
+ const pos_profile_query = () => {
+ return {
+ query: 'erpnext.accounts.doctype.pos_profile.pos_profile.pos_profile_query',
+ filters: { company: dialog.fields_dict.company.get_value() }
+ }
};
}
diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
index 77c3253..3229463 100644
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -8,6 +8,7 @@
"engine": "InnoDB",
"field_order": [
"barcode",
+ "has_item_scanned",
"item_code",
"item_name",
"col_break1",
@@ -809,13 +810,21 @@
"label": "Purchase Order Item",
"print_hide": 1,
"read_only": 1
+ },
+ {
+ "default": "0",
+ "depends_on": "barcode",
+ "fieldname": "has_item_scanned",
+ "fieldtype": "Check",
+ "label": "Has Item Scanned",
+ "read_only": 1
}
],
"idx": 1,
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2022-10-26 16:05:17.720768",
+ "modified": "2022-11-02 12:54:07.225623",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note Item",
diff --git a/erpnext/stock/doctype/pick_list/pick_list.py b/erpnext/stock/doctype/pick_list/pick_list.py
index 9c1c7e5..5de7fed 100644
--- a/erpnext/stock/doctype/pick_list/pick_list.py
+++ b/erpnext/stock/doctype/pick_list/pick_list.py
@@ -10,6 +10,8 @@
from frappe import _
from frappe.model.document import Document
from frappe.model.mapper import map_child_doc
+from frappe.query_builder import Case
+from frappe.query_builder.functions import Locate
from frappe.utils import cint, floor, flt, today
from frappe.utils.nestedset import get_descendants_of
@@ -686,31 +688,22 @@
@frappe.whitelist()
def get_pending_work_orders(doctype, txt, searchfield, start, page_length, filters, as_dict):
- return frappe.db.sql(
- """
- SELECT
- `name`, `company`, `planned_start_date`
- FROM
- `tabWork Order`
- WHERE
- `status` not in ('Completed', 'Stopped')
- AND `qty` > `material_transferred_for_manufacturing`
- AND `docstatus` = 1
- AND `company` = %(company)s
- AND `name` like %(txt)s
- ORDER BY
- (case when locate(%(_txt)s, name) > 0 then locate(%(_txt)s, name) else 99999 end) name
- LIMIT
- %(start)s, %(page_length)s""",
- {
- "txt": "%%%s%%" % txt,
- "_txt": txt.replace("%", ""),
- "start": start,
- "page_length": frappe.utils.cint(page_length),
- "company": filters.get("company"),
- },
- as_dict=as_dict,
- )
+ wo = frappe.qb.DocType("Work Order")
+ return (
+ frappe.qb.from_(wo)
+ .select(wo.name, wo.company, wo.planned_start_date)
+ .where(
+ (wo.status.notin(["Completed", "Stopped"]))
+ & (wo.qty > wo.material_transferred_for_manufacturing)
+ & (wo.docstatus == 1)
+ & (wo.company == filters.get("company"))
+ & (wo.name.like("%{0}%".format(txt)))
+ )
+ .orderby(Case().when(Locate(txt, wo.name) > 0, Locate(txt, wo.name)).else_(99999))
+ .orderby(wo.name)
+ .limit(cint(page_length))
+ .offset(start)
+ ).run(as_dict=as_dict)
@frappe.whitelist()
diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
index 474ee92..557bb59 100644
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -8,6 +8,7 @@
"engine": "InnoDB",
"field_order": [
"barcode",
+ "has_item_scanned",
"section_break_2",
"item_code",
"product_bundle",
@@ -996,12 +997,20 @@
{
"fieldname": "column_break_102",
"fieldtype": "Column Break"
+ },
+ {
+ "default": "0",
+ "depends_on": "barcode",
+ "fieldname": "has_item_scanned",
+ "fieldtype": "Check",
+ "label": "Has Item Scanned",
+ "read_only": 1
}
],
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2022-10-26 16:06:02.524435",
+ "modified": "2022-11-02 12:49:28.746701",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt Item",
diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
index 5fe11a2..95f4f5f 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -8,6 +8,7 @@
"engine": "InnoDB",
"field_order": [
"barcode",
+ "has_item_scanned",
"section_break_2",
"s_warehouse",
"col_break1",
@@ -498,14 +499,14 @@
"read_only": 1
},
{
- "fieldname": "sco_rm_detail",
- "fieldtype": "Data",
- "hidden": 1,
- "label": "SCO Supplied Item",
- "no_copy": 1,
- "print_hide": 1,
- "read_only": 1
- },
+ "fieldname": "sco_rm_detail",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "SCO Supplied Item",
+ "no_copy": 1,
+ "print_hide": 1,
+ "read_only": 1
+ },
{
"default": "0",
"depends_on": "eval:parent.purpose===\"Repack\" && doc.t_warehouse",
@@ -563,13 +564,21 @@
"fieldname": "is_process_loss",
"fieldtype": "Check",
"label": "Is Process Loss"
+ },
+ {
+ "default": "0",
+ "depends_on": "barcode",
+ "fieldname": "has_item_scanned",
+ "fieldtype": "Check",
+ "label": "Has Item Scanned",
+ "read_only": 1
}
],
"idx": 1,
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2022-06-17 05:06:33.621264",
+ "modified": "2022-11-02 13:00:34.258828",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Entry Detail",
diff --git a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
index 79c2fcc..7c3e151 100644
--- a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
+++ b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
@@ -7,6 +7,7 @@
"engine": "InnoDB",
"field_order": [
"barcode",
+ "has_item_scanned",
"item_code",
"item_name",
"warehouse",
@@ -177,11 +178,18 @@
"label": "Allow Zero Valuation Rate",
"print_hide": 1,
"read_only": 1
+ },
+ {
+ "depends_on": "barcode",
+ "fieldname": "has_item_scanned",
+ "fieldtype": "Data",
+ "label": "Has Item Scanned",
+ "read_only": 1
}
],
"istable": 1,
"links": [],
- "modified": "2022-04-02 04:19:40.380587",
+ "modified": "2022-11-02 13:01:23.580937",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Reconciliation Item",
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
index cd05b74..bce5360 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
@@ -57,6 +57,7 @@
def before_validate(self):
super(SubcontractingReceipt, self).before_validate()
+ self.set_items_bom()
self.set_items_cost_center()
self.set_items_expense_account()
@@ -193,6 +194,24 @@
).format(item.idx)
)
+ def set_items_bom(self):
+ if self.is_return:
+ for item in self.items:
+ if not item.bom:
+ item.bom = frappe.db.get_value(
+ "Subcontracting Receipt Item",
+ {"name": item.subcontracting_receipt_item, "parent": self.return_against},
+ "bom",
+ )
+ else:
+ for item in self.items:
+ if not item.bom:
+ item.bom = frappe.db.get_value(
+ "Subcontracting Order Item",
+ {"name": item.subcontracting_order_item, "parent": item.subcontracting_order},
+ "bom",
+ )
+
def set_items_cost_center(self):
if self.company:
cost_center = frappe.get_cached_value("Company", self.company, "cost_center")
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
index 090f145..34e7842 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
@@ -327,7 +327,7 @@
for row in scr.supplied_items:
self.assertEqual(transferred_batch.get(row.batch_no), row.consumed_qty)
- def test_subcontracting_order_partial_return(self):
+ def test_subcontracting_receipt_partial_return(self):
sco = get_subcontracting_order()
rm_items = get_rm_items(sco.supplied_items)
itemwise_details = make_stock_in_entry(rm_items=rm_items)
@@ -343,15 +343,17 @@
scr1_return = make_return_subcontracting_receipt(scr_name=scr1.name, qty=-3)
scr1.load_from_db()
self.assertEqual(scr1_return.status, "Return")
+ self.assertIsNotNone(scr1_return.items[0].bom)
self.assertEqual(scr1.items[0].returned_qty, 3)
scr2_return = make_return_subcontracting_receipt(scr_name=scr1.name, qty=-7)
scr1.load_from_db()
self.assertEqual(scr2_return.status, "Return")
+ self.assertIsNotNone(scr2_return.items[0].bom)
self.assertEqual(scr1.status, "Return Issued")
self.assertEqual(scr1.items[0].returned_qty, 10)
- def test_subcontracting_order_over_return(self):
+ def test_subcontracting_receipt_over_return(self):
sco = get_subcontracting_order()
rm_items = get_rm_items(sco.supplied_items)
itemwise_details = make_stock_in_entry(rm_items=rm_items)
@@ -402,8 +404,8 @@
"stock_value_difference",
)
- # Service Cost(100 * 10) + Raw Materials Cost(50 * 10) + Additional Costs(100) = 1600
- self.assertEqual(stock_value_difference, 1600)
+ # Service Cost(100 * 10) + Raw Materials Cost(100 * 10) + Additional Costs(10 * 10) = 2100
+ self.assertEqual(stock_value_difference, 2100)
self.assertFalse(get_gl_entries("Subcontracting Receipt", scr.name))
def test_subcontracting_receipt_gl_entry(self):