accounting/books
2
0
Fork 0
mirror of https://github.com/frappe/books.git synced 2024-11-10 07:40:55 +00:00
Code Issues Releases Activity

fix: issue where setup currency is not considered

Browse Source
This commit is contained in:
18alantom 2022-02-26 12:52:07 +05:30
parent 8ab7356701
commit 0702ce383f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pages/SetupWizard/setupCompany.js
View File

@ -2,10 +2,10 @@ import config from '@/config';
import frappe from 'frappe'; import frappe from 'frappe';
import { DEFAULT_LOCALE } from 'frappe/utils/consts'; import { DEFAULT_LOCALE } from 'frappe/utils/consts';
import countryList from '~/fixtures/countryInfo.json'; import countryList from '~/fixtures/countryInfo.json';
import importCharts from '../../../accounting/importCOA';
import generateTaxes from '../../../models/doctype/Tax/RegionalEntries'; import generateTaxes from '../../../models/doctype/Tax/RegionalEntries';
import regionalModelUpdates from '../../../models/regionalModelUpdates'; import regionalModelUpdates from '../../../models/regionalModelUpdates';
import { callInitializeMoneyMaker } from '../../utils'; import { callInitializeMoneyMaker } from '../../utils';
import importCharts from '../../../accounting/importCOA';
export default async function setupCompany(setupWizardValues) { export default async function setupCompany(setupWizardValues) {
const { const {
@ -15,13 +15,14 @@ export default async function setupCompany(setupWizardValues) {
name, name,
email, email,
bankName, bankName,
currency: companyCurrency,
fiscalYearStart, fiscalYearStart,
fiscalYearEnd, fiscalYearEnd,
chartOfAccounts, chartOfAccounts,
} = setupWizardValues; } = setupWizardValues;
const accountingSettings = frappe.AccountingSettings; const accountingSettings = frappe.AccountingSettings;
const currency = countryList[country]['currency']; const currency = companyCurrency || countryList[country]['currency'];
const locale = countryList[country]['locale'] ?? DEFAULT_LOCALE; const locale = countryList[country]['locale'] ?? DEFAULT_LOCALE;
await callInitializeMoneyMaker(currency); await callInitializeMoneyMaker(currency);