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

Merged in hengsin/idempiere-hengsin (IDEMPIERE-212 IDEMPIERE-213)

This commit is contained in:
Carlos Ruiz 2012-04-02 16:02:03 -05:00
parent 1982a8b331 1ce9a29b2e
commit 1547755d5b
27 changed files with 189 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/ddlutils/oracle/views/RV_M_REQUISITION.sql
View File

@ -4,7 +4,7 @@ CREATE OR REPLACE VIEW RV_M_REQUISITION
HELP, AD_USER_ID, M_PRICELIST_ID, M_WAREHOUSE_ID, ISAPPROVED,
PRIORITYRULE, DATEREQUIRED, TOTALLINES, DOCACTION, DOCSTATUS,
PROCESSED, M_REQUISITIONLINE_ID, LINE, QTY, QTYORDERED,
M_PRODUCT_ID, LINEDESCRIPTION, PRICEACTUAL, LINENETAMT)
M_PRODUCT_ID, LINEDESCRIPTION, PRICEACTUAL, LINENETAMT, C_CHARGE_ID)
AS
SELECT r.M_Requisition_ID,
r.AD_Client_ID, r.AD_Org_ID, r.IsActive, r.Created, r.CreatedBy, r.Updated, r.UpdatedBy,
@ -16,7 +16,7 @@ SELECT r.M_Requisition_ID,
(CASE WHEN l.C_OrderLine_ID IS NOT NULL THEN l.Qty ELSE 0 END) AS QtyOrdered,
l.M_Product_ID,
l.Description AS LineDescription,
l.PriceActual, l.LineNetAmt
l.PriceActual, l.LineNetAmt, l.C_Charge_ID
FROM M_Requisition r
INNER JOIN M_RequisitionLine l ON (r.M_Requisition_ID=l.M_Requisition_ID);

4
db/ddlutils/postgresql/views/RV_M_REQUISITION.sql
View File

@ -4,7 +4,7 @@ CREATE OR REPLACE VIEW RV_M_REQUISITION
HELP, AD_USER_ID, M_PRICELIST_ID, M_WAREHOUSE_ID, ISAPPROVED,
PRIORITYRULE, DATEREQUIRED, TOTALLINES, DOCACTION, DOCSTATUS,
PROCESSED, M_REQUISITIONLINE_ID, LINE, QTY, QTYORDERED,
M_PRODUCT_ID, LINEDESCRIPTION, PRICEACTUAL, LINENETAMT)
M_PRODUCT_ID, LINEDESCRIPTION, PRICEACTUAL, LINENETAMT, C_CHARGE_ID)
AS
SELECT r.M_Requisition_ID,
r.AD_Client_ID, r.AD_Org_ID, r.IsActive, r.Created, r.CreatedBy, r.Updated, r.UpdatedBy,
@ -16,7 +16,7 @@ SELECT r.M_Requisition_ID,
(CASE WHEN l.C_OrderLine_ID IS NOT NULL THEN l.Qty ELSE 0 END) AS QtyOrdered,
l.M_Product_ID,
l.Description AS LineDescription,
l.PriceActual, l.LineNetAmt
l.PriceActual, l.LineNetAmt, l.C_Charge_ID
FROM M_Requisition r
INNER JOIN M_RequisitionLine l ON (r.M_Requisition_ID=l.M_Requisition_ID);

41
migration/360lts-release/oracle/828_IDEMPIERE-204.sql Normal file
View File

