Price Calculation as % of Margin - fixed spelling for base commission…

… points column

refs: #6045

(cherry picked from commit 3700900)

de.metas.adempiere.adempiere/base/src/main/java-gen/org/compiere/model/I_C_OrderLine.java

@@ -111,7 +111,7 @@ public interface I_C_OrderLine
 	 * <br>Mandatory: false
 	 * <br>Virtual Column: false
 	 */
-	public void setBase_Commission_Ponits_Per_Price_UOM (java.math.BigDecimal Base_Commission_Ponits_Per_Price_UOM);
+	public void setBase_Commission_Points_Per_Price_UOM(java.math.BigDecimal Base_Commission_Points_Per_Price_UOM);
 
 	/**
 	 * Get Base Commission Points Per Price UOM.
@@ -120,12 +120,12 @@ public interface I_C_OrderLine
 	 * <br>Mandatory: false
 	 * <br>Virtual Column: false
 	 */
-	public java.math.BigDecimal getBase_Commission_Ponits_Per_Price_UOM();
+	public java.math.BigDecimal getBase_Commission_Points_Per_Price_UOM();
 
-    /** Column definition for Base_Commission_Ponits_Per_Price_UOM */
-    public static final org.adempiere.model.ModelColumn<I_C_OrderLine, Object> COLUMN_Base_Commission_Ponits_Per_Price_UOM = new org.adempiere.model.ModelColumn<I_C_OrderLine, Object>(I_C_OrderLine.class, "Base_Commission_Ponits_Per_Price_UOM", null);
-    /** Column name Base_Commission_Ponits_Per_Price_UOM */
-    public static final String COLUMNNAME_Base_Commission_Ponits_Per_Price_UOM = "Base_Commission_Ponits_Per_Price_UOM";
+    /** Column definition for Base_Commission_Points_Per_Price_UOM */
+    public static final org.adempiere.model.ModelColumn<I_C_OrderLine, Object> COLUMN_Base_Commission_Points_Per_Price_UOM = new org.adempiere.model.ModelColumn<I_C_OrderLine, Object>(I_C_OrderLine.class, "Base_Commission_Points_Per_Price_UOM", null);
+    /** Column name Base_Commission_Points_Per_Price_UOM */
+    public static final String COLUMNNAME_Base_Commission_Points_Per_Price_UOM = "Base_Commission_Points_Per_Price_UOM";
 
 	/**
 	 * Set Preissystem.

de.metas.adempiere.adempiere/base/src/main/java-gen/org/compiere/model/X_C_OrderLine.java

@@ -131,19 +131,19 @@ public int getAD_User_ID ()
 	}
 
 	/** Set Base Commission Points Per Price UOM.
-		@param Base_Commission_Ponits_Per_Price_UOM Base Commission Points Per Price UOM	  */
+		@param Base_Commission_Points_Per_Price_UOM Base Commission Points Per Price UOM	  */
 	@Override
-	public void setBase_Commission_Ponits_Per_Price_UOM (java.math.BigDecimal Base_Commission_Ponits_Per_Price_UOM)
+	public void setBase_Commission_Points_Per_Price_UOM(java.math.BigDecimal Base_Commission_Points_Per_Price_UOM)
 	{
-		set_Value (COLUMNNAME_Base_Commission_Ponits_Per_Price_UOM, Base_Commission_Ponits_Per_Price_UOM);
+		set_Value (COLUMNNAME_Base_Commission_Points_Per_Price_UOM, Base_Commission_Points_Per_Price_UOM);
 	}
 
 	/** Get Base Commission Points Per Price UOM.
 		@return Base Commission Points Per Price UOM	  */
 	@Override
-	public java.math.BigDecimal getBase_Commission_Ponits_Per_Price_UOM () 
+	public java.math.BigDecimal getBase_Commission_Points_Per_Price_UOM()
 	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Base_Commission_Ponits_Per_Price_UOM);
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Base_Commission_Points_Per_Price_UOM);
 		if (bd == null)
 			 return BigDecimal.ZERO;
 		return bd;

de.metas.business/src/main/java/de/metas/order/impl/OrderLinePriceCalculator.java

@@ -150,7 +150,7 @@ public void updateOrderLine()
 		orderLine.setPriceList(pricingResult.getPriceList());
 		orderLine.setPriceStd(pricingResult.getPriceStd());
 		orderLine.setPrice_UOM_ID(UomId.toRepoId(pricingResult.getPriceUomId())); // 07090: when setting a priceActual, we also need to specify a PriceUOM
