midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-867 Wrong shipping columns naming

This commit is contained in:
Elaine Tan 2013-04-19 16:51:44 +08:00
parent f810e8dc10
commit 670c4f9c9c
8 changed files with 199 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
org.adempiere.base/src/org/compiere/model/I_M_CommodityShipment.java
View File

@ -62,14 +62,14 @@ public interface I_M_CommodityShipment
*/
public int getAD_Org_ID();
/** Column name CountryOfManufacture */
public static final String COLUMNNAME_CountryOfManufacture = "CountryOfManufacture";
/** Column name CountryOfManufacture_ID */
public static final String COLUMNNAME_CountryOfManufacture_ID = "CountryOfManufacture_ID";
/** Set Country Of Manufacture */
public void setCountryOfManufacture (int CountryOfManufacture);
public void setCountryOfManufacture_ID (int CountryOfManufacture_ID);
/** Get Country Of Manufacture */
public int getCountryOfManufacture();
public int getCountryOfManufacture_ID();
/** Column name Created */
public static final String COLUMNNAME_Created = "Created";
@ -131,6 +131,24 @@ public interface I_M_CommodityShipment
*/
public boolean isActive();
/** Column name M_CommodityShipment_ID */
public static final String COLUMNNAME_M_CommodityShipment_ID = "M_CommodityShipment_ID";
/** Set Commodity Shipment */
public void setM_CommodityShipment_ID (int M_CommodityShipment_ID);
/** Get Commodity Shipment */
public int getM_CommodityShipment_ID();
/** Column name M_CommodityShipment_UU */
public static final String COLUMNNAME_M_CommodityShipment_UU = "M_CommodityShipment_UU";
/** Set M_CommodityShipment_UU */
public void setM_CommodityShipment_UU (String M_CommodityShipment_UU);
/** Get M_CommodityShipment_UU */
public String getM_CommodityShipment_UU();
/** Column name M_Product_ID */
public static final String COLUMNNAME_M_Product_ID = "M_Product_ID";
@ -161,22 +179,4 @@ public interface I_M_CommodityShipment
* User who updated this records
*/
public int getUpdatedBy();
/** Column name M_CommodityShipment_ID */
public static final String COLUMNNAME_M_CommodityShipment_ID = "M_CommodityShipment_ID";
/** Set M_CommodityShipment */
public void setM_CommodityShipment_ID (int M_CommodityShipment_ID);
/** Get M_CommodityShipment */
public int getM_CommodityShipment_ID();
/** Column name M_CommodityShipment_UU */
public static final String COLUMNNAME_M_CommodityShipment_UU = "M_CommodityShipment_UU";
/** Set M_CommodityShipment_UU */
public void setM_CommodityShipment_UU (String M_CommodityShipment_UU);
/** Get M_CommodityShipment_UU */
public String getM_CommodityShipment_UU();
}

10
org.adempiere.base/src/org/compiere/model/I_M_Package.java
View File

@ -300,16 +300,16 @@ public interface I_M_Package
/** Get Height */
public BigDecimal getHeight();
/** Column name HoldAddress */
public static final String COLUMNNAME_HoldAddress = "HoldAddress";
/** Column name HoldAddress_ID */
public static final String COLUMNNAME_HoldAddress_ID = "HoldAddress_ID";
/** Set Hold Address */
public void setHoldAddress (int HoldAddress);
public void setHoldAddress_ID (int HoldAddress_ID);
/** Get Hold Address */
public int getHoldAddress();
public int getHoldAddress_ID();
public org.compiere.model.I_C_BPartner_Location getHoldAddr() throws RuntimeException;
public org.compiere.model.I_C_BPartner_Location getHoldAddress() throws RuntimeException;
/** Column name HomeDeliveryPremiumDate */
public static final String COLUMNNAME_HomeDeliveryPremiumDate = "HomeDeliveryPremiumDate";

94
org.adempiere.base/src/org/compiere/model/I_M_ShippingTransaction.java
View File

