tax

.idpass-e

@@ -0,0 +1,3 @@
+ADEMPIERE_MAIL_PASSWORD=
+ADEMPIERE_DB_PASSWORD="TTFkNXUxdC1PMkk5Cg=="
+ADEMPIERE_DB_SYSTEM="TTFkNXUxdC1PMkk5Cg=="

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("");
 			}

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 {

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

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())))

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

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)

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

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;
 					//

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);

org.adempiere.pipo/.classpath

@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" output="target/classes" path="src">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

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<Boolean> postCallback = new Callback<Boolean>() {
 			@Override
 			public void onCallback(Boolean result) {

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<Object, Object> s : prop.entrySet()) {
+			String name = (String) s.getKey();
+			if(name.endsWith("URL")) {
+				url = Env.getContext(Env.getCtx(), name);
+			}
+		}
+		iframe.setSrc(url);
+		appendChild(mainLayout);
+	}
+}

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Messagebox.java

@@ -64,7 +64,7 @@ public class Messagebox extends Window implements EventListener<Event>
 	 */
 	private static final long serialVersionUID = 8928526331932742124L;
 	
-	private static final String MESSAGE_PANEL_STYLE = "text-align:left; word-break: break-all; overflow: auto; max-height: 350pt; min-width: 230pt; max-width: 450pt;";	
+	private static final String MESSAGE_PANEL_STYLE = "text-align:left; word-break: break-all; overflow: auto; max-height: 350pt; min-width: 230pt;";	
 	private static final String SMALLER_MESSAGE_PANEL_STYLE = "text-align:left; word-break: break-all; overflow: auto; max-height: 350pt; min-width: 180pt; ";
 	private String msg = "";
 	private String imgSrc = "";

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ProcessInfoDialog.java

@@ -59,7 +59,7 @@ public class ProcessInfoDialog extends Window implements EventListener<Event> {
 	 */
 	private static final long serialVersionUID = -1712025652050086903L;
 
-	private static final String MESSAGE_PANEL_STYLE = "text-align:left; word-break: break-all; overflow: auto; max-height: 250pt; min-width: 230pt; max-width: 450pt;";
+	private static final String MESSAGE_PANEL_STYLE = "text-align:left; word-break: break-all; overflow: auto;  min-width: 230pt;";
 	
 	private Text lblMsg = new Text();
 	private Button btnOk = ButtonFactory.createNamedButton(ConfirmPanel.A_OK);

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPCareerPath.java

@@ -0,0 +1,22 @@
+package org.adempiere.webui.dashboard;
+
+import org.adempiere.webui.apps.graph.WCareerPath;
+
+public class DPCareerPath extends DashboardPanel{
+	@Override
+	public boolean isLazy() {
+		// TODO Auto-generated method stub
+		return true;
+	}
+	
+	@Override
+	public boolean isEmpty() {
+		// TODO Auto-generated method stub
+		return true;
+	}
+	
+	public DPCareerPath() {
+		WCareerPath path = new WCareerPath();
+		appendChild(path);
+	}
+}

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java

@@ -252,21 +252,29 @@ public class WAttachment extends Window implements EventListener<Event>
 		{
 		}
 
-		if (m_attachment.isReadOnly()) {
-			toolBar.removeChild(bLoad);
-			toolBar.removeChild(bDelete);
-			confirmPanel.removeChild(bDeleteAll);
-			text.setReadonly(true);
-		} else {
-			String maxUploadSize = "";
-			int size = MSysConfig.getIntValue(MSysConfig.ZK_MAX_UPLOAD_SIZE, 0);
-			if (size > 0)
-				maxUploadSize = "" + size;
+//		if (m_attachment.isReadOnly()) {
+//			toolBar.removeChild(bLoad);
+//			toolBar.removeChild(bDelete);
+//			confirmPanel.removeChild(bDeleteAll);
+//			text.setReadonly(true);
+//		} else {
+//			String maxUploadSize = "";
+//			int size = MSysConfig.getIntValue(MSysConfig.ZK_MAX_UPLOAD_SIZE, 0);
+//			if (size > 0)
+//				maxUploadSize = "" + size;
+//
+//			Clients.evalJavaScript("idempiere.dropToAttachFiles('" + this.getUuid() + "','" + mainPanel.getUuid() + "','"
+//					+ this.getDesktop().getId() + "','" + progress.getUuid() + "','" + sizeLabel.getUuid() + "','"
+//					+ maxUploadSize + "');");
+//		}
+		String maxUploadSize = "";
+		int size = MSysConfig.getIntValue(MSysConfig.ZK_MAX_UPLOAD_SIZE, 0);
+		if (size > 0)
+			maxUploadSize = "" + size;
 
-			Clients.evalJavaScript("idempiere.dropToAttachFiles('" + this.getUuid() + "','" + mainPanel.getUuid() + "','"
-					+ this.getDesktop().getId() + "','" + progress.getUuid() + "','" + sizeLabel.getUuid() + "','"
-					+ maxUploadSize + "');");
-		}
+		Clients.evalJavaScript("idempiere.dropToAttachFiles('" + this.getUuid() + "','" + mainPanel.getUuid() + "','"
+				+ this.getDesktop().getId() + "','" + progress.getUuid() + "','" + sizeLabel.getUuid() + "','"
+				+ maxUploadSize + "');");
 
 	} // WAttachment
 

org.adempiere.ui.zk/zul/careerPath.zul

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<window use="org.adempiere.webui.dashboard.DPCareerPath"/>

org.idempiere.parent/pom.xml

@@ -202,6 +202,25 @@
 										<ignore></ignore>
 									</action>
 								</pluginExecution>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.eclipse.tycho
+										</groupId>
+										<artifactId>
+											tycho-bnd-plugin
+										</artifactId>
+										<versionRange>
+											[4.0.4,)
+										</versionRange>
+										<goals>
+											<goal>process</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
 							</pluginExecutions>
 						</lifecycleMappingMetadata>
 					</configuration>

org.idempiere.tablepartition/.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

org.idempiere.ui.sso.oidc/.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

org.idempiere.zk.datatable/.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

org.idempiere.zk.pivot/.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1