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

hg merge release-4.1 (merge release4.1 into development)

This commit is contained in:
Carlos Ruiz 2016-12-07 11:10:09 +01:00
parent 74009c053c 9499cb0df4
commit 6e4dc8a5f5
9 changed files with 863 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db/ddlutils/oracle/views/RV_UNPOSTED.sql
View File

@ -88,8 +88,9 @@ as
WHERE Posted <> 'Y' AND DocStatus <> 'VO' WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy, SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, DateRequired, DateRequired, 702, IsActive, DocumentNo, DateDoc, DateDoc, 702,
M_Requisition_ID, 'N', posted, processing, processed, docstatus, processedon M_Requisition_ID, 'N', posted, processing, processed, docstatus, processedon
from M_REQUISITION from M_REQUISITION
WHERE Posted <> 'Y' AND DocStatus <> 'VO' WHERE Posted <> 'Y' AND DocStatus <> 'VO'
; ;

8
db/ddlutils/oracle/views/RV_UNPROCESSED.sql
View File

@ -310,8 +310,8 @@ AS
UpdatedBy, UpdatedBy,
IsActive, IsActive,
DocumentNo, DocumentNo,
DateRequired, DateDoc,
DateRequired, DateDoc,
702, 702,
M_Requisition_ID, M_Requisition_ID,
'N', 'N',
@ -320,4 +320,6 @@ AS
processed, processed,
docstatus docstatus
FROM M_REQUISITION FROM M_REQUISITION
WHERE DocStatus NOT IN ('CO','CL','VO','RE'); WHERE DocStatus NOT IN ('CO','CL','VO','RE')
;

3
db/ddlutils/postgresql/views/RV_UNPOSTED.sql
View File

@ -88,8 +88,9 @@ as
WHERE Posted <> 'Y' AND DocStatus <> 'VO' WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy, SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, DateRequired, DateRequired, 702, IsActive, DocumentNo, DateDoc, DateDoc, 702,
M_Requisition_ID, 'N', posted, processing, processed, docstatus, processedon M_Requisition_ID, 'N', posted, processing, processed, docstatus, processedon
from M_REQUISITION from M_REQUISITION
WHERE Posted <> 'Y' AND DocStatus <> 'VO' WHERE Posted <> 'Y' AND DocStatus <> 'VO'
; ;

11
db/ddlutils/postgresql/views/RV_UNPROCESSED.sql
View File

@ -310,8 +310,8 @@ AS
UpdatedBy, UpdatedBy,
IsActive, IsActive,
DocumentNo, DocumentNo,
DateRequired, DateDoc,
DateRequired, DateDoc,
702, 702,
M_Requisition_ID, M_Requisition_ID,
'N', 'N',
@ -320,9 +320,6 @@ AS
processed, processed,
docstatus docstatus
FROM M_REQUISITION FROM M_REQUISITION
WHERE DocStatus NOT IN ('CO','CL','VO','RE'); WHERE DocStatus NOT IN ('CO','CL','VO','RE')
-- Jul 24, 2009 12:44:54 PM COT
-- 2815134-Window My Unprocessed Documents
INSERT INTO AD_Window (AD_Client_ID,AD_Org_ID,AD_Window_ID,Created,CreatedBy,Description,EntityType,Help,IsActive,IsBetaFunctionality,IsDefault,IsSOTrx,Name,Processing,Updated,UpdatedBy,WindowType) VALUES (0,0,53086,TO_TIMESTAMP('2009-07-24 12:44:53','YYYY-MM-DD HH24:MI:SS'),100,'My UnProcessed Documents','D','View my unprocessed documents','Y','N','N','Y','My UnProcessed Documents','N',TO_TIMESTAMP('2009-07-24 12:44:53','YYYY-MM-DD HH24:MI:SS'),100,'Q')
; ;

424
migration/i4.1/oracle/201612061508_IDEMPIERE-3252.sql Normal file
View File

