From 917fe37caa19c2b2ad2d36b2d0abd2aa76babc9a Mon Sep 17 00:00:00 2001 From: Kirit Thummar Date: Tue, 2 Oct 2012 11:48:33 -0500 Subject: [PATCH] IDEMPIERE-370 Implement link from process ending message to next records --- .../oracle/908_Process_Message.sql | 62 +++++++++++++++++++ .../postgresql/908_Process_Message.sql | 62 +++++++++++++++++++ .../adempiere/process/InvoiceGenerateRMA.java | 3 +- .../org/compiere/process/AllocationAuto.java | 10 ++- .../org/compiere/process/InOutGenerate.java | 3 +- .../compiere/process/InvoiceBatchProcess.java | 4 +- .../org/compiere/process/InvoiceGenerate.java | 3 +- .../org/compiere/process/OrderPOCreate.java | 4 +- .../org/compiere/process/RequestInvoice.java | 4 +- .../compiere/process/RequisitionPOCreate.java | 3 +- 10 files changed, 148 insertions(+), 10 deletions(-) create mode 100644 migration/360lts-release/oracle/908_Process_Message.sql create mode 100644 migration/360lts-release/postgresql/908_Process_Message.sql diff --git a/migration/360lts-release/oracle/908_Process_Message.sql b/migration/360lts-release/oracle/908_Process_Message.sql new file mode 100644 index 0000000000..3d89bb9cd5 --- /dev/null +++ b/migration/360lts-release/oracle/908_Process_Message.sql @@ -0,0 +1,62 @@ +-- Sep 11, 2012 8:42:54 PM IST +-- Adding i18n messages +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Invoice Processed: ',200060,'U','3c06a457-be2c-4e54-a197-ac5b5646143f','InvoiceProcessed','Y',TO_DATE('2012-09-11 20:42:53','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_DATE('2012-09-11 20:42:53','YYYY-MM-DD HH24:MI:SS')) +; + +-- Sep 11, 2012 8:42:55 PM IST +-- Adding i18n messages +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200060 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- Sep 11, 2012 8:49:40 PM IST +-- Adding i18n messages +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Payment Allocated: ',200061,'U','2d9d4e87-b308-4643-9046-a2730a95cb9b','PaymentAllocated','Y',TO_DATE('2012-09-11 20:49:39','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_DATE('2012-09-11 20:49:39','YYYY-MM-DD HH24:MI:SS')) +; + +-- Sep 11, 2012 8:49:40 PM IST +-- Adding i18n messages +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200061 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- Sep 11, 2012 8:52:47 PM IST +-- Adding i18n messages +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Allocation Processed: ',200062,'U','5e6e24fc-a609-4424-9aa4-f30f13fa03ac','AllocationProcessed','Y',TO_DATE('2012-09-11 20:52:46','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_DATE('2012-09-11 20:52:46','YYYY-MM-DD HH24:MI:SS')) +; + +-- Sep 11, 2012 8:52:47 PM IST +-- Adding i18n messages +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200062 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- Sep 11, 2012 8:54:59 PM IST +-- Adding i18n messages +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Shipment Processed: ',200063,'U','1de82564-7da4-468e-955d-7451a304844d','ShipmentProcessed','Y',TO_DATE('2012-09-11 20:54:58','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_DATE('2012-09-11 20:54:58','YYYY-MM-DD HH24:MI:SS')) +; + +-- Sep 11, 2012 8:54:59 PM IST +-- Adding i18n messages +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200063 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- Sep 11, 2012 9:00:52 PM IST +-- Adding i18n messages +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Order Created: ',200064,'U','0e54bec9-9529-4ac8-b453-b36b201b5149','OrderCreated','Y',TO_DATE('2012-09-11 21:00:51','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_DATE('2012-09-11 21:00:51','YYYY-MM-DD HH24:MI:SS')) +; + +-- Sep 11, 2012 9:00:52 PM IST +-- Adding i18n messages +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200064 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- Sep 11, 2012 9:05:34 PM IST +-- Adding i18n messages +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Generated PO: ',200065,'U','f0135f4a-27e6-499c-9c7e-851631a10a4f','GeneratedPO','Y',TO_DATE('2012-09-11 21:05:33','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_DATE('2012-09-11 21:05:33','YYYY-MM-DD HH24:MI:SS')) +; + +-- Sep 11, 2012 9:05:34 PM IST +-- Adding i18n messages +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200065 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +SELECT register_migration_script('908_Process_Message.sql') FROM dual +; \ No newline at end of file diff --git a/migration/360lts-release/postgresql/908_Process_Message.sql b/migration/360lts-release/postgresql/908_Process_Message.sql new file mode 100644 index 0000000000..5d7ac6e769 --- /dev/null +++ b/migration/360lts-release/postgresql/908_Process_Message.sql @@ -0,0 +1,62 @@ +-- Sep 11, 2012 8:42:54 PM IST +-- Adding i18n messages +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Invoice Processed: ',200060,'U','3c06a457-be2c-4e54-a197-ac5b5646143f','InvoiceProcessed','Y',TO_TIMESTAMP('2012-09-11 20:42:53','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_TIMESTAMP('2012-09-11 20:42:53','YYYY-MM-DD HH24:MI:SS')) +; + +-- Sep 11, 2012 8:42:55 PM IST +-- Adding i18n messages +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200060 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- Sep 11, 2012 8:49:40 PM IST +-- Adding i18n messages +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Payment Allocated: ',200061,'U','2d9d4e87-b308-4643-9046-a2730a95cb9b','PaymentAllocated','Y',TO_TIMESTAMP('2012-09-11 20:49:39','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_TIMESTAMP('2012-09-11 20:49:39','YYYY-MM-DD HH24:MI:SS')) +; + +-- Sep 11, 2012 8:49:40 PM IST +-- Adding i18n messages +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200061 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- Sep 11, 2012 8:52:47 PM IST +-- Adding i18n messages +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Allocation Processed: ',200062,'U','5e6e24fc-a609-4424-9aa4-f30f13fa03ac','AllocationProcessed','Y',TO_TIMESTAMP('2012-09-11 20:52:46','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_TIMESTAMP('2012-09-11 20:52:46','YYYY-MM-DD HH24:MI:SS')) +; + +-- Sep 11, 2012 8:52:47 PM IST +-- Adding i18n messages +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200062 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- Sep 11, 2012 8:54:59 PM IST +-- Adding i18n messages +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Shipment Processed: ',200063,'U','1de82564-7da4-468e-955d-7451a304844d','ShipmentProcessed','Y',TO_TIMESTAMP('2012-09-11 20:54:58','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_TIMESTAMP('2012-09-11 20:54:58','YYYY-MM-DD HH24:MI:SS')) +; + +-- Sep 11, 2012 8:54:59 PM IST +-- Adding i18n messages +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200063 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- Sep 11, 2012 9:00:52 PM IST +-- Adding i18n messages +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Order Created: ',200064,'U','0e54bec9-9529-4ac8-b453-b36b201b5149','OrderCreated','Y',TO_TIMESTAMP('2012-09-11 21:00:51','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_TIMESTAMP('2012-09-11 21:00:51','YYYY-MM-DD HH24:MI:SS')) +; + +-- Sep 11, 2012 9:00:52 PM IST +-- Adding i18n messages +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200064 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +-- Sep 11, 2012 9:05:34 PM IST +-- Adding i18n messages +INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Generated PO: ',200065,'U','f0135f4a-27e6-499c-9c7e-851631a10a4f','GeneratedPO','Y',TO_TIMESTAMP('2012-09-11 21:05:33','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_TIMESTAMP('2012-09-11 21:05:33','YYYY-MM-DD HH24:MI:SS')) +; + +-- Sep 11, 2012 9:05:34 PM IST +-- Adding i18n messages +INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200065 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID) +; + +SELECT register_migration_script('908_Process_Message.sql') FROM dual +; \ No newline at end of file diff --git a/org.adempiere.base.process/src/org/adempiere/process/InvoiceGenerateRMA.java b/org.adempiere.base.process/src/org/adempiere/process/InvoiceGenerateRMA.java index de7d5e0239..693fc6b8ca 100644 --- a/org.adempiere.base.process/src/org/adempiere/process/InvoiceGenerateRMA.java +++ b/org.adempiere.base.process/src/org/adempiere/process/InvoiceGenerateRMA.java @@ -219,7 +219,8 @@ public class InvoiceGenerateRMA extends SvrProcess } // Add processing information to process log - addLog(invoice.getC_Invoice_ID(), invoice.getDateInvoiced(), null, processMsg.toString(),invoice.get_Table_ID(),invoice.getC_Invoice_ID()); + String message = Msg.parseTranslation(getCtx(), "@InvoiceProcessed@ " + processMsg.toString()); + addLog(invoice.getC_Invoice_ID(), invoice.getDateInvoiced(), null, message, invoice.get_Table_ID(), invoice.getC_Invoice_ID()); m_created++; } } diff --git a/org.adempiere.base.process/src/org/compiere/process/AllocationAuto.java b/org.adempiere.base.process/src/org/compiere/process/AllocationAuto.java index 361eb27c8e..b8cbe3d946 100644 --- a/org.adempiere.base.process/src/org/compiere/process/AllocationAuto.java +++ b/org.adempiere.base.process/src/org/compiere/process/AllocationAuto.java @@ -33,6 +33,7 @@ import org.compiere.model.MPayment; import org.compiere.util.AdempiereSystemError; import org.compiere.util.DB; import org.compiere.util.Env; +import org.compiere.util.Msg; /** * Automatic Allocation Process @@ -397,7 +398,8 @@ public class AllocationAuto extends SvrProcess { if (payment.allocateIt()) { - addLog(0, payment.getDateAcct(), openAmt, payment.getDocumentNo() + " [1]",payment.get_Table_ID(),payment.getC_Payment_ID()); + String message = Msg.parseTranslation(getCtx(), "@PaymentAllocated@ " + payment.getDocumentNo() + " [1]"); + addLog(0, payment.getDateAcct(), openAmt, message, payment.get_Table_ID(), payment.getC_Payment_ID()); count++; } break; @@ -441,7 +443,8 @@ public class AllocationAuto extends SvrProcess { if (payment.allocateIt()) { - addLog(0, payment.getDateAcct(), availableAmt, payment.getDocumentNo() + " [n]"); + String message = Msg.parseTranslation(getCtx(), "@PaymentAllocated@ " + payment.getDocumentNo() + " [n]"); + addLog(0, payment.getDateAcct(), availableAmt, message); count++; } } @@ -837,7 +840,8 @@ public class AllocationAuto extends SvrProcess } else m_allocation.saveEx(); - addLog(0, m_allocation.getDateAcct(), null, m_allocation.getDescription()); + String message = Msg.parseTranslation(getCtx(), "@AllocationProcessed@ " + m_allocation.getDescription()); + addLog(0, m_allocation.getDateAcct(), null, message); m_allocation = null; return success; } // processAllocation diff --git a/org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java b/org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java index f12c5b4fb8..bb0c5fbb69 100644 --- a/org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java +++ b/org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java @@ -585,7 +585,8 @@ public class InOutGenerate extends SvrProcess } m_shipment.saveEx(); - addLog(m_shipment.getM_InOut_ID(), m_shipment.getMovementDate(), null, m_shipment.getDocumentNo(),m_shipment.get_Table_ID(),m_shipment.getM_InOut_ID()); + String message = Msg.parseTranslation(getCtx(), "@ShipmentProcessed@ " + m_shipment.getDocumentNo()); + addLog(m_shipment.getM_InOut_ID(), m_shipment.getMovementDate(), null, message, m_shipment.get_Table_ID(),m_shipment.getM_InOut_ID()); m_created++; //reset storage cache as MInOut.completeIt will update m_storage diff --git a/org.adempiere.base.process/src/org/compiere/process/InvoiceBatchProcess.java b/org.adempiere.base.process/src/org/compiere/process/InvoiceBatchProcess.java index 90905bfdc4..e6941c5dfb 100644 --- a/org.adempiere.base.process/src/org/compiere/process/InvoiceBatchProcess.java +++ b/org.adempiere.base.process/src/org/compiere/process/InvoiceBatchProcess.java @@ -21,6 +21,7 @@ import org.compiere.model.MInvoiceBatch; import org.compiere.model.MInvoiceBatchLine; import org.compiere.model.MInvoiceLine; import org.compiere.util.AdempiereUserError; +import org.compiere.util.Msg; /** @@ -163,7 +164,8 @@ public class InvoiceBatchProcess extends SvrProcess } m_invoice.saveEx(); - addLog(0, m_invoice.getDateInvoiced(), m_invoice.getGrandTotal(), m_invoice.getDocumentNo(),m_invoice.get_Table_ID(),m_invoice.getC_Invoice_ID()); + String message = Msg.parseTranslation(getCtx(), "@InvoiceProcessed@ " + m_invoice.getDocumentNo()); + addLog(0, m_invoice.getDateInvoiced(), m_invoice.getGrandTotal(), message, m_invoice.get_Table_ID(), m_invoice.getC_Invoice_ID()); m_count++; m_invoice = null; diff --git a/org.adempiere.base.process/src/org/compiere/process/InvoiceGenerate.java b/org.adempiere.base.process/src/org/compiere/process/InvoiceGenerate.java index 9d3b4ce445..ba12b6e370 100644 --- a/org.adempiere.base.process/src/org/compiere/process/InvoiceGenerate.java +++ b/org.adempiere.base.process/src/org/compiere/process/InvoiceGenerate.java @@ -499,7 +499,8 @@ public class InvoiceGenerate extends SvrProcess } m_invoice.saveEx(); - addLog(m_invoice.getC_Invoice_ID(), m_invoice.getDateInvoiced(), null, m_invoice.getDocumentNo(),m_invoice.get_Table_ID(),m_invoice.getC_Invoice_ID()); + String message = Msg.parseTranslation(getCtx(), "@InvoiceProcessed@ " + m_invoice.getDocumentNo()); + addLog(m_invoice.getC_Invoice_ID(), m_invoice.getDateInvoiced(), null, message, m_invoice.get_Table_ID(), m_invoice.getC_Invoice_ID()); m_created++; } m_invoice = null; diff --git a/org.adempiere.base.process/src/org/compiere/process/OrderPOCreate.java b/org.adempiere.base.process/src/org/compiere/process/OrderPOCreate.java index 837b51be9e..a889e2c647 100644 --- a/org.adempiere.base.process/src/org/compiere/process/OrderPOCreate.java +++ b/org.adempiere.base.process/src/org/compiere/process/OrderPOCreate.java @@ -28,6 +28,7 @@ import org.compiere.model.MOrderLine; import org.compiere.model.MOrgInfo; import org.compiere.util.AdempiereUserError; import org.compiere.util.DB; +import org.compiere.util.Msg; /** * Generate PO from Sales Order @@ -208,7 +209,8 @@ public class OrderPOCreate extends SvrProcess if (po == null || po.getBill_BPartner_ID() != C_BPartner_ID) { po = createPOForVendor(rs.getInt(1), so); - addLog(0, null, null, po.getDocumentNo(),po.get_Table_ID(),po.getC_Order_ID()); + String message = Msg.parseTranslation(getCtx(), "@OrderCreated@ " + po.getDocumentNo()); + addLog(0, null, null, message, po.get_Table_ID(), po.getC_Order_ID()); counter++; } diff --git a/org.adempiere.base.process/src/org/compiere/process/RequestInvoice.java b/org.adempiere.base.process/src/org/compiere/process/RequestInvoice.java index 00a6b213ad..f5c2a18812 100644 --- a/org.adempiere.base.process/src/org/compiere/process/RequestInvoice.java +++ b/org.adempiere.base.process/src/org/compiere/process/RequestInvoice.java @@ -29,6 +29,7 @@ import org.compiere.model.MRequestType; import org.compiere.model.MRequestUpdate; import org.compiere.util.AdempiereSystemError; import org.compiere.util.DB; +import org.compiere.util.Msg; /** * Create Invoices for Requests @@ -184,7 +185,8 @@ public class RequestInvoice extends SvrProcess } m_invoice.saveEx(); - addLog(0, null, m_invoice.getGrandTotal(), m_invoice.getDocumentNo(),m_invoice.get_Table_ID(),m_invoice.getC_Invoice_ID()); + String message = Msg.parseTranslation(getCtx(), "@InvoiceProcessed@ " + m_invoice.getDocumentNo()); + addLog(0, null, m_invoice.getGrandTotal(), message, m_invoice.get_Table_ID(), m_invoice.getC_Invoice_ID()); } } m_invoice = null; diff --git a/org.adempiere.base.process/src/org/compiere/process/RequisitionPOCreate.java b/org.adempiere.base.process/src/org/compiere/process/RequisitionPOCreate.java index 44cd6ed874..f1bc07b3b3 100644 --- a/org.adempiere.base.process/src/org/compiere/process/RequisitionPOCreate.java +++ b/org.adempiere.base.process/src/org/compiere/process/RequisitionPOCreate.java @@ -381,7 +381,8 @@ public class RequisitionPOCreate extends SvrProcess if (m_order != null) { m_order.load(get_TrxName()); - addLog(0, null, m_order.getGrandTotal(), m_order.getDocumentNo(),m_order.get_Table_ID(),m_order.getC_Order_ID()); + String message = Msg.parseTranslation(getCtx(), "@GeneratedPO@ " + m_order.getDocumentNo()); + addLog(0, null, m_order.getGrandTotal(), message, m_order.get_Table_ID(), m_order.getC_Order_ID()); } m_order = null; m_orderLine = null;