Skip to content

Commit

Permalink
Apply spotless java google code format
Browse files Browse the repository at this point in the history
  • Loading branch information
ale-axelor committed Nov 19, 2019
1 parent a55060a commit 3e7c49e
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ BigDecimal getInTaxUnitPrice(

BigDecimal getCompanyExTaxTotal(BigDecimal exTaxTotal, Invoice invoice) throws AxelorException;

PriceListLine getPriceListLine(InvoiceLine invoiceLine, PriceList priceList,BigDecimal price);
PriceListLine getPriceListLine(InvoiceLine invoiceLine, PriceList priceList, BigDecimal price);

BigDecimal computeDiscount(InvoiceLine invoiceLine, Boolean inAti);

Expand All @@ -68,7 +68,7 @@ Map<String, Object> getDiscount(Invoice invoice, InvoiceLine invoiceLine, BigDec
Map<String, Object> getDiscountsFromPriceLists(
Invoice invoice, InvoiceLine invoiceLine, BigDecimal price);

int getDiscountTypeSelect(Invoice invoice, InvoiceLine invoiceLine,BigDecimal price);
int getDiscountTypeSelect(Invoice invoice, InvoiceLine invoiceLine, BigDecimal price);

Unit getUnit(Product product, boolean isPurchase);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,11 @@ public BigDecimal getCompanyExTaxTotal(BigDecimal exTaxTotal, Invoice invoice)
}

@Override
public PriceListLine getPriceListLine(InvoiceLine invoiceLine, PriceList priceList,BigDecimal price) {
public PriceListLine getPriceListLine(
InvoiceLine invoiceLine, PriceList priceList, BigDecimal price) {

return priceListService.getPriceListLine(
invoiceLine.getProduct(), invoiceLine.getQty(), priceList,price);
invoiceLine.getProduct(), invoiceLine.getQty(), priceList, price);
}

@Override
Expand Down Expand Up @@ -309,18 +310,18 @@ public Map<String, Object> getDiscountsFromPriceLists(
PriceList priceList = invoice.getPriceList();

if (priceList != null) {
PriceListLine priceListLine = this.getPriceListLine(invoiceLine, priceList,price);
PriceListLine priceListLine = this.getPriceListLine(invoiceLine, priceList, price);
discounts = priceListService.getReplacedPriceAndDiscounts(priceList, priceListLine, price);
}

return discounts;
}

@Override
public int getDiscountTypeSelect(Invoice invoice, InvoiceLine invoiceLine,BigDecimal price) {
public int getDiscountTypeSelect(Invoice invoice, InvoiceLine invoiceLine, BigDecimal price) {
PriceList priceList = invoice.getPriceList();
if (priceList != null) {
PriceListLine priceListLine = this.getPriceListLine(invoiceLine, priceList,price);
PriceListLine priceListLine = this.getPriceListLine(invoiceLine, priceList, price);

return priceListLine.getTypeSelect();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ public class PriceListService {

@Inject protected AppBaseService appBaseService;

public PriceListLine getPriceListLine(Product product, BigDecimal qty, PriceList priceList, BigDecimal price) {
public PriceListLine getPriceListLine(
Product product, BigDecimal qty, PriceList priceList, BigDecimal price) {

PriceListLine priceListLine = null;
List<PriceListLine> priceListLineList = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public List<InvoiceLine> createInvoiceLine(Invoice invoice, PurchaseOrderLine pu
.getDefaultPriceList(invoice.getPartner(), PriceListRepository.TYPE_SALE);
if (priceList != null) {
PriceListLine priceListLine =
purchaseOrderLineServiceImpl.getPriceListLine(purchaseOrderLine, priceList,price);
purchaseOrderLineServiceImpl.getPriceListLine(purchaseOrderLine, priceList, price);
if (priceListLine != null) {
discountTypeSelect = priceListLine.getTypeSelect();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ public TeamTask updateDiscount(TeamTask teamTask) {
return teamTask;
}

PriceListLine priceListLine = this.getPriceListLine(teamTask, priceList, teamTask.getUnitPrice());
PriceListLine priceListLine =
this.getPriceListLine(teamTask, priceList, teamTask.getUnitPrice());
Map<String, Object> discounts =
priceListService.getReplacedPriceAndDiscounts(
priceList, priceListLine, teamTask.getUnitPrice());
Expand All @@ -127,7 +128,7 @@ private void emptyDiscounts(TeamTask teamTask) {
private PriceListLine getPriceListLine(TeamTask teamTask, PriceList priceList, BigDecimal price) {

return priceListService.getPriceListLine(
teamTask.getProduct(), teamTask.getQuantity(), priceList, price);
teamTask.getProduct(), teamTask.getQuantity(), priceList, price);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ public List<InvoiceLine> createInvoiceLine(

if (priceList != null) {
PriceListLine priceListLine =
priceListService.getPriceListLine(product, qtyConverted, priceList,price);
priceListService.getPriceListLine(product, qtyConverted, priceList, price);
if (priceListLine != null) {
discountMethodTypeSelect = priceListLine.getTypeSelect();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ Optional<TaxLine> getOptionalTaxLine(
public BigDecimal getCompanyExTaxTotal(BigDecimal exTaxTotal, PurchaseOrder purchaseOrder)
throws AxelorException;

public PriceListLine getPriceListLine(PurchaseOrderLine purchaseOrderLine, PriceList priceList, BigDecimal price);
public PriceListLine getPriceListLine(
PurchaseOrderLine purchaseOrderLine, PriceList priceList, BigDecimal price);

public Map<String, BigDecimal> compute(
PurchaseOrderLine purchaseOrderLine, PurchaseOrder purchaseOrder) throws AxelorException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,8 @@ public BigDecimal getCompanyExTaxTotal(BigDecimal exTaxTotal, PurchaseOrder purc
}

@Override
public PriceListLine getPriceListLine(PurchaseOrderLine purchaseOrderLine, PriceList priceList,BigDecimal price) {
public PriceListLine getPriceListLine(
PurchaseOrderLine purchaseOrderLine, PriceList priceList, BigDecimal price) {

return priceListService.getPriceListLine(
purchaseOrderLine.getProduct(), purchaseOrderLine.getQty(), priceList, price);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ public BigDecimal getAmountInCompanyCurrency(BigDecimal exTaxTotal, SaleOrder sa
public BigDecimal getCompanyCostPrice(SaleOrder saleOrder, SaleOrderLine saleOrderLine)
throws AxelorException;

public PriceListLine getPriceListLine(SaleOrderLine saleOrderLine, PriceList priceList, BigDecimal price);
public PriceListLine getPriceListLine(
SaleOrderLine saleOrderLine, PriceList priceList, BigDecimal price);

/**
* Compute and return the discounted price of a sale order line.
Expand All @@ -113,7 +114,8 @@ public BigDecimal getCompanyCostPrice(SaleOrder saleOrder, SaleOrderLine saleOrd
public Map<String, Object> getDiscountsFromPriceLists(
SaleOrder saleOrder, SaleOrderLine saleOrderLine, BigDecimal price);

public int getDiscountTypeSelect(SaleOrder saleOrder, SaleOrderLine saleOrderLine,BigDecimal price);
public int getDiscountTypeSelect(
SaleOrder saleOrder, SaleOrderLine saleOrderLine, BigDecimal price);

public Unit getSaleUnit(SaleOrderLine saleOrderLine);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -418,10 +418,11 @@ public BigDecimal getCompanyCostPrice(SaleOrder saleOrder, SaleOrderLine saleOrd
}

@Override
public PriceListLine getPriceListLine(SaleOrderLine saleOrderLine, PriceList priceList, BigDecimal price) {
public PriceListLine getPriceListLine(
SaleOrderLine saleOrderLine, PriceList priceList, BigDecimal price) {

return priceListService.getPriceListLine(
saleOrderLine.getProduct(), saleOrderLine.getQty(), priceList,price);
saleOrderLine.getProduct(), saleOrderLine.getQty(), priceList, price);
}

@Override
Expand Down Expand Up @@ -457,18 +458,19 @@ public Map<String, Object> getDiscountsFromPriceLists(
PriceList priceList = saleOrder.getPriceList();

if (priceList != null) {
PriceListLine priceListLine = this.getPriceListLine(saleOrderLine, priceList,price);
PriceListLine priceListLine = this.getPriceListLine(saleOrderLine, priceList, price);
discounts = priceListService.getReplacedPriceAndDiscounts(priceList, priceListLine, price);
}

return discounts;
}

@Override
public int getDiscountTypeSelect(SaleOrder saleOrder, SaleOrderLine saleOrderLine,BigDecimal price) {
public int getDiscountTypeSelect(
SaleOrder saleOrder, SaleOrderLine saleOrderLine, BigDecimal price) {
PriceList priceList = saleOrder.getPriceList();
if (priceList != null) {
PriceListLine priceListLine = this.getPriceListLine(saleOrderLine, priceList,price);
PriceListLine priceListLine = this.getPriceListLine(saleOrderLine, priceList, price);

return priceListLine.getTypeSelect();
}
Expand Down

0 comments on commit 3e7c49e

Please sign in to comment.