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

hg merge release-6.2 (merge release6.2 into default)

This commit is contained in:
Carlos Ruiz 2019-08-18 12:38:53 +02:00
parent d7cddaa9f2 4284ae73ed
commit 01643c0acb
8 changed files with 57 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
migration/i6.2/oracle/201908080715_IDEMPIERE-918_RelationType.sql Normal file
View File

@ -0,0 +1,18 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- IDEMPIERE-918 - RelationType
-- 8 August 2019 at  07:10:25 CEST
INSERT INTO AD_Reference (AD_Reference_ID,Name,ValidationType,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,EntityType,IsOrderByValue,AD_Reference_UU) VALUES (200171,'RelType C_Invoice -> C_Invoice (CM)','T',0,0,'Y',TO_DATE('2019-08-08 07:10:25','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2019-08-08 07:10:25','YYYY-MM-DD HH24:MI:SS'),0,'D','N','0c256942-4836-4cef-9fb1-e5bb4554aa00')
;
-- 8 August 2019 at  07:10:49 CEST
INSERT INTO AD_Ref_Table (AD_Reference_ID,AD_Table_ID,AD_Key,AD_Display,WhereClause,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsValueDisplayed,EntityType,AD_Ref_Table_UU) VALUES (200171,318,3484,3484,'C_Invoice.RelatedInvoice_ID = @C_Invoice_ID@',0,0,'Y',TO_DATE('2019-08-08 07:10:49','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2019-08-08 07:10:49','YYYY-MM-DD HH24:MI:SS'),0,'N','D','93d883dc-5a38-4887-babd-5f691390ea38')
;
-- 8 August 2019 at  07:11:05 CEST
INSERT INTO AD_RelationType (AD_Client_ID,AD_Org_ID,AD_RelationType_ID,Created,CreatedBy,IsActive,Name,Updated,UpdatedBy,AD_Reference_Source_ID,AD_Reference_Target_ID,IsDirected,Type,AD_RelationType_UU) VALUES (0,0,200000,TO_DATE('2019-08-08 07:11:04','YYYY-MM-DD HH24:MI:SS'),0,'Y','Invoice -> Credit Memo (using RelatedInvoice_ID field)',TO_DATE('2019-08-08 07:11:04','YYYY-MM-DD HH24:MI:SS'),0,200171,200171,'N','I','9c8aec77-a6f5-4154-8d63-5cd285f316b9')
;
SELECT register_migration_script('201908080715_IDEMPIERE-918_RelationType.sql') FROM dual
;

15
migration/i6.2/postgresql/201908080715_IDEMPIERE-918_RelationType.sql Normal file
View File

@ -0,0 +1,15 @@
-- IDEMPIERE-918 - RelationType
-- 8 August 2019 at  07:10:25 CEST
INSERT INTO AD_Reference (AD_Reference_ID,Name,ValidationType,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,EntityType,IsOrderByValue,AD_Reference_UU) VALUES (200171,'RelType C_Invoice -> C_Invoice (CM)','T',0,0,'Y',TO_TIMESTAMP('2019-08-08 07:10:25','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2019-08-08 07:10:25','YYYY-MM-DD HH24:MI:SS'),0,'D','N','0c256942-4836-4cef-9fb1-e5bb4554aa00')
;
-- 8 August 2019 at  07:10:49 CEST
INSERT INTO AD_Ref_Table (AD_Reference_ID,AD_Table_ID,AD_Key,AD_Display,WhereClause,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsValueDisplayed,EntityType,AD_Ref_Table_UU) VALUES (200171,318,3484,3484,'C_Invoice.RelatedInvoice_ID = @C_Invoice_ID@',0,0,'Y',TO_TIMESTAMP('2019-08-08 07:10:49','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2019-08-08 07:10:49','YYYY-MM-DD HH24:MI:SS'),0,'N','D','93d883dc-5a38-4887-babd-5f691390ea38')
;
-- 8 August 2019 at  07:11:05 CEST
INSERT INTO AD_RelationType (AD_Client_ID,AD_Org_ID,AD_RelationType_ID,Created,CreatedBy,IsActive,Name,Updated,UpdatedBy,AD_Reference_Source_ID,AD_Reference_Target_ID,IsDirected,Type,AD_RelationType_UU) VALUES (0,0,200000,TO_TIMESTAMP('2019-08-08 07:11:04','YYYY-MM-DD HH24:MI:SS'),0,'Y','Invoice -> Credit Memo (using RelatedInvoice_ID field)',TO_TIMESTAMP('2019-08-08 07:11:04','YYYY-MM-DD HH24:MI:SS'),0,200171,200171,'N','I','9c8aec77-a6f5-4154-8d63-5cd285f316b9')
;
SELECT register_migration_script('201908080715_IDEMPIERE-918_RelationType.sql') FROM dual
;

2
org.adempiere.base/src/org/compiere/acct/FactLine.java
View File

