midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-5695 - Process audit doesn't set print language, format, print format on Forms/documents (#1805) 

* IDEMPIERE-5695 - Process audit doesn't set print language, format, print format on Forms/documents

* IDEMPIERE-5695 - get language from print format

* IDEMPIERE-5695 - fix javadoc

* IDEMPIERE-5695 - implement in startStandardReport and startFinReport
This commit is contained in:
Peter Takács 2023-05-02 11:13:55 +02:00 committed by GitHub
parent 1fb4248ab9
commit d53570eb75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 108 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
org.adempiere.base/src/org/compiere/model/MPInstance.java
View File

@ -30,6 +30,7 @@ import java.util.logging.Level;
import org.adempiere.base.Core;
import org.adempiere.base.event.EventManager;
import org.compiere.print.MPrintFormat;
import org.compiere.util.CLogger;
import org.compiere.util.DB;
import org.compiere.util.Env;
@ -664,4 +665,19 @@ public class MPInstance extends X_AD_PInstance
return true;
} // beforeSave
/**
* Set AD_PrintFormat_ID if empty, AD_Language_ID if empty and save the record.
* @param pf
*/
public void updatePrintFormatAndLanguageIfEmpty(MPrintFormat format) {
if(getAD_PrintFormat_ID() <= 0 && format.getAD_PrintFormat_ID() > 0) {
setAD_PrintFormat_ID(format.getAD_PrintFormat_ID());
saveEx();
}
if(getAD_Language_ID() <= 0 && format.getLanguage() != null) {
setAD_Language_ID(MLanguage.get(Env.getCtx(), format.getLanguage()).getAD_Language_ID());
saveEx();
}
}
} // MPInstance

108
org.adempiere.ui/src/org/compiere/print/ReportCtl.java
View File

