Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(journal): preserve trans_id_reference_number #3537

Merged
merged 1 commit into from
Jan 10, 2019
Merged

fix(journal): preserve trans_id_reference_number #3537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client/src/modules/journal/modals/editTransaction.modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,7 @@ function JournalEditTransactionController(
const columns = [
'hrRecord', 'record_uuid', 'project_name', 'trans_id', 'transaction_type_id', 'display_name', 'trans_date',
'project_id', 'fiscal_year_id', 'currency_id', 'user_id', 'posted', 'period_id', 'description',
'trans_id_reference_number',
];

// for some reason no data has been passed in, no shared attributes are possible
Expand Down
2 changes: 1 addition & 1 deletion server/controllers/finance/journal/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ function buildTransactionQuery(options, posted) {
BUID(p.reference_uuid) AS reference_uuid, dm2.text AS hrReference,
p.comment, p.transaction_type_id, p.user_id, p.cc_id, p.pc_id, pro.abbr,
pro.name AS project_name, tp.text AS transaction_type_text,
a.number AS account_number, a.label AS account_label,
a.number AS account_number, a.label AS account_label, p.trans_id_reference_number,
u.display_name ${includeExchangeRate}
FROM ${table} p
JOIN project pro ON pro.id = p.project_id
Expand Down