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

hg merge release-1.0c (forward-porting)

This commit is contained in:
Carlos Ruiz 2013-09-19 18:08:23 -05:00
parent a784103b35 cb2624fbef
commit 8f6c092672
4 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
migration/i1.0c-release/oracle/201309190245_IDEMPIERE-1180.sql Normal file
View File

@ -0,0 +1,11 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- Sep 19, 2013 10:36:56 AM MYT
-- IDEMPIERE-1064 Control dashboard access by role
UPDATE AD_Field SET AD_Reference_ID=30, AD_Reference_Value_ID=162,Updated=TO_DATE('2013-09-19 10:36:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202328
;
SELECT register_migration_script('201309190245_IDEMPIERE-1180.sql') FROM dual
;

8
migration/i1.0c-release/postgresql/201309190245_IDEMPIERE-1180.sql Normal file
View File

@ -0,0 +1,8 @@
-- Sep 19, 2013 10:36:56 AM MYT
-- IDEMPIERE-1064 Control dashboard access by role
UPDATE AD_Field SET AD_Reference_ID=30, AD_Reference_Value_ID=162,Updated=TO_TIMESTAMP('2013-09-19 10:36:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202328
;
SELECT register_migration_script('201309190245_IDEMPIERE-1180.sql') FROM dual
;

13
org.adempiere.base/src/org/compiere/acct/Doc_Inventory.java
View File

@ -195,12 +195,19 @@ public class Doc_Inventory extends Doc
if (costAdjustment) if (costAdjustment)
{ {
product = line.getProduct(); product = line.getProduct();
String productCostingMethod = product.getCostingMethod(as); if (!product.isStocked())
costingLevel = product.getCostingLevel(as);
if (!docCostingMethod.equals(productCostingMethod))
{ {
doPosting = false; doPosting = false;
} }
else
{
String productCostingMethod = product.getCostingMethod(as);
costingLevel = product.getCostingLevel(as);
if (!docCostingMethod.equals(productCostingMethod))
{
doPosting = false;
}
}
} }
BigDecimal costs = null; BigDecimal costs = null;

17
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AEnv.java
View File

@ -160,6 +160,21 @@ public final class AEnv
zoom(AD_Window_ID, MQuery.getEqualQuery(table.getKeyColumns()[0], Record_ID)); zoom(AD_Window_ID, MQuery.getEqualQuery(table.getKeyColumns()[0], Record_ID));
} // zoom } // zoom
/*************************************************************************
* Zoom
* @param AD_Table_ID
* @param Record_ID
* @param query
*/
public static void zoom (int AD_Table_ID, int Record_ID, MQuery query)
{
int AD_Window_ID = Env.getZoomWindowID(AD_Table_ID, Record_ID);
// Nothing to Zoom to
if (AD_Window_ID == 0)
return;
zoom(AD_Window_ID, query);
} // zoom
/** /**
* Exit System * Exit System
* @param status System exit status (usually 0 for no error) * @param status System exit status (usually 0 for no error)
@ -388,7 +403,7 @@ public final class AEnv
} }
if (value instanceof Integer && ((Integer) value).intValue() >= 0 && zoomQuery != null && zoomQuery.getZoomTableName() != null) { if (value instanceof Integer && ((Integer) value).intValue() >= 0 && zoomQuery != null && zoomQuery.getZoomTableName() != null) {
int tableId = MTable.getTable_ID(zoomQuery.getZoomTableName()); int tableId = MTable.getTable_ID(zoomQuery.getZoomTableName());
zoom(tableId, ((Integer) value).intValue()); zoom(tableId, ((Integer) value).intValue(), zoomQuery);
} else { } else {
int windowId = lookup.getZoom(zoomQuery); int windowId = lookup.getZoom(zoomQuery);
zoom(windowId, zoomQuery); zoom(windowId, zoomQuery);