@ -0,0 +1,41 @@
CREATE OR REPLACE VIEW RV_M_REQUISITION
(M_REQUISITION_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED,
CREATEDBY, UPDATED, UPDATEDBY, DOCUMENTNO, DESCRIPTION,
HELP, AD_USER_ID, M_PRICELIST_ID, M_WAREHOUSE_ID, ISAPPROVED,
PRIORITYRULE, DATEREQUIRED, TOTALLINES, DOCACTION, DOCSTATUS,
PROCESSED, M_REQUISITIONLINE_ID, LINE, QTY, QTYORDERED,
M_PRODUCT_ID, LINEDESCRIPTION, PRICEACTUAL, LINENETAMT, C_CHARGE_ID)
AS
SELECT r.M_Requisition_ID,
r.AD_Client_ID, r.AD_Org_ID, r.IsActive, r.Created, r.CreatedBy, r.Updated, r.UpdatedBy,
r.DocumentNo, r.Description, r.Help,
r.AD_User_ID, r.M_PriceList_ID, r.M_Warehouse_ID, r.IsApproved, r.PriorityRule,
r.DateRequired, r.TotalLines, r.DocAction, r.DocStatus, r.Processed,
l.M_RequisitionLine_ID, l.Line,
l.Qty,
(CASE WHEN l.C_OrderLine_ID IS NOT NULL THEN l.Qty ELSE 0 END) AS QtyOrdered,
l.M_Product_ID,
l.Description AS LineDescription,
l.PriceActual, l.LineNetAmt, l.C_Charge_ID
FROM M_Requisition r
INNER JOIN M_RequisitionLine l ON (r.M_Requisition_ID=l.M_Requisition_ID);
-- Mar 22, 2012 9:47:24 AM COT
-- IDEMPIERE-204 Add charge to Open Requisitions report
INSERT INTO AD_Column (AD_Column_ID,AD_Table_ID,EntityType,Version,IsMandatory,IsTranslated,IsIdentifier,Help,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Name,CreatedBy,Updated,AD_Client_ID,AD_Org_ID,IsActive,Created,UpdatedBy) VALUES (200082,711,'U',0,'N','N','N','The Charge indicates a type of Charge (Handling, Shipping, Restocking)','N',10,'N',19,'N',968,'N','N','N','C_Charge_ID','Additional document charges','Charge',100,TO_DATE('2012-03-22 09:47:22','YYYY-MM-DD HH24:MI:SS'),0,0,'Y',TO_DATE('2012-03-22 09:47:22','YYYY-MM-DD HH24:MI:SS'),100)
;
-- Mar 22, 2012 9:47:24 AM COT
INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200082 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
;
-- Mar 22, 2012 9:47:47 AM COT
UPDATE AD_Column SET EntityType='D',Updated=TO_DATE('2012-03-22 09:47:47','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200082
;
UPDATE AD_System
SET LastMigrationScriptApplied='828_IDEMPIERE-204.sql'
WHERE LastMigrationScriptApplied<'828_IDEMPIERE-204.sql'
OR LastMigrationScriptApplied IS NULL
;

40
migration/360lts-release/postgresql/828_IDEMPIERE-204.sql Normal file
View File

@ -0,0 +1,40 @@
CREATE OR REPLACE VIEW RV_M_REQUISITION
(M_REQUISITION_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED,
CREATEDBY, UPDATED, UPDATEDBY, DOCUMENTNO, DESCRIPTION,
HELP, AD_USER_ID, M_PRICELIST_ID, M_WAREHOUSE_ID, ISAPPROVED,
PRIORITYRULE, DATEREQUIRED, TOTALLINES, DOCACTION, DOCSTATUS,
PROCESSED, M_REQUISITIONLINE_ID, LINE, QTY, QTYORDERED,
M_PRODUCT_ID, LINEDESCRIPTION, PRICEACTUAL, LINENETAMT, C_CHARGE_ID)
AS
SELECT r.M_Requisition_ID,
r.AD_Client_ID, r.AD_Org_ID, r.IsActive, r.Created, r.CreatedBy, r.Updated, r.UpdatedBy,
r.DocumentNo, r.Description, r.Help,
r.AD_User_ID, r.M_PriceList_ID, r.M_Warehouse_ID, r.IsApproved, r.PriorityRule,
r.DateRequired, r.TotalLines, r.DocAction, r.DocStatus, r.Processed,
l.M_RequisitionLine_ID, l.Line,
l.Qty,
(CASE WHEN l.C_OrderLine_ID IS NOT NULL THEN l.Qty ELSE 0 END) AS QtyOrdered,
l.M_Product_ID,
l.Description AS LineDescription,
l.PriceActual, l.LineNetAmt, l.C_Charge_ID
FROM M_Requisition r
INNER JOIN M_RequisitionLine l ON (r.M_Requisition_ID=l.M_Requisition_ID);
-- Mar 22, 2012 9:47:24 AM COT
-- IDEMPIERE-204 Add charge to Open Requisitions report
INSERT INTO AD_Column (AD_Column_ID,AD_Table_ID,EntityType,Version,IsMandatory,IsTranslated,IsIdentifier,Help,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Name,CreatedBy,Updated,AD_Client_ID,AD_Org_ID,IsActive,Created,UpdatedBy) VALUES (200082,711,'U',0,'N','N','N','The Charge indicates a type of Charge (Handling, Shipping, Restocking)','N',10,'N',19,'N',968,'N','N','N','C_Charge_ID','Additional document charges','Charge',100,TO_TIMESTAMP('2012-03-22 09:47:22','YYYY-MM-DD HH24:MI:SS'),0,0,'Y',TO_TIMESTAMP('2012-03-22 09:47:22','YYYY-MM-DD HH24:MI:SS'),100)
;
-- Mar 22, 2012 9:47:24 AM COT
INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200082 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
;
-- Mar 22, 2012 9:47:47 AM COT
UPDATE AD_Column SET EntityType='D',Updated=TO_TIMESTAMP('2012-03-22 09:47:47','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200082
;
UPDATE AD_System
SET LastMigrationScriptApplied='828_IDEMPIERE-204.sql'
WHERE LastMigrationScriptApplied<'828_IDEMPIERE-204.sql'
OR LastMigrationScriptApplied IS NULL
;

4
org.adempiere.base.process/src/org/compiere/process/BPartnerOrgLink.java
View File

@ -142,7 +142,7 @@ public class BPartnerOrgLink extends SvrProcess
{
mLoc = new MLocator (wh, "Standard");
mLoc.setIsDefault(true);
mLoc.save(get_TrxName());
mLoc.saveEx(get_TrxName());
}
// Update/Save Org Info
@ -176,7 +176,7 @@ public class BPartnerOrgLink extends SvrProcess
if (!found)
{
MRoleOrgAccess orgAccess = new MRoleOrgAccess (org, p_AD_Role_ID);
orgAccess.save(get_TrxName());
orgAccess.saveEx(get_TrxName());
}
}

36
org.adempiere.base.process/src/org/compiere/process/CopyColumnsFromTable.java
View File

@ -20,6 +20,7 @@ import java.util.logging.Level;
import org.compiere.model.MColumn;
import org.compiere.model.MTable;
import org.compiere.model.M_Element;
import org.compiere.model.PO;
import org.compiere.util.AdempiereSystemError;
/**
@ -84,6 +85,9 @@ public class CopyColumnsFromTable extends SvrProcess
for (int i = 0; i < sourceColumns.length; i++)
{
MColumn colTarget = new MColumn(targetTable);
PO.copyValues(sourceColumns[i], colTarget);
colTarget.setAD_Table_ID (targetTable.getAD_Table_ID());
colTarget.setEntityType(targetTable.getEntityType());
// special case the key -> sourceTable_ID
if (sourceColumns[i].getColumnName().equals(sourceTable.getTableName()+"_ID")) {
String targetColumnName = new String(targetTable.getTableName()+"_ID");
@ -104,39 +108,9 @@ public class CopyColumnsFromTable extends SvrProcess
colTarget.setName(targetTable.getName());
colTarget.setDescription(targetTable.getDescription());
colTarget.setHelp(targetTable.getHelp());
} else {
colTarget.setColumnName(sourceColumns[i].getColumnName());
colTarget.setAD_Element_ID(sourceColumns[i].getAD_Element_ID());
colTarget.setName(sourceColumns[i].getName());
colTarget.setDescription(sourceColumns[i].getDescription());
colTarget.setHelp(sourceColumns[i].getHelp());
}
colTarget.setVersion(sourceColumns[i].getVersion());
colTarget.setAD_Val_Rule_ID(sourceColumns[i].getAD_Val_Rule_ID());
colTarget.setDefaultValue(sourceColumns[i].getDefaultValue());
colTarget.setFieldLength(sourceColumns[i].getFieldLength());
colTarget.setIsKey(sourceColumns[i].isKey());
colTarget.setIsParent(sourceColumns[i].isParent());
colTarget.setIsMandatory(sourceColumns[i].isMandatory());
colTarget.setIsTranslated(sourceColumns[i].isTranslated());
colTarget.setIsIdentifier(sourceColumns[i].isIdentifier());
colTarget.setSeqNo(sourceColumns[i].getSeqNo());
colTarget.setIsEncrypted(sourceColumns[i].getIsEncrypted());
colTarget.setAD_Reference_ID(sourceColumns[i].getAD_Reference_ID());
colTarget.setAD_Reference_Value_ID(sourceColumns[i].getAD_Reference_Value_ID());
colTarget.setIsActive(sourceColumns[i].isActive());
colTarget.setVFormat(sourceColumns[i].getVFormat());
colTarget.setCallout(sourceColumns[i].getCallout());
colTarget.setIsUpdateable(sourceColumns[i].isUpdateable());
colTarget.setAD_Process_ID(sourceColumns[i].getAD_Process_ID());
colTarget.setValueMin(sourceColumns[i].getValueMin());
colTarget.setValueMax(sourceColumns[i].getValueMax());
colTarget.setIsSelectionColumn(sourceColumns[i].isSelectionColumn());
colTarget.setReadOnlyLogic(sourceColumns[i].getReadOnlyLogic());
colTarget.setIsSyncDatabase(sourceColumns[i].getIsSyncDatabase());
colTarget.setIsAlwaysUpdateable(sourceColumns[i].isAlwaysUpdateable());
colTarget.setColumnSQL(sourceColumns[i].getColumnSQL());
colTarget.save(get_TrxName());
colTarget.saveEx(get_TrxName());
// TODO: Copy translations
m_count++;
}

4
org.adempiere.base.process/src/org/compiere/process/M_Product_BOM_Check.java
View File

@ -85,7 +85,7 @@ public class M_Product_BOM_Check extends SvrProcess
log.info("NOT BOM Product");
// No BOM - should not happen, but no problem
xp.setIsVerified(true);
xp.save(get_TrxName());
xp.saveEx(get_TrxName());
return "OK";
}
@ -170,7 +170,7 @@ public class M_Product_BOM_Check extends SvrProcess
// Finish process
xp.setIsVerified(true);
xp.save(get_TrxName());
xp.saveEx(get_TrxName());
return "OK";
} // doIt

22
org.adempiere.base/src/org/compiere/Adempiere.java
View File

@ -45,6 +45,9 @@ import org.compiere.util.Login;
import org.compiere.util.SecureEngine;
import org.compiere.util.SecureInterface;
import org.compiere.util.Util;
import org.eclipse.core.runtime.IProduct;
import org.eclipse.core.runtime.Platform;
import org.osgi.framework.Bundle;
/**
* Adempiere Control Class
@ -139,9 +142,21 @@ public final class Adempiere
*/
public static String getVersion()
{
return MAIN_VERSION + " @ " + DATE_VERSION;
IProduct product = Platform.getProduct();
if (product != null) {
Bundle bundle = product.getDefiningBundle();
if (bundle != null) {
return bundle.getVersion().toString();
}
}
return "Unknown";
} // getVersion
public static String getDatabaseVersion()
{
return DB.getSQLValueString(null, "select lastmigrationscriptapplied from ad_system");
}
/**
* Short Summary (Windows)
* @return summary
@ -183,8 +198,8 @@ public final class Adempiere
s_ImplementationVersion = adempierePackage.getImplementationVersion();
if (s_ImplementationVendor == null)
{
s_ImplementationVendor = "Supported by ADempiere community";
s_ImplementationVersion = "ADempiere";
s_ImplementationVendor = "Supported by iDempiere community";
s_ImplementationVersion = "iDempiere";
}
} // setPackageInfo
@ -576,5 +591,4 @@ public final class Adempiere
public static URL getResource(String name) {
return Core.getResourceFinder().getResource(name);
}
} // Adempiere

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

@ -111,7 +111,7 @@ public class MAdvertisement extends X_W_Advertisement
if (m_clickCount != null)
{
m_clickCount.setTargetURL(TargetURL);
m_clickCount.save(get_TrxName());
m_clickCount.saveEx(get_TrxName());
}
} // getClickTargetURL

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

@ -387,7 +387,7 @@ public class MBankStatement extends X_C_BankStatement implements DocAction
{
MPayment payment = new MPayment (getCtx(), line.getC_Payment_ID(), get_TrxName());
payment.setIsReconciled(true);
payment.save(get_TrxName());
payment.saveEx(get_TrxName());
}
}
// Update Bank Account
@ -395,7 +395,7 @@ public class MBankStatement extends X_C_BankStatement implements DocAction
ba.load(get_TrxName());
//BF 1933645
ba.setCurrentBalance(ba.getCurrentBalance().add(getStatementDifference()));
ba.save(get_TrxName());
ba.saveEx(get_TrxName());
// User Validation
String valid = ModelValidationEngine.get().fireDocValidate(this, ModelValidator.TIMING_AFTER_COMPLETE);

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

@ -287,7 +287,7 @@ public class MCStage extends X_CM_CStage
thisElement.setCM_CStage_ID(this.get_ID());
thisElement.setContentHTML(" ");
thisElement.setName(elementName);
thisElement.save(get_TrxName());
thisElement.saveEx(get_TrxName());
}
}

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

@ -106,7 +106,7 @@ public class MExpenseType extends X_S_ExpenseType
MProduct prod = getProduct();
if (prod.setExpenseType(this))
prod.save(get_TrxName());
prod.saveEx(get_TrxName());
return success;
} // afterSave

16
org.adempiere.base/src/org/compiere/model/MInOut.java
View File

@ -743,7 +743,7 @@ public class MInOut extends X_M_InOut implements DocAction
if (counter)
{
fromLine.setRef_InOutLine_ID(line.getM_InOutLine_ID());
fromLine.save(get_TrxName());
fromLine.saveEx(get_TrxName());
}
}
if (fromLines.length != count) {
@ -1544,7 +1544,7 @@ public class MInOut extends X_M_InOut implements DocAction
&& sLine.getMovementQty().compareTo(oLine.getQtyOrdered()) == 0) // just if full match [ 1876965 ]
{
oLine.setM_AttributeSetInstance_ID(sLine.getM_AttributeSetInstance_ID());
oLine.save(get_TrxName());
oLine.saveEx(get_TrxName());
}
}
else // No Order - Try finding links via Invoice
@ -1573,7 +1573,7 @@ public class MInOut extends X_M_InOut implements DocAction
&& sLine.getMovementQty().compareTo(oLine.getQtyOrdered()) == 0) // just if full match [ 1876965 ]
{
oLine.setM_AttributeSetInstance_ID(sLine.getM_AttributeSetInstance_ID());
oLine.save(get_TrxName());
oLine.saveEx(get_TrxName());
}
}
} // No Order
@ -1667,7 +1667,7 @@ public class MInOut extends X_M_InOut implements DocAction
// References (Should not be required
dropShipment.setSalesRep_ID(getSalesRep_ID());
dropShipment.save(get_TrxName());
dropShipment.saveEx(get_TrxName());
// Update line order references to linked sales order lines
MInOutLine[] lines = dropShipment.getLines(true);
@ -1877,7 +1877,7 @@ public class MInOut extends X_M_InOut implements DocAction
// Refernces (Should not be required
counter.setSalesRep_ID(getSalesRep_ID());
counter.save(get_TrxName());
counter.saveEx(get_TrxName());
String MovementType = counter.getMovementType();
boolean inTrx = MovementType.charAt(1) == '+'; // V+ Vendor Receipt
@ -1892,7 +1892,7 @@ public class MInOut extends X_M_InOut implements DocAction
counterLine.setM_Locator_ID(0);
counterLine.setM_Locator_ID(inTrx ? Env.ZERO : counterLine.getMovementQty());
//
counterLine.save(get_TrxName());
counterLine.saveEx(get_TrxName());
}
log.fine(counter.toString());
@ -1904,7 +1904,7 @@ public class MInOut extends X_M_InOut implements DocAction
{
counter.setDocAction(counterDT.getDocAction());
counter.processIt(counterDT.getDocAction());
counter.save(get_TrxName());
counter.saveEx(get_TrxName());
}
}
return counter;
@ -1947,7 +1947,7 @@ public class MInOut extends X_M_InOut implements DocAction
{
line.setQty(Env.ZERO);
line.addDescription("Void (" + old + ")");
line.save(get_TrxName());
line.saveEx(get_TrxName());
}
}
//

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

@ -689,7 +689,7 @@ public class MInventory extends X_M_Inventory implements DocAction
line.setQtyInternalUse(Env.ZERO);
line.setQtyCount(line.getQtyBook());
line.addDescription("Void (" + oldCount + "/" + oldInternal + ")");
line.save(get_TrxName());
line.saveEx(get_TrxName());
}
}
}

20
org.adempiere.base/src/org/compiere/model/MInvoice.java
View File

@ -761,7 +761,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
if (counter)
{
fromLine.setRef_InvoiceLine_ID(line.getC_InvoiceLine_ID());
fromLine.save(get_TrxName());
fromLine.saveEx(get_TrxName());
}
// MZ Goodwill
@ -2004,7 +2004,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
counter.setBPartner(counterBP);
// Refernces (Should not be required
counter.setSalesRep_ID(getSalesRep_ID());
counter.save(get_TrxName());
counter.saveEx(get_TrxName());
// Update copied lines
MInvoiceLine[] counterLines = counter.getLines(true);
@ -2016,7 +2016,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
counterLine.setPrice();
counterLine.setTax();
//
counterLine.save(get_TrxName());
counterLine.saveEx(get_TrxName());
}
log.fine(counter.toString());
@ -2028,7 +2028,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
{
counter.setDocAction(counterDT.getDocAction());
counter.processIt(counterDT.getDocAction());
counter.save(get_TrxName());
counter.saveEx(get_TrxName());
}
}
return counter;
@ -2080,10 +2080,10 @@ public class MInvoice extends X_C_Invoice implements DocAction
{
MInOutLine ioLine = new MInOutLine(getCtx(), line.getM_InOutLine_ID(), get_TrxName());
ioLine.setIsInvoiced(false);
ioLine.save(get_TrxName());
ioLine.saveEx(get_TrxName());
line.setM_InOutLine_ID(0);
}
line.save(get_TrxName());
line.saveEx(get_TrxName());
}
}
addDescription(Msg.getMsg(getCtx(), "Voided"));
@ -2147,7 +2147,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
{
allocations[i].setDocAction(DocAction.ACTION_Reverse_Correct);
allocations[i].reverseCorrectIt();
allocations[i].save(get_TrxName());
allocations[i].saveEx(get_TrxName());
}
// Reverse/Delete Matching
if (!isSOTrx())
@ -2163,7 +2163,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
else
{
mPO[i].setC_InvoiceLine_ID(null);
mPO[i].save(get_TrxName());
mPO[i].saveEx(get_TrxName());
}
}
}
@ -2232,10 +2232,10 @@ public class MInvoice extends X_C_Invoice implements DocAction
{
MInOutLine ioLine = new MInOutLine(getCtx(), iLine.getM_InOutLine_ID(), get_TrxName());
ioLine.setIsInvoiced(false);
ioLine.save(get_TrxName());
ioLine.saveEx(get_TrxName());
// Reconsiliation
iLine.setM_InOutLine_ID(0);
iLine.save(get_TrxName());
iLine.saveEx(get_TrxName());
}
}
setProcessed(true);

12
org.adempiere.base/src/org/compiere/model/MMeasure.java
View File

@ -388,7 +388,7 @@ public class MMeasure extends X_PA_Measure
{
MGoal goal = goals[i];
goal.setMeasureActual(getManualActual());
goal.save(get_TrxName());
goal.saveEx(get_TrxName());
}
return true;
} // updateManualGoals
@ -431,7 +431,7 @@ public class MMeasure extends X_PA_Measure
}
}
goal.setMeasureActual(ManualActual);
goal.save(get_TrxName());
goal.saveEx(get_TrxName());
}
return true;
} // updateAchievementGoals
@ -478,7 +478,7 @@ public class MMeasure extends X_PA_Measure
log.fine("No Value = " + sql);
}
goal.setMeasureActual(ManualActual);
goal.save(get_TrxName());
goal.saveEx(get_TrxName());
}
return true;
} // updateCalculatedGoals
@ -532,7 +532,7 @@ public class MMeasure extends X_PA_Measure
log.fine("No Value = " + sql);
}
goal.setMeasureActual(ManualActual);
goal.save(get_TrxName());
goal.saveEx(get_TrxName());
}
return true;
} // updateRequests
@ -575,7 +575,7 @@ public class MMeasure extends X_PA_Measure
log.fine("No Value = " + sql);
}
goal.setMeasureActual(ManualActual);
goal.save(get_TrxName());
goal.saveEx(get_TrxName());
}
return true;
} // updateProjects
@ -659,7 +659,7 @@ public class MMeasure extends X_PA_Measure
}
}
goal.setMeasureActual(amt);
goal.save(get_TrxName());
goal.saveEx(get_TrxName());
}
return true;
} // updateUserDefinedGoals

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

@ -634,7 +634,7 @@ public class MMovement extends X_M_Movement implements DocAction
{
line.setMovementQty(Env.ZERO);
line.addDescription("Void (" + old + ")");
line.save(get_TrxName());
line.saveEx(get_TrxName());
}
}
}

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

@ -394,14 +394,14 @@ public class MMovementConfirm extends X_M_MovementConfirm implements DocAction
if (confirm.isFullyConfirmed())
{
confirm.setProcessed(true);
confirm.save(get_TrxName());
confirm.saveEx(get_TrxName());
}
else
{
if (createDifferenceDoc (move, confirm))
{
confirm.setProcessed(true);
confirm.save(get_TrxName());
confirm.saveEx(get_TrxName());
}
else
{

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

@ -553,7 +553,7 @@ public class MOrder extends X_C_Order implements DocAction
if (counter)
{
fromLines[i].setRef_OrderLine_ID(line.getC_OrderLine_ID());
fromLines[i].save(get_TrxName());
fromLines[i].saveEx(get_TrxName());
}
}
if (fromLines.length != count)
@ -704,7 +704,7 @@ public class MOrder extends X_C_Order implements DocAction
{
MOrderLine line = lines[i];
line.setLine(number);
line.save(get_TrxName());
line.saveEx(get_TrxName());
number += step;
}
m_lines = null;
@ -892,7 +892,7 @@ public class MOrder extends X_C_Order implements DocAction
if (schedule[i].isValid() != valid)
{
schedule[i].setIsValid(valid);
schedule[i].save(get_TrxName());
schedule[i].saveEx(get_TrxName());
}
}
return valid;
@ -2061,7 +2061,7 @@ public class MOrder extends X_C_Order implements DocAction
counter.setDatePromised(getDatePromised()); // default is date ordered
// Refernces (Should not be required
counter.setSalesRep_ID(getSalesRep_ID());
counter.save(get_TrxName());
counter.saveEx(get_TrxName());
// Update copied lines
MOrderLine[] counterLines = counter.getLines(true, null);
@ -2071,7 +2071,7 @@ public class MOrder extends X_C_Order implements DocAction
counterLine.setOrder(counter); // copies header values (BP, etc.)
counterLine.setPrice();
counterLine.setTax();
counterLine.save(get_TrxName());
counterLine.saveEx(get_TrxName());
}
log.fine(counter.toString());
@ -2082,7 +2082,7 @@ public class MOrder extends X_C_Order implements DocAction
{
counter.setDocAction(counterDT.getDocAction());
counter.processIt(counterDT.getDocAction());
counter.save(get_TrxName());
counter.saveEx(get_TrxName());
}
}
return counter;
@ -2111,7 +2111,7 @@ public class MOrder extends X_C_Order implements DocAction
line.addDescription(Msg.getMsg(getCtx(), "Voided") + " (" + old + ")");
line.setQty(Env.ZERO);
line.setLineNetAmt(Env.ZERO);
line.save(get_TrxName());
line.saveEx(get_TrxName());
}
//AZ Goodwill
if (!isSOTrx())
@ -2199,7 +2199,7 @@ public class MOrder extends X_C_Order implements DocAction
return false;
}
ship.setDocAction(MInOut.DOCACTION_None);
ship.save(get_TrxName());
ship.saveEx(get_TrxName());
} // for all shipments
// Reverse All *Invoices*
@ -2232,7 +2232,7 @@ public class MOrder extends X_C_Order implements DocAction
return false;
}
invoice.setDocAction(MInvoice.DOCACTION_None);
invoice.save(get_TrxName());
invoice.saveEx(get_TrxName());
} // for all shipments
m_processMsg = info.toString();
@ -2265,7 +2265,7 @@ public class MOrder extends X_C_Order implements DocAction
line.setQtyOrdered(line.getQtyDelivered());
// QtyEntered unchanged
line.addDescription("Close (" + old + ")");
line.save(get_TrxName());
line.saveEx(get_TrxName());
}
}
// Clear Reservations

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

@ -2379,7 +2379,7 @@ public final class MPayment extends X_C_Payment
reversal.closeIt();
reversal.setDocStatus(DOCSTATUS_Reversed);
reversal.setDocAction(DOCACTION_None);
reversal.save(get_TrxName());
reversal.saveEx(get_TrxName());
// Unlink & De-Allocate
deAllocate();
@ -2418,7 +2418,7 @@ public final class MPayment extends X_C_Payment
log.warning("Automatic allocation - reversal line not saved");
}
alloc.processIt(DocAction.ACTION_Complete);
alloc.save(get_TrxName());
alloc.saveEx(get_TrxName());
//
StringBuffer info = new StringBuffer (reversal.getDocumentNo());
info.append(" - @C_AllocationHdr_ID@: ").append(alloc.getDocumentNo());
@ -2428,7 +2428,7 @@ public final class MPayment extends X_C_Payment
{
MBPartner bp = new MBPartner (getCtx(), getC_BPartner_ID(), get_TrxName());
bp.setTotalOpenBalance();
bp.save(get_TrxName());
bp.saveEx(get_TrxName());
}
// After reverseCorrect
m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_REVERSECORRECT);

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

@ -166,7 +166,7 @@ public class MProductBOM extends X_M_Product_BOM
if (product.isVerified())
{
product.setIsVerified(false);
product.save(get_TrxName());
product.saveEx(get_TrxName());
}
// Invalidate Products where BOM is used

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

@ -240,6 +240,11 @@ public class MRecentItem extends X_AD_RecentItem
String windowName = win.get_Translation("Name");
MTable table = MTable.get(getCtx(), getAD_Table_ID());
PO po = table.getPO(getRecord_ID(), null);
if (po == null) {
/* Recent Item was deleted (probably with direct SQL DELETE) */
this.deleteEx(true, null);
return null;
}
String recordIdentifier = "";
if (po.get_ColumnIndex("DocumentNo") > 0)
recordIdentifier = recordIdentifier + "_" + po.get_ValueAsString("DocumentNo");

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