-		orderLine.setBase_Commission_Ponits_Per_Price_UOM( pricingResult.getBaseCommissionPointsPerPriceUOM() );
+		orderLine.setBase_Commission_Points_Per_Price_UOM( pricingResult.getBaseCommissionPointsPerPriceUOM() );
 		orderLine.setTraded_Commission_Percent( pricingResult.getTradedCommissionPercent() );
 
 		//

de.metas.contracts/src/main/java/de/metas/contracts/commission/commissioninstance/interceptor/C_Invoice_Candidate.java

@@ -91,7 +91,7 @@ public void deleteCommissionInstance(@NonNull final I_C_Invoice_Candidate icReco
 	}
 
 	/**
-	 *  Reset {@link I_C_Invoice_Candidate.COLUMNNAME_Base_Commission_Ponits_Per_Price_UOM} and {@link I_C_Invoice_Candidate.COLUMNNAME_Traded_Commission_Percent}
+	 *  Reset {@link I_C_Invoice_Candidate.COLUMNNAME_Base_Commission_Points_Per_Price_UOM} and {@link I_C_Invoice_Candidate.COLUMNNAME_Traded_Commission_Percent}
 	 *  in case the price entered was overridden so the commission points will be calculated based on the {@link I_C_Invoice_Candidate.COLUMNNAME_PriceActual_Override}.
 	 *
 	 * @param icRecord Invoice Candidate record
@@ -101,7 +101,7 @@ public void resetComputedCommissionPoints(@NonNull final I_C_Invoice_Candidate i
 	{
 		if ( !icRecord.getPriceEntered().equals( icRecord.getPriceEntered_Override() ) )
 		{
-			icRecord.setBase_Commission_Ponits_Per_Price_UOM(null);
+			icRecord.setBase_Commission_Points_Per_Price_UOM(null);
 			icRecord.setTraded_Commission_Percent(null);
 		}
 	}

de.metas.contracts/src/main/java/de/metas/contracts/commission/commissioninstance/interceptor/C_OrderLine.java

@@ -34,7 +34,7 @@
 public class C_OrderLine
 {
 	/**
-	 *  Reset {@link I_C_OrderLine.COLUMNNAME_Base_Commission_Ponits_Per_Price_UOM} and {@link I_C_OrderLine.COLUMNNAME_Traded_Commission_Percent}
+	 *  Reset {@link I_C_OrderLine.COLUMNNAME_Base_Commission_Points_Per_Price_UOM} and {@link I_C_OrderLine.COLUMNNAME_Traded_Commission_Percent}
 	 *  in case the price computed by the price engine was overridden by the user in UI, so the commission points will be calculated based on the
 	 *  {@link I_C_OrderLine.COLUMNNAME_PriceActual}.
 	 *
@@ -46,7 +46,7 @@ public void resetComputedCommissionPoints(@NonNull final I_C_OrderLine icRecord)
 	{
 		if ( !icRecord.getPriceStd().equals( icRecord.getPriceEntered() ) )
 		{
-			icRecord.setBase_Commission_Ponits_Per_Price_UOM(null);
+			icRecord.setBase_Commission_Points_Per_Price_UOM(null);
 			icRecord.setTraded_Commission_Percent(null);
 		}
 	}

de.metas.contracts/src/main/java/de/metas/contracts/commission/commissioninstance/services/repos/InvoiceCandidateRecordHelper.java

@@ -52,7 +52,7 @@ CommissionPoints extractForecastCommissionPoints(@NonNull final I_C_Invoice_Cand
 		final CommissionPoints forecastCommissionPoints;
 
 		final ProductPrice priceActual = Services.get(IInvoiceCandBL.class).getPriceActual(icRecord);
-		final BigDecimal baseCommissionPointsPerPriceUOM = icRecord.getBase_Commission_Ponits_Per_Price_UOM();
+		final BigDecimal baseCommissionPointsPerPriceUOM = icRecord.getBase_Commission_Points_Per_Price_UOM();
 
 		final BigDecimal forecastQtyInPriceUOM = icRecord.getQtyEntered()
 				.subtract( icRecord.getQtyToInvoiceInUOM() )
@@ -78,7 +78,7 @@ CommissionPoints extractForecastCommissionPoints(@NonNull final I_C_Invoice_Cand
 	CommissionPoints extractCommissionPointsToInvoice(@NonNull final I_C_Invoice_Candidate icRecord)
 	{
 		final CommissionPoints commissionPointsToInvoice;
-		final BigDecimal baseCommissionPointsPerPriceUOM = icRecord.getBase_Commission_Ponits_Per_Price_UOM();
+		final BigDecimal baseCommissionPointsPerPriceUOM = icRecord.getBase_Commission_Points_Per_Price_UOM();
 
 		if (baseCommissionPointsPerPriceUOM.signum() > 0)
 		{
@@ -95,7 +95,7 @@ CommissionPoints extractCommissionPointsToInvoice(@NonNull final I_C_Invoice_Can
 	CommissionPoints extractInvoicedCommissionPoints(@NonNull final I_C_Invoice_Candidate icRecord)
 	{
 		final CommissionPoints commissionPointsToInvoice;
-		final BigDecimal baseCommissionPointsPerPriceUOM = icRecord.getBase_Commission_Ponits_Per_Price_UOM();
+		final BigDecimal baseCommissionPointsPerPriceUOM = icRecord.getBase_Commission_Points_Per_Price_UOM();
 
 		if (baseCommissionPointsPerPriceUOM.signum() > 0)
 		{

de.metas.contracts/src/main/sql/postgresql/system/50-de.metas.contracts/5541150_sys_gh6045_add_base_and_traded_CommPoints_on_OL_and_invoiceCand.sql

@@ -1,6 +1,6 @@
 -- 2020-01-10T17:21:14.183Z
 -- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
-INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Org_ID,ColumnName,Created,CreatedBy,EntityType,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,577454,0,'Base_Commission_Ponits_Per_Price_UOM',TO_TIMESTAMP('2020-01-10 19:21:14','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Base Commission Points Per Price UOM','Base Commission Points Per Price UOM',TO_TIMESTAMP('2020-01-10 19:21:14','YYYY-MM-DD HH24:MI:SS'),100)
+INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Org_ID,ColumnName,Created,CreatedBy,EntityType,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,577454,0,'Base_Commission_Points_Per_Price_UOM',TO_TIMESTAMP('2020-01-10 19:21:14','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','Base Commission Points Per Price UOM','Base Commission Points Per Price UOM',TO_TIMESTAMP('2020-01-10 19:21:14','YYYY-MM-DD HH24:MI:SS'),100)
 ;
 
 -- 2020-01-10T17:21:14.186Z
@@ -20,7 +20,7 @@ INSERT INTO AD_Element_Trl (AD_Language,AD_Element_ID, CommitWarning,Description
 
 -- 2020-01-10T17:27:12.492Z
 -- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
-INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,DDL_NoForeignKey,EntityType,FieldLength,IsActive,IsAdvancedText,IsAllowLogging,IsAlwaysUpdateable,IsAutoApplyValidationRule,IsAutocomplete,IsCalculated,IsDimension,IsDLMPartitionBoundary,IsEncrypted,IsForceIncludeInGeneratedModel,IsGenericZoomKeyColumn,IsGenericZoomOrigin,IsIdentifier,IsKey,IsLazyLoading,IsMandatory,IsParent,IsRangeFilter,IsSelectionColumn,IsShowFilterIncrementButtons,IsStaleable,IsSyncDatabase,IsTranslated,IsUpdateable,IsUseDocSequence,Name,SelectionColumnSeqNo,SeqNo,Updated,UpdatedBy,Version) VALUES (0,569825,577454,0,22,260,'Base_Commission_Ponits_Per_Price_UOM',TO_TIMESTAMP('2020-01-10 19:27:12','YYYY-MM-DD HH24:MI:SS'),100,'N','D',16,'Y','N','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','Y','N','Base Commission Points Per Price UOM',0,0,TO_TIMESTAMP('2020-01-10 19:27:12','YYYY-MM-DD HH24:MI:SS'),100,0)
+INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,DDL_NoForeignKey,EntityType,FieldLength,IsActive,IsAdvancedText,IsAllowLogging,IsAlwaysUpdateable,IsAutoApplyValidationRule,IsAutocomplete,IsCalculated,IsDimension,IsDLMPartitionBoundary,IsEncrypted,IsForceIncludeInGeneratedModel,IsGenericZoomKeyColumn,IsGenericZoomOrigin,IsIdentifier,IsKey,IsLazyLoading,IsMandatory,IsParent,IsRangeFilter,IsSelectionColumn,IsShowFilterIncrementButtons,IsStaleable,IsSyncDatabase,IsTranslated,IsUpdateable,IsUseDocSequence,Name,SelectionColumnSeqNo,SeqNo,Updated,UpdatedBy,Version) VALUES (0,569825,577454,0,22,260,'Base_Commission_Points_Per_Price_UOM',TO_TIMESTAMP('2020-01-10 19:27:12','YYYY-MM-DD HH24:MI:SS'),100,'N','D',16,'Y','N','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','Y','N','Base Commission Points Per Price UOM',0,0,TO_TIMESTAMP('2020-01-10 19:27:12','YYYY-MM-DD HH24:MI:SS'),100,0)
 ;
 
 -- 2020-01-10T17:27:12.494Z
@@ -35,7 +35,7 @@ INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Clien
 
 -- 2020-01-10T17:27:12.958Z
 -- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
-/* DDL */ SELECT public.db_alter_table('C_OrderLine','ALTER TABLE public.C_OrderLine ADD COLUMN Base_Commission_Ponits_Per_Price_UOM NUMERIC')
+/* DDL */ SELECT public.db_alter_table('C_OrderLine','ALTER TABLE public.C_OrderLine ADD COLUMN Base_Commission_Points_Per_Price_UOM NUMERIC')
 ;
 
 -- 2020-01-10T17:27:33.410Z