@ -0,0 +1,424 @@
create or replace view rv_unposted
as
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, DateDoc, DateAcct, 224 AS AD_Table_ID,
GL_Journal_ID AS Record_ID, 'N' AS IsSOTrx, posted, processing,
processed, docstatus, processedon
from GL_JOURNAL
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION
SELECT pi.AD_Client_ID, pi.AD_Org_ID, pi.Created, pi.CreatedBy, pi.Updated,
pi.UpdatedBy, pi.IsActive, p.NAME || '_' || pi.Line,
pi.MovementDate, pi.MovementDate, 623, pi.C_ProjectIssue_ID, 'N',
posted, pi.processing, pi.processed, 'CO' as DocStatus, processedon
from C_PROJECTISSUE pi INNER JOIN C_PROJECT p
ON (pi.C_Project_ID = p.C_Project_ID)
WHERE Posted <> 'Y' --AND DocStatus<>'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, DateInvoiced, DateAcct, 318, C_Invoice_ID,
IsSOTrx, posted, processing, processed, docstatus, processedon
from C_INVOICE
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, MovementDate, DateAcct, 319, M_InOut_ID,
IsSOTrx, posted, processing, processed, docstatus, processedon
from M_INOUT
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, MovementDate, MovementDate, 321,
M_Inventory_ID, 'N', posted, processing, processed, docstatus, processedon
from M_INVENTORY
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, MovementDate, MovementDate, 323,
M_Movement_ID, 'N', posted, processing, processed, docstatus, processedon
from M_MOVEMENT
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, MovementDate, MovementDate, 325, M_Production_ID,
'N', posted, processing, processed, docstatus, processedon
from M_PRODUCTION
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, NAME, StatementDate, DateAcct, 407, C_Cash_ID, 'N',
posted, processing, processed, docstatus, processedon
from C_CASH
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, DateTrx, DateAcct, 335, C_Payment_ID, 'N',
posted, processing, processed, docstatus, processedon
from C_PAYMENT
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, DateTrx, DateAcct, 735, C_AllocationHdr_ID,
'N', posted, processing, processed, docstatus, processedon
from C_ALLOCATIONHDR
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, NAME, StatementDate, StatementDate, 392,
C_BankStatement_ID, 'N', posted, processing, processed, docstatus, processedon
from C_BANKSTATEMENT
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, DateTrx, DateAcct, 472, M_MatchInv_ID, 'N',
posted, processing, processed, 'CO' as docstatus, processedon
from M_MATCHINV
WHERE Posted <> 'Y' --AND DocStatus<>'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, DateTrx, DateAcct, 473, M_MatchPO_ID, 'N',
posted, processing, processed, 'CO' as docstatus, processedon
from M_MATCHPO
WHERE Posted <> 'Y' --AND DocStatus<>'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, DateOrdered, DateAcct, 259, C_Order_ID,
IsSOTrx, posted, processing, processed, docstatus, processedon
from C_ORDER
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, DateDoc, DateDoc, 702,
M_Requisition_ID, 'N', posted, processing, processed, docstatus, processedon
from M_REQUISITION
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
;
CREATE OR REPLACE VIEW RV_UNPROCESSED
(
AD_CLIENT_ID,
AD_ORG_ID,
CREATED,
CREATEDBY,
UPDATED,
UPDATEDBY,
ISACTIVE,
DOCUMENTNO,
DATEDOC,
DATEACCT,
AD_TABLE_ID,
RECORD_ID,
ISSOTRX,
POSTED,
PROCESSING,
PROCESSED,
DOCSTATUS
)
AS
SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
DocumentNo,
DateDoc,
DateAcct,
224 AS AD_Table_ID,
GL_Journal_ID AS Record_ID,
'N' AS IsSOTrx,
posted,
processing,
processed,
docstatus
FROM GL_JOURNAL
WHERE DocStatus NOT IN ('CO','CL','VO','RE')
UNION
/*SELECT pi.AD_Client_ID,
pi.AD_Org_ID,
pi.Created,
pi.CreatedBy,
pi.Updated,
pi.UpdatedBy,
pi.IsActive,
p.NAME || '_' || pi.Line,
pi.MovementDate,
pi.MovementDate,
623,
pi.C_ProjectIssue_ID,
'N',
posted,
pi.processing,
pi.processed,
'CO' AS DocStatus
FROM C_PROJECTISSUE pi
INNER JOIN
C_PROJECT p
ON (pi.C_Project_ID = p.C_Project_ID)
WHERE Posted <> 'Y' --AND DocStatus<>'VO'
UNION*/
SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
DocumentNo,
DateInvoiced,
DateAcct,
318,
C_Invoice_ID,
IsSOTrx,
posted,
processing,
processed,
docstatus
FROM C_INVOICE
WHERE DocStatus NOT IN ('CO','CL','VO','RE')
UNION
SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
DocumentNo,
MovementDate,
DateAcct,
319,
M_InOut_ID,
IsSOTrx,
posted,
processing,
processed,
docstatus
FROM M_INOUT
WHERE DocStatus NOT IN ('CO','CL','VO','RE')
UNION
SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
DocumentNo,
MovementDate,
MovementDate,
321,
M_Inventory_ID,
'N',
posted,
processing,
processed,
docstatus
FROM M_INVENTORY
WHERE DocStatus NOT IN ('CO','CL','VO','RE')
UNION
SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
DocumentNo,
MovementDate,
MovementDate,
323,
M_Movement_ID,
'N',
posted,
processing,
processed,
docstatus
FROM M_MOVEMENT
WHERE DocStatus NOT IN ('CO','CL','VO','RE')
UNION
/*SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
NAME,
MovementDate,
MovementDate,
325,
M_Production_ID,
'N',
posted,
processing,
processed,
'CO' AS docstatus
FROM M_PRODUCTION
WHERE Posted <> 'Y' -- AND DocStatus<>'VO'
UNION*/
SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
NAME,
StatementDate,
DateAcct,
407,
C_Cash_ID,
'N',
posted,
processing,
processed,
docstatus
FROM C_CASH
WHERE DocStatus NOT IN ('CO','CL','VO','RE')
UNION
SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
DocumentNo,
DateTrx,
DateTrx,
335,
C_Payment_ID,
'N',
posted,
processing,
processed,
docstatus
FROM C_PAYMENT
WHERE DocStatus NOT IN ('CO','CL','VO','RE')
UNION
SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
DocumentNo,
DateTrx,
DateTrx,
735,
C_AllocationHdr_ID,
'N',
posted,
processing,
processed,
docstatus
FROM C_ALLOCATIONHDR
WHERE DocStatus NOT IN ('CO','CL','VO','RE')
UNION
SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
NAME,
StatementDate,
StatementDate,
392,
C_BankStatement_ID,
'N',
posted,
processing,
processed,
docstatus
FROM C_BANKSTATEMENT
WHERE DocStatus NOT IN ('CO','CL','VO','RE')
UNION
/*SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
DocumentNo,
DateTrx,
DateTrx,
472,
M_MatchInv_ID,
'N',
posted,
processing,
processed,
'CO' AS docstatus
FROM M_MATCHINV
WHERE Posted <> 'Y' --AND DocStatus<>'VO'
UNION*/
/*SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
DocumentNo,
DateTrx,
DateTrx,
473,
M_MatchPO_ID,
'N',
posted,
processing,
processed,
'CO' AS docstatus
FROM M_MATCHPO
WHERE Posted <> 'Y' --AND DocStatus<>'VO'
UNION*/
SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
DocumentNo,
DateOrdered,
DateAcct,
259,
C_Order_ID,
IsSOTrx,
posted,
processing,
processed,
docstatus
FROM C_ORDER
WHERE DocStatus NOT IN ('CO','CL','VO','RE')
UNION
SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
DocumentNo,
DateDoc,
DateDoc,
702,
M_Requisition_ID,
'N',
posted,
processing,
processed,
docstatus
FROM M_REQUISITION
WHERE DocStatus NOT IN ('CO','CL','VO','RE')
;
SELECT register_migration_script('201612061508_IDEMPIERE-3252.sql') FROM dual
;

