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

IDEMPIERE-3929 "Failed when processing document" & "is mandatory" is not translated. / integrate suggestion from Flemming Birch (sjeffen)

This commit is contained in:
Carlos Ruiz 2019-03-24 13:16:00 -03:00
parent a70411da40
commit 7ee9d5e7cd
12 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
migration/i6.2/oracle/201903241211_IDEMPIERE-3929.sql Normal file
View File

@ -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
;

8
migration/i6.2/postgresql/201903241211_IDEMPIERE-3929.sql Normal file
View File

@ -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
;

4
org.adempiere.base.process/src/org/idempiere/process/InvoiceCreateCreditMemo.java
View File

@ -186,7 +186,7 @@ public class InvoiceCreateCreditMemo extends SvrProcess {
// //
if (p_DocAction != null) { if (p_DocAction != null) {
if (!creditMemo.processIt(p_DocAction)) { 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)) { if (p_IsCreateAllocation && DocAction.ACTION_Complete.equals(p_DocAction)) {
// Create Allocation // Create Allocation
@ -210,7 +210,7 @@ public class InvoiceCreateCreditMemo extends SvrProcess {
cLine.setC_Invoice_ID(creditMemo.getC_Invoice_ID()); cLine.setC_Invoice_ID(creditMemo.getC_Invoice_ID());
cLine.saveEx(); cLine.saveEx();
if (!alloc.processIt(DocAction.ACTION_Complete)) 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 // end added
alloc.saveEx(); alloc.saveEx();
} }

2
org.adempiere.base/src/org/compiere/model/MCashLine.java
View File

@ -157,7 +157,7 @@ public class MCashLine extends X_C_CashLine
order.setC_CashLine_ID(getC_CashLine_ID()); order.setC_CashLine_ID(getC_CashLine_ID());
// added AdempiereException by Zuhri // added AdempiereException by Zuhri
if (!order.processIt(MOrder.ACTION_WaitComplete)) 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 // end added
order.saveEx(trxName); order.saveEx(trxName);
// Set Invoice // Set Invoice

4
org.adempiere.base/src/org/compiere/model/MInOut.java
View File

@ -1772,7 +1772,7 @@ public class MInOut extends X_M_InOut implements DocAction
dropShipment.setDocAction(DocAction.ACTION_Complete); dropShipment.setDocAction(DocAction.ACTION_Complete);
// added AdempiereException by Zuhri // added AdempiereException by Zuhri
if (!dropShipment.processIt(DocAction.ACTION_Complete)) 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 // end added
dropShipment.saveEx(); dropShipment.saveEx();
@ -2042,7 +2042,7 @@ public class MInOut extends X_M_InOut implements DocAction
counter.setDocAction(counterDT.getDocAction()); counter.setDocAction(counterDT.getDocAction());
// added AdempiereException by zuhri // added AdempiereException by zuhri
if (!counter.processIt(counterDT.getDocAction())) 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 // end added
counter.saveEx(get_TrxName()); counter.saveEx(get_TrxName());
} }

4
org.adempiere.base/src/org/compiere/model/MInvoice.java
View File

@ -2256,7 +2256,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
counter.setDocAction(counterDT.getDocAction()); counter.setDocAction(counterDT.getDocAction());
// added AdempiereException by zuhri // added AdempiereException by zuhri
if (!counter.processIt(counterDT.getDocAction())) 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 // end added
counter.saveEx(get_TrxName()); counter.saveEx(get_TrxName());
} }
@ -2569,7 +2569,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
rLine.saveEx(); rLine.saveEx();
// added AdempiereException by zuhri // added AdempiereException by zuhri
if (!alloc.processIt(DocAction.ACTION_Complete)) 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 // end added
alloc.saveEx(); alloc.saveEx();

2
org.adempiere.base/src/org/compiere/model/MJournalBatch.java
View File

@ -475,7 +475,7 @@ public class MJournalBatch extends X_GL_JournalBatch implements DocAction
{ {
// added AdempiereException by zuhri // added AdempiereException by zuhri
if (!journal.processIt(DocAction.ACTION_Complete)) 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 // end added
journal.saveEx(); journal.saveEx();
if (!DocAction.STATUS_Completed.equals(journal.getDocStatus())) if (!DocAction.STATUS_Completed.equals(journal.getDocStatus()))

6
org.adempiere.base/src/org/compiere/model/MOrder.java
View File

@ -2193,7 +2193,7 @@ public class MOrder extends X_C_Order implements DocAction
} }
// added AdempiereException by zuhri // added AdempiereException by zuhri
if (!shipment.processIt(DocAction.ACTION_Complete)) 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 // end added
shipment.saveEx(get_TrxName()); shipment.saveEx(get_TrxName());
if (!DOCSTATUS_Completed.equals(shipment.getDocStatus())) if (!DOCSTATUS_Completed.equals(shipment.getDocStatus()))
@ -2296,7 +2296,7 @@ public class MOrder extends X_C_Order implements DocAction
// added AdempiereException by zuhri // added AdempiereException by zuhri
if (!invoice.processIt(DocAction.ACTION_Complete)) 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 // end added
invoice.saveEx(get_TrxName()); invoice.saveEx(get_TrxName());
setC_CashLine_ID(invoice.getC_CashLine_ID()); setC_CashLine_ID(invoice.getC_CashLine_ID());
@ -2383,7 +2383,7 @@ public class MOrder extends X_C_Order implements DocAction
counter.setDocAction(counterDT.getDocAction()); counter.setDocAction(counterDT.getDocAction());
// added AdempiereException by zuhri // added AdempiereException by zuhri
if (!counter.processIt(counterDT.getDocAction())) 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 // end added
counter.saveEx(get_TrxName()); counter.saveEx(get_TrxName());
} }