@@ -80,7 +80,7 @@ INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Clien
 
 -- 2020-01-10T17:28:49.453Z
 -- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
-INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,DDL_NoForeignKey,EntityType,FieldLength,IsActive,IsAdvancedText,IsAllowLogging,IsAlwaysUpdateable,IsAutoApplyValidationRule,IsAutocomplete,IsCalculated,IsDimension,IsDLMPartitionBoundary,IsEncrypted,IsForceIncludeInGeneratedModel,IsGenericZoomKeyColumn,IsGenericZoomOrigin,IsIdentifier,IsKey,IsLazyLoading,IsMandatory,IsParent,IsRangeFilter,IsSelectionColumn,IsShowFilterIncrementButtons,IsStaleable,IsSyncDatabase,IsTranslated,IsUpdateable,IsUseDocSequence,Name,SelectionColumnSeqNo,SeqNo,Updated,UpdatedBy,Version) VALUES (0,569828,577454,0,22,540270,'Base_Commission_Ponits_Per_Price_UOM',TO_TIMESTAMP('2020-01-10 19:28:49','YYYY-MM-DD HH24:MI:SS'),100,'N','de.metas.invoicecandidate',16,'Y','N','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','Y','N','Base Commission Points Per Price UOM',0,0,TO_TIMESTAMP('2020-01-10 19:28:49','YYYY-MM-DD HH24:MI:SS'),100,0)
+INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,DDL_NoForeignKey,EntityType,FieldLength,IsActive,IsAdvancedText,IsAllowLogging,IsAlwaysUpdateable,IsAutoApplyValidationRule,IsAutocomplete,IsCalculated,IsDimension,IsDLMPartitionBoundary,IsEncrypted,IsForceIncludeInGeneratedModel,IsGenericZoomKeyColumn,IsGenericZoomOrigin,IsIdentifier,IsKey,IsLazyLoading,IsMandatory,IsParent,IsRangeFilter,IsSelectionColumn,IsShowFilterIncrementButtons,IsStaleable,IsSyncDatabase,IsTranslated,IsUpdateable,IsUseDocSequence,Name,SelectionColumnSeqNo,SeqNo,Updated,UpdatedBy,Version) VALUES (0,569828,577454,0,22,540270,'Base_Commission_Points_Per_Price_UOM',TO_TIMESTAMP('2020-01-10 19:28:49','YYYY-MM-DD HH24:MI:SS'),100,'N','de.metas.invoicecandidate',16,'Y','N','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','Y','N','Base Commission Points Per Price UOM',0,0,TO_TIMESTAMP('2020-01-10 19:28:49','YYYY-MM-DD HH24:MI:SS'),100,0)
 ;
 
 -- 2020-01-10T17:28:49.459Z