@ -125,7 +125,7 @@ public final class FactLine extends X_Fact_Acct
reversal.setC_LocTo_ID(getC_LocTo_ID()); reversal.setC_LocTo_ID(getC_LocTo_ID());
reversal.setC_LocFrom_ID(getC_LocFrom_ID()); reversal.setC_LocFrom_ID(getC_LocFrom_ID());
reversal.setUser1_ID(getUser1_ID()); reversal.setUser1_ID(getUser1_ID());
reversal.setUser2_ID(getUser1_ID()); reversal.setUser2_ID(getUser2_ID());
reversal.setUserElement1_ID(getUserElement1_ID()); reversal.setUserElement1_ID(getUserElement1_ID());
reversal.setUserElement2_ID(getUserElement2_ID()); reversal.setUserElement2_ID(getUserElement2_ID());

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

@ -532,6 +532,8 @@ public class MOrder extends X_C_Order implements DocAction
line.setQtyDelivered(Env.ZERO); line.setQtyDelivered(Env.ZERO);
line.setQtyInvoiced(Env.ZERO); line.setQtyInvoiced(Env.ZERO);
line.setQtyReserved(Env.ZERO); line.setQtyReserved(Env.ZERO);
line.setQtyLostSales(Env.ZERO);
line.setQtyOrdered(Env.ZERO);
line.setDateDelivered(null); line.setDateDelivered(null);
line.setDateInvoiced(null); line.setDateInvoiced(null);
// //

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

@ -814,7 +814,7 @@ public class MOrderLine extends X_C_OrderLine
if (getM_Product_ID() == 0) if (getM_Product_ID() == 0)
setM_AttributeSetInstance_ID(0); setM_AttributeSetInstance_ID(0);
// Product // Product
else // Set/check Product Price else if (!isProcessed()) // Set/check Product Price
{ {
// Set Price if Actual = 0 // Set Price if Actual = 0
if (m_productPrice == null if (m_productPrice == null

5
org.adempiere.base/src/org/compiere/model/MProductPricing.java
View File

@ -37,9 +37,6 @@ import org.compiere.util.Trace;
*/ */
public class MProductPricing extends AbstractProductPricing public class MProductPricing extends AbstractProductPricing
{ {
private String trxName=null;
/** /**
* New constructor to be used with the ProductPriceFactories * New constructor to be used with the ProductPriceFactories
*/ */
@ -88,8 +85,6 @@ public class MProductPricing extends AbstractProductPricing
m_useVendorBreak = thereAreVendorBreakRecords > 0; m_useVendorBreak = thereAreVendorBreakRecords > 0;
} }
private int m_M_PriceList_Version_ID = 0;
private Timestamp m_PriceDate;
/** Precision -1 = no rounding */ /** Precision -1 = no rounding */
private int m_precision = -1; private int m_precision = -1;

15
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java
View File

@ -323,12 +323,17 @@ ContextMenuListener, IZoomableEditor
{ {
//if it is problem with record lock, just keep value (no trigger change) and set field readonly //if it is problem with record lock, just keep value (no trigger change) and set field readonly
MRole role = MRole.getDefault(Env.getCtx(), false); MRole role = MRole.getDefault(Env.getCtx(), false);
MColumn col = MColumn.get(Env.getCtx(), gridField.getAD_Column_ID());
int refTableID = -1; int refTableID = -1;
if (col.get_ID() > 0) { if (gridTab != null) // fields process para don't represent a column ID
String refTable = col.getReferenceTableName(); {
MTable table = MTable.get(Env.getCtx(), refTable); MColumn col = MColumn.get(Env.getCtx(), gridField.getAD_Column_ID());
refTableID = table.getAD_Table_ID(); if (col.get_ID() > 0) {
String refTable = col.getReferenceTableName();
if (refTable != null) {
MTable table = MTable.get(Env.getCtx(), refTable);
refTableID = table.getAD_Table_ID();
}
}
} }
if (refTableID > 0 && ! role.isRecordAccess(refTableID, (int)value, false)) if (refTableID > 0 && ! role.isRecordAccess(refTableID, (int)value, false))
{ {

10
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuTreeFilterPanel.java
View File

@ -84,6 +84,16 @@ public class MenuTreeFilterPanel extends Popup implements EventListener<Event>,
form.addEventListener(Events.ON_CHECK, this); form.addEventListener(Events.ON_CHECK, this);
box.appendChild(form); box.appendChild(form);
Checkbox info = new Checkbox();
if (ThemeManager.isUseFontIconForImage())
info.setIconSclass("z-icon-Info");
else
info.setImage(ThemeManager.getThemeResource("images/mInfo.png"));
info.setChecked(true);
info.setId("info");
info.addEventListener(Events.ON_CHECK, this);
box.appendChild(info);
Checkbox single = new Checkbox(); Checkbox single = new Checkbox();
single.setLabel(Msg.getMsg(Env.getCtx(), "FlatView")); single.setLabel(Msg.getMsg(Env.getCtx(), "FlatView"));
single.setId("flatView"); single.setId("flatView");