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

IDEMPIERE-197 Stabilize Fixed Assets / Required fixes for iDempiere

This commit is contained in:
Carlos Ruiz 2012-10-24 22:30:01 -05:00
parent c6f25f2a6d
commit 95622fc317
6 changed files with 58 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
migration/360lts-release/oracle/946_IDEMPIERE-197_FixedAssets.sql Normal file
View File

@ -0,0 +1,29 @@
-- Position new fixed assets fields according to new grid positioning
UPDATE AD_Field SET XPosition=3 WHERE ad_field_uu is null and seqnogrid is null AND IsSameLine='Y' AND IsActive='Y';
UPDATE AD_Field SET XPosition=1 WHERE ad_field_uu is null and seqnogrid is null AND IsSameline='N' AND IsActive='Y';
UPDATE AD_Field SET ColumnSpan=1 WHERE ad_field_uu is null and seqnogrid is null AND DisplayLength<30 AND IsActive='Y';
UPDATE AD_Field SET ColumnSpan=3 WHERE ad_field_uu is null and seqnogrid is null AND DisplayLength>=30 AND IsActive='Y';
UPDATE AD_Field SET NumLines=3 WHERE ad_field_uu is null and seqnogrid is null AND AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Reference_ID=14) AND IsActive='Y';
UPDATE AD_Field SET NumLines=5 WHERE ad_field_uu is null and seqnogrid is null AND AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Reference_ID=36) AND IsActive='Y';
UPDATE AD_Field SET NumLines=8 WHERE ad_field_uu is null and seqnogrid is null AND AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Reference_ID=34) AND IsActive='Y';
UPDATE AD_Field SET ColumnSpan=2 WHERE ad_field_uu is null and seqnogrid is null AND AD_Field_ID IN (SELECT AD_Field_ID FROM AD_Field WHERE XPosition=1 AND ColumnSpan=1 AND IsActive='Y');
UPDATE AD_Field SET XPosition=4,ColumnSpan=2 WHERE ad_field_uu is null and seqnogrid is null AND AD_Field_ID IN (SELECT AD_Field_ID FROM AD_Field WHERE XPosition=3 AND ColumnSpan=1 AND IsActive='Y');
UPDATE AD_Field SET XPosition=XPosition+1 WHERE ad_field_uu is null and seqnogrid is null AND AD_Field_ID IN (SELECT fi.AD_Field_ID FROM AD_Field fi INNER JOIN AD_Column c ON (fi.AD_Column_ID=C.AD_Column_ID) WHERE c.AD_Reference_ID in (20,28) AND fi.IsActive='Y');
UPDATE AD_Field SET ColumnSpan=5 WHERE ad_field_uu is null and seqnogrid is null AND AD_Field_ID IN (SELECT AD_Field_ID FROM AD_Field WHERE XPosition=1 AND ColumnSpan=3 AND IsActive='Y');
UPDATE AD_Field SET seqnogrid=seqno WHERE ad_field_uu is null and seqnogrid is null;
SELECT register_migration_script('946_IDEMPIERE-197_FixedAssets.sql') FROM dual
;

29
migration/360lts-release/postgresql/946_IDEMPIERE-197_FixedAssets.sql Normal file
View File

