QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-16 04:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: conflict merge.

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2020-10-25 18:34:07 +02:00
parent 426f9fcf55
commit fb7686bfdd
18 changed files with 283 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
server/src/data/options.js
View File

@@ -1,58 +1,66 @@
export default {
organization: [
{
key: 'name',
type: 'string',
key: "name",
type: "string",
config: true,
},
{
key: 'base_currency',
type: 'string',
key: "base_currency",
type: "string",
config: true,
},
{
key: 'industry',
type: 'string',
key: "industry",
type: "string",
},
{
key: 'location',
type: 'string',
key: "location",
type: "string",
},
{
key: 'fiscal_year',
type: 'string',
key: "fiscal_year",
type: "string",
// config: true,
},
{
key: 'financial_date_start',
type: 'string',
key: "financial_date_start",
type: "string",
},
{
key: 'language',
type: 'string',
key: "language",
type: "string",
config: true,
},
{
key: 'time_zone',
type: 'string',
{
key: "time_zone",
type: "string",
// config: true,
},
{
key: 'date_format',
type: 'string',
key: "date_format",
type: "string",
// config: true,
},
],
manual_journals: [
{
key: 'next_number',
type: 'number',
key: "next_number",
type: "number",
},
{
key: 'number_prefix',
type: 'string',
key: "number_prefix",
type: "string",
},
]
};
],
bills: [
{
key: "next_number",
type: "number",
},
{
key: "number_prefix",
type: "string",
},
],
};