Skip to content

Commit

Permalink
#14444 Add column M_Delivery_Planning_ID to M_ShipperTransportation
Browse files Browse the repository at this point in the history
#14444 Delivery Planning - Delivery Instructions Amendment
  • Loading branch information
cristinamghita committed Jan 25, 2023
1 parent c401b23 commit 64eec3f
Show file tree
Hide file tree
Showing 3 changed files with 91 additions and 27 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package de.metas.shipping.model;

import org.adempiere.model.ModelColumn;

import javax.annotation.Nullable;
import java.math.BigDecimal;
import javax.annotation.Nullable;
import org.adempiere.model.ModelColumn;

/** Generated Interface for M_ShipperTransportation
* @author metasfresh (generated)
Expand Down Expand Up @@ -136,52 +135,52 @@ public interface I_M_ShipperTransportation
String COLUMNNAME_C_DocType_ID = "C_DocType_ID";

/**
* Set Sammelrechnung erstellen.
* Set Incoterms.
*
* <br>Type: Button
* <br>Type: Search
* <br>Mandatory: false
* <br>Virtual Column: false
*/
void setCollectiveBillReport(java.lang.String CollectiveBillReport);
void setC_Incoterms_ID (int C_Incoterms_ID);

/**
* Get Sammelrechnung erstellen.
* Get Incoterms.
*
* <br>Type: Button
* <br>Type: Search
* <br>Mandatory: false
* <br>Virtual Column: false
*/
java.lang.String getCollectiveBillReport();
int getC_Incoterms_ID();

/** Column definition for CollectiveBillReport */
org.adempiere.model.ModelColumn<I_M_ShipperTransportation, Object> COLUMN_CollectiveBillReport = new org.adempiere.model.ModelColumn<I_M_ShipperTransportation, Object>(I_M_ShipperTransportation.class, "CollectiveBillReport", null);
/** Column name CollectiveBillReport */
String COLUMNNAME_CollectiveBillReport = "CollectiveBillReport";
@Nullable org.compiere.model.I_C_Incoterms getC_Incoterms();

void setC_Incoterms(@Nullable org.compiere.model.I_C_Incoterms C_Incoterms);

ModelColumn<I_M_ShipperTransportation, org.compiere.model.I_C_Incoterms> COLUMN_C_Incoterms_ID = new ModelColumn<>(I_M_ShipperTransportation.class, "C_Incoterms_ID", org.compiere.model.I_C_Incoterms.class);
String COLUMNNAME_C_Incoterms_ID = "C_Incoterms_ID";

/**
* Set Incoterms.
* Set Sammelrechnung erstellen.
*
* <br>Type: Search
* <br>Type: Button
* <br>Mandatory: false
* <br>Virtual Column: false
*/
void setC_Incoterms_ID (int C_Incoterms_ID);
void setCollectiveBillReport(java.lang.String CollectiveBillReport);

/**
* Get Incoterms.
* Get Sammelrechnung erstellen.
*
* <br>Type: Search
* <br>Type: Button
* <br>Mandatory: false
* <br>Virtual Column: false
*/
int getC_Incoterms_ID();

@Nullable org.compiere.model.I_C_Incoterms getC_Incoterms();

void setC_Incoterms(@Nullable org.compiere.model.I_C_Incoterms C_Incoterms);
java.lang.String getCollectiveBillReport();

ModelColumn<I_M_ShipperTransportation, org.compiere.model.I_C_Incoterms> COLUMN_C_Incoterms_ID = new ModelColumn<>(I_M_ShipperTransportation.class, "C_Incoterms_ID", org.compiere.model.I_C_Incoterms.class);
String COLUMNNAME_C_Incoterms_ID = "C_Incoterms_ID";
/** Column definition for CollectiveBillReport */
org.adempiere.model.ModelColumn<I_M_ShipperTransportation, Object> COLUMN_CollectiveBillReport = new org.adempiere.model.ModelColumn<I_M_ShipperTransportation, Object>(I_M_ShipperTransportation.class, "CollectiveBillReport", null);
/** Column name CollectiveBillReport */
String COLUMNNAME_CollectiveBillReport = "CollectiveBillReport";

/**
* Get Created.
Expand Down Expand Up @@ -514,6 +513,31 @@ public interface I_M_ShipperTransportation
ModelColumn<I_M_ShipperTransportation, Object> COLUMN_LoadingTime = new ModelColumn<>(I_M_ShipperTransportation.class, "LoadingTime", null);
String COLUMNNAME_LoadingTime = "LoadingTime";

/**
* Set Delivery Planning.
*
* <br>Type: TableDir
* <br>Mandatory: false
* <br>Virtual Column: false
*/
void setM_Delivery_Planning_ID (int M_Delivery_Planning_ID);

/**
* Get Delivery Planning.
*
* <br>Type: TableDir
* <br>Mandatory: false
* <br>Virtual Column: false
*/
int getM_Delivery_Planning_ID();

