Skip to content

Commit

Permalink
Merge pull request #1414 from metasfresh/gh523-metasfresh
Browse files Browse the repository at this point in the history
#523 metasfresh WIP
  • Loading branch information
metas-ts authored May 1, 2017
2 parents aaf5894 + 8ec6e46 commit 0532dbf
Show file tree
Hide file tree
Showing 374 changed files with 18,618 additions and 3,882 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@
import java.util.Properties;

import org.adempiere.acct.api.IFactAcctListenersService;
import org.adempiere.acct.api.IPostingService;
import org.adempiere.ad.callout.spi.IProgramaticCalloutProvider;
import org.adempiere.ad.dao.cache.IModelCacheService;
import org.adempiere.ad.modelvalidator.AbstractModuleInterceptor;
import org.adempiere.ad.modelvalidator.IModelValidationEngine;
import org.adempiere.ad.security.IUserRolePermissionsDAO;
import org.adempiere.util.Services;
import org.compiere.model.I_AD_Client;
import org.compiere.model.I_C_AcctSchema;
Expand All @@ -55,7 +57,6 @@
import de.metas.currency.ICurrencyDAO;
import de.metas.logging.LogManager;


/**
* Accounting module activator
*
Expand All @@ -75,11 +76,16 @@ protected void onAfterInit()

final IDocumentBL documentBL = Services.get(IDocumentBL.class);

//FRESH-539: register Reposting Handlers
// FRESH-539: register Reposting Handlers
documentBL.registerHandler(new InvoiceDocumentRepostingHandler());
documentBL.registerHandler(new PaymentDocumentRepostingHandler());
documentBL.registerHandler(new AllocationHdrDocumentRepostingHandler());
documentBL.registerHandler(new GLJournalDocumentRepostingHandler());

if (Services.get(IPostingService.class).isEnabled())
{
Services.get(IUserRolePermissionsDAO.class).setAccountingModuleActive();
}
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="${project_loc:de.metas.adempiere.adempiere.base}/src/main/java-gen&#13;&#10;&quot;-&quot;&#13;&#10;&quot;'%'&quot;&#13;&#10;&quot; '${string_prompt:TableName}' &quot;"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="de.metas.adempiere.adempiere.base"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-DPropertyFile=&quot;${project_loc:metasfresh-dist}/metasfresh.properties&quot;&#13;&#10;-Dorg.adempiere.util.GenerateModel.OnlySystemColumns=true&#13;&#10;-Dgenerate.legacy=false"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-DPropertyFile=&quot;${project_loc:metasfresh-sp80}/metasfresh.properties&quot;&#13;&#10;-Dorg.adempiere.util.GenerateModel.OnlySystemColumns=true&#13;&#10;-Dgenerate.legacy=false"/>
</launchConfiguration>
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,52 @@ public interface I_PP_Order
/** Column name Description */
public static final String COLUMNNAME_Description = "Description";

/**
* Set DLM_Level.
*
* <br>Type: Integer
* <br>Mandatory: false
* <br>Virtual Column: false
*/
public void setDLM_Level (int DLM_Level);

/**
* Get DLM_Level.
*
* <br>Type: Integer
* <br>Mandatory: false
* <br>Virtual Column: false
*/
public int getDLM_Level();

/** Column definition for DLM_Level */
public static final org.adempiere.model.ModelColumn<I_PP_Order, Object> COLUMN_DLM_Level = new org.adempiere.model.ModelColumn<I_PP_Order, Object>(I_PP_Order.class, "DLM_Level", null);
/** Column name DLM_Level */
public static final String COLUMNNAME_DLM_Level = "DLM_Level";

/**
* Set Partition.
*
* <br>Type: Integer
* <br>Mandatory: false
* <br>Virtual Column: false
*/
public void setDLM_Partition_ID (int DLM_Partition_ID);

/**
* Get Partition.
*
* <br>Type: Integer
* <br>Mandatory: false
* <br>Virtual Column: false
*/
public int getDLM_Partition_ID();

/** Column definition for DLM_Partition_ID */
public static final org.adempiere.model.ModelColumn<I_PP_Order, Object> COLUMN_DLM_Partition_ID = new org.adempiere.model.ModelColumn<I_PP_Order, Object>(I_PP_Order.class, "DLM_Partition_ID", null);
/** Column name DLM_Partition_ID */
public static final String COLUMNNAME_DLM_Partition_ID = "DLM_Partition_ID";

/**
* Set Belegverarbeitung.
* The targeted status of the document
Expand Down Expand Up @@ -1377,6 +1423,33 @@ public interface I_PP_Order
/** Column name PP_Product_BOM_ID */
public static final String COLUMNNAME_PP_Product_BOM_ID = "PP_Product_BOM_ID";

/**
* Set Product Planning.
*
* <br>Type: Search
* <br>Mandatory: false
* <br>Virtual Column: false
*/
public void setPP_Product_Planning_ID (int PP_Product_Planning_ID);

