diff --git a/._.idpass b/._.idpass
new file mode 100644
index 0000000000..14cd2db99a
Binary files /dev/null and b/._.idpass differ
diff --git a/._.idpass-e b/._.idpass-e
new file mode 100644
index 0000000000..8db0836390
Binary files /dev/null and b/._.idpass-e differ
diff --git a/._adempiere-local-template.properties b/._adempiere-local-template.properties
new file mode 100644
index 0000000000..ce7f0ce194
Binary files /dev/null and b/._adempiere-local-template.properties differ
diff --git a/._hazelcast.xml b/._hazelcast.xml
new file mode 100644
index 0000000000..20b861a8c4
Binary files /dev/null and b/._hazelcast.xml differ
diff --git a/._idempiere.properties b/._idempiere.properties
new file mode 100644
index 0000000000..021843c164
Binary files /dev/null and b/._idempiere.properties differ
diff --git a/._idempiereEnv.properties b/._idempiereEnv.properties
new file mode 100644
index 0000000000..3c6c25eebc
Binary files /dev/null and b/._idempiereEnv.properties differ
diff --git a/.idpass-e b/.idpass-e
new file mode 100644
index 0000000000..f45a78dc87
--- /dev/null
+++ b/.idpass-e
@@ -0,0 +1,3 @@
+ADEMPIERE_MAIL_PASSWORD=
+ADEMPIERE_DB_PASSWORD="TTFkNXUxdC1PMkk5Cg=="
+ADEMPIERE_DB_SYSTEM="TTFkNXUxdC1PMkk5Cg=="
diff --git a/org.adempiere.base-feature/._model.generator.launch b/org.adempiere.base-feature/._model.generator.launch
new file mode 100644
index 0000000000..4d0ca3fccf
Binary files /dev/null and b/org.adempiere.base-feature/._model.generator.launch differ
diff --git a/org.adempiere.base.callout/._.classpath b/org.adempiere.base.callout/._.classpath
new file mode 100644
index 0000000000..644e1be457
Binary files /dev/null and b/org.adempiere.base.callout/._.classpath differ
diff --git a/org.adempiere.base.process/._.classpath b/org.adempiere.base.process/._.classpath
new file mode 100644
index 0000000000..3eeaea8bd0
Binary files /dev/null and b/org.adempiere.base.process/._.classpath differ
diff --git a/org.adempiere.base/._.classpath b/org.adempiere.base/._.classpath
new file mode 100644
index 0000000000..3e2a31d591
Binary files /dev/null and b/org.adempiere.base/._.classpath differ
diff --git a/org.adempiere.base/OSGI-INF/._org.adempiere.base.AnnotationBasedModelFactory.xml b/org.adempiere.base/OSGI-INF/._org.adempiere.base.AnnotationBasedModelFactory.xml
new file mode 100644
index 0000000000..333f62ed5c
Binary files /dev/null and b/org.adempiere.base/OSGI-INF/._org.adempiere.base.AnnotationBasedModelFactory.xml differ
diff --git a/org.adempiere.base/OSGI-INF/._org.adempiere.base.DefaultAnnotationBasedColumnCalloutFactory.xml b/org.adempiere.base/OSGI-INF/._org.adempiere.base.DefaultAnnotationBasedColumnCalloutFactory.xml
new file mode 100644
index 0000000000..ee235acfaa
Binary files /dev/null and b/org.adempiere.base/OSGI-INF/._org.adempiere.base.DefaultAnnotationBasedColumnCalloutFactory.xml differ
diff --git a/org.adempiere.base/OSGI-INF/._org.adempiere.base.DefaultAnnotationBasedEventManager.xml b/org.adempiere.base/OSGI-INF/._org.adempiere.base.DefaultAnnotationBasedEventManager.xml
new file mode 100644
index 0000000000..d18be62f72
Binary files /dev/null and b/org.adempiere.base/OSGI-INF/._org.adempiere.base.DefaultAnnotationBasedEventManager.xml differ
diff --git a/org.adempiere.base/OSGI-INF/._org.adempiere.base.DefaultAnnotationBasedProcessFactory.xml b/org.adempiere.base/OSGI-INF/._org.adempiere.base.DefaultAnnotationBasedProcessFactory.xml
new file mode 100644
index 0000000000..a9dfe16779
Binary files /dev/null and b/org.adempiere.base/OSGI-INF/._org.adempiere.base.DefaultAnnotationBasedProcessFactory.xml differ
diff --git a/org.adempiere.base/OSGI-INF/._org.adempiere.base.DefaultCreditManagerFactory.xml b/org.adempiere.base/OSGI-INF/._org.adempiere.base.DefaultCreditManagerFactory.xml
new file mode 100644
index 0000000000..2904d5dbe0
Binary files /dev/null and b/org.adempiere.base/OSGI-INF/._org.adempiere.base.DefaultCreditManagerFactory.xml differ
diff --git a/org.adempiere.base/OSGI-INF/._org.adempiere.base.DefaultTaxLookup.xml b/org.adempiere.base/OSGI-INF/._org.adempiere.base.DefaultTaxLookup.xml
new file mode 100644
index 0000000000..0c104b1754
Binary files /dev/null and b/org.adempiere.base/OSGI-INF/._org.adempiere.base.DefaultTaxLookup.xml differ
diff --git a/org.adempiere.base/OSGI-INF/._org.adempiere.base.MappedColumnCalloutFactory.xml b/org.adempiere.base/OSGI-INF/._org.adempiere.base.MappedColumnCalloutFactory.xml
new file mode 100644
index 0000000000..c31fd89fa6
Binary files /dev/null and b/org.adempiere.base/OSGI-INF/._org.adempiere.base.MappedColumnCalloutFactory.xml differ
diff --git a/org.adempiere.base/OSGI-INF/._org.adempiere.base.MappedDocumentFactory.xml b/org.adempiere.base/OSGI-INF/._org.adempiere.base.MappedDocumentFactory.xml
new file mode 100644
index 0000000000..18ce522dba
Binary files /dev/null and b/org.adempiere.base/OSGI-INF/._org.adempiere.base.MappedDocumentFactory.xml differ
diff --git a/org.adempiere.base/OSGI-INF/._org.idempiere.model.MappedModelFactory.xml b/org.adempiere.base/OSGI-INF/._org.idempiere.model.MappedModelFactory.xml
new file mode 100644
index 0000000000..d0611576b6
Binary files /dev/null and b/org.adempiere.base/OSGI-INF/._org.idempiere.model.MappedModelFactory.xml differ
diff --git a/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.CSVReportRenderer.xml b/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.CSVReportRenderer.xml
new file mode 100644
index 0000000000..715bac8171
Binary files /dev/null and b/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.CSVReportRenderer.xml differ
diff --git a/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.HTMLReportRenderer.xml b/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.HTMLReportRenderer.xml
new file mode 100644
index 0000000000..d0465f64d9
Binary files /dev/null and b/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.HTMLReportRenderer.xml differ
diff --git a/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.PDFReportRenderer.xml b/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.PDFReportRenderer.xml
new file mode 100644
index 0000000000..9ebf205811
Binary files /dev/null and b/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.PDFReportRenderer.xml differ
diff --git a/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.PSReportRenderer.xml b/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.PSReportRenderer.xml
new file mode 100644
index 0000000000..56a21c5787
Binary files /dev/null and b/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.PSReportRenderer.xml differ
diff --git a/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.SSVReportRenderer.xml b/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.SSVReportRenderer.xml
new file mode 100644
index 0000000000..e7c0d5d915
Binary files /dev/null and b/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.SSVReportRenderer.xml differ
diff --git a/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.TabDelimitedReportRenderer.xml b/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.TabDelimitedReportRenderer.xml
new file mode 100644
index 0000000000..c112cb6294
Binary files /dev/null and b/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.TabDelimitedReportRenderer.xml differ
diff --git a/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.XLSReportRenderer.xml b/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.XLSReportRenderer.xml
new file mode 100644
index 0000000000..038ce7f709
Binary files /dev/null and b/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.XLSReportRenderer.xml differ
diff --git a/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.XLSXReportRenderer.xml b/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.XLSXReportRenderer.xml
new file mode 100644
index 0000000000..a50d578a94
Binary files /dev/null and b/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.XLSXReportRenderer.xml differ
diff --git a/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.XMLReportRenderer.xml b/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.XMLReportRenderer.xml
new file mode 100644
index 0000000000..52337fe740
Binary files /dev/null and b/org.adempiere.base/OSGI-INF/._org.idempiere.print.renderer.XMLReportRenderer.xml differ
diff --git a/org.adempiere.base/OSGI-INF/._org.idempiere.process.MappedProcessFactory.xml b/org.adempiere.base/OSGI-INF/._org.idempiere.process.MappedProcessFactory.xml
new file mode 100644
index 0000000000..2c735168fa
Binary files /dev/null and b/org.adempiere.base/OSGI-INF/._org.idempiere.process.MappedProcessFactory.xml differ
diff --git a/org.adempiere.base/src/org/compiere/model/._MUser.java b/org.adempiere.base/src/org/compiere/model/._MUser.java
new file mode 100644
index 0000000000..53539334e7
Binary files /dev/null and b/org.adempiere.base/src/org/compiere/model/._MUser.java differ
diff --git a/org.adempiere.base/src/org/compiere/model/MAttributeSetInstance.java b/org.adempiere.base/src/org/compiere/model/MAttributeSetInstance.java
index 17a7eb50d0..35e63421aa 100644
--- a/org.adempiere.base/src/org/compiere/model/MAttributeSetInstance.java
+++ b/org.adempiere.base/src/org/compiere/model/MAttributeSetInstance.java
@@ -21,6 +21,7 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.Properties;
import java.util.logging.Level;
@@ -237,8 +238,14 @@ public class MAttributeSetInstance extends X_M_AttributeSetInstance
{
if (sb.length() > 0)
sb.append("_");
- if (mai.getValue() != null)
- sb.append(mai.getValue());
+ if (mai.getValue() != null) {
+ String val = mai.getValue();
+ if(mai.getM_Attribute().getAttributeValueType().equals(MAttribute.ATTRIBUTEVALUETYPE_Date)) {
+ SimpleDateFormat format = new SimpleDateFormat(mai.getM_Attribute().getDateFormat());
+ val = format.format(mai.getValue());
+ }
+ sb.append(val);
+ }
else
sb.append("");
}
diff --git a/org.adempiere.base/src/org/compiere/model/MInvoice.java b/org.adempiere.base/src/org/compiere/model/MInvoice.java
index a3c7d34585..c91309c984 100644
--- a/org.adempiere.base/src/org/compiere/model/MInvoice.java
+++ b/org.adempiere.base/src/org/compiere/model/MInvoice.java
@@ -1741,11 +1741,11 @@ public class MInvoice extends X_C_Invoice implements DocAction, IDocsPostProcess
}
explodeBOM();
- if (!calculateTaxTotal()) // setTotals
- {
- m_processMsg = "Error calculating Tax";
- return DocAction.STATUS_Invalid;
- }
+// if (!calculateTaxTotal()) // setTotals
+// {
+// m_processMsg = "Error calculating Tax";
+// return DocAction.STATUS_Invalid;
+// }
if ( getGrandTotal().signum() != 0
&& (PAYMENTRULE_OnCredit.equals(getPaymentRule()) || PAYMENTRULE_DirectDebit.equals(getPaymentRule())))
@@ -3273,7 +3273,7 @@ public class MInvoice extends X_C_Invoice implements DocAction, IDocsPostProcess
inoutLine.getC_UOM_ID(), invoiceLine.getPriceEntered(), 12);
if (PriceEntered == null)
throw new AdempiereException("No Conversion For Price=" + invoiceLine.getPriceEntered());
- invoiceLine.setPriceEntered(PriceEntered);
+ invoiceLine.setPriceEntered(PriceEntered);
}
}
else {
diff --git a/org.adempiere.base/src/org/compiere/model/MInvoiceTax.java b/org.adempiere.base/src/org/compiere/model/MInvoiceTax.java
index 018c5cf52c..274ca4be79 100644
--- a/org.adempiere.base/src/org/compiere/model/MInvoiceTax.java
+++ b/org.adempiere.base/src/org/compiere/model/MInvoiceTax.java
@@ -17,6 +17,7 @@
package org.compiere.model;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -365,9 +366,25 @@ public class MInvoiceTax extends X_C_InvoiceTax
setTaxBaseAmt (taxBaseAmt.subtract(taxAmt));
else
setTaxBaseAmt (taxBaseAmt);
+
+ if(getTax().get_ValueAsBoolean("IsAdjustmentDPP")) {
+ BigDecimal ppn2025baseamt = getTaxBaseAmt().divide(new BigDecimal(12), getPrecision(), RoundingMode.HALF_UP).multiply(new BigDecimal(11));
+ set_ValueNoCheck("OtherTaxBaseAmt",ppn2025baseamt);
+ setTaxAmt(tax.calculateTax(ppn2025baseamt, isTaxIncluded(), getPrecision()));
+ }
return true;
} // calculateTaxFromLines
+ @Override
+ protected boolean afterSave(boolean newRecord, boolean success) {
+ // TODO Auto-generated method stub
+ boolean s = super.afterSave(newRecord, success);
+ if(getTaxAmt().compareTo(Env.ZERO)==0 && getTaxBaseAmt().compareTo(Env.ZERO)==0) {
+ deleteEx(true);
+ }
+ return s;
+ }
+
/**
* String Representation
* @return info
diff --git a/org.adempiere.base/src/org/compiere/model/MOrder.java b/org.adempiere.base/src/org/compiere/model/MOrder.java
index 8e09314bd5..b220090c89 100644
--- a/org.adempiere.base/src/org/compiere/model/MOrder.java
+++ b/org.adempiere.base/src/org/compiere/model/MOrder.java
@@ -1665,11 +1665,11 @@ public class MOrder extends X_C_Order implements DocAction
m_processMsg = m_processMsg + " -> " + innerMsg;
return DocAction.STATUS_Invalid;
}
- if (!calculateTaxTotal())
- {
- m_processMsg = "Error calculating tax";
- return DocAction.STATUS_Invalid;
- }
+// if (!calculateTaxTotal())
+// {
+// m_processMsg = "Error calculating tax";
+// return DocAction.STATUS_Invalid;
+// }
if ( getGrandTotal().signum() != 0
&& (PAYMENTRULE_OnCredit.equals(getPaymentRule()) || PAYMENTRULE_DirectDebit.equals(getPaymentRule())))
diff --git a/org.adempiere.base/src/org/compiere/model/MOrderTax.java b/org.adempiere.base/src/org/compiere/model/MOrderTax.java
index 361a9f4cb7..8564e9992c 100644
--- a/org.adempiere.base/src/org/compiere/model/MOrderTax.java
+++ b/org.adempiere.base/src/org/compiere/model/MOrderTax.java
@@ -17,6 +17,7 @@
package org.compiere.model;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
@@ -368,9 +369,24 @@ public class MOrderTax extends X_C_OrderTax
else
setTaxBaseAmt (taxBaseAmt);
if (log.isLoggable(Level.FINE)) log.fine(toString());
+ if(getTax().get_ValueAsBoolean("IsAdjustmentDPP")) {
+ BigDecimal ppn2025baseamt = getTaxBaseAmt().divide(new BigDecimal(12), getPrecision(), RoundingMode.HALF_UP).multiply(new BigDecimal(11));
+ set_ValueNoCheck("OtherTaxBaseAmt",ppn2025baseamt);
+ setTaxAmt(tax.calculateTax(ppn2025baseamt, isTaxIncluded(), getPrecision()));
+ }
return true;
} // calculateTaxFromLines
+ @Override
+ protected boolean afterSave(boolean newRecord, boolean success) {
+ // TODO Auto-generated method stub
+ boolean s = super.afterSave(newRecord, success);
+ if(getTaxAmt().compareTo(Env.ZERO)==0 && getTaxBaseAmt().compareTo(Env.ZERO)==0) {
+ deleteEx(true);
+ }
+ return s;
+ }
+
/**
* String Representation
* @return info
diff --git a/org.adempiere.base/src/org/compiere/model/MRMA.java b/org.adempiere.base/src/org/compiere/model/MRMA.java
index 9a0c36c8e4..2132f447f6 100644
--- a/org.adempiere.base/src/org/compiere/model/MRMA.java
+++ b/org.adempiere.base/src/org/compiere/model/MRMA.java
@@ -375,11 +375,11 @@ public class MRMA extends X_M_RMA implements DocAction
}
// Updates Amount
- if (!calculateTaxTotal())
- {
- m_processMsg = "Error calculating tax";
- return DocAction.STATUS_Invalid;
- }
+// if (!calculateTaxTotal())
+// {
+// m_processMsg = "Error calculating tax";
+// return DocAction.STATUS_Invalid;
+// }
m_processMsg = ModelValidationEngine.get().fireDocValidate(this, ModelValidator.TIMING_AFTER_PREPARE);
if (m_processMsg != null)
diff --git a/org.adempiere.base/src/org/compiere/model/MRMATax.java b/org.adempiere.base/src/org/compiere/model/MRMATax.java
index 1fa0f86e9c..cb44d121c4 100644
--- a/org.adempiere.base/src/org/compiere/model/MRMATax.java
+++ b/org.adempiere.base/src/org/compiere/model/MRMATax.java
@@ -14,6 +14,7 @@
package org.compiere.model;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
@@ -358,9 +359,24 @@ public class MRMATax extends X_M_RMATax
else
setTaxBaseAmt (taxBaseAmt);
if (log.isLoggable(Level.FINE)) log.fine(toString());
+ if(getTax().get_ValueAsBoolean("IsAdjustmentDPP")) {
+ BigDecimal ppn2025baseamt = getTaxBaseAmt().divide(new BigDecimal(12), getPrecision(), RoundingMode.HALF_UP).multiply(new BigDecimal(11));
+ set_ValueNoCheck("OtherTaxBaseAmt",ppn2025baseamt);
+ setTaxAmt(tax.calculateTax(ppn2025baseamt, isTaxIncluded(), getPrecision()));
+ }
return true;
} // calculateTaxFromLines
+ @Override
+ protected boolean afterSave(boolean newRecord, boolean success) {
+ // TODO Auto-generated method stub
+ boolean s = super.afterSave(newRecord, success);
+ if(getTaxAmt().compareTo(Env.ZERO)==0 && getTaxBaseAmt().compareTo(Env.ZERO)==0) {
+ deleteEx(true);
+ }
+ return s;
+ }
+
/**
* String Representation
* @return info
diff --git a/org.adempiere.base/src/org/compiere/model/StandardTaxProvider.java b/org.adempiere.base/src/org/compiere/model/StandardTaxProvider.java
index f039296ac8..48d4a8d4b2 100644
--- a/org.adempiere.base/src/org/compiere/model/StandardTaxProvider.java
+++ b/org.adempiere.base/src/org/compiere/model/StandardTaxProvider.java
@@ -14,6 +14,7 @@
package org.compiere.model;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.ArrayList;
import org.adempiere.model.ITaxProvider;
@@ -89,6 +90,13 @@ public class StandardTaxProvider implements ITaxProvider {
newOTax.setIsTaxIncluded(order.isTaxIncluded());
newOTax.setTaxBaseAmt(oTax.getTaxBaseAmt());
newOTax.setTaxAmt(taxAmt);
+
+ if(cTax.get_ValueAsBoolean("IsAdjustmentDPP")) {
+ BigDecimal ppn2025baseamt = oTax.getTaxBaseAmt().divide(new BigDecimal(12), order.getPrecision(), RoundingMode.HALF_UP).multiply(new BigDecimal(11));
+ newOTax.set_ValueNoCheck("OtherTaxBaseAmt",ppn2025baseamt);
+ newOTax.setTaxAmt(tax.calculateTax(ppn2025baseamt, order.isTaxIncluded(), order.getPrecision()));
+ }
+
if (!newOTax.save(order.get_TrxName()))
return false;
//
@@ -219,6 +227,13 @@ public class StandardTaxProvider implements ITaxProvider {
newITax.setIsTaxIncluded(invoice.isTaxIncluded());
newITax.setTaxBaseAmt(iTax.getTaxBaseAmt());
newITax.setTaxAmt(taxAmt);
+
+ if(cTax.get_ValueAsBoolean("IsAdjustmentDPP")) {
+ BigDecimal ppn2025baseamt = iTax.getTaxBaseAmt().divide(new BigDecimal(12), invoice.getPrecision(), RoundingMode.HALF_UP).multiply(new BigDecimal(11));
+ newITax.set_ValueNoCheck("OtherTaxBaseAmt",ppn2025baseamt);
+ newITax.setTaxAmt(tax.calculateTax(ppn2025baseamt, invoice.isTaxIncluded(), invoice.getPrecision()));
+ }
+
newITax.saveEx(invoice.get_TrxName());
//
if (!invoice.isTaxIncluded())
@@ -344,6 +359,13 @@ public class StandardTaxProvider implements ITaxProvider {
newOTax.setIsTaxIncluded(rma.isTaxIncluded());
newOTax.setTaxBaseAmt(oTax.getTaxBaseAmt());
newOTax.setTaxAmt(taxAmt);
+
+ if(cTax.get_ValueAsBoolean("IsAdjustmentDPP")) {
+ BigDecimal ppn2025baseamt = oTax.getTaxBaseAmt().divide(new BigDecimal(12), rma.getPrecision(), RoundingMode.HALF_UP).multiply(new BigDecimal(11));
+ newOTax.set_ValueNoCheck("OtherTaxBaseAmt",ppn2025baseamt);
+ newOTax.setTaxAmt(tax.calculateTax(ppn2025baseamt, rma.isTaxIncluded(), rma.getPrecision()));
+ }
+
if (!newOTax.save(rma.get_TrxName()))
return false;
//
diff --git a/org.adempiere.base/src/org/compiere/report/FinReport.java b/org.adempiere.base/src/org/compiere/report/FinReport.java
index 2440eb1cd1..70efe24fa2 100644
--- a/org.adempiere.base/src/org/compiere/report/FinReport.java
+++ b/org.adempiere.base/src/org/compiere/report/FinReport.java
@@ -314,7 +314,7 @@ public class FinReport extends SvrProcess
int PA_ReportLineSet_ID = m_report.getLineSet().getPA_ReportLineSet_ID();
StringBuilder sql = new StringBuilder ("INSERT INTO T_Report "
+ "(AD_PInstance_ID, PA_ReportLine_ID, Record_ID,Fact_Acct_ID, SeqNo,LevelNo, Name,Description) "
- + "SELECT ").append(getAD_PInstance_ID()).append(", rl.PA_ReportLine_ID, 0,0, rl.SeqNo,0, CASE WHEN LineType='B' THEN '' ELSE NVL(trl.Name, rl.Name) END as Name, NVL(trl.Description,rl.Description) as Description "
+ + "SELECT ").append(getAD_PInstance_ID()).append(", rl.PA_ReportLine_ID, 0,0, rl.SeqNo,0, CASE WHEN LineType='B' THEN '' ELSE NVL(trl.Name, rl.Name) END as Name, NVL(trl.Description,rl.Description) as Description "
+ "FROM PA_ReportLine rl "
+ "LEFT JOIN PA_ReportLine_Trl trl ON trl.PA_ReportLine_ID = rl.PA_ReportLine_ID AND trl.AD_Language = '" + Env.getAD_Language(Env.getCtx()) + "' "
+ "WHERE rl.IsActive='Y' AND rl.PA_ReportLineSet_ID=").append(PA_ReportLineSet_ID);
diff --git a/org.adempiere.base/src/org/compiere/util/._Secure.java b/org.adempiere.base/src/org/compiere/util/._Secure.java
new file mode 100644
index 0000000000..be1ec2314e
Binary files /dev/null and b/org.adempiere.base/src/org/compiere/util/._Secure.java differ
diff --git a/org.adempiere.base/src/org/compiere/util/._SecureEngine.java b/org.adempiere.base/src/org/compiere/util/._SecureEngine.java
new file mode 100644
index 0000000000..445cc176e5
Binary files /dev/null and b/org.adempiere.base/src/org/compiere/util/._SecureEngine.java differ
diff --git a/org.adempiere.eclipse.equinox.http.servlet/._.classpath b/org.adempiere.eclipse.equinox.http.servlet/._.classpath
new file mode 100644
index 0000000000..745e2da709
Binary files /dev/null and b/org.adempiere.eclipse.equinox.http.servlet/._.classpath differ
diff --git a/org.adempiere.install/._.classpath b/org.adempiere.install/._.classpath
new file mode 100644
index 0000000000..c6bcef66ae
Binary files /dev/null and b/org.adempiere.install/._.classpath differ
diff --git a/org.adempiere.install/._install.app.launch b/org.adempiere.install/._install.app.launch
new file mode 100644
index 0000000000..fc5eeb28fc
Binary files /dev/null and b/org.adempiere.install/._install.app.launch differ
diff --git a/org.adempiere.payment.processor/._.classpath b/org.adempiere.payment.processor/._.classpath
new file mode 100644
index 0000000000..59726d3340
Binary files /dev/null and b/org.adempiere.payment.processor/._.classpath differ
diff --git a/org.adempiere.pipo.handlers/._.classpath b/org.adempiere.pipo.handlers/._.classpath
new file mode 100644
index 0000000000..fd95fd8ac9
Binary files /dev/null and b/org.adempiere.pipo.handlers/._.classpath differ
diff --git a/org.adempiere.pipo/._.classpath b/org.adempiere.pipo/._.classpath
new file mode 100644
index 0000000000..a83b4a9610
Binary files /dev/null and b/org.adempiere.pipo/._.classpath differ
diff --git a/org.adempiere.pipo/.classpath b/org.adempiere.pipo/.classpath
index 7931ec26b9..5508535a40 100755
--- a/org.adempiere.pipo/.classpath
+++ b/org.adempiere.pipo/.classpath
@@ -1,21 +1,7 @@
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/org.adempiere.plugin.utils/._.classpath b/org.adempiere.plugin.utils/._.classpath
new file mode 100644
index 0000000000..78842c314d
Binary files /dev/null and b/org.adempiere.plugin.utils/._.classpath differ
diff --git a/org.adempiere.replication.server/._.classpath b/org.adempiere.replication.server/._.classpath
new file mode 100644
index 0000000000..0e5fc44c2a
Binary files /dev/null and b/org.adempiere.replication.server/._.classpath differ
diff --git a/org.adempiere.replication/._.classpath b/org.adempiere.replication/._.classpath
new file mode 100644
index 0000000000..2b2d199f7a
Binary files /dev/null and b/org.adempiere.replication/._.classpath differ
diff --git a/org.adempiere.report.jasper.library/._.classpath b/org.adempiere.report.jasper.library/._.classpath
new file mode 100644
index 0000000000..9132ddd75c
Binary files /dev/null and b/org.adempiere.report.jasper.library/._.classpath differ
diff --git a/org.adempiere.report.jasper/._.classpath b/org.adempiere.report.jasper/._.classpath
new file mode 100644
index 0000000000..1039887bec
Binary files /dev/null and b/org.adempiere.report.jasper/._.classpath differ
diff --git a/org.adempiere.server/._.classpath b/org.adempiere.server/._.classpath
new file mode 100644
index 0000000000..733bb67175
Binary files /dev/null and b/org.adempiere.server/._.classpath differ
diff --git a/org.adempiere.ui.zk/._.classpath b/org.adempiere.ui.zk/._.classpath
new file mode 100644
index 0000000000..0e064f07da
Binary files /dev/null and b/org.adempiere.ui.zk/._.classpath differ
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/._ADWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/._ADWindow.java
new file mode 100644
index 0000000000..e2dbfef67d
Binary files /dev/null and b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/._ADWindow.java differ
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
index 13dc6ee9dd..89d1131a4d 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
@@ -2397,6 +2397,9 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
@Override
public void onNew()
{
+ if(adTabbox.getSelectedTabpanel().isGridView()) {
+ adTabbox.getSelectedTabpanel().switchRowPresentation();
+ }
final Callback postCallback = new Callback() {
@Override
public void onCallback(Boolean result) {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/._WCareerPath.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/._WCareerPath.java
new file mode 100644
index 0000000000..236affd5ff
Binary files /dev/null and b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/._WCareerPath.java differ
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WCareerPath.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WCareerPath.java
new file mode 100644
index 0000000000..66f0e3dee6
--- /dev/null
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WCareerPath.java
@@ -0,0 +1,43 @@
+package org.adempiere.webui.apps.graph;
+
+import java.util.Iterator;
+import java.util.Map.Entry;
+import java.util.Properties;
+
+import org.adempiere.webui.component.Borderlayout;
+import org.adempiere.webui.component.Panel;
+import org.compiere.util.CLogger;
+import org.compiere.util.Env;
+import org.zkoss.zul.Center;
+import org.zkoss.zul.Iframe;
+import org.zkoss.zul.North;
+
+public class WCareerPath extends Panel {
+
+ private static final long serialVersionUID = -4374372743023403069L;
+ private Iframe iframe = new Iframe();
+ protected CLogger log = CLogger.getCLogger(getClass());
+ public WCareerPath() {
+ Borderlayout mainLayout = new Borderlayout();
+ mainLayout.setStyle("width: 99%; height: 100%; position: absolute;");
+
+ North nth = new North();
+ Center cen = new Center();
+ iframe.setHflex("true");
+ iframe.setVflex("true");
+ iframe.setStyle("width: 90%; height: 95%;");
+ cen.appendChild(iframe);
+ mainLayout.appendChild(cen);
+
+ Properties prop = Env.getCtx();
+ String url = "";
+ for (Entry