@@ -95,6 +95,6 @@ INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Clien
 
 -- 2020-01-10T17:28:51.651Z
 -- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
-/* DDL */ SELECT public.db_alter_table('C_Invoice_Candidate','ALTER TABLE public.C_Invoice_Candidate ADD COLUMN Base_Commission_Ponits_Per_Price_UOM NUMERIC')
+/* DDL */ SELECT public.db_alter_table('C_Invoice_Candidate','ALTER TABLE public.C_Invoice_Candidate ADD COLUMN Base_Commission_Points_Per_Price_UOM NUMERIC')
 ;
 

de.metas.swat/de.metas.swat.base/src/main/java-gen/de/metas/invoicecandidate/model/I_C_Invoice_Candidate.java

@@ -157,7 +157,7 @@ public interface I_C_Invoice_Candidate
 	 * <br>Mandatory: false
 	 * <br>Virtual Column: false
 	 */
-	public void setBase_Commission_Ponits_Per_Price_UOM (java.math.BigDecimal Base_Commission_Ponits_Per_Price_UOM);
+	public void setBase_Commission_Points_Per_Price_UOM(java.math.BigDecimal Base_Commission_Points_Per_Price_UOM);
 
 	/**
 	 * Get Base Commission Points Per Price UOM.
@@ -166,12 +166,12 @@ public interface I_C_Invoice_Candidate
 	 * <br>Mandatory: false
 	 * <br>Virtual Column: false
 	 */