@ -114,14 +114,16 @@ public interface I_M_ShippingTransaction
/** Get Box Count */
public int getBoxCount();
/** Column name CashOnDelivery */
public static final String COLUMNNAME_CashOnDelivery = "CashOnDelivery";
/** Column name C_BP_ShippingAcct_ID */
public static final String COLUMNNAME_C_BP_ShippingAcct_ID = "C_BP_ShippingAcct_ID";
/** Set COD */
public void setCashOnDelivery (boolean CashOnDelivery);
/** Set Business Partner Shipping Account */
public void setC_BP_ShippingAcct_ID (int C_BP_ShippingAcct_ID);
/** Get COD */
public boolean isCashOnDelivery();
/** Get Business Partner Shipping Account */
public int getC_BP_ShippingAcct_ID();
public org.compiere.model.I_C_BP_ShippingAcct getC_BP_ShippingAcct() throws RuntimeException;
/** Column name C_BPartner_ID */
public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID";
@ -153,17 +155,6 @@ public interface I_M_ShippingTransaction
public org.compiere.model.I_C_BPartner_Location getC_BPartner_Location() throws RuntimeException;
/** Column name C_BP_ShippingAcct_ID */
public static final String COLUMNNAME_C_BP_ShippingAcct_ID = "C_BP_ShippingAcct_ID";
/** Set Business Partner Shipping Account */
public void setC_BP_ShippingAcct_ID (int C_BP_ShippingAcct_ID);
/** Get Business Partner Shipping Account */
public int getC_BP_ShippingAcct_ID();
public org.compiere.model.I_C_BP_ShippingAcct getC_BP_ShippingAcct() throws RuntimeException;
/** Column name C_Currency_ID */
public static final String COLUMNNAME_C_Currency_ID = "C_Currency_ID";
@ -194,15 +185,6 @@ public interface I_M_ShippingTransaction
public org.compiere.model.I_C_Invoice getC_Invoice() throws RuntimeException;
/** Column name CODAmount */
public static final String COLUMNNAME_CODAmount = "CODAmount";
/** Set COD Amount */
public void setCODAmount (BigDecimal CODAmount);
/** Get COD Amount */
public BigDecimal getCODAmount();
/** Column name C_Order_ID */
public static final String COLUMNNAME_C_Order_ID = "C_Order_ID";
@ -218,22 +200,6 @@ public interface I_M_ShippingTransaction
public org.compiere.model.I_C_Order getC_Order() throws RuntimeException;
/** Column name Created */
public static final String COLUMNNAME_Created = "Created";
/** Get Created.
* Date this record was created
*/
public Timestamp getCreated();
/** Column name CreatedBy */
public static final String COLUMNNAME_CreatedBy = "CreatedBy";
/** Get Created By.
* User who created this records
*/
public int getCreatedBy();
/** Column name C_UOM_Length_ID */
public static final String COLUMNNAME_C_UOM_Length_ID = "C_UOM_Length_ID";
@ -264,6 +230,40 @@ public interface I_M_ShippingTransaction
public org.compiere.model.I_C_UOM getC_UOM_Weight() throws RuntimeException;
/** Column name CashOnDelivery */
public static final String COLUMNNAME_CashOnDelivery = "CashOnDelivery";
/** Set COD */
public void setCashOnDelivery (boolean CashOnDelivery);
/** Get COD */
public boolean isCashOnDelivery();
/** Column name CODAmount */
public static final String COLUMNNAME_CODAmount = "CODAmount";
/** Set COD Amount */
public void setCODAmount (BigDecimal CODAmount);
/** Get COD Amount */
public BigDecimal getCODAmount();
/** Column name Created */
public static final String COLUMNNAME_Created = "Created";
/** Get Created.
* Date this record was created
*/
public Timestamp getCreated();
/** Column name CreatedBy */
public static final String COLUMNNAME_CreatedBy = "CreatedBy";
/** Get Created By.
* User who created this records
*/
public int getCreatedBy();
/** Column name CustomsValue */
public static final String COLUMNNAME_CustomsValue = "CustomsValue";
@ -397,16 +397,16 @@ public interface I_M_ShippingTransaction
/** Get Height */
public BigDecimal getHeight();
/** Column name HoldAddress */
public static final String COLUMNNAME_HoldAddress = "HoldAddress";
/** Column name HoldAddress_ID */
public static final String COLUMNNAME_HoldAddress_ID = "HoldAddress_ID";
/** Set Hold Address */
public void setHoldAddress (int HoldAddress);
public void setHoldAddress_ID (int HoldAddress_ID);
/** Get Hold Address */
public int getHoldAddress();
public int getHoldAddress_ID();
public org.compiere.model.I_C_BPartner_Location getHoldAddr() throws RuntimeException;
public org.compiere.model.I_C_BPartner_Location getHoldAddress() throws RuntimeException;
/** Column name HomeDeliveryPremiumDate */
public static final String COLUMNNAME_HomeDeliveryPremiumDate = "HomeDeliveryPremiumDate";

