diff --git a/.hgignore b/.hgignore index c38dd87..d03948a 100644 --- a/.hgignore +++ b/.hgignore @@ -1,3 +1,4 @@ # Add any directories, files, or patterns you don't want to be tracked by version control syntax: glob *.class +andromeida.midsuit.project/bin/andromedia/midsuit/factory/*.rej diff --git a/andromeida.midsuit.project/src/andromedia/midsuit/factory/MID_ModelFactory.java b/andromeida.midsuit.project/src/andromedia/midsuit/factory/MID_ModelFactory.java index 5b1c3b3..2c6c596 100644 --- a/andromeida.midsuit.project/src/andromedia/midsuit/factory/MID_ModelFactory.java +++ b/andromeida.midsuit.project/src/andromedia/midsuit/factory/MID_ModelFactory.java @@ -21,7 +21,7 @@ public class MID_ModelFactory implements IModelFactory{ mapTableModels.put(MID_MRequisitionTrx.Table_Name, "andromedia.midsuit.model.MID_MRequisitionTrx"); mapTableModels.put(MID_MRequisitionTrxLine.Table_Name, "andromedia.midsuit.model.MID_MRequisitionTrxLine"); mapTableModels.put(X_zpos_Cashier.Table_Name, "andromedia.midsuit.model.X_zpos_Cashier"); -// mapTableModels.put(MID_Aging.Table_Name, "andromedia.midsuit.model.MID_Aging"); + mapTableModels.put(MID_Aging.Table_Name, "andromedia.midsuit.model.MID_Aging"); } @Override diff --git a/andromeida.midsuit.project/src/andromedia/midsuit/factory/MID_ValidatorFactory.java b/andromeida.midsuit.project/src/andromedia/midsuit/factory/MID_ValidatorFactory.java index dc33ddd..d79f80e 100644 --- a/andromeida.midsuit.project/src/andromedia/midsuit/factory/MID_ValidatorFactory.java +++ b/andromeida.midsuit.project/src/andromedia/midsuit/factory/MID_ValidatorFactory.java @@ -1,6 +1,7 @@ package andromedia.midsuit.factory; import org.adempiere.base.event.AbstractEventHandler; + import org.adempiere.base.event.IEventTopics; import org.adempiere.exceptions.AdempiereException; import org.compiere.model.MInOut; @@ -32,14 +33,14 @@ public class MID_ValidatorFactory extends AbstractEventHandler { // if (getPO(event).get_TableName().equals(MOrderLandedCostAllocation.Table_Name)) // msg = SMT_LandedCostAllocationValidator.executeEvent(event, getPO(event)); - if (getPO(event).get_TableName().equals(MOrder.Table_Name)) - msg = MID_OrderValidator.executeEvent(event, getPO(event)); - if (getPO(event).get_TableName().equals(MRMA.Table_Name)) - msg = MID_RMAValidator.executeEvent(event, getPO(event)); - if (getPO(event).get_TableName().equals(MInOut.Table_Name)) - msg = MID_InOutValidator.executeEvent(event, getPO(event)); - if(getPO(event).get_TableName().equals(MInvoice.Table_Name)) - msg = MID_InvoiceValidator.executeEvent(event, getPO(event)); +// if (getPO(event).get_TableName().equals(MOrder.Table_Name)) +// msg = MID_OrderValidator.executeEvent(event, getPO(event)); +// if (getPO(event).get_TableName().equals(MRMA.Table_Name)) +// msg = MID_RMAValidator.executeEvent(event, getPO(event)); +// if (getPO(event).get_TableName().equals(MInOut.Table_Name)) +// msg = MID_InOutValidator.executeEvent(event, getPO(event)); +// if(getPO(event).get_TableName().equals(MInvoice.Table_Name)) +// msg = MID_InvoiceValidator.executeEvent(event, getPO(event)); // if(getPO(event).get_TableName().equals(MPaymentAllocate.Table_Name)) // msg = MID_PaymentAllocateValidator.executeEvent(event, getPO(event)); // if(getPO(event).get_TableName().equals(MProductPrice.Table_Name)) @@ -77,7 +78,7 @@ public class MID_ValidatorFactory extends AbstractEventHandler { registerTableEvent(IEventTopics.PO_AFTER_CHANGE,MProductPrice.Table_Name); registerTableEvent(IEventTopics.PO_BEFORE_NEW,MPriceList.Table_Name); - registerTableEvent(IEventTopics.PO_AFTER_NEW,MInvoice.Table_Name); +// registerTableEvent(IEventTopics.PO_AFTER_NEW,MInvoice.Table_Name); } } diff --git a/andromeida.midsuit.project/src/andromedia/midsuit/model/I_zpos_Cashier.java b/andromeida.midsuit.project/src/andromedia/midsuit/model/I_zpos_Cashier.java index a25ede1..49f2770 100644 --- a/andromeida.midsuit.project/src/andromedia/midsuit/model/I_zpos_Cashier.java +++ b/andromeida.midsuit.project/src/andromedia/midsuit/model/I_zpos_Cashier.java @@ -33,7 +33,7 @@ public interface I_zpos_Cashier public static final String Table_Name = "zpos_Cashier"; /** AD_Table_ID=300006 */ - public static final int Table_ID = 30015; + public static final int Table_ID = MTable.getTable_ID(Table_Name); KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); diff --git a/andromeida.midsuit.project/src/andromedia/midsuit/process/MID_CompleteRecord.java b/andromeida.midsuit.project/src/andromedia/midsuit/process/MID_CompleteRecord.java index 660e08d..187320b 100644 --- a/andromeida.midsuit.project/src/andromedia/midsuit/process/MID_CompleteRecord.java +++ b/andromeida.midsuit.project/src/andromedia/midsuit/process/MID_CompleteRecord.java @@ -83,7 +83,7 @@ public class MID_CompleteRecord extends SvrProcess{ default : throw new AdempiereException( "Failed to Complete Document !!!"); } - return "Document Process Complete !!!"; + return ""; } } diff --git a/andromeida.midsuit.project/src/andromedia/midsuit/validator/MID_InOutValidator.java b/andromeida.midsuit.project/src/andromedia/midsuit/validator/MID_InOutValidator.java index 0e1960b..eb98ac0 100644 --- a/andromeida.midsuit.project/src/andromedia/midsuit/validator/MID_InOutValidator.java +++ b/andromeida.midsuit.project/src/andromedia/midsuit/validator/MID_InOutValidator.java @@ -24,9 +24,6 @@ public class MID_InOutValidator { .firstId(); InOut.setC_BPartner_Location_ID(C_BPartner_Location_ID); } - if(InOut.getC_Order().getDocStatus().equals("DR")) { - return "Failed to Create new Shipment / Receipt for this Order"+InOut.getC_Order().getDocumentNo(); - } return ""; } }