-	public java.math.BigDecimal getBase_Commission_Ponits_Per_Price_UOM();
+	public java.math.BigDecimal getBase_Commission_Points_Per_Price_UOM();
 
-    /** Column definition for Base_Commission_Ponits_Per_Price_UOM */
-    public static final org.adempiere.model.ModelColumn<I_C_Invoice_Candidate, Object> COLUMN_Base_Commission_Ponits_Per_Price_UOM = new org.adempiere.model.ModelColumn<I_C_Invoice_Candidate, Object>(I_C_Invoice_Candidate.class, "Base_Commission_Ponits_Per_Price_UOM", null);
-    /** Column name Base_Commission_Ponits_Per_Price_UOM */
-    public static final String COLUMNNAME_Base_Commission_Ponits_Per_Price_UOM = "Base_Commission_Ponits_Per_Price_UOM";
+    /** Column definition for Base_Commission_Points_Per_Price_UOM */
+    public static final org.adempiere.model.ModelColumn<I_C_Invoice_Candidate, Object> COLUMN_Base_Commission_Points_Per_Price_UOM = new org.adempiere.model.ModelColumn<I_C_Invoice_Candidate, Object>(I_C_Invoice_Candidate.class, "Base_Commission_Points_Per_Price_UOM", null);
+    /** Column name Base_Commission_Points_Per_Price_UOM */
+    public static final String COLUMNNAME_Base_Commission_Points_Per_Price_UOM = "Base_Commission_Points_Per_Price_UOM";
 
 	/**
 	 * Set Rechnungspartner.

de.metas.swat/de.metas.swat.base/src/main/java-gen/de/metas/invoicecandidate/model/X_C_Invoice_Candidate.java

@@ -167,19 +167,19 @@ public boolean isApprovalForInvoicing ()
 	}
 
 	/** Set Base Commission Points Per Price UOM.
-		@param Base_Commission_Ponits_Per_Price_UOM Base Commission Points Per Price UOM	  */
+		@param Base_Commission_Points_Per_Price_UOM Base Commission Points Per Price UOM	  */
 	@Override
-	public void setBase_Commission_Ponits_Per_Price_UOM (java.math.BigDecimal Base_Commission_Ponits_Per_Price_UOM)
+	public void setBase_Commission_Points_Per_Price_UOM(java.math.BigDecimal Base_Commission_Points_Per_Price_UOM)
 	{
-		set_Value (COLUMNNAME_Base_Commission_Ponits_Per_Price_UOM, Base_Commission_Ponits_Per_Price_UOM);
+		set_Value (COLUMNNAME_Base_Commission_Points_Per_Price_UOM, Base_Commission_Points_Per_Price_UOM);
 	}
 
 	/** Get Base Commission Points Per Price UOM.
 		@return Base Commission Points Per Price UOM	  */
 	@Override
-	public java.math.BigDecimal getBase_Commission_Ponits_Per_Price_UOM () 
+	public java.math.BigDecimal getBase_Commission_Points_Per_Price_UOM()
 	{
-		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Base_Commission_Ponits_Per_Price_UOM);
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Base_Commission_Points_Per_Price_UOM);
 		if (bd == null)
 			 return BigDecimal.ZERO;
 		return bd;

de.metas.swat/de.metas.swat.base/src/main/java/de/metas/order/invoicecandidate/C_OrderLine_Handler.java

@@ -175,7 +175,7 @@ private I_C_Invoice_Candidate createCandidateForOrderLine(final I_C_OrderLine or
 
 		ic.setDescription(orderLine.getDescription()); // 03439
 
-		icRecord.setBase_Commission_Ponits_Per_Price_UOM( orderLine.getBase_Commission_Ponits_Per_Price_UOM() );
+		icRecord.setBase_Commission_Points_Per_Price_UOM( orderLine.getBase_Commission_Points_Per_Price_UOM() );
 		icRecord.setTraded_Commission_Percent( orderLine.getTraded_Commission_Percent() );
 
 		final I_C_Order order = InterfaceWrapperHelper.create(orderLine.getC_Order(), I_C_Order.class);