2
org.adempiere.base/src/org/compiere/model/MPackage.java
View File

@ -521,7 +521,7 @@ public class MPackage extends X_M_Package
st.setFreightCharges(getFreightCharges());
st.setHandlingCharge(getHandlingCharge());
st.setHeight(getHeight());
st.setHoldAddress(getHoldAddress());
st.setHoldAddress_ID(getHoldAddress_ID());
st.setHomeDeliveryPremiumDate(getHomeDeliveryPremiumDate());
st.setHomeDeliveryPremiumPhone(getHomeDeliveryPremiumPhone());
st.setHomeDeliveryPremiumType(getHomeDeliveryPremiumType());

2
org.adempiere.base/src/org/compiere/model/MShippingTransaction.java
View File

@ -303,7 +303,7 @@ public class MShippingTransaction extends X_M_ShippingTransaction
public String getCountryOfManufacture(int M_Product_ID)
{
X_M_CommodityShipment commodityShipment = getCommodityShipment(M_Product_ID);
int countryId = commodityShipment.getCountryOfManufacture();
int countryId = commodityShipment.getCountryOfManufacture_ID();
X_C_Country c = new X_C_Country(getCtx(), countryId, null);
return c.getCountryCode();
}

85
org.adempiere.base/src/org/compiere/model/X_M_CommodityShipment.java
View File