/**
* Get Product Planning.
*
* <br>Type: Search
* <br>Mandatory: false
* <br>Virtual Column: false
*/
public int getPP_Product_Planning_ID();

public org.eevolution.model.I_PP_Product_Planning getPP_Product_Planning();

public void setPP_Product_Planning(org.eevolution.model.I_PP_Product_Planning PP_Product_Planning);

/** Column definition for PP_Product_Planning_ID */
public static final org.adempiere.model.ModelColumn<I_PP_Order, org.eevolution.model.I_PP_Product_Planning> COLUMN_PP_Product_Planning_ID = new org.adempiere.model.ModelColumn<I_PP_Order, org.eevolution.model.I_PP_Product_Planning>(I_PP_Order.class, "PP_Product_Planning_ID", org.eevolution.model.I_PP_Product_Planning.class);
/** Column name PP_Product_Planning_ID */
public static final String COLUMNNAME_PP_Product_Planning_ID = "PP_Product_Planning_ID";

/**
* Set Bereitstellungsdatum.
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
/******************************************************************************
* Product: Adempiere ERP & CRM Smart Business Solution *
* Copyright (C) 1999-2007 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 *
* by the Free Software Foundation. This program is distributed in the hope *
* that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
* See the GNU General Public License for more details. *
* You should have received a copy of the GNU General Public License along *
* with this program, if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
* For the text or an alternative of this public license, you may reach us *
* ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA *
* or via info@compiere.org or http://www.compiere.org/license.html *
*****************************************************************************/
package org.eevolution.model;


Expand All @@ -32,7 +16,7 @@ public interface I_PP_Order_BOMLine

// org.compiere.util.KeyNamePair Model = new org.compiere.util.KeyNamePair(Table_ID, Table_Name);

/** AccessLevel = 3 - Client - Org
/** AccessLevel = 3 - Client - Org
*/
// java.math.BigDecimal accessLevel = java.math.BigDecimal.valueOf(3);

Expand Down Expand Up @@ -295,6 +279,52 @@ public interface I_PP_Order_BOMLine
/** Column name Description */
public static final String COLUMNNAME_Description = "Description";

/**
* Set DLM_Level.
*
* <br>Type: Integer
* <br>Mandatory: false
* <br>Virtual Column: false
*/
public void setDLM_Level (int DLM_Level);

/**
* Get DLM_Level.
*
* <br>Type: Integer
* <br>Mandatory: false
* <br>Virtual Column: false
*/
public int getDLM_Level();

/** Column definition for DLM_Level */
public static final org.adempiere.model.ModelColumn<I_PP_Order_BOMLine, Object> COLUMN_DLM_Level = new org.adempiere.model.ModelColumn<I_PP_Order_BOMLine, Object>(I_PP_Order_BOMLine.class, "DLM_Level", null);
/** Column name DLM_Level */
public static final String COLUMNNAME_DLM_Level = "DLM_Level";

/**
* Set Partition.
*
* <br>Type: Integer
* <br>Mandatory: false
* <br>Virtual Column: false
*/
public void setDLM_Partition_ID (int DLM_Partition_ID);

/**
* Get Partition.
*
* <br>Type: Integer
* <br>Mandatory: false
* <br>Virtual Column: false
*/
public int getDLM_Partition_ID();

/** Column definition for DLM_Partition_ID */
public static final org.adempiere.model.ModelColumn<I_PP_Order_BOMLine, Object> COLUMN_DLM_Partition_ID = new org.adempiere.model.ModelColumn<I_PP_Order_BOMLine, Object>(I_PP_Order_BOMLine.class, "DLM_Partition_ID", null);
/** Column name DLM_Partition_ID */
public static final String COLUMNNAME_DLM_Partition_ID = "DLM_Partition_ID";

/**
* Set Feature.
* Indicated the Feature for Product Configure
Expand Down Expand Up @@ -521,8 +551,8 @@ public interface I_PP_Order_BOMLine
public static final String COLUMNNAME_Line = "Line";

/**
* Set Ausprägung Merkmals-Satz.
* Product Attribute Set Instance
* Set Merkmale.
* Merkmals Ausprägungen zum Produkt
*
* <br>Type: PAttribute
* <br>Mandatory: false
Expand All @@ -531,8 +561,8 @@ public interface I_PP_Order_BOMLine
public void setM_AttributeSetInstance_ID (int M_AttributeSetInstance_ID);

/**
* Get Ausprägung Merkmals-Satz.
* Product Attribute Set Instance
* Get Merkmale.
* Merkmals Ausprägungen zum Produkt
*
* <br>Type: PAttribute
* <br>Mandatory: false
Expand Down Expand Up @@ -742,6 +772,35 @@ public interface I_PP_Order_BOMLine
/** Column name PP_Order_ID */
public static final String COLUMNNAME_PP_Order_ID = "PP_Order_ID";

