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

Merge 2feb23f94426

This commit is contained in:
Heng Sin Low 2013-03-13 00:24:23 +08:00
parent bc6078de46 0ba596ace8
commit 2186311a7c
9 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
migration/i1.0a-release/oracle/201303121104_IDEMPIERE-166.sql Normal file
View File

@ -0,0 +1,8 @@
-- Mar 12, 2013 10:55:02 AM COT
-- IDEMPIERE-166 Rebranding of logo and product name
UPDATE AD_PrintTableFormat SET FunctBG_PrintColor_ID=115, HdrLine_PrintColor_ID=NULL, Line_PrintColor_ID=NULL, FunctFG_PrintColor_ID=100, IsPaintHLines='N', IsPaintVLines='N', HdrTextBG_PrintColor_ID=115, Hdr_PrintFont_ID=161, LineStrokeType='S', LineStroke=0.5, HdrTextFG_PrintColor_ID=100, HdrStroke=1, Funct_PrintFont_ID=155,Updated=TO_DATE('2013-03-12 10:55:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_PrintTableFormat_ID=100
;
SELECT register_migration_script('201303121104_IDEMPIERE-166.sql') FROM dual
;

8
migration/i1.0a-release/postgresql/201303121104_IDEMPIERE-166.sql Normal file
View File

@ -0,0 +1,8 @@
-- Mar 12, 2013 10:55:02 AM COT
-- IDEMPIERE-166 Rebranding of logo and product name
UPDATE AD_PrintTableFormat SET FunctBG_PrintColor_ID=115, HdrLine_PrintColor_ID=NULL, Line_PrintColor_ID=NULL, FunctFG_PrintColor_ID=100, IsPaintHLines='N', IsPaintVLines='N', HdrTextBG_PrintColor_ID=115, Hdr_PrintFont_ID=161, LineStrokeType='S', LineStroke=0.5, HdrTextFG_PrintColor_ID=100, HdrStroke=1, Funct_PrintFont_ID=155,Updated=TO_TIMESTAMP('2013-03-12 10:55:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_PrintTableFormat_ID=100
;
SELECT register_migration_script('201303121104_IDEMPIERE-166.sql') FROM dual
;

6
org.adempiere.base.process/src/org/compiere/process/BOMVerify.java
View File

@ -195,21 +195,21 @@ public class BOMVerify extends SvrProcess
{
invalidproducts.add(product);
product.setIsVerified(false);
product.save();
product.saveEx();
return false;
}
else if (containsinvalid)
{
containinvalidproducts.add(product);
product.setIsVerified(false);
product.save();
product.saveEx();
return false;
}
else
{
validproducts.add(product);
product.setIsVerified(true);
product.save();
product.saveEx();
return true;
}

4
org.adempiere.base/src/org/adempiere/process/DepositBatchClose.java
View File

@ -79,11 +79,11 @@ public class DepositBatchClose extends SvrProcess
for (int line = 0; line < depositbatchLines.length; line++)
{
depositbatchLines[line].setProcessed(true);
depositbatchLines[line].save();
depositbatchLines[line].saveEx();
}
depositbatch.setProcessed(true);
depositbatch.save();
depositbatch.saveEx();
return "";
} // doIt

4
org.adempiere.base/src/org/compiere/model/MPayment.java
View File

@ -2874,13 +2874,13 @@ public final class MPayment extends X_C_Payment
{
MInvoice inv = new MInvoice(getCtx(), getC_Invoice_ID(), get_TrxName());
inv.setC_Payment_ID(0);
inv.save();
inv.saveEx();
}
if (getC_Order_ID() != 0)
{
MOrder ord = new MOrder(getCtx(), getC_Order_ID(), get_TrxName());
ord.setC_Payment_ID(0);
ord.save();
ord.saveEx();
}
return true;

4
org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java
View File

@ -301,14 +301,14 @@ public class PackInHandler extends DefaultHandler {
//Update package history log with package status
X_AD_Package_Imp packageImp = new X_AD_Package_Imp(m_ctx.ctx, AD_Package_Imp_ID, null);
packageImp.setPK_Status(packageStatus);
packageImp.save();
packageImp.saveEx();
throw re;
} catch (SAXException se) {
packageStatus = "Import Failed";
//Update package history log with package status
X_AD_Package_Imp packageImp = new X_AD_Package_Imp(m_ctx.ctx, AD_Package_Imp_ID, null);
packageImp.setPK_Status(packageStatus);
packageImp.save();
packageImp.saveEx();
throw se;
}
}

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
View File

@ -1022,7 +1022,7 @@ DataStatusListener, IADTabpanel, IdSpace
preference.setAttribute(adTabId+"|DetailPane.IsOpen");
preference.setValue(value ? "Y" : "N");
}
preference.save();
preference.saveEx();
//update current context
Env.getCtx().setProperty("P"+windowId+"|"+adTabId+"|DetailPane.IsOpen", value ? "Y" : "N");
}

6
org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/RunProcess.java
View File

@ -122,7 +122,7 @@ public class RunProcess extends TableFixture {
exception(getCell(i, 1), new Exception(errorMsg));
if (recordID > 0)
pInstance.setRecord_ID( recordID);
pInstance.save();
pInstance.saveEx();
if (docAction != null) {
if (docAction != null && docAction.length() > 0) {
// Requirements
@ -139,7 +139,7 @@ public class RunProcess extends TableFixture {
PO po = table.getPO(recordID, null);
if (po != null) {
po.set_ValueOfColumn("DocAction", docAction);
po.save();
po.saveEx();
}
}
}
@ -389,7 +389,7 @@ public class RunProcess extends TableFixture {
}
//
iPara.save();
iPara.saveEx();
}
catch (Exception e)
{

8
org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/Process.java
View File

@ -194,7 +194,7 @@ public class Process {
PO po = table.getPO(m_record_id, null);
if (po != null) {
po.set_ValueOfColumn("DocAction", docAction);
po.save();
po.saveEx();
}
}
}
@ -218,7 +218,7 @@ public class Process {
if (m_record_id>0)
{
pInstance.setRecord_ID( m_record_id);
pInstance.save();
pInstance.saveEx();
}
//
ProcessInfo pi = new ProcessInfo (process.getName(), process.getAD_Process_ID());
@ -539,7 +539,7 @@ public class Process {
}
//
iPara.save();
iPara.saveEx();
}
catch (Exception e)
{
@ -551,7 +551,7 @@ public class Process {
} // not null
} // instance parameter loop
pInstance.save(); // kolec - tego chyba brakowalo
pInstance.saveEx(); // kolec - tego chyba brakowalo
return pInstance;
} // fillParameter