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

- feat: Update react-query package to V 2.1.1.

Browse Source 
- feat: Favicon setup.
- feat: Fix accounts inactivate/activate 1 account.
- feat: Seed accounts, expenses and manual journals resource fields.
- feat: Validate make journal receivable/payable without contact.
- feat: Validate make journal contact without receivable or payable.
- feat: More components abstractions.
- feat: Use reselect.js to memorize components properties.
- fix: Journal type of manual journal.
- fix: Sidebar style optimization.
- fix: Data-table check-box style optimization.
- fix: Data-table spinner style dimensions.
- fix: Submit journal with contact_id and contact_type.
This commit is contained in:
Ahmed Bouhuolia
2020-07-01 12:51:12 +02:00
parent 111aa83908
commit 4718f63c94
94 changed files with 1706 additions and 1001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/database/migrations/20190822214304_create_accounts_table.js
View File

@@ -3,8 +3,8 @@ exports.up = function (knex) {
return knex.schema.createTable('accounts', (table) => {
table.bigIncrements('id').comment('Auto-generated id');;
table.string('name');
table.integer('account_type_id');
table.integer('parent_account_id');
table.integer('account_type_id').unsigned();
table.integer('parent_account_id').unsigned();
table.string('code', 10);
table.text('description');
table.boolean('active').defaultTo(true);

2
server/src/database/migrations/20200105195823_create_manual_journals_table.js
View File

@@ -4,7 +4,7 @@ exports.up = function(knex) {
table.increments();
table.string('journal_number');
table.string('reference');
table.string('transaction_type');
table.string('journal_type');
table.decimal('amount');
table.date('date');
table.boolean('status').defaultTo(false);

202
server/src/database/seeds/seed_resources_fields.js
View File

@@ -68,40 +68,189 @@ exports.seed = (knex) => {
predefined: 1,
columnable: true,
},
{
id: 31,
resource_id: 1,
data_type: 'numeric',
label_name: 'Balance',
key: 'balance',
predefined: 1,
columnable: true,
},
{
id: 32,
resource_id: 1,
data_type: 'options',
label_name: 'Currency',
key: 'currency',
predefined: 1,
columnable: true,
data_resource: 'currencies',
},
{
id: 33,
resource_id: 1,
data_type: 'options',
label_name: 'Normal',
key: 'normal',
predefined: 1,
columnable: true,
options: JSON.stringify([
{ key: 'credit', label: 'Credit' },
{ key: 'debit', label: 'Debit' },
])
},
// Manual Journals
{
id: 18,
resource_id: 4,
data_type: 'date',
label_name: 'Date',
key: 'date',
predefined: 1,
columnable: true,
},
{
id: 19,
resource_id: 4,
data_type: 'date',
label_name: 'Created At',
key: 'created_at',
predefined: 1,
columnable: true,
},
{
id: 20,
resource_id: 4,
data_type: 'textbox',
label_name: 'Journal Number',
key: 'journal_number',
predefined: 1,
columnable: true,
},
{
id: 21,
resource_id: 4,
data_type: 'boolean',
label_name: 'Active',
key: 'status',
predefined: 1,
columnable: true,
},
{
id: 22,
resource_id: 4,
data_type: 'textbox',
label_name: 'Reference',
key: 'reference',
predefined: 1,
columnable: true,
},
{
id: 23,
resource_id: 4,
data_type: 'textbox',
label_name: 'Description',
key: 'description',
predefined: 1,
columnable: true,
},
{
id: 24,
resource_id: 4,
data_type: 'numeric',
label_name: 'Amount',
key: 'amount',
predefined: 1,
columnable: true,
},
{
id: 25,
resource_id: 4,
data_type: 'optons',
label_name: 'User',
key: 'user',
predefined: 1,
columnable: true,
data_resource: 'users',
},
{
id: 26,
resource_id: 4,
data_type: 'textbox',
label_name: 'Journal Type',
key: 'journal_type',
predefined: 1,
columnable: true,
},
// Expenses
{
id: 7,
resource_id: 3,
label_name: 'Date',
label_name: 'Payment Date',
key: 'payment_date',
data_type: 'date',
predefined: 1,
columnable: true,
},
{
id: 8,
resource_id: 3,
label_name: 'Expense Account',
data_type: 'options',
predefined: 1,
columnable: true,
columnable: true,
},
{
id: 9,
resource_id: 3,
key: 'payment_account',
label_name: 'Payment Account',
data_type: 'options',
predefined: 1,
columnable: true,
data_resource: 'accounts',
},
{
id: 10,
resource_id: 3,
key: 'total_amount',
label_name: 'Amount',
data_type: 'number',
data_type: 'numeric',
predefined: 1,
columnable: true,
},
{
id: 27,
resource_id: 3,
label_name: 'Reference No.',
key: 'reference_no',
data_type: 'textbox',
predefined: 1,
columnable: true,
},
{
id: 28,
resource_id: 3,
key: 'description',
label_name: 'Description',
data_type: 'textbox',
predefined: 1,
columnable: true,
},
{
id: 29,
resource_id: 3,
key: 'published',
label_name: 'Published',
data_type: 'checkbox',
predefined: 1,
columnable: true,
},
{
id: 30,
resource_id: 3,
key: 'user',
data_type: 'options',
label_name: 'User',
predefined: 1,
columnable: true,
data_resource: 'users',
},
// Items
{
@@ -113,7 +262,7 @@ exports.seed = (knex) => {
predefined: 1,
columnable: true,
},
{
{
id: 12,
resource_id: 2,
label_name: 'Type',
@@ -122,35 +271,6 @@ exports.seed = (knex) => {
predefined: 1,
columnable: true,
},
// Manual Journals
{
id: 13,
resource_id: 4,
label_name: 'Transaction type',
key: 'transaction_key',
data_type: 'textbox',
predefined: 1,
columnable: true,
},
{
id: 14,
resource_id: 4,
label_name: 'Amount',
key: 'amount',
data_type: 'textbox',
predefined: 1,
columnable: true,
},
{
id: 15,
resource_id: 4,
label_name: 'Journal No.',
key: 'journal_number',
data_type: 'textbox',
predefined: 1,
columnable: true,
},
]);
});
};

5
server/src/database/seeds/seed_views.js
View File

@@ -22,6 +22,11 @@ exports.seed = (knex) => {
{ id: 9, name: 'Journal', roles_logic_expression: '1', resource_id: 4, predefined: true },
{ id: 10, name: 'Credit', roles_logic_expression: '1', resource_id: 4, predefined: true },
{ id: 11, name: 'Reconciliation', roles_logic_expression: '1', resource_id: 4, predefined: true },
// Expenses
{ id: 12, name: 'Interest', roles_logic_expression: '1', resource_id: 3, predefined: false, },
{ id: 13, name: 'Depreciation', roles_logic_expression: '1', resource_id: 3, predefined: false, },
{ id: 14, name: 'Payroll', roles_logic_expression: '1', resource_id: '3', predefined: false },
]);
});
};

9
server/src/database/seeds/seed_views_roles.js
View File

@@ -18,9 +18,12 @@ exports.seed = (knex) => {
{ id: 8, field_id: 12, index: 1, comparator: 'equals', value: 'non-inventory', view_id: 8 },
// Manual Journals
{ id: 9, field_id: 13, index: 1, comparator: 'equals', value: 'Journal', view_id: 9 },
{ id: 10, field_id: 13, index: 1, comparator: 'equals', value: 'CreditNote', view_id: 10 },
{ id: 11, field_id: 13, index: 1, comparator: 'equals', value: 'Reconciliation', view_id: 11 },
{ id: 9, field_id: 26, index: 1, comparator: 'equals', value: 'Journal', view_id: 9 },
{ id: 10, field_id: 26, index: 1, comparator: 'equals', value: 'CreditNote', view_id: 10 },
{ id: 11, field_id: 26, index: 1, comparator: 'equals', value: 'Reconciliation', view_id: 11 },
// Expenses
// { id: 12, field_id: index: }
]);
});
};