@ -29,7 +29,7 @@ public class X_M_CommodityShipment extends PO implements I_M_CommodityShipment,
/**
*
*/
private static final long serialVersionUID = 20121207L;
private static final long serialVersionUID = 20130419L;
/** Standard Constructor */
public X_M_CommodityShipment (Properties ctx, int M_CommodityShipment_ID, String trxName)
@ -37,7 +37,7 @@ public class X_M_CommodityShipment extends PO implements I_M_CommodityShipment,
super (ctx, M_CommodityShipment_ID, trxName);
/** if (M_CommodityShipment_ID == 0)
{
setCountryOfManufacture (0);
setCountryOfManufacture_ID (0);
setHarmonizedCode (null);
setM_CommodityShipment_ID (0);
} */
@ -72,17 +72,20 @@ public class X_M_CommodityShipment extends PO implements I_M_CommodityShipment,
}
/** Set Country Of Manufacture.
@param CountryOfManufacture Country Of Manufacture */
public void setCountryOfManufacture (int CountryOfManufacture)
@param CountryOfManufacture_ID Country Of Manufacture */
public void setCountryOfManufacture_ID (int CountryOfManufacture_ID)
{
set_Value (COLUMNNAME_CountryOfManufacture, Integer.valueOf(CountryOfManufacture));
if (CountryOfManufacture_ID < 1)
set_Value (COLUMNNAME_CountryOfManufacture_ID, null);
else
set_Value (COLUMNNAME_CountryOfManufacture_ID, Integer.valueOf(CountryOfManufacture_ID));
}
/** Get Country Of Manufacture.
@return Country Of Manufacture */
public int getCountryOfManufacture ()
public int getCountryOfManufacture_ID ()
{
Integer ii = (Integer)get_Value(COLUMNNAME_CountryOfManufacture);
Integer ii = (Integer)get_Value(COLUMNNAME_CountryOfManufacture_ID);
if (ii == null)
return 0;
return ii.intValue();
@ -133,6 +136,40 @@ public class X_M_CommodityShipment extends PO implements I_M_CommodityShipment,
return (String)get_Value(COLUMNNAME_HarmonizedCode);
}
/** Set Commodity Shipment.
@param M_CommodityShipment_ID Commodity Shipment */
public void setM_CommodityShipment_ID (int M_CommodityShipment_ID)
{
if (M_CommodityShipment_ID < 1)
set_ValueNoCheck (COLUMNNAME_M_CommodityShipment_ID, null);
else
set_ValueNoCheck (COLUMNNAME_M_CommodityShipment_ID, Integer.valueOf(M_CommodityShipment_ID));
}
/** Get Commodity Shipment.
@return Commodity Shipment */
public int getM_CommodityShipment_ID ()
{
Integer ii = (Integer)get_Value(COLUMNNAME_M_CommodityShipment_ID);
if (ii == null)
return 0;
return ii.intValue();
}
/** Set M_CommodityShipment_UU.
@param M_CommodityShipment_UU M_CommodityShipment_UU */
public void setM_CommodityShipment_UU (String M_CommodityShipment_UU)
{
set_Value (COLUMNNAME_M_CommodityShipment_UU, M_CommodityShipment_UU);
}
/** Get M_CommodityShipment_UU.
@return M_CommodityShipment_UU */
public String getM_CommodityShipment_UU ()
{
return (String)get_Value(COLUMNNAME_M_CommodityShipment_UU);
}
public org.compiere.model.I_M_Product getM_Product() throws RuntimeException
{
return (org.compiere.model.I_M_Product)MTable.get(getCtx(), org.compiere.model.I_M_Product.Table_Name)
@ -160,38 +197,4 @@ public class X_M_CommodityShipment extends PO implements I_M_CommodityShipment,
return 0;
return ii.intValue();
}
/** Set M_CommodityShipment.
@param M_CommodityShipment_ID M_CommodityShipment */
public void setM_CommodityShipment_ID (int M_CommodityShipment_ID)
{
if (M_CommodityShipment_ID < 1)
set_ValueNoCheck (COLUMNNAME_M_CommodityShipment_ID, null);
else
set_ValueNoCheck (COLUMNNAME_M_CommodityShipment_ID, Integer.valueOf(M_CommodityShipment_ID));
}
/** Get M_CommodityShipment.
@return M_CommodityShipment */
public int getM_CommodityShipment_ID ()
{
Integer ii = (Integer)get_Value(COLUMNNAME_M_CommodityShipment_ID);
if (ii == null)
return 0;
return ii.intValue();
}
/** Set M_CommodityShipment_UU.
@param M_CommodityShipment_UU M_CommodityShipment_UU */
public void setM_CommodityShipment_UU (String M_CommodityShipment_UU)
{
set_Value (COLUMNNAME_M_CommodityShipment_UU, M_CommodityShipment_UU);
}
/** Get M_CommodityShipment_UU.
@return M_CommodityShipment_UU */
public String getM_CommodityShipment_UU ()
{
return (String)get_Value(COLUMNNAME_M_CommodityShipment_UU);
}
}

19
org.adempiere.base/src/org/compiere/model/X_M_Package.java
View File