@ -126,7 +126,7 @@ public class MRecurring extends X_C_Recurring
}
else
return "Invalid @RecurringType@ = " + getRecurringType();
run.save(get_TrxName());
run.saveEx(get_TrxName());
//
setDateLastRun (run.getUpdated());

13
org.adempiere.base/src/org/compiere/report/FinStatement.java
View File

@ -341,11 +341,22 @@ public class FinStatement extends SvrProcess
log.finest(sb.toString());
// Set Name,Description
String sql_select = "SELECT e.Name, fa.Description "
String sql_select;
Language lang = Language.getLoginLanguage();
if (Env.isBaseLanguage(lang, "AD_Element")) {
sql_select = "SELECT e.Name, fa.Description "
+ "FROM Fact_Acct fa"
+ " INNER JOIN AD_Table t ON (fa.AD_Table_ID=t.AD_Table_ID)"
+ " INNER JOIN AD_Element e ON (t.TableName||'_ID'=e.ColumnName) "
+ "WHERE r.Fact_Acct_ID=fa.Fact_Acct_ID";
} else {
sql_select = "SELECT et.Name, fa.Description "
+ "FROM Fact_Acct fa"
+ " INNER JOIN AD_Table t ON (fa.AD_Table_ID=t.AD_Table_ID)"
+ " INNER JOIN AD_Element e ON (t.TableName||'_ID'=e.ColumnName) "
+ " INNER JOIN AD_Element_Trl et ON (e.AD_Element_ID=et.AD_Element_ID AND et.AD_Language='"+lang.getAD_Language()+"') "
+ "WHERE r.Fact_Acct_ID=fa.Fact_Acct_ID";
}
// Translated Version ...
sb = new StringBuffer ("UPDATE T_ReportStatement r SET (Name,Description)=(")
.append(sql_select).append(") "

6
org.adempiere.base/src/org/eevolution/model/MDDOrder.java
View File

@ -486,7 +486,7 @@ public class MDDOrder extends X_DD_Order implements DocAction
{
MDDOrderLine line = lines[i];
line.setLine(number);
line.save(get_TrxName());
line.saveEx(get_TrxName());
number += step;
}
m_lines = null;
@ -1008,7 +1008,7 @@ public class MDDOrder extends X_DD_Order implements DocAction
if (old.signum() != 0)
{
line.addDescription(Msg.getMsg(getCtx(), "Voided") + " (" + old + ")");
line.save(get_TrxName());
line.saveEx(get_TrxName());
}
}
addDescription(Msg.getMsg(getCtx(), "Voided"));
@ -1133,7 +1133,7 @@ public class MDDOrder extends X_DD_Order implements DocAction
line.setQtyOrdered(line.getQtyDelivered());
// QtyEntered unchanged
line.addDescription("Close (" + old + ")");
line.save(get_TrxName());
line.saveEx(get_TrxName());
}
}
// Clear Reservations

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPRecentItems.java
View File

