From ad1f6783b55f7fa1ba17fadf15ce76b63a456db6 Mon Sep 17 00:00:00 2001 From: Ali <010109ali@gmail.com> Date: Thu, 26 Mar 2026 17:35:31 +0400 Subject: [PATCH] use account_number instead of account_name for company defaults export/import Co-Authored-By: Claude Sonnet 4.6 --- jey_erp/custom/company_export.py | 6 +++--- jey_erp/default_data/company_defaults.json | 16 +++++++++------- jey_erp/setup/setup_wizard_handler.py | 4 ++-- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/jey_erp/custom/company_export.py b/jey_erp/custom/company_export.py index 64191c4..0c60b59 100644 --- a/jey_erp/custom/company_export.py +++ b/jey_erp/custom/company_export.py @@ -51,8 +51,8 @@ def export_company_defaults(): for fieldname in ACCOUNT_FIELDS: full_account = doc.get(fieldname) if full_account: - account_name = frappe.db.get_value("Account", full_account, "account_name") - if account_name: - result[fieldname] = account_name + account_number = frappe.db.get_value("Account", full_account, "account_number") + if account_number: + result[fieldname] = account_number return result diff --git a/jey_erp/default_data/company_defaults.json b/jey_erp/default_data/company_defaults.json index d2db4f7..f706324 100644 --- a/jey_erp/default_data/company_defaults.json +++ b/jey_erp/default_data/company_defaults.json @@ -1,9 +1,11 @@ { - "default_bank_account": "Depozit hesablar", - "default_cash_account": "Pul vəsaitlərinin ekvivalentləri", - "default_receivable_account": "Verilmiş qısamüddətli borclar", - "default_payable_account": "Digər qısamüddətli kreditor borcları", - "default_expense_account": "Satışın digər maya dəyəri xərcləri", - "default_income_account": "Satış", - "default_inventory_account": "Digər ehtiyatlar" + "default_bank_account": "224.3", + "default_cash_account": "225", + "default_receivable_account": "233", + "default_payable_account": "538", + "default_expense_account": "701.5", + "default_income_account": "601", + "default_inventory_account": "207", + "accumulated_depreciation_account": "235", + "capital_work_in_progress_account": "123.2" } diff --git a/jey_erp/setup/setup_wizard_handler.py b/jey_erp/setup/setup_wizard_handler.py index df87e9d..5aebdea 100644 --- a/jey_erp/setup/setup_wizard_handler.py +++ b/jey_erp/setup/setup_wizard_handler.py @@ -102,9 +102,9 @@ def create_default_company_accounts(args): doc = frappe.get_doc("Company", company) updated = False - for fieldname, account_name in defaults.items(): + for fieldname, account_number in defaults.items(): full_account = frappe.db.get_value( - "Account", {"account_name": account_name, "company": company}, "name" + "Account", {"account_number": account_number, "company": company}, "name" ) if full_account: doc.set(fieldname, full_account)