Projects >> mes >>febac4c69bf494c5de1409d6ba51980a497eabeb

Chunk
Conflicting content 
                "costCalculation.costCalculationDetails.report.columnHeader.totalCosts")) {
            materialsTableHeader.add(translationService.translate(translate, locale));
        }
<<<<<<< HEAD
        PdfPTable materialsTable = pdfHelper.createTableWithHeader(materialsTableHeader.size(), materialsTableHeader, false);

=======
        PdfPTable materialsTable = pdfHelper.createTableWithHeader(materialsTableHeader.size(), materialsTableHeader, false,
                defaultMaterialTableColumnWidth);
>>>>>>> fa7956b21598e5c0177da0e0eaf539f7f361b99c
        Entity technology;
        if (costCalculation.getBelongsToField(ORDER) == null) {
            technology = costCalculation.getBelongsToField(TECHNOLOGY);
Solution content 
                "costCalculation.costCalculationDetails.report.columnHeader.totalCosts")) {
            materialsTableHeader.add(translationService.translate(translate, locale));
        }
        PdfPTable materialsTable = pdfHelper.createTableWithHeader(materialsTableHeader.size(), materialsTableHeader, false,
                defaultMaterialTableColumnWidth);
        Entity technology;
        if (costCalculation.getBelongsToField(ORDER) == null) {
            technology = costCalculation.getBelongsToField(TECHNOLOGY);
File
CostCalculationPdfService.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
            BigDecimal costs = productsCostCalculationService.calculateProductCostForGivenQuantity(productEntity,
                    productQuantity, mode);

<<<<<<< HEAD
            materialsTable.addCell(new Phrase(numberService.format(costs), FontUtils.getDejavuRegular9Dark()));
=======
        for (Entry product : products.entrySet()) {

            materialsTable.addCell(new Phrase(product.getKey().getStringField(NUMBER), FontUtils.getDejavuRegular9Dark()));
            materialsTable.addCell(new Phrase(numberService.format(product.getValue()), FontUtils.getDejavuRegular9Dark()));
            materialsTable.addCell(new Phrase(product.getKey().getStringField(L_UNIT), FontUtils.getDejavuRegular9Dark()));
            BigDecimal nominalCost = (BigDecimal) product.getKey().getField(L_NOMINAL_COST);
            BigDecimal costForNumber = (BigDecimal) product.getKey().getField(L_COST_FOR_NUMBER);
            BigDecimal totalCostPerUnit = nominalCost.divide(costForNumber, numberService.getMathContext());
            BigDecimal costs = product.getValue().multiply(totalCostPerUnit, numberService.getMathContext());
            materialsTable.addCell(new Phrase(numberService.format(costs) + " " + currencyService.getCurrencyAlphabeticCode(),
                    FontUtils.getDejavuRegular9Dark()));
>>>>>>> fa7956b21598e5c0177da0e0eaf539f7f361b99c
            BigDecimal margin = (BigDecimal) costCalculation.getField(MATERIAL_COST_MARGIN);
            if (margin == null) {
                materialsTable.addCell(new Phrase("", FontUtils.getDejavuRegular9Dark()));
Solution content 
            BigDecimal costs = productsCostCalculationService.calculateProductCostForGivenQuantity(productEntity,
                    productQuantity, mode);

            materialsTable.addCell(new Phrase(numberService.format(costs) + " " + currencyService.getCurrencyAlphabeticCode(),
                    FontUtils.getDejavuRegular9Dark()));
            BigDecimal margin = (BigDecimal) costCalculation.getField(MATERIAL_COST_MARGIN);
            if (margin == null) {
                materialsTable.addCell(new Phrase("", FontUtils.getDejavuRegular9Dark()));
File
CostCalculationPdfService.java
Developer's decision
Combination
Kind of conflict
Cast expression
For statement
Method invocation
Variable