2
org.adempiere.base/src/org/compiere/model/MPaySelectionCheck.java
View File

@ -359,7 +359,7 @@ public class MPaySelectionCheck extends X_C_PaySelectionCheck
check.saveEx(); // Payment process needs it check.saveEx(); // Payment process needs it
// added AdempiereException by zuhri // added AdempiereException by zuhri
if (!payment.processIt(DocAction.ACTION_Complete)) 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 // end added
payment.saveEx(); payment.saveEx();
} }

10
org.adempiere.base/src/org/compiere/model/MPayment.java
View File

@ -1858,7 +1858,7 @@ public class MPayment extends X_C_Payment
order.set_TrxName(get_TrxName()); order.set_TrxName(get_TrxName());
// added AdempiereException by zuhri // added AdempiereException by zuhri
if (!order.processIt (X_C_Order.DOCACTION_WaitComplete)) 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 // end added
m_processMsg = order.getProcessMsg(); m_processMsg = order.getProcessMsg();
order.saveEx(get_TrxName()); order.saveEx(get_TrxName());
@ -2288,7 +2288,7 @@ public class MPayment extends X_C_Payment
} }
// added AdempiereException by zuhri // added AdempiereException by zuhri
if (!alloc.processIt(DocAction.ACTION_Complete)) 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 // end added
m_processMsg = "@C_AllocationHdr_ID@: " + alloc.getDocumentNo(); m_processMsg = "@C_AllocationHdr_ID@: " + alloc.getDocumentNo();
return alloc.save(get_TrxName()); return alloc.save(get_TrxName());
@ -2323,7 +2323,7 @@ public class MPayment extends X_C_Payment
aLine.saveEx(get_TrxName()); aLine.saveEx(get_TrxName());
// added AdempiereException by zuhri // added AdempiereException by zuhri
if (!alloc.processIt(DocAction.ACTION_Complete)) 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 // end added
alloc.saveEx(get_TrxName()); alloc.saveEx(get_TrxName());
m_justCreatedAllocInv = alloc; m_justCreatedAllocInv = alloc;
@ -2421,7 +2421,7 @@ public class MPayment extends X_C_Payment
if(alloc.processIt(DocAction.ACTION_Complete)) if(alloc.processIt(DocAction.ACTION_Complete))
ok = alloc.save(get_TrxName()); ok = alloc.save(get_TrxName());
else else
throw new AdempiereException("Failed when processing document - " + alloc.getProcessMsg()); throw new AdempiereException(Msg.getMsg(getCtx(), "FailedProcessingDocument") + " - " + alloc.getProcessMsg());
// end added by zuhri // end added by zuhri
m_processMsg = "@C_AllocationHdr_ID@: " + alloc.getDocumentNo(); m_processMsg = "@C_AllocationHdr_ID@: " + alloc.getDocumentNo();
} }
@ -2708,7 +2708,7 @@ public class MPayment extends X_C_Payment
// added AdempiereException by zuhri // added AdempiereException by zuhri
if (!alloc.processIt(DocAction.ACTION_Complete)) 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 // end added
alloc.saveEx(get_TrxName()); alloc.saveEx(get_TrxName());
// //

2
org.adempiere.base/src/org/compiere/model/MRMA.java
View File

@ -555,7 +555,7 @@ public class MRMA extends X_M_RMA implements DocAction
counter.setDocAction(counterDT.getDocAction()); counter.setDocAction(counterDT.getDocAction());
// added AdempiereException by zuhri // added AdempiereException by zuhri
if (!counter.processIt(counterDT.getDocAction())) 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 // end added
counter.saveEx(get_TrxName()); counter.saveEx(get_TrxName());
} }

2
org.adempiere.webstore.servlet/src/org/compiere/wstore/PaymentServlet.java
View File

@ -285,7 +285,7 @@ public class PaymentServlet extends HttpServlet
// //
// Added adempiereException by zuhri // Added adempiereException by zuhri
if(!payment.processIt(DocAction.ACTION_Complete)) 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 // end added by zuhri
payment.saveEx(); payment.saveEx();
sendThanksEMail (request, ctx, payment, wu, wo); sendThanksEMail (request, ctx, payment, wu, wo);