@ -170,6 +170,8 @@ public class DPRecentItems extends DashboardPanel implements EventListener {
int riShown = 0;
for (MRecentItem ri : ris) {
String label = ri.getLabel();
if (label == null)
continue;
ToolBarButton btnrecentItem = new ToolBarButton(String.valueOf(ri.getAD_RecentItem_ID()));
btnrecentItem.setLabel(label);
btnrecentItem.setImage(getIconFile());

18
org.adempiere.ui.zk/theme/default/version-info.zul
View File

@ -6,11 +6,9 @@ Copyright (C) 2009 Idalica Corporation
<zk>
<zscript>
import org.compiere.Adempiere;
var mainVersion = Adempiere.MAIN_VERSION;
var dateVersion = Adempiere.DATE_VERSION;
var dbVersion = Adempiere.DB_VERSION;
var mainVersion = Adempiere.getVersion();
var dbVersion = Adempiere.getDatabaseVersion();
var vendor = Adempiere.getImplementationVendor();
var vendorVersion = Adempiere.getImplementationVersion();
var jvm = Adempiere.getJavaInfo();
var os = Adempiere.getOSInfo();
</zscript>
@ -30,15 +28,10 @@ Copyright (C) 2009 Idalica Corporation
<div class="versionInfoBox">
<table border="0">
<tr>
<td align="right">Main Version</td>
<td align="right">Version</td>
<td>:</td>
<td aligh="left">${mainVersion}</td>
</tr>
<tr>
<td align="right">Date Version</td>
<td>:</td>
<td aligh="left">${dateVersion}</td>
</tr>
<tr>
<td align="right">Database Version</td>
<td>:</td>
@ -49,11 +42,6 @@ Copyright (C) 2009 Idalica Corporation
<td>:</td>
<td aligh="left">${vendor}</td>
</tr>
<tr>
<td align="right">Vendor Version</td>
<td>:</td>
<td aligh="left">${vendorVersion}</td>
</tr>
<tr>
<td align="right">JVM</td>
<td>:</td>