424
migration/i4.1/postgresql/201612061508_IDEMPIERE-3252.sql Normal file
View File

@ -0,0 +1,424 @@
create or replace view rv_unposted
as
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, DateDoc, DateAcct, 224 AS AD_Table_ID,
GL_Journal_ID AS Record_ID, 'N' AS IsSOTrx, posted, processing,
processed, docstatus, processedon
from GL_JOURNAL
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION
SELECT pi.AD_Client_ID, pi.AD_Org_ID, pi.Created, pi.CreatedBy, pi.Updated,
pi.UpdatedBy, pi.IsActive, p.NAME || '_' || pi.Line,
pi.MovementDate, pi.MovementDate, 623, pi.C_ProjectIssue_ID, 'N',
posted, pi.processing, pi.processed, 'CO' as DocStatus, processedon
from C_PROJECTISSUE pi INNER JOIN C_PROJECT p
ON (pi.C_Project_ID = p.C_Project_ID)
WHERE Posted <> 'Y' --AND DocStatus<>'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, DateInvoiced, DateAcct, 318, C_Invoice_ID,
IsSOTrx, posted, processing, processed, docstatus, processedon
from C_INVOICE
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, MovementDate, DateAcct, 319, M_InOut_ID,
IsSOTrx, posted, processing, processed, docstatus, processedon
from M_INOUT
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, MovementDate, MovementDate, 321,
M_Inventory_ID, 'N', posted, processing, processed, docstatus, processedon
from M_INVENTORY
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, MovementDate, MovementDate, 323,
M_Movement_ID, 'N', posted, processing, processed, docstatus, processedon
from M_MOVEMENT
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, documentno, MovementDate, MovementDate, 325, M_Production_ID,
'N', posted, processing, processed, docstatus, processedon
from M_PRODUCTION
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, NAME, StatementDate, DateAcct, 407, C_Cash_ID, 'N',
posted, processing, processed, docstatus, processedon
from C_CASH
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, DateTrx, DateAcct, 335, C_Payment_ID, 'N',
posted, processing, processed, docstatus, processedon
from C_PAYMENT
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, DateTrx, DateAcct, 735, C_AllocationHdr_ID,
'N', posted, processing, processed, docstatus, processedon
from C_ALLOCATIONHDR
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, NAME, StatementDate, StatementDate, 392,
C_BankStatement_ID, 'N', posted, processing, processed, docstatus, processedon
from C_BANKSTATEMENT
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, DateTrx, DateAcct, 472, M_MatchInv_ID, 'N',
posted, processing, processed, 'CO' as docstatus, processedon
from M_MATCHINV
WHERE Posted <> 'Y' --AND DocStatus<>'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, DateTrx, DateAcct, 473, M_MatchPO_ID, 'N',
posted, processing, processed, 'CO' as docstatus, processedon
from M_MATCHPO
WHERE Posted <> 'Y' --AND DocStatus<>'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, DateOrdered, DateAcct, 259, C_Order_ID,
IsSOTrx, posted, processing, processed, docstatus, processedon
from C_ORDER
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
UNION
SELECT AD_Client_ID, AD_Org_ID, Created, CreatedBy, Updated, UpdatedBy,
IsActive, DocumentNo, DateDoc, DateDoc, 702,
M_Requisition_ID, 'N', posted, processing, processed, docstatus, processedon
from M_REQUISITION
WHERE Posted <> 'Y' AND DocStatus <> 'VO'
;
CREATE OR REPLACE VIEW RV_UNPROCESSED
(
AD_CLIENT_ID,
AD_ORG_ID,
CREATED,
CREATEDBY,
UPDATED,
UPDATEDBY,
ISACTIVE,
DOCUMENTNO,
DATEDOC,
DATEACCT,
AD_TABLE_ID,
RECORD_ID,
ISSOTRX,
POSTED,
PROCESSING,
PROCESSED,
DOCSTATUS
)
AS
SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
DocumentNo,
DateDoc,
DateAcct,
224 AS AD_Table_ID,
GL_Journal_ID AS Record_ID,
'N' AS IsSOTrx,
posted,
processing,
processed,
docstatus
FROM GL_JOURNAL
WHERE DocStatus NOT IN ('CO','CL','VO','RE')
UNION
/*SELECT pi.AD_Client_ID,
pi.AD_Org_ID,
pi.Created,
pi.CreatedBy,
pi.Updated,
pi.UpdatedBy,
pi.IsActive,
p.NAME || '_' || pi.Line,
pi.MovementDate,
pi.MovementDate,
623,
pi.C_ProjectIssue_ID,
'N',
posted,
pi.processing,
pi.processed,
'CO' AS DocStatus
FROM C_PROJECTISSUE pi
INNER JOIN
C_PROJECT p
ON (pi.C_Project_ID = p.C_Project_ID)
WHERE Posted <> 'Y' --AND DocStatus<>'VO'
UNION*/
SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
DocumentNo,
DateInvoiced,
DateAcct,
318,
C_Invoice_ID,
IsSOTrx,
posted,
processing,
processed,
docstatus
FROM C_INVOICE
WHERE DocStatus NOT IN ('CO','CL','VO','RE')
UNION
SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
DocumentNo,
MovementDate,
DateAcct,
319,
M_InOut_ID,
IsSOTrx,
posted,
processing,
processed,
docstatus
FROM M_INOUT
WHERE DocStatus NOT IN ('CO','CL','VO','RE')
UNION
SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
DocumentNo,
MovementDate,
MovementDate,
321,
M_Inventory_ID,
'N',
posted,
processing,
processed,
docstatus
FROM M_INVENTORY
WHERE DocStatus NOT IN ('CO','CL','VO','RE')
UNION
SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
DocumentNo,
MovementDate,
MovementDate,
323,
M_Movement_ID,
'N',
posted,
processing,
processed,
docstatus
FROM M_MOVEMENT
WHERE DocStatus NOT IN ('CO','CL','VO','RE')
UNION
/*SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
NAME,
MovementDate,
MovementDate,
325,
M_Production_ID,
'N',
posted,
processing,
processed,
'CO' AS docstatus
FROM M_PRODUCTION
WHERE Posted <> 'Y' -- AND DocStatus<>'VO'
UNION*/
SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
NAME,
StatementDate,
DateAcct,
407,
C_Cash_ID,
'N',
posted,
processing,
processed,
docstatus
FROM C_CASH
WHERE DocStatus NOT IN ('CO','CL','VO','RE')
UNION
SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
DocumentNo,
DateTrx,
DateTrx,
335,
C_Payment_ID,
'N',
posted,
processing,
processed,
docstatus
FROM C_PAYMENT
WHERE DocStatus NOT IN ('CO','CL','VO','RE')
UNION
SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
DocumentNo,
DateTrx,
DateTrx,
735,
C_AllocationHdr_ID,
'N',
posted,
processing,
processed,
docstatus
FROM C_ALLOCATIONHDR
WHERE DocStatus NOT IN ('CO','CL','VO','RE')
UNION
SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
NAME,
StatementDate,
StatementDate,
392,
C_BankStatement_ID,
'N',
posted,
processing,
processed,
docstatus
FROM C_BANKSTATEMENT
WHERE DocStatus NOT IN ('CO','CL','VO','RE')
UNION
/*SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
DocumentNo,
DateTrx,
DateTrx,
472,
M_MatchInv_ID,
'N',
posted,
processing,
processed,
'CO' AS docstatus
FROM M_MATCHINV
WHERE Posted <> 'Y' --AND DocStatus<>'VO'
UNION*/
/*SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
DocumentNo,
DateTrx,
DateTrx,
473,
M_MatchPO_ID,
'N',
posted,
processing,
processed,
'CO' AS docstatus
FROM M_MATCHPO
WHERE Posted <> 'Y' --AND DocStatus<>'VO'
UNION*/
SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
DocumentNo,
DateOrdered,
DateAcct,
259,
C_Order_ID,
IsSOTrx,
posted,
processing,
processed,
docstatus
FROM C_ORDER
WHERE DocStatus NOT IN ('CO','CL','VO','RE')
UNION
SELECT AD_Client_ID,
AD_Org_ID,
Created,
CreatedBy,
Updated,
UpdatedBy,
IsActive,
DocumentNo,
DateDoc,
DateDoc,
702,
M_Requisition_ID,
'N',
posted,
processing,
processed,
docstatus
FROM M_REQUISITION
WHERE DocStatus NOT IN ('CO','CL','VO','RE')
;
SELECT register_migration_script('201612061508_IDEMPIERE-3252.sql') FROM dual
;