/**
* Set BOM Line.
* BOM Line
*
* <br>Type: Search
* <br>Mandatory: false
* <br>Virtual Column: false
*/
public void setPP_Product_BOMLine_ID (int PP_Product_BOMLine_ID);

/**
* Get BOM Line.
* BOM Line
*
* <br>Type: Search
* <br>Mandatory: false
* <br>Virtual Column: false
*/
public int getPP_Product_BOMLine_ID();

public org.eevolution.model.I_PP_Product_BOMLine getPP_Product_BOMLine();

public void setPP_Product_BOMLine(org.eevolution.model.I_PP_Product_BOMLine PP_Product_BOMLine);

/** Column definition for PP_Product_BOMLine_ID */
public static final org.adempiere.model.ModelColumn<I_PP_Order_BOMLine, org.eevolution.model.I_PP_Product_BOMLine> COLUMN_PP_Product_BOMLine_ID = new org.adempiere.model.ModelColumn<I_PP_Order_BOMLine, org.eevolution.model.I_PP_Product_BOMLine>(I_PP_Order_BOMLine.class, "PP_Product_BOMLine_ID", org.eevolution.model.I_PP_Product_BOMLine.class);
/** Column name PP_Product_BOMLine_ID */
public static final String COLUMNNAME_PP_Product_BOMLine_ID = "PP_Product_BOMLine_ID";

/**
* Set Verarbeitet.
* Checkbox sagt aus, ob der Beleg verarbeitet wurde.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class X_PP_Order extends org.compiere.model.PO implements I_PP_Order, org
/**
*
*/
private static final long serialVersionUID = -15520562L;
private static final long serialVersionUID = -600634647L;

/** Standard Constructor */
public X_PP_Order (Properties ctx, int PP_Order_ID, String trxName)
Expand Down Expand Up @@ -731,6 +731,47 @@ public java.lang.String getDescription ()
return (java.lang.String)get_Value(COLUMNNAME_Description);
}

/** Set DLM_Level.
@param DLM_Level DLM_Level */
@Override
public void setDLM_Level (int DLM_Level)
{
set_Value (COLUMNNAME_DLM_Level, Integer.valueOf(DLM_Level));
}

/** Get DLM_Level.
@return DLM_Level */
@Override
public int getDLM_Level ()
{
Integer ii = (Integer)get_Value(COLUMNNAME_DLM_Level);
if (ii == null)
return 0;
return ii.intValue();
}

/** Set Partition.
@param DLM_Partition_ID Partition */
@Override
public void setDLM_Partition_ID (int DLM_Partition_ID)
{
if (DLM_Partition_ID < 1)
set_Value (COLUMNNAME_DLM_Partition_ID, null);
else
set_Value (COLUMNNAME_DLM_Partition_ID, Integer.valueOf(DLM_Partition_ID));
}

/** Get Partition.
@return Partition */
@Override
public int getDLM_Partition_ID ()
{
Integer ii = (Integer)get_Value(COLUMNNAME_DLM_Partition_ID);
if (ii == null)
return 0;
return ii.intValue();
}

/**
* DocAction AD_Reference_ID=135
* Reference name: _Document Action
Expand Down Expand Up @@ -1447,6 +1488,40 @@ public int getPP_Product_BOM_ID ()
return ii.intValue();
}

@Override
public org.eevolution.model.I_PP_Product_Planning getPP_Product_Planning() throws RuntimeException
{
return get_ValueAsPO(COLUMNNAME_PP_Product_Planning_ID, org.eevolution.model.I_PP_Product_Planning.class);
}

@Override
public void setPP_Product_Planning(org.eevolution.model.I_PP_Product_Planning PP_Product_Planning)
{
set_ValueFromPO(COLUMNNAME_PP_Product_Planning_ID, org.eevolution.model.I_PP_Product_Planning.class, PP_Product_Planning);
}

/** Set Product Planning.
@param PP_Product_Planning_ID Product Planning */
@Override
public void setPP_Product_Planning_ID (int PP_Product_Planning_ID)
{
if (PP_Product_Planning_ID < 1)
set_ValueNoCheck (COLUMNNAME_PP_Product_Planning_ID, null);
else
set_ValueNoCheck (COLUMNNAME_PP_Product_Planning_ID, Integer.valueOf(PP_Product_Planning_ID));
}

/** Get Product Planning.
@return Product Planning */
@Override
public int getPP_Product_Planning_ID ()
{
Integer ii = (Integer)get_Value(COLUMNNAME_PP_Product_Planning_ID);
if (ii == null)
return 0;
return ii.intValue();
}

/** Set Bereitstellungsdatum.
@param PreparationDate Bereitstellungsdatum */
@Override
Expand Down
Loading

0 comments on commit 0532dbf

Please sign in to comment.