Implement Feature Request [ 1789836 ] Add fields to Import Invoice - allow import charges
This commit is contained in:
parent
1707618b0a
commit
42fc2ba250
|
@ -32,16 +32,15 @@
|
|||
**********************************************************************/
|
||||
package org.compiere.model;
|
||||
|
||||
import java.util.*;
|
||||
import java.math.BigDecimal;
|
||||
import java.sql.Timestamp;
|
||||
import java.math.*;
|
||||
import org.compiere.util.*;
|
||||
import org.compiere.util.KeyNamePair;
|
||||
|
||||
/** Generated Interface for I_Invoice
|
||||
* @author Trifon Trifonov (generated)
|
||||
* @version Release 3.3.0 - 2007-08-24 11:39:48.046
|
||||
*/
|
||||
public interface I_I_Invoice
|
||||
/** Generated Interface for I_Invoice
|
||||
* @author Trifon Trifonov (generated)
|
||||
* @version Release 3.3.0
|
||||
*/
|
||||
public interface I_I_Invoice
|
||||
{
|
||||
|
||||
/** TableName=I_Invoice */
|
||||
|
@ -54,7 +53,7 @@ import org.compiere.util.*;
|
|||
|
||||
/** AccessLevel = 2 - Client
|
||||
*/
|
||||
BigDecimal accessLevel = new BigDecimal(2);
|
||||
BigDecimal accessLevel = BigDecimal.valueOf(2);
|
||||
|
||||
/** Load Meta Data */
|
||||
|
||||
|
@ -84,7 +83,16 @@ import org.compiere.util.*;
|
|||
*/
|
||||
public int getAD_User_ID();
|
||||
|
||||
public I_AD_User getI_AD_User() throws Exception;
|
||||
public I_AD_User getAD_User() throws Exception;
|
||||
|
||||
/** Column name ActivityValue */
|
||||
public static final String COLUMNNAME_ActivityValue = "ActivityValue";
|
||||
|
||||
/** Set ActivityValue */
|
||||
public void setActivityValue (String ActivityValue);
|
||||
|
||||
/** Get ActivityValue */
|
||||
public String getActivityValue();
|
||||
|
||||
/** Column name Address1 */
|
||||
public static final String COLUMNNAME_Address1 = "Address1";
|
||||
|
@ -138,7 +146,7 @@ import org.compiere.util.*;
|
|||
*/
|
||||
public int getC_Activity_ID();
|
||||
|
||||
public I_C_Activity getI_C_Activity() throws Exception;
|
||||
public I_C_Activity getC_Activity() throws Exception;
|
||||
|
||||
/** Column name C_BPartner_ID */
|
||||
public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID";
|
||||
|
@ -166,7 +174,7 @@ import org.compiere.util.*;
|
|||
*/
|
||||
public int getC_BPartner_Location_ID();
|
||||
|
||||
public I_C_BPartner_Location getI_C_BPartner_Location() throws Exception;
|
||||
public I_C_BPartner_Location getC_BPartner_Location() throws Exception;
|
||||
|
||||
/** Column name C_Campaign_ID */
|
||||
public static final String COLUMNNAME_C_Campaign_ID = "C_Campaign_ID";
|
||||
|
@ -181,7 +189,22 @@ import org.compiere.util.*;
|
|||
*/
|
||||
public int getC_Campaign_ID();
|
||||
|
||||
public I_C_Campaign getI_C_Campaign() throws Exception;
|
||||
public I_C_Campaign getC_Campaign() throws Exception;
|
||||
|
||||
/** Column name C_Charge_ID */
|
||||
public static final String COLUMNNAME_C_Charge_ID = "C_Charge_ID";
|
||||
|
||||
/** Set Charge.
|
||||
* Additional document charges
|
||||
*/
|
||||
public void setC_Charge_ID (int C_Charge_ID);
|
||||
|
||||
/** Get Charge.
|
||||
* Additional document charges
|
||||
*/
|
||||
public int getC_Charge_ID();
|
||||
|
||||
public I_C_Charge getC_Charge() throws Exception;
|
||||
|
||||
/** Column name C_Country_ID */
|
||||
public static final String COLUMNNAME_C_Country_ID = "C_Country_ID";
|
||||
|
@ -196,7 +219,7 @@ import org.compiere.util.*;
|
|||
*/
|
||||
public int getC_Country_ID();
|
||||
|
||||
public I_C_Country getI_C_Country() throws Exception;
|
||||
public I_C_Country getC_Country() throws Exception;
|
||||
|
||||
/** Column name C_Currency_ID */
|
||||
public static final String COLUMNNAME_C_Currency_ID = "C_Currency_ID";
|
||||
|
@ -211,7 +234,7 @@ import org.compiere.util.*;
|
|||
*/
|
||||
public int getC_Currency_ID();
|
||||
|
||||
public I_C_Currency getI_C_Currency() throws Exception;
|
||||
public I_C_Currency getC_Currency() throws Exception;
|
||||
|
||||
/** Column name C_DocType_ID */
|
||||
public static final String COLUMNNAME_C_DocType_ID = "C_DocType_ID";
|
||||
|
@ -226,7 +249,7 @@ import org.compiere.util.*;
|
|||
*/
|
||||
public int getC_DocType_ID();
|
||||
|
||||
public I_C_DocType getI_C_DocType() throws Exception;
|
||||
public I_C_DocType getC_DocType() throws Exception;
|
||||
|
||||
/** Column name C_InvoiceLine_ID */
|
||||
public static final String COLUMNNAME_C_InvoiceLine_ID = "C_InvoiceLine_ID";
|
||||
|
@ -280,7 +303,7 @@ import org.compiere.util.*;
|
|||
*/
|
||||
public int getC_PaymentTerm_ID();
|
||||
|
||||
public I_C_PaymentTerm getI_C_PaymentTerm() throws Exception;
|
||||
public I_C_PaymentTerm getC_PaymentTerm() throws Exception;
|
||||
|
||||
/** Column name C_Project_ID */
|
||||
public static final String COLUMNNAME_C_Project_ID = "C_Project_ID";
|
||||
|
@ -308,7 +331,7 @@ import org.compiere.util.*;
|
|||
*/
|
||||
public int getC_Region_ID();
|
||||
|
||||
public I_C_Region getI_C_Region() throws Exception;
|
||||
public I_C_Region getC_Region() throws Exception;
|
||||
|
||||
/** Column name C_Tax_ID */
|
||||
public static final String COLUMNNAME_C_Tax_ID = "C_Tax_ID";
|
||||
|
@ -323,7 +346,20 @@ import org.compiere.util.*;
|
|||
*/
|
||||
public int getC_Tax_ID();
|
||||
|
||||
public I_C_Tax getI_C_Tax() throws Exception;
|
||||
public I_C_Tax getC_Tax() throws Exception;
|
||||
|
||||
/** Column name ChargeName */
|
||||
public static final String COLUMNNAME_ChargeName = "ChargeName";
|
||||
|
||||
/** Set Charge Name.
|
||||
* Name of the Charge
|
||||
*/
|
||||
public void setChargeName (String ChargeName);
|
||||
|
||||
/** Get Charge Name.
|
||||
* Name of the Charge
|
||||
*/
|
||||
public String getChargeName();
|
||||
|
||||
/** Column name City */
|
||||
public static final String COLUMNNAME_City = "City";
|
||||
|
@ -520,7 +556,7 @@ import org.compiere.util.*;
|
|||
*/
|
||||
public int getM_PriceList_ID();
|
||||
|
||||
public I_M_PriceList getI_M_PriceList() throws Exception;
|
||||
public I_M_PriceList getM_PriceList() throws Exception;
|
||||
|
||||
/** Column name M_Product_ID */
|
||||
public static final String COLUMNNAME_M_Product_ID = "M_Product_ID";
|
||||
|
@ -635,6 +671,19 @@ import org.compiere.util.*;
|
|||
*/
|
||||
public String getProductValue();
|
||||
|
||||
/** Column name ProjectValue */
|
||||
public static final String COLUMNNAME_ProjectValue = "ProjectValue";
|
||||
|
||||
/** Set Project Key.
|
||||
* Key of the Project
|
||||
*/
|
||||
public void setProjectValue (String ProjectValue);
|
||||
|
||||
/** Get Project Key.
|
||||
* Key of the Project
|
||||
*/
|
||||
public String getProjectValue();
|
||||
|
||||
/** Column name QtyOrdered */
|
||||
public static final String COLUMNNAME_QtyOrdered = "QtyOrdered";
|
||||
|
||||
|
|
|
@ -17,12 +17,13 @@
|
|||
/** Generated Model - DO NOT CHANGE */
|
||||
package org.compiere.model;
|
||||
|
||||
import java.util.*;
|
||||
import java.sql.*;
|
||||
import java.math.*;
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.math.BigDecimal;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.Timestamp;
|
||||
import java.util.Properties;
|
||||
import java.util.logging.Level;
|
||||
import org.compiere.util.*;
|
||||
import org.compiere.util.Env;
|
||||
|
||||
/** Generated Model for I_Invoice
|
||||
* @author Adempiere (generated)
|
||||
|
@ -39,9 +40,11 @@ public class X_I_Invoice extends PO implements I_I_Invoice, I_Persistent
|
|||
public X_I_Invoice (Properties ctx, int I_Invoice_ID, String trxName)
|
||||
{
|
||||
super (ctx, I_Invoice_ID, trxName);
|
||||
/** if (I_Invoice_ID == 0) { setI_Invoice_ID (0);
|
||||
/** if (I_Invoice_ID == 0)
|
||||
{
|
||||
setI_Invoice_ID (0);
|
||||
setI_IsImported (false);
|
||||
} */
|
||||
} */
|
||||
}
|
||||
|
||||
/** Load Constructor */
|
||||
|
@ -72,17 +75,18 @@ public class X_I_Invoice extends PO implements I_I_Invoice, I_Persistent
|
|||
return sb.toString();
|
||||
}
|
||||
|
||||
/** AD_OrgTrx_ID AD_Reference_ID=130 */
|
||||
public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
||||
/** AD_OrgTrx_ID AD_Reference_ID=130 */
|
||||
public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
||||
/** Set Trx Organization.
|
||||
@param AD_OrgTrx_ID
|
||||
Performing or initiating organization
|
||||
*/
|
||||
public void setAD_OrgTrx_ID (int AD_OrgTrx_ID)
|
||||
{
|
||||
if (AD_OrgTrx_ID <= 0) set_Value (COLUMNNAME_AD_OrgTrx_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_AD_OrgTrx_ID, Integer.valueOf(AD_OrgTrx_ID));
|
||||
if (AD_OrgTrx_ID <= 0)
|
||||
set_Value (COLUMNNAME_AD_OrgTrx_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_AD_OrgTrx_ID, Integer.valueOf(AD_OrgTrx_ID));
|
||||
}
|
||||
|
||||
/** Get Trx Organization.
|
||||
|
@ -96,7 +100,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
return ii.intValue();
|
||||
}
|
||||
|
||||
public I_AD_User getI_AD_User() throws Exception
|
||||
public I_AD_User getAD_User() throws Exception
|
||||
{
|
||||
Class<?> clazz = MTable.getClass(I_AD_User.Table_Name);
|
||||
I_AD_User result = null;
|
||||
|
@ -118,9 +122,10 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setAD_User_ID (int AD_User_ID)
|
||||
{
|
||||
if (AD_User_ID <= 0) set_Value (COLUMNNAME_AD_User_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_AD_User_ID, Integer.valueOf(AD_User_ID));
|
||||
if (AD_User_ID <= 0)
|
||||
set_Value (COLUMNNAME_AD_User_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_AD_User_ID, Integer.valueOf(AD_User_ID));
|
||||
}
|
||||
|
||||
/** Get User/Contact.
|
||||
|
@ -134,12 +139,33 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
return ii.intValue();
|
||||
}
|
||||
|
||||
/** Set ActivityValue.
|
||||
@param ActivityValue ActivityValue */
|
||||
public void setActivityValue (String ActivityValue)
|
||||
{
|
||||
|
||||
if (ActivityValue != null && ActivityValue.length() > 40)
|
||||
{
|
||||
log.warning("Length > 40 - truncated");
|
||||
ActivityValue = ActivityValue.substring(0, 39);
|
||||
}
|
||||
set_Value (COLUMNNAME_ActivityValue, ActivityValue);
|
||||
}
|
||||
|
||||
/** Get ActivityValue.
|
||||
@return ActivityValue */
|
||||
public String getActivityValue ()
|
||||
{
|
||||
return (String)get_Value(COLUMNNAME_ActivityValue);
|
||||
}
|
||||
|
||||
/** Set Address 1.
|
||||
@param Address1
|
||||
Address line 1 for this location
|
||||
*/
|
||||
public void setAddress1 (String Address1)
|
||||
{
|
||||
|
||||
if (Address1 != null && Address1.length() > 60)
|
||||
{
|
||||
log.warning("Length > 60 - truncated");
|
||||
|
@ -162,6 +188,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setAddress2 (String Address2)
|
||||
{
|
||||
|
||||
if (Address2 != null && Address2.length() > 60)
|
||||
{
|
||||
log.warning("Length > 60 - truncated");
|
||||
|
@ -184,6 +211,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setBPartnerValue (String BPartnerValue)
|
||||
{
|
||||
|
||||
if (BPartnerValue != null && BPartnerValue.length() > 40)
|
||||
{
|
||||
log.warning("Length > 40 - truncated");
|
||||
|
@ -200,7 +228,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
return (String)get_Value(COLUMNNAME_BPartnerValue);
|
||||
}
|
||||
|
||||
public I_C_Activity getI_C_Activity() throws Exception
|
||||
public I_C_Activity getC_Activity() throws Exception
|
||||
{
|
||||
Class<?> clazz = MTable.getClass(I_C_Activity.Table_Name);
|
||||
I_C_Activity result = null;
|
||||
|
@ -222,9 +250,10 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setC_Activity_ID (int C_Activity_ID)
|
||||
{
|
||||
if (C_Activity_ID <= 0) set_Value (COLUMNNAME_C_Activity_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_Activity_ID, Integer.valueOf(C_Activity_ID));
|
||||
if (C_Activity_ID <= 0)
|
||||
set_Value (COLUMNNAME_C_Activity_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_Activity_ID, Integer.valueOf(C_Activity_ID));
|
||||
}
|
||||
|
||||
/** Get Activity.
|
||||
|
@ -244,9 +273,10 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setC_BPartner_ID (int C_BPartner_ID)
|
||||
{
|
||||
if (C_BPartner_ID <= 0) set_Value (COLUMNNAME_C_BPartner_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_BPartner_ID, Integer.valueOf(C_BPartner_ID));
|
||||
if (C_BPartner_ID <= 0)
|
||||
set_Value (COLUMNNAME_C_BPartner_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_BPartner_ID, Integer.valueOf(C_BPartner_ID));
|
||||
}
|
||||
|
||||
/** Get Business Partner .
|
||||
|
@ -260,7 +290,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
return ii.intValue();
|
||||
}
|
||||
|
||||
public I_C_BPartner_Location getI_C_BPartner_Location() throws Exception
|
||||
public I_C_BPartner_Location getC_BPartner_Location() throws Exception
|
||||
{
|
||||
Class<?> clazz = MTable.getClass(I_C_BPartner_Location.Table_Name);
|
||||
I_C_BPartner_Location result = null;
|
||||
|
@ -282,9 +312,10 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setC_BPartner_Location_ID (int C_BPartner_Location_ID)
|
||||
{
|
||||
if (C_BPartner_Location_ID <= 0) set_Value (COLUMNNAME_C_BPartner_Location_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_BPartner_Location_ID, Integer.valueOf(C_BPartner_Location_ID));
|
||||
if (C_BPartner_Location_ID <= 0)
|
||||
set_Value (COLUMNNAME_C_BPartner_Location_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_BPartner_Location_ID, Integer.valueOf(C_BPartner_Location_ID));
|
||||
}
|
||||
|
||||
/** Get Partner Location.
|
||||
|
@ -298,7 +329,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
return ii.intValue();
|
||||
}
|
||||
|
||||
public I_C_Campaign getI_C_Campaign() throws Exception
|
||||
public I_C_Campaign getC_Campaign() throws Exception
|
||||
{
|
||||
Class<?> clazz = MTable.getClass(I_C_Campaign.Table_Name);
|
||||
I_C_Campaign result = null;
|
||||
|
@ -320,9 +351,10 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setC_Campaign_ID (int C_Campaign_ID)
|
||||
{
|
||||
if (C_Campaign_ID <= 0) set_Value (COLUMNNAME_C_Campaign_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_Campaign_ID, Integer.valueOf(C_Campaign_ID));
|
||||
if (C_Campaign_ID <= 0)
|
||||
set_Value (COLUMNNAME_C_Campaign_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_Campaign_ID, Integer.valueOf(C_Campaign_ID));
|
||||
}
|
||||
|
||||
/** Get Campaign.
|
||||
|
@ -336,7 +368,46 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
return ii.intValue();
|
||||
}
|
||||
|
||||
public I_C_Country getI_C_Country() throws Exception
|
||||
public I_C_Charge getC_Charge() throws Exception
|
||||
{
|
||||
Class<?> clazz = MTable.getClass(I_C_Charge.Table_Name);
|
||||
I_C_Charge result = null;
|
||||
try {
|
||||
Constructor<?> constructor = null;
|
||||
constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class});
|
||||
result = (I_C_Charge)constructor.newInstance(new Object[] {getCtx(), new Integer(getC_Charge_ID()), get_TrxName()});
|
||||
} catch (Exception e) {
|
||||
log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
|
||||
log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
|
||||
throw e;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/** Set Charge.
|
||||
@param C_Charge_ID
|
||||
Additional document charges
|
||||
*/
|
||||
public void setC_Charge_ID (int C_Charge_ID)
|
||||
{
|
||||
if (C_Charge_ID <= 0)
|
||||
set_Value (COLUMNNAME_C_Charge_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_Charge_ID, Integer.valueOf(C_Charge_ID));
|
||||
}
|
||||
|
||||
/** Get Charge.
|
||||
@return Additional document charges
|
||||
*/
|
||||
public int getC_Charge_ID ()
|
||||
{
|
||||
Integer ii = (Integer)get_Value(COLUMNNAME_C_Charge_ID);
|
||||
if (ii == null)
|
||||
return 0;
|
||||
return ii.intValue();
|
||||
}
|
||||
|
||||
public I_C_Country getC_Country() throws Exception
|
||||
{
|
||||
Class<?> clazz = MTable.getClass(I_C_Country.Table_Name);
|
||||
I_C_Country result = null;
|
||||
|
@ -358,9 +429,10 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setC_Country_ID (int C_Country_ID)
|
||||
{
|
||||
if (C_Country_ID <= 0) set_Value (COLUMNNAME_C_Country_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_Country_ID, Integer.valueOf(C_Country_ID));
|
||||
if (C_Country_ID <= 0)
|
||||
set_Value (COLUMNNAME_C_Country_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_Country_ID, Integer.valueOf(C_Country_ID));
|
||||
}
|
||||
|
||||
/** Get Country.
|
||||
|
@ -374,7 +446,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
return ii.intValue();
|
||||
}
|
||||
|
||||
public I_C_Currency getI_C_Currency() throws Exception
|
||||
public I_C_Currency getC_Currency() throws Exception
|
||||
{
|
||||
Class<?> clazz = MTable.getClass(I_C_Currency.Table_Name);
|
||||
I_C_Currency result = null;
|
||||
|
@ -396,9 +468,10 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setC_Currency_ID (int C_Currency_ID)
|
||||
{
|
||||
if (C_Currency_ID <= 0) set_Value (COLUMNNAME_C_Currency_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_Currency_ID, Integer.valueOf(C_Currency_ID));
|
||||
if (C_Currency_ID <= 0)
|
||||
set_Value (COLUMNNAME_C_Currency_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_Currency_ID, Integer.valueOf(C_Currency_ID));
|
||||
}
|
||||
|
||||
/** Get Currency.
|
||||
|
@ -412,7 +485,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
return ii.intValue();
|
||||
}
|
||||
|
||||
public I_C_DocType getI_C_DocType() throws Exception
|
||||
public I_C_DocType getC_DocType() throws Exception
|
||||
{
|
||||
Class<?> clazz = MTable.getClass(I_C_DocType.Table_Name);
|
||||
I_C_DocType result = null;
|
||||
|
@ -434,9 +507,10 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setC_DocType_ID (int C_DocType_ID)
|
||||
{
|
||||
if (C_DocType_ID <= 0) set_Value (COLUMNNAME_C_DocType_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_DocType_ID, Integer.valueOf(C_DocType_ID));
|
||||
if (C_DocType_ID <= 0)
|
||||
set_Value (COLUMNNAME_C_DocType_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_DocType_ID, Integer.valueOf(C_DocType_ID));
|
||||
}
|
||||
|
||||
/** Get Document Type.
|
||||
|
@ -456,9 +530,10 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setC_InvoiceLine_ID (int C_InvoiceLine_ID)
|
||||
{
|
||||
if (C_InvoiceLine_ID <= 0) set_Value (COLUMNNAME_C_InvoiceLine_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_InvoiceLine_ID, Integer.valueOf(C_InvoiceLine_ID));
|
||||
if (C_InvoiceLine_ID <= 0)
|
||||
set_Value (COLUMNNAME_C_InvoiceLine_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_InvoiceLine_ID, Integer.valueOf(C_InvoiceLine_ID));
|
||||
}
|
||||
|
||||
/** Get Invoice Line.
|
||||
|
@ -478,9 +553,10 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setC_Invoice_ID (int C_Invoice_ID)
|
||||
{
|
||||
if (C_Invoice_ID <= 0) set_Value (COLUMNNAME_C_Invoice_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_Invoice_ID, Integer.valueOf(C_Invoice_ID));
|
||||
if (C_Invoice_ID <= 0)
|
||||
set_Value (COLUMNNAME_C_Invoice_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_Invoice_ID, Integer.valueOf(C_Invoice_ID));
|
||||
}
|
||||
|
||||
/** Get Invoice.
|
||||
|
@ -500,9 +576,10 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setC_Location_ID (int C_Location_ID)
|
||||
{
|
||||
if (C_Location_ID <= 0) set_Value (COLUMNNAME_C_Location_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_Location_ID, Integer.valueOf(C_Location_ID));
|
||||
if (C_Location_ID <= 0)
|
||||
set_Value (COLUMNNAME_C_Location_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_Location_ID, Integer.valueOf(C_Location_ID));
|
||||
}
|
||||
|
||||
/** Get Address.
|
||||
|
@ -516,7 +593,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
return ii.intValue();
|
||||
}
|
||||
|
||||
public I_C_PaymentTerm getI_C_PaymentTerm() throws Exception
|
||||
public I_C_PaymentTerm getC_PaymentTerm() throws Exception
|
||||
{
|
||||
Class<?> clazz = MTable.getClass(I_C_PaymentTerm.Table_Name);
|
||||
I_C_PaymentTerm result = null;
|
||||
|
@ -538,9 +615,10 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setC_PaymentTerm_ID (int C_PaymentTerm_ID)
|
||||
{
|
||||
if (C_PaymentTerm_ID <= 0) set_Value (COLUMNNAME_C_PaymentTerm_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_PaymentTerm_ID, Integer.valueOf(C_PaymentTerm_ID));
|
||||
if (C_PaymentTerm_ID <= 0)
|
||||
set_Value (COLUMNNAME_C_PaymentTerm_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_PaymentTerm_ID, Integer.valueOf(C_PaymentTerm_ID));
|
||||
}
|
||||
|
||||
/** Get Payment Term.
|
||||
|
@ -560,9 +638,10 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setC_Project_ID (int C_Project_ID)
|
||||
{
|
||||
if (C_Project_ID <= 0) set_Value (COLUMNNAME_C_Project_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_Project_ID, Integer.valueOf(C_Project_ID));
|
||||
if (C_Project_ID <= 0)
|
||||
set_Value (COLUMNNAME_C_Project_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_Project_ID, Integer.valueOf(C_Project_ID));
|
||||
}
|
||||
|
||||
/** Get Project.
|
||||
|
@ -576,7 +655,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
return ii.intValue();
|
||||
}
|
||||
|
||||
public I_C_Region getI_C_Region() throws Exception
|
||||
public I_C_Region getC_Region() throws Exception
|
||||
{
|
||||
Class<?> clazz = MTable.getClass(I_C_Region.Table_Name);
|
||||
I_C_Region result = null;
|
||||
|
@ -598,9 +677,10 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setC_Region_ID (int C_Region_ID)
|
||||
{
|
||||
if (C_Region_ID <= 0) set_Value (COLUMNNAME_C_Region_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_Region_ID, Integer.valueOf(C_Region_ID));
|
||||
if (C_Region_ID <= 0)
|
||||
set_Value (COLUMNNAME_C_Region_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_Region_ID, Integer.valueOf(C_Region_ID));
|
||||
}
|
||||
|
||||
/** Get Region.
|
||||
|
@ -614,7 +694,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
return ii.intValue();
|
||||
}
|
||||
|
||||
public I_C_Tax getI_C_Tax() throws Exception
|
||||
public I_C_Tax getC_Tax() throws Exception
|
||||
{
|
||||
Class<?> clazz = MTable.getClass(I_C_Tax.Table_Name);
|
||||
I_C_Tax result = null;
|
||||
|
@ -636,9 +716,10 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setC_Tax_ID (int C_Tax_ID)
|
||||
{
|
||||
if (C_Tax_ID <= 0) set_Value (COLUMNNAME_C_Tax_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_Tax_ID, Integer.valueOf(C_Tax_ID));
|
||||
if (C_Tax_ID <= 0)
|
||||
set_Value (COLUMNNAME_C_Tax_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_C_Tax_ID, Integer.valueOf(C_Tax_ID));
|
||||
}
|
||||
|
||||
/** Get Tax.
|
||||
|
@ -652,12 +733,36 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
return ii.intValue();
|
||||
}
|
||||
|
||||
/** Set Charge Name.
|
||||
@param ChargeName
|
||||
Name of the Charge
|
||||
*/
|
||||
public void setChargeName (String ChargeName)
|
||||
{
|
||||
|
||||
if (ChargeName != null && ChargeName.length() > 60)
|
||||
{
|
||||
log.warning("Length > 60 - truncated");
|
||||
ChargeName = ChargeName.substring(0, 59);
|
||||
}
|
||||
set_Value (COLUMNNAME_ChargeName, ChargeName);
|
||||
}
|
||||
|
||||
/** Get Charge Name.
|
||||
@return Name of the Charge
|
||||
*/
|
||||
public String getChargeName ()
|
||||
{
|
||||
return (String)get_Value(COLUMNNAME_ChargeName);
|
||||
}
|
||||
|
||||
/** Set City.
|
||||
@param City
|
||||
Identifies a City
|
||||
*/
|
||||
public void setCity (String City)
|
||||
{
|
||||
|
||||
if (City != null && City.length() > 60)
|
||||
{
|
||||
log.warning("Length > 60 - truncated");
|
||||
|
@ -680,6 +785,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setContactName (String ContactName)
|
||||
{
|
||||
|
||||
if (ContactName != null && ContactName.length() > 60)
|
||||
{
|
||||
log.warning("Length > 60 - truncated");
|
||||
|
@ -760,6 +866,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setDescription (String Description)
|
||||
{
|
||||
|
||||
if (Description != null && Description.length() > 255)
|
||||
{
|
||||
log.warning("Length > 255 - truncated");
|
||||
|
@ -782,6 +889,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setDocTypeName (String DocTypeName)
|
||||
{
|
||||
|
||||
if (DocTypeName != null && DocTypeName.length() > 60)
|
||||
{
|
||||
log.warning("Length > 60 - truncated");
|
||||
|
@ -804,6 +912,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setDocumentNo (String DocumentNo)
|
||||
{
|
||||
|
||||
if (DocumentNo != null && DocumentNo.length() > 30)
|
||||
{
|
||||
log.warning("Length > 30 - truncated");
|
||||
|
@ -826,6 +935,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setEMail (String EMail)
|
||||
{
|
||||
|
||||
if (EMail != null && EMail.length() > 60)
|
||||
{
|
||||
log.warning("Length > 60 - truncated");
|
||||
|
@ -848,6 +958,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setI_ErrorMsg (String I_ErrorMsg)
|
||||
{
|
||||
|
||||
if (I_ErrorMsg != null && I_ErrorMsg.length() > 2000)
|
||||
{
|
||||
log.warning("Length > 2000 - truncated");
|
||||
|
@ -940,6 +1051,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setLineDescription (String LineDescription)
|
||||
{
|
||||
|
||||
if (LineDescription != null && LineDescription.length() > 255)
|
||||
{
|
||||
log.warning("Length > 255 - truncated");
|
||||
|
@ -956,7 +1068,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
return (String)get_Value(COLUMNNAME_LineDescription);
|
||||
}
|
||||
|
||||
public I_M_PriceList getI_M_PriceList() throws Exception
|
||||
public I_M_PriceList getM_PriceList() throws Exception
|
||||
{
|
||||
Class<?> clazz = MTable.getClass(I_M_PriceList.Table_Name);
|
||||
I_M_PriceList result = null;
|
||||
|
@ -978,9 +1090,10 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setM_PriceList_ID (int M_PriceList_ID)
|
||||
{
|
||||
if (M_PriceList_ID <= 0) set_Value (COLUMNNAME_M_PriceList_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_M_PriceList_ID, Integer.valueOf(M_PriceList_ID));
|
||||
if (M_PriceList_ID <= 0)
|
||||
set_Value (COLUMNNAME_M_PriceList_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_M_PriceList_ID, Integer.valueOf(M_PriceList_ID));
|
||||
}
|
||||
|
||||
/** Get Price List.
|
||||
|
@ -1000,9 +1113,10 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setM_Product_ID (int M_Product_ID)
|
||||
{
|
||||
if (M_Product_ID <= 0) set_Value (COLUMNNAME_M_Product_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_M_Product_ID, Integer.valueOf(M_Product_ID));
|
||||
if (M_Product_ID <= 0)
|
||||
set_Value (COLUMNNAME_M_Product_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_M_Product_ID, Integer.valueOf(M_Product_ID));
|
||||
}
|
||||
|
||||
/** Get Product.
|
||||
|
@ -1022,6 +1136,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setName (String Name)
|
||||
{
|
||||
|
||||
if (Name != null && Name.length() > 60)
|
||||
{
|
||||
log.warning("Length > 60 - truncated");
|
||||
|
@ -1044,6 +1159,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setPaymentTermValue (String PaymentTermValue)
|
||||
{
|
||||
|
||||
if (PaymentTermValue != null && PaymentTermValue.length() > 40)
|
||||
{
|
||||
log.warning("Length > 40 - truncated");
|
||||
|
@ -1066,6 +1182,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setPhone (String Phone)
|
||||
{
|
||||
|
||||
if (Phone != null && Phone.length() > 40)
|
||||
{
|
||||
log.warning("Length > 40 - truncated");
|
||||
|
@ -1088,6 +1205,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setPostal (String Postal)
|
||||
{
|
||||
|
||||
if (Postal != null && Postal.length() > 10)
|
||||
{
|
||||
log.warning("Length > 10 - truncated");
|
||||
|
@ -1156,7 +1274,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
}
|
||||
|
||||
/** Get Process Now.
|
||||
@return Process Now */
|
||||
@return Process Now */
|
||||
public boolean isProcessing ()
|
||||
{
|
||||
Object oo = get_Value(COLUMNNAME_Processing);
|
||||
|
@ -1175,6 +1293,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setProductValue (String ProductValue)
|
||||
{
|
||||
|
||||
if (ProductValue != null && ProductValue.length() > 40)
|
||||
{
|
||||
log.warning("Length > 40 - truncated");
|
||||
|
@ -1191,6 +1310,29 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
return (String)get_Value(COLUMNNAME_ProductValue);
|
||||
}
|
||||
|
||||
/** Set Project Key.
|
||||
@param ProjectValue
|
||||
Key of the Project
|
||||
*/
|
||||
public void setProjectValue (String ProjectValue)
|
||||
{
|
||||
|
||||
if (ProjectValue != null && ProjectValue.length() > 40)
|
||||
{
|
||||
log.warning("Length > 40 - truncated");
|
||||
ProjectValue = ProjectValue.substring(0, 39);
|
||||
}
|
||||
set_Value (COLUMNNAME_ProjectValue, ProjectValue);
|
||||
}
|
||||
|
||||
/** Get Project Key.
|
||||
@return Key of the Project
|
||||
*/
|
||||
public String getProjectValue ()
|
||||
{
|
||||
return (String)get_Value(COLUMNNAME_ProjectValue);
|
||||
}
|
||||
|
||||
/** Set Ordered Quantity.
|
||||
@param QtyOrdered
|
||||
Ordered Quantity
|
||||
|
@ -1217,6 +1359,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setRegionName (String RegionName)
|
||||
{
|
||||
|
||||
if (RegionName != null && RegionName.length() > 60)
|
||||
{
|
||||
log.warning("Length > 60 - truncated");
|
||||
|
@ -1239,6 +1382,7 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
*/
|
||||
public void setSKU (String SKU)
|
||||
{
|
||||
|
||||
if (SKU != null && SKU.length() > 30)
|
||||
{
|
||||
log.warning("Length > 30 - truncated");
|
||||
|
@ -1255,17 +1399,18 @@ public static final int AD_ORGTRX_ID_AD_Reference_ID=130;
|
|||
return (String)get_Value(COLUMNNAME_SKU);
|
||||
}
|
||||
|
||||
/** SalesRep_ID AD_Reference_ID=190 */
|
||||
public static final int SALESREP_ID_AD_Reference_ID=190;
|
||||
/** SalesRep_ID AD_Reference_ID=190 */
|
||||
public static final int SALESREP_ID_AD_Reference_ID=190;
|
||||
/** Set Sales Representative.
|
||||
@param SalesRep_ID
|
||||
Sales Representative or Company Agent
|
||||
*/
|
||||
public void setSalesRep_ID (int SalesRep_ID)
|
||||
{
|
||||
if (SalesRep_ID <= 0) set_Value (COLUMNNAME_SalesRep_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_SalesRep_ID, Integer.valueOf(SalesRep_ID));
|
||||
if (SalesRep_ID <= 0)
|
||||
set_Value (COLUMNNAME_SalesRep_ID, null);
|
||||
else
|
||||
set_Value (COLUMNNAME_SalesRep_ID, Integer.valueOf(SalesRep_ID));
|
||||
}
|
||||
|
||||
/** Get Sales Representative.
|
||||
|
@ -1305,6 +1450,7 @@ public static final int SALESREP_ID_AD_Reference_ID=190;
|
|||
*/
|
||||
public void setTaxIndicator (String TaxIndicator)
|
||||
{
|
||||
|
||||
if (TaxIndicator != null && TaxIndicator.length() > 5)
|
||||
{
|
||||
log.warning("Length > 5 - truncated");
|
||||
|
@ -1327,6 +1473,7 @@ public static final int SALESREP_ID_AD_Reference_ID=190;
|
|||
*/
|
||||
public void setUPC (String UPC)
|
||||
{
|
||||
|
||||
if (UPC != null && UPC.length() > 30)
|
||||
{
|
||||
log.warning("Length > 30 - truncated");
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/******************************************************************************
|
||||
* Product: Adempiere ERP & CRM Smart Business Solution *
|
||||
* Product: Adempiere ERP & CRM Smart Business Solution *
|
||||
* Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved. *
|
||||
* This program is free software; you can redistribute it and/or modify it *
|
||||
* under the terms version 2 of the GNU General Public License as published *
|
||||
|
@ -26,7 +26,7 @@ import org.compiere.util.*;
|
|||
* Import Invoice from I_Invoice
|
||||
*
|
||||
* @author Jorg Janke
|
||||
* @version $Id: ImportInvoice.java,v 1.2 2006/07/30 00:51:01 jjanke Exp $
|
||||
* @version $Id: ImportInvoice.java,v 1.1 2007/09/05 09:27:31 cruiz Exp $
|
||||
*/
|
||||
public class ImportInvoice extends SvrProcess
|
||||
{
|
||||
|
@ -244,6 +244,52 @@ public class ImportInvoice extends SvrProcess
|
|||
if (no != 0)
|
||||
log.warning ("No PaymentTerm=" + no);
|
||||
|
||||
// globalqss - Add project and activity
|
||||
// Project
|
||||
sql = new StringBuffer ("UPDATE I_Invoice o "
|
||||
+ "SET C_Project_ID=(SELECT C_Project_ID FROM C_Project p"
|
||||
+ " WHERE o.ProjectValue=p.Value AND o.AD_Client_ID=p.AD_Client_ID) "
|
||||
+ "WHERE C_Project_ID IS NULL AND ProjectValue IS NOT NULL AND I_IsImported<>'Y'").append (clientCheck);
|
||||
no = DB.executeUpdate(sql.toString(), get_TrxName());
|
||||
log.fine("Set Project=" + no);
|
||||
sql = new StringBuffer ("UPDATE I_Invoice "
|
||||
+ "SET I_IsImported='E', I_ErrorMsg=I_ErrorMsg||'ERR=Invalid Project, ' "
|
||||
+ "WHERE C_Project_ID IS NULL AND (ProjectValue IS NOT NULL)"
|
||||
+ " AND I_IsImported<>'Y'").append (clientCheck);
|
||||
no = DB.executeUpdate(sql.toString(), get_TrxName());
|
||||
if (no != 0)
|
||||
log.warning ("Invalid Project=" + no);
|
||||
// Activity
|
||||
sql = new StringBuffer ("UPDATE I_Invoice o "
|
||||
+ "SET C_Activity_ID=(SELECT C_Activity_ID FROM C_Activity p"
|
||||
+ " WHERE o.ActivityValue=p.Value AND o.AD_Client_ID=p.AD_Client_ID) "
|
||||
+ "WHERE C_Activity_ID IS NULL AND ActivityValue IS NOT NULL AND I_IsImported<>'Y'").append (clientCheck);
|
||||
no = DB.executeUpdate(sql.toString(), get_TrxName());
|
||||
log.fine("Set Activity=" + no);
|
||||
sql = new StringBuffer ("UPDATE I_Invoice "
|
||||
+ "SET I_IsImported='E', I_ErrorMsg=I_ErrorMsg||'ERR=Invalid Activity, ' "
|
||||
+ "WHERE C_Activity_ID IS NULL AND (ActivityValue IS NOT NULL)"
|
||||
+ " AND I_IsImported<>'Y'").append (clientCheck);
|
||||
no = DB.executeUpdate(sql.toString(), get_TrxName());
|
||||
if (no != 0)
|
||||
log.warning ("Invalid Activity=" + no);
|
||||
// globalqss - add charge
|
||||
// Charge
|
||||
sql = new StringBuffer ("UPDATE I_Invoice o "
|
||||
+ "SET C_Charge_ID=(SELECT C_Charge_ID FROM C_Charge p"
|
||||
+ " WHERE o.ChargeName=p.Name AND o.AD_Client_ID=p.AD_Client_ID) "
|
||||
+ "WHERE C_Charge_ID IS NULL AND ChargeName IS NOT NULL AND I_IsImported<>'Y'").append (clientCheck);
|
||||
no = DB.executeUpdate(sql.toString(), get_TrxName());
|
||||
log.fine("Set Charge=" + no);
|
||||
sql = new StringBuffer ("UPDATE I_Invoice "
|
||||
+ "SET I_IsImported='E', I_ErrorMsg=I_ErrorMsg||'ERR=Invalid Charge, ' "
|
||||
+ "WHERE C_Charge_ID IS NULL AND (ChargeName IS NOT NULL)"
|
||||
+ " AND I_IsImported<>'Y'").append (clientCheck);
|
||||
no = DB.executeUpdate(sql.toString(), get_TrxName());
|
||||
if (no != 0)
|
||||
log.warning ("Invalid Charge=" + no);
|
||||
//
|
||||
|
||||
// BP from EMail
|
||||
sql = new StringBuffer ("UPDATE I_Invoice o "
|
||||
+ "SET (C_BPartner_ID,AD_User_ID)=(SELECT C_BPartner_ID,AD_User_ID FROM AD_User u"
|
||||
|
@ -394,7 +440,16 @@ public class ImportInvoice extends SvrProcess
|
|||
if (no != 0)
|
||||
log.warning ("Invalid Product=" + no);
|
||||
|
||||
// Tax
|
||||
// globalqss - charge and product are exclusive
|
||||
sql = new StringBuffer ("UPDATE I_Invoice "
|
||||
+ "SET I_IsImported='E', I_ErrorMsg=I_ErrorMsg||'ERR=Product and Charge, ' "
|
||||
+ "WHERE M_Product_ID IS NOT NULL AND C_Charge_ID IS NOT NULL "
|
||||
+ " AND I_IsImported<>'Y'").append (clientCheck);
|
||||
no = DB.executeUpdate(sql.toString(), get_TrxName());
|
||||
if (no != 0)
|
||||
log.warning ("Invalid Product and Charge exclusive=" + no);
|
||||
|
||||
// Tax
|
||||
sql = new StringBuffer ("UPDATE I_Invoice o "
|
||||
+ "SET C_Tax_ID=(SELECT MAX(C_Tax_ID) FROM C_Tax t"
|
||||
+ " WHERE o.TaxIndicator=t.TaxIndicator AND o.AD_Client_ID=t.AD_Client_ID) "
|
||||
|
@ -637,6 +692,10 @@ public class ImportInvoice extends SvrProcess
|
|||
lineNo += 10;
|
||||
if (imp.getM_Product_ID() != 0)
|
||||
line.setM_Product_ID(imp.getM_Product_ID(), true);
|
||||
// globalqss - import invoice with charges
|
||||
if (imp.getC_Charge_ID() != 0)
|
||||
line.setC_Charge_ID(imp.getC_Charge_ID());
|
||||
//
|
||||
line.setQty(imp.getQtyOrdered());
|
||||
line.setPrice();
|
||||
BigDecimal price = imp.getPriceActual();
|
||||
|
|
|
@ -0,0 +1,178 @@
|
|||
-- [ 1789836 ] Add fields to Import Invoice - allow import charges
|
||||
-- http://sourceforge.net/tracker/index.php?func=detail&aid=1789836&group_id=176962&atid=879335
|
||||
|
||||
ALTER TABLE I_INVOICE ADD (projectvalue NVARCHAR2(40));
|
||||
|
||||
ALTER TABLE I_INVOICE ADD (activityvalue NVARCHAR2(40));
|
||||
|
||||
ALTER TABLE I_INVOICE ADD (chargename NVARCHAR2(60));
|
||||
|
||||
ALTER TABLE I_INVOICE ADD (c_charge_id NUMBER(10));
|
||||
|
||||
INSERT INTO AD_ELEMENT
|
||||
(ad_element_id, ad_client_id, ad_org_id, isactive,
|
||||
created, createdby,
|
||||
updated, updatedby,
|
||||
columnname, entitytype, NAME, printname
|
||||
)
|
||||
VALUES (53222, 0, 0, 'Y',
|
||||
TO_DATE ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
TO_DATE ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
'ActivityValue', 'U', 'ActivityValue', 'ActivityValue'
|
||||
);
|
||||
|
||||
INSERT INTO AD_COLUMN
|
||||
(ad_column_id, ad_client_id, ad_org_id, isactive,
|
||||
created,
|
||||
updated, createdby,
|
||||
updatedby, NAME, description, VERSION, entitytype,
|
||||
columnname, ad_table_id, ad_reference_id, fieldlength, iskey,
|
||||
isparent, ismandatory, isupdateable, isidentifier, istranslated,
|
||||
isencrypted, isselectioncolumn, ad_element_id, issyncdatabase,
|
||||
isalwaysupdateable
|
||||
)
|
||||
VALUES (53241, 0, 0, 'Y',
|
||||
TO_DATE ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'),
|
||||
TO_DATE ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
100, 'Project Key', 'Key of the Project', 0, 'U',
|
||||
'ProjectValue', 598, 10, 40, 'N',
|
||||
'N', 'N', 'Y', 'N', 'N',
|
||||
'N', 'N', 2118, 'Y',
|
||||
'N'
|
||||
);
|
||||
|
||||
INSERT INTO AD_COLUMN
|
||||
(ad_column_id, ad_client_id, ad_org_id, isactive,
|
||||
created,
|
||||
updated, createdby,
|
||||
updatedby, NAME, description,
|
||||
HELP,
|
||||
VERSION, entitytype, columnname, ad_table_id, ad_reference_id,
|
||||
fieldlength, iskey, isparent, ismandatory, isupdateable,
|
||||
isidentifier, istranslated, isencrypted, isselectioncolumn,
|
||||
ad_element_id, issyncdatabase, isalwaysupdateable
|
||||
)
|
||||
VALUES (53242, 0, 0, 'Y',
|
||||
TO_DATE ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'),
|
||||
TO_DATE ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
100, 'Charge', 'Additional document charges',
|
||||
'The Charge indicates a type of Charge (Handling, Shipping, Restocking)',
|
||||
0, 'U', 'C_Charge_ID', 598, 19,
|
||||
10, 'N', 'N', 'N', 'Y',
|
||||
'N', 'N', 'N', 'N',
|
||||
968, 'Y', 'N'
|
||||
);
|
||||
|
||||
INSERT INTO AD_COLUMN
|
||||
(ad_column_id, ad_client_id, ad_org_id, isactive,
|
||||
created,
|
||||
updated, createdby,
|
||||
updatedby, NAME, VERSION, entitytype, columnname, ad_table_id,
|
||||
ad_reference_id, fieldlength, iskey, isparent, ismandatory,
|
||||
isupdateable, isidentifier, istranslated, isencrypted,
|
||||
isselectioncolumn, ad_element_id, issyncdatabase,
|
||||
isalwaysupdateable
|
||||
)
|
||||
VALUES (53243, 0, 0, 'Y',
|
||||
TO_DATE ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'),
|
||||
TO_DATE ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
100, 'ActivityValue', 0, 'U', 'ActivityValue', 598,
|
||||
10, 40, 'N', 'N', 'N',
|
||||
'Y', 'N', 'N', 'N',
|
||||
'N', 53222, 'Y',
|
||||
'N'
|
||||
);
|
||||
|
||||
INSERT INTO AD_COLUMN
|
||||
(ad_column_id, ad_client_id, ad_org_id, isactive,
|
||||
created,
|
||||
updated, createdby,
|
||||
updatedby, NAME, description, VERSION, entitytype, columnname,
|
||||
ad_table_id, ad_reference_id, fieldlength, iskey, isparent,
|
||||
ismandatory, isupdateable, isidentifier, istranslated,
|
||||
isencrypted, isselectioncolumn, ad_element_id, issyncdatabase,
|
||||
isalwaysupdateable
|
||||
)
|
||||
VALUES (53244, 0, 0, 'Y',
|
||||
TO_DATE ('09/04/2007 22:54:46', 'MM/DD/YYYY HH24:MI:SS'),
|
||||
TO_DATE ('09/04/2007 22:54:46', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
100, 'Charge Name', 'Name of the Charge', 0, 'U', 'ChargeName',
|
||||
598, 10, 60, 'N', 'N',
|
||||
'N', 'Y', 'N', 'N',
|
||||
'N', 'N', 2096, 'Y',
|
||||
'N'
|
||||
);
|
||||
|
||||
INSERT INTO AD_FIELD
|
||||
(ad_field_id, ad_client_id, ad_org_id, isactive,
|
||||
created, createdby,
|
||||
updated, updatedby,
|
||||
NAME, iscentrallymaintained, ad_tab_id, ad_column_id,
|
||||
isdisplayed, displaylength, isreadonly, seqno, sortno,
|
||||
issameline, isheading, isfieldonly, isencrypted, entitytype
|
||||
)
|
||||
VALUES (53251, 0, 0, 'Y',
|
||||
TO_DATE ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
TO_DATE ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
'ActivityValue', 'Y', 510, 53243,
|
||||
'Y', 40, 'N', 498, 0,
|
||||
'N', 'N', 'N', 'N', 'U'
|
||||
);
|
||||
|
||||
INSERT INTO AD_FIELD
|
||||
(ad_field_id, ad_client_id, ad_org_id, isactive,
|
||||
created, createdby,
|
||||
updated, updatedby,
|
||||
NAME, description, iscentrallymaintained, ad_tab_id,
|
||||
ad_column_id, ad_fieldgroup_id, isdisplayed, displaylength,
|
||||
isreadonly, seqno, sortno, issameline, isheading, isfieldonly,
|
||||
isencrypted, entitytype
|
||||
)
|
||||
VALUES (53252, 0, 0, 'Y',
|
||||
TO_DATE ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
TO_DATE ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
'Project Key', 'Key of the Project', 'Y', 510,
|
||||
53241, 104, 'Y', 40,
|
||||
'N', 478, 0, 'N', 'N', 'N',
|
||||
'N', 'U'
|
||||
);
|
||||
|
||||
INSERT INTO AD_FIELD
|
||||
(ad_field_id, ad_client_id, ad_org_id, isactive,
|
||||
created, createdby,
|
||||
updated, updatedby,
|
||||
NAME, description,
|
||||
HELP,
|
||||
iscentrallymaintained, ad_tab_id, ad_column_id, isdisplayed,
|
||||
displaylength, isreadonly, seqno, sortno, issameline, isheading,
|
||||
isfieldonly, isencrypted, entitytype
|
||||
)
|
||||
VALUES (53253, 0, 0, 'Y',
|
||||
TO_DATE ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
TO_DATE ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
'Charge', 'Additional document charges',
|
||||
'The Charge indicates a type of Charge (Handling, Shipping, Restocking)',
|
||||
'Y', 510, 53242, 'Y',
|
||||
10, 'N', 392, 0, 'N', 'N',
|
||||
'N', 'N', 'U'
|
||||
);
|
||||
|
||||
INSERT INTO AD_FIELD
|
||||
(ad_field_id, ad_client_id, ad_org_id, isactive,
|
||||
created, createdby,
|
||||
updated, updatedby,
|
||||
NAME, description, iscentrallymaintained, ad_tab_id,
|
||||
ad_column_id, isdisplayed, displaylength, isreadonly, seqno,
|
||||
sortno, issameline, isheading, isfieldonly, isencrypted,
|
||||
entitytype
|
||||
)
|
||||
VALUES (53254, 0, 0, 'Y',
|
||||
TO_DATE ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
TO_DATE ('09/04/2007 22:57:16', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
'Charge Name', 'Name of the Charge', 'Y', 510,
|
||||
53244, 'Y', 40, 'N', 394,
|
||||
0, 'Y', 'N', 'N', 'N',
|
||||
'U'
|
||||
);
|
||||
|
||||
COMMIT ;
|
|
@ -0,0 +1,177 @@
|
|||
-- [ 1789836 ] Add fields to Import Invoice - allow import charges
|
||||
-- http://sourceforge.net/tracker/index.php?func=detail&aid=1789836&group_id=176962&atid=879335
|
||||
|
||||
ALTER TABLE I_INVOICE ADD COLUMN projectvalue VARCHAR(40) NULL;
|
||||
|
||||
ALTER TABLE I_INVOICE ADD COLUMN activityvalue VARCHAR(40) NULL;
|
||||
|
||||
ALTER TABLE I_INVOICE ADD COLUMN chargename VARCHAR(60) NULL;
|
||||
|
||||
ALTER TABLE I_INVOICE ADD COLUMN c_charge_id NUMERIC(10,0) NULL;
|
||||
|
||||
INSERT INTO AD_ELEMENT
|
||||
(ad_element_id, ad_client_id, ad_org_id, isactive,
|
||||
created, createdby,
|
||||
updated, updatedby,
|
||||
columnname, entitytype, NAME, printname
|
||||
)
|
||||
VALUES (53222, 0, 0, 'Y',
|
||||
TO_TIMESTAMP ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
TO_TIMESTAMP ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
'ActivityValue', 'U', 'ActivityValue', 'ActivityValue'
|
||||
);
|
||||
|
||||
INSERT INTO AD_COLUMN
|
||||
(ad_column_id, ad_client_id, ad_org_id, isactive,
|
||||
created,
|
||||
updated, createdby,
|
||||
updatedby, NAME, description, VERSION, entitytype,
|
||||
columnname, ad_table_id, ad_reference_id, fieldlength, iskey,
|
||||
isparent, ismandatory, isupdateable, isidentifier, istranslated,
|
||||
isencrypted, isselectioncolumn, ad_element_id, issyncdatabase,
|
||||
isalwaysupdateable
|
||||
)
|
||||
VALUES (53241, 0, 0, 'Y',
|
||||
TO_TIMESTAMP ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'),
|
||||
TO_TIMESTAMP ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
100, 'Project Key', 'Key of the Project', 0, 'U',
|
||||
'ProjectValue', 598, 10, 40, 'N',
|
||||
'N', 'N', 'Y', 'N', 'N',
|
||||
'N', 'N', 2118, 'Y',
|
||||
'N'
|
||||
);
|
||||
|
||||
INSERT INTO AD_COLUMN
|
||||
(ad_column_id, ad_client_id, ad_org_id, isactive,
|
||||
created,
|
||||
updated, createdby,
|
||||
updatedby, NAME, description,
|
||||
HELP,
|
||||
VERSION, entitytype, columnname, ad_table_id, ad_reference_id,
|
||||
fieldlength, iskey, isparent, ismandatory, isupdateable,
|
||||
isidentifier, istranslated, isencrypted, isselectioncolumn,
|
||||
ad_element_id, issyncdatabase, isalwaysupdateable
|
||||
)
|
||||
VALUES (53242, 0, 0, 'Y',
|
||||
TO_TIMESTAMP ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'),
|
||||
TO_TIMESTAMP ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
100, 'Charge', 'Additional document charges',
|
||||
'The Charge indicates a type of Charge (Handling, Shipping, Restocking)',
|
||||
0, 'U', 'C_Charge_ID', 598, 19,
|
||||
10, 'N', 'N', 'N', 'Y',
|
||||
'N', 'N', 'N', 'N',
|
||||
968, 'Y', 'N'
|
||||
);
|
||||
|
||||
INSERT INTO AD_COLUMN
|
||||
(ad_column_id, ad_client_id, ad_org_id, isactive,
|
||||
created,
|
||||
updated, createdby,
|
||||
updatedby, NAME, VERSION, entitytype, columnname, ad_table_id,
|
||||
ad_reference_id, fieldlength, iskey, isparent, ismandatory,
|
||||
isupdateable, isidentifier, istranslated, isencrypted,
|
||||
isselectioncolumn, ad_element_id, issyncdatabase,
|
||||
isalwaysupdateable
|
||||
)
|
||||
VALUES (53243, 0, 0, 'Y',
|
||||
TO_TIMESTAMP ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'),
|
||||
TO_TIMESTAMP ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
100, 'ActivityValue', 0, 'U', 'ActivityValue', 598,
|
||||
10, 40, 'N', 'N', 'N',
|
||||
'Y', 'N', 'N', 'N',
|
||||
'N', 53222, 'Y',
|
||||
'N'
|
||||
);
|
||||
|
||||
INSERT INTO AD_COLUMN
|
||||
(ad_column_id, ad_client_id, ad_org_id, isactive,
|
||||
created,
|
||||
updated, createdby,
|
||||
updatedby, NAME, description, VERSION, entitytype, columnname,
|
||||
ad_table_id, ad_reference_id, fieldlength, iskey, isparent,
|
||||
ismandatory, isupdateable, isidentifier, istranslated,
|
||||
isencrypted, isselectioncolumn, ad_element_id, issyncdatabase,
|
||||
isalwaysupdateable
|
||||
)
|
||||
VALUES (53244, 0, 0, 'Y',
|
||||
TO_TIMESTAMP ('09/04/2007 22:54:46', 'MM/DD/YYYY HH24:MI:SS'),
|
||||
TO_TIMESTAMP ('09/04/2007 22:54:46', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
100, 'Charge Name', 'Name of the Charge', 0, 'U', 'ChargeName',
|
||||
598, 10, 60, 'N', 'N',
|
||||
'N', 'Y', 'N', 'N',
|
||||
'N', 'N', 2096, 'Y',
|
||||
'N'
|
||||
);
|
||||
|
||||
INSERT INTO AD_FIELD
|
||||
(ad_field_id, ad_client_id, ad_org_id, isactive,
|
||||
created, createdby,
|
||||
updated, updatedby,
|
||||
NAME, iscentrallymaintained, ad_tab_id, ad_column_id,
|
||||
isdisplayed, displaylength, isreadonly, seqno, sortno,
|
||||
issameline, isheading, isfieldonly, isencrypted, entitytype
|
||||
)
|
||||
VALUES (53251, 0, 0, 'Y',
|
||||
TO_TIMESTAMP ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
TO_TIMESTAMP ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
'ActivityValue', 'Y', 510, 53243,
|
||||
'Y', 40, 'N', 498, 0,
|
||||
'N', 'N', 'N', 'N', 'U'
|
||||
);
|
||||
|
||||
INSERT INTO AD_FIELD
|
||||
(ad_field_id, ad_client_id, ad_org_id, isactive,
|
||||
created, createdby,
|
||||
updated, updatedby,
|
||||
NAME, description, iscentrallymaintained, ad_tab_id,
|
||||
ad_column_id, ad_fieldgroup_id, isdisplayed, displaylength,
|
||||
isreadonly, seqno, sortno, issameline, isheading, isfieldonly,
|
||||
isencrypted, entitytype
|
||||
)
|
||||
VALUES (53252, 0, 0, 'Y',
|
||||
TO_TIMESTAMP ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
TO_TIMESTAMP ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
'Project Key', 'Key of the Project', 'Y', 510,
|
||||
53241, 104, 'Y', 40,
|
||||
'N', 478, 0, 'N', 'N', 'N',
|
||||
'N', 'U'
|
||||
);
|
||||
|
||||
INSERT INTO AD_FIELD
|
||||
(ad_field_id, ad_client_id, ad_org_id, isactive,
|
||||
created, createdby,
|
||||
updated, updatedby,
|
||||
NAME, description,
|
||||
HELP,
|
||||
iscentrallymaintained, ad_tab_id, ad_column_id, isdisplayed,
|
||||
displaylength, isreadonly, seqno, sortno, issameline, isheading,
|
||||
isfieldonly, isencrypted, entitytype
|
||||
)
|
||||
VALUES (53253, 0, 0, 'Y',
|
||||
TO_TIMESTAMP ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
TO_TIMESTAMP ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
'Charge', 'Additional document charges',
|
||||
'The Charge indicates a type of Charge (Handling, Shipping, Restocking)',
|
||||
'Y', 510, 53242, 'Y',
|
||||
10, 'N', 392, 0, 'N', 'N',
|
||||
'N', 'N', 'U'
|
||||
);
|
||||
|
||||
INSERT INTO AD_FIELD
|
||||
(ad_field_id, ad_client_id, ad_org_id, isactive,
|
||||
created, createdby,
|
||||
updated, updatedby,
|
||||
NAME, description, iscentrallymaintained, ad_tab_id,
|
||||
ad_column_id, isdisplayed, displaylength, isreadonly, seqno,
|
||||
sortno, issameline, isheading, isfieldonly, isencrypted,
|
||||
entitytype
|
||||
)
|
||||
VALUES (53254, 0, 0, 'Y',
|
||||
TO_TIMESTAMP ('09/04/2007 22:54:47', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
TO_TIMESTAMP ('09/04/2007 22:57:16', 'MM/DD/YYYY HH24:MI:SS'), 100,
|
||||
'Charge Name', 'Name of the Charge', 'Y', 510,
|
||||
53244, 'Y', 40, 'N', 394,
|
||||
0, 'Y', 'N', 'N', 'N',
|
||||
'U'
|
||||
);
|
||||
|
Loading…
Reference in New Issue