Skip to content

T
Tia-dev
Commit d11e494c authored by Riri Novita's avatar Riri Novita
Browse files
Options

Merge branch 'dev/riri' into 'ENV-DEV' 

mabok

See merge request !2016
parents 1f8f36e2 c6d8e226
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2353 additions and 4778 deletions
src/container/BudgetTahunan/BalanceSheet.js
View file @ d11e494c
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/BudgetTahunan/CashFlow.js
View file @ d11e494c
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/BudgetTahunan/TaxPlanning.js
View file @ d11e494c
This diff is collapsed.
src/container/MonthlyReport/TaxPlanningMR.js
View file @ d11e494c
......@@ -882,12 +882,16 @@ export default class TaxPlanningMR extends Component {
console.log(dataTable2)
}
const handleTotal = (value, tableMeta, dex) => {
// console.log(tableMeta)
let total = 0
dataTable2[tableMeta.rowIndex].map((item, index) => {
if (index == 9) {
let valItemTBF = item.tbf == undefined || item.tbf == "" || item.tbf == "undefined" ? 0.0 : item.tbf
total = Number(tableMeta.rowData[16]) + Number(valItemTBF)
if (tableMeta.rowData[8] == "Revenue") {
console.log(valItemTBF);
console.log(Number(tableMeta.rowData[16]));
console.log(total);
}
}
})
......@@ -897,7 +901,7 @@ export default class TaxPlanningMR extends Component {
const handleParent = (tableMeta, type) => {
let total = 0
console.log("tes parent");
// console.log("tes parent");
dataTable2.map((item, index) => {
if (item[5] == tableMeta.rowData[4]) {
total += Number(type == 1 ?
......@@ -1443,7 +1447,7 @@ export default class TaxPlanningMR extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[16]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(handleTotal(value, tableMeta, 4)), 2) : fixNumber(Number(handleTotal(value, tableMeta, 4)), 1)) : (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(handleTotal(value, tableMeta, 4)) : Number(handleTotal(value, tableMeta, 4)))}
value={this.props.defaultCurrency.id == 1 ? (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(handleTotal(value, tableMeta, 4)), 2) : fixNumber(Number(handleTotal(value, tableMeta, 4)), 1)) : (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(handleTotal(value, tableMeta, 4)) : Number(handleTotal(value, tableMeta, 4)))}
/>
}
/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment