#6713 Fixed Report Engine hardcoded tables & Added printFormatId to p…

…rintform for distribution orders.
metasfresh · May 27, 2020 · 9cec73a · 9cec73a
1 parent 18e9adb
commit 9cec73a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/....metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/print/ReportEngine.java b/....metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/print/ReportEngine.java
@@ -513,7 +513,7 @@ public void setPrinterName(String printerName)
 	{
 		if (printerName == null)
 			m_printerName = Services.get(IPrinterRoutingBL.class).getDefaultPrinterName(); // metas: us316
-		// m_printerName = Ini.getProperty(Ini.P_PRINTER); // metas: us316: commented
+			// m_printerName = Ini.getProperty(Ini.P_PRINTER); // metas: us316: commented
 		else
 			m_printerName = printerName;
 	}	// setPrinterName
@@ -1310,17 +1310,21 @@ static public ReportEngine get(Properties ctx, ProcessInfo pi)
 
 	private static final String[] DOC_BASETABLES = new String[] {
 			"C_Order", "M_InOut", "C_Invoice", "C_Project",
-			"C_DunningRunEntry", "PP_Order", "DD_Order" };
+			"C_DunningRunEntry", "PP_Order", "null", "null", "null", "null", "DD_Order" };
 	private static final String[] DOC_IDS = new String[] {
 			"C_Order_ID", "M_InOut_ID", "C_Invoice_ID", "C_Project_ID",
-			"C_DunningRunEntry_ID", "PP_Order_ID", "DD_Order_ID" };
+			"C_DunningRunEntry_ID", "PP_Order_ID", "null", "null", "null", "null", "DD_Order_ID" };
 	private static final int[] DOC_TABLE_ID = new int[] {
 			getTableId(I_C_Order.class),
 			getTableId(I_M_InOut.class),
 			getTableId(I_C_Invoice.class),
 			getTableId(I_C_Project.class),
 			I_C_DunningRunEntry.Table_ID,
 			Services.get(IADTableDAO.class).retrieveTableId(I_PP_Order.Table_Name),
+			-1,
+			-1,
+			-1,
+			-1,
 			Services.get(IADTableDAO.class).retrieveTableId(I_DD_Order.Table_Name)};
 
 	/**************************************************************************
@@ -1728,10 +1732,10 @@ private static int[] getDocumentWhat(int C_Order_ID)
 		// WalkIn Receipt, WalkIn Invoice,
 		if (DocSubType.equals("WR") || DocSubType.equals("WI"))
 			what[0] = INVOICE;
-		// WalkIn Pickup,
+			// WalkIn Pickup,
 		else if (DocSubType.equals("WP"))
 			what[0] = SHIPMENT;
-		// Offer Binding, Offer Nonbinding, Standard Order
+			// Offer Binding, Offer Nonbinding, Standard Order
 		else
 			return what;
 

diff --git a/.../system/10-de.metas.adempiere/5560130_sys_gh6713SetDistribOrderPrintFormatInPrintForm.sql b/.../system/10-de.metas.adempiere/5560130_sys_gh6713SetDistribOrderPrintFormatInPrintForm.sql
@@ -0,0 +1 @@
+update ad_printform set distrib_order_printformat_id = 50011;