From 7ee9d5e7cddc08da0dd52d23e1510c5e68392f86 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sun, 24 Mar 2019 13:16:00 -0300 Subject: [PATCH] IDEMPIERE-3929 "Failed when processing document" & "is mandatory" is not translated. / integrate suggestion from Flemming Birch (sjeffen) --- migration/i6.2/oracle/201903241211_IDEMPIERE-3929.sql | 11 +++++++++++ .../i6.2/postgresql/201903241211_IDEMPIERE-3929.sql | 8 ++++++++ .../idempiere/process/InvoiceCreateCreditMemo.java | 4 ++-- .../src/org/compiere/model/MCashLine.java | 2 +- org.adempiere.base/src/org/compiere/model/MInOut.java | 4 ++-- .../src/org/compiere/model/MInvoice.java | 4 ++-- .../src/org/compiere/model/MJournalBatch.java | 2 +- org.adempiere.base/src/org/compiere/model/MOrder.java | 6 +++--- .../src/org/compiere/model/MPaySelectionCheck.java | 2 +- .../src/org/compiere/model/MPayment.java | 10 +++++----- org.adempiere.base/src/org/compiere/model/MRMA.java | 2 +- .../src/org/compiere/wstore/PaymentServlet.java | 2 +- 12 files changed, 38 insertions(+), 19 deletions(-) create mode 100644 migration/i6.2/oracle/201903241211_IDEMPIERE-3929.sql create mode 100644 migration/i6.2/postgresql/201903241211_IDEMPIERE-3929.sql diff --git a/migration/i6.2/oracle/201903241211_IDEMPIERE-3929.sql b/migration/i6.2/oracle/201903241211_IDEMPIERE-3929.sql new file mode 100644 index 0000000000..66bb828ec4 --- /dev/null +++ b/migration/i6.2/oracle/201903241211_IDEMPIERE-3929.sql @@ -0,0 +1,11 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- sjeffen: +-- 22. mar. 2019 16.00.03 CET +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('E','Failed when processing document',0,0,'Y',TO_DATE('2019-03-22 16:00:03','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2019-03-22 16:00:03','YYYY-MM-DD HH24:MI:SS'),100,200489,'FailedProcessingDocument','D','21281020-8057-4315-b0c0-144c874a5f46') +; + +SELECT register_migration_script('201903241211_IDEMPIERE-3929.sql') FROM dual +; + diff --git a/migration/i6.2/postgresql/201903241211_IDEMPIERE-3929.sql b/migration/i6.2/postgresql/201903241211_IDEMPIERE-3929.sql new file mode 100644 index 0000000000..885fd2ecbf --- /dev/null +++ b/migration/i6.2/postgresql/201903241211_IDEMPIERE-3929.sql @@ -0,0 +1,8 @@ +-- sjeffen: +-- 22. mar. 2019 16.00.03 CET +INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('E','Failed when processing document',0,0,'Y',TO_TIMESTAMP('2019-03-22 16:00:03','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2019-03-22 16:00:03','YYYY-MM-DD HH24:MI:SS'),100,200489,'FailedProcessingDocument','D','21281020-8057-4315-b0c0-144c874a5f46') +; + +SELECT register_migration_script('201903241211_IDEMPIERE-3929.sql') FROM dual +; + diff --git a/org.adempiere.base.process/src/org/idempiere/process/InvoiceCreateCreditMemo.java b/org.adempiere.base.process/src/org/idempiere/process/InvoiceCreateCreditMemo.java index 6654076b90..498c62b019 100644 --- a/org.adempiere.base.process/src/org/idempiere/process/InvoiceCreateCreditMemo.java +++ b/org.adempiere.base.process/src/org/idempiere/process/InvoiceCreateCreditMemo.java @@ -186,7 +186,7 @@ public class InvoiceCreateCreditMemo extends SvrProcess { // if (p_DocAction != null) { if (!creditMemo.processIt(p_DocAction)) { - throw new AdempiereException("ERROR processing credit memo " + p_DocAction + " -> " + creditMemo.getProcessMsg()); + throw new AdempiereException(Msg.getMsg(getCtx(), "FailedProcessingDocument") + " - " + creditMemo.getProcessMsg()); } if (p_IsCreateAllocation && DocAction.ACTION_Complete.equals(p_DocAction)) { // Create Allocation @@ -210,7 +210,7 @@ public class InvoiceCreateCreditMemo extends SvrProcess { cLine.setC_Invoice_ID(creditMemo.getC_Invoice_ID()); cLine.saveEx(); if (!alloc.processIt(DocAction.ACTION_Complete)) - throw new AdempiereException("Failed when processing document - " + alloc.getProcessMsg()); + throw new AdempiereException(Msg.getMsg(getCtx(), "FailedProcessingDocument") + " - " + alloc.getProcessMsg()); // end added alloc.saveEx(); } diff --git a/org.adempiere.base/src/org/compiere/model/MCashLine.java b/org.adempiere.base/src/org/compiere/model/MCashLine.java index e98eaccff8..67f81c9cb5 100644 --- a/org.adempiere.base/src/org/compiere/model/MCashLine.java +++ b/org.adempiere.base/src/org/compiere/model/MCashLine.java @@ -157,7 +157,7 @@ public class MCashLine extends X_C_CashLine order.setC_CashLine_ID(getC_CashLine_ID()); // added AdempiereException by Zuhri if (!order.processIt(MOrder.ACTION_WaitComplete)) - throw new AdempiereException("Failed when processing document - " + order.getProcessMsg()); + throw new AdempiereException(Msg.getMsg(getCtx(), "FailedProcessingDocument") + " - " + order.getProcessMsg()); // end added order.saveEx(trxName); // Set Invoice diff --git a/org.adempiere.base/src/org/compiere/model/MInOut.java b/org.adempiere.base/src/org/compiere/model/MInOut.java index 7691b08732..90d7166b56 100644 --- a/org.adempiere.base/src/org/compiere/model/MInOut.java +++ b/org.adempiere.base/src/org/compiere/model/MInOut.java @@ -1772,7 +1772,7 @@ public class MInOut extends X_M_InOut implements DocAction dropShipment.setDocAction(DocAction.ACTION_Complete); // added AdempiereException by Zuhri if (!dropShipment.processIt(DocAction.ACTION_Complete)) - throw new AdempiereException("Failed when processing document - " + dropShipment.getProcessMsg()); + throw new AdempiereException(Msg.getMsg(getCtx(), "FailedProcessingDocument") + " - " + dropShipment.getProcessMsg()); // end added dropShipment.saveEx(); @@ -2042,7 +2042,7 @@ public class MInOut extends X_M_InOut implements DocAction counter.setDocAction(counterDT.getDocAction()); // added AdempiereException by zuhri if (!counter.processIt(counterDT.getDocAction())) - throw new AdempiereException("Failed when processing document - " + counter.getProcessMsg()); + throw new AdempiereException(Msg.getMsg(getCtx(), "FailedProcessingDocument") + " - " + counter.getProcessMsg()); // end added counter.saveEx(get_TrxName()); } diff --git a/org.adempiere.base/src/org/compiere/model/MInvoice.java b/org.adempiere.base/src/org/compiere/model/MInvoice.java index 13a39a7403..2b5bfd325c 100644 --- a/org.adempiere.base/src/org/compiere/model/MInvoice.java +++ b/org.adempiere.base/src/org/compiere/model/MInvoice.java @@ -2256,7 +2256,7 @@ public class MInvoice extends X_C_Invoice implements DocAction counter.setDocAction(counterDT.getDocAction()); // added AdempiereException by zuhri if (!counter.processIt(counterDT.getDocAction())) - throw new AdempiereException("Failed when processing document - " + counter.getProcessMsg()); + throw new AdempiereException(Msg.getMsg(getCtx(), "FailedProcessingDocument") + " - " + counter.getProcessMsg()); // end added counter.saveEx(get_TrxName()); } @@ -2569,7 +2569,7 @@ public class MInvoice extends X_C_Invoice implements DocAction rLine.saveEx(); // added AdempiereException by zuhri if (!alloc.processIt(DocAction.ACTION_Complete)) - throw new AdempiereException("Failed when processing document - " + alloc.getProcessMsg()); + throw new AdempiereException(Msg.getMsg(getCtx(), "FailedProcessingDocument") + " - " + alloc.getProcessMsg()); // end added alloc.saveEx(); diff --git a/org.adempiere.base/src/org/compiere/model/MJournalBatch.java b/org.adempiere.base/src/org/compiere/model/MJournalBatch.java index a3b6ffe9b4..372c53756b 100644 --- a/org.adempiere.base/src/org/compiere/model/MJournalBatch.java +++ b/org.adempiere.base/src/org/compiere/model/MJournalBatch.java @@ -475,7 +475,7 @@ public class MJournalBatch extends X_GL_JournalBatch implements DocAction { // added AdempiereException by zuhri if (!journal.processIt(DocAction.ACTION_Complete)) - throw new AdempiereException("Failed when processing document - " + journal.getProcessMsg()); + throw new AdempiereException(Msg.getMsg(getCtx(), "FailedProcessingDocument") + " - " + journal.getProcessMsg()); // end added journal.saveEx(); if (!DocAction.STATUS_Completed.equals(journal.getDocStatus())) diff --git a/org.adempiere.base/src/org/compiere/model/MOrder.java b/org.adempiere.base/src/org/compiere/model/MOrder.java index 44da00ff9f..f72e3b6808 100644 --- a/org.adempiere.base/src/org/compiere/model/MOrder.java +++ b/org.adempiere.base/src/org/compiere/model/MOrder.java @@ -2193,7 +2193,7 @@ public class MOrder extends X_C_Order implements DocAction } // added AdempiereException by zuhri if (!shipment.processIt(DocAction.ACTION_Complete)) - throw new AdempiereException("Failed when processing document - " + shipment.getProcessMsg()); + throw new AdempiereException(Msg.getMsg(getCtx(), "FailedProcessingDocument") + " - " + shipment.getProcessMsg()); // end added shipment.saveEx(get_TrxName()); if (!DOCSTATUS_Completed.equals(shipment.getDocStatus())) @@ -2296,7 +2296,7 @@ public class MOrder extends X_C_Order implements DocAction // added AdempiereException by zuhri if (!invoice.processIt(DocAction.ACTION_Complete)) - throw new AdempiereException("Failed when processing document - " + invoice.getProcessMsg()); + throw new AdempiereException(Msg.getMsg(getCtx(), "FailedProcessingDocument") + " - " + invoice.getProcessMsg()); // end added invoice.saveEx(get_TrxName()); setC_CashLine_ID(invoice.getC_CashLine_ID()); @@ -2383,7 +2383,7 @@ public class MOrder extends X_C_Order implements DocAction counter.setDocAction(counterDT.getDocAction()); // added AdempiereException by zuhri if (!counter.processIt(counterDT.getDocAction())) - throw new AdempiereException("Failed when processing document - " + counter.getProcessMsg()); + throw new AdempiereException(Msg.getMsg(getCtx(), "FailedProcessingDocument") + " - " + counter.getProcessMsg()); // end added counter.saveEx(get_TrxName()); } diff --git a/org.adempiere.base/src/org/compiere/model/MPaySelectionCheck.java b/org.adempiere.base/src/org/compiere/model/MPaySelectionCheck.java index 5f4970e443..c000cff213 100644 --- a/org.adempiere.base/src/org/compiere/model/MPaySelectionCheck.java +++ b/org.adempiere.base/src/org/compiere/model/MPaySelectionCheck.java @@ -359,7 +359,7 @@ public class MPaySelectionCheck extends X_C_PaySelectionCheck check.saveEx(); // Payment process needs it // added AdempiereException by zuhri if (!payment.processIt(DocAction.ACTION_Complete)) - throw new AdempiereException("Failed when processing document - " + payment.getProcessMsg()); + throw new AdempiereException(Msg.getMsg(Env.getCtx(), "FailedProcessingDocument") + " - " + payment.getProcessMsg()); // end added payment.saveEx(); } diff --git a/org.adempiere.base/src/org/compiere/model/MPayment.java b/org.adempiere.base/src/org/compiere/model/MPayment.java index f09d39b812..a9a84d8edd 100644 --- a/org.adempiere.base/src/org/compiere/model/MPayment.java +++ b/org.adempiere.base/src/org/compiere/model/MPayment.java @@ -1858,7 +1858,7 @@ public class MPayment extends X_C_Payment order.set_TrxName(get_TrxName()); // added AdempiereException by zuhri if (!order.processIt (X_C_Order.DOCACTION_WaitComplete)) - throw new AdempiereException("Failed when processing document - " + order.getProcessMsg()); + throw new AdempiereException(Msg.getMsg(getCtx(), "FailedProcessingDocument") + " - " + order.getProcessMsg()); // end added m_processMsg = order.getProcessMsg(); order.saveEx(get_TrxName()); @@ -2288,7 +2288,7 @@ public class MPayment extends X_C_Payment } // added AdempiereException by zuhri if (!alloc.processIt(DocAction.ACTION_Complete)) - throw new AdempiereException("Failed when processing document - " + alloc.getProcessMsg()); + throw new AdempiereException(Msg.getMsg(getCtx(), "FailedProcessingDocument") + " - " + alloc.getProcessMsg()); // end added m_processMsg = "@C_AllocationHdr_ID@: " + alloc.getDocumentNo(); return alloc.save(get_TrxName()); @@ -2323,7 +2323,7 @@ public class MPayment extends X_C_Payment aLine.saveEx(get_TrxName()); // added AdempiereException by zuhri if (!alloc.processIt(DocAction.ACTION_Complete)) - throw new AdempiereException("Failed when processing document - " + alloc.getProcessMsg()); + throw new AdempiereException(Msg.getMsg(getCtx(), "FailedProcessingDocument") + " - " + alloc.getProcessMsg()); // end added alloc.saveEx(get_TrxName()); m_justCreatedAllocInv = alloc; @@ -2421,7 +2421,7 @@ public class MPayment extends X_C_Payment if(alloc.processIt(DocAction.ACTION_Complete)) ok = alloc.save(get_TrxName()); else - throw new AdempiereException("Failed when processing document - " + alloc.getProcessMsg()); + throw new AdempiereException(Msg.getMsg(getCtx(), "FailedProcessingDocument") + " - " + alloc.getProcessMsg()); // end added by zuhri m_processMsg = "@C_AllocationHdr_ID@: " + alloc.getDocumentNo(); } @@ -2708,7 +2708,7 @@ public class MPayment extends X_C_Payment // added AdempiereException by zuhri if (!alloc.processIt(DocAction.ACTION_Complete)) - throw new AdempiereException("Failed when processing document - " + alloc.getProcessMsg()); + throw new AdempiereException(Msg.getMsg(getCtx(), "FailedProcessingDocument") + " - " + alloc.getProcessMsg()); // end added alloc.saveEx(get_TrxName()); // diff --git a/org.adempiere.base/src/org/compiere/model/MRMA.java b/org.adempiere.base/src/org/compiere/model/MRMA.java index 157e697a7e..93ca4ec366 100644 --- a/org.adempiere.base/src/org/compiere/model/MRMA.java +++ b/org.adempiere.base/src/org/compiere/model/MRMA.java @@ -555,7 +555,7 @@ public class MRMA extends X_M_RMA implements DocAction counter.setDocAction(counterDT.getDocAction()); // added AdempiereException by zuhri if (!counter.processIt(counterDT.getDocAction())) - throw new AdempiereException("Failed when processing document - " + counter.getProcessMsg()); + throw new AdempiereException(Msg.getMsg(getCtx(), "FailedProcessingDocument") + " - " + counter.getProcessMsg()); // end added counter.saveEx(get_TrxName()); } diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/PaymentServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/PaymentServlet.java index 8858beda05..0ecec2fb9b 100644 --- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/PaymentServlet.java +++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/PaymentServlet.java @@ -285,7 +285,7 @@ public class PaymentServlet extends HttpServlet // // Added adempiereException by zuhri if(!payment.processIt(DocAction.ACTION_Complete)) - throw new AdempiereException("Failed when processing document - " + payment.getProcessMsg()); + throw new AdempiereException(Msg.getMsg(ctx, "FailedProcessingDocument") + " - " + payment.getProcessMsg()); // end added by zuhri payment.saveEx(); sendThanksEMail (request, ctx, payment, wu, wo);