@ -32,7 +32,7 @@ public class X_M_Package extends PO implements I_M_Package, I_Persistent
/**
*
*/
private static final long serialVersionUID = 20121212L;
private static final long serialVersionUID = 20130419L;
/** Standard Constructor */
public X_M_Package (Properties ctx, int M_Package_ID, String trxName)
@ -592,23 +592,26 @@ public class X_M_Package extends PO implements I_M_Package, I_Persistent
return bd;
}
public org.compiere.model.I_C_BPartner_Location getHoldAddr() throws RuntimeException
public org.compiere.model.I_C_BPartner_Location getHoldAddress() throws RuntimeException
{
return (org.compiere.model.I_C_BPartner_Location)MTable.get(getCtx(), org.compiere.model.I_C_BPartner_Location.Table_Name)
.getPO(getHoldAddress(), get_TrxName()); }
.getPO(getHoldAddress_ID(), get_TrxName()); }
/** Set Hold Address.
@param HoldAddress Hold Address */
public void setHoldAddress (int HoldAddress)
@param HoldAddress_ID Hold Address */
public void setHoldAddress_ID (int HoldAddress_ID)
{
set_Value (COLUMNNAME_HoldAddress, Integer.valueOf(HoldAddress));
if (HoldAddress_ID < 1)
set_Value (COLUMNNAME_HoldAddress_ID, null);
else
set_Value (COLUMNNAME_HoldAddress_ID, Integer.valueOf(HoldAddress_ID));
}
/** Get Hold Address.
@return Hold Address */
public int getHoldAddress ()
public int getHoldAddress_ID ()
{
Integer ii = (Integer)get_Value(COLUMNNAME_HoldAddress);
Integer ii = (Integer)get_Value(COLUMNNAME_HoldAddress_ID);
if (ii == null)
return 0;
return ii.intValue();

133
org.adempiere.base/src/org/compiere/model/X_M_ShippingTransaction.java
View File

@ -32,7 +32,7 @@ public class X_M_ShippingTransaction extends PO implements I_M_ShippingTransacti
/**
*
*/
private static final long serialVersionUID = 20130318L;
private static final long serialVersionUID = 20130419L;
/** Standard Constructor */
public X_M_ShippingTransaction (Properties ctx, int M_ShippingTransaction_ID, String trxName)
@ -211,25 +211,29 @@ public class X_M_ShippingTransaction extends PO implements I_M_ShippingTransacti
return ii.intValue();
}
/** Set COD.
@param CashOnDelivery COD */
public void setCashOnDelivery (boolean CashOnDelivery)
public org.compiere.model.I_C_BP_ShippingAcct getC_BP_ShippingAcct() throws RuntimeException
{
return (org.compiere.model.I_C_BP_ShippingAcct)MTable.get(getCtx(), org.compiere.model.I_C_BP_ShippingAcct.Table_Name)
.getPO(getC_BP_ShippingAcct_ID(), get_TrxName()); }
/** Set Business Partner Shipping Account.
@param C_BP_ShippingAcct_ID Business Partner Shipping Account */
public void setC_BP_ShippingAcct_ID (int C_BP_ShippingAcct_ID)
{
set_Value (COLUMNNAME_CashOnDelivery, Boolean.valueOf(CashOnDelivery));
if (C_BP_ShippingAcct_ID < 1)
set_Value (COLUMNNAME_C_BP_ShippingAcct_ID, null);
else
set_Value (COLUMNNAME_C_BP_ShippingAcct_ID, Integer.valueOf(C_BP_ShippingAcct_ID));
}
/** Get COD.
@return COD */
public boolean isCashOnDelivery ()
/** Get Business Partner Shipping Account.
@return Business Partner Shipping Account */
public int getC_BP_ShippingAcct_ID ()
{
Object oo = get_Value(COLUMNNAME_CashOnDelivery);
if (oo != null)
{
if (oo instanceof Boolean)
return ((Boolean)oo).booleanValue();
return "Y".equals(oo);
}
return false;
Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_ShippingAcct_ID);
if (ii == null)
return 0;
return ii.intValue();
}
public org.compiere.model.I_C_BPartner getC_BPartner() throws RuntimeException
@ -288,31 +292,6 @@ public class X_M_ShippingTransaction extends PO implements I_M_ShippingTransacti
return ii.intValue();
}
public org.compiere.model.I_C_BP_ShippingAcct getC_BP_ShippingAcct() throws RuntimeException
{
return (org.compiere.model.I_C_BP_ShippingAcct)MTable.get(getCtx(), org.compiere.model.I_C_BP_ShippingAcct.Table_Name)
.getPO(getC_BP_ShippingAcct_ID(), get_TrxName()); }
/** Set Business Partner Shipping Account.
@param C_BP_ShippingAcct_ID Business Partner Shipping Account */
public void setC_BP_ShippingAcct_ID (int C_BP_ShippingAcct_ID)
{
if (C_BP_ShippingAcct_ID < 1)
set_Value (COLUMNNAME_C_BP_ShippingAcct_ID, null);
else
set_Value (COLUMNNAME_C_BP_ShippingAcct_ID, Integer.valueOf(C_BP_ShippingAcct_ID));
}
/** Get Business Partner Shipping Account.
@return Business Partner Shipping Account */
public int getC_BP_ShippingAcct_ID ()
{
Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_ShippingAcct_ID);
if (ii == null)
return 0;
return ii.intValue();
}
public org.compiere.model.I_C_Currency getC_Currency() throws RuntimeException
{
return (org.compiere.model.I_C_Currency)MTable.get(getCtx(), org.compiere.model.I_C_Currency.Table_Name)
@ -369,23 +348,6 @@ public class X_M_ShippingTransaction extends PO implements I_M_ShippingTransacti
return ii.intValue();
}
/** Set COD Amount.
@param CODAmount COD Amount */
public void setCODAmount (BigDecimal CODAmount)
{
set_Value (COLUMNNAME_CODAmount, CODAmount);
}
/** Get COD Amount.
@return COD Amount */
public BigDecimal getCODAmount ()
{
BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CODAmount);
if (bd == null)
return Env.ZERO;
return bd;
}
public org.compiere.model.I_C_Order getC_Order() throws RuntimeException
{
return (org.compiere.model.I_C_Order)MTable.get(getCtx(), org.compiere.model.I_C_Order.Table_Name)
@ -470,6 +432,44 @@ public class X_M_ShippingTransaction extends PO implements I_M_ShippingTransacti
return ii.intValue();
}
/** Set COD.
@param CashOnDelivery COD */
public void setCashOnDelivery (boolean CashOnDelivery)
{
set_Value (COLUMNNAME_CashOnDelivery, Boolean.valueOf(CashOnDelivery));
}
/** Get COD.
@return COD */
public boolean isCashOnDelivery ()
{
Object oo = get_Value(COLUMNNAME_CashOnDelivery);
if (oo != null)
{
if (oo instanceof Boolean)
return ((Boolean)oo).booleanValue();
return "Y".equals(oo);
}
return false;
}
/** Set COD Amount.
@param CODAmount COD Amount */
public void setCODAmount (BigDecimal CODAmount)
{
set_Value (COLUMNNAME_CODAmount, CODAmount);
}
/** Get COD Amount.
@return COD Amount */
public BigDecimal getCODAmount ()
{
BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_CODAmount);
if (bd == null)
return Env.ZERO;
return bd;
}
/** Set Customs Value.
@param CustomsValue Customs Value */
public void setCustomsValue (BigDecimal CustomsValue)
@ -784,23 +784,26 @@ public class X_M_ShippingTransaction extends PO implements I_M_ShippingTransacti
return bd;
}
public org.compiere.model.I_C_BPartner_Location getHoldAddr() throws RuntimeException
public org.compiere.model.I_C_BPartner_Location getHoldAddress() throws RuntimeException
{
return (org.compiere.model.I_C_BPartner_Location)MTable.get(getCtx(), org.compiere.model.I_C_BPartner_Location.Table_Name)
.getPO(getHoldAddress(), get_TrxName()); }
.getPO(getHoldAddress_ID(), get_TrxName()); }
/** Set Hold Address.
@param HoldAddress Hold Address */
public void setHoldAddress (int HoldAddress)
@param HoldAddress_ID Hold Address */
public void setHoldAddress_ID (int HoldAddress_ID)
{
set_Value (COLUMNNAME_HoldAddress, Integer.valueOf(HoldAddress));
if (HoldAddress_ID < 1)
set_Value (COLUMNNAME_HoldAddress_ID, null);
else
set_Value (COLUMNNAME_HoldAddress_ID, Integer.valueOf(HoldAddress_ID));
}
/** Get Hold Address.
@return Hold Address */
public int getHoldAddress ()
public int getHoldAddress_ID ()
{
Integer ii = (Integer)get_Value(COLUMNNAME_HoldAddress);
Integer ii = (Integer)get_Value(COLUMNNAME_HoldAddress_ID);
if (ii == null)
return 0;
return ii.intValue();