@Nullable org.compiere.model.I_M_Delivery_Planning getM_Delivery_Planning();

void setM_Delivery_Planning(@Nullable org.compiere.model.I_M_Delivery_Planning M_Delivery_Planning);

ModelColumn<I_M_ShipperTransportation, org.compiere.model.I_M_Delivery_Planning> COLUMN_M_Delivery_Planning_ID = new ModelColumn<>(I_M_ShipperTransportation.class, "M_Delivery_Planning_ID", org.compiere.model.I_M_Delivery_Planning.class);
String COLUMNNAME_M_Delivery_Planning_ID = "M_Delivery_Planning_ID";

/**
* Set Means of Transportation.
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Generated Model - DO NOT CHANGE
package de.metas.shipping.model;

import javax.annotation.Nullable;
import java.math.BigDecimal;
import java.sql.ResultSet;
import java.util.Properties;
import javax.annotation.Nullable;

/** Generated Model for M_ShipperTransportation
* @author metasfresh (generated)
Expand All @@ -13,7 +13,7 @@
public class X_M_ShipperTransportation extends org.compiere.model.PO implements I_M_ShipperTransportation, org.compiere.model.I_Persistent
{

private static final long serialVersionUID = 510905355L;
private static final long serialVersionUID = 1950052061L;

/** Standard Constructor */
public X_M_ShipperTransportation (final Properties ctx, final int M_ShipperTransportation_ID, @Nullable final String trxName)
Expand Down Expand Up @@ -355,6 +355,33 @@ public java.lang.String getLoadingTime()
return get_ValueAsString(COLUMNNAME_LoadingTime);
}

@Override
public org.compiere.model.I_M_Delivery_Planning getM_Delivery_Planning()
{
return get_ValueAsPO(COLUMNNAME_M_Delivery_Planning_ID, org.compiere.model.I_M_Delivery_Planning.class);
}

@Override
public void setM_Delivery_Planning(final org.compiere.model.I_M_Delivery_Planning M_Delivery_Planning)
{
set_ValueFromPO(COLUMNNAME_M_Delivery_Planning_ID, org.compiere.model.I_M_Delivery_Planning.class, M_Delivery_Planning);
}

@Override
public void setM_Delivery_Planning_ID (final int M_Delivery_Planning_ID)
{
if (M_Delivery_Planning_ID < 1)
set_Value (COLUMNNAME_M_Delivery_Planning_ID, null);
else
set_Value (COLUMNNAME_M_Delivery_Planning_ID, M_Delivery_Planning_ID);
}

@Override
public int getM_Delivery_Planning_ID()
{
return get_ValueAsInt(COLUMNNAME_M_Delivery_Planning_ID);
}

@Override
public org.compiere.model.I_M_MeansOfTransportation getM_MeansOfTransportation()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
-- Column: M_ShipperTransportation.M_Delivery_Planning_ID
-- 2023-01-25T12:50:19.637Z
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,FacetFilterSeqNo,FieldLength,IsActive,IsAdvancedText,IsAllowLogging,IsAlwaysUpdateable,IsAutoApplyValidationRule,IsAutocomplete,IsCalculated,IsDimension,IsDLMPartitionBoundary,IsEncrypted,IsExcludeFromZoomTargets,IsFacetFilter,IsForceIncludeInGeneratedModel,IsGenericZoomKeyColumn,IsGenericZoomOrigin,IsIdentifier,IsKey,IsLazyLoading,IsMandatory,IsParent,IsRestAPICustomColumn,IsSelectionColumn,IsShowFilterIncrementButtons,IsShowFilterInline,IsStaleable,IsSyncDatabase,IsTranslated,IsUpdateable,IsUseDocSequence,MaxFacetsToFetch,Name,SelectionColumnSeqNo,SeqNo,Updated,UpdatedBy,Version) VALUES (0,585609,581677,0,19,540030,'M_Delivery_Planning_ID',TO_TIMESTAMP('2023-01-25 14:50:19','YYYY-MM-DD HH24:MI:SS'),100,'N','METAS_SHIPPING',0,10,'Y','N','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','Y','N',0,'Lieferplanung',0,0,TO_TIMESTAMP('2023-01-25 14:50:19','YYYY-MM-DD HH24:MI:SS'),100,0)
;

-- 2023-01-25T12:50:19.639Z
INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,IsActive) SELECT l.AD_Language, t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,'Y' FROM AD_Language l, AD_Column t WHERE l.IsActive='Y'AND (l.IsSystemLanguage='Y' OR l.IsBaseLanguage='Y') AND t.AD_Column_ID=585609 AND NOT EXISTS (SELECT 1 FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
;

-- 2023-01-25T12:50:19.663Z
/* DDL */ select update_Column_Translation_From_AD_Element(581677)
;

0 comments on commit 64eec3f

Please sign in to comment.