4
org.adempiere.base/src/org/compiere/print/ReportEngine.java
View File

@ -2084,10 +2084,6 @@ queued-job-count = 0 (class javax.print.attribute.standard.QueuedJobCount)
} }
} }
public void cleanTempObj (){
m_layout = null;
}
/** /**
* store info of report column, * store info of report column,
* now just use index to create css selector, but for later maybe will construct a complex class name * now just use index to create css selector, but for later maybe will construct a complex class name

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/ValidateReadonlyComponent.java
View File

@ -48,7 +48,7 @@ public class ValidateReadonlyComponent implements AuService {
// event is reason change value of component // event is reason change value of component
boolean considerEvent = Events.ON_CHANGE.equals(cmd) || Events.ON_CHECK.equals(cmd) || boolean considerEvent = Events.ON_CHANGE.equals(cmd) || Events.ON_CHECK.equals(cmd) ||
Events.ON_SELECT.equals(cmd) || Events.ON_OPEN.equals(cmd) || Events.ON_SELECT.equals(cmd) ||
Events.ON_CLICK.equals(cmd) || Events.ON_DOUBLE_CLICK.equals(cmd) || Events.ON_OK.equals(cmd) || Events.ON_UPLOAD.equals(cmd); Events.ON_CLICK.equals(cmd) || Events.ON_DOUBLE_CLICK.equals(cmd) || Events.ON_OK.equals(cmd) || Events.ON_UPLOAD.equals(cmd);
if (!considerEvent){ if (!considerEvent){
@ -99,7 +99,7 @@ public class ValidateReadonlyComponent implements AuService {
if (isCannotEdit){ if (isCannotEdit){
boolean editing = (inputComp != null && Events.ON_CHANGE.equals(cmd)) || boolean editing = (inputComp != null && Events.ON_CHANGE.equals(cmd)) ||
(checkbox != null && Events.ON_CHECK.equals(cmd)) || (checkbox != null && Events.ON_CHECK.equals(cmd)) ||
(comb != null && (Events.ON_CHANGE.equals(cmd) || Events.ON_SELECT.equals(cmd) || Events.ON_OPEN.equals(cmd))) || (comb != null && (Events.ON_CHANGE.equals(cmd) || Events.ON_SELECT.equals(cmd))) ||
(button != null && (Events.ON_CLICK.equals(cmd) || Events.ON_OK.equals(cmd) || Events.ON_UPLOAD.equals(cmd)));; (button != null && (Events.ON_CLICK.equals(cmd) || Events.ON_OK.equals(cmd) || Events.ON_UPLOAD.equals(cmd)));;
// for combobox each change have both event onchange and onselect, so will have duplicate message // for combobox each change have both event onchange and onselect, so will have duplicate message

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java
View File

@ -532,8 +532,6 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
reportLink.setLabel(media.getName()); reportLink.setLabel(media.getName());
revalidate(); revalidate();
} finally { } finally {
if (m_reportEngine != null)
m_reportEngine.cleanTempObj();
hideBusyDialog(); hideBusyDialog();
future = null; future = null;
} }