Merge branch 'ENV-DEV' into 'ENV-STAGING'

update settingan

See merge request !2105

src/container/BudgetTahunan/BalanceSheet.js

@@ -76,7 +76,8 @@ export default class BalanceSheet extends Component {
         let body = {
             group: 'THRESHOLD_CONTROL',
             company_id: this.props.company.company_id,
-            type: 'BALANCE_SHEET'
+            type: 'BALANCE_SHEET',
+            currency_id: this.props.defaultCurrency.id,
         }
 
         api.create().getAllSettingByType(body).then(response => {

src/container/BudgetTahunan/CashFlow.js

@@ -59,7 +59,8 @@ export default class CashFlow extends Component {
         let body = {
             group: 'THRESHOLD_CONTROL',
             company_id: this.props.company.company_id,
-            type: 'CASH_FLOW'
+            type: 'CASH_FLOW',
+            currency_id: this.props.defaultCurrency.id,
         }
 
         api.create().getAllSettingByType(body).then(response => {

src/container/BudgetTahunan/ProfitLoss.js

@@ -84,7 +84,7 @@ export default class ProfitLoss extends Component {
         let body = {
             group: 'CURRENCY_MONEY_FORMAT',
             company_id: this.props.company.company_id,
-            type: this.props.defaultCurrency.value
+            type: this.props.defaultCurrency.value,
         }
         console.log(body);
 

src/container/BudgetTahunan/TaxPlanning.js

@@ -74,7 +74,8 @@ export default class TaxPlanning extends Component {
         let body = {
             group: 'THRESHOLD_CONTROL',
             company_id: this.props.company.company_id,
-            type: 'TAX_PLANNING'
+            type: 'TAX_PLANNING',
+            currency_id: this.props.defaultCurrency.id,
         }
 
         api.create().getAllSettingByType(body).then(response => {
@@ -1533,7 +1534,14 @@ export default class TaxPlanning extends Component {
                 }
             }
 
-            total = R.equals(total, NaN) ? "0.0" : total
+            if (tableMeta.rowData[8] == "Control (should be nil)") {
+                total = R.equals(total, NaN) ? "0.0" : fixNumber(Number(total), 1)
+                if (tableMeta.rowData[4] == 3163752 && tableMeta.columnIndex == 10) {
+                    console.log(total);
+                }
+            } else {
+                total = R.equals(total, NaN) ? "0.0" : total
+            }
             // if (tableMeta.rowData[8] == "Corporate Income Tax") {
             //     console.log(tableMeta.rowData[8])
             //             // console.log(splitFormula)

src/container/MonthlyReport/CorporateAnnualTargetMR.js

@@ -557,7 +557,8 @@ export default class CorporateAnnualTargetMR extends Component {
         let body = {
             group: 'CAT',
             company_id: this.props.company.company_id,
-            type: 'KPI_TYPE'
+            type: 'KPI_TYPE',
+            currency_id: this.props.defaultCurrency.id,
         }
         api.create().getAllSettingByType(body).then(response => {
             console.log(response)
@@ -602,7 +603,8 @@ export default class CorporateAnnualTargetMR extends Component {
         let body = {
             group: 'CAT',
             company_id: this.props.company.company_id,
-            type: 'MAX_ACHIEVEMENT'
+            type: 'MAX_ACHIEVEMENT',
+            currency_id: this.props.defaultCurrency.id,
         }
         api.create().getAllSettingByType(body).then(response => {
             console.log(response);

src/container/MonthlyReport/ListOfCreditFacilitiesMR.js

@@ -858,7 +858,8 @@ export default class ListOfCreditFacilities extends Component {
         let body = {
             group: 'BANK',
             company_id: this.props.company.company_id,
-            type: 'BANK_NAME'
+            type: 'BANK_NAME',
+            currency_id: this.props.defaultCurrency.id,
         }
         this.setState({ dataLoaded: false })
         api.create().getAllSettingByType(body).then(response => {
@@ -904,7 +905,8 @@ export default class ListOfCreditFacilities extends Component {
         let body = {
             group: 'BANK',
             company_id: this.props.company.company_id,
-            type: 'TYPE_OF_CREDIT'
+            type: 'TYPE_OF_CREDIT',
+            currency_id: this.props.defaultCurrency.id,
         }
         api.create().getAllSettingByType(body).then(response => {
             console.log(response)

src/container/MonthlyReport/OperatingIndicatorMR.js

@@ -142,7 +142,8 @@ export default class OperatingIndicatorMR extends Component {
         let body = {
             group: 'THRESHOLD_VARIANCE',
             company_id: this.props.company.company_id,
-            type: 'BALANCE_SHEET'
+            type: 'BALANCE_SHEET',
+            currency_id: this.props.defaultCurrency.id,
         }
 
         api.create().getAllSettingByType(body).then(response => {

src/container/MonthlyReport/ProfitLossMR.js

@@ -155,7 +155,8 @@ export default class ProfitLossMR extends Component {
         let body = {
             group: 'THRESHOLD_VARIANCE',
             company_id: this.props.company.company_id,
-            type: 'PNL'
+            type: 'PNL',
+            currency_id: this.props.defaultCurrency.id,
         }
 
         api.create().getAllSettingByType(body).then(response => {

src/container/OutlookPA/BalanceSheetOLPA.js

@@ -113,7 +113,8 @@ export default class BalanceSheetOLPA extends Component {
         let body = {
             group: 'THRESHOLD_CONTROL',
             company_id: this.props.company.company_id,
-            type: 'BALANCE_SHEET'
+            type: 'BALANCE_SHEET',
+            currency_id: this.props.defaultCurrency.id,
         }
 
         api.create().getAllSettingByType(body).then(response => {

src/container/OutlookPA/CashFlowOLPA.js

@@ -108,7 +108,8 @@ export default class CashFlow extends Component {
         let body = {
             group: 'THRESHOLD_CONTROL',
             company_id: this.props.company.company_id,
-            type: 'CASH_FLOW'
+            type: 'CASH_FLOW',
+            currency_id: this.props.defaultCurrency.id,
         }
 
         api.create().getAllSettingByType(body).then(response => {

src/container/OutlookPA/CorporateAnnualTargetOLPA.js

@@ -257,7 +257,8 @@ export default class CorporateAnnualTargetRO extends Component {
         let body = {
             group: 'CAT',
             company_id: this.props.company.company_id,
-            type: 'KPI_TYPE'
+            type: 'KPI_TYPE',
+            currency_id: this.props.defaultCurrency.id,
         }
         api.create().getAllSettingByType(body).then(response => {
             // console.log(response)
@@ -302,7 +303,8 @@ export default class CorporateAnnualTargetRO extends Component {
         let body = {
             group: 'CAT',
             company_id: this.props.company.company_id,
-            type: 'MAX_ACHIEVEMENT'
+            type: 'MAX_ACHIEVEMENT',
+            currency_id: this.props.defaultCurrency.id,
         }
         api.create().getAllSettingByType(body).then(response => {
             if (response.data) {

src/container/OutlookPA/TaxPlanningOLPA.js

@@ -115,7 +115,8 @@ export default class TaxPlanningOLPA extends Component {
         let body = {
             group: 'THRESHOLD_CONTROL',
             company_id: this.props.company.company_id,
-            type: 'TAX_PLANNING'
+            type: 'TAX_PLANNING',
+            currency_id: this.props.defaultCurrency.id,
         }
 
         api.create().getAllSettingByType(body).then(response => {

src/container/RollingOutlook/BalanceSheetRO.js

@@ -118,7 +118,8 @@ export default class BalanceSheetRO extends Component {
         let body = {
             group: 'THRESHOLD_CONTROL',
             company_id: this.props.company.company_id,
-            type: 'BALANCE_SHEET'
+            type: 'BALANCE_SHEET',
+            currency_id: this.props.defaultCurrency.id,
         }
 
         api.create().getAllSettingByType(body).then(response => {

src/container/RollingOutlook/CashFlowRO.js

@@ -108,7 +108,8 @@ export default class CashFlow extends Component {
         let body = {
             group: 'THRESHOLD_CONTROL',
             company_id: this.props.company.company_id,
-            type: 'CASH_FLOW'
+            type: 'CASH_FLOW',
+            currency_id: this.props.defaultCurrency.id,
         }
 
         api.create().getAllSettingByType(body).then(response => {

src/container/RollingOutlook/CorporateAnnualTargetRO.js

@@ -261,7 +261,8 @@ export default class CorporateAnnualTargetRO extends Component {
         let body = {
             group: 'CAT',
             company_id: this.props.company.company_id,
-            type: 'KPI_TYPE'
+            type: 'KPI_TYPE',
+            currency_id: this.props.defaultCurrency.id,
         }
         api.create().getAllSettingByType(body).then(response => {
             // console.log(response)
@@ -306,7 +307,8 @@ export default class CorporateAnnualTargetRO extends Component {
         let body = {
             group: 'CAT',
             company_id: this.props.company.company_id,
-            type: 'MAX_ACHIEVEMENT'
+            type: 'MAX_ACHIEVEMENT',
+            currency_id: this.props.defaultCurrency.id,
         }
         api.create().getAllSettingByType(body).then(response => {
             if (response.data) {

src/container/RollingOutlook/TaxPlanningRO.js

@@ -115,7 +115,8 @@ export default class TaxPlanning extends Component {
         let body = {
             group: 'THRESHOLD_CONTROL',
             company_id: this.props.company.company_id,
-            type: 'TAX_PLANNING'
+            type: 'TAX_PLANNING',
+            currency_id: this.props.defaultCurrency.id,
         }
 
         api.create().getAllSettingByType(body).then(response => {