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

IDEMPIERE-2447 Migration script from packin adding unnecessary updates

This commit is contained in:
Carlos Ruiz 2015-02-04 10:16:19 -05:00
parent a75477d81d
commit 833c03ddc0
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
org.adempiere.base/src/org/compiere/dbPort/Convert.java
View File

@ -577,12 +577,6 @@ public abstract class Convert
prm_COMMENT = MSysConfig.getValue(MSysConfig.PROJECT_ID_COMMENTS); prm_COMMENT = MSysConfig.getValue(MSysConfig.PROJECT_ID_COMMENTS);
else else
prm_COMMENT = MSysConfig.getValue(MSysConfig.DICTIONARY_ID_COMMENTS); prm_COMMENT = MSysConfig.getValue(MSysConfig.DICTIONARY_ID_COMMENTS);
// log time and date
SimpleDateFormat format = DisplayType.getDateFormat(DisplayType.DateTime);
String dateTimeText = format.format(new Timestamp(System.currentTimeMillis()));
w.append("-- ");
w.append(dateTimeText);
w.append("\n");
if (prm_COMMENT != null && ! m_oldprm_COMMENT.equals(prm_COMMENT)) { if (prm_COMMENT != null && ! m_oldprm_COMMENT.equals(prm_COMMENT)) {
// log sysconfig comment // log sysconfig comment
w.append("-- "); w.append("-- ");
@ -591,6 +585,12 @@ public abstract class Convert
if (w == writerPg) if (w == writerPg)
m_oldprm_COMMENT = prm_COMMENT; m_oldprm_COMMENT = prm_COMMENT;
} }
// log time and date
SimpleDateFormat format = DisplayType.getDateFormat(DisplayType.DateTime);
String dateTimeText = format.format(new Timestamp(System.currentTimeMillis()));
w.append("-- ");
w.append(dateTimeText);
w.append("\n");
// log statement // log statement
w.append(statement); w.append(statement);
// close statement // close statement

8
org.adempiere.pipo/src/org/adempiere/pipo2/PoFiller.java
View File

@ -195,14 +195,16 @@ public class PoFiller{
String sAD_Client_ID = clientElement != null ? clientElement.contents.toString() : null; String sAD_Client_ID = clientElement != null ? clientElement.contents.toString() : null;
if (sAD_Client_ID != null && sAD_Client_ID.equals("0")) if (sAD_Client_ID != null && sAD_Client_ID.equals("0"))
{ {
po.set_ValueNoCheck("AD_Client_ID", 0); if (po.getAD_Client_ID() != 0)
po.setAD_Org_ID(0); po.set_ValueNoCheck("AD_Client_ID", 0);
if (po.getAD_Org_ID() != 0)
po.setAD_Org_ID(0);
} }
else else
{ {
Element orgElement = element.properties.get("AD_Org_ID"); Element orgElement = element.properties.get("AD_Org_ID");
String sAD_Org_ID = orgElement != null ? orgElement.contents.toString() : null; String sAD_Org_ID = orgElement != null ? orgElement.contents.toString() : null;
if (sAD_Org_ID != null && sAD_Org_ID.equals("0")) if (sAD_Org_ID != null && sAD_Org_ID.equals("0") && po.getAD_Org_ID() != 0)
po.setAD_Org_ID(0); po.setAD_Org_ID(0);
else if (sAD_Org_ID != null && sAD_Org_ID.equals("@AD_Org_ID@")) else if (sAD_Org_ID != null && sAD_Org_ID.equals("@AD_Org_ID@"))
po.setAD_Org_ID(Env.getAD_Org_ID(ctx.ctx)); po.setAD_Org_ID(Env.getAD_Org_ID(ctx.ctx));