midsuit
/
bali-nusa-plugin
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

This commit is contained in:
hodianto 2018-04-21 08:46:15 +07:00
parent 46acc84522 736414bba8
commit a4aad50bba
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
andromeida.midsuit.project/src/andromedia/midsuit/callout/MID_CalloutOrder.java
View File

@ -38,6 +38,7 @@ public class MID_CalloutOrder extends CalloutEngine implements IColumnCallout {
if(priceList>0)
mTab.setValue(MOrder.COLUMNNAME_M_PriceList_ID, priceList);
else
{
priceList = new Query(ctx, MPriceList.Table_Name, "AD_Client_ID =? AND AD_Org_ID =? AND IsSOPriceList =?", null)
@ -46,8 +47,7 @@ public class MID_CalloutOrder extends CalloutEngine implements IColumnCallout {
.firstId();
mTab.setValue(MOrder.COLUMNNAME_M_PriceList_ID, priceList);
}
Env.setContext(ctx, "#M_PriceList_ID", priceList);
return null;
}
}

4
andromeida.midsuit.project/src/andromedia/midsuit/factory/MID_CalloutFactory.java
View File

@ -5,7 +5,9 @@ import java.util.List;
import org.adempiere.base.IColumnCallout;
import org.adempiere.base.IColumnCalloutFactory;
import org.compiere.model.MOrder;
import andromedia.midsuit.callout.MID_CalloutOrder;
import andromedia.midsuit.callout.MID_CalloutRequisitionTrxLine;
import andromedia.midsuit.model.X_MID_RequisitionLine;
@ -16,6 +18,8 @@ public class MID_CalloutFactory implements IColumnCalloutFactory{
List<IColumnCallout> list = new ArrayList<IColumnCallout>();
if (tableName.equals(X_MID_RequisitionLine.Table_Name))
list.add(new MID_CalloutRequisitionTrxLine());
if(tableName.equals(MOrder.Table_Name))
list.add(new MID_CalloutOrder());
return list != null ? list.toArray(new IColumnCallout[0]) : new IColumnCallout[0];
}

11
andromeida.midsuit.project/src/andromedia/midsuit/factory/MID_CalloutFactory.java.rej Normal file
View File

@ -0,0 +1,11 @@
--- MID_CalloutFactory.java
+++ MID_CalloutFactory.java
@@ -16,6 +18,8 @@
List<IColumnCallout> list = new ArrayList<IColumnCallout>();
if (tableName.equals(X_MID_RequisitionLine.Table_Name))
list.add(new MID_CalloutRequisitionTrxLine());
+ if(tableName.equals(MOrder.Table_Name))
+ list.add(new MID_CalloutOrder());
return list != null ? list.toArray(new IColumnCallout[0]) : new IColumnCallout[0];
}