@ -0,0 +1,29 @@
-- Position new fixed assets fields according to new grid positioning
UPDATE AD_Field SET XPosition=3 WHERE ad_field_uu is null and seqnogrid is null AND IsSameLine='Y' AND IsActive='Y';
UPDATE AD_Field SET XPosition=1 WHERE ad_field_uu is null and seqnogrid is null AND IsSameline='N' AND IsActive='Y';
UPDATE AD_Field SET ColumnSpan=1 WHERE ad_field_uu is null and seqnogrid is null AND DisplayLength<30 AND IsActive='Y';
UPDATE AD_Field SET ColumnSpan=3 WHERE ad_field_uu is null and seqnogrid is null AND DisplayLength>=30 AND IsActive='Y';
UPDATE AD_Field SET NumLines=3 WHERE ad_field_uu is null and seqnogrid is null AND AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Reference_ID=14) AND IsActive='Y';
UPDATE AD_Field SET NumLines=5 WHERE ad_field_uu is null and seqnogrid is null AND AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Reference_ID=36) AND IsActive='Y';
UPDATE AD_Field SET NumLines=8 WHERE ad_field_uu is null and seqnogrid is null AND AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Reference_ID=34) AND IsActive='Y';
UPDATE AD_Field SET ColumnSpan=2 WHERE ad_field_uu is null and seqnogrid is null AND AD_Field_ID IN (SELECT AD_Field_ID FROM AD_Field WHERE XPosition=1 AND ColumnSpan=1 AND IsActive='Y');
UPDATE AD_Field SET XPosition=4,ColumnSpan=2 WHERE ad_field_uu is null and seqnogrid is null AND AD_Field_ID IN (SELECT AD_Field_ID FROM AD_Field WHERE XPosition=3 AND ColumnSpan=1 AND IsActive='Y');
UPDATE AD_Field SET XPosition=XPosition+1 WHERE ad_field_uu is null and seqnogrid is null AND AD_Field_ID IN (SELECT fi.AD_Field_ID FROM AD_Field fi INNER JOIN AD_Column c ON (fi.AD_Column_ID=C.AD_Column_ID) WHERE c.AD_Reference_ID in (20,28) AND fi.IsActive='Y');
UPDATE AD_Field SET ColumnSpan=5 WHERE ad_field_uu is null and seqnogrid is null AND AD_Field_ID IN (SELECT AD_Field_ID FROM AD_Field WHERE XPosition=1 AND ColumnSpan=3 AND IsActive='Y');
UPDATE AD_Field SET seqnogrid=seqno WHERE ad_field_uu is null and seqnogrid is null;
SELECT register_migration_script('946_IDEMPIERE-197_FixedAssets.sql') FROM dual
;

1
org.adempiere.base/META-INF/MANIFEST.MF
View File

@ -166,7 +166,6 @@ Export-Package: bsh,
org.codehaus.groovy.vmplugin.v5,
org.codehaus.groovy.vmplugin.v6,
org.compiere,
org.compiere.FA,
org.compiere.acct,
org.compiere.cm,
org.compiere.db,

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

@ -4,28 +4,18 @@ import java.io.File;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.ResultSet;
import java.sql.Timestamp;
import java.util.List;
import java.util.Properties;
import org.compiere.model.MClient;
import org.compiere.model.MDocType;
import org.compiere.model.MPeriod;
import org.compiere.model.ModelValidationEngine;
import org.compiere.model.ModelValidator;
import org.compiere.process.DocAction;
import org.compiere.process.DocumentEngine;
import org.compiere.util.Env;
import org.idempiere.fa.exceptions.AssetAlreadyDepreciatedException;
import org.idempiere.fa.exceptions.AssetException;
import org.idempiere.fa.exceptions.AssetNotImplementedException;
import org.idempiere.fa.exceptions.AssetNotSupportedException;
import org.idempiere.fa.exceptions.AssetStatusChangedException;
import org.idempiere.fa.feature.UseLifeImpl;
import org.idempiere.fa.util.POCacheLocal;
import com.sun.enterprise.connectors.util.SetMethodAction;
/**

0
org.adempiere.base.process/src/org/compiere/process/ProjectClose.java → org.adempiere.base/src/org/compiere/process/ProjectClose.java
View File

5
org.adempiere.base/src/org/idempiere/fa/model/CalloutA_Depreciation_Workfile.java
View File

@ -6,13 +6,8 @@ import java.util.Properties;
import org.compiere.model.CalloutEngine;
import org.compiere.model.GridField;
import org.compiere.model.GridTab;
import org.compiere.model.MAsset;
import org.compiere.model.MAssetAddition;
import org.compiere.model.MDepreciationWorkfile;
import org.compiere.model.SetGetUtil;
import org.compiere.util.Env;
import com.sun.corba.ee.spi.servicecontext.ServiceContextsCache.CASE;
/**