mirror of
https://github.com/frappe/books.git
synced 2024-11-10 07:40:55 +00:00
Merge branch 'feature/gstr1-b2c' of github.com:ankitsinghaniyaz/books into feature/gstr1-b2c
This commit is contained in:
commit
39bad5bd83
@ -1,6 +1,6 @@
|
||||
import { showMessageDialog } from '@/utils';
|
||||
import frappe from 'frappejs';
|
||||
import { sleep, _ } from 'frappejs/utils';
|
||||
import { _ } from 'frappejs/utils';
|
||||
import { DateTime } from 'luxon';
|
||||
import { saveExportData } from '../reports/commonExporter';
|
||||
import { getSavePath } from '../src/utils';
|
||||
@ -120,7 +120,6 @@ export async function generateGstr1Json(getReportData) {
|
||||
gstData.b2cs = await generateB2csData(rows);
|
||||
}
|
||||
|
||||
await sleep(1);
|
||||
const jsonData = JSON.stringify(gstData);
|
||||
await saveExportData(jsonData, filePath);
|
||||
}
|
||||
|
@ -16,9 +16,9 @@ export default function getAugmentedAddress({ country }) {
|
||||
...Address.fields.slice(0, cityFieldIndex + 1),
|
||||
{
|
||||
fieldname: 'state',
|
||||
label: 'State',
|
||||
label: 'State / UT',
|
||||
fieldtype: 'Select',
|
||||
placeholder: 'State',
|
||||
placeholder: 'State / UT',
|
||||
options: Object.keys(stateCodeMap).map((key) => capitalize(key)),
|
||||
},
|
||||
...Address.fields.slice(cityFieldIndex + 1, Address.fields.length),
|
||||
|
@ -31,6 +31,7 @@
|
||||
v-for="option in options"
|
||||
:key="option.value"
|
||||
:value="option.value"
|
||||
class="text-black"
|
||||
>
|
||||
{{ option.label }}
|
||||
</option>
|
||||
|
Loading…
Reference in New Issue
Block a user