@ -148,25 +148,25 @@ public class ReportCtl
* Order Print
*/
if (pi.getAD_Process_ID() == PROCESS_RPT_C_ORDER) // C_Order
return startDocumentPrint(ReportEngine.ORDER, pi.getRecord_ID(), parent, WindowNo, !pi.isPrintPreview());
return startDocumentPrint(ReportEngine.ORDER, pi.getRecord_ID(), parent, WindowNo, !pi.isPrintPreview(), instance);
if (pi.getAD_Process_ID() == MProcess.getProcess_ID("Rpt PP_Order", null)) // C_Order
return startDocumentPrint(ReportEngine.MANUFACTURING_ORDER, pi.getRecord_ID(), parent, WindowNo, !pi.isPrintPreview());
return startDocumentPrint(ReportEngine.MANUFACTURING_ORDER, pi.getRecord_ID(), parent, WindowNo, !pi.isPrintPreview(), instance);
if (pi.getAD_Process_ID() == MProcess.getProcess_ID("Rpt DD_Order", null)) // C_Order
return startDocumentPrint(ReportEngine.DISTRIBUTION_ORDER, pi.getRecord_ID(), parent, WindowNo, !pi.isPrintPreview());
return startDocumentPrint(ReportEngine.DISTRIBUTION_ORDER, pi.getRecord_ID(), parent, WindowNo, !pi.isPrintPreview(), instance);
else if (pi.getAD_Process_ID() == PROCESS_RPT_C_INVOICE) // C_Invoice
return startDocumentPrint(ReportEngine.INVOICE, pi.getRecord_ID(), parent, WindowNo, !pi.isPrintPreview());
return startDocumentPrint(ReportEngine.INVOICE, pi.getRecord_ID(), parent, WindowNo, !pi.isPrintPreview(), instance);
else if (pi.getAD_Process_ID() == PROCESS_RPT_M_INOUT) // M_InOut
return startDocumentPrint(ReportEngine.SHIPMENT, pi.getRecord_ID(), parent, WindowNo, !pi.isPrintPreview());
return startDocumentPrint(ReportEngine.SHIPMENT, pi.getRecord_ID(), parent, WindowNo, !pi.isPrintPreview(), instance);
else if (pi.getAD_Process_ID() == PROCESS_RPT_C_PROJECT) // C_Project
return startDocumentPrint(ReportEngine.PROJECT, pi.getRecord_ID(), parent, WindowNo, !pi.isPrintPreview());
return startDocumentPrint(ReportEngine.PROJECT, pi.getRecord_ID(), parent, WindowNo, !pi.isPrintPreview(), instance);
else if (pi.getAD_Process_ID() == PROCESS_RPT_C_RFQRESPONSE) // C_RfQResponse
return startDocumentPrint(ReportEngine.RFQ, pi.getRecord_ID(), parent, WindowNo, !pi.isPrintPreview());
return startDocumentPrint(ReportEngine.RFQ, pi.getRecord_ID(), parent, WindowNo, !pi.isPrintPreview(), instance);
else if (pi.getAD_Process_ID() == PROCESS_RPT_C_PAYMENT) // C_Payment
return startCheckPrint(pi.getRecord_ID(), !pi.isPrintPreview());
return startCheckPrint(pi.getRecord_ID(), !pi.isPrintPreview(), instance);
else if (pi.getAD_Process_ID() == PROCESS_RPT_M_INVENTORY) // Physical Inventory
return startDocumentPrint(ReportEngine.INVENTORY, pi.getRecord_ID(), parent, WindowNo, !pi.isPrintPreview());
return startDocumentPrint(ReportEngine.INVENTORY, pi.getRecord_ID(), parent, WindowNo, !pi.isPrintPreview(), instance);
else if (pi.getAD_Process_ID() == PROCESS_RPT_M_MOVEMENT) // Inventory Move
return startDocumentPrint(ReportEngine.MOVEMENT, pi.getRecord_ID(), parent, WindowNo, !pi.isPrintPreview());
return startDocumentPrint(ReportEngine.MOVEMENT, pi.getRecord_ID(), parent, WindowNo, !pi.isPrintPreview(), instance);
/**
else if (pi.getAD_Process_ID() == 290) // Movement Submission by VHARCQ
return startDocumentPrint(ReportEngine.MOVEMENT, pi.getRecord_ID(), parent, WindowNo, IsDirectPrint);
@ -179,11 +179,11 @@ public class ReportCtl
return startDocumentPrint(ReportEngine.DUNNING, pi.getRecord_ID(), parent, WindowNo, !pi.isPrintPreview());
else if (pi.getAD_Process_ID() == PROCESS_RPT_FINREPORT // Financial Report
|| pi.getAD_Process_ID() == PROCESS_RPT_FINSTATEMENT) // Financial Statement
return startFinReport (pi, WindowNo);
return startFinReport (pi, WindowNo, instance);
/********************
* Standard Report
*******************/
return startStandardReport (pi, WindowNo);
return startStandardReport (pi, WindowNo, instance);
}
finally {
instance.setIsProcessing(false);
@ -212,6 +212,20 @@ public class ReportCtl
* @return true if OK
*/
static public boolean startStandardReport (ProcessInfo pi, int WindowNo, boolean IsDirectPrint)
{
return startStandardReport(pi, WindowNo, IsDirectPrint, null);
}
/**************************************************************************
* Start Standard Report.
* - Get Table Info and submit
* @param pi Process Info
* @param WindowNo The windows number which invoked the printing
* @param IsDirectPrint if true, prints directly - otherwise View
* @param instance - AD_PInstance
* @return true if OK
*/
static public boolean startStandardReport (ProcessInfo pi, int WindowNo, boolean IsDirectPrint, MPInstance instance)
{
pi.setPrintPreview(!IsDirectPrint);
return startStandardReport(pi, WindowNo);
@ -246,6 +260,24 @@ public class ReportCtl
* @return true if OK
*/
static public boolean startStandardReport (ProcessInfo pi, int WindowNo)
{
return startStandardReport(pi, WindowNo, null);
}
/**************************************************************************
* Start Standard Report.
* - Get Table Info and submit.<br>
* A report can be created from:
* <ol>
* <li>attached MPrintFormat, if any (see {@link ProcessInfo#setTransientObject(Object)}, {@link ProcessInfo#setSerializableObject(java.io.Serializable)}
* <li>process information (AD_Process.AD_PrintFormat_ID, AD_Process.AD_ReportView_ID)
* </ol>
* @param pi Process Info
* @param WindowNo The windows number which invoked the printing
* @param instance - AD_PInstance
* @return true if OK
*/
static public boolean startStandardReport (ProcessInfo pi, int WindowNo, MPInstance instance)
{
ReportEngine re = null;
//
@ -256,6 +288,9 @@ public class ReportCtl
if (o != null && o instanceof MPrintFormat) {
Properties ctx = Env.getCtx();
MPrintFormat format = (MPrintFormat)o;
if(instance != null) {
instance.updatePrintFormatAndLanguageIfEmpty(format);
}
String TableName = MTable.getTableName(ctx, format.getAD_Table_ID());
MQuery query = MQuery.get (ctx, pi.getAD_PInstance_ID(), TableName);
PrintInfo info = new PrintInfo(pi);
@ -298,6 +333,18 @@ public class ReportCtl
* @return true if OK
*/
static public boolean startFinReport (ProcessInfo pi, int WindowNo)
{
return startFinReport(pi, WindowNo, null);
}
/**
* Start Financial Report.
* @param pi Process Info
* @param WindowNo The windows number which invoked the printing
* @param instance - AD_PInstance
* @return true if OK
*/
static public boolean startFinReport (ProcessInfo pi, int WindowNo, MPInstance instance)
{
@SuppressWarnings("unused")
int AD_Client_ID = Env.getAD_Client_ID(Env.getCtx());
@ -315,6 +362,11 @@ public class ReportCtl
s_log.log(Level.SEVERE, "startFinReport - No PrintFormat");
return false;
}
if(instance != null) {
instance.updatePrintFormatAndLanguageIfEmpty(format);
}
PrintInfo info = new PrintInfo(pi);
ReportEngine re = new ReportEngine(Env.getCtx(), format, query, info, pi.isSummary(), null, WindowNo);
@ -353,7 +405,7 @@ public class ReportCtl
*/
public static boolean startDocumentPrint(int type, MPrintFormat customPrintFormat, int Record_ID, IProcessUI parent, int WindowNo, String printerName)
{
return(startDocumentPrint(type, customPrintFormat, Record_ID, parent, WindowNo, true, printerName));
return(startDocumentPrint(type, customPrintFormat, Record_ID, parent, WindowNo, true, printerName, null));
}
/**
@ -369,7 +421,24 @@ public class ReportCtl
public static boolean startDocumentPrint(int type, int Record_ID, IProcessUI parent, int WindowNo,
boolean IsDirectPrint)
{
return(startDocumentPrint(type, null, Record_ID, parent, WindowNo, IsDirectPrint, null ));
return(startDocumentPrint(type, Record_ID, parent, WindowNo, IsDirectPrint, null ));
}
/**
* Start Document Print for Type.
* Called also directly from ProcessDialog, VInOutGen, VInvoiceGen, VPayPrint
* @param type document type in ReportEngine
* @param Record_ID id
* @param parent The window which invoked the printing
* @param WindowNo The windows number which invoked the printing
* @param IsDirectPrint if true, prints directly - otherwise View
* @param instance - AD_PInstance
* @return true if success
*/
public static boolean startDocumentPrint(int type, int Record_ID, IProcessUI parent, int WindowNo,
boolean IsDirectPrint, MPInstance instance)
{
return(startDocumentPrint(type, null, Record_ID, parent, WindowNo, IsDirectPrint, null, instance ));
}
/**
@ -379,10 +448,11 @@ public class ReportCtl
* @param parent The window which invoked the printing
* @param WindowNo The windows number which invoked the printing
* @param printerName Specified printer name
* @param instance - AD_PInstance
* @return true if success
*/
public static boolean startDocumentPrint (int type, MPrintFormat customPrintFormat, int Record_ID, IProcessUI parent, int WindowNo,
boolean IsDirectPrint, String printerName)
boolean IsDirectPrint, String printerName, MPInstance instance)
{
ReportEngine re = ReportEngine.get (Env.getCtx(), type, Record_ID, WindowNo);
if (re == null)
@ -398,6 +468,9 @@ public class ReportCtl
{
MPrintFormat format = re.getPrintFormat();
if(instance != null) {
instance.updatePrintFormatAndLanguageIfEmpty(format);
}
// We have a Jasper Print Format
// ==============================
if(format.getJasperProcess_ID() > 0)
@ -426,9 +499,10 @@ public class ReportCtl
* Find/Create
* @param C_Payment_ID Payment
* @param IsDirectPrint if true, prints directly - otherwise View
* @param instance - AD_PInstance
* @return true if success
*/
public static boolean startCheckPrint (int C_Payment_ID, boolean IsDirectPrint)
public static boolean startCheckPrint (int C_Payment_ID, boolean IsDirectPrint, MPInstance instance)
{
// afalcone - [ 1871567 ] Wrong value in Payment document
@ -447,7 +521,7 @@ public class ReportCtl
if (psc != null)
C_PaySelectionCheck_ID = psc.getC_PaySelectionCheck_ID();
}
return startDocumentPrint (ReportEngine.CHECK, C_PaySelectionCheck_ID, null, -1, IsDirectPrint);
return startDocumentPrint (ReportEngine.CHECK, C_PaySelectionCheck_ID, null, -1, IsDirectPrint, instance);
} // startCheckPrint
private static void createOutput(ReportEngine re, boolean printPreview, String printerName)