Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
Tia-dev
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dida Adams Arizona
Tia-dev
Commits
dd8358c9
Commit
dd8358c9
authored
Apr 15, 2026
by
ardiansyah
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT'
tambah parameter master_report_type_id di cf mb See merge request
!2418
parents
f01c2b5f
c19bc168
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
BudgetTahunan.js
src/container/BudgetTahunan/BudgetTahunan.js
+8
-0
CashFlow.js
src/container/BudgetTahunan/CashFlow.js
+2
-1
No files found.
src/container/BudgetTahunan/BudgetTahunan.js
View file @
dd8358c9
...
...
@@ -2770,6 +2770,13 @@ export default class BudgetTahunan extends Component {
return
tableKey
===
'CAT'
?
lastStatusCat
:
lastStatus
}
getActiveMasterReportTypeId
=
()
=>
{
const
{
tableKey
,
rowDataFinance
,
rowDataCAT
}
=
this
.
state
const
mstIdFinance
=
rowDataFinance
?.
length
>
0
&&
rowDataFinance
[
0
]?.
master_report_type_id
const
mstIdCAT
=
rowDataCAT
?.
length
>
0
&&
rowDataCAT
[
0
]?.
master_report_type_id
return
tableKey
===
'CAT'
?
mstIdCAT
:
mstIdFinance
}
getSubmissionObj
=
(
tableKeyParam
)
=>
{
const
{
tableKey
,
...
...
@@ -3782,6 +3789,7 @@ export default class BudgetTahunan extends Component {
// PLBSFAMSubmitted={false}
PLBSFAMSubmitted
=
{
this
.
getLastStatus
()
===
'APPROVED'
?
true
:
false
}
createCashFlow
=
{
this
.
createCashFlow
.
bind
(
this
)}
master_report_type_id
=
{
this
.
getActiveMasterReportTypeId
()}
/
>
)
}
...
...
src/container/BudgetTahunan/CashFlow.js
View file @
dd8358c9
...
...
@@ -421,7 +421,8 @@ export default class CashFlow extends Component {
"report_id"
:
6
,
"currency_id"
:
this
.
props
.
defaultCurrency
.
id
,
"status"
:
"submitted"
,
"cash_flow"
:
dbcf
"cash_flow"
:
dbcf
,
"master_report_type_id"
:
this
.
props
?.
master_report_type_id
}
console
.
log
(
dbcf
)
console
.
log
(
JSON
.
stringify
(
payload
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment