accounting/books
2
0
Fork 0
mirror of https://github.com/frappe/books.git synced 2025-02-13 01:18:37 +00:00
Code Issues Releases Activity

Merge pull request #32 from piyushsinghania/feature/gstr1-b2c

Browse Source 
Fixed dropdown CSS, removed sleep, renamed state label for India
This commit is contained in:
Ankit Singhaniya 2021-12-28 20:35:10 +05:30 committed by GitHub
commit efcee2a1a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
accounting/gst.js
View File

@ -1,6 +1,6 @@
import { showMessageDialog } from '@/utils'; import { showMessageDialog } from '@/utils';
import frappe from 'frappejs'; import frappe from 'frappejs';
import { sleep, _ } from 'frappejs/utils'; import { _ } from 'frappejs/utils';
import { DateTime } from 'luxon'; import { DateTime } from 'luxon';
import { saveExportData } from '../reports/commonExporter'; import { saveExportData } from '../reports/commonExporter';
import { getSavePath } from '../src/utils'; import { getSavePath } from '../src/utils';
@ -120,7 +120,6 @@ export async function generateGstr1Json(getReportData) {
gstData.b2cs = await generateB2csData(rows); gstData.b2cs = await generateB2csData(rows);
} }
await sleep(1);
const jsonData = JSON.stringify(gstData); const jsonData = JSON.stringify(gstData);
await saveExportData(jsonData, filePath); await saveExportData(jsonData, filePath);
} }

4
models/doctype/Address/RegionalChanges.js
View File

@ -16,9 +16,9 @@ export default function getAugmentedAddress({ country }) {
...Address.fields.slice(0, cityFieldIndex + 1), ...Address.fields.slice(0, cityFieldIndex + 1),
{ {
fieldname: 'state', fieldname: 'state',
label: 'State', label: 'State / UT',
fieldtype: 'Select', fieldtype: 'Select',
placeholder: 'State', placeholder: 'State / UT',
options: Object.keys(stateCodeMap).map((key) => capitalize(key)), options: Object.keys(stateCodeMap).map((key) => capitalize(key)),
}, },
...Address.fields.slice(cityFieldIndex + 1, Address.fields.length), ...Address.fields.slice(cityFieldIndex + 1, Address.fields.length),

1
src/components/Controls/Select.vue
View File

@ -31,6 +31,7 @@
v-for="option in options" v-for="option in options"
:key="option.value" :key="option.value"
:value="option.value" :value="option.value"
class="text-black"
> >
{{ option.label }} {{ option.label }}
</option> </option>