ADempiere ERP Business Suite

Revision: 6292
          http://adempiere.svn.sourceforge.net/adempiere/?rev=6292&view=rev
Author:   tspc
Date:     2008-08-31 03:58:34 +0000 (Sun, 31 Aug 2008)

Log Message:
-----------
BF2084725 PDF Exporting Issues

Modified Paths:
--------------
    branches/stable/base/src/org/compiere/print/layout/LayoutEngine.java

Modified: branches/stable/base/src/org/compiere/print/layout/LayoutEngine.java
===================================================================
--- branches/stable/base/src/org/compiere/print/layout/LayoutEngine.java	2008-08-30 18:52:32 UTC (rev 6291)
+++ branches/stable/base/src/org/compiere/print/layout/LayoutEngine.java	2008-08-31 03:58:34 UTC (rev 6292)
@@ -161,7 +161,8 @@
 
 	/**	Draw using attributed String vs. Text Layout where possible */
 	//hengsin: [ 1564523 ] Max width of print element not always respected
-	public static boolean		s_FASTDRAW = false;
+	//tspc: [ 2084725 ] setting s_FASTDRAW to false is causing exported pdf to be generated as image
+	public static boolean		s_FASTDRAW = true;
 	/** Print Copy (print interface)	*/
 	private boolean				m_isCopy = false;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6291
          http://adempiere.svn.sourceforge.net/adempiere/?rev=6291&view=rev
Author:   trifonnt
Date:     2008-08-30 18:52:32 +0000 (Sat, 30 Aug 2008)

Log Message:
-----------
tax

Added Paths:
-----------
    contributions/253b/comxe/_Project-ID-03/patch-src/JasperReports/
    contributions/253b/comxe/_Project-ID-03/patch-src/JasperReports/src/
    contributions/253b/comxe/_Project-ID-03/patch-src/JasperReports/src/org/
    contributions/253b/comxe/_Project-ID-03/patch-src/JasperReports/src/org/compiere/
    contributions/253b/comxe/_Project-ID-03/patch-src/JasperReports/src/org/compiere/report/
    contributions/253b/comxe/_Project-ID-03/patch-src/JasperReports/src/org/compiere/report/ReportStarter.java
    contributions/253b/comxe/_Project-ID-03/patch-src/base/src/org/compiere/model/I_C_Tax.java
    contributions/253b/comxe/_Project-ID-03/patch-src/base/src/org/compiere/model/Tax.java
    contributions/253b/comxe/_Project-ID-03/patch-src/base/src/org/compiere/model/X_C_Tax.java

Added: contributions/253b/comxe/_Project-ID-03/patch-src/JasperReports/src/org/compiere/report/ReportStarter.java
===================================================================
--- contributions/253b/comxe/_Project-ID-03/patch-src/JasperReports/src/org/compiere/report/ReportStarter.java	                        (rev 0)
+++ contributions/253b/comxe/_Project-ID-03/patch-src/JasperReports/src/org/compiere/report/ReportStarter.java	2008-08-30 18:52:32 UTC (rev 6291)
@@ -0,0 +1,1148 @@
+/*
+ */
+package org.compiere.report;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.math.BigDecimal;
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.UnknownHostException;
+import java.rmi.RemoteException;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Properties;
+import java.util.PropertyResourceBundle;
+
+import javax.ejb.CreateException;
+import javax.ejb.RemoveException;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JasperCompileManager;
+import net.sf.jasperreports.engine.JasperExportManager;
+import net.sf.jasperreports.engine.JasperFillManager;
+import net.sf.jasperreports.engine.JasperPrint;
+import net.sf.jasperreports.engine.JasperPrintManager;
+import net.sf.jasperreports.engine.JasperReport;
+import net.sf.jasperreports.engine.util.JRLoader;
+
+import org.compiere.db.CConnection;
+import org.compiere.db.ServerConnection;
+import org.compiere.interfaces.MD5;
+import org.compiere.interfaces.MD5Home;
+import org.compiere.model.MAttachment;
+import org.compiere.model.MAttachmentEntry;
+import org.compiere.model.MProcess;
+import org.compiere.process.ClientProcess;
+import org.compiere.process.ProcessCall;
+import org.compiere.process.ProcessInfo;
+import org.compiere.process.ProcessInfoParameter;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Ini;
+import org.compiere.util.Language;
+import org.compiere.util.Trx;
+import org.compiere.utils.DBUtils;
+import org.compiere.utils.DigestOfFile;
+
+/**
+ * @author rlemeill
+ * originaly coming from an application note from compiere.co.uk
+ * ---
+ * Modifications: Allow Jasper Reports to be able to be run on VPN profile (i.e: no direct connection to DB).
+ *                Implemented ClientProcess for it to run on client.
+ * @author Ashley Ramdass 
+ * @author victor.perez@... 
+ * @see FR 1906632 http://sourceforge.net/tracker/?func=detail&atid=879335&aid=1906632&group_id=176962
+ */
+public class ReportStarter implements ProcessCall, ClientProcess {
+//logger
+	private static CLogger log = CLogger.getCLogger(ReportStarter.class);
+	private static File REPORT_HOME = null;
+	
+	private static JRViewerProvider viewerProvider = new SwingJRViewerProvider();
+
+    static {
+//        System.setProperty( "javax.xml.parsers.SAXParserFactory", "org.apache.xerces.jaxp.SAXParserFactoryImpl");
+//        System.setProperty( "org.xml.sax.driver", "org.apache.xerces.parsers.SAXParser");
+
+        String reportPath = System.getProperty("org.compiere.report.path");
+        if (reportPath == null) {
+        	REPORT_HOME = new File(Ini.getAdempiereHome() + File.separator + "reports");
+        } else {
+			REPORT_HOME = new File(reportPath);
+        }
+    }
+
+	private ProcessInfo processInfo;
+	private MAttachment attachment;
+
+    
+    /**
+     * @param requestURL
+     * @return true if the report is on the same ip address than Application Server
+     */
+    private boolean isRequestedonAS(URL requestURL)
+    {
+    	boolean tBool = false;
+    	try{
+    		InetAddress[] request_iaddrs = InetAddress.getAllByName(requestURL.getHost());
+    		InetAddress as_iaddr = InetAddress.getByName(CConnection.get().getAppsHost());
+    		for(int i=0;i<request_iaddrs.length;i++)
+    		{
+    			log.info("Got "+request_iaddrs[i].toString()+" for "+requestURL+" as address #"+i);
+    			if(request_iaddrs[i].equals(as_iaddr))
+    			{
+    				log.info("Requested report is on application server host");
+    				tBool = true;
+    				break;
+    			}
+    		}
+    	}
+    	catch (UnknownHostException e) {
+    		log.severe("Unknown dns lookup error");
+    		return false;
+    	}
+    	return tBool;
+    	
+    }
+    
+    /**
+     * @return true if the class org.compiere.interfaces.MD5Home is present
+     */
+    private boolean isMD5HomeInterfaceAvailable()
+    {
+    	try
+		{
+    		Class md5HomeClass = Class.forName("org.compiere.interfaces.MD5Home");
+    		log.info("EJB client for MD5 remote hashing is present");
+    		return true;
+		}
+    	catch (ClassNotFoundException e)
+		{
+    		log.warning("EJB Client for MD5 remote hashing absent\nyou need the class org.compiere.interfaces.MD5Home - from webEJB-client.jar - in classpath");
+    		return false;	
+		}
+    }
+    
+    /**
+     * @param requestedURLString
+     * @return md5 hash of remote file computed directly on application server
+     * 			null if problem or if report doesn't seem to be on AS (different IP or 404)
+     */
+    private String ejbGetRemoteMD5(String requestedURLString)
+    {
+		InitialContext context = null;
+		String md5Hash = null;
+    	try {
+    		URL requestURL = new URL(requestedURLString);
+    		//String requestURLHost = requestURL.getHost();
+    		Hashtable env = new Hashtable();
+    		env.put(InitialContext.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
+    		env.put(InitialContext.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces");
+    		env.put(InitialContext.PROVIDER_URL, requestURL.getHost() + ":" + CConnection.get().getAppsPort());
+    		context = new InitialContext(env);
+    		if (isRequestedonAS(requestURL) && isMD5HomeInterfaceAvailable())
+    		{
+    			MD5Home home = (MD5Home)context.lookup(MD5Home.JNDI_NAME);
+    			MD5 md5 = home.create();
+    			md5Hash = md5.getFileMD5(requestedURLString);
+    			log.info("MD5 for " + requestedURLString + " is " + md5Hash);
+    			md5.remove();
+    		}
+  
+    	}
+    	catch (MalformedURLException e) {
+    		log.severe("URL is invalid: "+ e.getMessage());
+    		return null;
+    	}
+    	catch (NamingException e){
+    		log.warning("Unable to create jndi context did you deployed webApp.ear package?\nRemote hashing is impossible");
+    		return null;
+    	}
+    	catch (RemoteException e){
+    		log.warning("Unknown remote error exception");
+    		return null;
+    	}
+    	catch(CreateException e){
+    		log.warning("Error in RemoteInterface creation");
+			return null;
+    	}
+    	catch(RemoveException e){
+    		log.warning("Error in RemoteInterface removing");
+    		return null;
+    	}
+    	return md5Hash;
+    }
+    
+    /**
+     * @author rlemeill
+     * @param reportLocation http://applicationserver/webApp/standalone.jrxml for example
+     * @param localPath Where to put the http downloaded file
+     * @return abstract File which represent the downloaded file
+     */
+    private File getRemoteFile(String reportLocation, String localPath)
+    {
+    	try{
+    		URL reportURL = new URL(reportLocation); 
+			InputStream in = reportURL.openStream();
+			
+    		File downloadedFile = new File(localPath);
+
+    		if (downloadedFile.exists())
+    		{
+    			downloadedFile.delete();
+    		}
+    		
+    		FileOutputStream fout = new FileOutputStream(downloadedFile);
+			
+			byte buf[] = new byte[1024];
+			int s = 0;
+			long tl = 0;
+			
+			while((s = in.read(buf, 0, 1024)) > 0)
+				fout.write(buf, 0, s);
+			
+    		in.close();
+    		fout.flush();
+    		fout.close();
+    		return downloadedFile;
+    	} catch (FileNotFoundException e) {
+			if(reportLocation.indexOf("Subreport") == -1) // Only show the warning if it is not a subreport
+				log.warning("404 not found: Report cannot be found on server "+ e.getMessage());
+    		return null;
+    	} catch (IOException e) {
+			log.severe("I/O error when trying to download (sub)report from server "+ e.getMessage());
+    		return null;
+    	}
+    }
+	
+	/**
+	 * Search for additional subreports deployed to a webcontext if
+	 * the parent report is located there
+	 * @author deathmeat
+	 * @param reportName The original reportname
+	 * @param reportPath The full path to the parent report
+	 * @param fileExtension The file extension of the parent report
+	 * @return An Array of File objects referencing to the downloaded subreports
+	 */
+	private File[] getHttpSubreports(String reportName, String reportPath, String fileExtension)
+	{
+		ArrayList<File> subreports = new ArrayList<File>();
+		String remoteDir = reportPath.substring(0, reportPath.lastIndexOf("/"));
+		
+		// Currently check hardcoded for max. 10 subreports
+		for(int i=1; i<10; i++)
+		{
+			// Check if subreport number i exists
+			File subreport = httpDownloadedReport(remoteDir + "/" + reportName + i + fileExtension);
+			if(subreport == null) // Subreport doesn't exist, abort further approaches
+				break;
+			
+			subreports.add(subreport);
+		}
+		
+		File[] subreportsTemp = new File[0];
+		subreportsTemp = subreports.toArray(subreportsTemp);
+		return subreportsTemp;
+	}
+    
+    /**
+     * @author rlemeill
+     * @param reportLocation http string url ex: http://adempiereserver.domain.com/webApp/standalone.jrxml
+     * @return downloaded File (or already existing one)
+     */
+    private File httpDownloadedReport(String reportLocation)
+    {
+    	File reportFile = null;
+    	File downloadedFile = null;
+    	log.info(" report deployed to " + reportLocation);
+    	try {
+    		
+    		
+    		String[] tmps = reportLocation.split("/");
+    		String cleanFile = tmps[tmps.length-1];
+    		String localFile = System.getProperty("java.io.tmpdir") + System.getProperty("file.separator") + cleanFile;
+    		String downloadedLocalFile = System.getProperty("java.io.tmpdir") + System.getProperty("file.separator")+"TMP" + cleanFile;
+    		
+    		reportFile = new File(localFile);
+    		
+    		
+    		if (reportFile.exists())
+    		{
+    			String localMD5hash = DigestOfFile.GetLocalMD5Hash(reportFile);
+    			String remoteMD5Hash = ejbGetRemoteMD5(reportLocation);
+    			log.info("MD5 for local file is "+localMD5hash );
+    			if ( remoteMD5Hash != null)
+    			{
+    				if (localMD5hash.equals(remoteMD5Hash))
+    				{
+    					log.info(" no need to download: local report is up-to-date");
+    				}
+    				else
+    				{
+    					log.info(" report on server is different that local one, download and replace");
+    					downloadedFile = getRemoteFile(reportLocation, downloadedLocalFile);
+    					reportFile.delete();
+    					downloadedFile.renameTo(reportFile);
+    				}
+    			}
+    			else
+    			{
+    				log.warning("Remote hashing is not available did you deployed webApp.ear?");
+    				downloadedFile = getRemoteFile(reportLocation, downloadedLocalFile);
+    				//    				compare hash of existing and downloaded
+    				if ( DigestOfFile.md5localHashCompare(reportFile,downloadedFile) )
+    				{
+    					//nothing file are identic
+    					log.info(" no need to replace your existing report");
+    				}
+    				else
+    				{
+    					log.info(" report on server is different that local one, replacing");
+    					reportFile.delete();
+    					downloadedFile.renameTo(reportFile);
+    				}
+    			}
+    		}
+    		else
+    		{
+    			reportFile = getRemoteFile(reportLocation,localFile);
+    		}
+    		
+    	}
+    	catch (Exception e) {
+    		log.severe("Unknown exception: "+ e.getMessage());
+    		return null;
+    	}
+    	return reportFile;
+    }
+    
+    /**
+     * Returns the Server Connection if direct connection is not available
+     * (VPN, WAN, Terminal) and thus query has to be run on server only else return
+     * a direct connection to DB.
+     * 
+     * Notes: Need to refactor and integrate in DB if confirmed to be working as
+     * expected.
+     * 
+     * @author Ashley Ramdass
+     * @return Connection DB Connection
+     */
+    protected Connection getConnection()
+    {
+    	if (DB.isRemoteObjects())
+    	{
+    		return new ServerConnection();
+    	}
+    	else 
+    	{
+    		return DB.getConnectionRW();
+    	}
+    }
+    
+    /**
+	 *  Start the process.
+	 *  Called then pressing the Process button in R_Request.
+	 *  It should only return false, if the function could not be performed
+	 *  as this causes the process to abort.
+	 *  @author rlemeill
+	 *  @param ctx  context
+	 *  @param pi            Compiere standard process info
+	 *  @param trx
+	 *  @return true if success
+	 */
+    public boolean startProcess(Properties ctx, ProcessInfo pi, Trx trx) {
+		
+    	processInfo = pi;
+		String Name=pi.getTitle();
+        int AD_PInstance_ID=pi.getAD_PInstance_ID();
+        int Record_ID=pi.getRecord_ID();
+        log.info( "Name="+Name+"  AD_PInstance_ID="+AD_PInstance_ID+" Record_ID="+Record_ID);
+        String trxName = null;
+        if (trx != null) {
+        	trxName = trx.getTrxName();
+        }
+        ReportData reportData = getReportData( pi, trxName);
+        if (reportData==null) {
+            reportResult( AD_PInstance_ID, "Can not find report data", trxName);
+            return false;
+        }
+
+        String reportPath =  reportData.getReportFilePath();
+        if ((reportPath==null)||(reportPath.length()==0)) {
+            reportResult( AD_PInstance_ID, "Can not find report", trxName);
+            return false;
+        }
+        
+		JasperData data = null;
+		File reportFile = null;
+		String fileExtension = "";
+		HashMap params = new HashMap( ctx);
+		
+		addProcessParameters( AD_PInstance_ID, params, trxName);
+		
+		addProcessInfoParameters(params, pi.getParameter());
+		
+		reportFile = getReportFile(reportPath, (String)params.get("ReportType"));
+		
+		if (reportFile == null || reportFile.exists() == false) 
+		{
+			log.severe("No report file found for given type, falling back to " + reportPath);
+			reportFile = getReportFile(reportPath);
+		}
+		
+		if (reportFile == null || reportFile.exists() == false) {
+			String tmp = "Can not find report file at path - " + reportPath;
+			log.severe(tmp);
+			reportResult(AD_PInstance_ID, tmp, trxName);
+		}
+
+		if (reportFile != null)
+		{
+			data = processReport(reportFile);
+			fileExtension = reportFile.getName().substring(reportFile.getName().lastIndexOf("."),
+					reportFile.getName().length());
+		}
+		else
+		{
+			return false;
+		}
+		
+		JasperReport jasperReport = data.getJasperReport();
+        String jasperName = data.getJasperName();
+        File reportDir = data.getReportDir();
+
+        if (jasperReport != null) {
+			File[] subreports;
+			
+            // Subreports
+			if(reportPath.startsWith("http://") || reportPath.startsWith("https://"))
+			{
+				// Locate and download subreports from remote webcontext
+				subreports = getHttpSubreports(jasperName + "Subreport", reportPath, fileExtension);
+			}
+			else if (reportPath.startsWith("attachment:")) 
+			{
+				subreports = getAttachmentSubreports(reportPath);
+			}
+			else if (reportPath.startsWith("resource:")) 
+			{
+				subreports = getResourceSubreports(jasperName + "Subreport", reportPath, fileExtension);
+			}
+			// TODO: Implement file:/ lookup for subreports
+			else
+			{
+				// Locate subreports from local/remote filesystem
+				subreports = reportDir.listFiles( new FileFilter( jasperName+"Subreport", reportDir, fileExtension));
+			}
+			
+            for( int i=0; i<subreports.length; i++) {
+                JasperData subData = processReport( subreports[i]);
+                if (subData.getJasperReport()!=null) {
+                    params.put( subData.getJasperName(), subData.getJasperFile().getAbsolutePath());
+                }
+            }
+
+            if (Record_ID > 0)
+            	params.put("RECORD_ID", new Integer( Record_ID));
+            
+            // contribution from Ricardo (ralexsander)
+            // in iReports you can 'SELECT' AD_Client_ID, AD_Org_ID and AD_User_ID using only AD_PINSTANCE_ID
+            params.put("AD_PINSTANCE_ID", new Integer( AD_PInstance_ID));
+            
+            Language currLang = Env.getLanguage(Env.getCtx());
+            params.put("CURRENT_LANG", currLang.getAD_Language());
+            // Resources
+            File resFile = null;
+            if (reportPath.startsWith("attachment:") && attachment != null) {
+            	resFile = getAttachmentResourceFile(jasperName, currLang);
+            } else if (reportPath.startsWith("resource:")) {
+                	resFile = getResourcesForResourceFile(jasperName, currLang);
+            // TODO: Implement file:/ for resources
+            } else {
+                File[] resources = reportDir.listFiles( new FileFilter( jasperName, reportDir, ".properties"));                
+                // try baseName + "_" + language
+                for( int i=0; i<resources.length; i++) {
+                    if ( resources[i].getName().equals( jasperName+currLang.getLocale().getLanguage()+".properties")) {
+                        resFile=resources[i];
+                        break;
+                    }
+                }
+                if (resFile==null) {
+                    // try baseName only
+                    for( int i=0; i<resources.length; i++) {
+                        if ( resources[i].getName().equals( jasperName+".properties")) {
+                            resFile=resources[i];
+                            break;
+                        }
+                    }
+                }
+            }
+            if (resFile!=null) {
+                try {
+                    PropertyResourceBundle res = new PropertyResourceBundle( new FileInputStream(resFile));
+                    params.put("RESOURCE", res);
+                } catch (IOException e) {
+                    ;
+                }
+            }
+
+            Connection conn = null;
+            try {
+                //JasperPrint jasperPrint = JasperFillManager.fillReport( jasperReport, params, DB.getConnectionRW());
+            	conn = getConnection();
+                JasperPrint jasperPrint = JasperFillManager.fillReport( jasperReport, params, conn);
+                if (reportData.isDirectPrint()) 
+                {
+                    log.info( "ReportStarter.startProcess print report -" + jasperPrint.getName());
+                    //RF 1906632
+                    if(!processInfo.isBatch())
+                    JasperPrintManager.printReport( jasperPrint, false);
+                    else
+                    {
+                    	// You can use JasperPrint to create PDF
+                    	// Used For the PH
+                    	try 
+                    	{
+                    		File PDF = File.createTempFile("mail", ".pdf");
+                    		JasperExportManager.exportReportToPdfFile(jasperPrint, PDF.getAbsolutePath());
+                    		processInfo.setPDFReport(PDF);
+                    	} 
+                    	catch (IOException e) 
+                    	{
+                    		log.severe("ReportStarter.startProcess: Can not make PDF File - "+ e.getMessage());
+                    	}
+                }
+                    
+                    // You can use JasperPrint to create PDF
+//                        JasperExportManager.exportReportToPdfFile(jasperPrint, "BasicReport.pdf");
+                } else {
+                    log.info( "ReportStarter.startProcess run report -"+jasperPrint.getName());
+                    JRViewerProvider viewerLauncher = getReportViewerProvider();
+                    viewerLauncher.openViewer(jasperPrint, pi.getTitle()+" - " + reportPath);
+                }
+            } catch (JRException e) {
+                log.severe("ReportStarter.startProcess: Can not run report - "+ e.getMessage());
+            } finally {
+            	if (conn != null)
+					try {
+						conn.close();
+					} catch (SQLException e) {
+					}
+            }
+        }
+
+        reportResult( AD_PInstance_ID, null, trxName);
+        return true;
+    }
+
+	/**
+     * Get .property resource file from process attachment
+     * @param jasperName
+     * @param currLang
+     * @return File
+     */
+    private File getAttachmentResourceFile(String jasperName, Language currLang) {
+    	File resFile = null;
+    	MAttachmentEntry[] entries = attachment.getEntries();
+    	// try baseName + "_" + language
+        for( int i=0; i<entries.length; i++) {
+            if ( entries[i].getName().equals( jasperName+currLang.getLocale().getLanguage()+".properties")) {
+                resFile = getAttachmentEntryFile(entries[i]);
+                break;
+            }
+        }
+        if (resFile==null) {
+            // try baseName only
+            for( int i=0; i<entries.length; i++) {
+                if ( entries[i].getName().equals( jasperName+".properties")) {
+                	resFile = getAttachmentEntryFile(entries[i]);
+                    break;
+                }
+            }
+        }
+		return resFile;
+	}
+
+	/**
+     * Get .property resource file from resources
+     * @param jasperName
+     * @param currLang
+     * @return File
+     */
+    private File getResourcesForResourceFile(String jasperName, Language currLang) {
+    	File resFile = null;
+		try {
+			resFile = getFileAsResource(jasperName+currLang.getLocale().getLanguage()+".properties");
+		} catch (Exception e) {
+			// ignore exception - file couldn't exist
+		}
+		return resFile;
+	}
+
+	/**
+     * Get subreports from attachment. Assume all other jasper attachment is subreport.
+     * @param reportPath
+     * @return File[]
+     */
+    private File[] getAttachmentSubreports(String reportPath) {
+		String name = reportPath.substring("attachment:".length()).trim();
+		ArrayList<File> subreports = new ArrayList<File>();
+		MAttachmentEntry[] entries = attachment.getEntries();
+		for(int i = 0; i < entries.length; i++) {
+			if (!entries[i].getName().equals(name) &&
+				(entries[i].getName().endsWith(".jrxml") || entries[i].getName().endsWith(".jasper"))) {
+				File reportFile = getAttachmentEntryFile(entries[i]);
+				if (reportFile != null)
+					subreports.add(reportFile);
+			}
+		}
+		File[] files = new File[subreports.size()];
+		File[] subreportsTemp = new File[0];
+		subreportsTemp = subreports.toArray(subreportsTemp);
+		return subreportsTemp;
+	}
+
+	/**
+	 * Search for additional subreports deployed as resources
+	 * @param reportName The original reportname
+	 * @param reportPath The full path to the parent report
+	 * @param fileExtension The file extension of the parent report
+	 * @return An Array of File objects referencing to the downloaded subreports
+	 */
+	private File[] getResourceSubreports(String reportName, String reportPath, String fileExtension)
+	{
+		ArrayList<File> subreports = new ArrayList<File>();
+		String remoteDir = reportPath.substring(0, reportPath.lastIndexOf("/"));
+		
+		// Currently check hardcoded for max. 10 subreports
+		for(int i=1; i<10; i++)
+		{
+			// Check if subreport number i exists
+			File subreport = null;
+			try {
+				subreport = getFileAsResource(remoteDir + "/" + reportName + i + fileExtension);
+			} catch (Exception e) {
+				// just ignore it
+			}
+			if(subreport == null) // Subreport doesn't exist, abort further approaches
+				break;
+			
+			subreports.add(subreport);
+		}
+		
+		File[] subreportsTemp = new File[0];
+		subreportsTemp = subreports.toArray(subreportsTemp);
+		return subreportsTemp;
+	}
+
+	/**
+     * @author alinv
+     * @param reportPath
+     * @param reportType
+     * @return the abstract file corresponding to typed report
+     */
+	protected File getReportFile(String reportPath, String reportType) {
+		
+		if (reportType != null)
+		{
+			int cpos = reportPath.lastIndexOf('.');
+			reportPath = reportPath.substring(0, cpos) + "_" + reportType + reportPath.substring(cpos, reportPath.length());
+		}
+		
+		return getReportFile(reportPath);
+	}
+	
+	/**
+	 * @author alinv
+	 * @param reportPath
+	 * @return the abstract file corresponding to report
+	 */
+	protected File getReportFile(String reportPath) {
+		File reportFile = null;
+		
+		// Reports deployment on web server Thanks to Alin Vaida
+		if (reportPath.startsWith("http://") || reportPath.startsWith("https://")) {
+			reportFile = httpDownloadedReport(reportPath);
+		} else if (reportPath.startsWith("attachment:")) {
+			//report file from process attachment
+			reportFile = downloadAttachment(reportPath);
+		} else if(reportPath.startsWith("/")) {
+			reportFile = new File(reportPath);
+		} else if (reportPath.startsWith("file:/")) {
+			try {
+				reportFile = new File(new URI(reportPath));
+			} catch (URISyntaxException e) {
+				log.warning(e.getLocalizedMessage());
+				reportFile = null;
+			}
+		} else if (reportPath.startsWith("resource:")) {
+			try {
+				reportFile = getFileAsResource(reportPath);
+			} catch (Exception e) {
+				log.warning(e.getLocalizedMessage());
+				reportFile = null;
+			}
+		} else {
+			reportFile = new File(REPORT_HOME, reportPath);
+		}
+		
+		// Set org.compiere.report.path because it is used in reports which refer to subreports
+		System.setProperty("org.compiere.report.path", reportFile.getParentFile().getAbsolutePath());
+		return reportFile;
+	}
+
+	/**
+	 * @param reportPath
+	 * @return
+	 * @throws Exception 
+	 */
+	private File getFileAsResource(String reportPath) throws Exception {
+		File reportFile;
+		String name = reportPath.substring("resource:".length()).trim();
+		String localName = name.replace('/', '_');
+		log.info("reportPath = " + reportPath);
+		log.info("getting resource from = " + getClass().getClassLoader().getResource(name));
+		InputStream inputStream = getClass().getClassLoader().getResourceAsStream(name);
+		String localFile = System.getProperty("java.io.tmpdir") + System.getProperty("file.separator") + localName;
+		log.info("localFile = " + localFile);
+		reportFile = new File(localFile);
+
+		OutputStream out = null;
+		out = new FileOutputStream(reportFile);
+		if (out != null){
+			byte buf[]=new byte[1024];
+			int len;
+			while((len=inputStream.read(buf))>0)
+				out.write(buf,0,len);
+			out.close();
+			inputStream.close();
+		}
+
+		return reportFile;
+	}
+
+	/**
+	 * Download db attachment 
+	 * @param reportPath must of syntax attachment:filename
+	 * @return File
+	 */
+	private File downloadAttachment(String reportPath) {
+		File reportFile = null;
+		String name = reportPath.substring("attachment:".length()).trim();
+		MProcess process = new MProcess(Env.getCtx(), processInfo.getAD_Process_ID(), processInfo.getTransactionName()); 
+		attachment = process.getAttachment();
+		if (attachment != null) {
+			MAttachmentEntry[] entries = attachment.getEntries();
+			MAttachmentEntry entry = null;
+			for (int i = 0; i < entries.length; i++) {
+				if (entries[i].getName().equals(name)) {
+					entry = entries[i];
+					break;
+				}
+			}
+			if (entry != null) {
+				reportFile = getAttachmentEntryFile(entry);
+			}	
+		}
+		return reportFile;
+	}
+	
+	/**
+	 * Download db attachment to local file
+	 * @param entry
+	 * @return File
+	 */
+	private File getAttachmentEntryFile(MAttachmentEntry entry) {
+		String localFile = System.getProperty("java.io.tmpdir") + System.getProperty("file.separator") + entry.getName();
+		String downloadedLocalFile = System.getProperty("java.io.tmpdir") + System.getProperty("file.separator")+"TMP" + entry.getName();
+		File reportFile = new File(localFile);
+		if (reportFile.exists()) {
+			String localMD5hash = DigestOfFile.GetLocalMD5Hash(reportFile);
+			String entryMD5hash = DigestOfFile.getMD5Hash(entry.getData());
+			if (localMD5hash.equals(entryMD5hash))
+			{
+				log.info(" no need to download: local report is up-to-date");
+			}
+			else
+			{
+				log.info(" report on server is different that local one, download and replace");
+				File downloadedFile = new File(downloadedLocalFile);
+				entry.getFile(downloadedFile);
+				reportFile.delete();
+				downloadedFile.renameTo(reportFile);
+			}
+		} else {
+			entry.getFile(reportFile);
+		}
+		return reportFile;
+	}
+
+	/**
+     * @author rlemeill
+     * @param AD_PInstance_ID
+     * @param errMsg
+     */
+    protected void reportResult( int AD_PInstance_ID, String errMsg, String trxName) {
+        int result = (errMsg==null)?1:0;
+        errMsg = (errMsg==null)?"":errMsg;
+        String sql = "UPDATE AD_PInstance SET result="+result+", errormsg='"+errMsg+"' "+
+                     "WHERE AD_PInstance_ID="+AD_PInstance_ID;
+        Statement pstmt = null;
+        try {
+            pstmt = DB.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE, trxName);
+            pstmt.executeUpdate(sql);
+            pstmt.close();
+        } catch (SQLException e) {
+            log.severe(sql+e.getMessage());
+        } finally {
+            DBUtils.close( pstmt);
+        }
+    }
+
+    /**
+     * @author rlemeill
+     * @param reportFile
+     * @return
+     */
+    protected JasperData processReport( File reportFile) {
+        log.info( "reportFile.getAbsolutePath() = "+reportFile.getAbsolutePath());
+        JasperReport jasperReport = null;
+
+        String jasperName = reportFile.getName();
+        int pos = jasperName.indexOf('.');
+        if (pos!=-1) jasperName = jasperName.substring(0, pos);
+        File reportDir = reportFile.getParentFile();
+        
+        //test if the compiled report exists
+        File jasperFile = new File( reportDir.getAbsolutePath(), jasperName+".jasper");
+        if (jasperFile.exists()) { // test time
+            if (reportFile.lastModified() == jasperFile.lastModified()) {
+            	log.info(" no need to compile use "+jasperFile.getAbsolutePath());
+                try {
+                    jasperReport = (JasperReport)JRLoader.loadObject(jasperFile.getAbsolutePath());
+                } catch (JRException e) {
+                    jasperReport = null;
+                    log.severe("Can not load report - "+ e.getMessage());
+                }
+            } else {
+                jasperReport = compileReport( reportFile, jasperFile);
+            }
+        } else { // create new jasper file
+            jasperReport = compileReport( reportFile, jasperFile);
+        }
+
+        return new JasperData( jasperReport, reportDir, jasperName, jasperFile);
+    }
+
+
+    protected void addProcessParameters( int AD_PInstance_ID, Map<String, Object> params, String trxName) {
+        log.info("");
+        String sql = "SELECT ParameterName, "+
+                        "P_String, "+
+                        "P_String_To, "+
+                        "P_Number, "+
+                        "P_Number_To, "+
+                        "P_Date, "+
+                        "P_Date_To "+
+                    "FROM AD_PInstance_Para "+
+                    "WHERE AD_PInstance_ID=?";
+        PreparedStatement pstmt = null;
+        ResultSet rs = null;
+        try {
+            pstmt = DB.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, trxName);
+            pstmt.setInt(1, AD_PInstance_ID);
+            rs = pstmt.executeQuery();
+            while (rs.next()) {
+                String name = rs.getString(1);
+                String pStr = rs.getString(2);
+                String pStrTo = rs.getString(3);
+                //Double pNum = new Double( rs.getDouble(4));
+                //Double pNumTo = new Double( rs.getDouble(5));
+                BigDecimal pNum = rs.getBigDecimal(4);
+                BigDecimal pNumTo = rs.getBigDecimal(5);
+                
+                Timestamp pDate = rs.getTimestamp(6);
+                Timestamp pDateTo = rs.getTimestamp(7);
+                if (pStr != null) {
+                    if (pStrTo!=null) {
+                        params.put( name+"1", pStr);
+                        params.put( name+"2", pStrTo);
+                    } else {
+                        params.put( name, pStr);
+                    }
+                } else if (pDate != null) {
+                    if (pDateTo!=null) {
+                        params.put( name+"1", pDate);
+                        params.put( name+"2", pDateTo);
+                    } else {
+                        params.put( name, pDate);
+                    }
+                } else if (pNum != null) {
+                    if (rs.getBigDecimal(5)!=null) {
+                        params.put( name+"1", pNum);
+                        params.put( name+"2", pNumTo);
+                    } else {
+                        params.put( name, pNum);
+                    }
+                }
+            }
+        } catch (SQLException e) {
+            log.severe("Execption; sql = "+sql+"; e.getMessage() = " +e.getMessage());
+        } finally {
+            DBUtils.close( rs);
+            DBUtils.close( pstmt);
+        }
+    }
+
+    private void addProcessInfoParameters(Map<String, Object> params, ProcessInfoParameter[] para) {
+    	if (para != null) {
+			for (int i = 0; i < para.length; i++) {
+				if (para[i].getParameter_To() == null) {
+					params.put(para[i].getParameterName(), para[i].getParameter());
+				} else {
+	                params.put( para[i].getParameterName()+"1", para[i].getParameter());
+	                params.put( para[i].getParameterName()+"2", para[i].getParameter_To());
+				}
+			}
+    	}
+	}
+
+    /**
+     * @author rlemeill
+     * Correct the class path if loaded from java web start
+     */
+    private void JWScorrectClassPath()
+    {
+		URL jasperreportsAbsoluteURL = Thread.currentThread().getContextClassLoader().getResource("net/sf/jasperreports/engine");
+		String jasperreportsAbsolutePath = "";
+		
+		if(jasperreportsAbsoluteURL.toString().startsWith("jar:http:") || jasperreportsAbsoluteURL.toString().startsWith("jar:https:"))
+		{
+			// Jasper classes are deployed to a webserver (Java Webstart)
+			jasperreportsAbsolutePath = jasperreportsAbsoluteURL.toString().split("!")[0].split("jar:")[1];
+			
+			// Download the required jasper libraries if they are not already existing
+			File reqLib = new File(System.getProperty("java.io.tmpdir"), "CompiereJasperReqs.jar");
+			if(!reqLib.exists() && !(reqLib.length() > 0))
+			{
+				try{
+					URL reqLibURL = new URL(jasperreportsAbsolutePath);
+					InputStream in = reqLibURL.openStream();
+
+					FileOutputStream fout = new FileOutputStream(reqLib);
+
+					byte buf[] = new byte[1024];
+					int s = 0;
+					long tl = 0;
+
+					while((s = in.read(buf, 0, 1024)) > 0)
+						fout.write(buf, 0, s);
+
+					in.close();
+					fout.flush();
+					fout.close();
+				} catch (FileNotFoundException e) {
+					log.warning("Required library not found "+ e.getMessage());
+					reqLib.delete();
+					reqLib = null;
+				} catch (IOException e) {
+					log.severe("I/O error downloading required library from server "+ e.getMessage());
+					reqLib.delete();
+					reqLib = null;
+				}
+			}
+
+			jasperreportsAbsolutePath = reqLib.getAbsolutePath();
+		}
+		else
+		{
+			// Jasper classes are locally available (Local client)
+			jasperreportsAbsolutePath = jasperreportsAbsoluteURL.toString().split("!")[0].split("file:")[1];
+		}
+		
+		if(jasperreportsAbsolutePath != null && !jasperreportsAbsolutePath.trim().equals(""))
+		{
+			// Check whether the current CLASSPATH already contains our
+			// jasper libraries and dependencies or not.
+			if(System.getProperty("java.class.path").indexOf(jasperreportsAbsolutePath) < 0)
+			{
+			System.setProperty("java.class.path",
+					System.getProperty("java.class.path") +
+					System.getProperty("path.separator") +
+					jasperreportsAbsolutePath);
+			log.info("Classpath has been corrected to " + System.getProperty("java.class.path"));
+			}
+		}
+    }
+	
+    /**
+     * @author rlemeill
+     * @param reportFile
+     * @param jasperFile
+     * @return compiled JasperReport
+     */
+    private JasperReport compileReport( File reportFile, File jasperFile) {
+    	JWScorrectClassPath();
+        JasperReport compiledJasperReport = null;
+        try {
+          	JasperCompileManager.compileReportToFile ( reportFile.getAbsolutePath(), jasperFile.getAbsolutePath() );
+            jasperFile.setLastModified( reportFile.lastModified()); //Synchronize Dates
+            compiledJasperReport =  (JasperReport)JRLoader.loadObject(jasperFile);
+        } catch (JRException e) {
+            log.severe("JRException; e.getMessage()= "+ e.getMessage());
+        }
+        return compiledJasperReport;
+    }
+
+    /**
+     * @author rlemeill
+     * @param ProcessInfo
+     * @return ReportData
+     */
+    public ReportData getReportData( ProcessInfo pi, String trxName) {
+    	log.info("");
+        String sql = "SELECT pr.JasperReport, pr.IsDirectPrint "
+        		   + "FROM AD_Process pr, AD_PInstance pi "
+                   + "WHERE pr.AD_Process_ID = pi.AD_Process_ID "
+                   + " AND pi.AD_PInstance_ID=?";
+        PreparedStatement pstmt = null;
+        ResultSet rs = null;
+        try {
+            pstmt = DB.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, trxName);
+            pstmt.setInt(1, pi.getAD_PInstance_ID());
+            rs = pstmt.executeQuery();
+            String path = null;
+            boolean	directPrint = false;
+            boolean isPrintPreview = pi.isPrintPreview();
+            if (rs.next()) {
+                path = rs.getString(1);
+				
+				if ("Y".equalsIgnoreCase(rs.getString(2)) && !Ini.isPropertyBool(Ini.P_PRINTPREVIEW)
+						&& !isPrintPreview )
+					directPrint = true;
+            } else {
+                log.severe("data not found; sql = "+sql);
+				return null;
+            }
+            
+            return new ReportData( path, directPrint);
+        } catch (SQLException e) {
+            log.severe("sql = "+sql+"; e.getMessage() = "+ e.getMessage());
+            return null;
+        } finally {
+            DBUtils.close( rs);
+            DBUtils.close( pstmt);
+        }
+    }
+    
+    /**
+     * Set jasper report viewer provider.
+     * @param provider
+     */
+    public static void setReportViewerProvider(JRViewerProvider provider) {
+    	if (provider == null)
+    		throw new IllegalArgumentException("Cannot set report viewer provider to null");
+    	viewerProvider = provider;
+    }
+    
+    /**
+     * Get the current jasper report viewer provider
+     * @return JRViewerProvider
+     */
+    public static JRViewerProvider getReportViewerProvider() {
+    	return viewerProvider;
+    }
+
+    class ReportData {
+        private String reportFilePath;
+        private boolean directPrint;
+
+        public ReportData(String reportFilePath, boolean directPrint) {
+            this.reportFilePath = reportFilePath;
+            this.directPrint = directPrint;
+        }
+
+        public String getReportFilePath() {
+            return reportFilePath;
+        }
+
+        public boolean isDirectPrint() {
+            return directPrint;
+        }
+    }
+
+    class JasperData {
+        private JasperReport jasperReport;
+        private File reportDir;
+        private String jasperName;
+        private File jasperFile;
+
+        public JasperData(JasperReport jasperReport, File reportDir, String jasperName, File jasperFile) {
+            this.jasperReport = jasperReport;
+            this.reportDir = reportDir;
+            this.jasperName = jasperName;
+            this.jasperFile = jasperFile;
+        }
+
+        public JasperReport getJasperReport() {
+            return jasperReport;
+        }
+
+        public File getReportDir() {
+            return reportDir;
+        }
+
+        public String getJasperName() {
+            return jasperName;
+        }
+
+        public File getJasperFile() {
+            return jasperFile;
+        }
+    }
+
+    class FileFilter implements FilenameFilter {
+        private String reportStart;
+        private File directory;
+        private String extension;
+
+        public FileFilter(String reportStart, File directory, String extension) {
+            this.reportStart = reportStart;
+            this.directory = directory;
+            this.extension = extension;
+        }
+
+        public boolean accept(File file, String name) {
+            if (file.equals( directory)) {
+                if (name.startsWith( reportStart)) {
+                    int pos = name.lastIndexOf( extension);
+                    if ( (pos!=-1) && (pos==(name.length()-extension.length()))) return true;
+                }
+            }
+            return false;
+        }
+    }
+
+}
\ No newline at end of file


Property changes on: contributions/253b/comxe/_Project-ID-03/patch-src/JasperReports/src/org/compiere/report/ReportStarter.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: contributions/253b/comxe/_Project-ID-03/patch-src/base/src/org/compiere/model/I_C_Tax.java
===================================================================
--- contributions/253b/comxe/_Project-ID-03/patch-src/base/src/org/compiere/model/I_C_Tax.java	                        (rev 0)
+++ contributions/253b/comxe/_Project-ID-03/patch-src/base/src/org/compiere/model/I_C_Tax.java	2008-08-30 18:52:32 UTC (rev 6291)
@@ -0,0 +1,359 @@
+/**********************************************************************
+ * This file is part of Adempiere ERP Bazaar                          *
+ * http://www.adempiere.org                                           *
+ *                                                                    *
+ * Copyright (C) Trifon Trifonov.                                     *
+ * Copyright (C) Contributors                                         *
+ *                                                                    *
+ * This program is free software, you can redistribute it and/or      *
+ * modify it under the terms of the GNU General Public License        *
+ * as published by the Free Software Foundation, either version 2     *
+ * of the License, or (at your option) any later version.             *
+ *                                                                    *
+ * This program is distributed in the hope that it will be useful,    *
+ * but WITHOUT ANY WARRANTY, without even the implied warranty of     *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the       *
+ * GNU General Public License for more details.                       *
+ *                                                                    *
+ * You should have received a copy of the GNU General Public License  *
+ * along with this program, if not, write to the Free Software        *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,         *
+ * MA 02110-1301, USA.                                                *
+ *                                                                    *
+ * Contributors:                                                      *
+ * - Trifon Trifonov (trifonnt@...)                 *
+ *                                                                    *
+ * Sponsors:                                                          *
+ * - Company (http://www.site.com)                                    *
+ **********************************************************************/
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Interface for C_Tax
+ *  @author Adempiere (generated) 
+ *  @version Release 3.5.2a
+ */
+public interface I_C_Tax 
+{
+
+    /** TableName=C_Tax */
+    public static final String Table_Name = "C_Tax";
+
+    /** AD_Table_ID=261 */
+    public static final int Table_ID = MTable.getTable_ID(Table_Name);
+
+    KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name);
+
+    /** AccessLevel = 2 - Client 
+     */
+    BigDecimal accessLevel = BigDecimal.valueOf(2);
+
+    /** Load Meta Data */
+
+    /** Column name AD_Rule_ID */
+    public static final String COLUMNNAME_AD_Rule_ID = "AD_Rule_ID";
+
+	/** Set Rule	  */
+	public void setAD_Rule_ID (int AD_Rule_ID);
+
+	/** Get Rule	  */
+	public int getAD_Rule_ID();
+
+	public I_AD_Rule getAD_Rule() throws Exception;
+
+    /** Column name C_BPartner_ID */
+    public static final String COLUMNNAME_C_BPartner_ID = "C_BPartner_ID";
+
+	/** Set Business Partner	  */
+	public void setC_BPartner_ID (int C_BPartner_ID);
+
+	/** Get Business Partner	  */
+	public int getC_BPartner_ID();
+
+	public I_C_BPartner getC_BPartner() throws Exception;
+
+    /** Column name C_BP_Group_ID */
+    public static final String COLUMNNAME_C_BP_Group_ID = "C_BP_Group_ID";
+
+	/** Set B.Parther Group	  */
+	public void setC_BP_Group_ID (int C_BP_Group_ID);
+
+	/** Get B.Parther Group	  */
+	public int getC_BP_Group_ID();
+
+	public I_C_BP_Group getC_BP_Group() throws Exception;
+
+    /** Column name C_Country_ID */
+    public static final String COLUMNNAME_C_Country_ID = "C_Country_ID";
+
+	/** Set Country.
+	  * Country 
+	  */
+	public void setC_Country_ID (int C_Country_ID);
+
+	/** Get Country.
+	  * Country 
+	  */
+	public int getC_Country_ID();
+
+    /** Column name C_Region_ID */
+    public static final String COLUMNNAME_C_Region_ID = "C_Region_ID";
+
+	/** Set Region.
+	  * Identifies a geographical Region
+	  */
+	public void setC_Region_ID (int C_Region_ID);
+
+	/** Get Region.
+	  * Identifies a geographical Region
+	  */
+	public int getC_Region_ID();
+
+    /** Column name C_TaxCategory_ID */
+    public static final String COLUMNNAME_C_TaxCategory_ID = "C_TaxCategory_ID";
+
+	/** Set Tax Category.
+	  * Tax Category
+	  */
+	public void setC_TaxCategory_ID (int C_TaxCategory_ID);
+
+	/** Get Tax Category.
+	  * Tax Category
+	  */
+	public int getC_TaxCategory_ID();
+
+	public I_C_TaxCategory getC_TaxCategory() throws Exception;
+
+    /** Column name C_Tax_ID */
+    public static final String COLUMNNAME_C_Tax_ID = "C_Tax_ID";
+
+	/** Set Tax.
+	  * Tax identifier
+	  */
+	public void setC_Tax_ID (int C_Tax_ID);
+
+	/** Get Tax.
+	  * Tax identifier
+	  */
+	public int getC_Tax_ID();
+
+    /** Column name Description */
+    public static final String COLUMNNAME_Description = "Description";
+
+	/** Set Description.
+	  * Optional short description of the record
+	  */
+	public void setDescription (String Description);
+
+	/** Get Description.
+	  * Optional short description of the record
+	  */
+	public String getDescription();
+
+    /** Column name IsDefault */
+    public static final String COLUMNNAME_IsDefault = "IsDefault";
+
+	/** Set Default.
+	  * Default value
+	  */
+	public void setIsDefault (boolean IsDefault);
+
+	/** Get Default.
+	  * Default value
+	  */
+	public boolean isDefault();
+
+    /** Column name IsDocumentLevel */
+    public static final String COLUMNNAME_IsDocumentLevel = "IsDocumentLevel";
+
+	/** Set Document Level.
+	  * Tax is calculated on document level (rather than line by line)
+	  */
+	public void setIsDocumentLevel (boolean IsDocumentLevel);
+
+	/** Get Document Level.
+	  * Tax is calculated on document level (rather than line by line)
+	  */
+	public boolean isDocumentLevel();
+
+    /** Column name IsSalesTax */
+    public static final String COLUMNNAME_IsSalesTax = "IsSalesTax";
+
+	/** Set Sales Tax.
+	  * This is a sales tax (i.e. not a value added tax)
+	  */
+	public void setIsSalesTax (boolean IsSalesTax);
+
+	/** Get Sales Tax.
+	  * This is a sales tax (i.e. not a value added tax)
+	  */
+	public boolean isSalesTax();
+
+    /** Column name IsSummary */
+    public static final String COLUMNNAME_IsSummary = "IsSummary";
+
+	/** Set Summary Level.
+	  * This is a summary entity
+	  */
+	public void setIsSummary (boolean IsSummary);
+
+	/** Get Summary Level.
+	  * This is a summary entity
+	  */
+	public boolean isSummary();
+
+    /** Column name IsTaxExempt */
+    public static final String COLUMNNAME_IsTaxExempt = "IsTaxExempt";
+
+	/** Set Tax exempt.
+	  * Business partner is exempt from tax
+	  */
+	public void setIsTaxExempt (boolean IsTaxExempt);
+
+	/** Get Tax exempt.
+	  * Business partner is exempt from tax
+	  */
+	public boolean isTaxExempt();
+
+    /** Column name M_Product_Category_ID */
+    public static final String COLUMNNAME_M_Product_Category_ID = "M_Product_Category_ID";
+
+	/** Set Product Category	  */
+	public void setM_Product_Category_ID (int M_Product_Category_ID);
+
+	/** Get Product Category	  */
+	public int getM_Product_Category_ID();
+
+	public I_M_Product_Category getM_Product_Category() throws Exception;
+
+    /** Column name M_Product_ID */
+    public static final String COLUMNNAME_M_Product_ID = "M_Product_ID";
+
+	/** Set Product	  */
+	public void setM_Product_ID (int M_Product_ID);
+
+	/** Get Product	  */
+	public int getM_Product_ID();
+
+	public I_M_Product getM_Product() throws Exception;
+
+    /** Column name Name */
+    public static final String COLUMNNAME_Name = "Name";
+
+	/** Set Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name);
+
+	/** Get Name.
+	  * Alphanumeric identifier of the entity
+	  */
+	public String getName();
+
+    /** Column name Parent_Tax_ID */
+    public static final String COLUMNNAME_Parent_Tax_ID = "Parent_Tax_ID";
+
+	/** Set Parent Tax.
+	  * Parent Tax indicates a tax that is made up of multiple taxes
+	  */
+	public void setParent_Tax_ID (int Parent_Tax_ID);
+
+	/** Get Parent Tax.
+	  * Parent Tax indicates a tax that is made up of multiple taxes
+	  */
+	public int getParent_Tax_ID();
+
+    /** Column name Rate */
+    public static final String COLUMNNAME_Rate = "Rate";
+
+	/** Set Rate.
+	  * Rate or Tax or Exchange
+	  */
+	public void setRate (BigDecimal Rate);
+
+	/** Get Rate.
+	  * Rate or Tax or Exchange
+	  */
+	public BigDecimal getRate();
+
+    /** Column name RequiresTaxCertificate */
+    public static final String COLUMNNAME_RequiresTaxCertificate = "RequiresTaxCertificate";
+
+	/** Set Requires Tax Certificate.
+	  * This tax rate requires the Business Partner to be tax exempt
+	  */
+	public void setRequiresTaxCertificate (boolean RequiresTaxCertificate);
+
+	/** Get Requires Tax Certificate.
+	  * This tax rate requires the Business Partner to be tax exempt
+	  */
+	public boolean isRequiresTaxCertificate();
+
+    /** Column name SOPOType */
+    public static final String COLUMNNAME_SOPOType = "SOPOType";
+
+	/** Set SO/PO Type.
+	  * Sales Tax applies to sales situations, Purchase Tax to purchase situations
+	  */
+	public void setSOPOType (String SOPOType);
+
+	/** Get SO/PO Type.
+	  * Sales Tax applies to sales situations, Purchase Tax to purchase situations
+	  */
+	public String getSOPOType();
+
+    /** Column name TaxIndicator */
+    public static final String COLUMNNAME_TaxIndicator = "TaxIndicator";
+
+	/** Set Tax Indicator.
+	  * Short form for Tax to be printed on documents
+	  */
+	public void setTaxIndicator (String TaxIndicator);
+
+	/** Get Tax Indicator.
+	  * Short form for Tax to be printed on documents
+	  */
+	public String getTaxIndicator();
+
+    /** Column name To_Country_ID */
+    public static final String COLUMNNAME_To_Country_ID = "To_Country_ID";
+
+	/** Set To.
+	  * Receiving Country
+	  */
+	public void setTo_Country_ID (int To_Country_ID);
+
+	/** Get To.
+	  * Receiving Country
+	  */
+	public int getTo_Country_ID();
+
+    /** Column name To_Region_ID */
+    public static final String COLUMNNAME_To_Region_ID = "To_Region_ID";
+
+	/** Set To.
+	  * Receiving Region
+	  */
+	public void setTo_Region_ID (int To_Region_ID);
+
+	/** Get To.
+	  * Receiving Region
+	  */
+	public int getTo_Region_ID();
+
+    /** Column name ValidFrom */
+    public static final String COLUMNNAME_ValidFrom = "ValidFrom";
+
+	/** Set Valid from.
+	  * Valid from including this date (first day)
+	  */
+	public void setValidFrom (Timestamp ValidFrom);
+
+	/** Get Valid from.
+	  * Valid from including this date (first day)
+	  */
+	public Timestamp getValidFrom();
+}


Property changes on: contributions/253b/comxe/_Project-ID-03/patch-src/base/src/org/compiere/model/I_C_Tax.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: contributions/253b/comxe/_Project-ID-03/patch-src/base/src/org/compiere/model/Tax.java
===================================================================
--- contributions/253b/comxe/_Project-ID-03/patch-src/base/src/org/compiere/model/Tax.java	                        (rev 0)
+++ contributions/253b/comxe/_Project-ID-03/patch-src/base/src/org/compiere/model/Tax.java	2008-08-30 18:52:32 UTC (rev 6291)
@@ -0,0 +1,661 @@
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution                        *
+ * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@... or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+package org.compiere.model;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogMgt;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
+
+/**
+ *	Tax Handling
+ *
+ * 	@author 	Jorg Janke
+ * 	@version 	$Id: Tax.java,v 1.3 2006/07/30 00:51:02 jjanke Exp $
+ */
+public class Tax
+{
+	/**	Logger							*/
+	static private CLogger			log = CLogger.getCLogger (Tax.class);
+
+	
+	/**************************************************************************
+	 *	Get Tax ID - converts parameters to call Get Tax.
+	 *  <pre>
+	 *		M_Product_ID/C_Charge_ID	->	C_TaxCategory_ID
+	 *		billDate, shipDate			->	billDate, shipDate
+	 *		AD_Org_ID					->	billFromC_Location_ID
+	 *		M_Warehouse_ID				->	shipFromC_Location_ID
+	 *		billC_BPartner_Location_ID  ->	billToC_Location_ID
+	 *		shipC_BPartner_Location_ID 	->	shipToC_Location_ID
+	 *
+	 *  if IsSOTrx is false, bill and ship are reversed
+	 *  </pre>
+	 * 	@param ctx	context
+	 * 	@param M_Product_ID product
+	 * 	@param C_Charge_ID product
+	 * 	@param billDate invoice date
+	 * 	@param shipDate ship date
+	 * 	@param AD_Org_ID org
+	 * 	@param M_Warehouse_ID warehouse
+	 * 	@param billC_BPartner_Location_ID invoice location
+	 * 	@param shipC_BPartner_Location_ID ship location
+	 * 	@param IsSOTrx is a sales trx
+	 * 	@return C_Tax_ID
+	 *  If error it returns 0 and sets error log (TaxCriteriaNotFound)
+	 */
+	public static int get (Properties ctx, int M_Product_ID, int C_Charge_ID,
+		Timestamp billDate, Timestamp shipDate,
+		int AD_Org_ID, int M_Warehouse_ID,
+		int billC_BPartner_Location_ID, int shipC_BPartner_Location_ID,
+		boolean IsSOTrx)
+	{
+		if (M_Product_ID != 0)
+			return getProduct (ctx, M_Product_ID, billDate, shipDate, AD_Org_ID, M_Warehouse_ID,
+				billC_BPartner_Location_ID, shipC_BPartner_Location_ID, IsSOTrx);
+		else if (C_Charge_ID != 0)
+			return getCharge (ctx, C_Charge_ID, billDate, shipDate, AD_Org_ID, M_Warehouse_ID,
+				billC_BPartner_Location_ID, shipC_BPartner_Location_ID, IsSOTrx);
+		else
+			return getExemptTax (ctx, AD_Org_ID);
+	}	//	get
+
+	/**
+	 *	Get Tax ID - converts parameters to call Get Tax.
+	 *  <pre>
+	 *		C_Charge_ID					->	C_TaxCategory_ID
+	 *		billDate, shipDate			->	billDate, shipDate
+	 *		AD_Org_ID					->	billFromC_Location_ID
+	 *		M_Warehouse_ID				->	shipFromC_Location_ID
+	 *		billC_BPartner_Location_ID  ->	billToC_Location_ID
+	 *		shipC_BPartner_Location_ID 	->	shipToC_Location_ID
+	 *
+	 *  if IsSOTrx is false, bill and ship are reversed
+	 *  </pre>
+	 * 	@param ctx	context
+	 * 	@param C_Charge_ID product
+	 * 	@param billDate invoice date
+	 * 	@param shipDate ship date
+	 * 	@param AD_Org_ID org
+	 * 	@param M_Warehouse_ID warehouse
+	 * 	@param billC_BPartner_Location_ID invoice location
+	 * 	@param shipC_BPartner_Location_ID ship location
+	 * 	@param IsSOTrx is a sales trx
+	 * 	@return C_Tax_ID
+	 *  If error it returns 0 and sets error log (TaxCriteriaNotFound)
+	 */
+	public static int getCharge (Properties ctx, int C_Charge_ID,
+		Timestamp billDate, Timestamp shipDate,
+		int AD_Org_ID, int M_Warehouse_ID,
+		int billC_BPartner_Location_ID, int shipC_BPartner_Location_ID,
+		boolean IsSOTrx)
+	{
+		if (M_Warehouse_ID == 0)
+			M_Warehouse_ID = Env.getContextAsInt(ctx, "M_Warehouse_ID");
+		if (M_Warehouse_ID == 0)
+		{
+			log.warning("No Warehouse - C_Charge_ID=" + C_Charge_ID);
+			return 0;
+		}
+		int C_TaxCategory_ID = 0;
+		int shipFromC_Location_ID = 0;
+		int shipToC_Location_ID = 0;
+		int billFromC_Location_ID = 0;
+		int billToC_Location_ID = 0;
+		String IsTaxExempt = null;
+		int C_BPartner_ID = 0; // @Trifon
+		int C_BP_Group_ID = 0; // @Trifon
+		
+		//	Get all at once
+		String sql = "SELECT c.C_TaxCategory_ID, o.C_Location_ID, il.C_Location_ID, b.IsTaxExempt,"
+			 + " w.C_Location_ID, sl.C_Location_ID "
+			 + " , b.C_BPartner_ID, b.C_BP_Group_ID " // #7, #8 @Trifon
+			 + "FROM C_Charge c, AD_OrgInfo o,"
+			 + " C_BPartner_Location il INNER JOIN C_BPartner b ON (il.C_BPartner_ID=b.C_BPartner_ID),"
+			 + " M_Warehouse w, C_BPartner_Location sl "
+			 + "WHERE c.C_Charge_ID=?"
+			 + " AND o.AD_Org_ID=?"
+			 + " AND il.C_BPartner_Location_ID=?"
+			 + " AND w.M_Warehouse_ID=?"
+			 + " AND sl.C_BPartner_Location_ID=?";
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		try
+		{
+			pstmt = DB.prepareStatement (sql, null);
+			pstmt.setInt (1, C_Charge_ID);
+			pstmt.setInt (2, AD_Org_ID);
+			pstmt.setInt (3, billC_BPartner_Location_ID);
+			pstmt.setInt (4, M_Warehouse_ID);
+			pstmt.setInt (5, shipC_BPartner_Location_ID);
+			rs = pstmt.executeQuery ();
+			boolean found = false;
+			if (rs.next ())
+			{
+				C_TaxCategory_ID = rs.getInt (1);
+				billFromC_Location_ID = rs.getInt (2);
+				billToC_Location_ID = rs.getInt (3);
+				IsTaxExempt = rs.getString (4);
+				shipFromC_Location_ID = rs.getInt (5);
+				shipToC_Location_ID = rs.getInt (6);
+				found = true;
+				C_BPartner_ID = rs.getInt( 7 ); // @Trifon
+				C_BP_Group_ID = rs.getInt( 8 ); // @Trifon
+			}
+			DB.close(rs, pstmt);
+			//
+			if (!found)
+			{
+				log.warning("Not found for C_Charge_ID=" + C_Charge_ID 
+					+ ", AD_Org_ID=" + AD_Org_ID + ", M_Warehouse_ID=" + M_Warehouse_ID
+					+ ", C_BPartner_Location_ID=" + billC_BPartner_Location_ID 
+					+ "/" + shipC_BPartner_Location_ID);
+				return 0;
+			}
+			else if ("Y".equals (IsTaxExempt))
+				return getExemptTax (ctx, AD_Org_ID);
+		}
+		catch (Exception e)
+		{
+			log.log(Level.SEVERE, sql, e);
+			return 0;
+		}
+		finally {
+			DB.close(rs, pstmt);
+			rs = null; pstmt = null;
+		}
+
+		//	Reverese for PO
+		if (!IsSOTrx)
+		{
+			int temp = billFromC_Location_ID;
+			billFromC_Location_ID = billToC_Location_ID;
+			billToC_Location_ID = temp;
+			temp = shipFromC_Location_ID;
+			shipFromC_Location_ID = shipToC_Location_ID;
+			shipToC_Location_ID = temp;
+		}
+		//
+		log.fine("getCharge - C_TaxCategory_ID=" + C_TaxCategory_ID
+		  + ", billFromC_Location_ID=" + billFromC_Location_ID
+		  + ", billToC_Location_ID=" + billToC_Location_ID
+		  + ", shipFromC_Location_ID=" + shipFromC_Location_ID
+		  + ", shipToC_Location_ID=" + shipToC_Location_ID);
+		return get (ctx, C_TaxCategory_ID, IsSOTrx,
+		  shipDate, shipFromC_Location_ID, shipToC_Location_ID,
+		  billDate, billFromC_Location_ID, billToC_Location_ID // @Trifon
+		  , -1, -1 // @Trifon; mProductCategoryId, mProductId
+		  , C_BP_Group_ID, C_BPartner_ID); // @Trifon
+	}	//	getCharge
+
+
+	/**
+	 *	Get Tax ID - converts parameters to call Get Tax.
+	 *  <pre>
+	 *		M_Product_ID				->	C_TaxCategory_ID
+	 *		billDate, shipDate			->	billDate, shipDate
+	 *		AD_Org_ID					->	billFromC_Location_ID
+	 *		M_Warehouse_ID				->	shipFromC_Location_ID
+	 *		billC_BPartner_Location_ID  ->	billToC_Location_ID
+	 *		shipC_BPartner_Location_ID 	->	shipToC_Location_ID
+	 *
+	 *  if IsSOTrx is false, bill and ship are reversed
+	 *  </pre>
+	 * 	@param ctx	context
+	 * 	@param M_Product_ID product
+	 * 	@param billDate invoice date
+	 * 	@param shipDate ship date
+	 * 	@param AD_Org_ID org
+	 * 	@param M_Warehouse_ID warehouse
+	 * 	@param billC_BPartner_Location_ID invoice location
+	 * 	@param shipC_BPartner_Location_ID ship location
+	 * 	@param IsSOTrx is a sales trx
+	 * 	@return C_Tax_ID
+	 *  If error it returns 0 and sets error log (TaxCriteriaNotFound)
+	 */
+	public static int getProduct (Properties ctx, int M_Product_ID,
+		Timestamp billDate, Timestamp shipDate,
+		int AD_Org_ID, int M_Warehouse_ID,
+		int billC_BPartner_Location_ID, int shipC_BPartner_Location_ID,
+		boolean IsSOTrx)
+	{
+		String variable = "";
+		int C_TaxCategory_ID = 0;
+		int shipFromC_Location_ID = 0;
+		int shipToC_Location_ID = 0;
+		int billFromC_Location_ID = 0;
+		int billToC_Location_ID = 0;
+		int M_Product_Category_ID = 0; // @Trifon
+		int cBPGroupId = 0; // @Trifon
+		int cBpartnerId = 0; // @Trifon
+		String IsTaxExempt = null;
+
+		PreparedStatement  pstmt = null;
+		ResultSet rs = null;
+		try
+		{
+			//	Get all at once
+			String sql = "SELECT p.C_TaxCategory_ID, o.C_Location_ID, il.C_Location_ID, b.IsTaxExempt,"
+				+ " w.C_Location_ID, sl.C_Location_ID "
+				+ " , p.M_Product_Category_ID " // #7 @Trifon
+				+ " , b.C_BPartner_ID, b.C_BP_Group_ID " // #8, #9 @Trifon
+				+ "FROM M_Product p, AD_OrgInfo o,"
+				+ " C_BPartner_Location il INNER JOIN C_BPartner b ON (il.C_BPartner_ID=b.C_BPartner_ID),"
+				+ " M_Warehouse w, C_BPartner_Location sl "
+				+ "WHERE p.M_Product_ID=?"
+				+ " AND o.AD_Org_ID=?"
+				+ " AND il.C_BPartner_Location_ID=?"
+				+ " AND w.M_Warehouse_ID=?"
+				+ " AND sl.C_BPartner_Location_ID=?";
+			pstmt = DB.prepareStatement(sql, null);
+			pstmt.setInt(1, M_Product_ID);
+			pstmt.setInt(2, AD_Org_ID);
+			pstmt.setInt(3, billC_BPartner_Location_ID);
+			pstmt.setInt(4, M_Warehouse_ID);
+			pstmt.setInt(5, shipC_BPartner_Location_ID);
+			rs = pstmt.executeQuery();
+			boolean found = false;
+			if (rs.next())
+			{
+				C_TaxCategory_ID = rs.getInt(1);
+				billFromC_Location_ID = rs.getInt(2);
+				billToC_Location_ID = rs.getInt(3);
+				IsTaxExempt = rs.getString(4);
+				shipFromC_Location_ID = rs.getInt(5);
+				shipToC_Location_ID = rs.getInt(6);
+				M_Product_Category_ID = rs.getInt( X_M_Product.COLUMNNAME_M_Product_Category_ID ); // @Trifon
+				cBpartnerId = rs.getInt( X_C_BPartner.COLUMNNAME_C_BPartner_ID ); // @Trifon
+				cBPGroupId = rs.getInt( X_C_BPartner.COLUMNNAME_C_BP_Group_ID ); // @Trifon
+				
+				found = true;
+			}
+			DB.close(rs, pstmt);
+			//
+			if (found && "Y".equals(IsTaxExempt))
+			{
+				log.fine("getProduct - Business Partner is Tax exempt");
+				return getExemptTax(ctx, AD_Org_ID);
+			}
+			else if (found)
+			{
+				if (!IsSOTrx)
+				{
+					int temp = billFromC_Location_ID;
+					billFromC_Location_ID = billToC_Location_ID;
+					billToC_Location_ID = temp;
+					temp = shipFromC_Location_ID;
+					shipFromC_Location_ID = shipToC_Location_ID;
+					shipToC_Location_ID = temp;
+				}
+				log.fine("getProduct - C_TaxCategory_ID=" + C_TaxCategory_ID
+					+ ", billFromC_Location_ID=" + billFromC_Location_ID
+					+ ", billToC_Location_ID=" + billToC_Location_ID
+					+ ", shipFromC_Location_ID=" + shipFromC_Location_ID
+					+ ", shipToC_Location_ID=" + shipToC_Location_ID);
+				return get(ctx, C_TaxCategory_ID, IsSOTrx,
+					shipDate, shipFromC_Location_ID, shipToC_Location_ID,
+					billDate, billFromC_Location_ID, billToC_Location_ID
+					, M_Product_Category_ID, M_Product_ID // @Trifon
+					, cBPGroupId, cBpartnerId); // @Trifon
+			}
+
+			// ----------------------------------------------------------------
+
+			//	Detail for error isolation
+
+		//	M_Product_ID				->	C_TaxCategory_ID
+			sql = "SELECT C_TaxCategory_ID "
+				+ ", M_Product_Category_ID " // #2 @Trifon
+				+ " FROM M_Product "
+				+ "WHERE M_Product_ID=?";
+			variable = "M_Product_ID";
+			pstmt = DB.prepareStatement(sql, null);
+			pstmt.setInt(1, M_Product_ID);
+			rs = pstmt.executeQuery();
+			found = false;
+			if (rs.next())
+			{
+				C_TaxCategory_ID = rs.getInt(1);
+				M_Product_Category_ID = rs.getInt( 2 ); // @Trifon
+				found = true;
+			}
+			DB.close(rs, pstmt);
+			if (C_TaxCategory_ID == 0)
+			{
+				log.saveError("TaxCriteriaNotFound", Msg.translate(ctx, variable)
+					+ (found ? "" : " (Product=" + M_Product_ID + " not found)"));
+				return 0;
+			}
+			log.fine("getProduct - C_TaxCategory_ID=" + C_TaxCategory_ID);
+
+		//	AD_Org_ID					->	billFromC_Location_ID
+			sql = "SELECT C_Location_ID FROM AD_OrgInfo "
+				+ "WHERE AD_Org_ID=?";
+			variable = "AD_Org_ID";
+			pstmt = DB.prepareStatement(sql, null);
+			pstmt.setInt(1, AD_Org_ID);
+			rs = pstmt.executeQuery();
+			found = false;
+			if (rs.next())
+			{
+				billFromC_Location_ID = rs.getInt (1);
+				found = true;
+			}
+			DB.close(rs, pstmt);
+			if (billFromC_Location_ID == 0)
+			{
+				log.saveError("TaxCriteriaNotFound", Msg.translate(Env.getAD_Language(ctx), variable)
+				  + (found ? "" : " (Info/Org=" + AD_Org_ID + " not found)"));
+				return 0;
+			}
+
+		//	billC_BPartner_Location_ID  ->	billToC_Location_ID
+			sql = "SELECT l.C_Location_ID, b.IsTaxExempt "
+				+ "FROM C_BPartner_Location l INNER JOIN C_BPartner b ON (l.C_BPartner_ID=b.C_BPartner_ID) "
+				+ "WHERE C_BPartner_Location_ID=?";
+			variable = "BillTo_ID";
+			pstmt = DB.prepareStatement(sql, null);
+			pstmt.setInt(1, billC_BPartner_Location_ID);
+			rs = pstmt.executeQuery();
+			found = false;
+			if (rs.next())
+			{
+				billToC_Location_ID = rs.getInt(1);
+				IsTaxExempt = rs.getString(2);
+				found = true;
+			}
+			DB.close(rs, pstmt);
+			if (billToC_Location_ID == 0)
+			{
+				log.saveError("TaxCriteriaNotFound", Msg.translate(Env.getAD_Language(ctx), variable)
+					+ (found ? "" : " (BPLocation=" + billC_BPartner_Location_ID + " not found)"));
+				return 0;
+			}
+			if ("Y".equals(IsTaxExempt))
+				return getExemptTax(ctx, AD_Org_ID);
+
+			//  Reverse for PO
+			if (!IsSOTrx)
+			{
+				int temp = billFromC_Location_ID;
+				billFromC_Location_ID = billToC_Location_ID;
+				billToC_Location_ID = temp;
+			}
+			log.fine("getProduct - billFromC_Location_ID = " + billFromC_Location_ID);
+			log.fine("getProduct - billToC_Location_ID = " + billToC_Location_ID);
+
+			//-----------------------------------------------------------------
+
+		//	M_Warehouse_ID				->	shipFromC_Location_ID
+			sql = "SELECT C_Location_ID FROM M_Warehouse "
+				+ "WHERE M_Warehouse_ID=?";
+			variable = "M_Warehouse_ID";
+			pstmt = DB.prepareStatement(sql, null);
+			pstmt.setInt(1, M_Warehouse_ID);
+			rs = pstmt.executeQuery();
+			found = false;
+			if (rs.next())
+			{
+				shipFromC_Location_ID = rs.getInt (1);
+				found = true;
+			}
+			DB.close(rs, pstmt);
+			if (shipFromC_Location_ID == 0)
+			{
+				log.saveError("TaxCriteriaNotFound", Msg.translate(Env.getAD_Language(ctx), variable)
+					+ (found ? "" : " (Warehouse=" + M_Warehouse_ID + " not found)"));
+				return 0;
+			}
+
+		//	shipC_BPartner_Location_ID 	->	shipToC_Location_ID
+			sql = "SELECT C_Location_ID FROM C_BPartner_Location "
+				+ "WHERE C_BPartner_Location_ID=?";
+			variable = "C_BPartner_Location_ID";
+			pstmt = DB.prepareStatement(sql, null);
+			pstmt.setInt(1, shipC_BPartner_Location_ID);
+			rs = pstmt.executeQuery();
+			found = false;
+			if (rs.next())
+			{
+				shipToC_Location_ID = rs.getInt (1);
+				found = true;
+			}
+			DB.close(rs, pstmt);
+			if (shipToC_Location_ID == 0)
+			{
+				log.saveError("TaxCriteriaNotFound", Msg.translate(Env.getAD_Language(ctx), variable)
+					+ (found ? "" : " (BPLocation=" + shipC_BPartner_Location_ID + " not found)"));
+				return 0;
+			}
+
+			//  Reverse for PO
+			if (!IsSOTrx)
+			{
+				int temp = shipFromC_Location_ID;
+				shipFromC_Location_ID = shipToC_Location_ID;
+				shipToC_Location_ID = temp;
+			}
+			log.fine("getProduct - shipFromC_Location_ID = " + shipFromC_Location_ID);
+			log.fine("getProduct - shipToC_Location_ID = " + shipToC_Location_ID);
+		}
+		catch (SQLException e)
+		{
+			log.log(Level.SEVERE, "getProduct (" + variable + ")", e);
+		}
+		finally
+		{
+			DB.close(rs);
+			DB.close(pstmt);
+			rs = null; pstmt = null;
+		}
+
+		return get (ctx, C_TaxCategory_ID, IsSOTrx,
+			shipDate, shipFromC_Location_ID, shipToC_Location_ID,
+			billDate, billFromC_Location_ID, billToC_Location_ID
+			, M_Product_Category_ID, M_Product_ID  // @Trifon
+			, cBPGroupId, cBpartnerId); // @Trifon
+	}	//	getProduct
+
+	/**
+	 * 	Get Exempt Tax Code
+	 * 	@param ctx context
+	 * 	@param AD_Org_ID org to find client
+	 * 	@return C_Tax_ID
+	 */
+	private static int getExemptTax (Properties ctx, int AD_Org_ID)
+	{
+		int C_Tax_ID = 0;
+		String sql = "SELECT t.C_Tax_ID "
+			+ "FROM C_Tax t"
+			+ " INNER JOIN AD_Org o ON (t.AD_Client_ID=o.AD_Client_ID) "
+			+ "WHERE t.IsTaxExempt='Y' AND o.AD_Org_ID=? "
+			+ "ORDER BY t.Rate DESC";
+		boolean found = false;
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		try
+		{
+			pstmt = DB.prepareStatement(sql, null);
+			pstmt.setInt(1, AD_Org_ID);
+			rs = pstmt.executeQuery();
+			if (rs.next())
+			{
+				C_Tax_ID = rs.getInt (1);
+				found = true;
+			}
+		}
+		catch (SQLException e)
+		{
+			log.log(Level.SEVERE, "getExemptTax", e);
+		}
+		finally {
+			DB.close(rs, pstmt);
+			rs = null; pstmt = null;
+		}
+		log.fine("getExemptTax - TaxExempt=Y - C_Tax_ID=" + C_Tax_ID);
+		if (C_Tax_ID == 0)
+			log.saveError("TaxCriteriaNotFound", Msg.getMsg(ctx, "TaxNoExemptFound")
+				+ (found ? "" : " (Tax/Org=" + AD_Org_ID + " not found)"));
+		return C_Tax_ID;
+	}	//	getExemptTax
+
+	
+	/**************************************************************************
+	 *	Get Tax ID (Detail).
+	 *  If error return 0 and set error log (TaxNotFound)
+	 *  @param ctx context
+	 *	@param C_TaxCategory_ID tax category
+	 * 	@param IsSOTrx Sales Order Trx
+	 *	@param shipDate ship date (ignored)
+	 *	@param shipFromC_Locction_ID ship from (ignored)
+	 *	@param shipToC_Location_ID ship to (ignored)
+	 *	@param billDate invoice date
+	 *	@param billFromC_Location_ID invoice from
+	 *	@param billToC_Location_ID invoice to
+	 *	@return C_Tax_ID
+	 */
+	protected static int get (Properties ctx,
+		int C_TaxCategory_ID, boolean IsSOTrx,
+		Timestamp shipDate, int shipFromC_Locction_ID, int shipToC_Location_ID,
+		Timestamp billDate, int billFromC_Location_ID, int billToC_Location_ID
+		, int mProductCategoryId, int mProductId  // @Trifon
+		, int cBPGroupId, int cBpartnerId)  // @Trifon
+	{
+		//	C_TaxCategory contains CommodityCode
+		
+		//	API to Tax Vendor comes here
+
+		if (CLogMgt.isLevelFine())
+		{
+			log.info("get(Detail) - Tax Category=" + C_TaxCategory_ID 
+				+ ", SOTrx=" + IsSOTrx);
+			log.config("get(Detail) - BillFrom=" + billFromC_Location_ID 
+				+ ", BillTo=" + billToC_Location_ID + ", BillDate=" + billDate);
+		}
+
+		MTax[] taxes = MTax.getAll (ctx);
+		MLocation lFrom = new MLocation (ctx, billFromC_Location_ID, null); 
+		MLocation lTo = new MLocation (ctx, billToC_Location_ID, null); 
+		log.finer("From=" + lFrom);
+		log.finer("To=" + lTo);
+		
+		for (int i = 0; i < taxes.length; i++)
+		{
+			MTax tax = taxes[i];
+			log.finest(tax.toString());
+			//
+			if (tax.getC_TaxCategory_ID() != C_TaxCategory_ID
+				|| !tax.isActive() 
+				|| tax.getParent_Tax_ID() != 0)	//	user parent tax
+				continue;
+			if (IsSOTrx && MTax.SOPOTYPE_PurchaseTax.equals(tax.getSOPOType()))
+				continue;
+			if (!IsSOTrx && MTax.SOPOTYPE_SalesTax.equals(tax.getSOPOType()))
+				continue;
+			
+			log.finest("From Country - " + (tax.getC_Country_ID() == lFrom.getC_Country_ID() 
+				|| tax.getC_Country_ID() == 0));
+			log.finest("From Region - " + (tax.getC_Region_ID() == lFrom.getC_Region_ID() 
+				|| tax.getC_Region_ID() == 0));
+			log.finest("To Country - " + (tax.getTo_Country_ID() == lTo.getC_Country_ID() 
+				|| tax.getTo_Country_ID() == 0));
+			log.finest("To Region - " + (tax.getTo_Region_ID() == lTo.getC_Region_ID() 
+				|| tax.getTo_Region_ID() == 0));
+			log.finest("Date valid - " + (!tax.getValidFrom().after(billDate)));
+			log.finest("Product Category - " + (tax.getM_Product_Category_ID() == mProductCategoryId 
+					|| tax.getM_Product_Category_ID() == 0));
+			log.finest("Product - " + (tax.getM_Product_ID() == mProductId 
+					|| tax.getM_Product_ID() == 0));
+			log.finest("Business Partner Group - " + (tax.getC_BP_Group_ID() == cBPGroupId 
+					|| tax.getC_BP_Group_ID() == 0));
+			log.finest("Business Partner - " + (tax.getC_BPartner_ID() == cBpartnerId 
+					|| tax.getC_BPartner_ID() == 0));
+				//	From Country
+			if ((tax.getC_Country_ID() == lFrom.getC_Country_ID() 
+					|| tax.getC_Country_ID() == 0)
+				//	From Region
+				&& (tax.getC_Region_ID() == lFrom.getC_Region_ID() 
+					|| tax.getC_Region_ID() == 0)
+				//	To Country
+				&& (tax.getTo_Country_ID() == lTo.getC_Country_ID() 
+					|| tax.getTo_Country_ID() == 0)
+				//	To Region
+				&& (tax.getTo_Region_ID() == lTo.getC_Region_ID() 
+					|| tax.getTo_Region_ID() == 0)
+				//	Date
+				&& !tax.getValidFrom().after(billDate)
+				// Product Category @Trifon
+				&& (tax.getM_Product_Category_ID() == mProductCategoryId 
+					|| tax.getM_Product_Category_ID() == 0)
+				// Product @Trifon
+				&& (tax.getM_Product_ID() == mProductId 
+						|| tax.getM_Product_ID() == 0)
+				// Business Partner Group @Trifon
+				&& (tax.getC_BP_Group_ID() == cBPGroupId 
+						|| tax.getC_BP_Group_ID() == 0)
+				// Business Partner @Trifon
+				&& (tax.getC_BPartner_ID() == cBpartnerId 
+						|| tax.getC_BPartner_ID() == 0)
+				)
+			{
+				if (!tax.isPostal())
+					return tax.getC_Tax_ID();
+				//
+				MTaxPostal[] postals = tax.getPostals(false);
+				for (int j = 0; j < postals.length; j++)
+				{
+					MTaxPostal postal = postals[j];
+					if (postal.isActive()
+						//	Postal From is mandatory
+						&& postal.getPostal().startsWith(lFrom.getPostal())
+						//	Postal To is optional
+						&& (postal.getPostal_To() == null 
+							|| postal.getPostal_To().startsWith(lTo.getPostal()))
+						)
+						return tax.getC_Tax_ID();
+				}	//	for all postals
+			}
+		}	//	for all taxes
+
+		//	Default Tax
+		for (int i = 0; i < taxes.length; i++)
+		{
+			MTax tax = taxes[i];
+			if (!tax.isDefault() || !tax.isActive()
+				|| tax.getParent_Tax_ID() != 0)	//	user parent tax
+				continue;
+			if (IsSOTrx && MTax.SOPOTYPE_PurchaseTax.equals(tax.getSOPOType()))
+				continue;
+			if (!IsSOTrx && MTax.SOPOTYPE_SalesTax.equals(tax.getSOPOType()))
+				continue;
+			log.fine("get (default) - " + tax);
+			return tax.getC_Tax_ID();
+		}	//	for all taxes
+		
+		log.saveError("TaxNotFound", "");
+		return 0;
+	}	//	get
+	
+}	//	Tax


Property changes on: contributions/253b/comxe/_Project-ID-03/patch-src/base/src/org/compiere/model/Tax.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: contributions/253b/comxe/_Project-ID-03/patch-src/base/src/org/compiere/model/X_C_Tax.java
===================================================================
--- contributions/253b/comxe/_Project-ID-03/patch-src/base/src/org/compiere/model/X_C_Tax.java	                        (rev 0)
+++ contributions/253b/comxe/_Project-ID-03/patch-src/base/src/org/compiere/model/X_C_Tax.java	2008-08-30 18:52:32 UTC (rev 6291)
@@ -0,0 +1,727 @@
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2007 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@... or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+/** Generated Model - DO NOT CHANGE */
+package org.compiere.model;
+
+import java.lang.reflect.Constructor;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.Properties;
+import java.util.logging.Level;
+import org.compiere.util.Env;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Model for C_Tax
+ *  @author Adempiere (generated) 
+ *  @version Release 3.5.2a - $Id$ */
+public class X_C_Tax extends PO implements I_C_Tax, I_Persistent 
+{
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 1L;
+
+    /** Standard Constructor */
+    public X_C_Tax (Properties ctx, int C_Tax_ID, String trxName)
+    {
+      super (ctx, C_Tax_ID, trxName);
+      /** if (C_Tax_ID == 0)
+        {
+			setC_TaxCategory_ID (0);
+			setC_Tax_ID (0);
+			setIsDefault (false);
+			setIsDocumentLevel (false);
+			setIsSalesTax (false);
+// N
+			setIsSummary (false);
+			setIsTaxExempt (false);
+			setName (null);
+			setRate (Env.ZERO);
+			setRequiresTaxCertificate (false);
+			setSOPOType (null);
+// B
+			setValidFrom (new Timestamp( System.currentTimeMillis() ));
+        } */
+    }
+
+    /** Load Constructor */
+    public X_C_Tax (Properties ctx, ResultSet rs, String trxName)
+    {
+      super (ctx, rs, trxName);
+    }
+
+    /** AccessLevel
+      * @return 2 - Client 
+      */
+    protected int get_AccessLevel()
+    {
+      return accessLevel.intValue();
+    }
+
+    /** Load Meta Data */
+    protected POInfo initPO (Properties ctx)
+    {
+      POInfo poi = POInfo.getPOInfo (ctx, Table_ID, get_TrxName());
+      return poi;
+    }
+
+    public String toString()
+    {
+      StringBuffer sb = new StringBuffer ("X_C_Tax[")
+        .append(get_ID()).append("]");
+      return sb.toString();
+    }
+
+	public I_AD_Rule getAD_Rule() throws Exception 
+    {
+        Class<?> clazz = MTable.getClass(I_AD_Rule.Table_Name);
+        I_AD_Rule result = null;
+        try	{
+	        Constructor<?> constructor = null;
+	    	constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class});
+    	    result = (I_AD_Rule)constructor.newInstance(new Object[] {getCtx(), new Integer(getAD_Rule_ID()), get_TrxName()});
+        } catch (Exception e) {
+	        log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
+	        log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
+           throw e;
+        }
+        return result;
+    }
+
+	/** Set Rule.
+		@param AD_Rule_ID Rule	  */
+	public void setAD_Rule_ID (int AD_Rule_ID)
+	{
+		if (AD_Rule_ID < 1) 
+			set_Value (COLUMNNAME_AD_Rule_ID, null);
+		else 
+			set_Value (COLUMNNAME_AD_Rule_ID, Integer.valueOf(AD_Rule_ID));
+	}
+
+	/** Get Rule.
+		@return Rule	  */
+	public int getAD_Rule_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_Rule_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	public I_C_BPartner getC_BPartner() throws Exception 
+    {
+        Class<?> clazz = MTable.getClass(I_C_BPartner.Table_Name);
+        I_C_BPartner result = null;
+        try	{
+	        Constructor<?> constructor = null;
+	    	constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class});
+    	    result = (I_C_BPartner)constructor.newInstance(new Object[] {getCtx(), new Integer(getC_BPartner_ID()), get_TrxName()});
+        } catch (Exception e) {
+	        log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
+	        log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
+           throw e;
+        }
+        return result;
+    }
+
+	/** Set Business Partner.
+		@param C_BPartner_ID Business Partner	  */
+	public void setC_BPartner_ID (int C_BPartner_ID)
+	{
+		if (C_BPartner_ID < 1) 
+			set_Value (COLUMNNAME_C_BPartner_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_BPartner_ID, Integer.valueOf(C_BPartner_ID));
+	}
+
+	/** Get Business Partner.
+		@return Business Partner	  */
+	public int getC_BPartner_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_BPartner_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	public I_C_BP_Group getC_BP_Group() throws Exception 
+    {
+        Class<?> clazz = MTable.getClass(I_C_BP_Group.Table_Name);
+        I_C_BP_Group result = null;
+        try	{
+	        Constructor<?> constructor = null;
+	    	constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class});
+    	    result = (I_C_BP_Group)constructor.newInstance(new Object[] {getCtx(), new Integer(getC_BP_Group_ID()), get_TrxName()});
+        } catch (Exception e) {
+	        log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
+	        log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
+           throw e;
+        }
+        return result;
+    }
+
+	/** Set B.Parther Group.
+		@param C_BP_Group_ID B.Parther Group	  */
+	public void setC_BP_Group_ID (int C_BP_Group_ID)
+	{
+		if (C_BP_Group_ID < 1) 
+			set_Value (COLUMNNAME_C_BP_Group_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_BP_Group_ID, Integer.valueOf(C_BP_Group_ID));
+	}
+
+	/** Get B.Parther Group.
+		@return B.Parther Group	  */
+	public int getC_BP_Group_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_Group_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** C_Country_ID AD_Reference_ID=156 */
+	public static final int C_COUNTRY_ID_AD_Reference_ID=156;
+	/** Set Country.
+		@param C_Country_ID 
+		Country 
+	  */
+	public void setC_Country_ID (int C_Country_ID)
+	{
+		if (C_Country_ID < 1) 
+			set_Value (COLUMNNAME_C_Country_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_Country_ID, Integer.valueOf(C_Country_ID));
+	}
+
+	/** Get Country.
+		@return Country 
+	  */
+	public int getC_Country_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_Country_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** C_Region_ID AD_Reference_ID=157 */
+	public static final int C_REGION_ID_AD_Reference_ID=157;
+	/** Set Region.
+		@param C_Region_ID 
+		Identifies a geographical Region
+	  */
+	public void setC_Region_ID (int C_Region_ID)
+	{
+		if (C_Region_ID < 1) 
+			set_Value (COLUMNNAME_C_Region_ID, null);
+		else 
+			set_Value (COLUMNNAME_C_Region_ID, Integer.valueOf(C_Region_ID));
+	}
+
+	/** Get Region.
+		@return Identifies a geographical Region
+	  */
+	public int getC_Region_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_Region_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	public I_C_TaxCategory getC_TaxCategory() throws Exception 
+    {
+        Class<?> clazz = MTable.getClass(I_C_TaxCategory.Table_Name);
+        I_C_TaxCategory result = null;
+        try	{
+	        Constructor<?> constructor = null;
+	    	constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class});
+    	    result = (I_C_TaxCategory)constructor.newInstance(new Object[] {getCtx(), new Integer(getC_TaxCategory_ID()), get_TrxName()});
+        } catch (Exception e) {
+	        log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
+	        log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
+           throw e;
+        }
+        return result;
+    }
+
+	/** Set Tax Category.
+		@param C_TaxCategory_ID 
+		Tax Category
+	  */
+	public void setC_TaxCategory_ID (int C_TaxCategory_ID)
+	{
+		if (C_TaxCategory_ID < 1)
+			 throw new IllegalArgumentException ("C_TaxCategory_ID is mandatory.");
+		set_Value (COLUMNNAME_C_TaxCategory_ID, Integer.valueOf(C_TaxCategory_ID));
+	}
+
+	/** Get Tax Category.
+		@return Tax Category
+	  */
+	public int getC_TaxCategory_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_TaxCategory_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Tax.
+		@param C_Tax_ID 
+		Tax identifier
+	  */
+	public void setC_Tax_ID (int C_Tax_ID)
+	{
+		if (C_Tax_ID < 1)
+			 throw new IllegalArgumentException ("C_Tax_ID is mandatory.");
+		set_ValueNoCheck (COLUMNNAME_C_Tax_ID, Integer.valueOf(C_Tax_ID));
+	}
+
+	/** Get Tax.
+		@return Tax identifier
+	  */
+	public int getC_Tax_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_Tax_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Description.
+		@param Description 
+		Optional short description of the record
+	  */
+	public void setDescription (String Description)
+	{
+		set_Value (COLUMNNAME_Description, Description);
+	}
+
+	/** Get Description.
+		@return Optional short description of the record
+	  */
+	public String getDescription () 
+	{
+		return (String)get_Value(COLUMNNAME_Description);
+	}
+
+	/** Set Default.
+		@param IsDefault 
+		Default value
+	  */
+	public void setIsDefault (boolean IsDefault)
+	{
+		set_Value (COLUMNNAME_IsDefault, Boolean.valueOf(IsDefault));
+	}
+
+	/** Get Default.
+		@return Default value
+	  */
+	public boolean isDefault () 
+	{
+		Object oo = get_Value(COLUMNNAME_IsDefault);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
+	/** Set Document Level.
+		@param IsDocumentLevel 
+		Tax is calculated on document level (rather than line by line)
+	  */
+	public void setIsDocumentLevel (boolean IsDocumentLevel)
+	{
+		set_Value (COLUMNNAME_IsDocumentLevel, Boolean.valueOf(IsDocumentLevel));
+	}
+
+	/** Get Document Level.
+		@return Tax is calculated on document level (rather than line by line)
+	  */
+	public boolean isDocumentLevel () 
+	{
+		Object oo = get_Value(COLUMNNAME_IsDocumentLevel);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
+	/** Set Sales Tax.
+		@param IsSalesTax 
+		This is a sales tax (i.e. not a value added tax)
+	  */
+	public void setIsSalesTax (boolean IsSalesTax)
+	{
+		set_Value (COLUMNNAME_IsSalesTax, Boolean.valueOf(IsSalesTax));
+	}
+
+	/** Get Sales Tax.
+		@return This is a sales tax (i.e. not a value added tax)
+	  */
+	public boolean isSalesTax () 
+	{
+		Object oo = get_Value(COLUMNNAME_IsSalesTax);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
+	/** Set Summary Level.
+		@param IsSummary 
+		This is a summary entity
+	  */
+	public void setIsSummary (boolean IsSummary)
+	{
+		set_Value (COLUMNNAME_IsSummary, Boolean.valueOf(IsSummary));
+	}
+
+	/** Get Summary Level.
+		@return This is a summary entity
+	  */
+	public boolean isSummary () 
+	{
+		Object oo = get_Value(COLUMNNAME_IsSummary);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
+	/** Set Tax exempt.
+		@param IsTaxExempt 
+		Business partner is exempt from tax
+	  */
+	public void setIsTaxExempt (boolean IsTaxExempt)
+	{
+		set_Value (COLUMNNAME_IsTaxExempt, Boolean.valueOf(IsTaxExempt));
+	}
+
+	/** Get Tax exempt.
+		@return Business partner is exempt from tax
+	  */
+	public boolean isTaxExempt () 
+	{
+		Object oo = get_Value(COLUMNNAME_IsTaxExempt);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
+	public I_M_Product_Category getM_Product_Category() throws Exception 
+    {
+        Class<?> clazz = MTable.getClass(I_M_Product_Category.Table_Name);
+        I_M_Product_Category result = null;
+        try	{
+	        Constructor<?> constructor = null;
+	    	constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class});
+    	    result = (I_M_Product_Category)constructor.newInstance(new Object[] {getCtx(), new Integer(getM_Product_Category_ID()), get_TrxName()});
+        } catch (Exception e) {
+	        log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
+	        log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
+           throw e;
+        }
+        return result;
+    }
+
+	/** Set Product Category.
+		@param M_Product_Category_ID Product Category	  */
+	public void setM_Product_Category_ID (int M_Product_Category_ID)
+	{
+		if (M_Product_Category_ID < 1) 
+			set_Value (COLUMNNAME_M_Product_Category_ID, null);
+		else 
+			set_Value (COLUMNNAME_M_Product_Category_ID, Integer.valueOf(M_Product_Category_ID));
+	}
+
+	/** Get Product Category.
+		@return Product Category	  */
+	public int getM_Product_Category_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_Product_Category_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	public I_M_Product getM_Product() throws Exception 
+    {
+        Class<?> clazz = MTable.getClass(I_M_Product.Table_Name);
+        I_M_Product result = null;
+        try	{
+	        Constructor<?> constructor = null;
+	    	constructor = clazz.getDeclaredConstructor(new Class[]{Properties.class, int.class, String.class});
+    	    result = (I_M_Product)constructor.newInstance(new Object[] {getCtx(), new Integer(getM_Product_ID()), get_TrxName()});
+        } catch (Exception e) {
+	        log.log(Level.SEVERE, "(id) - Table=" + Table_Name + ",Class=" + clazz, e);
+	        log.saveError("Error", "Table=" + Table_Name + ",Class=" + clazz);
+           throw e;
+        }
+        return result;
+    }
+
+	/** Set Product.
+		@param M_Product_ID Product	  */
+	public void setM_Product_ID (int M_Product_ID)
+	{
+		if (M_Product_ID < 1) 
+			set_Value (COLUMNNAME_M_Product_ID, null);
+		else 
+			set_Value (COLUMNNAME_M_Product_ID, Integer.valueOf(M_Product_ID));
+	}
+
+	/** Get Product.
+		@return Product	  */
+	public int getM_Product_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_M_Product_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Name.
+		@param Name 
+		Alphanumeric identifier of the entity
+	  */
+	public void setName (String Name)
+	{
+		if (Name == null)
+			throw new IllegalArgumentException ("Name is mandatory.");
+		set_Value (COLUMNNAME_Name, Name);
+	}
+
+	/** Get Name.
+		@return Alphanumeric identifier of the entity
+	  */
+	public String getName () 
+	{
+		return (String)get_Value(COLUMNNAME_Name);
+	}
+
+    /** Get Record ID/ColumnName
+        @return ID/ColumnName pair
+      */
+    public KeyNamePair getKeyNamePair() 
+    {
+        return new KeyNamePair(get_ID(), getName());
+    }
+
+	/** Parent_Tax_ID AD_Reference_ID=158 */
+	public static final int PARENT_TAX_ID_AD_Reference_ID=158;
+	/** Set Parent Tax.
+		@param Parent_Tax_ID 
+		Parent Tax indicates a tax that is made up of multiple taxes
+	  */
+	public void setParent_Tax_ID (int Parent_Tax_ID)
+	{
+		if (Parent_Tax_ID < 1) 
+			set_Value (COLUMNNAME_Parent_Tax_ID, null);
+		else 
+			set_Value (COLUMNNAME_Parent_Tax_ID, Integer.valueOf(Parent_Tax_ID));
+	}
+
+	/** Get Parent Tax.
+		@return Parent Tax indicates a tax that is made up of multiple taxes
+	  */
+	public int getParent_Tax_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_Parent_Tax_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Rate.
+		@param Rate 
+		Rate or Tax or Exchange
+	  */
+	public void setRate (BigDecimal Rate)
+	{
+		if (Rate == null)
+			throw new IllegalArgumentException ("Rate is mandatory.");
+		set_Value (COLUMNNAME_Rate, Rate);
+	}
+
+	/** Get Rate.
+		@return Rate or Tax or Exchange
+	  */
+	public BigDecimal getRate () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_Rate);
+		if (bd == null)
+			 return Env.ZERO;
+		return bd;
+	}
+
+	/** Set Requires Tax Certificate.
+		@param RequiresTaxCertificate 
+		This tax rate requires the Business Partner to be tax exempt
+	  */
+	public void setRequiresTaxCertificate (boolean RequiresTaxCertificate)
+	{
+		set_Value (COLUMNNAME_RequiresTaxCertificate, Boolean.valueOf(RequiresTaxCertificate));
+	}
+
+	/** Get Requires Tax Certificate.
+		@return This tax rate requires the Business Partner to be tax exempt
+	  */
+	public boolean isRequiresTaxCertificate () 
+	{
+		Object oo = get_Value(COLUMNNAME_RequiresTaxCertificate);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
+	/** SOPOType AD_Reference_ID=287 */
+	public static final int SOPOTYPE_AD_Reference_ID=287;
+	/** Both = B */
+	public static final String SOPOTYPE_Both = "B";
+	/** Sales Tax = S */
+	public static final String SOPOTYPE_SalesTax = "S";
+	/** Purchase Tax = P */
+	public static final String SOPOTYPE_PurchaseTax = "P";
+	/** Set SO/PO Type.
+		@param SOPOType 
+		Sales Tax applies to sales situations, Purchase Tax to purchase situations
+	  */
+	public void setSOPOType (String SOPOType)
+	{
+		if (SOPOType == null) throw new IllegalArgumentException ("SOPOType is mandatory");
+		if (SOPOType.equals("B") || SOPOType.equals("S") || SOPOType.equals("P")); else throw new IllegalArgumentException ("SOPOType Invalid value - " + SOPOType + " - Reference_ID=287 - B - S - P");		set_Value (COLUMNNAME_SOPOType, SOPOType);
+	}
+
+	/** Get SO/PO Type.
+		@return Sales Tax applies to sales situations, Purchase Tax to purchase situations
+	  */
+	public String getSOPOType () 
+	{
+		return (String)get_Value(COLUMNNAME_SOPOType);
+	}
+
+	/** Set Tax Indicator.
+		@param TaxIndicator 
+		Short form for Tax to be printed on documents
+	  */
+	public void setTaxIndicator (String TaxIndicator)
+	{
+		set_Value (COLUMNNAME_TaxIndicator, TaxIndicator);
+	}
+
+	/** Get Tax Indicator.
+		@return Short form for Tax to be printed on documents
+	  */
+	public String getTaxIndicator () 
+	{
+		return (String)get_Value(COLUMNNAME_TaxIndicator);
+	}
+
+	/** To_Country_ID AD_Reference_ID=156 */
+	public static final int TO_COUNTRY_ID_AD_Reference_ID=156;
+	/** Set To.
+		@param To_Country_ID 
+		Receiving Country
+	  */
+	public void setTo_Country_ID (int To_Country_ID)
+	{
+		if (To_Country_ID < 1) 
+			set_Value (COLUMNNAME_To_Country_ID, null);
+		else 
+			set_Value (COLUMNNAME_To_Country_ID, Integer.valueOf(To_Country_ID));
+	}
+
+	/** Get To.
+		@return Receiving Country
+	  */
+	public int getTo_Country_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_To_Country_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** To_Region_ID AD_Reference_ID=157 */
+	public static final int TO_REGION_ID_AD_Reference_ID=157;
+	/** Set To.
+		@param To_Region_ID 
+		Receiving Region
+	  */
+	public void setTo_Region_ID (int To_Region_ID)
+	{
+		if (To_Region_ID < 1) 
+			set_Value (COLUMNNAME_To_Region_ID, null);
+		else 
+			set_Value (COLUMNNAME_To_Region_ID, Integer.valueOf(To_Region_ID));
+	}
+
+	/** Get To.
+		@return Receiving Region
+	  */
+	public int getTo_Region_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_To_Region_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Valid from.
+		@param ValidFrom 
+		Valid from including this date (first day)
+	  */
+	public void setValidFrom (Timestamp ValidFrom)
+	{
+		if (ValidFrom == null)
+			throw new IllegalArgumentException ("ValidFrom is mandatory.");
+		set_Value (COLUMNNAME_ValidFrom, ValidFrom);
+	}
+
+	/** Get Valid from.
+		@return Valid from including this date (first day)
+	  */
+	public Timestamp getValidFrom () 
+	{
+		return (Timestamp)get_Value(COLUMNNAME_ValidFrom);
+	}
+}
\ No newline at end of file


Property changes on: contributions/253b/comxe/_Project-ID-03/patch-src/base/src/org/compiere/model/X_C_Tax.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6290
          http://adempiere.svn.sourceforge.net/adempiere/?rev=6290&view=rev
Author:   teo_sarca
Date:     2008-08-30 16:23:11 +0000 (Sat, 30 Aug 2008)

Log Message:
-----------
libero fixing:
* MRPUpdate is generating duplicate records
* MPPMRP: in case of Orders, the PP_MRP.C_BPartner_ID should be filled

Modified Paths:
--------------
    branches/stable/base/src/org/eevolution/model/MPPMRP.java
    branches/stable/base/src/org/eevolution/process/MRPUpdate.java

Modified: branches/stable/base/src/org/eevolution/model/MPPMRP.java
===================================================================
--- branches/stable/base/src/org/eevolution/model/MPPMRP.java	2008-08-30 13:49:50 UTC (rev 6289)
+++ branches/stable/base/src/org/eevolution/model/MPPMRP.java	2008-08-30 16:23:11 UTC (rev 6290)
@@ -211,6 +211,7 @@
 		mrp.setDateOrdered(ol.getDateOrdered());
 		mrp.setM_Product_ID(ol.getM_Product_ID());
 		mrp.setM_Warehouse_ID(ol.getM_Warehouse_ID());
+		mrp.setC_BPartner_ID(ol.getParent().getC_BPartner_ID());                                         
 		mrp.setDocStatus(ol.getParent().getDocStatus());                                         
 		mrp.saveEx();
 

Modified: branches/stable/base/src/org/eevolution/process/MRPUpdate.java
===================================================================
--- branches/stable/base/src/org/eevolution/process/MRPUpdate.java	2008-08-30 13:49:50 UTC (rev 6289)
+++ branches/stable/base/src/org/eevolution/process/MRPUpdate.java	2008-08-30 16:23:11 UTC (rev 6290)
@@ -12,6 +12,7 @@
  * For the text or an alternative of this public license, you may reach us    *
  * Copyright (C) 2003-2007 e-Evolution,SC. All Rights Reserved.               *
  * Contributor(s): Victor Perez http://www.e-evolution.com                           *
+ *                 Teo Sarca, http://www.arhipac.ro                                  *
  *****************************************************************************/
 
 package org.eevolution.process;
@@ -21,21 +22,24 @@
 import java.util.List;
 import java.util.logging.Level;
 
-import org.compiere.model.MOrg;
+import org.compiere.model.MNote;
+import org.compiere.model.MOrderLine;
 import org.compiere.model.MRequisition;
+import org.compiere.model.MRequisitionLine;
 import org.compiere.model.MResource;
-import org.compiere.model.MWarehouse;
+import org.compiere.model.MTable;
 import org.compiere.model.PO;
 import org.compiere.model.POResultSet;
 import org.compiere.model.Query;
 import org.compiere.process.ProcessInfoParameter;
 import org.compiere.process.SvrProcess;
-import org.compiere.util.CLogger;
 import org.compiere.util.DB;
 import org.compiere.util.Env;
 import org.compiere.util.Msg;
+import org.eevolution.model.MForecastLine;
 import org.eevolution.model.MPPMRP;
 import org.eevolution.model.MPPOrder;
+import org.eevolution.model.MPPOrderBOMLine;
 
 /**
  *	MRPUpdate
@@ -91,132 +95,66 @@
 	 */       
 	protected String doIt() throws Exception                
 	{
-		ArrayList <Object> parameters = new ArrayList();
-		StringBuffer whereClause = new StringBuffer(MResource.COLUMNNAME_ManufacturingResourceType+"='"+
-													MResource.MANUFACTURINGRESOURCETYPE_Plant+ "' AND AD_Client_ID=?");
-		parameters.add(m_AD_Client_ID);
-		
-		if (p_S_Resource_ID > 0)
-		{	
-			whereClause.append(" AND S_Resource_ID=?");
-			parameters.add(p_S_Resource_ID);
-		}	
-		
-		List <MResource> plants = new Query(getCtx(), MResource.Table_Name, whereClause.toString(), get_TrxName())
-		.setParameters(parameters)
-		.list(); 
-		
-		for(MResource plant : plants)
-		{	
-			log.info("Create MRP record to Plant: " + plant.getName());
-			parameters = new ArrayList();
-			whereClause = new StringBuffer("AD_Client_ID=?");
-			parameters.add(m_AD_Client_ID);
-			
-			if (p_AD_Org_ID > 0)
-			{	
-				whereClause.append(" AND AD_Org_ID=?");
-				parameters.add(p_AD_Org_ID);
-			}	
-			
-		
-			List <MOrg> organizations = new Query(getCtx(),MOrg.Table_Name, whereClause.toString(), get_TrxName())
-			.setParameters(parameters)
-			.list();
-			
-				for (MOrg organization :  organizations)
-				{
-					log.info("Create MRP record to Organization: " + organization.getName());
-	
-					if(p_M_Warehouse_ID==0)
-					{
-						MWarehouse[] ws = MWarehouse.getForOrg(getCtx(), p_AD_Org_ID);
-						for(MWarehouse w : ws)
-						{	 
-							log.info("Create MRP record to Warehouse: " + organization.getName());
-							if(!deleteRecord(m_AD_Client_ID,organization.get_ID(),plant.get_ID(),w.get_ID()))
-								throw new Exception(Msg.getMsg(getCtx(), "ProcessFailed"),CLogger.retrieveException());
-							if(!createRecord(m_AD_Client_ID,organization.get_ID(),plant.get_ID(),w.get_ID()))
-								throw new Exception(Msg.getMsg(getCtx(), "ProcessFailed"),CLogger.retrieveException());
-						}
-					}
-					else
-					{
-						if(!deleteRecord(m_AD_Client_ID,p_AD_Org_ID,plant.get_ID(),p_M_Warehouse_ID))
-							throw new Exception(Msg.getMsg(getCtx(), "ProcessFailed"),CLogger.retrieveException());
-						if(!createRecord(m_AD_Client_ID,p_AD_Org_ID,plant.get_ID(),p_M_Warehouse_ID))
-							throw new Exception(Msg.getMsg(getCtx(), "ProcessFailed"),CLogger.retrieveException());
-					}
-			}
-		}		
+		deleteRecords();
+		createRecords();
 		return Msg.getMsg(getCtx(), "ProcessOK");
 	} 
 
 	/**
 	 * Delete MRP records
 	 */       
-	public boolean deleteRecord(int AD_Client_ID,int AD_Org_ID, int S_Resource_ID, int M_Warehouse_ID)
+	private void deleteRecords()
 	{						               
-		String where = "";
-		String resourcewhere = "";
+		// Delete MRP records (Orders, Forecasts, Material Requisitions):
+		{
+			List<Object> params = new ArrayList<Object>();
+			String whereClause = "OrderType IN ('MOP','FCT','POR', 'SOO', 'POO') AND "+getWhereClause(params, MPPMRP.Table_Name, null);
+			executeUpdate("DELETE FROM PP_MRP WHERE "+whereClause, params);
+		}
 
-		if (AD_Org_ID > 0 )
-			where += " AND AD_Org_ID=" + AD_Org_ID;
-		if (M_Warehouse_ID > 0 )
-			where += " AND M_Warehouse_ID=" + M_Warehouse_ID;
-
-		if (S_Resource_ID > 0 )
-			resourcewhere = " AND S_Resource_ID=" + S_Resource_ID;
-
-		// Delete MRP records (Mfg. Order, Forecast, Material Requisition):
-		String sql = "DELETE FROM PP_MRP  WHERE OrderType IN ('MOP','FCT','POR') AND AD_Client_ID=" + m_AD_Client_ID + where + resourcewhere;   
-		DB.executeUpdateEx(sql, get_TrxName());
-
 		// Delete notes:
-		sql = "DELETE FROM AD_Note n WHERE AD_Table_ID = " + MPPMRP.Table_ID + " AND AD_Client_ID = " + m_AD_Client_ID;
-		if (AD_Org_ID > 0)
-			sql += " AND AD_Org_ID=" + AD_Org_ID;
-		DB.executeUpdateEx(sql, get_TrxName());
+		{
+			List<Object> params = new ArrayList<Object>();
+			String whereClause = "AD_Table_ID="+MPPMRP.Table_ID+" AND "+getWhereClause(params, MNote.Table_Name, null); 
+			executeUpdate("DELETE FROM AD_Note WHERE "+whereClause, params);
+		}
 
 		// Delete Mfg. Orders:
-		String whereClause = "DocStatus = 'DR' AND AD_Client_ID = " + m_AD_Client_ID + where;
-		if (S_Resource_ID > 0)
-			whereClause += " AND S_Resource_ID="+S_Resource_ID;
-		deletePO(MPPOrder.Table_Name, whereClause, null);
-		
-		// Delete Material Requisitions:
-		whereClause = "DocStatus = 'DR' AND AD_Client_ID = " + m_AD_Client_ID+ where;
-		deletePO(MRequisition.Table_Name, whereClause, null);
+		{
+			List<Object> params = new ArrayList<Object>();
+			String whereClause = "DocStatus='DR' AND "+getWhereClause(params, MPPOrder.Table_Name, null);
+			deletePO(MPPOrder.Table_Name, whereClause, params);
+		}
 
-		return true;                
+		// Delete Material Requisitions:
+		{
+			List<Object> params = new ArrayList<Object>();
+			String whereClause = "DocStatus='DR' AND "+getWhereClause(params, MRequisition.Table_Name, null);
+			deletePO(MRequisition.Table_Name, whereClause, params);
+		}
 	}
 
 	/**
 	 * Create MRP records
 	 */            
-	public boolean createRecord(int AD_Client_ID,int AD_Org_ID, int S_Resource_ID, int M_Warehouse_ID)
+	private void createRecords ()
 	{
-		String where = "";
-		if (AD_Org_ID > 0 )
-			where = " AND t.AD_Org_ID=" + AD_Org_ID;
-		if (M_Warehouse_ID > 0 )
-			where += " AND t.M_Warehouse_ID=" + M_Warehouse_ID;
-		
 		final String sql = "INSERT INTO PP_MRP ("
-			+"ad_org_id,created, createdby , dateordered,"
+			+"ad_org_id, created, createdby , dateordered,"
 			+"datepromised, datestart, datestartschedule, description,"
 			+"docstatus, isactive , "
 			+"m_forecastline_id, m_forecast_id,"
-			+"pp_order_id,pp_order_bomline_id,"
-			+"c_order_id,c_orderline_id,"
-			+"m_requisition_id,m_requisitionline_id,"
+			+"pp_order_id, pp_order_bomline_id,"
+			+"c_order_id, c_orderline_id,"
+			+"m_requisition_id, m_requisitionline_id,"
 			+"m_product_id, m_warehouse_id, "
 			+"pp_mrp_id, planner_id, "
-			+"qty,  typemrp, ordertype, updated, updatedby, value, "
-			+"ad_client_id, s_resource_id )";
-		
+			+"qty, typemrp, ordertype, updated, updatedby, value, "
+			+"ad_client_id, s_resource_id, c_bpartner_id )";
+
 		//
 		//Insert from M_ForecastLine
+		List<Object> params = new ArrayList<Object>();
 		String sql_insert = " SELECT t.ad_org_id,"
 			+"t.created, t.createdby , t.datepromised,"
 			+"t.datepromised, t.datepromised, t.datepromised, f.Name," 
@@ -228,14 +166,15 @@
 			+"t.m_product_id, t.m_warehouse_id," 
 			+"nextidfunc(53040,'N') , null," 
 			+"t.qty,  'D', 'FCT', t.updated, t.updatedby, f.Name," 
-			+"t.ad_client_id , "+ S_Resource_ID
+			+"t.ad_client_id , null as S_Resource_ID, null as C_BPartner_ID "
 			+" FROM M_ForecastLine t "
 			+" INNER JOIN M_Forecast f ON (f.M_Forecast_ID=t.M_Forecast_ID) "
-			+" WHERE t.Qty > 0 AND t.AD_Client_ID="+ AD_Client_ID;
-		DB.executeUpdateEx(sql + sql_insert + where , get_TrxName());
+			+" WHERE t.Qty > 0 AND "+getWhereClause(params, MForecastLine.Table_Name, "t");
+		executeUpdate(sql + sql_insert, params);
 
 		//
 		//Insert from PP_Order
+		params = new ArrayList<Object>();
 		sql_insert = " SELECT t.ad_org_id,"
 			+"t.created, t.createdby , t.datepromised,"
 			+"t.datepromised, t.datepromised, t.datepromised, t.DocumentNo," 
@@ -247,16 +186,15 @@
 			+"t.m_product_id, t.m_warehouse_id," 
 			+"nextidfunc(53040,'N') , null," 
 			+"t.QtyOrdered-t.QtyDelivered,  'S', 'MOP', t.updated, t.updatedby, t.DocumentNo," 
-			+"t.ad_client_id ,t.S_Resource_ID "
+			+"t.ad_client_id, t.S_Resource_ID, null as C_BPartner_ID "
 			+" FROM PP_Order t "
 			+" WHERE (t.QtyOrdered - t.QtyDelivered) <> 0 AND t.DocStatus IN ('IP','CO')"
-					+" AND t.AD_Client_ID = " + m_AD_Client_ID;
-		if(S_Resource_ID > 0)
-			sql_insert += " AND S_Resource_ID=" + S_Resource_ID ; 
-		DB.executeUpdateEx(sql + sql_insert + where , get_TrxName());
+			+" AND "+getWhereClause(params, MPPOrder.Table_Name, "t");
+		executeUpdate(sql + sql_insert, params);
 
 		//
 		//Insert from PP_Order_BOMLine
+		params = new ArrayList<Object>();
 		sql_insert = " SELECT t.ad_org_id,"
 			+"t.created, t.createdby , o.datepromised,"
 			+"o.datepromised, o.datepromised, o.datepromised, o.DocumentNo," 
@@ -268,17 +206,16 @@
 			+"t.m_product_id, t.m_warehouse_id," 
 			+"nextidfunc(53040,'N') , null," 
 			+"t.QtyRequiered-t.QtyDelivered,  'D', 'MOP', t.updated, t.updatedby, o.DocumentNo," 
-			+"t.ad_client_id, o.S_Resource_ID "
+			+"t.ad_client_id, o.S_Resource_ID, null as C_BPartner_ID "
 			+" FROM PP_Order_BOMLine t "
 			+" INNER JOIN PP_Order o ON (o.pp_order_id=t.pp_order_id)"
 			+" WHERE  (t.QtyRequiered-t.QtyDelivered) <> 0 AND o.DocStatus IN ('DR','IP','CO')"
-					+" AND t.AD_Client_ID = " + m_AD_Client_ID;
-		if(S_Resource_ID > 0)
-			sql_insert += " AND S_Resource_ID=" + S_Resource_ID ; 
-		DB.executeUpdateEx(sql + sql_insert + where , get_TrxName());
+			+" AND "+getWhereClause(params, MPPOrderBOMLine.Table_Name, "t");
+		executeUpdate(sql + sql_insert , params);
 
 		//
 		// Insert from C_OrderLine
+		params = new ArrayList<Object>();
 		sql_insert = " SELECT t.ad_org_id,"
 			+"t.created, t.createdby , t.datepromised,"
 			+"t.datepromised, t.datepromised, t.datepromised, o.DocumentNo," 
@@ -289,16 +226,17 @@
 			+" null, null, "
 			+"t.m_product_id, t.m_warehouse_id," 
 			+"nextidfunc(53040,'N') , null," 
-			+"t.QtyOrdered-t.QtyDelivered,  'D', 'MOP', t.updated, t.updatedby, o.DocumentNo," 
-			+"t.ad_client_id ,"+S_Resource_ID
+			+"t.QtyOrdered-t.QtyDelivered,  'D', (case when o.IsSOTrx='Y' then 'SOO' else 'POO' end), t.updated, t.updatedby, o.DocumentNo," 
+			+"t.ad_client_id , null as S_Resource_ID, o.C_BPartner_ID"
 			+" FROM C_OrderLine t"
 			+" INNER JOIN C_Order o  ON (o.c_order_id=t.c_order_id)"
 			+" WHERE  (t.QtyOrdered - t.QtyDelivered) <> 0 AND o.DocStatus IN ('IP','CO')"
-					+" AND t.AD_Client_ID = " + m_AD_Client_ID; 
-		DB.executeUpdateEx(sql + sql_insert + where , get_TrxName());
+			+" AND "+getWhereClause(params, MOrderLine.Table_Name, "t"); 
+		executeUpdate(sql + sql_insert, params);
 
 		//
 		// Insert from M_RequisitionLine
+		params = new ArrayList<Object>();
 		sql_insert = " SELECT rl.ad_org_id,"
 			+"rl.created, rl.createdby , t.daterequired,"
 			+" t.daterequired,  t.daterequired,  t.daterequired, t.DocumentNo," 
@@ -310,22 +248,76 @@
 			+"rl.m_product_id, t.m_warehouse_id," 
 			+"nextidfunc(53040, 'N') , null," 
 			+"rl.Qty, 'S', 'POR', rl.updated, rl.updatedby, t.DocumentNo," 
-			+"rl.ad_client_id , "+ S_Resource_ID
+			+"rl.ad_client_id , null as S_Resource_ID, null as C_BPartner_ID "
 			+" FROM M_RequisitionLine rl"
 			+" INNER JOIN M_Requisition t ON (rl.m_requisition_id=t.m_requisition_id)"
-			+" WHERE rl.Qty > 0 AND t.DocStatus IN ('CL') AND t.AD_Client_ID = " + m_AD_Client_ID; 
-		DB.executeUpdateEx(sql + sql_insert + where , get_TrxName());
+			+" WHERE rl.Qty > 0 AND t.DocStatus IN ('CL')"
+			+" AND "+getWhereClause(params, MRequisitionLine.Table_Name, "rl"); 
+		executeUpdate(sql + sql_insert, params);
+	}
+	
+	private String getWhereClause(List<Object> params, String tableName, String tableAlias)
+	{
+		boolean filterWarehouse = MTable.get(getCtx(), tableName).getColumn("M_Warehouse_ID") != null;
+		boolean filterResource = MTable.get(getCtx(), tableName).getColumn("S_Resource_ID") != null;
+		String alias = (tableAlias != null ? tableAlias : tableName) + ".";
+		StringBuffer sb = new StringBuffer();
+		//
+		// AD_Client
+		sb.append(alias).append("AD_Client_ID=?");
+		params.add(m_AD_Client_ID);
+		//
+		// AD_Org
+		if (p_AD_Org_ID > 0) {
+			sb.append(" AND ").append(alias).append("AD_Org_ID=? ");
+			params.add(p_AD_Org_ID);
+		}
+		//
+		// M_Warehouse
+		if (filterWarehouse) {
+			if (p_M_Warehouse_ID > 0) {
+				sb.append(" AND ").append(alias).append("M_Warehouse_ID=?");
+				params.add(p_M_Warehouse_ID);
+			}
+		}
+		//
+		// Resource
+		if (filterResource) {
+			if (p_S_Resource_ID > 0) {
+				sb.append(" AND ").append(alias).append("S_Resource_ID=? ");
+				params.add(p_S_Resource_ID);
+			}
+			else {
+				sb.append(" AND EXISTS (SELECT 1 FROM S_Resource zz WHERE ")
+					.append("zz."+MResource.COLUMNNAME_ManufacturingResourceType+"=?")
+					.append(" AND zz.AD_Client_ID="+alias+"AD_Client_ID")
+					.append(") ");
+				params.add(MResource.MANUFACTURINGRESOURCETYPE_Plant);
+			}
+		}
+		//
+		return sb.toString();
+	}
+	
+	private void executeUpdate(String sql, List<Object> params)
+	{
+		Object[] pa = null;
+		if (params != null)
+			pa = params.toArray(new Object[params.size()]);
+		else
+			pa = new Object[]{};
+		//
+		int no = DB.executeUpdateEx(sql, pa, get_TrxName());
+		log.fine("#"+no+" -- "+sql);
+	}
 
-		return true;
-	}   
 
-	
-	private void deletePO(String tableName, String whereClause, Object[] params)
+	private void deletePO(String tableName, String whereClause, List<Object> params)
 	{
 		// TODO: refactor this method and move it to org.compiere.model.Query class
 		POResultSet<PO> rs = new Query(getCtx(), tableName, whereClause, get_TrxName())
-									.setParameters(params)
-									.scroll();
+		.setParameters(params)
+		.scroll();
 		try {
 			while(rs.hasNext()) {
 				rs.next().deleteEx(true);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6280
          http://adempiere.svn.sourceforge.net/adempiere/?rev=6280&view=rev
Author:   trifonnt
Date:     2008-08-29 21:04:08 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------
version 320.0.8 of core plug-in

Modified Paths:
--------------
    contributions/253b/comxe/_Project-ID-03/.classpath
    contributions/253b/comxe/_Project-ID-03/ReadMe.txt
    contributions/253b/comxe/_Project-ID-03/build.xml
    contributions/253b/comxe/_Project-ID-03/druid/_Project-ID-03.druid
    contributions/253b/comxe/_Project-ID-03/plugins/src/org.adempiere.importer.tmp/doc/changeLog.txt
    contributions/253b/comxe/_Project-ID-03/plugins/src/org.adempiere.importer.tmp/plugin.xml
    contributions/253b/comxe/_Project-ID-03/plugins/src/org.adempiere.importer.tmp/source/org/adempiere/importer/tmp/TEMPLATEImporter.java
    contributions/253b/comxe/_Project-ID-03/sql/AlterTable-Oracle-ID-001.sql
    contributions/253b/comxe/_Project-ID-03/sql/AlterTable-Postgre-ID-001.sql
    contributions/253b/comxe/_Project-ID-03/xml/model/Model-ID-001.xml
    contributions/253b/comxe/_Project-ID-03/xml/view/View-ID-001.xml
    contributions/253b/comxe/_Project-ID-03/xml/view/view-tax.xml
    contributions/253b/comxe/_Project-ID-TEMPLATE/.classpath
    contributions/253b/comxe/_Project-ID-TEMPLATE/build.xml
    contributions/253b/comxe/_Project-ID-TEMPLATE/plugins/src/org.adempiere.importer.tmp/doc/changeLog.txt
    contributions/253b/comxe/_Project-ID-TEMPLATE/plugins/src/org.adempiere.importer.tmp/plugin.xml
    contributions/253b/comxe/_Project-ID-TEMPLATE/plugins/src/org.adempiere.importer.tmp/source/org/adempiere/importer/tmp/TEMPLATEImporter.java
    contributions/253b/comxe/_ad2xml/build.xml
    contributions/253b/comxe/_xml2ad/plugins/src/org.adempiere.importer.yahoostore/doc/changeLog.txt
    contributions/253b/comxe/_xml2ad/plugins/src/org.adempiere.importer.yahoostore/plugin.xml
    contributions/253b/comxe/_xml2ad/plugins/src/org.adempiere.importer.yahoostore/source/org/adempiere/importer/yahoostore/YahooStoreOrderImporter.java
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.core/doc/changeLog.txt
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.core/org/compiere/compilo/importer/core/TableImporter.java
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.core/plugin.xml
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/doc/changeLog.txt
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/plugin.xml
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_ClientImporter.java
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_FieldGroupImporter.java
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_ImpFormatImporter.java
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_LanguageImporter.java
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_MessageImporter.java
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_PrintFormatImporter.java
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_PrintTableFormatImporter.java
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_ReportViewImporter.java
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_RoleImporter.java
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_SchedulerImporter.java
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_UserImporter.java
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/C_BP_GroupImporter.java
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/C_BPartnerImporter.java
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/M_Product_CategoryImporter.java
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/PA_ReportColumnSetImporter.java
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/PA_ReportImporter.java
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/PA_ReportLineSetImporter.java

Added Paths:
-----------
    contributions/253b/comxe/_Project-ID-03/data/
    contributions/253b/comxe/_Project-ID-03/plugins/org.adempiere.importer.tmp-320.0.8.zip
    contributions/253b/comxe/_Project-ID-03/plugins/org.adempiere.importer.yahoostore-320.0.8.zip
    contributions/253b/comxe/_Project-ID-03/plugins/org.compiere.compilo.importer.core-320.0.8.zip
    contributions/253b/comxe/_Project-ID-03/plugins/org.compiere.compilo.importer.standard-320.0.19.zip
    contributions/253b/comxe/_Project-ID-03/xml/data/tpl/C_Tax.xml.tpl
    contributions/253b/comxe/_Project-ID-03/xml/data/tpl/C_TaxCategory.xml.tpl
    contributions/253b/comxe/_Project-ID-03/xml/data/tpl/M_Product_Category.xml.tpl
    contributions/253b/comxe/_Project-ID-TEMPLATE/plugins/org.adempiere.importer.yahoostore-320.0.8.zip
    contributions/253b/comxe/_Project-ID-TEMPLATE/plugins/org.compiere.compilo.importer.core-320.0.8.zip
    contributions/253b/comxe/_Project-ID-TEMPLATE/plugins/org.compiere.compilo.importer.standard-320.0.19.zip
    contributions/253b/comxe/_Project-ID-TEMPLATE/xml/data/tpl/C_Tax.xml.tpl
    contributions/253b/comxe/_Project-ID-TEMPLATE/xml/data/tpl/C_TaxCategory.xml.tpl
    contributions/253b/comxe/_Project-ID-TEMPLATE/xml/data/tpl/M_Product_Category.xml.tpl
    contributions/253b/comxe/_ad2xml/xml/compiere/data/C_Tax.xml
    contributions/253b/comxe/_xml2ad/plugins/org.adempiere.importer.yahoostore-320.0.8.zip
    contributions/253b/comxe/_xml2ad/plugins/org.compiere.compilo.importer.core-320.0.8.zip
    contributions/253b/comxe/_xml2ad/plugins/org.compiere.compilo.importer.standard-320.0.19.zip
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/C_TaxCategoryImporter.java
    contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/C_TaxImporter.java

Removed Paths:
-------------
    contributions/253b/comxe/_Project-ID-03/plugins/org.adempiere.importer.tmp-320.0.5.zip
    contributions/253b/comxe/_Project-ID-03/plugins/org.adempiere.importer.yahoostore-320.0.4.zip
    contributions/253b/comxe/_Project-ID-03/plugins/org.adempiere.importer.yahoostore-320.0.7.zip
    contributions/253b/comxe/_Project-ID-03/plugins/org.compiere.compilo.importer.core-320.0.7.zip
    contributions/253b/comxe/_Project-ID-03/plugins/org.compiere.compilo.importer.standard-320.0.18.zip
    contributions/253b/comxe/_Project-ID-03/xml/data/M_Product_Category.xml
    contributions/253b/comxe/_Project-ID-TEMPLATE/plugins/org.adempiere.importer.yahoostore-320.0.4.zip
    contributions/253b/comxe/_Project-ID-TEMPLATE/plugins/org.adempiere.importer.yahoostore-320.0.7.zip
    contributions/253b/comxe/_Project-ID-TEMPLATE/plugins/org.compiere.compilo.importer.core-320.0.7.zip
    contributions/253b/comxe/_Project-ID-TEMPLATE/plugins/org.compiere.compilo.importer.standard-320.0.17.zip
    contributions/253b/comxe/_Project-ID-TEMPLATE/xml/data/M_Product_Category.xml
    contributions/253b/comxe/_ad2xml/result/compiere/view/view-part.xml

Modified: contributions/253b/comxe/_Project-ID-03/.classpath
===================================================================
--- contributions/253b/comxe/_Project-ID-03/.classpath	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_Project-ID-03/.classpath	2008-08-29 21:04:08 UTC (rev 6280)
@@ -13,7 +13,7 @@
 	<classpathentry kind="lib" path="lib/jxp.jar"/>
 	<classpathentry kind="lib" path="lib/log4j.jar"/>
 	<classpathentry kind="lib" path="lib/xml-apis.jar"/>
-	<classpathentry kind="lib" path="plugins/org.compiere.compilo.importer.core-320.0.7.zip"/>
+	<classpathentry kind="lib" path="plugins/org.compiere.compilo.importer.core-320.0.8.zip"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/base"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/looks"/>
 	<classpathentry kind="lib" path="/tools/lib/barbecue-1.1.jar"/>

Modified: contributions/253b/comxe/_Project-ID-03/ReadMe.txt
===================================================================
--- contributions/253b/comxe/_Project-ID-03/ReadMe.txt	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_Project-ID-03/ReadMe.txt	2008-08-29 21:04:08 UTC (rev 6280)
@@ -61,7 +61,16 @@
 
 9) If you would like to import example records, please execute:
 "build-ID-001.[bat|sh] imp_AD_Language"
+"build-ID-001.[bat|sh] imp_AD_Client"
+"build-ID-001.[bat|sh] imp_M_Product_Category"
+"build-ID-001.[bat|sh] imp_C_TaxCategory"
+"build-ID-001.[bat|sh] imp_C_Tax"
 
+10) Notes
+Alternate way to handle different tax rates.
+Create one tax category called "MwSt. Standard" (for 19%) and one called "MwSt. ermobigt" (for 7%).
+Then we create the tax rates for it.
 
+
 Enjoy new functionality.
 Records now should be imported into Adempiere/Compiere Application Dictionary.
\ No newline at end of file

Modified: contributions/253b/comxe/_Project-ID-03/build.xml
===================================================================
--- contributions/253b/comxe/_Project-ID-03/build.xml	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_Project-ID-03/build.xml	2008-08-29 21:04:08 UTC (rev 6280)
@@ -467,6 +467,18 @@
 		</antcall>
 	</target>
 	
+	<target name="imp_C_TaxCategory">
+		<antcall target="imp-xxx">
+			<param name="xml.file" value="C_TaxCategory.xml" />
+		</antcall>
+	</target>
+
+	<target name="imp_C_Tax">
+		<antcall target="imp-xxx">
+			<param name="xml.file" value="C_Tax.xml" />
+		</antcall>
+	</target>
+	
 	<target name="imp_">
 		<antcall target="imp-xxx">
 			<param name="xml.file" value=".xml" />

Modified: contributions/253b/comxe/_Project-ID-03/druid/_Project-ID-03.druid
===================================================================
--- contributions/253b/comxe/_Project-ID-03/druid/_Project-ID-03.druid	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_Project-ID-03/druid/_Project-ID-03.druid	2008-08-29 21:04:08 UTC (rev 6280)
@@ -2,8 +2,8 @@
 
 <project version="2">
 	<attribs>
-		<attrib name="build">680</attrib>
-		<attrib name="serial">261769</attrib>
+		<attrib name="build">685</attrib>
+		<attrib name="serial">263007</attrib>
 	</attribs>
 	<database>
 		<attribs>
@@ -177,6 +177,17 @@
 					</references>
 				</comap>
 			</GenericGenModule>
+			<SummaryGenModule>
+				<alterOracle>
+					<output>./_Project-ID-03/sql/AlterTable-Oracle-ID-001-part.sql</output>
+				</alterOracle>
+				<alterPostgre>
+					<output>./_Project-ID-03/sql/AlterTable-Postgre-ID-001-part.sql</output>
+				</alterPostgre>
+				<alter>
+					<output>./_Project-ID-TEMPLATE/sql/AlterTable-Oracle-ID-001-part.sql</output>
+				</alter>
+			</SummaryGenModule>
 			<SqlGenModule>
 				<oraSql>
 					<order>s</order>
@@ -228,24 +239,13 @@
 					</sqlMapping>
 				</pgSql>
 			</SqlGenModule>
-			<SummaryGenModule>
-				<alterOracle>
-					<output>./_Project-ID-03/sql/AlterTable-Oracle-ID-001-part.sql</output>
-				</alterOracle>
-				<alterPostgre>
-					<output>./_Project-ID-03/sql/AlterTable-Postgre-ID-001-part.sql</output>
-				</alterPostgre>
-				<alter>
-					<output>./_Project-ID-TEMPLATE/sql/AlterTable-Oracle-ID-001-part.sql</output>
-				</alter>
-			</SummaryGenModule>
 		</modsConfig>
 		<modsUsage>
 			<module name="SummaryGenModule.view"/>
 			<module name="SummaryGenModule.alterOracle"/>
 			<module name="GenericGenModule.comap"/>
+			<module name="SummaryGenModule.alterPostgre"/>
 			<module name="SummaryGenModule.alter"/>
-			<module name="SummaryGenModule.alterPostgre"/>
 			<module name="SqlGenModule.pgSql"/>
 			<module name="SqlGenModule.oraSql"/>
 		</modsUsage>
@@ -2463,6 +2463,15 @@
 				</attribs>
 				<modsConfig/>
 			</query>
+			<query>
+				<attribs>
+					<attrib name="name">-UnNamed-</attrib>
+					<attrib name="sqlCode">SELECT * 
+FROM C_Tax 
+WHERE Name Like '%'</attrib>
+				</attribs>
+				<modsConfig/>
+			</query>
 		</queries>
 		<erViews/>
 		<objects>
@@ -2511,7 +2520,17 @@
 					<attribs>
 						<attrib name="name">Compiere-3.0.0</attrib>
 					</attribs>
-					<modsConfig/>
+					<modsConfig>
+						<GenericGenModule>
+							<comap>
+								<IncludedInDataXML>N</IncludedInDataXML>
+								<IncludedInCreateSQL>N</IncludedInCreateSQL>
+								<IncludedInModelXML>N</IncludedInModelXML>
+								<IncludedInAlterSQL>N</IncludedInAlterSQL>
+								<IncludedInViewXML>N</IncludedInViewXML>
+							</comap>
+						</GenericGenModule>
+					</modsConfig>
 					<table>
 						<vars>
 							<list>
@@ -2625,6 +2644,162 @@
 						</field>
 					</table>
 				</folder>
+				<table>
+					<vars>
+						<list>
+							<header>
+								<elem>name</elem>
+								<elem>type</elem>
+								<elem>value</elem>
+								<elem>descr</elem>
+							</header>
+						</list>
+					</vars>
+					<triggers/>
+					<rules/>
+					<attribs>
+						<attrib name="comment"/>
+						<attrib name="name">C_Tax</attrib>
+						<attrib name="id">261771</attrib>
+						<attrib name="schema"/>
+						<attrib name="tempPK"/>
+						<attrib name="tempFK"/>
+						<attrib name="tempOther"/>
+						<attrib name="sqlCommands"/>
+					</attribs>
+					<modsConfig>
+						<GenericGenModule>
+							<comap>
+								<Name/>
+							</comap>
+						</GenericGenModule>
+					</modsConfig>
+					<field>
+						<fieldAttribs>
+							<attribs>
+								<attrib name="17">false</attrib>
+								<attrib name="16">false</attrib>
+								<attrib name="15">false</attrib>
+								<attrib name="339"/>
+								<attrib name="338">false</attrib>
+							</attribs>
+						</fieldAttribs>
+						<attribs>
+							<attrib name="comment"/>
+							<attrib name="matchType">s</attrib>
+							<attrib name="refField">261218</attrib>
+							<attrib name="name">M_Product_Category_ID</attrib>
+							<attrib name="id">261772</attrib>
+							<attrib name="onDelete">n</attrib>
+							<attrib name="onUpdate">n</attrib>
+							<attrib name="refTable">261217</attrib>
+							<attrib name="type">0</attrib>
+						</attribs>
+						<modsConfig>
+							<GenericGenModule>
+								<comap>
+									<Name>Product Category</Name>
+									<AD_Reference_Name>Table Direct</AD_Reference_Name>
+									<IsMandatory>N</IsMandatory>
+									<AD_Element_Name>M_Product_Category_ID</AD_Element_Name>
+								</comap>
+							</GenericGenModule>
+						</modsConfig>
+					</field>
+					<field>
+						<fieldAttribs>
+							<attribs>
+								<attrib name="17">false</attrib>
+								<attrib name="16">false</attrib>
+								<attrib name="15">false</attrib>
+								<attrib name="339"/>
+								<attrib name="338">false</attrib>
+							</attribs>
+						</fieldAttribs>
+						<attribs>
+							<attrib name="comment"/>
+							<attrib name="matchType">s</attrib>
+							<attrib name="refField">261947</attrib>
+							<attrib name="name">M_Product_ID</attrib>
+							<attrib name="id">261945</attrib>
+							<attrib name="onDelete">n</attrib>
+							<attrib name="onUpdate">n</attrib>
+							<attrib name="refTable">261946</attrib>
+							<attrib name="type">0</attrib>
+						</attribs>
+						<modsConfig>
+							<GenericGenModule>
+								<comap>
+									<Name>Product</Name>
+									<AD_Reference_Name>Table Direct</AD_Reference_Name>
+									<AD_Element_Name>M_Product_ID</AD_Element_Name>
+								</comap>
+							</GenericGenModule>
+						</modsConfig>
+					</field>
+					<field>
+						<fieldAttribs>
+							<attribs>
+								<attrib name="17">false</attrib>
+								<attrib name="16">false</attrib>
+								<attrib name="15">false</attrib>
+								<attrib name="339"/>
+								<attrib name="338">false</attrib>
+							</attribs>
+						</fieldAttribs>
+						<attribs>
+							<attrib name="comment"/>
+							<attrib name="matchType">s</attrib>
+							<attrib name="refField">262473</attrib>
+							<attrib name="name">C_BP_Group_ID</attrib>
+							<attrib name="id">262651</attrib>
+							<attrib name="onDelete">n</attrib>
+							<attrib name="onUpdate">n</attrib>
+							<attrib name="refTable">262472</attrib>
+							<attrib name="type">0</attrib>
+						</attribs>
+						<modsConfig>
+							<GenericGenModule>
+								<comap>
+									<Name>B.Parther Group</Name>
+									<AD_Reference_Name>Table Direct</AD_Reference_Name>
+									<AD_Element_Name>C_BP_Group_ID</AD_Element_Name>
+								</comap>
+							</GenericGenModule>
+						</modsConfig>
+					</field>
+					<field>
+						<fieldAttribs>
+							<attribs>
+								<attrib name="17">false</attrib>
+								<attrib name="16">false</attrib>
+								<attrib name="15">false</attrib>
+								<attrib name="339"/>
+								<attrib name="338">false</attrib>
+							</attribs>
+						</fieldAttribs>
+						<attribs>
+							<attrib name="comment"/>
+							<attrib name="matchType">s</attrib>
+							<attrib name="refField">247924</attrib>
+							<attrib name="name">C_BPartner_ID</attrib>
+							<attrib name="id">262296</attrib>
+							<attrib name="onDelete">n</attrib>
+							<attrib name="onUpdate">n</attrib>
+							<attrib name="refTable">247923</attrib>
+							<attrib name="type">0</attrib>
+						</attribs>
+						<modsConfig>
+							<GenericGenModule>
+								<comap>
+									<Name>Business Partner</Name>
+									<AD_Reference_Name>Table Direct</AD_Reference_Name>
+									<AD_Element_Name>C_BPartner_ID</AD_Element_Name>
+								</comap>
+							</GenericGenModule>
+						</modsConfig>
+					</field>
+				</table>
 			</folder>
 			<folder>
 				<attribs>
@@ -3456,6 +3631,109 @@
 						<modsConfig/>
 					</field>
 				</table>
+				<table>
+					<vars>
+						<list>
+							<header>
+								<elem>name</elem>
+								<elem>type</elem>
+								<elem>value</elem>
+								<elem>descr</elem>
+							</header>
+						</list>
+					</vars>
+					<triggers/>
+					<rules/>
+					<attribs>
+						<attrib name="comment"/>
+						<attrib name="name">M_Product</attrib>
+						<attrib name="id">261946</attrib>
+						<attrib name="schema"/>
+						<attrib name="tempPK"/>
+						<attrib name="tempFK"/>
+						<attrib name="tempOther"/>
+						<attrib name="sqlCommands"/>
+					</attribs>
+					<modsConfig/>
+					<field>
+						<fieldAttribs>
+							<attribs>
+								<attrib name="17">false</attrib>
+								<attrib name="16">false</attrib>
+								<attrib name="15">true</attrib>
+								<attrib name="339"/>
+								<attrib name="338">false</attrib>
+							</attribs>
+						</fieldAttribs>
+						<attribs>
+							<attrib name="comment"/>
+							<attrib name="matchType">s</attrib>
+							<attrib name="refField">0</attrib>
+							<attrib name="name">M_Product_ID</attrib>
+							<attrib name="id">261947</attrib>
+							<attrib name="onDelete">n</attrib>
+							<attrib name="onUpdate">n</attrib>
+							<attrib name="refTable">0</attrib>
+							<attrib name="type">463</attrib>
+						</attribs>
+						<modsConfig>
+							<GenericGenModule>
+								<comap>
+									<IncludeInAlterSQL>N</IncludeInAlterSQL>
+									<IncludeInXML>N</IncludeInXML>
+								</comap>
+							</GenericGenModule>
+						</modsConfig>
+					</field>
+				</table>
+				<table>
+					<vars>
+						<list>
+							<header>
+								<elem>name</elem>
+								<elem>type</elem>
+								<elem>value</elem>
+								<elem>descr</elem>
+							</header>
+						</list>
+					</vars>
+					<triggers/>
+					<rules/>
+					<attribs>
+						<attrib name="comment"/>
+						<attrib name="name">C_BP_Group</attrib>
+						<attrib name="id">262472</attrib>
+						<attrib name="schema"/>
+						<attrib name="tempPK"/>
+						<attrib name="tempFK"/>
+						<attrib name="tempOther"/>
+						<attrib name="sqlCommands"/>
+					</attribs>
+					<modsConfig/>
+					<field>
+						<fieldAttribs>
+							<attribs>
+								<attrib name="17">false</attrib>
+								<attrib name="16">false</attrib>
+								<attrib name="15">true</attrib>
+								<attrib name="339"/>
+								<attrib name="338">false</attrib>
+							</attribs>
+						</fieldAttribs>
+						<attribs>
+							<attrib name="comment"/>
+							<attrib name="matchType">s</attrib>
+							<attrib name="refField">0</attrib>
+							<attrib name="name">C_BP_Group_ID</attrib>
+							<attrib name="id">262473</attrib>
+							<attrib name="onDelete">n</attrib>
+							<attrib name="onUpdate">n</attrib>
+							<attrib name="refTable">0</attrib>
+							<attrib name="type">463</attrib>
+						</attribs>
+						<modsConfig/>
+					</field>
+				</table>
 			</folder>
 			<folder>
 				<attribs>
@@ -3958,8 +4236,8 @@
 						<modsConfig>
 							<GenericGenModule>
 								<comap>
+									<IsParent>Y</IsParent>
 									<AD_Reference_Name>ID</AD_Reference_Name>
-									<IsParent>Y</IsParent>
 									<IsMandatory>Y</IsMandatory>
 								</comap>
 							</GenericGenModule>
@@ -4335,8 +4613,8 @@
 						<modsConfig>
 							<GenericGenModule>
 								<comap>
+									<IsParent>Y</IsParent>
 									<AD_Reference_Name>ID</AD_Reference_Name>
-									<IsParent>Y</IsParent>
 								</comap>
 							</GenericGenModule>
 						</modsConfig>
@@ -5319,7 +5597,11 @@
 					<modsConfig>
 						<GenericGenModule>
 							<comap>
+								<IncludedInDataXML>N</IncludedInDataXML>
 								<IncludedInCreateSQL>N</IncludedInCreateSQL>
+								<IncludedInModelXML>N</IncludedInModelXML>
+								<IncludedInAlterSQL>N</IncludedInAlterSQL>
+								<IncludedInViewXML>N</IncludedInViewXML>
 							</comap>
 						</GenericGenModule>
 					</modsConfig>


Property changes on: contributions/253b/comxe/_Project-ID-03/plugins/org.adempiere.importer.tmp-320.0.8.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: contributions/253b/comxe/_Project-ID-03/plugins/org.adempiere.importer.yahoostore-320.0.8.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: contributions/253b/comxe/_Project-ID-03/plugins/org.compiere.compilo.importer.core-320.0.8.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: contributions/253b/comxe/_Project-ID-03/plugins/org.compiere.compilo.importer.standard-320.0.19.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: contributions/253b/comxe/_Project-ID-03/plugins/src/org.adempiere.importer.tmp/doc/changeLog.txt
===================================================================
--- contributions/253b/comxe/_Project-ID-03/plugins/src/org.adempiere.importer.tmp/doc/changeLog.txt	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_Project-ID-03/plugins/src/org.adempiere.importer.tmp/doc/changeLog.txt	2008-08-29 21:04:08 UTC (rev 6280)
@@ -1,4 +1,8 @@
-_Project-ID-TEMPLATE
+_Project-ID-03
+
+320.0.8 Adempiere compatible
+  * Migrated to core plug-in version 320.0.8
+  
 320.0.7 Adempiere compatible
   * Migrated to core plug-in version 320.0.7
 

Modified: contributions/253b/comxe/_Project-ID-03/plugins/src/org.adempiere.importer.tmp/plugin.xml
===================================================================
--- contributions/253b/comxe/_Project-ID-03/plugins/src/org.adempiere.importer.tmp/plugin.xml	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_Project-ID-03/plugins/src/org.adempiere.importer.tmp/plugin.xml	2008-08-29 21:04:08 UTC (rev 6280)
@@ -3,12 +3,12 @@
 <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.4" "http://jpf.sourceforge.net/plugin_0_4.dtd">
 
 <plugin id="org.adempiere.importer.tmp" 
-        version="320.0.7" 
+        version="320.0.8" 
 >
 	
 	<requires>
 		<import plugin-id="org.compiere.compilo.importer.core"
-		        plugin-version="320.0.7" />
+		        plugin-version="320.0.8" />
 	</requires>	
 	
 	<runtime>

Modified: contributions/253b/comxe/_Project-ID-03/plugins/src/org.adempiere.importer.tmp/source/org/adempiere/importer/tmp/TEMPLATEImporter.java
===================================================================
--- contributions/253b/comxe/_Project-ID-03/plugins/src/org.adempiere.importer.tmp/source/org/adempiere/importer/tmp/TEMPLATEImporter.java	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_Project-ID-03/plugins/src/org.adempiere.importer.tmp/source/org/adempiere/importer/tmp/TEMPLATEImporter.java	2008-08-29 21:04:08 UTC (rev 6280)
@@ -45,7 +45,6 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
-import org.w3c.dom.Text;
 
 public class TEMPLATEImporter extends TableImporter {
 
@@ -207,16 +206,6 @@
 		result.appendChild(createNewTextElement("result", String.valueOf( resultSave ), outDocument));
 		outElement.appendChild(result);
 	}
-
-	private Element createNewTextElement(String elementName, String textNodeValue, Document outDocument) {
-		Element newElement = outDocument.createElement(elementName);
-		
-		Text newText = outDocument.createTextNode(textNodeValue);
-		
-		newElement.appendChild(newText);
-		
-		return newElement;
-	}
 	
 	/*
 	public static X_IMP_ProcessorParameter getByIMP_Processor_IDandValue (Properties ctx, int IMP_Processor_ID, String Value, String trxName) throws Exception

Modified: contributions/253b/comxe/_Project-ID-03/sql/AlterTable-Oracle-ID-001.sql
===================================================================
--- contributions/253b/comxe/_Project-ID-03/sql/AlterTable-Oracle-ID-001.sql	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_Project-ID-03/sql/AlterTable-Oracle-ID-001.sql	2008-08-29 21:04:08 UTC (rev 6280)
@@ -8,3 +8,28 @@
 --- EVERY SQL STATEMENT must be separated from other by ';' ---
 ---------------------------------------------------------------
 
+--- Table: C_Tax ---------------------------------------------------------------
+ALTER TABLE C_Tax 
+ADD M_Product_Category_ID NUMBER(10,0);
+
+ALTER TABLE C_Tax 
+ADD CONSTRAINT Tax_Product_Category_ID FOREIGN KEY(M_Product_Category_ID)  REFERENCES M_Product_Category(M_Product_Category_ID);
+
+ALTER TABLE C_Tax 
+ADD M_Product_ID NUMBER(10,0);
+
+ALTER TABLE C_Tax 
+ADD CONSTRAINT Tax_M_Product_ID FOREIGN KEY(M_Product_ID)  REFERENCES M_Product(M_Product_ID);
+
+ALTER TABLE C_Tax 
+ADD C_BP_Group_ID NUMBER(10,0);
+
+ALTER TABLE C_Tax 
+ADD CONSTRAINT Tax_C_BP_Group_ID FOREIGN KEY(C_BP_Group_ID)  REFERENCES C_BP_Group(C_BP_Group_ID);
+
+ALTER TABLE C_Tax 
+ADD C_BPartner_ID NUMBER(10,0);
+
+ALTER TABLE C_Tax 
+ADD CONSTRAINT Tax_C_BPartner_ID FOREIGN KEY(C_BPartner_ID)  REFERENCES C_BPartner(C_BPartner_ID);
+

Modified: contributions/253b/comxe/_Project-ID-03/sql/AlterTable-Postgre-ID-001.sql
===================================================================
--- contributions/253b/comxe/_Project-ID-03/sql/AlterTable-Postgre-ID-001.sql	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_Project-ID-03/sql/AlterTable-Postgre-ID-001.sql	2008-08-29 21:04:08 UTC (rev 6280)
@@ -8,3 +8,27 @@
 --- EVERY SQL STATEMENT must be separated from other by ';' ---
 ---------------------------------------------------------------
 
+--- Table: C_Tax ---------------------------------------------------------------
+ALTER TABLE C_Tax 
+ADD COLUMN M_Product_Category_ID NUMERIC(10);
+
+ALTER TABLE C_Tax 
+ADD CONSTRAINT Tax_M_Product_Category_ID FOREIGN KEY(M_Product_Category_ID)  REFERENCES M_Product_Category(M_Product_Category_ID);
+
+ALTER TABLE C_Tax 
+ADD COLUMN M_Product_ID NUMERIC(10);
+
+ALTER TABLE C_Tax 
+ADD CONSTRAINT Tax_M_Product_ID FOREIGN KEY(M_Product_ID)  REFERENCES M_Product(M_Product_ID);
+
+ALTER TABLE C_Tax 
+ADD COLUMN C_BP_Group_ID NUMERIC(10);
+
+ALTER TABLE C_Tax 
+ADD CONSTRAINT Tax_C_BP_Group_ID FOREIGN KEY(C_BP_Group_ID)  REFERENCES C_BP_Group(C_BP_Group_ID);
+
+ALTER TABLE C_Tax 
+ADD COLUMN C_BPartner_ID NUMERIC(10);
+
+ALTER TABLE C_Tax 
+ADD CONSTRAINT Tax_C_BPartner_ID FOREIGN KEY(C_BPartner_ID)  REFERENCES C_BPartner(C_BPartner_ID);

Deleted: contributions/253b/comxe/_Project-ID-03/xml/data/M_Product_Category.xml
===================================================================
--- contributions/253b/comxe/_Project-ID-03/xml/data/M_Product_Category.xml	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_Project-ID-03/xml/data/M_Product_Category.xml	2008-08-29 21:04:08 UTC (rev 6280)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<compieredata>
-
-<!-- _____________________________________ Product Category _____________________________________ -->
-<!-- Product Category: ""
--->
-
-	<M_Product_Category>
-		<AD_Client_Value>GardenWorld</AD_Client_Value>
-		<AD_Org_Value>0</AD_Org_Value>
-		<CreatedBy_Name>GardenWorldAdmin</CreatedBy_Name>
-		<IsActive>Y</IsActive>
-		<Name>Standard-test</Name>
-		<Value>Standard-test</Value>
-		<IsDefault>N</IsDefault>
-		<IsSelfService>Y</IsSelfService>
-		<PlannedMargin>0.0</PlannedMargin>
-	</M_Product_Category>
-	 
-</compieredata>
\ No newline at end of file

Added: contributions/253b/comxe/_Project-ID-03/xml/data/tpl/C_Tax.xml.tpl
===================================================================
--- contributions/253b/comxe/_Project-ID-03/xml/data/tpl/C_Tax.xml.tpl	                        (rev 0)
+++ contributions/253b/comxe/_Project-ID-03/xml/data/tpl/C_Tax.xml.tpl	2008-08-29 21:04:08 UTC (rev 6280)
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<compieredata>
+
+	<C_Tax>
+		<AD_Client_Value>@AD_Client_Value@...>
+		<AD_Org_Value>@AD_Org_Value@...>
+		<CreatedBy_Name>@CreatedBy_Name@...>
+		<IsActive>Y</IsActive>
+		<Name>VAT-DE-Non Food</Name>
+		<IsDefault>N</IsDefault>
+		<TaxIndicator>VAT</TaxIndicator>
+		<IsDocumentLevel>N</IsDocumentLevel>
+		<ValidFrom>2008-08-01</ValidFrom>
+		<IsSummary>N</IsSummary>
+		<RequiresTaxCertificate>N</RequiresTaxCertificate>
+		<Rate>19</Rate>
+		<C_Country_CountryCode>DE</C_Country_CountryCode>
+		<C_TaxCategory_Name>VAT</C_TaxCategory_Name>
+		<IsDefault>N</IsDefault>
+		<IsTaxExempt>N</IsTaxExempt>
+		<SOPOType>B</SOPOType>
+		<IsSalesTax>N</IsSalesTax>
+		<M_Product_Category_Value>non food</M_Product_Category_Value>
+	</C_Tax>
+	<C_Tax>
+		<AD_Client_Value>@AD_Client_Value@...>
+		<AD_Org_Value>@AD_Org_Value@...>
+		<CreatedBy_Name>@CreatedBy_Name@...>
+		<IsActive>Y</IsActive>
+		<Name>VAT-CH-export</Name>
+		<IsDefault>N</IsDefault>
+		<IsDocumentLevel>N</IsDocumentLevel>
+		<ValidFrom>2008-08-01</ValidFrom>
+		<IsSummary>N</IsSummary>
+		<RequiresTaxCertificate>N</RequiresTaxCertificate>
+		<Rate>0</Rate>
+		<C_Country_CountryCode>CH</C_Country_CountryCode>
+		<C_TaxCategory_Name>VAT</C_TaxCategory_Name>
+		<IsDefault>N</IsDefault>
+		<IsTaxExempt>N</IsTaxExempt>
+		<SOPOType>B</SOPOType>
+		<IsSalesTax>N</IsSalesTax>
+	</C_Tax>
+	<C_Tax>
+		<AD_Client_Value>@AD_Client_Value@...>
+		<AD_Org_Value>@AD_Org_Value@...>
+		<CreatedBy_Name>@CreatedBy_Name@...>
+		<IsActive>Y</IsActive>
+		<Name>VAT-CH-Non Food</Name>
+		<IsDefault>N</IsDefault>
+		<TaxIndicator>VAT</TaxIndicator>
+		<IsDocumentLevel>N</IsDocumentLevel>
+		<ValidFrom>2008-08-01</ValidFrom>
+		<IsSummary>N</IsSummary>
+		<RequiresTaxCertificate>N</RequiresTaxCertificate>
+		<Rate>7.6</Rate>
+		<C_Country_CountryCode>CH</C_Country_CountryCode>
+		<C_TaxCategory_Name>VAT</C_TaxCategory_Name>
+		<IsDefault>N</IsDefault>
+		<IsTaxExempt>N</IsTaxExempt>
+		<SOPOType>B</SOPOType>
+		<IsSalesTax>N</IsSalesTax>
+		<M_Product_Category_Value>non food</M_Product_Category_Value>
+	</C_Tax>
+	<C_Tax>
+		<AD_Client_Value>@AD_Client_Value@...>
+		<AD_Org_Value>@AD_Org_Value@...>
+		<CreatedBy_Name>@CreatedBy_Name@...>
+		<IsActive>Y</IsActive>
+		<Name>VAT-CH-Food</Name>
+		<IsDefault>N</IsDefault>
+		<TaxIndicator>VAT</TaxIndicator>
+		<IsDocumentLevel>N</IsDocumentLevel>
+		<ValidFrom>2008-08-01</ValidFrom>
+		<IsSummary>N</IsSummary>
+		<RequiresTaxCertificate>N</RequiresTaxCertificate>
+		<Rate>2.4</Rate>
+		<C_Country_CountryCode>CH</C_Country_CountryCode>
+		<C_TaxCategory_Name>VAT</C_TaxCategory_Name>
+		<IsDefault>N</IsDefault>
+		<IsTaxExempt>N</IsTaxExempt>
+		<SOPOType>B</SOPOType>
+		<IsSalesTax>N</IsSalesTax>
+		<M_Product_Category_Value>food and books</M_Product_Category_Value>
+	</C_Tax>
+	<C_Tax>
+		<AD_Client_Value>@AD_Client_Value@...>
+		<AD_Org_Value>@AD_Org_Value@...>
+		<CreatedBy_Name>@CreatedBy_Name@...>
+		<IsActive>N</IsActive>
+		<Name>Standard</Name>
+		<IsDefault>Y</IsDefault>
+		<IsDocumentLevel>Y</IsDocumentLevel>
+		<ValidFrom>1990-01-01</ValidFrom>
+		<IsSummary>N</IsSummary>
+		<RequiresTaxCertificate>N</RequiresTaxCertificate>
+		<Rate>0</Rate>
+		<C_TaxCategory_Name>Standard</C_TaxCategory_Name>
+		<IsDefault>Y</IsDefault>
+		<IsTaxExempt>N</IsTaxExempt>
+		<SOPOType>B</SOPOType>
+		<IsSalesTax>N</IsSalesTax>
+	</C_Tax>
+	<C_Tax>
+		<AD_Client_Value>@AD_Client_Value@...>
+		<AD_Org_Value>@AD_Org_Value@...>
+		<CreatedBy_Name>@CreatedBy_Name@...>
+		<IsActive>Y</IsActive>
+		<Name>VAT-DE-export</Name>
+		<IsDefault>N</IsDefault>
+		<IsDocumentLevel>N</IsDocumentLevel>
+		<ValidFrom>2008-08-01</ValidFrom>
+		<IsSummary>N</IsSummary>
+		<RequiresTaxCertificate>N</RequiresTaxCertificate>
+		<Rate>0</Rate>
+		<C_Country_CountryCode>DE</C_Country_CountryCode>
+		<C_TaxCategory_Name>VAT</C_TaxCategory_Name>
+		<IsDefault>N</IsDefault>
+		<IsTaxExempt>N</IsTaxExempt>
+		<SOPOType>B</SOPOType>
+		<IsSalesTax>N</IsSalesTax>
+	</C_Tax>
+	<C_Tax>
+		<AD_Client_Value>@AD_Client_Value@...>
+		<AD_Org_Value>@AD_Org_Value@...>
+		<CreatedBy_Name>@CreatedBy_Name@...>
+		<IsActive>Y</IsActive>
+		<Name>VAT-DE-Food</Name>
+		<IsDefault>N</IsDefault>
+		<IsDocumentLevel>N</IsDocumentLevel>
+		<ValidFrom>2008-08-01</ValidFrom>
+		<IsSummary>N</IsSummary>
+		<RequiresTaxCertificate>N</RequiresTaxCertificate>
+		<Rate>7</Rate>
+		<C_Country_CountryCode>DE</C_Country_CountryCode>
+		<C_TaxCategory_Name>VAT</C_TaxCategory_Name>
+		<IsDefault>N</IsDefault>
+		<IsTaxExempt>N</IsTaxExempt>
+		<SOPOType>B</SOPOType>
+		<IsSalesTax>N</IsSalesTax>
+		<M_Product_Category_Value>food and books</M_Product_Category_Value>
+	</C_Tax>
+</compieredata>
\ No newline at end of file

Added: contributions/253b/comxe/_Project-ID-03/xml/data/tpl/C_TaxCategory.xml.tpl
===================================================================
--- contributions/253b/comxe/_Project-ID-03/xml/data/tpl/C_TaxCategory.xml.tpl	                        (rev 0)
+++ contributions/253b/comxe/_Project-ID-03/xml/data/tpl/C_TaxCategory.xml.tpl	2008-08-29 21:04:08 UTC (rev 6280)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<compieredata>
+	<!-- _____________________________________ C_TaxCategory Definition _____________________________________ -->
+	<!-- Tax Category: "VAT"
+	-->
+
+	<C_TaxCategory>
+		<AD_Client_Value>@AD_Client_Value@...>
+		<AD_Org_Value>@AD_Org_Value@...>
+		<CreatedBy_Name>@CreatedBy_Name@...>
+		<Name>VAT</Name>
+		<Description>Value Added Tax</Description>
+		<IsActive>Y</IsActive>
+		<CommodityCode></CommodityCode>
+		<IsDefault>Y</IsDefault>
+	</C_TaxCategory>
+
+</compieredata>
\ No newline at end of file

Added: contributions/253b/comxe/_Project-ID-03/xml/data/tpl/M_Product_Category.xml.tpl
===================================================================
--- contributions/253b/comxe/_Project-ID-03/xml/data/tpl/M_Product_Category.xml.tpl	                        (rev 0)
+++ contributions/253b/comxe/_Project-ID-03/xml/data/tpl/M_Product_Category.xml.tpl	2008-08-29 21:04:08 UTC (rev 6280)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<compieredata>
+
+<!-- _____________________________________ Product Category _____________________________________ -->
+<!-- Product Category: ""
+-->
+
+	<M_Product_Category>
+		<AD_Client_Value>@AD_Client_Value@...>
+		<AD_Org_Value>@AD_Org_Value@...>
+		<CreatedBy_Name>@CreatedBy_Name@...>
+		<IsActive>Y</IsActive>
+		<Name>Food</Name>
+		<Value>food</Value>
+		<IsDefault>Y</IsDefault>
+		<IsSelfService>Y</IsSelfService>
+		<PlannedMargin>0.0</PlannedMargin>
+	</M_Product_Category>
+	
+	<M_Product_Category>
+		<AD_Client_Value>@AD_Client_Value@...>
+		<AD_Org_Value>@AD_Org_Value@...>
+		<CreatedBy_Name>@CreatedBy_Name@...>
+		<IsActive>Y</IsActive>
+		<Name>Non Food</Name>
+		<Value>non food</Value>
+		<IsDefault>N</IsDefault>
+		<IsSelfService>Y</IsSelfService>
+		<PlannedMargin>0.0</PlannedMargin>
+	</M_Product_Category>
+	 
+</compieredata>
\ No newline at end of file

Modified: contributions/253b/comxe/_Project-ID-03/xml/model/Model-ID-001.xml
===================================================================
--- contributions/253b/comxe/_Project-ID-03/xml/model/Model-ID-001.xml	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_Project-ID-03/xml/model/Model-ID-001.xml	2008-08-29 21:04:08 UTC (rev 6280)
@@ -3,9 +3,33 @@
 <database name="ADCK Demo" build="1" date="2006-01-03 15:10:01">
 	
 	<!-- Default values. -->
-	<!-- default entitytype="Applications" /--> <!--entitytype="Applications/Dictionary" -->
+	<default entitytype="Applications" /> <!--entitytype="Applications/Dictionary" -->
 	
-	<AD_EntityType entitytype="SOD"></AD_EntityType> <!-- Compiere 3.0.0 new functionality -->
+	<!--AD_EntityType entitytype="SOD"></AD_EntityType--> <!-- Compiere 3.0.0 new functionality -->
 	<!-- SocrateOpen Dictionary -->
-  
+	
+	<table TableName="C_Tax">
+		<field ColumnName="M_Product_Category_ID" type="ID" sqlType="NUMBER(10,0)" ddEquiv="">
+			<attrib name="Name" value="Product Category"/>
+			<attrib name="Reference" value="Table Direct"/>
+			<attrib name="Element name" value="M_Product_Category_ID"/>
+			<attrib name="IsMandatory" value="N"/>
+		</field>
+		<field ColumnName="M_Product_ID" type="ID" sqlType="NUMBER(10,0)" ddEquiv="">
+			<attrib name="Name" value="Product"/>
+			<attrib name="Reference" value="Table Direct"/>
+			<attrib name="Element name" value="M_Product_ID"/>
+		</field>
+		<field ColumnName="C_BP_Group_ID" type="ID" sqlType="NUMBER(10,0)" ddEquiv="">
+			<attrib name="Name" value="B.Parther Group"/>
+			<attrib name="Reference" value="Table Direct"/>
+			<attrib name="Element name" value="C_BP_Group_ID"/>
+		</field>
+		<field ColumnName="C_BPartner_ID" type="ID" sqlType="NUMBER(10,0)" ddEquiv="">
+			<attrib name="Name" value="Business Partner"/>
+			<attrib name="Reference" value="Table Direct"/>
+			<attrib name="Element name" value="C_BPartner_ID"/>
+		</field>
+	</table>
+	
 </database>

Modified: contributions/253b/comxe/_Project-ID-03/xml/view/View-ID-001.xml
===================================================================
--- contributions/253b/comxe/_Project-ID-03/xml/view/View-ID-001.xml	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_Project-ID-03/xml/view/View-ID-001.xml	2008-08-29 21:04:08 UTC (rev 6280)
@@ -1,136 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--DOCTYPE component SYSTEM "dtds/comap-view-mapping-v1.0.0.dtd"-->
 
 <compiereAD>
 
-  <!-- Default values. -->
-  <default entitytype="Applications" firstdelete="false">
-  </default>
+	<!-- Default values. -->
+	<default entitytype="Applications" firstdelete="false">
+	</default>
 
-	<AD_EntityType entitytype="SOD"></AD_EntityType> <!-- Compiere 3.0.0 new functionality -->
+	<!--AD_EntityType entitytype="SOD"></AD_EntityType--> <!-- Compiere 3.0.0 new functionality -->
 	<!-- SocrateOpen Dictionary -->
 	
-<!-- 
-Example translation of AD_Field.
- -->
-<!-- WindowType = M=Maintain; Q=Query Only; S=Single Record; T=Transaction -->
-<!--
-  <window name="Sales Order" WindowType="Transaction" >
-    <tab name="Order" tablename="C_Order" syncfields="N">
-      <field name="Description" columnname="Description" isDisplayed="Y" isReadOnly="N" seqNo="260" >
-        <translation language="ru_RU" trl="N" IsActive="Y" >
-          <attrib name="Name">Opisanie Name</attrib>
-          <attrib name="Description">Opisanie Description</attrib>
-          <attrib name="Help">Pomosht Help</attrib>
-        </translation>
- 
-        <translation language="bg_BG" trl="N" IsActive="Y" >
-          <attrib name="Name">Описание Name</attrib>
-          <attrib name="Description">Описание Description</attrib>
-          <attrib name="Help">Описание Help</attrib>
-        </translation>
-      </field>
-      
-    </tab>
-  </window>
--->
-
-<!-- 
-Example usage of translation of AD_Reference and AD_Ref_List.
- -->
-<!--
-<Reference name="Delivery_Method" validationType="List Validation" entityType="Customization">
-
-  <translation language="ru_RU" trl="N" IsActive="Y" >
-	<attrib name="Name">Metod na Dostavka - Name - RU</attrib>
-    <attrib name="Description">Metod na Dostavka - Description - RU</attrib>
-    <attrib name="Help">Metod na Dostavka - Help - RU</attrib>
-  </translation>
-	  
-	<ReferenceList value="T" name="Train" isActive="Y" entityType="Customization">
-	  <translation language="ru_RU" trl="N" IsActive="Y" >
-		<attrib name="Name">Vlak - Name - RU</attrib>
-        <attrib name="Description">Vlak - Description - RU</attrib>
-	  </translation>
-	</ReferenceList>
-	
-    <ReferenceList value="A" name="Auto" isActive="Y" entityType="Customization">
-	  <translation language="ru_RU" trl="N" IsActive="Y" >
-		<attrib name="Name">Avto - Name - RU</attrib>
-        <attrib name="Description">Avto - Description - RU</attrib>
-	  </translation>
-	</ReferenceList>
-	
-    <ReferenceList value="P" name="Pipes" isActive="Y" entityType="Customization">
-	  <translation language="ru_RU" trl="N" >
-		<attrib name="Name">Trubi - Name - RU</attrib>
-        <attrib name="Description">Trubi - Description - RU</attrib>
-	  </translation>
-	</ReferenceList>
-	
-</Reference>
--->
-
-</compiereAD>
-
-<!--
-===============================================
-
-  <menu name="Import Loader Format Definition" isSummary="true/false" isSOTrx="true|false" 
-  		action="B = Workbench; F = WorkFlow; P = Process; R = Report; T = Task; W = Window; X = Form;" >
-    <menu name="" >
-    </menu>
-    
-    <process ...>
-    </process>
-    
-    <window name="" WindowType="Maintain/Query Only/Single Record/Transaction" >
-      <tab name="Order" tablename="I_Order" syncfields="N" linkcolumn="" >
-        <field name="" identifierno="1" mandatory="N" columnname="" displayLogic="@IsCustomer@...'" isSameLine="N" displayLength=""
-               defaultValue="" isDisplayed="" isReadOnly="" seqNo=""
-        >
-          <translation language="ru_RU" trl="N" IsActive="Y" >
-            <attrib name="Name">????????</attrib>
-            <attrib name="Description">???????????????????</attrib>
-            <attrib name="Help">?????????????????????????????????</attrib>
-          </translation>
- 
-          <translation language="bg_BG" trl="N" IsActive="Y" >
-            <attrib name="Name">????????</attrib>
-            <attrib name="Description">???????????????????</attrib>
-            <attrib name="Help">?????????????????????????????????</attrib>
-          </translation>
-        
-        </field>
-      </tab>
-    </window>
-
-    <window name="" >
-    </window>
-    
-  </menu>
-
-
-      
-  <process name="" value="" classname="" description="" help="" IsReport="Y/N">
-    <processpara name="" description="" reference="" columnname="" element="" val_rule="" mandatory="">
-    </processpara>
-  </process>
-
-  <Reference name="" description="" help="" validationType="" entityType="" vFormat="" >
-    entityType     = "Applications" / "Compiere" / "Customization" / "Dictionary" / "User maintained"
-    validationType = "DataType" / "List Validation" / "Table Validation"
-    
-    <ReferenceList value="" name="" isActive="Y" entityType=""
-                   description="" />
-    
-    <ReferenceTable >
-    </ReferenceTable>
-
-  </Reference>
-    
-=================================================   
--->
-
-
+	<window name="Tax Rate">
+		<tab name="Tax" tablename="C_Tax" syncfields="N">
+			<field name="Product Category" columnname="M_Product_Category_ID" isDisplayed="Y" isReadOnly="N" isSameLine="N" seqNo="230" />
+			<field name="Product" columnname="M_Product_ID" isDisplayed="Y" isReadOnly="N" isSameLine="Y" seqNo="240" />
+			<field name="B.Partner Group" columnname="C_BP_Group_ID" isDisplayed="Y" isReadOnly="N" isSameLine="N" seqNo="250" />
+			<field name="Business Partner" columnname="C_BPartner_ID" isDisplayed="Y" isReadOnly="N" isSameLine="Y" seqNo="260" />
+		</tab>
+	</window>
+  
+</compiereAD>
\ No newline at end of file

Modified: contributions/253b/comxe/_Project-ID-03/xml/view/view-tax.xml
===================================================================
--- contributions/253b/comxe/_Project-ID-03/xml/view/view-tax.xml	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_Project-ID-03/xml/view/view-tax.xml	2008-08-29 21:04:08 UTC (rev 6280)
@@ -427,7 +427,7 @@
 			<field columnname="Rate" displayLength="26" isDisplayed="Y"
 				isReadOnly="N" isSameLine="N" name="Rate" seqNo="170" />
 			<field columnname="AD_Rule_ID" displayLength="22"
-				isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Rule"
+				isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Script"
 				seqNo="180" />
 			<field columnname="C_Country_ID" displayLength="14"
 				isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Country From"

Modified: contributions/253b/comxe/_Project-ID-TEMPLATE/.classpath
===================================================================
--- contributions/253b/comxe/_Project-ID-TEMPLATE/.classpath	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_Project-ID-TEMPLATE/.classpath	2008-08-29 21:04:08 UTC (rev 6280)
@@ -13,7 +13,7 @@
 	<classpathentry kind="lib" path="lib/jxp.jar"/>
 	<classpathentry kind="lib" path="lib/log4j.jar"/>
 	<classpathentry kind="lib" path="lib/xml-apis.jar"/>
-	<classpathentry kind="lib" path="plugins/org.compiere.compilo.importer.core-320.0.7.zip"/>
+	<classpathentry kind="lib" path="plugins/org.compiere.compilo.importer.core-320.0.8.zip"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/base"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/looks"/>
 	<classpathentry kind="lib" path="/tools/lib/barbecue-1.1.jar"/>

Modified: contributions/253b/comxe/_Project-ID-TEMPLATE/build.xml
===================================================================
--- contributions/253b/comxe/_Project-ID-TEMPLATE/build.xml	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_Project-ID-TEMPLATE/build.xml	2008-08-29 21:04:08 UTC (rev 6280)
@@ -455,6 +455,18 @@
 		</antcall>
 	</target>
 	
+	<target name="imp_C_TaxCategory">
+		<antcall target="imp-xxx">
+			<param name="xml.file" value="C_TaxCategory.xml" />
+		</antcall>
+	</target>
+
+	<target name="imp_C_Tax">
+		<antcall target="imp-xxx">
+			<param name="xml.file" value="C_Tax.xml" />
+		</antcall>
+	</target>
+	
 	<target name="imp_">
 		<antcall target="imp-xxx">
 			<param name="xml.file" value=".xml" />


Property changes on: contributions/253b/comxe/_Project-ID-TEMPLATE/plugins/org.adempiere.importer.yahoostore-320.0.8.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: contributions/253b/comxe/_Project-ID-TEMPLATE/plugins/org.compiere.compilo.importer.core-320.0.8.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: contributions/253b/comxe/_Project-ID-TEMPLATE/plugins/org.compiere.compilo.importer.standard-320.0.19.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: contributions/253b/comxe/_Project-ID-TEMPLATE/plugins/src/org.adempiere.importer.tmp/doc/changeLog.txt
===================================================================
--- contributions/253b/comxe/_Project-ID-TEMPLATE/plugins/src/org.adempiere.importer.tmp/doc/changeLog.txt	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_Project-ID-TEMPLATE/plugins/src/org.adempiere.importer.tmp/doc/changeLog.txt	2008-08-29 21:04:08 UTC (rev 6280)
@@ -1,4 +1,8 @@
 _Project-ID-TEMPLATE
+
+320.0.8 Adempiere compatible
+  * Migrated to core plug-in version 320.0.8
+  
 320.0.7 Adempiere compatible
   * Migrated to core plug-in version 320.0.7
 
@@ -21,28 +25,28 @@
   * Changed package from org.compiere.compilo to org.adempiere
 
 320.0.1
-  * Migrated to core plugin version 320.0.1
-  * Added Yahoo Store Importer plugin vesion 320.0.1
+  * Migrated to core plug-in version 320.0.1
+  * Added Yahoo Store Importer plug-in version 320.0.1
 
 311.0.2
-  * Migrated to core plugin version 311.0.2
+  * Migrated to core plug-in version 311.0.2
   * Added example of field, reference and ref_list translations 
   
 253.2.12
- * Used Standard plugin version 253.2.12
+ * Used Standard plug-in version 253.2.12
  * Added example file how to import PA_Report - /xml/data/PA_Report.xml
  * Added example file how to import PA_ReportColumnSet, PA_ReportColumn - /xml/data/PA_ReportColumnSet.xml
  * Added example file how to import PA_ReportLineSet, PA_ReportLine, PA_ReportSource - /xml/data/PA_ReportLineSet.xml
 
 253.2.11
- * Used Standard plugin version 253.2.11
+ * Used Standard plug-in version 253.2.11
  * Added example file how to import M_Product_Category - /xml/data/M_Product_Category.xml
 
 253.2.6
- * Migrated to core plugin version 253.2.6
+ * Migrated to core plug-in version 253.2.6
  
 253.2.5b
- * Added changeLog.txt in template plugin.
+ * Added changeLog.txt in template plug-in.
  * Generated zip file will not include xml files in folder /result/compiere/...
  * Used new splash. Thank's to Sergey Vishniakov from compiere.lv team!!!
  
@@ -50,4 +54,4 @@
  * Replaces 253.2.5 as there was error in uploaded file.
 
 253.2.5
- * Migrated to core plugin version 253.2.5
\ No newline at end of file
+ * Migrated to core plug-in version 253.2.5
\ No newline at end of file

Modified: contributions/253b/comxe/_Project-ID-TEMPLATE/plugins/src/org.adempiere.importer.tmp/plugin.xml
===================================================================
--- contributions/253b/comxe/_Project-ID-TEMPLATE/plugins/src/org.adempiere.importer.tmp/plugin.xml	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_Project-ID-TEMPLATE/plugins/src/org.adempiere.importer.tmp/plugin.xml	2008-08-29 21:04:08 UTC (rev 6280)
@@ -3,12 +3,12 @@
 <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.4" "http://jpf.sourceforge.net/plugin_0_4.dtd">
 
 <plugin id="org.adempiere.importer.tmp" 
-        version="320.0.7" 
+        version="320.0.8" 
 >
 	
 	<requires>
 		<import plugin-id="org.compiere.compilo.importer.core"
-		        plugin-version="320.0.7" />
+		        plugin-version="320.0.8" />
 	</requires>	
 	
 	<runtime>

Modified: contributions/253b/comxe/_Project-ID-TEMPLATE/plugins/src/org.adempiere.importer.tmp/source/org/adempiere/importer/tmp/TEMPLATEImporter.java
===================================================================
--- contributions/253b/comxe/_Project-ID-TEMPLATE/plugins/src/org.adempiere.importer.tmp/source/org/adempiere/importer/tmp/TEMPLATEImporter.java	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_Project-ID-TEMPLATE/plugins/src/org.adempiere.importer.tmp/source/org/adempiere/importer/tmp/TEMPLATEImporter.java	2008-08-29 21:04:08 UTC (rev 6280)
@@ -45,7 +45,6 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
-import org.w3c.dom.Text;
 
 public class TEMPLATEImporter extends TableImporter {
 
@@ -133,9 +132,9 @@
 		{
 			
 			String errorMessage = "ERROR: C_EDIProcessorType_Name or C_EDIProcessorType_Value or AD_Client_Value is null..."; 
-			log.error(errorMessage);
-			System.out.println(errorMessage);
-			throw new ImportException(errorMessage);
+			log.error( errorMessage );
+			System.out.println( errorMessage );
+			throw new ImportException( errorMessage );
 		}
 		
 		// Search for AD_User by Name...
@@ -167,14 +166,14 @@
 		
 		//cause.setName(name);
 		
-		if (value != null && !"".equals(value)) {
+		if (value != null && !"".equals( value )) {
 			//cause.setValue(value);
 		}
 		
 		String IsActive = XMLHelper.getString("IsActive", C_Cause_Node);
 		log.info("IsActive = " + IsActive);
 		result.appendChild(createNewTextElement("IsActive", IsActive, outDocument));
-		if (IsActive != null && !"".equals(IsActive)) {
+		if (IsActive != null && !"".equals( IsActive )) {
 			//cause.setIsActive(IsActive.equals("Y") ? true : false);
 		}
 		
@@ -182,22 +181,22 @@
 		String Description = XMLHelper.getString("Description", C_Cause_Node);
 		//log.info(X_C_Cause.COLUMNNAME_Description + " = " + Description);
 		//result.appendChild(createNewTextElement(X_C_Cause.COLUMNNAME_Description, Description, outDocument));
-		if (Description != null && !"".equals(Description)) {
-			//cause.setDescription(Description);
+		if (Description != null && !"".equals( Description )) {
+			//cause.setDescription( Description );
 		}
 		
 		// Help
 		String Help = XMLHelper.getString("Help", C_Cause_Node);
 		//log.info(X_C_Cause.COLUMNNAME_Help + " = " + Help);
 		//result.appendChild(createNewTextElement(X_C_Cause.COLUMNNAME_Help, Help, outDocument));
-		if (Help != null && !"".equals(Help)) {
-			//cause.setHelp(Help);
+		if (Help != null && !"".equals( Help )) {
+			//cause.setHelp( Help );
 		}
 		
 		String IsSoTrx = XMLHelper.getString("IsSoTrx", C_Cause_Node);
 		log.info("IsSoTrx = " + IsSoTrx);
 		result.appendChild(createNewTextElement("IsSoTrx", IsSoTrx, outDocument));
-		if (IsSoTrx != null && !"".equals(IsSoTrx)) {
+		if (IsSoTrx != null && !"".equals( IsSoTrx )) {
 			//cause.setIsSoTrx(IsSoTrx.equals("Y") ? true : false);
 		}
 		
@@ -205,18 +204,8 @@
 		//resultSave = cause.save();
 		log.info("--- RESULT SAVE = " + resultSave);
 		result.appendChild(createNewTextElement("result", String.valueOf( resultSave ), outDocument));
-		outElement.appendChild(result);
+		outElement.appendChild( result );
 	}
-
-	private Element createNewTextElement(String elementName, String textNodeValue, Document outDocument) {
-		Element newElement = outDocument.createElement(elementName);
-		
-		Text newText = outDocument.createTextNode(textNodeValue);
-		
-		newElement.appendChild(newText);
-		
-		return newElement;
-	}
 	
 	/*
 	public static X_IMP_ProcessorParameter getByIMP_Processor_IDandValue (Properties ctx, int IMP_Processor_ID, String Value, String trxName) throws Exception

Deleted: contributions/253b/comxe/_Project-ID-TEMPLATE/xml/data/M_Product_Category.xml
===================================================================
--- contributions/253b/comxe/_Project-ID-TEMPLATE/xml/data/M_Product_Category.xml	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_Project-ID-TEMPLATE/xml/data/M_Product_Category.xml	2008-08-29 21:04:08 UTC (rev 6280)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<compieredata>
-
-<!-- _____________________________________ Product Category _____________________________________ -->
-<!-- Product Category: ""
--->
-
-	<M_Product_Category>
-		<AD_Client_Value>GardenWorld</AD_Client_Value>
-		<AD_Org_Value>0</AD_Org_Value>
-		<CreatedBy_Name>GardenWorldAdmin</CreatedBy_Name>
-		<IsActive>Y</IsActive>
-		<Name>Standard-test</Name>
-		<Value>Standard-test</Value>
-		<IsDefault>N</IsDefault>
-		<IsSelfService>Y</IsSelfService>
-		<PlannedMargin>0.0</PlannedMargin>
-	</M_Product_Category>
-	 
-</compieredata>
\ No newline at end of file

Added: contributions/253b/comxe/_Project-ID-TEMPLATE/xml/data/tpl/C_Tax.xml.tpl
===================================================================
--- contributions/253b/comxe/_Project-ID-TEMPLATE/xml/data/tpl/C_Tax.xml.tpl	                        (rev 0)
+++ contributions/253b/comxe/_Project-ID-TEMPLATE/xml/data/tpl/C_Tax.xml.tpl	2008-08-29 21:04:08 UTC (rev 6280)
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<compieredata>
+
+	<C_Tax>
+		<AD_Client_Value>@AD_Client_Value@...>
+		<AD_Org_Value>@AD_Org_Value@...>
+		<CreatedBy_Name>@CreatedBy_Name@...>
+		<IsActive>Y</IsActive>
+		<Name>VAT-DE-Non Food</Name>
+		<IsDefault>N</IsDefault>
+		<TaxIndicator>VAT</TaxIndicator>
+		<IsDocumentLevel>N</IsDocumentLevel>
+		<ValidFrom>2008-08-01</ValidFrom>
+		<IsSummary>N</IsSummary>
+		<RequiresTaxCertificate>N</RequiresTaxCertificate>
+		<Rate>19</Rate>
+		<C_Country_CountryCode>DE</C_Country_CountryCode>
+		<C_TaxCategory_Name>VAT</C_TaxCategory_Name>
+		<IsDefault>N</IsDefault>
+		<IsTaxExempt>N</IsTaxExempt>
+		<SOPOType>B</SOPOType>
+		<IsSalesTax>N</IsSalesTax>
+		<M_Product_Category_Value>non food</M_Product_Category_Value>
+	</C_Tax>
+	<C_Tax>
+		<AD_Client_Value>@AD_Client_Value@...>
+		<AD_Org_Value>@AD_Org_Value@...>
+		<CreatedBy_Name>@CreatedBy_Name@...>
+		<IsActive>Y</IsActive>
+		<Name>VAT-CH-export</Name>
+		<IsDefault>N</IsDefault>
+		<IsDocumentLevel>N</IsDocumentLevel>
+		<ValidFrom>2008-08-01</ValidFrom>
+		<IsSummary>N</IsSummary>
+		<RequiresTaxCertificate>N</RequiresTaxCertificate>
+		<Rate>0</Rate>
+		<C_Country_CountryCode>CH</C_Country_CountryCode>
+		<C_TaxCategory_Name>VAT</C_TaxCategory_Name>
+		<IsDefault>N</IsDefault>
+		<IsTaxExempt>N</IsTaxExempt>
+		<SOPOType>B</SOPOType>
+		<IsSalesTax>N</IsSalesTax>
+	</C_Tax>
+	<C_Tax>
+		<AD_Client_Value>@AD_Client_Value@...>
+		<AD_Org_Value>@AD_Org_Value@...>
+		<CreatedBy_Name>@CreatedBy_Name@...>
+		<IsActive>Y</IsActive>
+		<Name>VAT-CH-Non Food</Name>
+		<IsDefault>N</IsDefault>
+		<TaxIndicator>VAT</TaxIndicator>
+		<IsDocumentLevel>N</IsDocumentLevel>
+		<ValidFrom>2008-08-01</ValidFrom>
+		<IsSummary>N</IsSummary>
+		<RequiresTaxCertificate>N</RequiresTaxCertificate>
+		<Rate>7.6</Rate>
+		<C_Country_CountryCode>CH</C_Country_CountryCode>
+		<C_TaxCategory_Name>VAT</C_TaxCategory_Name>
+		<IsDefault>N</IsDefault>
+		<IsTaxExempt>N</IsTaxExempt>
+		<SOPOType>B</SOPOType>
+		<IsSalesTax>N</IsSalesTax>
+		<M_Product_Category_Value>non food</M_Product_Category_Value>
+	</C_Tax>
+	<C_Tax>
+		<AD_Client_Value>@AD_Client_Value@...>
+		<AD_Org_Value>@AD_Org_Value@...>
+		<CreatedBy_Name>@CreatedBy_Name@...>
+		<IsActive>Y</IsActive>
+		<Name>VAT-CH-Food</Name>
+		<IsDefault>N</IsDefault>
+		<TaxIndicator>VAT</TaxIndicator>
+		<IsDocumentLevel>N</IsDocumentLevel>
+		<ValidFrom>2008-08-01</ValidFrom>
+		<IsSummary>N</IsSummary>
+		<RequiresTaxCertificate>N</RequiresTaxCertificate>
+		<Rate>2.4</Rate>
+		<C_Country_CountryCode>CH</C_Country_CountryCode>
+		<C_TaxCategory_Name>VAT</C_TaxCategory_Name>
+		<IsDefault>N</IsDefault>
+		<IsTaxExempt>N</IsTaxExempt>
+		<SOPOType>B</SOPOType>
+		<IsSalesTax>N</IsSalesTax>
+		<M_Product_Category_Value>food and books</M_Product_Category_Value>
+	</C_Tax>
+	<C_Tax>
+		<AD_Client_Value>@AD_Client_Value@...>
+		<AD_Org_Value>@AD_Org_Value@...>
+		<CreatedBy_Name>@CreatedBy_Name@...>
+		<IsActive>N</IsActive>
+		<Name>Standard</Name>
+		<IsDefault>Y</IsDefault>
+		<IsDocumentLevel>Y</IsDocumentLevel>
+		<ValidFrom>1990-01-01</ValidFrom>
+		<IsSummary>N</IsSummary>
+		<RequiresTaxCertificate>N</RequiresTaxCertificate>
+		<Rate>0</Rate>
+		<C_TaxCategory_Name>Standard</C_TaxCategory_Name>
+		<IsDefault>Y</IsDefault>
+		<IsTaxExempt>N</IsTaxExempt>
+		<SOPOType>B</SOPOType>
+		<IsSalesTax>N</IsSalesTax>
+	</C_Tax>
+	<C_Tax>
+		<AD_Client_Value>@AD_Client_Value@...>
+		<AD_Org_Value>@AD_Org_Value@...>
+		<CreatedBy_Name>@CreatedBy_Name@...>
+		<IsActive>Y</IsActive>
+		<Name>VAT-DE-export</Name>
+		<IsDefault>N</IsDefault>
+		<IsDocumentLevel>N</IsDocumentLevel>
+		<ValidFrom>2008-08-01</ValidFrom>
+		<IsSummary>N</IsSummary>
+		<RequiresTaxCertificate>N</RequiresTaxCertificate>
+		<Rate>0</Rate>
+		<C_Country_CountryCode>DE</C_Country_CountryCode>
+		<C_TaxCategory_Name>VAT</C_TaxCategory_Name>
+		<IsDefault>N</IsDefault>
+		<IsTaxExempt>N</IsTaxExempt>
+		<SOPOType>B</SOPOType>
+		<IsSalesTax>N</IsSalesTax>
+	</C_Tax>
+	<C_Tax>
+		<AD_Client_Value>@AD_Client_Value@...>
+		<AD_Org_Value>@AD_Org_Value@...>
+		<CreatedBy_Name>@CreatedBy_Name@...>
+		<IsActive>Y</IsActive>
+		<Name>VAT-DE-Food</Name>
+		<IsDefault>N</IsDefault>
+		<IsDocumentLevel>N</IsDocumentLevel>
+		<ValidFrom>2008-08-01</ValidFrom>
+		<IsSummary>N</IsSummary>
+		<RequiresTaxCertificate>N</RequiresTaxCertificate>
+		<Rate>7</Rate>
+		<C_Country_CountryCode>DE</C_Country_CountryCode>
+		<C_TaxCategory_Name>VAT</C_TaxCategory_Name>
+		<IsDefault>N</IsDefault>
+		<IsTaxExempt>N</IsTaxExempt>
+		<SOPOType>B</SOPOType>
+		<IsSalesTax>N</IsSalesTax>
+		<M_Product_Category_Value>food and books</M_Product_Category_Value>
+	</C_Tax>
+</compieredata>
\ No newline at end of file

Added: contributions/253b/comxe/_Project-ID-TEMPLATE/xml/data/tpl/C_TaxCategory.xml.tpl
===================================================================
--- contributions/253b/comxe/_Project-ID-TEMPLATE/xml/data/tpl/C_TaxCategory.xml.tpl	                        (rev 0)
+++ contributions/253b/comxe/_Project-ID-TEMPLATE/xml/data/tpl/C_TaxCategory.xml.tpl	2008-08-29 21:04:08 UTC (rev 6280)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<compieredata>
+	<!-- _____________________________________ C_TaxCategory Definition _____________________________________ -->
+	<!-- Tax Category: "VAT"
+	-->
+
+	<C_TaxCategory>
+		<AD_Client_Value>@AD_Client_Value@...>
+		<AD_Org_Value>@AD_Org_Value@...>
+		<CreatedBy_Name>@CreatedBy_Name@...>
+		<Name>VAT</Name>
+		<Description>Value Added Tax</Description>
+		<IsActive>Y</IsActive>
+		<CommodityCode></CommodityCode>
+		<IsDefault>Y</IsDefault>
+	</C_TaxCategory>
+
+</compieredata>
\ No newline at end of file

Added: contributions/253b/comxe/_Project-ID-TEMPLATE/xml/data/tpl/M_Product_Category.xml.tpl
===================================================================
--- contributions/253b/comxe/_Project-ID-TEMPLATE/xml/data/tpl/M_Product_Category.xml.tpl	                        (rev 0)
+++ contributions/253b/comxe/_Project-ID-TEMPLATE/xml/data/tpl/M_Product_Category.xml.tpl	2008-08-29 21:04:08 UTC (rev 6280)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<compieredata>
+
+<!-- _____________________________________ Product Category _____________________________________ -->
+<!-- Product Category: ""
+-->
+
+	<M_Product_Category>
+		<AD_Client_Value>@AD_Client_Value@...>
+		<AD_Org_Value>@AD_Org_Value@...>
+		<CreatedBy_Name>@CreatedBy_Name@...>
+		<IsActive>Y</IsActive>
+		<Name>Standard-test</Name>
+		<Value>Standard-test</Value>
+		<IsDefault>N</IsDefault>
+		<IsSelfService>Y</IsSelfService>
+		<PlannedMargin>0.0</PlannedMargin>
+	</M_Product_Category>
+	 
+</compieredata>
\ No newline at end of file

Modified: contributions/253b/comxe/_ad2xml/build.xml
===================================================================
--- contributions/253b/comxe/_ad2xml/build.xml	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_ad2xml/build.xml	2008-08-29 21:04:08 UTC (rev 6280)
@@ -497,6 +497,20 @@
 	    </java>
 	</target>
 
+	<target name="expC_Tax" depends="compile">
+	    <java classname="CommandLineExporter">
+	    	<arg value="./xml/compiere/data/C_Tax.xml"/>
+			<arg value="./xsd/dbsql2xml.xsd"/>
+	    	<arg value="./result/compiere/data/C_Tax-part.xml"/>
+	    	
+			<sysproperty key="jdbcDriver" value="${jdbcDriver}"/>
+	    	<sysproperty key="jdbcURL" value="jdbc:oracle:thin:@${oracle.host}:${oracle.port}:${oracle.sid}"/>
+			<sysproperty key="jdbcUserName" value="${oracle.username}"/>
+			<sysproperty key="jdbcPassword" value="${oracle.password}"/>
+			<classpath refid="project.classpath"/>
+	    </java>
+	</target>
+	
   <target name="clean">
     <!-- Delete the ${build.dir} directory tree -->
     <delete dir="${build.dir}"/>

Deleted: contributions/253b/comxe/_ad2xml/result/compiere/view/view-part.xml
===================================================================
--- contributions/253b/comxe/_ad2xml/result/compiere/view/view-part.xml	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_ad2xml/result/compiere/view/view-part.xml	2008-08-29 21:04:08 UTC (rev 6280)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><compiereAD><!--The "dbsql2xml" is Java tool (class) for transforming (export) relational databases into hierarchical XML.
-For more information, see http://sourceforge.net/projects/dbsql2xml/--><window name="Payment"><tab name="Payment" syncfields="N" tablename="C_Payment"><commitWarning>@OperationName@ - Document No. - @DocumentNo@
-Date - @DateAcct@
-Client  -  @BPName@
-Account No.    -  @AccountName@
-Amount           -   @PayAmt@ @CurrencyName@
-      </commitWarning>
-    <field columnname="IsActive" displayLength="1" isDisplayed="N" isReadOnly="N" isSameLine="N" name="Active" seqNo="0"/>
-    <field columnname="C_Cause_Name" displayLength="null" isDisplayed="N" isReadOnly="N" isSameLine="N" name="Cause Name" seqNo="0"/><field columnname="Processed" displayLength="1" isDisplayed="N" isReadOnly="N" isSameLine="N" name="Processed" seqNo="0"/><field columnname="IsReconciled" displayLength="1" isDisplayed="N" isReadOnly="N" isSameLine="N" name="Reconciled" seqNo="0"/><field columnname="R_Info" displayLength="20" displayLogic="@IsOnline@..." isDisplayed="N" isReadOnly="Y" isSameLine="N" name="Info" seqNo="0"/><field columnname="C_Payment_ID" displayLength="14" isDisplayed="N" isReadOnly="N" isSameLine="N" name="Payment" seqNo="0"/><field columnname="C_BP_BankAccount_ID" displayLength="14" isDisplayed="N" isReadOnly="N" isSameLine="N" name="Partner Bank Account" seqNo="0"/><field columnname="C_PaymentBatch_ID" displayLength="14" isDisplayed="N" isReadOnly="N" isSameLine="N" name="Payment Batch" seqNo="0"/><field columnname="IsDelayedCapture" displayLength="1" isDisplayed="N" isReadOnly="N" isSameLine="N" name="Delayed Capture" seqNo="0"/><field columnname="ChargeAmt" displayLength="11" isDisplayed="N" isReadOnly="N" isSameLine="N" name="Charge amount" seqNo="0"/><field columnname="R_AuthCode_DC" displayLength="20" isDisplayed="N" isReadOnly="N" isSameLine="N" name="Authorization Code (DC)" seqNo="0"/><field columnname="R_CVV2Match" displayLength="1" isDisplayed="N" isReadOnly="N" isSameLine="N" name="CVV Match" seqNo="0"/><field columnname="R_PnRef_DC" displayLength="20" isDisplayed="N" isReadOnly="N" isSameLine="N" name="Reference (DC)" seqNo="0"/><field columnname="Swipe" displayLength="60" isDisplayed="N" isReadOnly="Y" isSameLine="N" name="Swipe" seqNo="0"/><field columnname="Processing" displayLength="23" isDisplayed="N" isReadOnly="N" isSameLine="N" name="Process Payment" seqNo="0"/><field columnname="AD_Client_ID" displayLength="14" isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Client" seqNo="10"/><field columnname="AD_Org_ID" displayLength="14" isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Organization" seqNo="20"/><field columnname="DocumentNo" displayLength="20" isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Document No" seqNo="30"/><field columnname="C_BankAccount_ID" displayLength="14" isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Bank Account" seqNo="40"/><field columnname="C_DocType_ID" displayLength="14" isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Document Type" seqNo="50"/><field columnname="IsReceipt" displayLength="1" isDisplayed="Y" isReadOnly="Y" isSameLine="Y" name="Receipt" seqNo="60"/><field columnname="Description" displayLength="60" displayLogic="@C_Cause_Name@ = 'Other'" isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Description" seqNo="60"/><field columnname="DateTrx" displayLength="14" isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Transaction Date" seqNo="70"/><field columnname="DateAcct" displayLength="14" isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Account Date" seqNo="80"/><field columnname="C_Cause_ID" displayLength="null" isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Cause" seqNo="84"/><field columnname="C_BPartner_ID" displayLength="26" isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Business Partner " seqNo="100"/><field columnname="C_BP_Account_ID" displayLength="null" displayLogic="@C_BPartner_ID@ &gt; 0" isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Account No" seqNo="102"/><field columnname="C_Invoice_ID" displayLength="26" isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Invoice" seqNo="110"/><field columnname="C_Order_ID" displayLength="26" isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Order" seqNo="140"/><field columnname="C_Project_ID" displayLength="14" displayLogic="@$Element_PJ@... &amp; @C_Invoice_ID@... | @C_Invoice_ID@=''" isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Project" seqNo="150"/><field columnname="C_Charge_ID" displayLength="14" isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Charge" seqNo="160"/><field columnname="IsPrepayment" displayLength="1" isDisplayed="Y" isReadOnly="Y" isSameLine="Y" name="Prepayment" seqNo="170"/><field columnname="C_Activity_ID" displayLength="14" displayLogic="@$Element_AY@..." isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Activity" seqNo="180"/><field columnname="C_Campaign_ID" displayLength="14" displayLogic="@$Element_MC@..." isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Campaign" seqNo="190"/><field columnname="AD_OrgTrx_ID" displayLength="14" displayLogic="@$Element_OT@..." isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Trx Organization" seqNo="200"/><field columnname="User1_ID" displayLength="14" displayLogic="@$Element_U1@..." isDisplayed="Y" isReadOnly="N" isSameLine="N" name="User List 1" seqNo="210"/><field columnname="User2_ID" displayLength="14" displayLogic="@$Element_U2@..." isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="User List 2" seqNo="220"/><field columnname="PayAmt" displayLength="26" isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Payment amount" seqNo="230"/><field columnname="C_Currency_ID" displayLength="14" displayLogic="@C_BPartner_ID@ &gt; 0" isDisplayed="Y" isReadOnly="Y" isSameLine="Y" name="Currency" seqNo="240"/><field columnname="C_ConversionType_ID" displayLength="14" displayLogic="@C_Currency_ID@...@" isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Currency Type" seqNo="250"/><field columnname="DiscountAmt" displayLength="26" displayLogic="@C_Invoice_ID@^''" isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Discount Amount" seqNo="260"/><field columnname="WriteOffAmt" displayLength="26" displayLogic="@C_Invoice_ID@^''" isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Write-off Amount" seqNo="270"/><field columnname="IsOverUnderPayment" displayLength="1" displayLogic="@C_Invoice_ID@^''" isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Over/Under Payment" seqNo="280"/><field columnname="OverUnderAmt" displayLength="26" displayLogic="@IsOverUnderPayment@... &amp; @C_Invoice_ID@^''" isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Over/Under Payment" seqNo="290"/><field columnname="TenderType" displayLength="14" isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Tender type" seqNo="300"/><field columnname="IsOnline" displayLength="1" isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Online Access" seqNo="310"/><field columnname="RoutingNo" displayLength="20" displayLogic="@TenderType@... | @TenderType@..." isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Routing No" seqNo="320"/><field columnname="AccountNo" displayLength="20" displayLogic="@TenderType@... | @TenderType@..." isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Account No" seqNo="330"/><field columnname="CheckNo" displayLength="20" displayLogic="@TenderType@..." isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Check No" seqNo="340"/><field columnname="Micr" displayLength="20" displayLogic="@TenderType@..." isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Micr" seqNo="350"/><field columnname="CreditCardType" displayLength="14" displayLogic="@TenderType@..." isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Credit Card" seqNo="360"/><field columnname="TrxType" displayLength="14" displayLogic="@TenderType@..." isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Transaction Type" seqNo="370"/><field columnname="CreditCardNumber" displayLength="20" displayLogic="@TenderType@..." isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Number" seqNo="380"/><field columnname="CreditCardVV" displayLength="5" displayLogic="@TenderType@..." isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Verification Code" seqNo="390"/><field columnname="CreditCardExpMM" displayLength="11" displayLogic="@TenderType@..." isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Exp. Month" seqNo="400"/><field columnname="CreditCardExpYY" displayLength="11" displayLogic="@TenderType@..." isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Exp. Year" seqNo="410"/><field columnname="A_Name" displayLength="20" displayLogic="@TenderType@... | @TenderType@..." isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Account Name" seqNo="420"/><field columnname="A_Street" displayLength="20" displayLogic="@TenderType@... | @TenderType@... &amp; @IsOnline@..." isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Account Street" seqNo="430"/><field columnname="A_City" displayLength="20" displayLogic="@TenderType@... | @TenderType@... &amp; @IsOnline@..." isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Account City" seqNo="440"/><field columnname="A_Zip" displayLength="11" displayLogic="@TenderType@... | @TenderType@... &amp; @IsOnline@..." isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Account Zip/Postal" seqNo="450"/><field columnname="A_State" displayLength="11" displayLogic="@TenderType@... | @TenderType@... &amp; @IsOnline@..." isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Account State" seqNo="460"/><field columnname="A_Country" displayLength="20" displayLogic="@TenderType@... | @TenderType@... &amp; @IsOnline@..." isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Account Country" seqNo="470"/><field columnname="A_Ident_DL" displayLength="20" displayLogic="@TenderType@... &amp; @IsOnline@..." isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Driver License" seqNo="480"/><field columnname="A_Ident_SSN" displayLength="20" displayLogic="@TenderType@... &amp; @IsOnline@..." isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Social Security No" seqNo="490"/><field columnname="A_EMail" displayLength="20" displayLogic="@TenderType@... &amp; @IsOnline@..." isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Account EMail" seqNo="500"/><field columnname="TaxAmt" displayLength="26" displayLogic="@CreditCardType@... &amp; @IsOnline@..." isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Tax Amount" seqNo="510"/><field columnname="PONum" displayLength="20" displayLogic="@CreditCardType@... &amp; @IsOnline@..." isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="PO Number" seqNo="520"/><field columnname="VoiceAuthCode" displayLength="20" displayLogic="@IsOnline@..." isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Voice authorization code" seqNo="530"/><field columnname="Orig_TrxID" displayLength="20" displayLogic="@IsOnline@..." isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Original Transaction ID" seqNo="540"/><field columnname="OProcessing" displayLength="23" displayLogic="@IsOnline@..." isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Online Process" seqNo="550"/><field columnname="IsApproved" displayLength="1" displayLogic="@IsOnline@..." isDisplayed="Y" isReadOnly="Y" isSameLine="Y" name="Approved" seqNo="560"/><field columnname="R_Result" displayLength="20" displayLogic="@IsOnline@..." isDisplayed="Y" isReadOnly="Y" isSameLine="N" name="Result" seqNo="570"/><field columnname="R_RespMsg" displayLength="20" displayLogic="@IsOnline@..." isDisplayed="Y" isReadOnly="Y" isSameLine="Y" name="Response Message" seqNo="580"/><field columnname="R_PnRef" displayLength="20" displayLogic="@IsOnline@..." isDisplayed="Y" isReadOnly="Y" isSameLine="N" name="Reference" seqNo="590"/><field columnname="R_AuthCode" displayLength="20" displayLogic="@IsOnline@..." isDisplayed="Y" isReadOnly="Y" isSameLine="Y" name="Authorization Code" seqNo="600"/><field columnname="R_AvsZip" displayLength="14" displayLogic="@IsOnline@..." isDisplayed="Y" isReadOnly="Y" isSameLine="N" name="Zip verified" seqNo="610"/><field columnname="R_AvsAddr" displayLength="14" displayLogic="@IsOnline@..." isDisplayed="Y" isReadOnly="Y" isSameLine="Y" name="Address verified" seqNo="620"/><field columnname="DocStatus" displayLength="14" isDisplayed="Y" isReadOnly="Y" isSameLine="N" name="Document Status" seqNo="630"/><field columnname="DocAction" displayLength="23" isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Process Payment" seqNo="640"/><field columnname="IsSelfService" displayLength="1" isDisplayed="Y" isReadOnly="Y" isSameLine="N" name="Self-Service" seqNo="650"/><field columnname="Posted" displayLength="23" displayLogic="@Processed@... &amp; @#ShowAcct@..." isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Posted" seqNo="660"/><field columnname="IsAllocated" displayLength="1" displayLogic="@Processed@..." isDisplayed="Y" isReadOnly="Y" isSameLine="N" name="Allocated" seqNo="670"/></tab>
-    
-  <tab name="Allocate" syncfields="N" tablename="C_PaymentAllocate">
-    <field columnname="C_PaymentAllocate_ID" displayLength="10" isDisplayed="N" isReadOnly="N" isSameLine="N" name="Allocate Payment" seqNo="0"/>
-    <field columnname="AD_Client_ID" displayLength="10" isDisplayed="Y" isReadOnly="Y" isSameLine="N" name="Client" seqNo="10"/>
-    <field columnname="AD_Org_ID" displayLength="10" isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Organization" seqNo="20"/>
-    <field columnname="C_Payment_ID" displayLength="10" isDisplayed="Y" isReadOnly="Y" isSameLine="N" name="Payment" seqNo="30"/><field columnname="IsActive" displayLength="1" isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Active" seqNo="40"/><field columnname="C_Invoice_ID" displayLength="10" isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Invoice" seqNo="50"/><field columnname="InvoiceAmt" displayLength="22" isDisplayed="Y" isReadOnly="Y" isSameLine="Y" name="Invoice Amt" seqNo="60"/><field columnname="Amount" displayLength="22" isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Amount" seqNo="70"/><field columnname="DiscountAmt" displayLength="22" isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Discount Amount" seqNo="80"/><field columnname="WriteOffAmt" displayLength="22" isDisplayed="Y" isReadOnly="N" isSameLine="N" name="Write-off Amount" seqNo="90"/><field columnname="OverUnderAmt" displayLength="22" isDisplayed="Y" isReadOnly="N" isSameLine="Y" name="Over/Under Payment" seqNo="100"/><field columnname="RemainingAmt" displayLength="0" isDisplayed="Y" isReadOnly="Y" isSameLine="N" name="Remaining Amt" seqNo="110"/><field columnname="C_AllocationLine_ID" displayLength="10" isDisplayed="Y" isReadOnly="Y" isSameLine="Y" name="Allocation Line" seqNo="120"/></tab>
-  
-  <tab name="Allocations" syncfields="N" tablename="C_AllocationLine">
-    <field columnname="C_BPartner_ID" displayLength="26" isDisplayed="N" isReadOnly="N" isSameLine="N" name="Business Partner " seqNo="0"/><field columnname="IsActive" displayLength="1" isDisplayed="N" isReadOnly="N" isSameLine="N" name="Active" seqNo="0"/><field columnname="C_CashLine_ID" displayLength="26" isDisplayed="N" isReadOnly="N" isSameLine="N" name="Cash Journal Line" seqNo="0"/><field columnname="IsManual" displayLength="1" isDisplayed="N" isReadOnly="N" isSameLine="N" name="Manual" seqNo="0"/><field columnname="C_AllocationLine_ID" displayLength="14" isDisplayed="N" isReadOnly="N" isSameLine="N" name="Allocation Line" seqNo="0"/><field columnname="AD_Client_ID" displayLength="14" isDisplayed="Y" isReadOnly="Y" isSameLine="N" name="Client" seqNo="10"/><field columnname="AD_Org_ID" displayLength="14" isDisplayed="Y" isReadOnly="Y" isSameLine="Y" name="Organization" seqNo="20"/><field columnname="C_Payment_ID" displayLength="26" isDisplayed="Y" isReadOnly="Y" isSameLine="N" name="Payment" seqNo="30"/><field columnname="C_AllocationHdr_ID" displayLength="14" isDisplayed="Y" isReadOnly="Y" isSameLine="N" name="Allocation" seqNo="40"/><field columnname="DateTrx" displayLength="14" isDisplayed="Y" isReadOnly="Y" isSameLine="Y" name="Transaction Date" seqNo="50"/><field columnname="C_Invoice_ID" displayLength="26" isDisplayed="Y" isReadOnly="Y" isSameLine="N" name="Invoice" seqNo="60"/><field columnname="C_Order_ID" displayLength="26" isDisplayed="Y" isReadOnly="Y" isSameLine="Y" name="Order" seqNo="70"/><field columnname="Amount" displayLength="26" isDisplayed="Y" isReadOnly="Y" isSameLine="N" name="Amount" seqNo="80"/><field columnname="C_Currency_ID" displayLength="14" isDisplayed="Y" isReadOnly="Y" isSameLine="Y" name="Currency" seqNo="90"/><field columnname="DiscountAmt" displayLength="26" isDisplayed="Y" isReadOnly="Y" isSameLine="N" name="Discount Amount" seqNo="100"/><field columnname="WriteOffAmt" displayLength="26" isDisplayed="Y" isReadOnly="Y" isSameLine="Y" name="Write-off Amount" seqNo="110"/><field columnname="OverUnderAmt" displayLength="26" isDisplayed="Y" isReadOnly="Y" isSameLine="N" name="Over/Under Payment" seqNo="120"/></tab></window></compiereAD>
\ No newline at end of file

Added: contributions/253b/comxe/_ad2xml/xml/compiere/data/C_Tax.xml
===================================================================
--- contributions/253b/comxe/_ad2xml/xml/compiere/data/C_Tax.xml	                        (rev 0)
+++ contributions/253b/comxe/_ad2xml/xml/compiere/data/C_Tax.xml	2008-08-29 21:04:08 UTC (rev 6280)
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**********************************************************************
+* This file is part of Adempiere ERP Bazaar                           *
+* http://www.adempiere.org                                            *
+*                                                                     *
+* Copyright (C) Trifon Trifonov.                                      *
+* Copyright (C) Contributors                                          *
+*                                                                     *
+* This program is free software; you can redistribute it and/or       *
+* modify it under the terms of the GNU General Public License         *
+* as published by the Free Software Foundation; either version 2      *
+* of the License, or (at your option) any later version.              *
+*                                                                     *
+* This program is distributed in the hope that it will be useful,     *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of      *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        *
+* GNU General Public License for more details.                        *
+*                                                                     *
+* You should have received a copy of the GNU General Public License   *
+* along with this program; if not, write to the Free Software         *
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,          *
+* MA 02110-1301, USA.                                                 *
+*                                                                     *
+* Contributors:                                                       *
+* - Trifon Trifonov (trifonnt@...)                  *
+*                                                                     *
+* Sponsors:                                                           *
+* - 'D3 Soft' Ltd. (http://www.d3-soft.com)                           *
+***********************************************************************/
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="dbsql2xml.xsd">
+  
+	<tokenForCommandLineStringArrays>#</tokenForCommandLineStringArrays>
+  
+	<globalCharsetName>UTF-8</globalCharsetName>
+  
+	<globalVariables>
+		<!-- Name of Client -->
+		<!--globalVariable name="$gv_AD_Client_Value"></globalVariable-->
+		<globalVariable name="$gv_AD_Client_ID">1000000</globalVariable>
+		<globalVariable name="$gv_C_Tax_NameLike">%</globalVariable>
+	</globalVariables>
+  
+	<processingInstructions>
+		<!--<css>dbsql2xml.css</css>-->
+		<!--<xslt>dbsql2xml.xsl</xslt>-->
+	</processingInstructions>
+
+	<root name="compieredata">
+	</root>
+  
+  <!-- table xmlName="AD_Client" sql="SELECT * FROM AD_Client WHERE Value = '$gv_AD_Client_Value'" globalVariableName="$gv_AD_Client_ID" -->
+  
+	  <!-- table xmlName="C_Tax" sql="SELECT * FROM C_Tax WHERE AD_Client_ID = $gv_AD_Client_ID" -->
+	<table xmlName="C_Tax" sql="SELECT * FROM C_Tax WHERE Name Like '$gv_C_Tax_NameLike' and AD_Client_ID = '$gv_AD_Client_ID'" >
+	    
+		<column xmlName="C_Tax_ID"               	sqlName="C_Tax_ID" globalVariableName="$gv_C_Tax_ID" isOut="N" />
+	    
+	    <column xmlName="AD_Client_ID"				sqlName="AD_Client_ID" globalVariableName="$gv_AD_Client_ID" isOut="N" />
+	    <column xmlName="AD_Client_Value"			sqlStmt="SELECT Value FROM AD_Client WHERE AD_Client_ID = $gv_AD_Client_ID" />
+	    
+	    <column xmlName="AD_Org_ID"					sqlName="AD_Org_ID" globalVariableName="$gv_AD_Org_ID" isOut="N" />
+	    <column xmlName="AD_Org_Value"				sqlStmt="SELECT Value FROM AD_Org WHERE AD_Org_ID = $gv_AD_Org_ID" />
+	    
+	    <column xmlName="CreatedBy"					sqlName="CreatedBy" globalVariableName="$gv_CreatedBy" isOut="N" />
+	    <column xmlName="CreatedBy_Name"			sqlStmt="SELECT Name FROM AD_User WHERE AD_User_ID = $gv_CreatedBy" />
+	    
+	    <column xmlName="IsActive"					sqlName="IsActive" />
+	    <column xmlName="Name"						sqlName="Name" />
+	    <column xmlName="Description"				sqlName="Description" />
+	    
+	    <column xmlName="IsDefault"					sqlName="IsDefault" />
+	    <column xmlName="TaxIndicator"				sqlName="TaxIndicator" />
+	    <column xmlName="IsDocumentLevel"			sqlName="IsDocumentLevel" />
+	    <column xmlName="ValidFrom"					sqlName="ValidFrom" />
+	    <column xmlName="IsSummary"					sqlName="IsSummary" />
+	    <column xmlName="RequiresTaxCertificate"	sqlName="RequiresTaxCertificate" />
+	    <column xmlName="Rate"						sqlName="Rate" />
+	    <column xmlName="Parent_Tax_ID"				sqlName="Parent_Tax_ID" globalVariableName="$gv_Parent_Tax_ID" isOut="N" />
+	    <column xmlName="Parent_Tax_Name"			sqlStmt="SELECT Name FROM C_Tax WHERE C_Tax_ID = $gv_Parent_Tax_ID" />
+	    <column xmlName="C_Country_ID"				sqlName="C_Country_ID" globalVariableName="$gv_C_Country_ID" isOut="N" />
+	    <column xmlName="C_Country_CountryCode"		sqlStmt="SELECT CountryCode FROM C_Country WHERE C_Country_ID = $gv_C_Country_ID" />
+	    <column xmlName="C_Region_ID"				sqlName="C_Region_ID" globalVariableName="$gv_C_Region_ID" isOut="N" />
+	    <column xmlName="C_Region_Name"				sqlStmt="SELECT Name FROM C_Region WHERE C_Region_ID = $gv_C_Region_ID" />
+	    <column xmlName="C_TaxCategory_ID"			sqlName="C_TaxCategory_ID" globalVariableName="$gv_C_TaxCategory_ID" isOut="N" />
+	    <column xmlName="C_TaxCategory_Name"		sqlStmt="SELECT Name FROM C_TaxCategory WHERE C_TaxCategory_ID = $gv_C_TaxCategory_ID" />
+	    <column xmlName="IsDefault"					sqlName="IsDefault" />
+	    <column xmlName="IsTaxExempt"				sqlName="IsTaxExempt" />
+	    <column xmlName="SOPOType"					sqlName="SOPOType" />
+	    <column xmlName="IsSalesTax"				sqlName="IsSalesTax" />
+	    <column xmlName="AD_Rule_ID"				sqlName="AD_Rule_ID" globalVariableName="$gv_AD_Rule_ID" isOut="N" />
+	    <column xmlName="AD_Rule_Value"				sqlStmt="SELECT Value FROM AD_Rule WHERE AD_Rule_ID = $gv_AD_Rule_ID" />
+	    <column xmlName="M_Product_Category_ID"		sqlName="M_Product_Category_ID" globalVariableName="$gv_M_Product_Category_ID" isOut="N" />
+	    <column xmlName="M_Product_Category_Value"	sqlStmt="SELECT Value FROM M_Product_Category WHERE M_Product_Category_ID = $gv_M_Product_Category_ID" />
+		<column xmlName="M_Product_ID"				sqlName="M_Product_ID" globalVariableName="$gv_M_Product_ID" isOut="N" />
+	    <column xmlName="M_Product_Value"			sqlStmt="SELECT Value FROM M_Product WHERE M_Product_ID = $gv_M_Product_ID" />
+		<column xmlName="C_BP_Group_ID"				sqlName="C_BP_Group_ID" globalVariableName="$gv_C_BP_Group_ID" isOut="N" />
+	    <column xmlName="C_BP_Group_Value"			sqlStmt="SELECT Value FROM C_BP_Group WHERE C_BP_Group_ID = $gv_C_BP_Group_ID" />
+	    <column xmlName="C_BPartner_ID"				sqlName="C_BPartner_ID" globalVariableName="$gv_C_BPartner_ID" isOut="N" />
+	    <column xmlName="C_BPartner_Value"			sqlStmt="SELECT Value FROM C_BPartner WHERE C_BPartner_ID = $gv_C_BPartner_ID" />
+	  </table>
+  
+</config>
\ No newline at end of file


Property changes on: contributions/253b/comxe/_ad2xml/xml/compiere/data/C_Tax.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain


Property changes on: contributions/253b/comxe/_xml2ad/plugins/org.adempiere.importer.yahoostore-320.0.8.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: contributions/253b/comxe/_xml2ad/plugins/org.compiere.compilo.importer.core-320.0.8.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: contributions/253b/comxe/_xml2ad/plugins/org.compiere.compilo.importer.standard-320.0.19.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: contributions/253b/comxe/_xml2ad/plugins/src/org.adempiere.importer.yahoostore/doc/changeLog.txt
===================================================================
--- contributions/253b/comxe/_xml2ad/plugins/src/org.adempiere.importer.yahoostore/doc/changeLog.txt	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_xml2ad/plugins/src/org.adempiere.importer.yahoostore/doc/changeLog.txt	2008-08-29 21:04:08 UTC (rev 6280)
@@ -1,5 +1,8 @@
 "Yahoo Store Importer" plug-in
 
+320.0.8 - Adempiere compatible
+ * Migrated to core plug-in version 320.0.8
+ 
 320.0.7 - Adempiere compatible
  * Migrated to core plug-in version 320.0.7
  

Modified: contributions/253b/comxe/_xml2ad/plugins/src/org.adempiere.importer.yahoostore/plugin.xml
===================================================================
--- contributions/253b/comxe/_xml2ad/plugins/src/org.adempiere.importer.yahoostore/plugin.xml	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_xml2ad/plugins/src/org.adempiere.importer.yahoostore/plugin.xml	2008-08-29 21:04:08 UTC (rev 6280)
@@ -3,11 +3,11 @@
 <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.4" "http://jpf.sourceforge.net/plugin_0_4.dtd">
 
 <plugin id="org.adempiere.importer.yahoostore" 
-        version="320.0.7"
+        version="320.0.8"
 >
 	<requires>
 		<import plugin-id="org.compiere.compilo.importer.core"
-		        plugin-version="320.0.7"
+		        plugin-version="320.0.8"
 		/>
 	</requires>	
 	

Modified: contributions/253b/comxe/_xml2ad/plugins/src/org.adempiere.importer.yahoostore/source/org/adempiere/importer/yahoostore/YahooStoreOrderImporter.java
===================================================================
--- contributions/253b/comxe/_xml2ad/plugins/src/org.adempiere.importer.yahoostore/source/org/adempiere/importer/yahoostore/YahooStoreOrderImporter.java	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_xml2ad/plugins/src/org.adempiere.importer.yahoostore/source/org/adempiere/importer/yahoostore/YahooStoreOrderImporter.java	2008-08-29 21:04:08 UTC (rev 6280)
@@ -27,7 +27,6 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
 
 public class YahooStoreOrderImporter extends TableImporter {
 
@@ -704,16 +703,6 @@
 		outElement.appendChild(result);
 	}
 
-	private Element createNewTextElement(String elementName, String textNodeValue, Document outDocument) {
-		Element newElement = outDocument.createElement(elementName);
-		
-		Text newText = outDocument.createTextNode(textNodeValue);
-		
-		newElement.appendChild(newText);
-		
-		return newElement;
-	}
-	
 	public static int getBPartnerLocation_ID (int C_BPartner_ID, int AD_Client_ID
 			, String Address1, String Address2, String Address3, String city
 			, int C_Region_ID, int C_Country_ID, String postal

Modified: contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.core/doc/changeLog.txt
===================================================================
--- contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.core/doc/changeLog.txt	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.core/doc/changeLog.txt	2008-08-29 21:04:08 UTC (rev 6280)
@@ -1,3 +1,7 @@
+320.0.8
+* Adempiere compatible.
+  Refactored TableImporter class. Added method: protected Element createNewTextElement(..)
+  
 320.0.7
 * Adempiere compatible.
 

Modified: contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.core/org/compiere/compilo/importer/core/TableImporter.java
===================================================================
--- contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.core/org/compiere/compilo/importer/core/TableImporter.java	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.core/org/compiere/compilo/importer/core/TableImporter.java	2008-08-29 21:04:08 UTC (rev 6280)
@@ -7,8 +7,10 @@
 import org.apache.commons.logging.Log;
 
 import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
+import org.w3c.dom.Text;
 
 public abstract class TableImporter {
 	
@@ -54,5 +56,16 @@
 	public void setRootElement(String rootElement) {
 		this.rootElement = rootElement;
 	}
+	
+
+	protected Element createNewTextElement(String elementName, String textNodeValue, Document outDocument) {
+		Element newElement = outDocument.createElement(elementName);
 		
+		Text newText = outDocument.createTextNode(textNodeValue);
+		
+		newElement.appendChild(newText);
+		
+		return newElement;
+	}
+		
 }

Modified: contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.core/plugin.xml
===================================================================
--- contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.core/plugin.xml	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.core/plugin.xml	2008-08-29 21:04:08 UTC (rev 6280)
@@ -3,7 +3,7 @@
 <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.4" "http://jpf.sourceforge.net/plugin_0_4.dtd">
 
 <plugin id="org.compiere.compilo.importer.core" 
-        version="320.0.7" 
+        version="320.0.8" 
         class="org.compiere.compilo.importer.core.ImporterPlugin">
 	
 	<runtime>

Modified: contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/doc/changeLog.txt
===================================================================
--- contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/doc/changeLog.txt	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/doc/changeLog.txt	2008-08-29 21:04:08 UTC (rev 6280)
@@ -1,3 +1,8 @@
+320.0.19 - Adempiere compatible
+   * Migrated to core plug-in version 320.0.8 - Adempiere compatible
+   * Developed import of C_TaxCategory
+   * Developed import of C_Tax
+   
 320.0.18 - Adempiere compatible
    * AD_Client added support for:
      <AD_Language>de_DE</AD_Language>

Modified: contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/plugin.xml
===================================================================
--- contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/plugin.xml	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/plugin.xml	2008-08-29 21:04:08 UTC (rev 6280)
@@ -3,11 +3,11 @@
 <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.4" "http://jpf.sourceforge.net/plugin_0_4.dtd">
 
 <plugin id="org.compiere.compilo.importer.standard" 
-        version="320.0.18"
+        version="320.0.19"
 >
 	<requires>
 		<import plugin-id="org.compiere.compilo.importer.core"
-		        plugin-version="320.0.7"
+		        plugin-version="320.0.8"
 		/>
 	</requires>	
 	
@@ -148,4 +148,20 @@
 		<parameter id="description" value="C_BPartner Importer"/>
 	</extension>
 	
+	<extension plugin-id="org.compiere.compilo.importer.core" 
+	           point-id="TableImporter" 
+	           id="C_TaxCategoryImporter">
+		<parameter id="class" value="org.compiere.compilo.importer.standard.C_TaxCategoryImporter"/>
+		<parameter id="tableName" value="C_TaxCategory"/>
+		<parameter id="description" value="C_TaxCategory Importer"/>
+	</extension>
+	
+	<extension plugin-id="org.compiere.compilo.importer.core" 
+	           point-id="TableImporter" 
+	           id="C_TaxImporter">
+		<parameter id="class" value="org.compiere.compilo.importer.standard.C_TaxImporter"/>
+		<parameter id="tableName" value="C_Tax"/>
+		<parameter id="description" value="C_Tax Importer"/>
+	</extension>
+	
 </plugin>

Modified: contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_ClientImporter.java
===================================================================
--- contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_ClientImporter.java	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_ClientImporter.java	2008-08-29 21:04:08 UTC (rev 6280)
@@ -46,7 +46,6 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
-import org.w3c.dom.Text;
 
 /**
  *	@author Trifon Trifonov
@@ -225,14 +224,4 @@
 		outElement.appendChild(result);
 	}
 
-	private Element createNewTextElement(String elementName, String textNodeValue, Document outDocument) {
-		Element newElement = outDocument.createElement(elementName);
-		
-		Text newText = outDocument.createTextNode(textNodeValue);
-		
-		newElement.appendChild(newText);
-		
-		return newElement;
-	}
-	
 }

Modified: contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_FieldGroupImporter.java
===================================================================
--- contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_FieldGroupImporter.java	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_FieldGroupImporter.java	2008-08-29 21:04:08 UTC (rev 6280)
@@ -41,7 +41,6 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
-import org.w3c.dom.Text;
 
 /**
  *	@author Trifon Trifonov
@@ -181,15 +180,5 @@
 		result.appendChild(createNewTextElement("result", ""+resultSave, outDocument));
 		outElement.appendChild(result);
 	}
-
-	private Element createNewTextElement(String elementName, String textNodeValue, Document outDocument) {
-		Element newElement = outDocument.createElement(elementName);
-		
-		Text newText = outDocument.createTextNode(textNodeValue);
-		
-		newElement.appendChild(newText);
-		
-		return newElement;
-	}
 	
 }

Modified: contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_ImpFormatImporter.java
===================================================================
--- contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_ImpFormatImporter.java	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_ImpFormatImporter.java	2008-08-29 21:04:08 UTC (rev 6280)
@@ -56,7 +56,6 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
 
 public class AD_ImpFormatImporter extends TableImporter {
 
@@ -390,16 +389,6 @@
 		result.appendChild(createNewTextElement("result", ""+resultSave, outDocument));
 		outElement.appendChild(result);
 	}
-
-	private Element createNewTextElement(String elementName, String textNodeValue, Document outDocument) {
-		Element newElement = outDocument.createElement(elementName);
-		
-		Text newText = outDocument.createTextNode(textNodeValue);
-		
-		newElement.appendChild(newText);
-		
-		return newElement;
-	}
 	
 	/* $if isAdempiere $ */
 public static X_AD_ImpFormat_Row getByAD_ImpFormat_IDandName (Properties ctx, int AD_ImpFormat_ID, String Name, String trxName) throws Exception  // Adempiere

Modified: contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_LanguageImporter.java
===================================================================
--- contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_LanguageImporter.java	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_LanguageImporter.java	2008-08-29 21:04:08 UTC (rev 6280)
@@ -41,7 +41,6 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
-import org.w3c.dom.Text;
 
 /**
  *	@author Trifon Trifonov
@@ -230,15 +229,5 @@
 		result.appendChild(createNewTextElement("result", ""+resultSave, outDocument));
 		outElement.appendChild(result);
 	}
-
-	private Element createNewTextElement(String elementName, String textNodeValue, Document outDocument) {
-		Element newElement = outDocument.createElement(elementName);
-		
-		Text newText = outDocument.createTextNode(textNodeValue);
-		
-		newElement.appendChild(newText);
-		
-		return newElement;
-	}
 	
 }

Modified: contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_MessageImporter.java
===================================================================
--- contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_MessageImporter.java	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_MessageImporter.java	2008-08-29 21:04:08 UTC (rev 6280)
@@ -47,7 +47,6 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
-import org.w3c.dom.Text;
 
 /**
  *	@author Trifon Trifonov
@@ -230,15 +229,5 @@
 		result.appendChild(createNewTextElement("result", ""+resultSave, outDocument));
 		outElement.appendChild(result);
 	}
-
-	private Element createNewTextElement(String elementName, String textNodeValue, Document outDocument) {
-		Element newElement = outDocument.createElement(elementName);
-		
-		Text newText = outDocument.createTextNode(textNodeValue);
-		
-		newElement.appendChild(newText);
-		
-		return newElement;
-	}
 	
 }

Modified: contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_PrintFormatImporter.java
===================================================================
--- contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_PrintFormatImporter.java	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_PrintFormatImporter.java	2008-08-29 21:04:08 UTC (rev 6280)
@@ -52,7 +52,6 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
 
 /**
  * @author Carlos Ruiz
@@ -857,18 +856,7 @@
 		result.appendChild(createNewTextElement("result", ""+resultSave, outDocument));
 		outElement.appendChild(result);
 	}
-
-	private Element createNewTextElement(String elementName, String textNodeValue, Document outDocument) {
-		Element newElement = outDocument.createElement(elementName);
-		
-		Text newText = outDocument.createTextNode(textNodeValue);
-		
-		newElement.appendChild(newText);
-		
-		return newElement;
-	}
 	
-	
 	/* $if isAdempiere $ */
 public static X_AD_PrintFormatItem getByAD_PrintFormat_IDandName (Properties ctx, int AD_PrintFormat_ID, String Name, String trxName)  // Adempiere
 	/* $else$

Modified: contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_PrintTableFormatImporter.java
===================================================================
--- contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_PrintTableFormatImporter.java	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_PrintTableFormatImporter.java	2008-08-29 21:04:08 UTC (rev 6280)
@@ -41,7 +41,6 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
-import org.w3c.dom.Text;
 
 /**
  * @author Carlos Ruiz
@@ -396,14 +395,4 @@
 		outElement.appendChild(result);
 	}
 
-	private Element createNewTextElement(String elementName, String textNodeValue, Document outDocument) {
-		Element newElement = outDocument.createElement(elementName);
-		
-		Text newText = outDocument.createTextNode(textNodeValue);
-		
-		newElement.appendChild(newText);
-		
-		return newElement;
-	}
-	
 }

Modified: contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_ReportViewImporter.java
===================================================================
--- contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_ReportViewImporter.java	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_ReportViewImporter.java	2008-08-29 21:04:08 UTC (rev 6280)
@@ -12,7 +12,6 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
-import org.w3c.dom.Text;
 
 public class AD_ReportViewImporter extends TableImporter {
 
@@ -178,15 +177,5 @@
 		result.appendChild(createNewTextElement("result", ""+resultSave, outDocument));
 		outElement.appendChild(result);
 	}
-
-	private Element createNewTextElement(String elementName, String textNodeValue, Document outDocument) {
-		Element newElement = outDocument.createElement(elementName);
-		
-		Text newText = outDocument.createTextNode(textNodeValue);
-		
-		newElement.appendChild(newText);
-		
-		return newElement;
-	}
 	
 }

Modified: contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_RoleImporter.java
===================================================================
--- contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_RoleImporter.java	2008-08-29 20:45:31 UTC (rev 6279)
+++ contributions/253b/comxe/_xml2ad/plugins/src/org.compiere.compilo.importer.standard/source/org/compiere/compilo/importer/standard/AD_RoleImporter.java	2008-08-29 21:04:08 UTC (rev 6280)
@@ -41,7 +41,6 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
-import org.w3c.dom.Text;
 
 /**
  *	@author Trifon Trifonov
@@ -330,15 +329,5 @@

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6288
          http://adempiere.svn.sourceforge.net/adempiere/?rev=6288&view=rev
Author:   trifonnt
Date:     2008-08-30 12:29:30 +0000 (Sat, 30 Aug 2008)

Log Message:
-----------
small typo mistake fixes.

Modified Paths:
--------------
    contributions/253b/comxe/_Project-ID-AdempiereJasper/.classpath
    contributions/253b/comxe/_Project-ID-AdempiereJasper/ReadMe.txt
    contributions/253b/comxe/_Project-ID-AdempiereJasper/plugins/src/org.compiere.compilo.importer.jasperreports/source/org/compiere/compilo/importer/jasperreports/AD_ProcessImporter.java

Modified: contributions/253b/comxe/_Project-ID-AdempiereJasper/.classpath
===================================================================
--- contributions/253b/comxe/_Project-ID-AdempiereJasper/.classpath	2008-08-30 11:12:36 UTC (rev 6287)
+++ contributions/253b/comxe/_Project-ID-AdempiereJasper/.classpath	2008-08-30 12:29:30 UTC (rev 6288)
@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" output="plugins/src/org.compiere.compilo.importer.jasperreports/classes" path="plugins/src/org.compiere.compilo.importer.jasperreports/source"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/dbPort"/>
 	<classpathentry kind="lib" path="lib/commons-logging.jar"/>
 	<classpathentry kind="lib" path="lib/jpf.jar"/>
 	<classpathentry kind="lib" path="lib/jpf-boot.jar"/>

Modified: contributions/253b/comxe/_Project-ID-AdempiereJasper/ReadMe.txt
===================================================================
--- contributions/253b/comxe/_Project-ID-AdempiereJasper/ReadMe.txt	2008-08-30 11:12:36 UTC (rev 6287)
+++ contributions/253b/comxe/_Project-ID-AdempiereJasper/ReadMe.txt	2008-08-30 12:29:30 UTC (rev 6288)
@@ -2,17 +2,17 @@
 
 This is work in progress, so please be patient.
 
-Any comments and requests for improvements are wellcome.
+Any comments and requests for improvements are welcome.
 
-Any improvements and patches are very wellcome and highly appreciated.
+Any improvements and patches are very welcome and highly appreciated.
 
 Target integration between Compiere and Jasper Reports.
 
 Steps that user must do:
-01) Copy "build-ID-001.properties.sampe" into "build-ID-001.properties"
+01) Copy "build-ID-001.properties.sample" into "build-ID-001.properties"
 02) Set proper setting in "build-ID-001.properties" file.
 
-03) Copy "build-ID-001.[bat|sh].sampe" into "build-ID-001.[bat|sh]"
+03) Copy "build-ID-001.[bat|sh].sample" into "build-ID-001.[bat|sh]"
 04) Set proper setting in "build-ID-001.[bat|sh]" file.
 
 05) Open shell console in current directory(_Project-ID-AdempiereJasper) and execute:

Modified: contributions/253b/comxe/_Project-ID-AdempiereJasper/plugins/src/org.compiere.compilo.importer.jasperreports/source/org/compiere/compilo/importer/jasperreports/AD_ProcessImporter.java
===================================================================
--- contributions/253b/comxe/_Project-ID-AdempiereJasper/plugins/src/org.compiere.compilo.importer.jasperreports/source/org/compiere/compilo/importer/jasperreports/AD_ProcessImporter.java	2008-08-30 11:12:36 UTC (rev 6287)
+++ contributions/253b/comxe/_Project-ID-AdempiereJasper/plugins/src/org.compiere.compilo.importer.jasperreports/source/org/compiere/compilo/importer/jasperreports/AD_ProcessImporter.java	2008-08-30 12:29:30 UTC (rev 6288)
@@ -19,7 +19,7 @@
 
 	
 	/*
-	 * Aim of this plugin is to import record having this structure:
+	 * Aim of this plug-in is to import record having this structure:
 	 * 
 	<AD_Process>
 	  <AD_Client_Value>GardenWorld</AD_Client_Value>
@@ -47,8 +47,7 @@
 	 */
 	public void importTable(Node AD_Process_Node, Element outElement) 
 		throws DOMException, SQLException, XPathExpressionException, ImportException {
-		// TODO - now "outElement" is not used... 
-		// This means that we do not return result in xml file...
+		
 		Document outDocument = outElement.getOwnerDocument();
 		Element result = outDocument.createElement("AD_Process");
 		
@@ -70,23 +69,23 @@
 		
 		name = XMLHelper.getString("Name", AD_Process_Node);
 		log.info("Name = [" + name +"]");
-		result.appendChild(createNewTextElement("Name", ""+name, outDocument));
+		result.appendChild(createNewTextElement("Name", name, outDocument));
 		
 		value = XMLHelper.getString("Value", AD_Process_Node);
 		log.info("Value = [" + value +"]");
-		result.appendChild(createNewTextElement("Value", ""+value, outDocument));
+		result.appendChild(createNewTextElement("Value", value, outDocument));
 		
 		AD_Client_Value = XMLHelper.getString("AD_Client_Value", AD_Process_Node);
 		log.info("AD_Client_Value = [" + AD_Client_Value +"]");
-		result.appendChild(createNewTextElement("AD_Client_Value", ""+AD_Client_Value, outDocument));
+		result.appendChild(createNewTextElement("AD_Client_Value", AD_Client_Value, outDocument));
 		
 		CreatedBy_Name = XMLHelper.getString("CreatedBy_Name", AD_Process_Node);
 		log.info("CreatedBy_Name = [" + CreatedBy_Name +"]");
-		result.appendChild(createNewTextElement("CreatedBy_Name", ""+CreatedBy_Name, outDocument));
+		result.appendChild(createNewTextElement("CreatedBy_Name", CreatedBy_Name, outDocument));
 		
 		UpdatedBy_Name = XMLHelper.getString("UpdatedBy_Name", AD_Process_Node);
 		log.info("UpdatedBy_Name = [" + UpdatedBy_Name +"]");
-		result.appendChild(createNewTextElement("UpdatedBy_Name", ""+UpdatedBy_Name, outDocument));
+		result.appendChild(createNewTextElement("UpdatedBy_Name", UpdatedBy_Name, outDocument));
 		
 		log.info("_______________________________________________");
 		
@@ -98,17 +97,17 @@
 			AD_Process_ID = XMLHelper.getIDbyName("AD_Process", name, AD_Client_Value);
 		}
 		log.info("AD_Process_ID = " + AD_Process_ID);
-		result.appendChild(createNewTextElement("AD_Process_ID", ""+AD_Process_ID, outDocument));
+		result.appendChild(createNewTextElement("AD_Process_ID", String.valueOf( AD_Process_ID ), outDocument));
 		
 		// Search for AD_Client_ID by Value...
 		AD_Client_ID = XMLHelper.getIDbyValue("AD_Client", AD_Client_Value, AD_Client_Value);
 		log.info("AD_Client_ID = " + AD_Client_ID);
-		result.appendChild(createNewTextElement("AD_Client_ID", ""+AD_Client_ID, outDocument));
+		result.appendChild(createNewTextElement("AD_Client_ID", String.valueOf( AD_Client_ID ), outDocument));
 		
 		// Search for AD_Org_ID by Value...
 		AD_Org_ID = XMLHelper.getIDbyValue("AD_Org", AD_Org_Value, AD_Client_Value);
 		log.info("AD_Org_ID = " + AD_Org_ID);
-		result.appendChild(createNewTextElement("AD_Org_ID", ""+AD_Org_ID, outDocument));
+		result.appendChild(createNewTextElement("AD_Org_ID", String.valueOf( AD_Org_ID ), outDocument));
 		
 		
 		if (value == null || "".equals(value) ||
@@ -123,16 +122,14 @@
 		// Search for AD_User by Name...
 		CreatedBy_ID = XMLHelper.getIDbyName("AD_User", CreatedBy_Name, AD_Client_Value);
 		log.info("CreatedBy_ID = " + CreatedBy_ID);
-		result.appendChild(createNewTextElement("CreatedBy_ID", ""+CreatedBy_ID, outDocument));
+		result.appendChild(createNewTextElement("CreatedBy_ID", String.valueOf( CreatedBy_ID ), outDocument));
 		if (CreatedBy_Name != null && !"".equals(CreatedBy_Name)) {
-			//adRole.set_ValueNoCheck("CreatedBy", CreatedBy_ID);
 			Env.setContext(Env.getCtx(), "#AD_User_ID", CreatedBy_ID);
 		}
 		UpdatedBy_ID = XMLHelper.getIDbyName("AD_User", UpdatedBy_Name, AD_Client_Value);
 		log.info("UpdatedBy_ID = " + UpdatedBy_ID);
-		result.appendChild(createNewTextElement("UpdatedBy_ID", ""+UpdatedBy_ID, outDocument));
+		result.appendChild(createNewTextElement("UpdatedBy_ID", String.valueOf( UpdatedBy_ID ), outDocument));
 		if (UpdatedBy_Name != null && !"".equals(UpdatedBy_Name)) {
-			//adRole.set_ValueNoCheck("CreatedBy", CreatedBy_ID);
 			Env.setContext(Env.getCtx(), "#AD_User_ID", UpdatedBy_ID);
 		}
 		
@@ -142,32 +139,32 @@
 		MProcess process = new MProcess(Env.getCtx(), AD_Process_ID, null);
 		
 		if (name != null && !"".equals(name)) {
-			process.setName(name);
+			process.setName( name );
 		}
 		if (value != null && !"".equals(value)) {
-			process.setValue(value);
+			process.setValue( value );
 		}
 		
 		String Description = XMLHelper.getString("Description", AD_Process_Node);
 		log.info("Description = " + Description);
-		result.appendChild(createNewTextElement("Description", ""+Description, outDocument));
+		result.appendChild(createNewTextElement("Description", Description, outDocument));
 		if (Description != null && !"".equals(Description)) {
 			process.setDescription(Description);
 		}
 
 		String Classname = XMLHelper.getString("Classname", AD_Process_Node);
 		log.info("Classname = " + Classname);
-		result.appendChild(createNewTextElement("Classname", ""+Classname, outDocument));
+		result.appendChild(createNewTextElement("Classname", Classname, outDocument));
 		if (Classname != null && !"".equals(Classname)) {
 			process.setClassname(Classname);
 		}
 		
 		String EntityType = XMLHelper.getString("EntityType", AD_Process_Node);
 		log.info("EntityType = " + EntityType);
-		result.appendChild(createNewTextElement("EntityType", ""+EntityType, outDocument));
+		result.appendChild(createNewTextElement("EntityType", EntityType, outDocument));
 		if (EntityType != null && !"".equals(EntityType)) {
 			String entityTypeValue = XMLHelper.reverseReference("_Entity Type", EntityType);
-			result.appendChild(createNewTextElement("EntityTypeValue", ""+entityTypeValue, outDocument));
+			result.appendChild(createNewTextElement("EntityTypeValue", entityTypeValue, outDocument));
     		if (entityTypeValue != null) {
     			process.setEntityType(entityTypeValue);
     		} else {
@@ -179,10 +176,10 @@
 		
 		String AccessLevel = XMLHelper.getString("AccessLevel", AD_Process_Node);
 		log.info("AccessLevel = " + AccessLevel);
-		result.appendChild(createNewTextElement("AccessLevel", ""+AccessLevel, outDocument));
+		result.appendChild(createNewTextElement("AccessLevel", AccessLevel, outDocument));
 		if (AccessLevel != null && !"".equals(AccessLevel)) {
 			String accessLevelValue = XMLHelper.reverseReference("AD_Table Access Levels", "Client+Organization");
-			result.appendChild(createNewTextElement("AccessLevelValue", ""+accessLevelValue, outDocument));
+			result.appendChild(createNewTextElement("AccessLevelValue", accessLevelValue, outDocument));
 			if (accessLevelValue != null) {
 				process.setAccessLevel(accessLevelValue);
 			} else {
@@ -193,14 +190,13 @@
 		
 		String JasperReport = XMLHelper.getString("JasperReport", AD_Process_Node);
 		log.info("JasperReport = " + JasperReport);
-		result.appendChild(createNewTextElement("JasperReport", ""+JasperReport, outDocument));
+		result.appendChild(createNewTextElement("JasperReport", JasperReport, outDocument));
 		if (JasperReport != null && !"".equals(JasperReport)) {
 			
 			try {
-				process.setJasperReport(JasperReport);
+				process.setJasperReport( JasperReport );
 			} catch (Error er) {
 				er.printStackTrace();
-				
 				//process.set_CustomColumn("JasperReport", JasperReport);
 			}
 		}
@@ -208,7 +204,7 @@
 		boolean resultSave = true;
 		resultSave = process.save();
 		log.info("--- RESULT SAVE = " + resultSave);
-		result.appendChild(createNewTextElement("result", ""+resultSave, outDocument));
+		result.appendChild(createNewTextElement("result", String.valueOf( resultSave ), outDocument));
 		outElement.appendChild(result);
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6287
          http://adempiere.svn.sourceforge.net/adempiere/?rev=6287&view=rev
Author:   trifonnt
Date:     2008-08-30 11:12:36 +0000 (Sat, 30 Aug 2008)

Log Message:
-----------
documentation.

Modified Paths:
--------------
    contributions/253b/comxe/_Project-ID-TEMPLATE/doc/jasper-reports/SalesInvoice.jrxml
    contributions/253b/comxe/_Project-ID-TEMPLATE/doc/jasper-reports/SalesInvoiceSubreport.jrxml
    contributions/253b/comxe/_Project-ID-TEMPLATE/doc/readme.txt

Modified: contributions/253b/comxe/_Project-ID-TEMPLATE/doc/jasper-reports/SalesInvoice.jrxml
===================================================================
--- contributions/253b/comxe/_Project-ID-TEMPLATE/doc/jasper-reports/SalesInvoice.jrxml	2008-08-30 05:29:39 UTC (rev 6286)
+++ contributions/253b/comxe/_Project-ID-TEMPLATE/doc/jasper-reports/SalesInvoice.jrxml	2008-08-30 11:12:36 UTC (rev 6287)
@@ -27,7 +27,7 @@
 		<defaultValueExpression ><![CDATA[new java.math.BigDecimal("11")]]></defaultValueExpression>
 	</parameter>
 	<parameter name="DocumentNo" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["100003"]]></defaultValueExpression>
+		<defaultValueExpression ><![CDATA["100000"]]></defaultValueExpression>
 	</parameter>
 	<queryString><![CDATA[SELECT *
 FROM C_Invoice inv
@@ -163,17 +163,30 @@
 			</band>
 		</pageHeader>
 		<columnHeader>
-			<band height="30"  isSplitAllowed="true" >
+			<band height="14"  isSplitAllowed="true" >
+				<staticText>
+					<reportElement
+						x="0"
+						y="0"
+						width="79"
+						height="14"
+						key="staticText-3"/>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="2" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<textElement>
+						<font/>
+					</textElement>
+				<text><![CDATA[Static Text]]></text>
+				</staticText>
 			</band>
 		</columnHeader>
 		<detail>
-			<band height="40"  isSplitAllowed="true" >
+			<band height="14"  isSplitAllowed="true" >
 				<subreport  isUsingCache="true">
 					<reportElement
 						x="0"
 						y="0"
 						width="535"
-						height="40"
+						height="14"
 						key="subreport-1"/>
 					<subreportParameter  name="C_Invoice_ID">
 						<subreportParameterExpression><![CDATA[$F{C_INVOICE_ID}]]></subreportParameterExpression>

Modified: contributions/253b/comxe/_Project-ID-TEMPLATE/doc/jasper-reports/SalesInvoiceSubreport.jrxml
===================================================================
--- contributions/253b/comxe/_Project-ID-TEMPLATE/doc/jasper-reports/SalesInvoiceSubreport.jrxml	2008-08-30 05:29:39 UTC (rev 6286)
+++ contributions/253b/comxe/_Project-ID-TEMPLATE/doc/jasper-reports/SalesInvoiceSubreport.jrxml	2008-08-30 11:12:36 UTC (rev 6287)
@@ -8,12 +8,12 @@
 		 orientation="Portrait"
 		 pageWidth="595"
 		 pageHeight="842"
-		 columnWidth="535"
+		 columnWidth="595"
 		 columnSpacing="0"
-		 leftMargin="30"
-		 rightMargin="30"
-		 topMargin="20"
-		 bottomMargin="20"
+		 leftMargin="0"
+		 rightMargin="0"
+		 topMargin="0"
+		 bottomMargin="0"
 		 whenNoDataType="NoPages"
 		 isTitleNewPage="false"
 		 isSummaryNewPage="false">
@@ -83,25 +83,25 @@
 			</band>
 		</background>
 		<title>
-			<band height="8"  isSplitAllowed="true" >
+			<band height="0"  isSplitAllowed="true" >
 			</band>
 		</title>
 		<pageHeader>
-			<band height="12"  isSplitAllowed="true" >
+			<band height="0"  isSplitAllowed="true" >
 			</band>
 		</pageHeader>
 		<columnHeader>
-			<band height="27"  isSplitAllowed="true" >
+			<band height="14"  isSplitAllowed="true" >
 				<staticText>
 					<reportElement
 						x="0"
 						y="0"
 						width="70"
-						height="20"
+						height="14"
 						key="staticText-1"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<box topBorder="1Point" topBorderColor="#000000" topPadding="1" leftBorder="1Point" leftBorderColor="#000000" leftPadding="2" rightBorder="1Point" rightBorderColor="#000000" bottomBorder="1Point" bottomBorderColor="#000000"/>
 					<textElement>
-						<font/>
+						<font size="10"/>
 					</textElement>
 				<text><![CDATA[Prod. Name]]></text>
 				</staticText>
@@ -110,60 +110,56 @@
 						x="70"
 						y="0"
 						width="60"
-						height="20"
+						height="14"
 						key="staticText-2"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<box topBorder="1Point" topBorderColor="#000000" topPadding="1" leftBorder="1Point" leftBorderColor="#000000" leftPadding="2" rightBorder="1Point" rightBorderColor="#000000" bottomBorder="1Point" bottomBorderColor="#000000"/>
 					<textElement>
-						<font/>
+						<font size="10"/>
 					</textElement>
 				<text><![CDATA[Qty]]></text>
 				</staticText>
 			</band>
 		</columnHeader>
 		<detail>
-			<band height="24"  isSplitAllowed="true" >
+			<band height="14"  isSplitAllowed="true" >
 				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
-						x="1"
-						y="4"
+						x="0"
+						y="0"
 						width="70"
-						height="20"
+						height="14"
 						key="textField-1"/>
-					<box topBorder="1Point" topBorderColor="#000000" topPadding="1" leftBorder="1Point" leftBorderColor="#000000" leftPadding="1" rightBorder="1Point" rightBorderColor="#000000" rightPadding="1" bottomBorder="1Point" bottomBorderColor="#000000" bottomPadding="1"/>
+					<box topBorder="1Point" topBorderColor="#000000" topPadding="1" leftBorder="1Point" leftBorderColor="#000000" leftPadding="2" rightBorder="1Point" rightBorderColor="#000000" bottomBorder="1Point" bottomBorderColor="#000000"/>
 					<textElement>
-						<font/>
+						<font size="8"/>
 					</textElement>
 				<textFieldExpression   class="java.lang.String"><![CDATA[$F{PROD_NAME}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						x="70"
-						y="4"
+						y="0"
 						width="60"
-						height="20"
+						height="14"
 						key="textField-2"/>
-					<box topBorder="1Point" topBorderColor="#000000" topPadding="1" leftBorder="1Point" leftBorderColor="#000000" leftPadding="1" rightBorder="1Point" rightBorderColor="#000000" rightPadding="1" bottomBorder="1Point" bottomBorderColor="#000000" bottomPadding="1"/>
+					<box topBorder="1Point" topBorderColor="#000000" topPadding="1" leftBorder="1Point" leftBorderColor="#000000" leftPadding="2" rightBorder="1Point" rightBorderColor="#000000" bottomBorder="1Point" bottomBorderColor="#000000"/>
 					<textElement>
-						<font/>
+						<font size="8"/>
 					</textElement>
 				<textFieldExpression   class="java.math.BigDecimal"><![CDATA[$F{QTYINVOICED}]]></textFieldExpression>
 				</textField>
 			</band>
 		</detail>
 		<columnFooter>
-			<band height="6"  isSplitAllowed="true" >
+			<band height="0"  isSplitAllowed="true" >
 			</band>
 		</columnFooter>
 		<pageFooter>
-			<band height="8"  isSplitAllowed="true" >
+			<band height="0"  isSplitAllowed="true" >
 			</band>
 		</pageFooter>
-		<lastPageFooter>
-			<band height="4"  isSplitAllowed="true" >
-			</band>
-		</lastPageFooter>
 		<summary>
-			<band height="8"  isSplitAllowed="true" >
+			<band height="0"  isSplitAllowed="true" >
 			</band>
 		</summary>
 </jasperReport>

Modified: contributions/253b/comxe/_Project-ID-TEMPLATE/doc/readme.txt
===================================================================
--- contributions/253b/comxe/_Project-ID-TEMPLATE/doc/readme.txt	2008-08-30 05:29:39 UTC (rev 6286)
+++ contributions/253b/comxe/_Project-ID-TEMPLATE/doc/readme.txt	2008-08-30 11:12:36 UTC (rev 6287)
@@ -19,7 +19,7 @@
 
 -08) Big companies requirement: Value of the fields to be stored in a way dependent on Organization.
 -09) Window 'System Element', tab 'Processes' should be renamed to 'Used in Process Parameters'.
--10) Tax Import/Export functionality.
++10) Tax Import/Export functionality.
 -11) Field Organization on all windows must allow user to choose organization from a tree-table component.
      And records must be visible only for user that have access.
 -12) There are cases when Vendors send Invoices with incorrect amount.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6276
          http://adempiere.svn.sourceforge.net/adempiere/?rev=6276&view=rev
Author:   hengsin
Date:     2008-08-29 07:57:02 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------
* merge revision 61272-6275 from branches/adempiere341

Revision Links:
--------------
    http://adempiere.svn.sourceforge.net/adempiere/?rev=61272&view=rev

Modified Paths:
--------------
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/WReport.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/component/CWindowToolbar.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WEditor.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WEditorPopupMenu.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADForm.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADTabpanel.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/LogoutPanel.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuPanel.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuSearchPanel.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/WDocActionPanel.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java

Property Changed:
----------------
    branches/stable/zkwebui/WEB-INF/src/
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/component/GridTableListModel.java


Property changes on: branches/stable/zkwebui/WEB-INF/src
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/adempiere341/zkwebui/WEB-INF/src:6036-6040,6081,6095,6125,6136,6147-6148,6183-6238,6241,6244,6246
/trunk/extend/posterita/webui/WEB-INF/src:3753-3764
/trunk/extension/posterita/webui/WEB-INF/src:3765-4943
   + /branches/adempiere341/zkwebui/WEB-INF/src:6036-6040,6081,6095,6125,6136,6147-6148,6183-6238,6241,6244,6246,6272-6275
/trunk/extend/posterita/webui/WEB-INF/src:3753-3764
/trunk/extension/posterita/webui/WEB-INF/src:3765-4943

Modified: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
===================================================================
--- branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java	2008-08-29 07:12:00 UTC (rev 6275)
+++ branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java	2008-08-29 07:57:02 UTC (rev 6276)
@@ -193,10 +193,6 @@
     	return appDesktop;
     }
     
-	public boolean isAsap() {
-		return true;
-	}
-	
 	public void onEvent(Event event) {
 		if (event instanceof ClientInfoEvent) {
 			ClientInfoEvent c = (ClientInfoEvent)event;

Modified: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
===================================================================
--- branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java	2008-08-29 07:12:00 UTC (rev 6275)
+++ branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java	2008-08-29 07:57:02 UTC (rev 6276)
@@ -123,14 +123,14 @@
 		String label = Msg.getMsg(Env.getCtx(), "Ok");
 		bOK = new Button(label.replaceAll("&", ""));
 		bOK.setImage("/images/Ok16.png");
-		bOK.setName("ok");
+		bOK.setId("Ok");
 		bOK.addEventListener(Events.ON_CLICK, this);
 		hbox.appendChild(bOK);
 		
 		label = Msg.getMsg(Env.getCtx(), "Cancel");
 		Button btn = new Button(label.replaceAll("&", ""));
 		btn.setImage("/images/Cancel16.png");
-		btn.setName("cancel");
+		btn.setId("Cancel");
 		btn.addEventListener(Events.ON_CLICK, this);
 		
 		hbox.appendChild(btn);
@@ -298,20 +298,16 @@
 		new Thread(runnable).start();	
 	}
 
-	public boolean isAsap() {
-		return true;
-	}
-
 	public void onEvent(Event event) {
 		Component component = event.getTarget(); 
 		if (component instanceof Button) {
 			Button element = (Button)component;
-			if ("ok".equalsIgnoreCase(element.getName())) {
+			if ("Ok".equalsIgnoreCase(element.getId())) {
 				if (element.getLabel().length() > 0)
 					this.startProcess();
 				else
 					this.dispose();
-			} else if ("cancel".equalsIgnoreCase(element.getName())) {
+			} else if ("Cancel".equalsIgnoreCase(element.getId())) {
 				this.dispose();
 			}
 		}
@@ -380,7 +376,9 @@
 			.append("</font></p>");
 		m_messageText.append(pi.getLogInfo(true));
 		message.setContent(m_messageText.toString());
-		//message.setCaretPosition(message.getDocument().getLength());	//	scroll down
+		
+		bOK.setLabel("");
+		
 		m_ids = pi.getIDs();
 		
 		//no longer needed, hide to give more space to display log

Modified: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java
===================================================================
--- branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java	2008-08-29 07:12:00 UTC (rev 6275)
+++ branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java	2008-08-29 07:57:02 UTC (rev 6276)
@@ -34,12 +34,14 @@
 import org.compiere.util.DB;
 import org.compiere.util.Env;
 import org.compiere.util.Msg;
+import org.zkoss.zk.au.out.AuEcho;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.DesktopUnavailableException;
 import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
+import org.zkoss.zk.ui.util.Clients;
 import org.zkoss.zul.Div;
 import org.zkoss.zul.Hbox;
 import org.zkoss.zul.Html;
@@ -98,6 +100,7 @@
 	}	//	ProcessDialog
 
 	private void initComponents() {
+		this.setBorder("normal");
 		VerticalBox vbox = new VerticalBox();
 		Div div = new Div();
 		message = new Html();
@@ -109,18 +112,21 @@
 		div.setAlign("right");
 		Hbox hbox = new Hbox();
 		Button btn = new Button("Ok");
-		btn.setName("ok");
+		btn.setSclass("action-text-button");
+		btn.setId("Ok");
 		btn.addEventListener(Events.ON_CLICK, this);
 		hbox.appendChild(btn);
 		
 		btn = new Button("Cancel");
-		btn.setName("cancel");
+		btn.setId("Cancel");
+		btn.setSclass("action-text-button");
 		btn.addEventListener(Events.ON_CLICK, this);
 		
 		hbox.appendChild(btn);
 		div.appendChild(hbox);
 		vbox.appendChild(div);		
 		this.appendChild(vbox);
+		
 	}
 
 	private ASyncProcess m_ASyncProcess;
@@ -143,6 +149,7 @@
 	private ProcessParameterPanel parameterPanel = null;
 	
 	private ProcessInfo m_pi = null;
+	private ProcessRunnable m_processRunnable;
 
 	
 	/**
@@ -159,12 +166,16 @@
 	 *	Dispose
 	 */
 	public void dispose()
-	{
+	{		
 		parameterPanel.restoreContext();
 		m_valid = false;
 		this.detach();
 	}	//	dispose
 
+	/**
+	 * is dialog still valid
+	 * @return boolean
+	 */
 	public boolean isValid()
 	{
 		return m_valid;
@@ -242,29 +253,40 @@
 			}
 			if (m_autoStart) {
 				startProcess();
-				dispose();
 			}
 		}
 		
 		// Check if the process is a silent one
 		if(isValid() && m_ShowHelp != null && m_ShowHelp.equals("S"))
 		{
-			startProcess();
-			dispose();
+			startProcess();			
 		}
 		return true;
 	}	//	init
 
-	public void startProcess()
-	{		
+	/**
+	 * launch process
+	 */
+	private void startProcess()
+	{	
+		m_processRunnable = new ProcessRunnable(Executions.getCurrent().getDesktop());
 		m_pi.setPrintPreview(true);
+		
 		if (m_ASyncProcess != null) {
 			m_ASyncProcess.lockUI(m_pi);
 		}
 		
-		new Thread(new ProcessRunnable(Executions.getCurrent().getDesktop())).start();
+		//use echo, otherwise lock ui wouldn't work
+		Clients.response(new AuEcho(this, "runProcessBackground", null));
 	}
 	
+	/**
+	 * internal use, don't call this directly
+	 */
+	public void runProcessBackground() {
+		new Thread(m_processRunnable).start();
+	}
+	
 	private class ProcessRunnable implements Runnable {
 		private org.zkoss.zk.ui.Desktop desktop;
 		ProcessRunnable(org.zkoss.zk.ui.Desktop desktop) {
@@ -282,7 +304,7 @@
 						m_ASyncProcess.unlockUI(m_pi);
 					}
 					//release full control of desktop
-                	Executions.deactivate(desktop);
+                	Executions.deactivate(desktop);                	
 				}
 			} catch (DesktopUnavailableException e) {
 				log.log(Level.SEVERE, e.getLocalizedMessage(), e);
@@ -292,22 +314,19 @@
 		}
 	}
 
-	public boolean isAsap() {
-		return true;
-	}
-
+	/**
+	 * handle events
+	 */
 	public void onEvent(Event event) {
 		Component component = event.getTarget(); 
 		if (component instanceof Button) {
 			Button element = (Button)component;
-			if ("ok".equalsIgnoreCase(element.getName())) {
+			if ("Ok".equalsIgnoreCase(element.getId())) {
 				this.startProcess();
+			} else if ("Cancel".equalsIgnoreCase(element.getId())) {
 				this.dispose();
-			} else if ("cancel".equalsIgnoreCase(element.getName())) {
-				this.dispose();
 			}
-		}
-		
+		}		
 	}
 	
 }	//	ProcessDialog

Modified: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java
===================================================================
--- branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java	2008-08-29 07:12:00 UTC (rev 6275)
+++ branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java	2008-08-29 07:57:02 UTC (rev 6276)
@@ -235,6 +235,7 @@
 			//	The Editor
 			WEditor wEditor = WebEditorFactory.getEditor(mField, false);
 			wEditor.addValueChangeListener(this);
+			wEditor.dynamicDisplay();
 			//  MField => VEditor - New Field value to be updated to editor
 			mField.addPropertyChangeListener(wEditor);
 			//  Set Default
@@ -257,6 +258,7 @@
 				WEditor wEditor2 = WebEditorFactory.getEditor(mField2, false);
 				//  New Field value to be updated to editor
 				mField2.addPropertyChangeListener(wEditor2);
+				wEditor2.dynamicDisplay();
 				//  Set Default
 				Object defaultObject2 = mField2.getDefault();
 				mField2.setValue (defaultObject2, true);

Modified: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/WReport.java
===================================================================
--- branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/WReport.java	2008-08-29 07:12:00 UTC (rev 6275)
+++ branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/WReport.java	2008-08-29 07:57:02 UTC (rev 6276)
@@ -233,10 +233,6 @@
 		return MTable.getTable_ID(tableName);
 	}	//	getAD_Table_ID
 
-	public boolean isAsap() {
-		return true;
-	}
-
 	public void onEvent(Event event) {
 		if(event.getTarget() instanceof Menuitem)
 		{


Property changes on: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java:6183-6238,6241,6244,6246
   + /branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java:6183-6238,6241,6244,6246,6272-6275

Modified: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/component/CWindowToolbar.java
===================================================================
--- branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/component/CWindowToolbar.java	2008-08-29 07:12:00 UTC (rev 6275)
+++ branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/component/CWindowToolbar.java	2008-08-29 07:57:02 UTC (rev 6276)
@@ -483,11 +483,6 @@
     	btnGridToggle.setDisabled(!enabled);
     }
     
-    public boolean isAsap()
-    {
-        return true;
-    }    
-    
     public Event getEvent() 
     {
     	return event;


Property changes on: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/component/GridTableListModel.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/component/GridTableListModel.java:5994,6036-6040,6081,6095,6125,6136,6147-6148,6183-6238,6241,6244,6246
   + /branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/component/GridTableListModel.java:5994,6036-6040,6081,6095,6125,6136,6147-6148,6183-6238,6241,6244,6246,6272-6275

Modified: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WEditor.java
===================================================================
--- branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WEditor.java	2008-08-29 07:12:00 UTC (rev 6275)
+++ branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WEditor.java	2008-08-29 07:57:02 UTC (rev 6276)
@@ -407,11 +407,9 @@
         return this.mandatory;
     }
 
-    public boolean isAsap()
-    {
-        return true;
-    }
-    
+    /**
+     * allow subclass to perform dynamic loading of data
+     */
     public void dynamicDisplay()
     {    	
     }

Modified: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WEditorPopupMenu.java
===================================================================
--- branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WEditorPopupMenu.java	2008-08-29 07:12:00 UTC (rev 6275)
+++ branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WEditorPopupMenu.java	2008-08-29 07:57:02 UTC (rev 6276)
@@ -128,11 +128,6 @@
         menuListeners.add(listener);
     }
 
-    public boolean isAsap()
-    {
-        return true;
-    }
-
     public void onEvent(Event event)
     {
         String evt = (String)event.getTarget().getAttribute(EVENT_ATTRIBUTE);

Modified: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADForm.java
===================================================================
--- branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADForm.java	2008-08-29 07:12:00 UTC (rev 6275)
+++ branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADForm.java	2008-08-29 07:57:02 UTC (rev 6276)
@@ -234,16 +234,7 @@
     
     /**
      * 
-     * @return false
      */
-    public boolean isAsap()
-    {
-        return false;
-    }
-
-    /**
-     * 
-     */
 	public void onEvent(Event arg0) throws Exception 
     {
     	

Modified: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADTabpanel.java
===================================================================
--- branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADTabpanel.java	2008-08-29 07:12:00 UTC (rev 6275)
+++ branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADTabpanel.java	2008-08-29 07:57:02 UTC (rev 6276)
@@ -634,11 +634,6 @@
         }*/
     }
 
-    public boolean isAsap()
-    {
-        return false;
-    }
-
     public void onEvent(Event event)
     {
     	if (event.getTarget() instanceof Toolbarbutton) 

Modified: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java
===================================================================
--- branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java	2008-08-29 07:12:00 UTC (rev 6275)
+++ branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java	2008-08-29 07:57:02 UTC (rev 6276)
@@ -469,11 +469,6 @@
     	return false;
     }
 
-    public boolean isAsap()
-    {
-        return true;
-    }
-
 //    private void find()
 //    {
 //    	MQuery mquery = new MQuery(curTab.getAD_Table_ID());
@@ -1380,32 +1375,36 @@
 		&& pi.isReportingProcess() == false;
 		//
 		//  Process Result
-		if (notPrint)		//	refresh if not print 
-		{			
-			if (Executions.getCurrent() != null)
+					
+		if (Executions.getCurrent() != null)
+		{
+			if (notPrint)		//	refresh if not print 
 			{
 				updateUI(pi);
-				Clients.showBusy(null, false);
 			}
-			else
-			{
-				try {
-					//get full control of desktop
-					Executions.activate(getComponent().getDesktop());
-					try {                    
-	                	updateUI(pi);                  
-	                	Clients.showBusy(null, false);
-	                } catch(Error ex){                    
-	                	throw ex;                    
-	                } finally{
-	                	//release full control of desktop
-	                	Executions.deactivate(getComponent().getDesktop());                                                            
-	                }
-				} catch (Exception e) {
-					logger.log(Level.WARNING, "Failed to update UI upon unloc.", e);
-				} 		                                                
-			}
+			Clients.showBusy(null, false);
 		}
+		else
+		{
+			try {
+				//get full control of desktop
+				Executions.activate(getComponent().getDesktop());
+				try {                    
+					if (notPrint)		//	refresh if not print
+					{
+						updateUI(pi);
+					}
+                	Clients.showBusy(null, false);
+                } catch(Error ex){                    
+                	throw ex;                    
+                } finally{
+                	//release full control of desktop
+                	Executions.deactivate(getComponent().getDesktop());                                                            
+                }
+			} catch (Exception e) {
+				logger.log(Level.WARNING, "Failed to update UI upon unloc.", e);
+			} 		                                                
+		}
 	}
 
 	private void updateUI(ProcessInfo pi) {

Modified: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java
===================================================================
--- branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java	2008-08-29 07:12:00 UTC (rev 6275)
+++ branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java	2008-08-29 07:57:02 UTC (rev 6276)
@@ -497,11 +497,6 @@
        
     }   //  saveSelectionDetail
 		   
-    public boolean isAsap()
-	{
-		return true;
-	}
-
     public void tableChanged(WTableModelEvent event)
     {
         

Modified: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
===================================================================
--- branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java	2008-08-29 07:12:00 UTC (rev 6275)
+++ branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java	2008-08-29 07:57:02 UTC (rev 6276)
@@ -216,9 +216,4 @@
             wndLogin.loginOk(userId, userPassword);
         }
     }
-
-    public boolean isAsap()
-    {
-        return true;
-    }
 }

Modified: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/LogoutPanel.java
===================================================================
--- branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/LogoutPanel.java	2008-08-29 07:12:00 UTC (rev 6275)
+++ branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/LogoutPanel.java	2008-08-29 07:57:02 UTC (rev 6276)
@@ -52,11 +52,6 @@
         this.appendChild(btnLogOut);
 	}
     
-    public boolean isAsap()
-    {
-        return true;
-    }
-
     public void onEvent(Event event)
     {
         if (btnLogOut == event.getTarget())

Modified: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuPanel.java
===================================================================
--- branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuPanel.java	2008-08-29 07:12:00 UTC (rev 6275)
+++ branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuPanel.java	2008-08-29 07:57:02 UTC (rev 6276)
@@ -229,11 +229,6 @@
         }		
 	}
 
-	public boolean isAsap()
-    {
-        return true;
-    }
-	
 	public Tree getMenuTree() 
 	{
 		return menuTree;

Modified: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuSearchPanel.java
===================================================================
--- branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuSearchPanel.java	2008-08-29 07:12:00 UTC (rev 6275)
+++ branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/MenuSearchPanel.java	2008-08-29 07:57:02 UTC (rev 6276)
@@ -98,12 +98,6 @@
         cmbSearch.setDict(treeValues);
    }
 
-    public boolean isAsap()
-    {
-        return true;
-    }
-
-
     public void onEvent(Event event)
     {
         if (cmbSearch.equals(event.getTarget()) && (event.getName() != Events.ON_CHANGING))

Modified: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
===================================================================
--- branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java	2008-08-29 07:12:00 UTC (rev 6275)
+++ branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java	2008-08-29 07:57:02 UTC (rev 6276)
@@ -334,9 +334,4 @@
         }
         wndLogin.loginCompleted();
     }
-
-    public boolean isAsap()
-    {
-        return true;
-    }
 }

Modified: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/WDocActionPanel.java
===================================================================
--- branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/WDocActionPanel.java	2008-08-29 07:12:00 UTC (rev 6275)
+++ branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/panel/WDocActionPanel.java	2008-08-29 07:57:02 UTC (rev 6276)
@@ -336,11 +336,6 @@
 		return index;
 	}	//	getSelectedIndex
 
-	public boolean isAsap()
-	{
-		return true;
-	}
-
 	public int getNumberOfOptions() {
 		return lstDocAction != null ? lstDocAction.getItemCount() : 0;
 	}

Modified: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
===================================================================
--- branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/window/FindWindow.java	2008-08-29 07:12:00 UTC (rev 6275)
+++ branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/window/FindWindow.java	2008-08-29 07:57:02 UTC (rev 6276)
@@ -631,6 +631,7 @@
         editor = WebEditorFactory.getEditor(mField, false);
         editor.setMandatory(false);
         editor.setReadWrite(true);
+        editor.dynamicDisplay();
         Label label = editor.getLabel();
         Component fieldLabel = editor.getComponent();
               
@@ -1182,6 +1183,7 @@
         m_editor.setValue(null);
         m_editor.setReadWrite(enabled);
         m_editor.setVisible(enabled);
+        m_editor.dynamicDisplay();
         //
         return m_editor.getComponent();
         

Modified: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java
===================================================================
--- branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java	2008-08-29 07:12:00 UTC (rev 6275)
+++ branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java	2008-08-29 07:57:02 UTC (rev 6276)
@@ -477,6 +477,7 @@
 		m_row.appendChild(div);
 
 		m_row.appendChild(editor.getComponent());
+		editor.dynamicDisplay();
 		//
 		m_newRow = !m_newRow;
 	}	//	addLine


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6285
          http://adempiere.svn.sourceforge.net/adempiere/?rev=6285&view=rev
Author:   hengsin
Date:     2008-08-30 05:11:55 +0000 (Sat, 30 Aug 2008)

Log Message:
-----------
[ 2081977 ] Sort Grid Column Bug

Modified Paths:
--------------
    branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/component/GridTableListModel.java

Modified: branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/component/GridTableListModel.java
===================================================================
--- branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/component/GridTableListModel.java	2008-08-30 01:34:55 UTC (rev 6284)
+++ branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/component/GridTableListModel.java	2008-08-30 05:11:55 UTC (rev 6285)
@@ -1,3 +1,15 @@
+/******************************************************************************
+ * Copyright (C) 2008 Low Heng Sin                                            *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ *****************************************************************************/
 package org.adempiere.webui.component;
 
 import java.sql.Timestamp;
@@ -2,2 +14,3 @@
 import java.text.SimpleDateFormat;
+import java.util.Comparator;
 
@@ -17,14 +30,23 @@
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zul.AbstractListModel;
+import org.zkoss.zul.ListModel;
+import org.zkoss.zul.ListModelExt;
 import org.zkoss.zul.Listbox;
 import org.zkoss.zul.Listcell;
 import org.zkoss.zul.Listitem;
+import org.zkoss.zul.ListitemComparator;
 import org.zkoss.zul.ListitemRenderer;
 import org.zkoss.zul.ListitemRendererExt;
 import org.zkoss.zul.event.ListDataEvent;
 
-public class GridTableListModel extends AbstractListModel implements ListitemRenderer, ListitemRendererExt, DataStatusListener {
+/**
+ * 
+ * @author Low Heng Sin
+ *
+ */
+public class GridTableListModel extends AbstractListModel implements ListitemRenderer, 
+ListitemRendererExt, DataStatusListener, ListModelExt {
 
 	private GridTable tableModel;
 	private GridField[] gridField;
@@ -33,6 +55,11 @@
 	private int pageSize = -1;
 	private int pageNo = 0;
 
+	/**
+	 * 
+	 * @param tableModel
+	 * @param windowNo
+	 */
 	public GridTableListModel(GridTable tableModel, int windowNo) {
 		this.tableModel = tableModel;
 		this.windowNo = windowNo;
@@ -40,6 +67,10 @@
 		tableModel.addDataStatusListener(this);
 	}
 
+	/**
+	 * @param rowIndex
+	 * @see ListModel#getElementAt(int)
+	 */
 	public Object getElementAt(int rowIndex) {
 		int columnCount = tableModel.getColumnCount();
 		Object[] values = new Object[columnCount];
@@ -79,14 +110,27 @@
 		return pageNo;
 	}
 	
+	/**
+	 * Set number of rows per page
+	 * @param pgSize
+	 */
 	public void setPageSize(int pgSize) {
 		pageSize = pgSize;
 	}
 
+	/**
+	 * Get number of rows per page
+	 * @return pageSize
+	 */
 	public int getPageSize() {
 		return pageSize;
 	}
 	
+	/**
+	 * Get total number of rows
+	 * @return int
+	 * @see ListModel#getSize()
+	 */
 	public int getSize() {
 		int total = tableModel.getRowCount(); 
 		if (pageSize < 0)
@@ -103,6 +147,11 @@
 		}
 	}
 
+	/**
+	 * @param listitem
+	 * @param data
+	 * @see ListitemRenderer#render(Listitem, Object)
+	 */
 	public void render(Listitem listitem, Object data) throws Exception {
 		Object[] values = (Object[])data;
 		int columnCount = tableModel.getColumnCount();
@@ -180,10 +229,17 @@
     		return obj.toString();
 	}
 
+	/**
+	 * @see ListitemRendererExt#getControls()
+	 */
 	public int getControls() {
 		return DETACH_ON_RENDER;
 	}
 
+	/**
+	 * @param item
+	 * @see ListitemRendererExt#newListcell(Listitem)
+	 */
 	public Listcell newListcell(Listitem item) {
 		ListCell listCell = new ListCell();
 		listCell.applyProperties();
@@ -191,12 +247,20 @@
 		return listCell;
 	}
 
+	/**
+	 * @param listbox
+	 * @see ListitemRendererExt#newListitem(Listbox)
+	 */
 	public Listitem newListitem(Listbox listbox) {
 		ListItem item = new ListItem();
 		item.applyProperties();
 		return item;
 	}
 
+	/**
+	 * @param e
+	 * @see DataStatusListener#dataStatusChanged(DataStatusEvent)
+	 */
 	public void dataStatusChanged(DataStatusEvent e) {
 		if (Executions.getCurrent() != null) {
 			fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1);
@@ -204,4 +268,16 @@
 		
 	}
 
+	/**
+	 * @param cmpr
+	 * @param ascending
+	 * @see ListModelExt#sort(Comparator, boolean) 
+	 */
+	public void sort(Comparator cmpr, boolean ascending) {
+		//use default zk comparator
+		ListitemComparator lic = (ListitemComparator) cmpr;
+		tableModel.sort(lic.getListheader().getColumnIndex(), ascending);
+		fireEvent(ListDataEvent.CONTENTS_CHANGED, -1, -1);
+	}
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6268
          http://adempiere.svn.sourceforge.net/adempiere/?rev=6268&view=rev
Author:   globalqss
Date:     2008-08-28 22:20:45 +0000 (Thu, 28 Aug 2008)

Log Message:
-----------
Fix [ 2081237 ] PaymentAvailable Oracle-XE function wrong

Modified Paths:
--------------
    branches/stable/db/ddlutils/oracle/functions/C_Payment_Available.sql

Added Paths:
-----------
    branches/stable/migration/352a-trunk/277_BF2081237_C_Payment_Available.sql
    branches/stable/migration/352a-trunk/postgresql/277_BF2081237_C_Payment_Available.sql

Modified: branches/stable/db/ddlutils/oracle/functions/C_Payment_Available.sql
===================================================================
--- branches/stable/db/ddlutils/oracle/functions/C_Payment_Available.sql	2008-08-28 18:04:15 UTC (rev 6267)
+++ branches/stable/db/ddlutils/oracle/functions/C_Payment_Available.sql	2008-08-28 22:20:45 UTC (rev 6268)
@@ -35,7 +35,7 @@
     FROM C_Payment 
     WHERE C_Payment_ID=p_C_Payment_ID AND C_Charge_ID > 0;
     IF (v_Amt IS NOT NULL) THEN
-        RETURN v_Amt;
+        RETURN 0;
     END IF;
 
 	--	Get Currency
@@ -59,4 +59,4 @@
 	v_AvailableAmt := ROUND(NVL(v_AvailableAmt,0), 2);
 	RETURN	v_AvailableAmt;
 END paymentAvailable;
-/
\ No newline at end of file
+/

Added: branches/stable/migration/352a-trunk/277_BF2081237_C_Payment_Available.sql
===================================================================
--- branches/stable/migration/352a-trunk/277_BF2081237_C_Payment_Available.sql	                        (rev 0)
+++ branches/stable/migration/352a-trunk/277_BF2081237_C_Payment_Available.sql	2008-08-28 22:20:45 UTC (rev 6268)
@@ -0,0 +1,62 @@
+CREATE OR REPLACE FUNCTION paymentAvailable
+(
+	p_C_Payment_ID	IN	NUMBER
+)
+RETURN NUMBER
+/*************************************************************************
+ * The contents of this file are subject to the Compiere License.  You may
+ * obtain a copy of the License at    http://www.compiere.org/license.html
+ * Software is on an  "AS IS" basis,  WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the License for details. Code: Compiere ERP+CRM
+ * Copyright (C) 1999-2001 Jorg Janke, ComPiere, Inc. All Rights Reserved.
+ *************************************************************************
+ * $Id: C_Payment_Available.sql,v 1.1 2006/04/21 17:51:58 jjanke Exp $
+ ***
+ * Title:	Calculate Available Payment Amount in Payment Currency
+ * Description:
+ *		similar to C_Invoice_Open
+ ************************************************************************/
+AS
+	v_Currency_ID		NUMBER(10);
+	v_AvailableAmt		NUMBER := 0;
+    v_IsReceipt         C_Payment.IsReceipt%TYPE;
+    v_Amt               NUMBER := 0;
+	CURSOR	Cur_Alloc	IS
+		SELECT	a.AD_Client_ID, a.AD_Org_ID, al.Amount, a.C_Currency_ID, a.DateTrx
+		FROM	C_AllocationLine al
+          INNER JOIN C_AllocationHdr a ON (al.C_AllocationHdr_ID=a.C_AllocationHdr_ID)
+		WHERE	al.C_Payment_ID = p_C_Payment_ID
+          AND   a.IsActive='Y';
+		--  AND	al.C_Invoice_ID IS NOT NULL;
+BEGIN
+    --  Charge - fully allocated
+    SELECT MAX(PayAmt) 
+      INTO v_Amt
+    FROM C_Payment 
+    WHERE C_Payment_ID=p_C_Payment_ID AND C_Charge_ID > 0;
+    IF (v_Amt IS NOT NULL) THEN
+        RETURN 0;
+    END IF;
+
+	--	Get Currency
+	SELECT	C_Currency_ID, PayAmt, IsReceipt
+	  INTO	v_Currency_ID, v_AvailableAmt, v_IsReceipt
+	FROM	C_Payment_v     -- corrected for AP/AR
+	WHERE	C_Payment_ID = p_C_Payment_ID;
+--  DBMS_OUTPUT.PUT_LINE('== C_Payment_ID=' || p_C_Payment_ID || ', PayAmt=' || v_AvailableAmt || ', Receipt=' || v_IsReceipt);
+
+	--	Calculate Allocated Amount
+	FOR a IN Cur_Alloc LOOP
+        v_Amt := currencyConvert(a.Amount, a.C_Currency_ID, v_Currency_ID, a.DateTrx, null, a.AD_Client_ID, a.AD_Org_ID);
+	    v_AvailableAmt := v_AvailableAmt - v_Amt;
+--      DBMS_OUTPUT.PUT_LINE('  Allocation=' || a.Amount || ' - Available=' || v_AvailableAmt);
+	END LOOP;
+	--	Ignore Rounding
+	IF (v_AvailableAmt BETWEEN -0.00999 AND 0.00999) THEN
+		v_AvailableAmt := 0;
+	END IF;
+	--	Round to penny
+	v_AvailableAmt := ROUND(NVL(v_AvailableAmt,0), 2);
+	RETURN	v_AvailableAmt;
+END paymentAvailable;
+/


Property changes on: branches/stable/migration/352a-trunk/277_BF2081237_C_Payment_Available.sql
___________________________________________________________________
Added: svn:executable
   + *

Added: branches/stable/migration/352a-trunk/postgresql/277_BF2081237_C_Payment_Available.sql
===================================================================
--- branches/stable/migration/352a-trunk/postgresql/277_BF2081237_C_Payment_Available.sql	                        (rev 0)
+++ branches/stable/migration/352a-trunk/postgresql/277_BF2081237_C_Payment_Available.sql	2008-08-28 22:20:45 UTC (rev 6268)
@@ -0,0 +1 @@
+-- just for oracle


Property changes on: branches/stable/migration/352a-trunk/postgresql/277_BF2081237_C_Payment_Available.sql
___________________________________________________________________
Added: svn:executable
   + *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6283
          http://adempiere.svn.sourceforge.net/adempiere/?rev=6283&view=rev
Author:   globalqss
Date:     2008-08-29 22:57:30 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------
Synchronizing some unsync classes from zkwebui 341 to stable

Modified Paths:
--------------
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/AEnv.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WMatch.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WPayment.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/component/Listbox.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/component/ListboxFactory.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java
    branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java

Modified: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/AEnv.java
===================================================================
--- branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/AEnv.java	2008-08-29 22:51:42 UTC (rev 6282)
+++ branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/AEnv.java	2008-08-29 22:57:30 UTC (rev 6283)
@@ -29,7 +29,6 @@
 import java.util.logging.Level;
 
 import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
 
 import org.adempiere.webui.component.Window;
 import org.adempiere.webui.session.SessionManager;
@@ -48,6 +47,7 @@
 import org.compiere.util.Env;
 import org.compiere.util.Ini;
 import org.zkoss.web.servlet.Servlets;
+import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Execution;
 import org.zkoss.zk.ui.Executions;
 
@@ -715,4 +715,24 @@
     		return false;
     	}
     }
+    
+    /**
+     * 
+     * @param parent
+     * @param child
+     * @return boolean
+     */
+    public static boolean contains(Component parent, Component child) {
+    	if (child == parent)
+    		return true;
+    	
+    	Component c = child.getParent();
+    	while (c != null) {
+    		if (c == parent)
+    			return true;
+    		c = c.getParent();
+    	}
+    	
+    	return false;
+    }
 }	//	AEnv

Modified: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WMatch.java
===================================================================
--- branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WMatch.java	2008-08-29 22:51:42 UTC (rev 6282)
+++ branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WMatch.java	2008-08-29 22:57:30 UTC (rev 6283)
@@ -1,1039 +1,875 @@
-/******************************************************************************
- * Product: Adempiere ERP & CRM Smart Business Solution                       *
- * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved.                *
- * This program is free software; you can redistribute it and/or modify it    *
- * under the terms version 2 of the GNU General Public License as published   *
- * by the Free Software Foundation. This program is distributed in the hope   *
- * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
- * See the GNU General Public License for more details.                       *
- * You should have received a copy of the GNU General Public License along    *
- * with this program; if not, write to the Free Software Foundation, Inc.,    *
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
- * For the text or an alternative of this public license, you may reach us    *
- * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
- * or via info@... or http://www.compiere.org/license.html           *
- *****************************************************************************/
-
-/**
- * 2007, Modified by Posterita Ltd.
- */
-
-package org.adempiere.webui.apps.form;
-
-import java.math.BigDecimal;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.Timestamp;
-import java.util.Date;
-import java.util.Vector;
-import java.util.logging.Level;
-
-import org.adempiere.webui.component.Button;
-import org.adempiere.webui.component.Checkbox;
-import org.adempiere.webui.component.Datebox;
-import org.adempiere.webui.component.Grid;
-import org.adempiere.webui.component.Label;
-import org.adempiere.webui.component.ListItem;
-import org.adempiere.webui.component.Listbox;
-import org.adempiere.webui.component.Row;
-import org.adempiere.webui.component.Rows;
-import org.adempiere.webui.component.Textbox;
-import org.adempiere.webui.component.WListbox;
-import org.adempiere.webui.editor.WEditor;
-import org.adempiere.webui.editor.WSearchEditor;
-import org.adempiere.webui.event.ValueChangeEvent;
-import org.adempiere.webui.event.ValueChangeListener;
-import org.adempiere.webui.event.WTableModelEvent;
-import org.adempiere.webui.event.WTableModelListener;
-import org.adempiere.webui.panel.ADForm;
-import org.compiere.minigrid.ColumnInfo;
-import org.compiere.minigrid.IDColumn;
-import org.compiere.model.MInOutLine;
-import org.compiere.model.MInvoiceLine;
-import org.compiere.model.MLookup;
-import org.compiere.model.MLookupFactory;
-import org.compiere.model.MMatchInv;
-import org.compiere.model.MMatchPO;
-import org.compiere.model.MOrderLine;
-import org.compiere.model.MRole;
-import org.compiere.model.MStorage;
-import org.compiere.util.CLogger;
-import org.compiere.util.DB;
-import org.compiere.util.DisplayType;
-import org.compiere.util.Env;
-import org.compiere.util.KeyNamePair;
-import org.compiere.util.Msg;
-import org.zkoss.zk.ui.event.Event;
-import org.zkoss.zk.ui.event.EventListener;
-import org.zkoss.zk.ui.event.Events;
-import org.zkoss.zul.Hbox;
-import org.zkoss.zul.Separator;
-
-/**
- * Match PO-Invoice-Receipt Custom Form : Based on VMatch
- * 
- * @author  Niraj Sohun
- * @date    Jul 2, 2007
- */
-
-public class WMatch extends ADForm implements EventListener, ValueChangeListener, WTableModelListener
-{
-	private static final long serialVersionUID = 1L;
-	
-	private Grid grdParameters;
-	private Grid grdMatch;
-	private Grid grdProcess;
-	
-	private Rows rows;
-	private Row row;
-	
-	private Listbox lstInvoice;
-	private Listbox lstReceipt;
-	
-	private Button cmdSearch;
-	private Button cmdProcess;
-	
-	private Datebox dateFrom;
-	private Datebox dateTo;
-	
-	private Listbox lstMatchFrom;
-	private Listbox lstMatchTo;
-	private Listbox lstSearchMode;
-		
-	private Checkbox chkSameBP;
-	private Checkbox chkSameProduct;
-	private Checkbox chkSameQty;
-	
-	private Textbox txtToBeMatched;
-	private Textbox txtMatching;
-	private Textbox txtDifference;
-	
-	private Label lblMatchFrom;
-	private Label lblMatchTo;
-	private Label lblStatus;
-	
-	private String[] m_matchOptions = new String[] {
-			Msg.getElement(Env.getCtx(), "C_Invoice_ID", false),
-			Msg.getElement(Env.getCtx(), "M_InOut_ID", false),
-			Msg.getElement(Env.getCtx(), "C_Order_ID", false) };
-	
-	private static final int MATCH_INVOICE = 0;
-	private static final int MATCH_SHIPMENT = 1;
-	private static final int MATCH_ORDER = 2;
-
-	private String[] m_matchMode = new String[] { 
-			Msg.translate(Env.getCtx(), "NotMatched"),
-			Msg.translate(Env.getCtx(), "Matched")};
-	
-	private static final int MODE_NOTMATCHED = 0;
-	private static final int MODE_MATCHED = 1;
-
-	private static final int I_BPartner = 3;
-	private static final int I_Line = 4;
-	private static final int I_Product = 5;
-	private static final int I_QTY = 6;
-	private static final int I_MATCHED = 7;
-
-	private StringBuffer m_sql = null;
-	private String m_dateColumn = "";
-	private String m_qtyColumn = "";
-	private String m_groupBy = "";
-
-	private BigDecimal m_xMatched = Env.ZERO;
-	private BigDecimal m_xMatchedTo = Env.ZERO;
-	
-	private WEditor bPartnerSearch = null;
-	private WEditor productSearch = null;
-
-	//private int m_C_BPartner_ID;
-	//private int productID;
-	
-	private WListbox xMatchedTable;
-	private WListbox xMatchedToTable;
-	
-	@SuppressWarnings("unused")
-	private String strMatchedTable;
-	
-	@SuppressWarnings("unused")
-	private String strMatchedToTable;
-
-	private static CLogger log = CLogger.getCLogger(WMatch.class);
-	
-	public WMatch()
-	{
-	}
-	
-	protected void initForm()
-	{
-		try
-		{
-			new Thread()
-			{
-				public void run()
-				{
-					log.info("Starting ...");
-					MMatchPO.consolidate(Env.getCtx());
-					log.info("... Done");
-				}
-			}.start();
-		}
-		catch(Exception e)
-		{
-			log.log(Level.SEVERE, "", e);
-		}		
-		
-		grdParameters = new Grid();
-		grdParameters.setWidth("700px");
-		
-		grdMatch = new Grid();
-		grdMatch.setWidth("700px");
-		
-		grdProcess = new Grid();
-		grdProcess.setWidth("700px");
-		
-		lstInvoice = new Listbox();
-		lstInvoice.setWidth("700px");
-   
-		lstReceipt = new Listbox();
-		lstReceipt.setWidth("700px");
-		
-		cmdSearch = new Button();
-		cmdSearch.setImage("/images/FindX24.png");
-		cmdSearch.addEventListener(Events.ON_CLICK, this);
-		
-		cmdProcess = new Button();
-		cmdProcess.setImage("/images/Process24.png");
-		cmdProcess.addEventListener(Events.ON_CLICK, this);
-		
-		dateFrom = new Datebox();
-		dateTo = new Datebox();
-		
-		lstMatchFrom = new Listbox();
-		lstMatchFrom.setRows(0);
-        lstMatchFrom.setMold("select");
-        lstMatchFrom.addEventListener(Events.ON_SELECT, this);
-        
-		lstMatchTo = new Listbox();
-		lstMatchTo.setRows(0);
-        lstMatchTo.setMold("select");
-        lstMatchTo.addEventListener(Events.ON_SELECT, this);
-        
-		lstSearchMode = new Listbox();
-		lstSearchMode.setRows(1);
-        lstSearchMode.setMold("select");
-        //lstSearchMode.addEventListener(Events.ON_SELECT, this);
-        
-        chkSameBP = new Checkbox();
-        chkSameBP.setLabel("Same Business Partner");
-        chkSameBP.setChecked(true);
-        chkSameBP.addEventListener(Events.ON_CHECK, this);
-        
-        chkSameProduct = new Checkbox();
-        chkSameProduct.setLabel("Same Product");
-        chkSameProduct.setChecked(true);
-        chkSameProduct.addEventListener(Events.ON_CHECK, this);
-        
-        chkSameQty = new Checkbox();
-        chkSameQty.setLabel("Same Quantity");
-        chkSameQty.setChecked(false);
-        chkSameQty.addEventListener(Events.ON_CHECK, this);
-        
-        txtToBeMatched = new Textbox();
-        txtToBeMatched.setEnabled(false);
-        
-        txtMatching = new Textbox();
-        txtMatching.setEnabled(false);
-        
-        txtDifference = new Textbox();
-        txtDifference.setEnabled(false);
-        
-        lblMatchFrom = new Label(" ");
-        
-        lblMatchTo = new Label(" ");
-        
-        lblStatus = new Label("Invoice#");
-        lblStatus.setWidth("700px");
-        
-        xMatchedTable = new WListbox();
-        xMatchedTable.setWidth("700px");
-        xMatchedTable.setHeight("150px");
-        xMatchedTable.getModel().addTableModelListener(this);
-        xMatchedTable.addEventListener(Events.ON_SELECT, this);
-        
-        xMatchedToTable = new WListbox();
-        xMatchedToTable.setWidth("700px");
-        xMatchedToTable.setHeight("150px");
-        xMatchedToTable.getModel().addTableModelListener(this);
-        xMatchedToTable.addEventListener(Events.ON_SELECT, this);
-        
-        initComponents();
-	}
-	
-	private void initComponents()
-	{
-		this.setWidth("710px");
-		this.setHeight("100%");
-		//this.setBorder("normal");
-		
-		rows = new Rows();
-		
-		// Row 1
-		row = new Row();
-		row.appendChild(new Label("Match From"));
-		row.appendChild(lstMatchFrom);
-		row.appendChild(new Label("Match To"));
-		row.appendChild(lstMatchTo);
-		rows.appendChild(row);
-		
-		// Row 2
-		row = new Row();
-		row.appendChild(new Label("Search Mode"));
-		row.appendChild(lstSearchMode);
-		rows.appendChild(row);
-		
-		// Row 3
-		row = new Row();
-		row.appendChild(new Label("Business Partner"));
-		showBusinessPartner();
-		row.appendChild(bPartnerSearch.getComponent());
-		row.appendChild(new Label("Product"));
-		showProduct();
-		row.appendChild(productSearch.getComponent());
-		rows.appendChild(row);
-		
-		// Row 4
-		row = new Row();
-		row.appendChild(new Label("Date From"));
-		row.appendChild(dateFrom);
-		row.appendChild(new Label("Date To"));
-		row.appendChild(dateTo);
-		rows.appendChild(row);
-		
-		grdParameters.appendChild(rows);
-		this.appendChild(grdParameters);
-		this.appendChild(new Separator());
-
-		Hbox hbox = new Hbox();
-		hbox.appendChild(cmdSearch);
-		hbox.appendChild(cmdProcess);
-		
-		this.appendChild(hbox);
-		this.appendChild(new Separator());
-		
-		// Listbox Invoice
-		
-		this.appendChild(new Label(" "));
-		this.appendChild(lblMatchFrom);
-		this.appendChild(new Separator());
-		this.appendChild(new Label(" "));
-		this.appendChild(xMatchedTable);
-		this.appendChild(new Separator());
-		
-		// Match Parameters
-		
-		rows = new Rows();
-		
-		this.appendChild(new Label(" "));
-		row = new Row();
-		row.appendChild(chkSameBP);
-		row.appendChild(chkSameProduct);
-		row.appendChild(chkSameQty);
-		rows.appendChild(row);
-		
-		grdMatch.appendChild(rows);
-		this.appendChild(grdMatch);
-		this.appendChild(new Separator());
-				
-		// Listbox Receipt
-		this.appendChild(new Label(" "));
-		this.appendChild(lblMatchTo);
-		this.appendChild(new Separator());
-		this.appendChild(new Label(" "));
-		this.appendChild(xMatchedToTable);
-		this.appendChild(new Separator());
-		
-		// Process Parameters
-		
-		rows = new Rows();
-		
-		row = new Row();
-		row.appendChild(new Label("To Be Matched"));
-		row.appendChild(txtToBeMatched);
-		row.appendChild(new Label("Matching"));
-		row.appendChild(txtMatching);
-		row.appendChild(new Label("Difference"));
-		row.appendChild(txtDifference);
-		rows.appendChild(row);
-		
-		grdProcess.appendChild(rows);
-		this.appendChild(grdProcess);
-		
-		this.appendChild(new Separator());
-		this.appendChild(lblStatus);
-		
-		populateMatchFrom();
-		populateMatchTo();
-		populateSearchMode();
-		prepareTable();
-	}
-	
-	private void populateMatchFrom()
-	{
-		for (int i = 0; i < m_matchOptions.length; i++)
-		{
-			String temp = m_matchOptions[i]; 
-			lstMatchFrom.appendItem(temp, temp);
-		}
-		
-		lstMatchFrom.setSelectedIndex(0);
-		lblMatchFrom.setValue(m_matchOptions[0]);
-	}
-	
-	private void populateMatchTo()
-	{
-		lstMatchTo.getChildren().clear();
-		
-		ListItem lstIteMatchFromSelection = lstMatchFrom.getSelectedItem();
-		String selection = (String)lstIteMatchFromSelection.getValue();
-		
-		Vector<String> vector = new Vector<String>(2);
-		
-		if (selection.equals(m_matchOptions[MATCH_INVOICE]))
-			vector.add(m_matchOptions[MATCH_SHIPMENT]);
-		else if (selection.equals(m_matchOptions[MATCH_ORDER]))
-			vector.add(m_matchOptions[MATCH_SHIPMENT]);
-		else
-		{
-			vector.add(m_matchOptions[MATCH_INVOICE]);
-			vector.add(m_matchOptions[MATCH_ORDER]);
-		}
-		
-		for (int i = 0; i < vector.size(); i++)
-		{
-			String temp = vector.get(i).toString();
-			lstMatchTo.appendItem(temp, temp);
-		}
-		
-		lstMatchTo.setSelectedIndex(0);
-		lblMatchTo.setValue(vector.get(0).toString());
-		
-		//  Reset Table
-		
-		//xMatchedTable.setRowCount(0);
-		//xMatchedToTable.setRowCount(0);
-	}
-	
-	private void populateSearchMode()
-	{
-		for (int i = 0; i < m_matchMode.length; i++)
-		{
-			lstSearchMode.appendItem(m_matchMode[i], m_matchMode[i]);
-		}
-		
-		lstSearchMode.setSelectedIndex(0);
-	}
-	
-	private void showBusinessPartner()
-	{
-		final int AD_Column_ID = 3499;
-		
-		MLookup lookupBP = MLookupFactory.get(Env.getCtx(), m_WindowNo,
-				0, AD_Column_ID, DisplayType.Search);
-		
-		bPartnerSearch = new WSearchEditor(lookupBP, Msg.translate(
-				Env.getCtx(), "C_BPartner_ID"), "", true, false, true);
-
-		bPartnerSearch.addValueChangeListener(this);
-	}
-	
-	private void showProduct()
-	{
-		final int AD_Column_ID = 3840;
-		
-		MLookup lookupP = MLookupFactory.get(Env.getCtx(), m_WindowNo,
-				0, AD_Column_ID, DisplayType.Search);
-		
-		productSearch = new WSearchEditor(lookupP, Msg.translate(
-				Env.getCtx(), "M_Product_ID"), "", true, false, true);
-
-		productSearch.addValueChangeListener(this);
-	}
-	
-	private void prepareTable()
-	{
-		ColumnInfo[] layout = new ColumnInfo[] {
-				new ColumnInfo(" ",                                         ".", IDColumn.class, false, false, ""),
-				new ColumnInfo(Msg.translate(Env.getCtx(), "DocumentNo"),   ".", String.class),             //  1
-				new ColumnInfo(Msg.translate(Env.getCtx(), "Date"),         ".", Timestamp.class),
-				new ColumnInfo(Msg.translate(Env.getCtx(), "C_BPartner_ID"),".", KeyNamePair.class, "."),   //  3
-				new ColumnInfo(Msg.translate(Env.getCtx(), "Line"),         ".", KeyNamePair.class, "."),
-				new ColumnInfo(Msg.translate(Env.getCtx(), "M_Product_ID"), ".", KeyNamePair.class, "."),   //  5
-				new ColumnInfo(Msg.translate(Env.getCtx(), "Qty"),          ".", Double.class),
-				new ColumnInfo(Msg.translate(Env.getCtx(), "Matched"),      ".", Double.class)
-			};
-
-		strMatchedTable = xMatchedTable.prepareTable(layout, "", "", false, "");
-		strMatchedToTable = xMatchedToTable.prepareTable(layout, "", "", true, "");
-	}
-	
-	private void searchRecords()
-	{
-		int display = lstMatchFrom.getSelectedIndex();
-		
-		ListItem lstIteMatchTo = lstMatchTo.getSelectedItem();
-		String matchToString = (String)lstIteMatchTo.getValue();
-		int matchToType = MATCH_INVOICE;
-		
-		if (matchToString.equals(m_matchOptions[MATCH_SHIPMENT]))
-			matchToType = MATCH_SHIPMENT;
-		else if (matchToString.equals(m_matchOptions[MATCH_ORDER]))
-			matchToType = MATCH_ORDER;
-
-		tableInit(display, matchToType);	//	sets m_sql
-
-		// Where Clause
-		// Product
-		
-		if (productSearch.getDisplay() != "")
-		{
-			Integer Product = (Integer)productSearch.getValue();
-			m_sql.append(" AND lin.M_Product_ID=").append(Product);
-		}
-		
-		//  Business Partner
-		
-		if (bPartnerSearch.getDisplay() != "")
-		{
-			Integer Vendor = (Integer)bPartnerSearch.getValue();
-			m_sql.append(" AND hdr.C_BPartner_ID=").append(Vendor);
-		}
-		
-		Date f =null;
-		Timestamp from  =null;
-		
-		if (dateFrom.getValue() != null)
-		{
-			f = dateFrom.getValue();
-			from = new Timestamp(f.getTime());
-		}
-		
-		Date t = null;
-		Timestamp to = null;
-
-		if (dateTo.getValue() != null)
-		{
-			t = dateTo.getValue();
-			to = new Timestamp(t.getTime());
-		}
-		
-		if (from != null && to != null)
-			m_sql.append(" AND ").append(m_dateColumn).append(" BETWEEN ")
-				.append(DB.TO_DATE(from)).append(" AND ").append(DB.TO_DATE(to));
-		else if (from != null)
-			m_sql.append(" AND ").append(m_dateColumn).append(" >= ").append(DB.TO_DATE(from));
-		else if (to != null)
-			m_sql.append(" AND ").append(m_dateColumn).append(" <= ").append(DB.TO_DATE(to));
-
-		//  Load Table
-		tableLoad (xMatchedTable);
-		txtMatching.setText(Env.ZERO.toString());
-		
-		//  Status Info
-		ListItem lstIteMatchFrom = lstMatchFrom.getSelectedItem();
-		Integer rowCount = xMatchedTable.getItemCount();
-		
-		lblStatus.setValue(lstIteMatchFrom.getLabel() + "# = " + rowCount.toString());
-		//	xMatchedTable.getRowCount() == 0);
-		//statusBar.setStatusDB(0);		
-	}
-	
-	private void process()
-	{
-		// Matched From
-		int matchedRow = xMatchedTable.getSelectedRow();
-		
-		if (matchedRow < 0)
-			return;
-
-		//KeyNamePair BPartner = (KeyNamePair)xMatchedTable.getValueAt(matchedRow, I_BPartner);
-		KeyNamePair lineMatched = (KeyNamePair)xMatchedTable.getValueAt(matchedRow, I_Line);
-		KeyNamePair Product = (KeyNamePair)xMatchedTable.getValueAt(matchedRow, I_Product);
-
-		//int M_Product_ID = Product.getKey();
-		double totalQty = m_xMatched.doubleValue();
-
-		//  Matched To
-		for (int row = 0; row < xMatchedToTable.getItemCount(); row++)
-		{
-			IDColumn id = (IDColumn)xMatchedToTable.getValueAt(row, 0);
-			if (id != null && id.isSelected())
-			{
-				// Need to be the same product
-				KeyNamePair ProductCompare = (KeyNamePair)xMatchedToTable.getValueAt(row, I_Product);
-				
-				if (Product.getKey() != ProductCompare.getKey())
-					continue;
-
-				KeyNamePair lineMatchedTo = (KeyNamePair)xMatchedToTable.getValueAt(row, I_Line);
-
-				//	Qty
-				double qty = 0.0;
-				
-				if (lstSearchMode.getSelectedIndex() == MODE_NOTMATCHED)
-					qty = ((Double)xMatchedToTable.getValueAt(row, I_QTY)).doubleValue();	// doc
-				
-				qty -= ((Double)xMatchedToTable.getValueAt(row, I_MATCHED)).doubleValue();  // matched
-				
-				if (qty > totalQty)
-					qty = totalQty;
-				
-				totalQty -= qty;
-
-				//  Invoice or PO
-				boolean invoice = true;
-				if (lstMatchFrom.getSelectedIndex() == MATCH_ORDER ||
-						lstMatchTo.getSelectedItem().equals(m_matchOptions[MATCH_ORDER]))
-					invoice = false;
-
-				//  Get Shipment_ID
-				int M_InOutLine_ID = 0;
-				int Line_ID = 0;
-				
-				if (lstMatchFrom.getSelectedIndex() == MATCH_SHIPMENT)
-				{
-					M_InOutLine_ID = lineMatched.getKey();      //  upper table
-					Line_ID = lineMatchedTo.getKey();
-				}
-				else
-				{
-					M_InOutLine_ID = lineMatchedTo.getKey();    //  lower table
-					Line_ID = lineMatched.getKey();
-				}
-
-				//  Create it
-				createMatchRecord(invoice, M_InOutLine_ID, Line_ID, new BigDecimal(qty));
-			}
-		}
-		//  Requery
-		searchRecords();		
-	}
-
-	public void tableChanged(WTableModelEvent e)
-	{
-		if (e.getColumn() != 0)
-			return;
-		
-		log.config("Row=" + e.getFirstRow() + "-" + e.getLastRow() + ", Col=" + e.getColumn()
-			+ ", Type=" + e.getType());
-		//setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-
-		//  Matched From
-		int matchedRow = xMatchedTable.getSelectedRow();
-		if (matchedRow == -1)
-		{
-			return;
-		}
-		KeyNamePair Product = (KeyNamePair)xMatchedTable.getValueAt(matchedRow, 5);
-
-		//  Matched To
-		double qty = 0.0;
-		Integer noRows = 0;
-		
-		for (int row = 0; row < xMatchedToTable.getItemCount(); row++)
-		{
-			IDColumn id = (IDColumn)xMatchedToTable.getValueAt(row, 0);
-		
-			if (id != null && id.isSelected())
-			{
-				KeyNamePair ProductCompare = (KeyNamePair)xMatchedToTable.getValueAt(row, 5);
-				if (Product.getKey() != ProductCompare.getKey())
-				{
-					id.setSelected(false);
-				}
-				else
-				{
-					if (lstSearchMode.getSelectedIndex() == MODE_NOTMATCHED)
-						qty += ((Double)xMatchedToTable.getValueAt(row, I_QTY)).doubleValue();  //  doc
-					
-					qty -= ((Double)xMatchedToTable.getValueAt(row, I_MATCHED)).doubleValue();  //  matched
-					noRows++;
-				}
-			}
-		}
-		
-		//  Update qualtities
-		m_xMatchedTo = new BigDecimal(qty);
-		txtMatching.setValue(m_xMatchedTo.toString());
-		txtDifference.setValue(m_xMatched.subtract(m_xMatchedTo).toString());
-		cmdProcess.setEnabled(noRows != 0);
-		
-		//setCursor(Cursor.getDefaultCursor());
-		//  Status
-		//lblStatus.setValue(noRows.toString());
-	}
-	
-	private void tableInit(int display, int matchToType)
-	{
-		boolean matched = lstSearchMode.getSelectedIndex() == MODE_MATCHED;
-
-		m_sql = new StringBuffer ();
-		
-		if (display == MATCH_INVOICE)
-		{
-			m_dateColumn = "hdr.DateInvoiced";
-			m_qtyColumn = "lin.QtyInvoiced";
-			m_sql.append("SELECT hdr.C_Invoice_ID,hdr.DocumentNo, hdr.DateInvoiced, bp.Name,hdr.C_BPartner_ID,"
-				+ " lin.Line,lin.C_InvoiceLine_ID, p.Name,lin.M_Product_ID,"
-				+ " lin.QtyInvoiced,SUM(NVL(mi.Qty,0)) "
-				+ "FROM C_Invoice hdr"
-				+ " INNER JOIN C_BPartner bp ON (hdr.C_BPartner_ID=bp.C_BPartner_ID)"
-				+ " INNER JOIN C_InvoiceLine lin ON (hdr.C_Invoice_ID=lin.C_Invoice_ID)"
-				+ " INNER JOIN M_Product p ON (lin.M_Product_ID=p.M_Product_ID)"
-				+ " INNER JOIN C_DocType dt ON (hdr.C_DocType_ID=dt.C_DocType_ID AND dt.DocBaseType IN ('API','APC'))"
-				+ " FULL JOIN M_MatchInv mi ON (lin.C_InvoiceLine_ID=mi.C_InvoiceLine_ID) "
-				+ "WHERE hdr.DocStatus IN ('CO','CL')");
-			m_groupBy = " GROUP BY hdr.C_Invoice_ID,hdr.DocumentNo,hdr.DateInvoiced,bp.Name,hdr.C_BPartner_ID,"
-				+ " lin.Line,lin.C_InvoiceLine_ID,p.Name,lin.M_Product_ID,lin.QtyInvoiced "
-				+ "HAVING "
-				+ (matched ? "0" : "lin.QtyInvoiced")
-				+ "<>SUM(NVL(mi.Qty,0))";
-		}
-		else if (display == MATCH_ORDER)
-		{
-			m_dateColumn = "hdr.DateOrdered";
-			m_qtyColumn = "lin.QtyOrdered";
-			m_sql.append("SELECT hdr.C_Order_ID,hdr.DocumentNo, hdr.DateOrdered, bp.Name,hdr.C_BPartner_ID,"
-				+ " lin.Line,lin.C_OrderLine_ID, p.Name,lin.M_Product_ID,"
-				+ " lin.QtyOrdered,SUM(COALESCE(mo.Qty,0)) "
-				+ "FROM C_Order hdr"
-				+ " INNER JOIN C_BPartner bp ON (hdr.C_BPartner_ID=bp.C_BPartner_ID)"
-				+ " INNER JOIN C_OrderLine lin ON (hdr.C_Order_ID=lin.C_Order_ID)"
-				+ " INNER JOIN M_Product p ON (lin.M_Product_ID=p.M_Product_ID)"
-				+ " INNER JOIN C_DocType dt ON (hdr.C_DocType_ID=dt.C_DocType_ID AND dt.DocBaseType='POO')"
-				+ " FULL JOIN M_MatchPO mo ON (lin.C_OrderLine_ID=mo.C_OrderLine_ID) "
-				+ "WHERE mo.")
-				.append(matchToType == MATCH_SHIPMENT ? "M_InOutLine_ID" : "C_InvoiceLine_ID")
-				.append(matched ? " IS NOT NULL" : " IS NULL"
-				+ " AND hdr.DocStatus IN ('CO','CL')");
-			m_groupBy = " GROUP BY hdr.C_Order_ID,hdr.DocumentNo,hdr.DateOrdered,bp.Name,hdr.C_BPartner_ID,"
-				+ " lin.Line,lin.C_OrderLine_ID,p.Name,lin.M_Product_ID,lin.QtyOrdered "
-				+ "HAVING "
-				+ (matched ? "0" : "lin.QtyOrdered")
-				+ "<>SUM(COALESCE(mo.Qty,0))";
-		}
-		else    //  Shipment
-		{
-			m_dateColumn = "hdr.MovementDate";
-			m_qtyColumn = "lin.MovementQty";
-			m_sql.append("SELECT hdr.M_InOut_ID,hdr.DocumentNo, hdr.MovementDate, bp.Name,hdr.C_BPartner_ID,"
-				+ " lin.Line,lin.M_InOutLine_ID, p.Name,lin.M_Product_ID,"
-				+ " lin.MovementQty,SUM(NVL(m.Qty,0)) "
-				+ "FROM M_InOut hdr"
-				+ " INNER JOIN C_BPartner bp ON (hdr.C_BPartner_ID=bp.C_BPartner_ID)"
-				+ " INNER JOIN M_InOutLine lin ON (hdr.M_InOut_ID=lin.M_InOut_ID)"
-				+ " INNER JOIN M_Product p ON (lin.M_Product_ID=p.M_Product_ID)"
-				+ " INNER JOIN C_DocType dt ON (hdr.C_DocType_ID = dt.C_DocType_ID AND dt.DocBaseType='MMR')"
-				+ " FULL JOIN ")
-				.append(matchToType == MATCH_ORDER ? "M_MatchPO" : "M_MatchInv")
-				.append(" m ON (lin.M_InOutLine_ID=m.M_InOutLine_ID) "
-				+ "WHERE hdr.DocStatus IN ('CO','CL')");
-			m_groupBy = " GROUP BY hdr.M_InOut_ID,hdr.DocumentNo,hdr.MovementDate,bp.Name,hdr.C_BPartner_ID,"
-				+ " lin.Line,lin.M_InOutLine_ID,p.Name,lin.M_Product_ID,lin.MovementQty "
-				+ "HAVING "
-				+ (matched ? "0" : "lin.MovementQty")
-				+ "<>SUM(NVL(m.Qty,0))";
-		}
-	}
-	
-	private void tableLoad(WListbox table)
-	{
-		log.finest(m_sql + " - " +  m_groupBy);
-		String sql = MRole.getDefault().addAccessSQL(
-			m_sql.toString(), "hdr", MRole.SQL_FULLYQUALIFIED, MRole.SQL_RO)
-			+ m_groupBy;
-		log.finest(sql);
-		
-		try
-		{
-			Statement stmt = DB.createStatement();
-			ResultSet rs = stmt.executeQuery(sql);
-			table.loadTable(rs);
-			stmt.close();
-		}
-		catch (SQLException e)
-		{
-			log.log(Level.SEVERE, sql, e);
-		}
-	}
-	
-	private boolean createMatchRecord (boolean invoice, int M_InOutLine_ID, int Line_ID,
-			BigDecimal qty)
-	{
-		if (qty.compareTo(Env.ZERO) == 0)
-			return true;
-
-		log.fine("IsInvoice=" + invoice
-				+ ", M_InOutLine_ID=" + M_InOutLine_ID + ", Line_ID=" + Line_ID
-				+ ", Qty=" + qty);
-
-		boolean success = false;
-		MInOutLine sLine = new MInOutLine (Env.getCtx(), M_InOutLine_ID, null);
-
-		if (invoice)	//	Shipment - Invoice
-		{
-			//	Update Invoice Line
-		
-			MInvoiceLine iLine = new MInvoiceLine (Env.getCtx(), Line_ID, null);
-			iLine.setM_InOutLine_ID(M_InOutLine_ID);
-			
-			if (sLine.getC_OrderLine_ID() != 0)
-				iLine.setC_OrderLine_ID(sLine.getC_OrderLine_ID());
-			
-			iLine.save();
-			
-			//	Create Shipment - Invoice Link
-			if (iLine.getM_Product_ID() != 0)
-			{
-				MMatchInv match = new MMatchInv (iLine, null, qty);
-				match.setM_InOutLine_ID(M_InOutLine_ID);
-				if (match.save())
-					success = true;
-				else
-					log.log(Level.SEVERE, "Inv Match not created: " + match);
-			}
-			else
-				success = true;
-			
-			//	Create PO - Invoice Link = corrects PO
-			if (iLine.getC_OrderLine_ID() != 0 && iLine.getM_Product_ID() != 0)
-			{
-				MMatchPO matchPO = MMatchPO.create(iLine, sLine, null, qty);
-				matchPO.setC_InvoiceLine_ID(iLine);
-				matchPO.setM_InOutLine_ID(M_InOutLine_ID);
-				
-				if (!matchPO.save())
-				{
-					log.log(Level.SEVERE, "PO(Inv) Match not created: " + matchPO);
-				}
-			}
-		}
-		else	//	Shipment - Order
-		{
-			//	Update Shipment Line
-			sLine.setC_OrderLine_ID(Line_ID);
-			sLine.save();
-			
-			//	Update Order Line
-			MOrderLine oLine = new MOrderLine(Env.getCtx(), Line_ID, null);
-			
-			if (oLine.get_ID() != 0)	//	other in MInOut.completeIt
-			{
-				oLine.setQtyReserved(oLine.getQtyReserved().subtract(qty));
-				if(!oLine.save())
-					;//log.severe("QtyReserved not updated - C_OrderLine_ID=" + Line_ID);
-			}
-
-			//	Create PO - Shipment Link
-			if (sLine.getM_Product_ID() != 0)
-			{
-				MMatchPO match = new MMatchPO (sLine, null, qty);
-				if (!match.save())
-					;//	log.log(Level.SEVERE, "PO Match not created: " + match);
-				else
-				{
-					success = true;
-
-					//	Correct Ordered Qty for Stocked Products (see MOrder.reserveStock / MInOut.processIt)
-					if (sLine.getProduct() != null && sLine.getProduct().isStocked())
-						success = MStorage.add (Env.getCtx(), sLine.getM_Warehouse_ID(), 
-								sLine.getM_Locator_ID(), 
-								sLine.getM_Product_ID(), 
-								sLine.getM_AttributeSetInstance_ID(), oLine.getM_AttributeSetInstance_ID(), 
-								null, null, qty.negate(), null);
-				}
-			}
-			else
-				success = true;
-		}
-		return success;
-	}
-	
-	private void searchTo()
-	{
-		int row = xMatchedTable.getSelectedRow();
-		log.config("Row=" + row);
-
-		double qty = 0.0;
-		
-		if (row < 0)
-		{
-			xMatchedToTable.setRowCount(0);
-		}
-		else
-		{
-			//  ** Create SQL **
-			ListItem lstIteDisplayStr = lstMatchTo.getSelectedItem();
-			String displayString = (String)lstIteDisplayStr.getValue();
-			int display = MATCH_INVOICE;
-			
-			if (displayString.equals(m_matchOptions[MATCH_SHIPMENT]))
-				display = MATCH_SHIPMENT;
-			else if (displayString.equals(m_matchOptions[MATCH_ORDER]))
-				display = MATCH_ORDER;
-			
-			int matchToType = lstMatchFrom.getSelectedIndex();
-			
-			tableInit (display, matchToType);	//	sets m_sql
-			
-			//  ** Add Where Clause **
-			KeyNamePair BPartner = (KeyNamePair)xMatchedTable.getValueAt(row, I_BPartner);
-			KeyNamePair Product = (KeyNamePair)xMatchedTable.getValueAt(row, I_Product);
-			log.fine("BPartner=" + BPartner + " - Product=" + Product);
-
-			if (chkSameBP.isChecked())
-				m_sql.append(" AND hdr.C_BPartner_ID=").append(BPartner.getKey());
-			
-			if (chkSameProduct.isChecked())
-				m_sql.append(" AND lin.M_Product_ID=").append(Product.getKey());
-
-			// Calculate qty
-			double docQty = ((Double)xMatchedTable.getValueAt(row, I_QTY)).doubleValue();
-			double matchedQty = ((Double)xMatchedTable.getValueAt(row, I_MATCHED)).doubleValue();
-			qty = docQty - matchedQty;
-			
-			if (chkSameQty.isChecked())
-				m_sql.append(" AND ").append(m_qtyColumn).append("=").append(docQty);
-
-			//  ** Load Table **
-			tableLoad (xMatchedToTable);
-		}
-
-		//  Display To be Matched Qty
-		m_xMatched = new BigDecimal (qty);
-		txtToBeMatched.setValue(m_xMatched.toString());
-		txtMatching.setValue(Env.ZERO.toString());
-		txtDifference.setValue(m_xMatched.toString());
-		
-		//  Status Info
-		ListItem lstIteMatchFrom = lstMatchFrom.getSelectedItem();
-		ListItem lstIteMatchTo = lstMatchTo.getSelectedItem();
-		
-		Integer matchedRowCount = xMatchedTable.getItemCount();
-		Integer matchToRowCount = xMatchedToTable.getItemCount();
-		
-		String stat = 	lstIteMatchFrom.getLabel() + "# = " + matchedRowCount.toString() + " - "
-						+ lstIteMatchTo.getLabel() +  "# = " + matchToRowCount.toString();
-		
-		lblStatus.setValue(stat);
-		//	xMatchedToTable.getRowCount() == 0);
-		//statusBar.setStatusDB(0);
-	}
-	
-	public void onEvent(Event evt) throws Exception
-	{
-		if (evt != null)
-		{
-			if (evt.getTarget() == lstMatchFrom)
-			{
-				populateMatchTo();
-				
-				ListItem lstIteMatchFrom = lstMatchFrom.getSelectedItem();
-				lblMatchFrom.setValue(lstIteMatchFrom.getLabel());
-				
-				ListItem lstIteMatchTo = lstMatchTo.getSelectedItem();
-				lblMatchTo.setValue(lstIteMatchTo.getLabel());
-				
-				xMatchedTable.clear();
-				xMatchedToTable.clear();
-			}
-
-			if (evt.getTarget() == lstMatchTo)
-			{
-				ListItem lstIteMatchTo = lstMatchTo.getSelectedItem();
-				lblMatchTo.setValue(lstIteMatchTo.getLabel());
-				
-				xMatchedTable.clear();
-				xMatchedToTable.clear();
-			}
-			
-			if (evt.getTarget() == chkSameBP)
-			{
-				searchTo();
-			}
-			
-			if (evt.getTarget() == chkSameProduct)
-			{
-				searchTo();
-			}
-
-			if (evt.getTarget() == chkSameQty)
-			{
-				searchTo();
-			}
-			
-			if (evt.getTarget() == cmdSearch)
-			{
-				xMatchedTable.clear();
-				xMatchedToTable.clear();
-				searchRecords();
-			}
-			
-			if (evt.getTarget() == cmdProcess)
-			{
-				process();
-				
-				xMatchedTable.clear();
-				xMatchedToTable.clear();
-				
-				txtMatching.setValue("");
-				txtToBeMatched.setValue("");
-				txtDifference.setValue("");
-				
-				lblStatus.setValue("");
-				
-				searchRecords();
-			}
-			
-			if (evt.getTarget() == xMatchedTable)
-			{
-				searchTo();
-			}
-		}
-	}
-
-	//public void tableChanged(WTableModelEvent event)
-	//{
-		//if (event.getColumn() == 0)
-		//{
-		//	searchTo();
-		//}
-	//}
-	
-	public void valueChange(ValueChangeEvent evt) 
-	{
-		if (evt == null)
-			return;
-
-		if (evt.getSource() instanceof WEditor)
-		{
-			String name = evt.getPropertyName();
-			Object value = evt.getNewValue() == null ? "" : evt.getNewValue();
-
-			xMatchedTable.clear();
-			xMatchedToTable.clear();
-			
-			if (name.equals("C_BPartner_ID"))
-			{
-				bPartnerSearch.setValue(value);
-				//m_C_BPartner_ID = ((Integer) value).intValue();
-			}
-			else if (name.equals("M_Product_ID"))
-			{
-				productSearch.setValue(value);
-				//productID = new Integer(value);
-			}
-		}
-	}
-}
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution                        *
+ * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@... or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+package org.adempiere.webui.apps.form;
+
+import java.math.*;
+import java.sql.*;
+import java.util.*;
+import java.util.logging.*;
+
+import org.adempiere.webui.LayoutUtils;
+import org.adempiere.webui.apps.AEnv;
+import org.adempiere.webui.component.Button;
+import org.adempiere.webui.component.Checkbox;
+import org.adempiere.webui.component.Grid;
+import org.adempiere.webui.component.GridFactory;
+import org.adempiere.webui.component.Label;
+import org.adempiere.webui.component.ListModelTable;
+import org.adempiere.webui.component.Listbox;
+import org.adempiere.webui.component.ListboxFactory;
+import org.adempiere.webui.component.Panel;
+import org.adempiere.webui.component.Row;
+import org.adempiere.webui.component.Rows;
+import org.adempiere.webui.component.SimpleListModel;
+import org.adempiere.webui.component.WListbox;
+import org.adempiere.webui.editor.WDateEditor;
+import org.adempiere.webui.editor.WNumberEditor;
+import org.adempiere.webui.editor.WSearchEditor;
+import org.adempiere.webui.event.WTableModelEvent;
+import org.adempiere.webui.event.WTableModelListener;
+import org.adempiere.webui.panel.ADForm;
+import org.adempiere.webui.panel.StatusBarPanel;
+import org.adempiere.webui.session.SessionManager;
+import org.compiere.minigrid.ColumnInfo;
+import org.compiere.minigrid.IDColumn;
+import org.compiere.model.*;
+import org.compiere.util.*;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
+import org.zkoss.zk.ui.event.Events;
+import org.zkoss.zkex.zul.Borderlayout;
+import org.zkoss.zkex.zul.Center;
+import org.zkoss.zkex.zul.North;
+import org.zkoss.zkex.zul.South;
+import org.zkoss.zul.ListModel;
+import org.zkoss.zul.Separator;
+import org.zkoss.zul.Space;
+
+/**
+ *  Manual Matching
+ *
+ *  @author     Jorg Janke
+ *  @version    $Id: VMatch.java,v 1.2 2006/07/30 00:51:28 jjanke Exp $
+ */
+public class WMatch extends ADForm
+	implements EventListener, WTableModelListener
+{
+	/**
+	 *	Initialize Panel
+	 */
+	protected void initForm()
+	{
+		log.info("WinNo=" + m_WindowNo
+			+ " - AD_Client_ID=" + m_AD_Client_ID + ", AD_Org_ID=" + m_AD_Org_ID + ", By=" + m_by);
+		Env.setContext(Env.getCtx(), m_WindowNo, "IsSOTrx", "N");
+
+		try
+		{
+			//	UI
+			onlyVendor = WSearchEditor.createBPartner(m_WindowNo); 
+			onlyProduct = WSearchEditor.createProduct(m_WindowNo);
+			zkInit();
+			//
+			dynInit();
+			southPanel.appendChild(new Separator());
+			southPanel.appendChild(statusBar);
+			LayoutUtils.addSclass("status-border", statusBar);
+			//
+			new Thread()
+			{
+				public void run()
+				{
+					log.info("Starting ...");
+					MMatchPO.consolidate(Env.getCtx());
+					log.info("... Done");
+				}
+			}.start();
+		}
+		catch(Exception e)
+		{
+			log.log(Level.SEVERE, "", e);
+		}
+	}	//	init
+
+	/**	Logger			*/
+	private static CLogger log = CLogger.getCLogger(WMatch.class);
+
+	private int     m_AD_Client_ID = Env.getAD_Client_ID(Env.getCtx());
+	private int     m_AD_Org_ID = Env.getAD_Org_ID(Env.getCtx());
+	private int     m_by = Env.getAD_User_ID(Env.getCtx());
+
+	/** Match Options           */
+	private String[] m_matchOptions = new String[] {
+		Msg.getElement(Env.getCtx(), "C_Invoice_ID", false),
+		Msg.getElement(Env.getCtx(), "M_InOut_ID", false),
+		Msg.getElement(Env.getCtx(), "C_Order_ID", false) };
+	private static final int		MATCH_INVOICE = 0;
+	private static final int		MATCH_SHIPMENT = 1;
+	private static final int		MATCH_ORDER = 2;
+
+	/** Match Mode              	*/
+	private String[] m_matchMode = new String[] {
+		Msg.translate(Env.getCtx(), "NotMatched"),
+		Msg.translate(Env.getCtx(), "Matched")};
+	private static final int		MODE_NOTMATCHED = 0;
+	private static final int		MODE_MATCHED = 1;
+
+	/**	Indexes in Table			*/
+	private static final int		I_BPartner = 3;
+	private static final int		I_Line = 4;
+	private static final int		I_Product = 5;
+	private static final int		I_QTY = 6;
+	private static final int		I_MATCHED = 7;
+
+
+	private StringBuffer    m_sql = null;
+	private String          m_dateColumn = "";
+	private String          m_qtyColumn = "";
+	private String          m_groupBy = "";
+	private StringBuffer			m_linetype = null;
+	private BigDecimal      m_xMatched = Env.ZERO;
+	private BigDecimal      m_xMatchedTo = Env.ZERO;
+
+	//
+	private Panel mainPanel = new Panel();
+	private StatusBarPanel statusBar = new StatusBarPanel();
+	private Borderlayout mainLayout = new Borderlayout();
+	private Panel northPanel = new Panel();
+	private Grid northLayout = GridFactory.newGridLayout();
+	private Label matchFromLabel = new Label();
+	private Listbox matchFrom = ListboxFactory.newDropdownListbox(m_matchOptions);
+	private Label matchToLabel = new Label();
+	private Listbox matchTo = ListboxFactory.newDropdownListbox();
+	private Label matchModeLabel = new Label();
+	private Listbox matchMode = ListboxFactory.newDropdownListbox(m_matchMode);
+	private WSearchEditor onlyVendor = null; 
+	private WSearchEditor onlyProduct = null;
+	private Label onlyVendorLabel = new Label();
+	private Label onlyProductLabel = new Label();
+	private Label dateFromLabel = new Label();
+	private Label dateToLabel = new Label();
+	private WDateEditor dateFrom = new WDateEditor("DateFrom", false, false, true, DisplayType.Date, "DateFrom");
+	private WDateEditor dateTo = new WDateEditor("DateTo", false, false, true, DisplayType.Date, "DateTo");
+	private Button bSearch = new Button();
+	private Panel southPanel = new Panel();
+	private Grid southLayout = GridFactory.newGridLayout();
+	private Label xMatchedLabel = new Label();
+	private Label xMatchedToLabel = new Label();
+	private Label differenceLabel = new Label();
+	private WNumberEditor xMatched = new WNumberEditor("xMatched", false, true, false, DisplayType.Quantity, "xMatched");
+	private WNumberEditor xMatchedTo = new WNumberEditor("xMatchedTo", false, true, false, DisplayType.Quantity, "xMatchedTo");
+	private WNumberEditor difference = new WNumberEditor("Difference", false, true, false, DisplayType.Quantity, "Difference");
+	private Button bProcess = new Button();
+	private Panel centerPanel = new Panel();
+	private Borderlayout centerLayout = new Borderlayout();
+//	private JScrollPane xMatchedScrollPane = new JScrollPane();
+	private Label xMatchedBorder = new Label("xMatched");
+	private WListbox xMatchedTable = ListboxFactory.newDataTable();
+//	private JScrollPane xMatchedToScrollPane = new JScrollPane();
+	private Label xMatchedToBorder = new Label("xMatchedTo");
+	private WListbox xMatchedToTable = ListboxFactory.newDataTable();
+	private Panel xPanel = new Panel();
+	private Checkbox sameProduct = new Checkbox();
+	private Checkbox sameBPartner = new Checkbox();
+	private Checkbox sameQty = new Checkbox();
+//	private FlowLayout xLayout = new FlowLayout(FlowLayout.CENTER, 10, 0);
+
+	/**
+	 *  Static Init.
+	 *  <pre>
+	 *  mainPanel
+	 *      northPanel
+	 *      centerPanel
+	 *          xMatched
+	 *          xPanel
+	 *          xMathedTo
+	 *      southPanel
+	 *  </pre>
+	 *  @throws Exception
+	 */
+	private void zkInit() throws Exception
+	{
+		this.appendChild(mainPanel);
+		mainPanel.setStyle("width: 99%; height: 100%; padding: 0; margin: 0");
+		mainPanel.appendChild(mainLayout);
+		mainLayout.setWidth("100%");
+		mainLayout.setHeight("100%");
+		northPanel.appendChild(northLayout);
+		matchFromLabel.setText(Msg.translate(Env.getCtx(), "MatchFrom"));
+		matchToLabel.setText(Msg.translate(Env.getCtx(), "MatchTo"));
+		matchModeLabel.setText(Msg.translate(Env.getCtx(), "MatchMode"));
+		onlyVendorLabel.setText(Msg.translate(Env.getCtx(), "C_BPartner_ID"));
+		onlyProductLabel.setText(Msg.translate(Env.getCtx(), "M_Product_ID"));
+		dateFromLabel.setText(Msg.translate(Env.getCtx(), "DateFrom"));
+		dateToLabel.setText(Msg.translate(Env.getCtx(), "DateTo"));
+		bSearch.setLabel(Msg.translate(Env.getCtx(), "Search"));
+		southPanel.appendChild(southLayout);
+		xMatchedLabel.setText(Msg.translate(Env.getCtx(), "ToBeMatched"));
+		xMatchedToLabel.setText(Msg.translate(Env.getCtx(), "Matching"));
+		differenceLabel.setText(Msg.translate(Env.getCtx(), "Difference"));
+		bProcess.setLabel(Msg.translate(Env.getCtx(), "Process"));
+		centerPanel.appendChild(centerLayout);
+//		xMatchedScrollPane.setBorder(xMatchedBorder);
+//		xMatchedScrollPane.setPreferredSize(new Dimension(450, 200));
+//		xMatchedToScrollPane.setBorder(xMatchedToBorder);
+//		xMatchedToScrollPane.setPreferredSize(new Dimension(450, 200));
+		sameProduct.setSelected(true);
+		sameProduct.setText(Msg.translate(Env.getCtx(), "SameProduct"));
+		sameBPartner.setSelected(true);
+		sameBPartner.setText(Msg.translate(Env.getCtx(), "SameBPartner"));
+		sameQty.setSelected(false);
+		sameQty.setText(Msg.translate(Env.getCtx(), "SameQty"));
+//		xPanel.setLayout(xLayout);
+		
+		North north = new North();
+		mainLayout.appendChild(north);
+		north.appendChild(northPanel);
+		
+		Rows rows = northLayout.newRows();
+		Row row = rows.newRow();
+		row.appendChild(matchFromLabel.rightAlign());
+		row.appendChild(matchFrom);
+		row.appendChild(matchToLabel.rightAlign());
+		row.appendChild(matchTo);
+		row.appendChild(new Space());
+		
+		row = rows.newRow();
+		row.setSpans("1,1,3");
+		row.appendChild(matchModeLabel.rightAlign());
+		row.appendChild(matchMode);
+		row.appendChild(new Space());
+		
+		row = rows.newRow();
+		row.appendChild(onlyVendorLabel.rightAlign());
+		row.appendChild(onlyVendor.getComponent());
+		row.appendChild(onlyProductLabel.rightAlign());
+		row.appendChild(onlyProduct.getComponent());
+		row.appendChild(new Space());
+		
+		row = rows.newRow();
+		row.appendChild(dateFromLabel.rightAlign());		
+		row.appendChild(dateFrom.getComponent());
+		row.appendChild(dateToLabel.rightAlign());
+		row.appendChild(dateTo.getComponent());
+		row.appendChild(bSearch);
+		
+		South south = new South();
+		mainLayout.appendChild(south);
+		south.appendChild(southPanel);
+		
+		rows = southLayout.newRows();
+		
+		row = rows.newRow();
+		row.appendChild(xMatchedLabel.rightAlign());
+		row.appendChild(xMatched.getComponent());
+		row.appendChild(xMatchedToLabel.rightAlign());
+		row.appendChild(xMatchedTo.getComponent());
+		row.appendChild(differenceLabel.rightAlign());
+		row.appendChild(difference.getComponent());
+		row.appendChild(bProcess);
+		
+		Center center = new Center();
+		mainLayout.appendChild(center);
+		center.appendChild(centerPanel);
+		center.setFlex(true);
+		centerLayout.setWidth("100%");
+		centerLayout.setHeight("100%");
+		north = new North();
+		centerLayout.appendChild(north);
+		north.setStyle("border: none");
+		Panel p = new Panel();
+		p.appendChild(xMatchedBorder);
+		p.appendChild(xMatchedTable);
+		xMatchedTable.setWidth("99%");
+		xMatchedTable.setHeight("85%");
+		p.setStyle("width: 100%; height: 100%; padding: 0; margin: 0");
+		north.appendChild(p);
+		north.setHeight("44%");
+		
+		south = new South();
+		centerLayout.appendChild(south);
+		south.setStyle("border: none");
+		xMatchedToTable.setWidth("99%");
+		xMatchedToTable.setHeight("99%");
+		south.appendChild(xMatchedToTable);
+		south.setHeight("44%");
+		
+		center = new Center();
+		centerLayout.appendChild(center);
+		center.setStyle("border: none");
+		center.setFlex(false);
+//		center.setHeight("6%");
+		center.appendChild(xPanel);
+		xPanel.appendChild(sameBPartner);
+		xPanel.appendChild(new Space());
+		xPanel.appendChild(sameProduct);
+		xPanel.appendChild(new Space());
+		xPanel.appendChild(sameQty);
+		xPanel.setHeight("50px");
+		xPanel.appendChild(new Separator());
+		xPanel.appendChild(xMatchedToBorder);
+	}   //  jbInit
+
+	/**
+	 *  Dynamic Init.
+	 *  Table Layout, Visual, Listener
+	 */
+	private void dynInit()
+	{
+		ColumnInfo[] layout = new ColumnInfo[] {
+			new ColumnInfo(" ",                                         ".", IDColumn.class, false, false, ""),
+			new ColumnInfo(Msg.translate(Env.getCtx(), "DocumentNo"),   ".", String.class),             //  1
+			new ColumnInfo(Msg.translate(Env.getCtx(), "Date"),         ".", Timestamp.class),
+			new ColumnInfo(Msg.translate(Env.getCtx(), "C_BPartner_ID"),".", KeyNamePair.class, "."),   //  3
+			new ColumnInfo(Msg.translate(Env.getCtx(), "Line"),         ".", KeyNamePair.class, "."),
+			new ColumnInfo(Msg.translate(Env.getCtx(), "M_Product_ID"), ".", KeyNamePair.class, "."),   //  5
+			new ColumnInfo(Msg.translate(Env.getCtx(), "Qty"),          ".", Double.class),
+			new ColumnInfo(Msg.translate(Env.getCtx(), "Matched"),      ".", Double.class)
+		};
+
+		xMatchedTable.prepareTable(layout, "", "", false, "");
+		xMatchedToTable.prepareTable(layout, "", "", true, "");
+
+		matchFrom.setSelectedIndex(0);
+		//  Listener
+		matchFrom.addActionListener(this);
+		matchTo.addActionListener(this);
+		bSearch.addActionListener(this);
+		xMatchedTable.addEventListener(Events.ON_SELECT, this);
+		xMatchedToTable.getModel().addTableModelListener(this);
+		bProcess.addActionListener(this);
+		sameBPartner.addActionListener(this);
+		sameProduct.addActionListener(this);
+		sameQty.addActionListener(this);
+		//  Init
+		cmd_matchFrom();
+		statusBar.setStatusLine("");
+		statusBar.setStatusDB("0");
+	}   //  dynInit
+
+	/**
+	 * 	Dispose
+	 */
+	public void dispose()
+	{
+		SessionManager.getAppDesktop().removeWindow();
+	}	//	dispose
+
+	
+	/**************************************************************************
+	 *  Action Listener
+	 *  @param e event
+	 */
+	public void onEvent (Event e)
+	{
+		if (e.getTarget() == matchFrom)
+			cmd_matchFrom();
+		else if (e.getTarget() == matchTo)
+			cmd_matchTo();
+		else if (e.getTarget() == bSearch)
+			cmd_search();
+		else if (e.getTarget() == bProcess)
+			cmd_process();
+		else if (e.getTarget() == sameBPartner
+			|| e.getTarget() == sameProduct
+			|| e.getTarget() == sameQty)
+			cmd_searchTo();
+		else if (AEnv.contains(xMatchedTable, e.getTarget()))
+			cmd_searchTo();
+	}   //  actionPerformed
+
+	/**
+	 *  Match From Changed - Fill Match To
+	 */
+	private void cmd_matchFrom()
+	{
+	//	log.fine( "VMatch.cmd_matchFrom");
+		String selection = (String)matchFrom.getSelectedItem().getValue();
+		Vector<String> vector = new Vector<String>(2);
+		if (selection.equals(m_matchOptions[MATCH_INVOICE]))
+			vector.add(m_matchOptions[MATCH_SHIPMENT]);
+		else if (selection.equals(m_matchOptions[MATCH_ORDER]))
+			vector.add(m_matchOptions[MATCH_SHIPMENT]);
+		else    //  shipment
+		{
+			vector.add(m_matchOptions[MATCH_INVOICE]);
+			vector.add(m_matchOptions[MATCH_ORDER]);
+		}
+		SimpleListModel model = new SimpleListModel(vector);
+		matchTo.setItemRenderer(model);
+		matchTo.setModel(model);		
+		//  Set Title
+		xMatchedBorder.setValue(selection);
+		//  Reset Table
+		xMatchedTable.setRowCount(0);
+		//  sync To
+		matchTo.setSelectedIndex(0);
+		cmd_matchTo();
+	}   //  cmd_matchFrom
+
+	/**
+	 *  Match To Changed - set Title
+	 */
+	private void cmd_matchTo()
+	{
+	//	log.fine( "VMatch.cmd_matchTo");
+		int index = matchTo.getSelectedIndex();
+		String selection = (String)matchTo.getModel().getElementAt(index);
+		xMatchedToBorder.setValue(selection);
+		//  Reset Table
+		xMatchedToTable.setRowCount(0);
+	}   //  cmd_matchTo
+
+	/**
+	 *  Search Button Pressed - Fill xMatched
+	 */
+	private void cmd_search()
+	{
+		//  ** Create SQL **
+		int display = matchFrom.getSelectedIndex();
+		String matchToString = (String)matchTo.getSelectedItem().getLabel();
+		int matchToType = MATCH_INVOICE;
+		if (matchToString.equals(m_matchOptions[MATCH_SHIPMENT]))
+			matchToType = MATCH_SHIPMENT;
+		else if (matchToString.equals(m_matchOptions[MATCH_ORDER]))
+			matchToType = MATCH_ORDER;
+		//
+		tableInit(display, matchToType);	//	sets m_sql
+
+		//  ** Add Where Clause **
+		//  Product
+		if (onlyProduct.getValue() != null)
+		{
+			Integer Product = (Integer)onlyProduct.getValue();
+			m_sql.append(" AND lin.M_Product_ID=").append(Product);
+		}
+		//  BPartner
+		if (onlyVendor.getValue() != null)
+		{
+			Integer Vendor = (Integer)onlyVendor.getValue();
+			m_sql.append(" AND hdr.C_BPartner_ID=").append(Vendor);
+		}
+		//  Date
+		Timestamp from = (Timestamp)dateFrom.getValue();
+		Timestamp to = (Timestamp)dateTo.getValue();
+		if (from != null && to != null)
+			m_sql.append(" AND ").append(m_dateColumn).append(" BETWEEN ")
+				.append(DB.TO_DATE(from)).append(" AND ").append(DB.TO_DATE(to));
+		else if (from != null)
+			m_sql.append(" AND ").append(m_dateColumn).append(" >= ").append(DB.TO_DATE(from));
+		else if (to != null)
+			m_sql.append(" AND ").append(m_dateColumn).append(" <= ").append(DB.TO_DATE(to));
+
+		//  ** Load Table **
+		tableLoad (xMatchedTable);
+		xMatched.setValue(Env.ZERO);
+		//  Status Info
+		statusBar.setStatusLine(matchFrom.getSelectedItem().getLabel()
+			+ "# = " + xMatchedTable.getRowCount(),
+			xMatchedTable.getRowCount() == 0);
+		statusBar.setStatusDB("0");
+	}   //  cmd_search
+
+	/**
+	 *  Process Button Pressed - Process Matching
+	 */
+	private void cmd_process()
+	{
+		log.config("");
+		//  Matched From
+		int matchedRow = xMatchedTable.getSelectedRow();
+		if (matchedRow < 0)
+			return;
+	//	KeyNamePair BPartner = (KeyNamePair)xMatchedTable.getValueAt(matchedRow, I_BPartner);
+		KeyNamePair lineMatched = (KeyNamePair)xMatchedTable.getValueAt(matchedRow, I_Line);
+		KeyNamePair Product = (KeyNamePair)xMatchedTable.getValueAt(matchedRow, I_Product);
+
+		int M_Product_ID = Product.getKey();
+		double totalQty = m_xMatched.doubleValue();
+
+		//  Matched To
+		for (int row = 0; row < xMatchedToTable.getRowCount(); row++)
+		{
+			IDColumn id = (IDColumn)xMatchedToTable.getValueAt(row, 0);
+			if (id != null && id.isSelected())
+			{
+				//  need to be the same product
+				KeyNamePair ProductCompare = (KeyNamePair)xMatchedToTable.getValueAt(row, I_Product);
+				if (Product.getKey() != ProductCompare.getKey())
+					continue;
+
+				KeyNamePair lineMatchedTo = (KeyNamePair)xMatchedToTable.getValueAt(row, I_Line);
+
+				//	Qty
+				double qty = 0.0;
+				if (matchMode.getSelectedIndex() == MODE_NOTMATCHED)
+					qty = ((Double)xMatchedToTable.getValueAt(row, I_QTY)).doubleValue();	//  doc
+				qty -= ((Double)xMatchedToTable.getValueAt(row, I_MATCHED)).doubleValue();  //  matched
+				if (qty > totalQty)
+					qty = totalQty;
+				totalQty -= qty;
+
+				//  Invoice or PO
+				boolean invoice = true;
+				if (matchFrom.getSelectedIndex() == MATCH_ORDER ||
+						matchTo.getSelectedItem().equals(m_matchOptions[MATCH_ORDER]))
+					invoice = false;
+				//  Get Shipment_ID
+				int M_InOutLine_ID = 0;
+				int Line_ID = 0;
+				if (matchFrom.getSelectedIndex() == MATCH_SHIPMENT)
+				{
+					M_InOutLine_ID = lineMatched.getKey();      //  upper table
+					Line_ID = lineMatchedTo.getKey();
+				}
+				else
+				{
+					M_InOutLine_ID = lineMatchedTo.getKey();    //  lower table
+					Line_ID = lineMatched.getKey();
+				}
+
+				//  Create it
+				createMatchRecord(invoice, M_InOutLine_ID, Line_ID, new BigDecimal(qty));
+			}
+		}
+		//  requery
+		cmd_search();
+	}   //  cmd_process
+	
+	/**
+	 *  Fill xMatchedTo
+	 */
+	private void cmd_searchTo()
+	{
+		int row = xMatchedTable.getSelectedRow();
+		log.config("Row=" + row);
+
+		double qty = 0.0;
+		if (row < 0)
+		{
+			xMatchedToTable.setRowCount(0);
+		}
+		else
+		{
+			//  ** Create SQL **
+			String displayString = (String)matchTo.getSelectedItem().getLabel();
+			int display = MATCH_INVOICE;
+			if (displayString.equals(m_matchOptions[MATCH_SHIPMENT]))
+				display = MATCH_SHIPMENT;
+			else if (displayString.equals(m_matchOptions[MATCH_ORDER]))
+				display = MATCH_ORDER;
+			int matchToType = matchFrom.getSelectedIndex();
+			tableInit (display, matchToType);	//	sets m_sql
+			//  ** Add Where Clause **
+			KeyNamePair BPartner = (KeyNamePair)xMatchedTable.getValueAt(row, I_BPartner);
+			KeyNamePair Product = (KeyNamePair)xMatchedTable.getValueAt(row, I_Product);
+			log.fine("BPartner=" + BPartner + " - Product=" + Product);
+			//
+			if (sameBPartner.isSelected())
+				m_sql.append(" AND hdr.C_BPartner_ID=").append(BPartner.getKey());
+			if (sameProduct.isSelected())
+				m_sql.append(" AND lin.M_Product_ID=").append(Product.getKey());
+
+			//  calculate qty
+			double docQty = ((Double)xMatchedTable.getValueAt(row, I_QTY)).doubleValue();
+			double matchedQty = ((Double)xMatchedTable.getValueAt(row, I_MATCHED)).doubleValue();
+			qty = docQty - matchedQty;
+			if (sameQty.isSelected())
+				m_sql.append(" AND ").append(m_qtyColumn).append("=").append(docQty);
+			//  ** Load Table **
+			tableLoad (xMatchedToTable);
+		}
+		//  Display To be Matched Qty
+		m_xMatched = new BigDecimal (qty);
+		xMatched.setValue(m_xMatched);
+		xMatchedTo.setValue(Env.ZERO);
+		difference.setValue(m_xMatched);
+		//  Status Info
+		statusBar.setStatusLine(matchFrom.getSelectedItem().getLabel()
+			+ "# = " + xMatchedTable.getRowCount() + " - "
+			+ getMatchToLabel()
+			+  "# = " + xMatchedToTable.getRowCount(),
+			xMatchedToTable.getRowCount() == 0);
+		statusBar.setStatusDB("0");
+	}   //  cmd_seachTo
+
+	
+	private String getMatchToLabel() {
+		int index = matchTo.getSelectedIndex();
+		return matchTo.getModel().getElementAt(index).toString();
+	}
+
+	/***************************************************************************
+	 *  Table Model Listener - calculate matchd Qty
+	 *  @param e event
+	 */
+	public void tableChanged (WTableModelEvent e)
+	{
+		if (e.getColumn() != 0)
+			return;
+		log.config("Row=" + e.getFirstRow() + "-" + e.getLastRow() + ", Col=" + e.getColumn()
+			+ ", Type=" + e.getType());
+
+		//  Matched From
+		int matchedRow = xMatchedTable.getSelectedRow();
+		KeyNamePair Product = (KeyNamePair)xMatchedTable.getValueAt(matchedRow, 5);
+
+		//  Matched To
+		double qty = 0.0;
+		int noRows = 0;
+		for (int row = 0; row < xMatchedToTable.getRowCount(); row++)
+		{
+			IDColumn id = (IDColumn)xMatchedToTable.getValueAt(row, 0);
+			if (id != null && id.isSelected())
+			{
+				KeyNamePair ProductCompare = (KeyNamePair)xMatchedToTable.getValueAt(row, 5);
+				if (Product.getKey() != ProductCompare.getKey())
+				{
+					id.setSelected(false);
+				}
+				else
+				{
+					if (matchMode.getSelectedIndex() == MODE_NOTMATCHED)
+						qty += ((Double)xMatchedToTable.getValueAt(row, I_QTY)).doubleValue();  //  doc
+					qty -= ((Double)xMatchedToTable.getValueAt(row, I_MATCHED)).doubleValue();  //  matched
+					noRows++;
+				}
+			}
+		}
+		//  update qualtities
+		m_xMatchedTo = new BigDecimal(qty);
+		xMatchedTo.setValue(m_xMatchedTo);
+		difference.setValue(m_xMatched.subtract(m_xMatchedTo));
+		bProcess.setEnabled(noRows != 0);
+		//  Status
+		statusBar.setStatusDB(noRows + "");
+	}   //  tableChanged
+
+	
+	/**************************************************************************
+	 *  Initialise Table access - create SQL, dateColumn.
+	 *  <br>
+	 *  The driving table is "hdr", e.g. for hdr.C_BPartner_ID=..
+	 *  The line table is "lin", e.g. for lin.M_Product_ID=..
+	 *  You use the dateColumn/qtyColumn variable directly as it is table specific.
+	 *  <br>
+	 *  The sql is dependent on MatchMode:
+	 *  - If Matched - all (fully or partially) matched records are listed
+	 *  - If Not Matched - all not fully matched records are listed
+	 *  @param display (Invoice, Shipment, Order) see MATCH_*
+	 *  @param matchToType (Invoice, Shipment, Order) see MATCH_*
+	 */
+	private void tableInit (int display, int matchToType)
+	{
+		boolean matched = matchMode.getSelectedIndex() == MODE_MATCHED;
+		log.config("Display=" + m_matchOptions[display]
+			+ ", MatchTo=" + m_matchOptions[matchToType]
+			+ ", Matched=" + matched);
+
+		m_sql = new StringBuffer ();
+		if (display == MATCH_INVOICE)
+		{
+			m_dateColumn = "hdr.DateInvoiced";
+			m_qtyColumn = "lin.QtyInvoiced";
+			m_sql.append("SELECT hdr.C_Invoice_ID,hdr.DocumentNo, hdr.DateInvoiced, bp.Name,hdr.C_BPartner_ID,"
+				+ " lin.Line,lin.C_InvoiceLine_ID, p.Name,lin.M_Product_ID,"
+				+ " lin.QtyInvoiced,SUM(NVL(mi.Qty,0)) "
+				+ "FROM C_Invoice hdr"
+				+ " INNER JOIN C_BPartner bp ON (hdr.C_BPartner_ID=bp.C_BPartner_ID)"
+				+ " INNER JOIN C_InvoiceLine lin ON (hdr.C_Invoice_ID=lin.C_Invoice_ID)"
+				+ " INNER JOIN M_Product p ON (lin.M_Product_ID=p.M_Product_ID)"
+				+ " INNER JOIN C_DocType dt ON (hdr.C_DocType_ID=dt.C_DocType_ID AND dt.DocBaseType IN ('API','APC'))"
+				+ " FULL JOIN M_MatchInv mi ON (lin.C_InvoiceLine_ID=mi.C_InvoiceLine_ID) "
+				+ "WHERE hdr.DocStatus IN ('CO','CL')");
+			m_groupBy = " GROUP BY hdr.C_Invoice_ID,hdr.DocumentNo,hdr.DateInvoiced,bp.Name,hdr.C_BPartner_ID,"
+				+ " lin.Line,lin.C_InvoiceLine_ID,p.Name,lin.M_Product_ID,lin.QtyInvoiced "
+				+ "HAVING "
+				+ (matched ? "0" : "lin.QtyInvoiced")
+				+ "<>SUM(NVL(mi.Qty,0))";
+		}
+		else if (display == MATCH_ORDER)
+		{
+			m_dateColumn = "hdr.DateOrdered";
+			m_qtyColumn = "lin.QtyOrdered";
+			m_sql.append("SELECT hdr.C_Order_ID,hdr.DocumentNo, hdr.DateOrdered, bp.Name,hdr.C_BPartner_ID,"
+				+ " lin.Line,lin.C_OrderLine_ID, p.Name,lin.M_Product_ID,"
+				+ " lin.QtyOrdered,SUM(COALESCE(mo.Qty,0)) "
+				+ "FROM C_Order hdr"
+				+ " INNER JOIN C_BPartner bp ON (hdr.C_BPartner_ID=bp.C_BPartner_ID)"
+				+ " INNER JOIN C_OrderLine lin ON (hdr.C_Order_ID=lin.C_Order_ID)"
+				+ " INNER JOIN M_Product p ON (lin.M_Product_ID=p.M_Product_ID)"
+				+ " INNER JOIN C_DocType dt ON (hdr.C_DocType_ID=dt.C_DocType_ID AND dt.DocBaseType='POO')"
+				+ " FULL JOIN M_MatchPO mo ON (lin.C_OrderLine_ID=mo.C_OrderLine_ID) "
+				+ " WHERE " ) ; //[ 1876972 ] Can't match partially matched PO with an unmatched receipt SOLVED BY BOJANA, AGENDA_GM
+			m_linetype = new StringBuffer();
+			m_linetype.append( matchToType == MATCH_SHIPMENT ? "M_InOutLine_ID" : "C_InvoiceLine_ID") ;
+			if ( matched ) {
+				m_sql.append( " mo." + m_linetype + " IS NOT NULL " ) ; 
+			} else {
+ 				m_sql.append( " ( mo." + m_linetype + " IS NULL OR "
+				+ " (lin.QtyOrdered <>  (SELECT sum(mo1.Qty) AS Qty" 
+				+ " FROM m_matchpo mo1 WHERE "
+				+ " mo1.C_ORDERLINE_ID=lin.C_ORDERLINE_ID AND "
+				+ " hdr.C_ORDER_ID=lin.C_ORDER_ID AND "
+				+ " mo1." + m_linetype
+				+ " IS NOT NULL group by mo1.C_ORDERLINE_ID))) " );	
+			}
+			m_sql.append( " AND hdr.DocStatus IN ('CO','CL')" );
+			m_groupBy = " GROUP BY hdr.C_Order_ID,hdr.DocumentNo,hdr.DateOrdered,bp.Name,hdr.C_BPartner_ID,"
+				+ " lin.Line,lin.C_OrderLine_ID,p.Name,lin.M_Product_ID,lin.QtyOrdered "
+				+ "HAVING "
+				+ (matched ? "0" : "lin.QtyOrdered")
+				+ "<>SUM(COALESCE(mo.Qty,0))";
+		}
+		else    //  Shipment
+		{
+			m_dateColumn = "hdr.MovementDate";
+			m_qtyColumn = "lin.MovementQty";
+			m_sql.append("SELECT hdr.M_InOut_ID,hdr.DocumentNo, hdr.MovementDate, bp.Name,hdr.C_BPartner_ID,"
+				+ " lin.Line,lin.M_InOutLine_ID, p.Name,lin.M_Product_ID,"
+				+ " lin.MovementQty,SUM(NVL(m.Qty,0)) "
+				+ "FROM M_InOut hdr"
+				+ " INNER JOIN C_BPartner bp ON (hdr.C_BPartner_ID=bp.C_BPartner_ID)"
+				+ " INNER JOIN M_InOutLine lin ON (hdr.M_InOut_ID=lin.M_InOut_ID)"
+				+ " INNER JOIN M_Product p ON (lin.M_Product_ID=p.M_Product_ID)"
+				+ " INNER JOIN C_DocType dt ON (hdr.C_DocType_ID = dt.C_DocType_ID AND dt.DocBaseType='MMR')"
+				+ " FULL JOIN ")
+				.append(matchToType == MATCH_ORDER ? "M_MatchPO" : "M_MatchInv")
+				.append(" m ON (lin.M_InOutLine_ID=m.M_InOutLine_ID) "
+				+ "WHERE hdr.DocStatus IN ('CO','CL')");
+			m_groupBy = " GROUP BY hdr.M_InOut_ID,hdr.DocumentNo,hdr.MovementDate,bp.Name,hdr.C_BPartner_ID,"
+				+ " lin.Line,lin.M_InOutLine_ID,p.Name,lin.M_Product_ID,lin.MovementQty "
+				+ "HAVING "
+				+ (matched ? "0" : "lin.MovementQty")
+				+ "<>SUM(NVL(m.Qty,0))";
+		}
+	//	Log.trace(7, "VMatch.tableInit", m_sql + "\n" + m_groupBy);
+	}   //  tableInit
+
+
+	/**
+	 *  Fill the table using m_sql
+	 *  @param table table
+	 */
+	private void tableLoad (WListbox table)
+	{
+	//	log.finest(m_sql + " - " +  m_groupBy);
+		String sql = MRole.getDefault().addAccessSQL(
+			m_sql.toString(), "hdr", MRole.SQL_FULLYQUALIFIED, MRole.SQL_RO)
+			+ m_groupBy;
+		log.finest(sql);
+		try
+		{
+			Statement stmt = DB.createStatement();
+			ResultSet rs = stmt.executeQuery(sql);
+			table.loadTable(rs);
+			stmt.close();
+		}
+		catch (SQLException e)
+		{
+			log.log(Level.SEVERE, sql, e);
+		}
+	}   //  tableLoad
+
+	/**
+	 *  Create Matching Record
+	 *  @param invoice true if matching invoice false if matching PO
+	 *  @param M_InOutLine_ID shipment line
+	 *  @param Line_ID C_InvoiceLine_ID or C_OrderLine_ID
+	 *  @param qty quantity
+	 *  @return true if created
+	 */
+	private boolean createMatchRecord (boolean invoice, int M_InOutLine_ID, int Line_ID,
+		BigDecimal qty)
+	{
+		if (qty.compareTo(Env.ZERO) == 0)
+			return true;
+		log.fine("IsInvoice=" + invoice
+			+ ", M_InOutLine_ID=" + M_InOutLine_ID + ", Line_ID=" + Line_ID
+			+ ", Qty=" + qty);
+		//
+		boolean success = false;
+		MInOutLine sLine = new MInOutLine (Env.getCtx(), M_InOutLine_ID, null);
+		if (invoice)	//	Shipment - Invoice
+		{
+			//	Update Invoice Line
+			MInvoiceLine iLine = new MInvoiceLine (Env.getCtx(), Line_ID, null);
+			iLine.setM_InOutLine_ID(M_InOutLine_ID);
+			if (sLine.getC_OrderLine_ID() != 0)
+				iLine.setC_OrderLine_ID(sLine.getC_OrderLine_ID());
+			iLine.save();
+			//	Create Shipment - Invoice Link
+			if (iLine.getM_Product_ID() != 0)
+			{
+				MMatchInv match = new MMatchInv (iLine, null, qty);
+				match.setM_InOutLine_ID(M_InOutLine_ID);
+				if (match.save())
+					success = true;
+				else
+					log.log(Level.SEVERE, "Inv Match not created: " + match);
+			}
+			else
+				success = true;
+			//	Create PO - Invoice Link = corrects PO
+			if (iLine.getC_OrderLine_ID() != 0 && iLine.getM_Product_ID() != 0)
+			{
+				MMatchPO matchPO = MMatchPO.create(iLine, sLine, null, qty);
+				matchPO.setC_InvoiceLine_ID(iLine);
+				matchPO.setM_InOutLine_ID(M_InOutLine_ID);
+				if (!matchPO.save())
+					log.log(Level.SEVERE, "PO(Inv) Match not created: " + matchPO);
+			}
+		}
+		else	//	Shipment - Order
+		{
+			//	Update Shipment Line
+			sLine.setC_OrderLine_ID(Line_ID);
+			sLine.save();
+			//	Update Order Line
+			MOrderLine oLine = new MOrderLine(Env.getCtx(), Line_ID, null);
+			if (oLine.get_ID() != 0)	//	other in MInOut.completeIt
+			{
+				oLine.setQtyReserved(oLine.getQtyReserved().subtract(qty));
+				if(!oLine.save())
+					log.severe("QtyReserved not updated - C_OrderLine_ID=" + Line_ID);
+			}
+
+			//	Create PO - Shipment Link
+			if (sLine.getM_Product_ID() != 0)
+			{
+				MMatchPO match = new MMatchPO (sLine, null, qty);
+				if (!match.save())
+					log.log(Level.SEVERE, "PO Match not created: " + match);
+				else
+				{
+					success = true;
+					//	Correct Ordered Qty for Stocked Products (see MOrder.reserveStock / MInOut.processIt)
+					if (sLine.getProduct() != null && sLine.getProduct().isStocked())
+						success = MStorage.add (Env.getCtx(), sLine.getM_Warehouse_ID(), 
+							sLine.getM_Locator_ID(), 
+							sLine.getM_Product_ID(), 
+							sLine.getM_AttributeSetInstance_ID(), oLine.getM_AttributeSetInstance_ID(), 
+							null, null, qty.negate(), null);
+				}
+			}
+			else
+				success = true;
+		}
+		return success;
+	}   //  createMatchRecord
+
+}   //  VMatch

Modified: branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WPayment.java
===================================================================
--- branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WPayment.java	2008-08-29 22:51:42 UTC (rev 6282)
+++ branches/stable/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WPayment.java	2008-08-29 22:57:30 UTC (rev 6283)
@@ -1,1931 +1,1531 @@
-/******************************************************************************
- * Product: Adempiere ERP & CRM Smart Business Solution                       *
- * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved.                *
- * This program is free software; you can redistribute it and/or modify it    *
- * under the terms version 2 of the GNU General Public License as published   *
- * by the Free Software Foundation. This program is distributed in the hope   *
- * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
- * See the GNU General Public License for more details.                       *
- * You should have received a copy of the GNU General Public License along    *
- * with this program; if not, write to the Free Software Foundation, Inc.,    *
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
- * For the text or an alternative of this public license, you may reach us    *
- * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
- * or via info@... or http://www.compiere.org/license.html           *
- *****************************************************************************/
-
-/**
- * 2007, Modified by Posterita Ltd.
- */
-
-package org.adempiere.webui.apps.form;
-
-import java.math.BigDecimal;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.text.DecimalFormat;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.logging.Level;
-
-import org.adempiere.webui.component.Button;
-import org.adempiere.webui.component.Datebox;
-import org.adempiere.webui.component.Label;
-import org.adempiere.webui.component.ListItem;
-import org.adempiere.webui.component.Listbox;
-import org.adempiere.webui.component.Textbox;
-import org.adempiere.webui.component.VerticalBox;
-import org.adempiere.webui.component.Window;
-import org.adempiere.webui.editor.WButtonEditor;
-import org.adempiere.webui.window.FDialog;
-import org.compiere.model.GridTab;
-import org.compiere.model.MCash;
-import org.compiere.model.MCashLine;
-import org.compiere.model.MConversionRate;
-import org.compiere.model.MInvoice;
-import org.compiere.model.MOrder;
-import org.compiere.model.MPayment;
-import org.compiere.model.MPaymentValidate;
-import org.compiere.model.MRole;
-import org.compiere.model.X_C_Order;
-import org.compiere.process.DocAction;
-import org.compiere.util.CLogger;
-import org.compiere.util.DB;
-import org.compiere.util.DisplayType;
-import org.compiere.util.Env;
-import org.compiere.util.KeyNamePair;
-import org.compiere.util.Msg;
-import org.compiere.util.TimeUtil;
-import org.compiere.util.ValueNamePair;
-import org.zkoss.zk.ui.event.Event;
-import org.zkoss.zk.ui.event.EventListener;
-import org.zkoss.zk.ui.event.Events;
-import org.zkoss.zul.Hbox;
-import org.zkoss.zul.Separator;
-
-/**
- *	Display (and process) Payment Options.
- *  <pre>
- *  Payment Rule
- *  -B- Cash          (Date)          -> Cash Entry
- *  -P- Payment Term  (Term)
- *  -S- Check         (Routing, ..)   -> Payment Entry
- *  -K- CreditCard    (No)            -> Payment Entry
- *  -U- ACH Transfer  (Routing)       -> Payment Entry
- *
- *  When processing:
- *  - If an invoice is a S/K/U, but has no Payment Entry, it is changed to P
- *  - If an invoive is B and has no Cash Entry, it is created
- *  - An invoice is "Open" if it is "P" and no Payment
- *
- *  Entry:
- *  - If not processed, an invoice has no Cash or Payment entry
- *  - The entry is created, during "Online" and when Saving
- *
- *  Changes/Reversals:
- *  - existing Cash Entries are reversed and newly created
- *  - existing Payment Entries are not changed and then "hang there" and need to be allocated
- *  </pre>
- *
- * 	@author 	Niraj Sohun
- * 				Payment Rule : Based on VPayment
- */
-
-public class WPayment extends Window implements EventListener
-{
-	private static final long serialVersionUID = 1L;
-
-	/**	Window						*/
-	private int m_WindowNo = 0;
-	
-	/**	Tab							*/
-	private GridTab m_mTab;
-
-	//	Data from Order/Invoice
-	private String              m_DocStatus = null;
-	
-	/** Start Payment Rule          */
-	private String m_PaymentRule = "";
-	
-	/** Start Payment Term          */
-	private int	m_C_PaymentTerm_ID = 0;
-	
-	/** Start Acct Date             */
-	private Timestamp m_DateAcct = null;
-	
-	/** Start Payment               */
-	private int m_C_Payment_ID = 0;
-	
-	private MPayment m_mPayment = null;
-	private MPayment m_mPaymentOriginal = null;
-	
-	/** Start CashBook Line         */
-	private int m_C_CashLine_ID = 0;
-	
-	private MCashLine m_cashLine = null;
-	
-	/** Start CreditCard            */
-	private String m_CCType = "";
-	
-	/** Start Bank Account			*/
-	private int m_C_BankAccount_ID = 0;
-	
-	/** Start CashBook              */
-	private int m_C_CashBook_ID = 0;
-
-	/** Is SOTrx					*/
-	private boolean m_isSOTrx = true;
-
-	/** Invoice Currency              */
-	private int	m_C_Currency_ID = 0;
-	
-	private int m_AD_Client_ID = 0;
-	private int m_AD_Org_ID = 0;
-	private int m_C_BPartner_ID = 0;
-	
-	//	Payment Amount
-	private BigDecimal m_Amount = Env.ZERO;
-
-	private boolean 			m_initOK = false;
-	
-	/** Only allow changing Rule        */
-	private boolean m_onlyRule = false;
-	
-	private DecimalFormat m_Format = DisplayType.getNumberFormat(DisplayType.Amount);
-	
-	//	EMU Currencies
-	private static Hashtable<Integer,KeyNamePair> s_Currencies = null;	
-	
-	private boolean	m_needSave = false;
-	
-	/**	Logger			*/
-	private static CLogger log = CLogger.getCLogger(WPayment.class);
-
-	/**	Date Editor 	*/
-	Datebox bDateField = new Datebox();
-
-	private Textbox bAmountField = new Textbox();
-	private Textbox sAmountField = new Textbox();
-	private Textbox kAmountField = new Textbox();
-	private Textbox kNumberField = new Textbox();
-	private Textbox kExpField = new Textbox();
-	private Textbox kApprovalField = new Textbox();
-	private Textbox sRoutingField = new Textbox();
-	private Textbox sNumberField = new Textbox();
-	private Textbox sCheckField = new Textbox();
-	private Textbox tRoutingField = new Textbox();
-	private Textbox tNumberField = new Textbox();
-
-	private Label kStatus = new Label();
-	private Label sStatus = new Label();
-	private Label tStatus = new Label();
-	private Label bCurrencyLabel = new Label();
-	private Label sCurrencyLabel = new Label();
-	private Label paymentLabel = new Label();
-	private Label kNumberLabel = new Label();
-	private Label kExpLabel = new Label();
-	private Label kApprovalLabel = new Label();
-	private Label kAmountLabel = new Label();
-	private Label kTypeLabel = new Label();
-	private Label tRoutingText = new Label();
-	private Label tNumberText = new Label();	
-	private Label tAccountLabel = new Label();
-	private Label sBankAccountLabel = new Label();
-	private Label sAmountLabel = new Label();
-	private Label sRoutingLabel = new Label();
-	private Label sNumberLabel = new Label();
-	private Label sCheckLabel = new Label();
-	private Label pTermLabel = new Label();
-	private Label bAmountLabel = new Label();
-	private Label bDateLabel = new Label();
-	private Label bCashBookLabel = new Label();
-
-	private Listbox kTypeCombo = new Listbox();
-	private Listbox bCurrencyCombo = new Listbox();
-	private Listbox sCurrencyCombo = new Listbox();
-	private Listbox paymentCombo = new Listbox();
-	private Listbox pTermCombo = new Listbox();
-	private Listbox tAccountCombo = new Listbox();
-	private Listbox sBankAccountCombo = new Listbox();
-	private Listbox bCashBookCombo = new Listbox();
-	
-	private Button kOnline = new Button();
-	private Button sOnline = new Button();
-	private Button btnOk = new Button();
-	private Button btnCancel = new Button();
-	private Button tOnline = new Button();
-	
-	private VerticalBox mainPanel = new VerticalBox();
-	private Hbox northPanel = new Hbox();
-	private VerticalBox centerPanel = new VerticalBox();
-	private VerticalBox kPanel = new VerticalBox();
-	private VerticalBox tPanel = new VerticalBox();
-	private VerticalBox sPanel = new VerticalBox();
-	private Hbox pPanel = new Hbox();
-	private VerticalBox bPanel = new VerticalBox();
-	
-	/**
-	 *	Constructor
-	 *
-	 *	@param WindowNo	owning window
-	 *  @param mTab     owning tab
-	 *	@param button	button with access information
-	 */
-	
-	public WPayment (int WindowNo, GridTab mTab, WButtonEditor button)
-	{
-		super();
-		
-		m_WindowNo = WindowNo;
-		m_isSOTrx = "Y".equals(Env.getContext(Env.getCtx(), WindowNo, "IsSOTrx"));
-		m_mTab = mTab;
-		
-		try
-		{
-			//bDateField = new WDateEditor("DateAcc", "", false, false, true);
-			bDateField.setValue(new Date(System.currentTimeMillis()));
-			
-			jbInit();
-			m_initOK = dynInit(button); // Null Pointer if order/invoice not saved yet
-		}
-		catch(Exception ex)
-		{
-			log.log(Level.SEVERE, "WPayment", ex);
-			m_initOK = false;
-		}
-
-		this.setVisible(true);
-		//show
-	}	//	VPayment
-	
-	/**
-	 *	Static Init
-	 *  @throws Exception
-	 */
-	
-	private void jbInit() throws Exception
-	{
-		this.setBorder("normal");
-		this.setWidth("400px");
-		this.setTitle("Payment");
-		this.setClosable(true);
-		this.appendChild(mainPanel);
-		
-		centerPanel.setWidth("100%");
-		
-		mainPanel.setWidth("100%");
-		mainPanel.appendChild(northPanel);
-		mainPanel.appendChild(new Separator());
-		mainPanel.appendChild(centerPanel);
-		
-		paymentLabel.setValue(Msg.translate(Env.getCtx(), "PaymentRule"));
-		
-		paymentCombo.setRows(0);
-		paymentCombo.setMold("select");
-		paymentCombo.addEventListener(Events.ON_SELECT, this);
-		
-		northPanel.setWidth("100%");
-		northPanel.setWidths("40%, 60%");
-		northPanel.appendChild(paymentLabel);
-		northPanel.appendChild(paymentCombo);
-		
-		// Credit Card
-		
-		kPanel.setWidth("100%");
-		
-		kTypeLabel.setValue(Msg.translate(Env.getCtx(), "CreditCardType"));
-		kNumberLabel.setValue(Msg.translate(Env.getCtx(), "CreditCardNumber"));
-		kExpLabel.setValue(Msg.getMsg(Env.getCtx(), "Expires"));
-		kApprovalLabel.setValue(Msg.translate(Env.getCtx(), "VoiceAuthCode"));
-		kAmountLabel.setValue(Msg.getMsg(Env.getCtx(), "Amount"));
-		kAmountField.setText("");
-		kOnline.setLabel(Msg.getMsg(Env.getCtx(), "Online"));
-		kOnline.addEventListener(Events.ON_CLICK, this);
-		kStatus.setValue(" ");
-		centerPanel.appendChild(kPanel);
-		
-		Hbox boxKType = new Hbox();
-		
-		kTypeCombo.setRows(0);
-		kTypeCombo.setMold("select");
-		kTypeCombo.addEventListener(Events.ON_SELECT, this);
-		
-		boxKType.setWidth("100%");
-		boxKType.setWidths("50%, 50%");
-		boxKType.appendChild(kTypeLabel);
-		boxKType.appendChild(kTypeCombo);
-		kPanel.appendChild(boxKType);
-		
-		Hbox boxKNumber = new Hbox();
-		boxKNumber.setWidth("100%");
-		boxKNumber.setWidths("50%, 50%");
-		boxKNumber.appendChild(kNumberLabel);
-		boxKNumber.appendChild(kNumberField);
-		kPanel.appendChild(boxKNumber);
-		
-		Hbox boxKExp = new Hbox();
-		boxKExp.setWidth("100%");
-		boxKExp.setWidths("50%, 50%");
-		boxKExp.appendChild(kExpLabel);
-		boxKExp.appendChild(kExpField);
-		kPanel.appendChild(boxKExp);
-		
-		Hbox boxKAmount = new Hbox();
-		boxKAmount.setWidth("100%");
-		boxKAmount.setWidths("50%, 50%");
-		boxKAmount.appendChild(kAmountLabel);
-		boxKAmount.appendChild(kAmountField);
-		kPanel.appendChild(boxKAmount);
-		
-		Hbox boxKApproval = new Hbox();
-		boxKApproval.setWidth("100%");
-		boxKApproval.setWidths("50%, 50%");
-		boxKApproval.appendChild(kApprovalLabel);
-		boxKApproval.appendChild(kApprovalField);
-		kPanel.appendChild(boxKApproval);
-		
-		kPanel.appendChild(kStatus);
-		kPanel.appendChild(kOnline);
-		
-		// Direct Debit/Credit
-		
-		tPanel.setWidth("100%");
-		
-		tAccountLabel.setValue(Msg.translate(Env.getCtx(), "C_BP_BankAccount_ID"));
-		//tRoutingField.setColumns(8);
-		//tNumberField.setColumns(10);
-		tRoutingText.setValue(Msg.translate(Env.getCtx(), "RoutingNo"));
-		tNumberText.setValue(Msg.translate(Env.getCtx(), "AccountNo"));
-		tOnline.setLabel(Msg.getMsg(Env.getCtx(), "Online"));
-		tOnline.addEventListener(Events.ON_CLICK, this);
-		tStatus.setValue(" ");
-		centerPanel.appendChild(tPanel);
-		
-		Hbox boxTAccount = new Hbox();
-		
-		tAccountCombo.setRows(0);
-		tAccountCombo.setMold("select");
-		tAccountCombo.addEventListener(Events.ON_SELECT, this);
-		
-		boxTAccount.setWidth("100%");
-		boxTAccount.setWidths("45%, 55%");
-		boxTAccount.appendChild(tAccountLabel);
-		boxTAccount.appendChild(tAccountCombo);
-		tPanel.appendChild(boxTAccount);
-		
-		Hbox boxTRouting = new Hbox();
-		boxTRouting.setWidth("100%");
-		boxTRouting.setWidths("45%, 55%");
-		boxTRouting.appendChild(tRoutingText);
-		boxTRouting.appendChild(tRoutingField);
-		tPanel.appendChild(boxTRouting);
-
-		Hbox boxTNumber = new Hbox();
-		boxTNumber.setWidth("100%");
-		boxTNumber.setWidths("45%, 55%");
-		boxTNumber.appendChild(tNumberText);
-		boxTNumber.appendChild(tNumberField);
-		tPanel.appendChild(boxTNumber);
-		
-		tPanel.appendChild(tStatus);
-		tPanel.appendChild(tOnline);
-		
-		// Cheque
-		
-		sPanel.setWidth("100%");
-		
-		sBankAccountLabel.setValue(Msg.translate(Env.getCtx(), "C_BankAccount_ID"));
-		sAmountLabel.setValue(Msg.getMsg(Env.getCtx(), "Amount"));
-		sAmountField.setText("");
-		sRoutingLabel.setValue(Msg.translate(Env.getCtx(), "RoutingNo"));
-		sNumberLabel.setValue(Msg.translate(Env.getCtx(), "AccountNo"));
-		sCheckLabel.setValue(Msg.translate(Env.getCtx(), "CheckNo"));
-		//sCheckField.setColumns(8);
-		sCurrencyLabel.setValue(Msg.translate(Env.getCtx(), "C_Currency_ID"));
-		//sNumberField.setPreferredSize(new Dimension(100, 21));
-		//sRoutingField.setPreferredSize(new Dimension(70, 21));
-		sStatus.setValue(" ");
-		sOnline.setLabel(Msg.getMsg(Env.getCtx(), "Online"));
-		sOnline.addEventListener(Events.ON_CLICK, this);
-		centerPanel.appendChild(sPanel);
-		
-		Hbox boxSBankAccount = new Hbox();
-		
-		sBankAccountCombo.setRows(0);
-		sBankAccountCombo.setMold("select");
-		sBankAccountCombo.addEventListener(Events.ON_SELECT, this);
-				
-		boxSBankAccount.setWidth("100%");
-		boxSBankAccount.setWidths("40%, 60%");
-		boxSBankAccount.appendChild(sBankAccountLabel);
-		boxSBankAccount.appendChild(sBankAccountCombo);
-		sPanel.appendChild(boxSBankAccount);
-		
-		Hbox boxSCurrency = new Hbox();
-		
-		sCurrencyCombo.setRows(0);
-		sCurrencyCombo.setMold("select");
-		sCurrencyCombo.addEventListener(Events.ON_SELECT, this);
-		
-		boxSCurrency.setWidth("100%");
-		boxSCurrency.setWidths("40%, 60%");
-		boxSCurrency.appendChild(sCurrencyLabel);
-		boxSCurrency.appendChild(sCurrencyCombo);
-		sPanel.appendChild(boxSCurrency);
-		
-		Hbox boxSAmount = new Hbox();
-		boxSAmount.setWidth("100%");
-		boxSAmount.setWidths("40%, 60%");
-		boxSAmount.appendChild(sAmountLabel);
-		boxSAmount.appendChild(sAmountField);
-		sPanel.appendChild(boxSAmount);
-		
-		Hbox boxSRouting = new Hbox();
-		boxSRouting.setWidth("100%");
-		boxSRouting.setWidths("40%, 60%");
-		boxSRouting.appendChild(sRoutingLabel);
-		boxSRouting.appendChild(sRoutingField);
-		sPanel.appendChild(boxSRouting);
-		
-		Hbox boxSNumber = new Hbox();
-		boxSNumber.setWidth("100%");
-		boxSNumber.setWidths("40%, 60%");
-		boxSNumber.appendChild(sNumberLabel);
-		boxSNumber.appendChild(sNumberField);
-		sPanel.appendChild(boxSNumber);
-		
-		Hbox boxSCheck = new Hbox();
-		boxSCheck.setWidth("100%");
-		boxSCheck.setWidths("40%, 60%");
-		boxSCheck.appendChild(sCheckLabel);
-		boxSCheck.appendChild(sCheckField);
-		sPanel.appendChild(boxSCheck);
-		
-		sPanel.appendChild(sOnline);
-		sPanel.appendChild(sStatus);
-		
-		// Cash
-		
-		pPanel.setWidth("100%");
-		pPanel.setWidths("40%, 60%");
-		
-		pTermLabel.setValue(Msg.translate(Env.getCtx(), "C_PaymentTerm_ID"));
-		centerPanel.appendChild(pPanel);
-		
-		pTermCombo.setRows(0);
-		pTermCombo.setMold("select");
-		pTermCombo.addEventListener(Events.ON_SELECT, this);
-		
-		pPanel.appendChild(pTermLabel);
-		pPanel.appendChild(pTermCombo);
-		
-		//
-		
-		bPanel.setWidth("100%");
-		
-		bCashBookLabel.setValue(Msg.translate(Env.getCtx(), "C_CashBook_ID"));
-		bCurrencyLabel.setValue(Msg.translate(Env.getCtx(), "C_Currency_ID"));
-		bAmountLabel.setValue(Msg.getMsg(Env.getCtx(), "Amount"));
-		bAmountField.setText("");
-		bDateLabel.setValue(Msg.translate(Env.getCtx(), "DateAcct"));
-		centerPanel.appendChild(bPanel);
-		
-		Hbox boxBCashBook = new Hbox();
-		
-		bCashBookCombo.setRows(0);
-		bCashBookCombo.setMold("select");
-		bCashBookCombo.addEventListener(Events.ON_SELECT, this);
-		
-		boxBCashBook.setWidth("100%");
-		boxBCashBook.setWidths("40%, 60%");
-		boxBCashBook.appendChild(bCashBookLabel);
-		boxBCashBook.appendChild(bCashBookCombo);
-		bPanel.appendChild(boxBCashBook);
-		
-		Hbox boxBCurrency = new Hbox();
-		
-		bCurrencyCombo.setRows(0);
-		bCurrencyCombo.setMold("select");
-		bCurrencyCombo.addEventListener(Events.ON_SELECT, this);
-		
-		boxBCurrency.setWidth("100%");
-		boxBCurrency.setWidths("40%, 60%");
-		boxBCurrency.appendChild(bCurrencyLabel);
-		boxBCurrency.appendChild(bCurrencyCombo);
-		bPanel.appendChild(boxBCurrency);
-		
-		Hbox boxBDate = new Hbox();
-		boxBDate.setWidth("100%");
-		boxBDate.setWidths("40%, 60%");
-		boxBDate.appendChild(bDateLabel);
-		boxBDate.appendChild(bDateField);
-		bPanel.appendChild(boxBDate);
-		
-		Hbox boxBAmount = new Hbox();
-		boxBAmount.setWidth("100%");
-		boxBAmount.setWidths("40%, 60%");
-		boxBAmount.appendChild(bAmountLabel);
-		boxBAmount.appendChild(bAmountField);
-		bPanel.appendChild(boxBAmount);
-		
-		Hbox boxButtons = new Hbox();
-		
-		btnCancel.setImage("/images/Cancel24.png");
-		btnCancel.addEventListener(Events.ON_CLICK, this);
-		btnOk.setImage("/images/Ok24.png");
-		btnOk.addEventListener(Events.ON_CLICK, this);
-		
-		boxButtons.appendChild(btnCancel);
-		boxButtons.appendChild(btnOk);
-		mainPanel.appendChild(new Separator());
-		mainPanel.appendChild(boxButtons);
-	}
-
-	/**************************************************************************
-	 *	Dynamic Init.
-	 *		B (Cash)		(Currency)
-	 *		K (CreditCard)  Type, Number, Exp, Approval
-	 *		L (DirectDebit)	BPartner_Bank
-	 *		P (PaymentTerm)	PaymentTerm
-	 *		S (Check)		(Currency) CheckNo, Routing
-	 *
-	 *	Currencies are shown, if member of EMU
-	 *  @param button payment type button
-	 *  @return true if init OK
-	 *  @throws Exception
-	 */
-	
-	private boolean dynInit (WButtonEditor button) throws Exception
-	{
-		m_DocStatus = (String)m_mTab.getValue("DocStatus");
-		log.config(m_DocStatus);
-
-		if (m_mTab.getValue("C_BPartner_ID") == null)
-		{
-			FDialog.error(0, this, "SaveErrorRowNotFound");
-			return false;
-		}
-
-		//	Is the Trx posted?
-		//	String Posted = (String)m_mTab.getValue("Posted");
-		//	if (Posted != null && Posted.equals("Y"))
-		//		return false;
-
-		//  DocStatus
-		
-		m_DocStatus = (String)m_mTab.getValue("DocStatus");
-		
-		if (m_DocStatus == null)
-			m_DocStatus = "";
-		
-		//	Is the Trx closed?		Reversed / Voided / Cloased
-		
-		if (m_DocStatus.equals("RE") || m_DocStatus.equals("VO") || m_DocStatus.equals("CL"))
-			return false;
-		
-		//  Document is not complete - allow to change the Payment Rule only
-		if (m_DocStatus.equals("CO") || m_DocStatus.equals("WP") )
-			m_onlyRule = false;
-		else
-			m_onlyRule = true;
-		
-		//	PO only  Rule
-		
-		if (!m_onlyRule		//	Only order has Warehouse
-			&& !m_isSOTrx && m_mTab.getValue("M_Warehouse_ID") != null)
-			m_onlyRule = true;
-		
-		centerPanel.setVisible(!m_onlyRule);
-		
-		//  Amount
-		
-		m_Amount = (BigDecimal)m_mTab.getValue("GrandTotal");
-		
-		if (!m_onlyRule && m_Amount.compareTo(Env.ZERO) == 0)
-		{
-			FDialog.error(m_WindowNo, this, "PaymentZero");
-			return false;
-		}
-		
-		bAmountField.setText(m_Format.format(m_Amount));
-		sAmountField.setText(m_Format.format(m_Amount));
-		kAmountField.setText(m_Format.format(m_Amount));
-
-		/**
-		 *	Get Data from Grid
-		 */
-		
-		m_AD_Client_ID = ((Integer)m_mTab.getValue("AD_Client_ID")).intValue();
-		m_AD_Org_ID = ((Integer)m_mTab.getValue("AD_Org_ID")).intValue();
-		m_C_BPartner_ID = ((Integer)m_mTab.getValue("C_BPartner_ID")).intValue();
-		m_PaymentRule = (String)m_mTab.getValue("PaymentRule");
-		m_C_Currency_ID = ((Integer)m_mTab.getValue("C_Currency_ID")).intValue();
-		m_DateAcct = (Timestamp)m_mTab.getValue("DateAcct");
-		
-		if (m_mTab.getValue("C_PaymentTerm_ID") != null)
-			m_C_PaymentTerm_ID = ((Integer)m_mTab.getValue("C_PaymentTerm_ID")).intValue();
-		
-		//  Existing Payment
-		
-		if (m_mTab.getValue("C_Payment_ID") != null)
-		{
-			m_C_Payment_ID = ((Integer)m_mTab.getValue("C_Payment_ID")).intValue();
-		
-			if (m_C_Payment_ID != 0)
-			{
-				m_mPayment = new MPayment(Env.getCtx(), m_C_Payment_ID, null);
-				m_mPaymentOriginal = new MPayment(Env.getCtx(), m_C_Payment_ID, null);	//	full copy
-			
-				//  CreditCard
-				m_CCType = m_mPayment.getCreditCardType();
-				kNumberField.setText(m_mPayment.getCreditCardNumber());
-				kExpField.setText(m_mPayment.getCreditCardExp(null));
-				kApprovalField.setText(m_mPayment.getVoiceAuthCode());
-				kStatus.setValue(m_mPayment.getR_PnRef());
-				kAmountField.setText(m_Format.format(m_mPayment.getPayAmt()));
-
-				//	if approved/paid, don't let it change
-				
-				kTypeCombo.setEnabled(!m_mPayment.isApproved());
-				kNumberField.setEnabled(!m_mPayment.isApproved());
-				kExpField.setEnabled(!m_mPayment.isApproved());
-				kApprovalField.setEnabled(!m_mPayment.isApproved());
-				kOnline.setEnabled(!m_mPayment.isApproved());
-				kAmountField.setEnabled(!m_mPayment.isApproved());
-				
-				//  Check
-				
-				m_C_BankAccount_ID = m_mPayment.getC_BankAccount_ID();
-				sRoutingField.setText(m_mPayment.getRoutingNo());
-				sNumberField.setText(m_mPayment.getAccountNo());
-				sCheckField.setText(m_mPayment.getCheckNo());
-				sStatus.setValue(m_mPayment.getR_PnRef());
-				sAmountField.setText(m_Format.format(m_mPayment.getPayAmt()));
-				
-				//  Transfer
-				
-				tRoutingField.setText(m_mPayment.getRoutingNo());
-				tNumberField.setText(m_mPayment.getAccountNo());
-				tStatus.setValue(m_mPayment.getR_PnRef());
-			}
-		}
-		if (m_mPayment == null)
-		{
-			m_mPayment = new MPayment (Env.getCtx (), 0, null);
-			m_mPayment.setAD_Org_ID(m_AD_Org_ID);
-			m_mPayment.setAmount (m_C_Currency_ID, m_Amount);
-		}
-
-		//  Existing Cashbook entry
-		
-		m_cashLine = null;
-		m_C_CashLine_ID = 0;
-		
-		if (m_mTab.getValue("C_CashLine_ID") != null)
-		{
-			m_C_CashLine_ID = ((Integer)m_mTab.getValue("C_CashLine_ID")).intValue();
-		
-			if (m_C_CashLine_ID == 0)
-				m_cashLine = null;
-			else
-			{
-				m_cashLine = new MCashLine (Env.getCtx(), m_C_CashLine_ID, null);
-				m_DateAcct = m_cashLine.getStatementDate();
-				bAmountField.setText(m_cashLine.getAmount().toString());
-			}
-		}
-
-		//	Accounting Date
-		
-		bDateField.setValue(m_DateAcct);
-
-		if (s_Currencies == null)
-			loadCurrencies();
-
-		//	Is the currency an EMU currency?
-
-		Integer C_Currency_ID = new Integer(m_C_Currency_ID);
-		
-		if (s_Currencies.containsKey(C_Currency_ID))
-		{
-			Enumeration en = s_Currencies.keys();
-			while (en.hasMoreElements())
-			{
-				Object key = en.nextElement();
-				bCurrencyCombo.appendItem(key.toString(), s_Currencies.get(key));
-				sCurrencyCombo.appendItem(key.toString(), s_Currencies.get(key));
-			}
-
-			ListItem listitem = new ListItem();
-			listitem.setValue(s_Currencies.get(C_Currency_ID));
-
-			sCurrencyCombo.addEventListener(Events.ON_SELECT, this);
-			sCurrencyCombo.setSelectedItem(listitem);
-			
-			bCurrencyCombo.addEventListener(Events.ON_SELECT, this);
-			bCurrencyCombo.setSelectedItem(listitem);
-		}
-		else	//	No EMU Currency
-		{
-			bCurrencyLabel.setVisible(false);	//	Cash
-			bCurrencyCombo.setVisible(false);
-			sCurrencyLabel.setVisible(false);	//	Check
-			sCurrencyCombo.setVisible(false);
-		}
-
-		/**
-		 *	Payment Combo
-		 */
-		
-		if (m_PaymentRule == null)
-			m_PaymentRule = "";
-		
-		ValueNamePair vp = null;
-		HashMap values = button.getValues();
-		Object[] a = values.keySet().toArray();
-		
-		for (int i = 0; i < a.length; i++)
-		{			
-			String PaymentRule = (String)a[i];		//	used for Panel selection
-			
-			if (X_C_Order.PAYMENTRULE_DirectDebit.equals(PaymentRule)			//	SO
-				&& !m_isSOTrx)
-				continue;
-			else if (X_C_Order.PAYMENTRULE_DirectDeposit.equals(PaymentRule)	//	PO 
-				&& m_isSOTrx)
-				continue;
-                                                
-			ValueNamePair pp = new ValueNamePair(PaymentRule, (String)values.get(a[i]));
-			paymentCombo.appendItem(pp.getName(), pp);
-			
-			if (PaymentRule.toString().equals(m_PaymentRule))	//	to select
-				vp = pp;
-		}
-
-		//	Set PaymentRule
-		
-		paymentCombo.addEventListener(Events.ON_SELECT, this);
-		
-		if (vp != null)
-		{
-			for (int i = 0; i < paymentCombo.getItemCount(); i++)
-			{
-				ListItem item = paymentCombo.getItemAtIndex(i);
-				ValueNamePair v = (ValueNamePair)item.getValue();
-				
-				if (v == vp)
-				{
-					paymentCombo.setSelectedIndex(i);
-					break;
-				}
-			}
-		}
-		
-		Event evt = new Event(Events.ON_SELECT, paymentCombo);
-		onEvent(evt);
-
-		/**
-		 * 	Load Payment Terms
-		 */
-		
-		String SQL = MRole.getDefault().addAccessSQL(
-			"SELECT C_PaymentTerm_ID, Name FROM C_PaymentTerm WHERE IsActive='Y' ORDER BY Name",
-			"C_PaymentTerm", MRole.SQL_NOTQUALIFIED, MRole.SQL_RO);
-		
-		KeyNamePair kp = null;
-		
-		try
-		{
-			PreparedStatement pstmt = DB.prepareStatement(SQL, null);
-			ResultSet rs = pstmt.executeQuery();
-			while (rs.next())
-			{
-				int key = rs.getInt(1);
-				String name = rs.getString(2);
-				KeyNamePair pp = new KeyNamePair(key, name);
-				pTermCombo.appendItem(pp.getName(), pp);
-				
-				if (key == m_C_PaymentTerm_ID)
-					kp = pp;
-			}
-			rs.close();
-			pstmt.close();
-		}
-		catch (SQLException ept)
-		{
-			log.log(Level.SEVERE, SQL, ept);
-		}
-		
-		//	Set Selection
-		
-		if (kp != null)
-		{
-			for (int i = 0; i < pTermCombo.getItemCount(); i++)
-			{
-				ListItem item = pTermCombo.getItemAtIndex(i);
-				KeyNamePair k = (KeyNamePair)item.getValue();
-				
-				if (k == kp)
-				{
-					pTermCombo.setSelectedIndex(i);
-					break;
-				}
-			}
-		}
-		
-		/**
-		 * 	Load Accounts
-		 */
-		
-		SQL = "SELECT a.C_BP_BankAccount_ID, NVL(b.Name, ' ')||a.AccountNo AS Acct "
-			+ "FROM C_BP_BankAccount a,C_Bank b "
-			+ "WHERE C_BPartner_ID=? AND a.IsActive='Y'";
-		
-		kp = null;
-		
-		try
-		{
-			PreparedStatement pstmt = DB.prepareStatement(SQL, null);
-			pstmt.setInt(1, m_C_BPartner_ID);
-			ResultSet rs = pstmt.executeQuery();
-		
-			while (rs.next())
-			{
-				int key = rs.getInt(1);
-				String name = rs.getString(2);
-				KeyNamePair pp = new KeyNamePair(key, name);
-				tAccountCombo.appendItem(pp.getName(), pp);
-				//	kp = pp;
-			}
-			rs.close();
-			pstmt.close();
-		}
-		catch (SQLException eac)
-		{
-			log.log(Level.SEVERE, SQL, eac);
-		}
-		
-		//	Set Selection
-		
-		if (kp != null)
-		{
-			for (int i = 0; i < tAccountCombo.getItemCount(); i++)
-			{
-				ListItem item = tAccountCombo.getItemAtIndex(i);
-				KeyNamePair k = (KeyNamePair)item.getValue();
-				
-				if (k == kp)
-				{
-					tAccountCombo.setSelectedIndex(i);
-					break;
-				}
-			}
-		}
-		
-		/**
-		 *	Load Credit Cards
-		 */
-		
-		ValueNamePair[] ccs = m_mPayment.getCreditCards();
-		vp = null;
-		
-		for (int i = 0; i < ccs.length; i++)
-		{
-			kTypeCombo.appendItem(ccs[i].getName(), ccs[i]);
-			
-			if (ccs[i].getValue().equals(m_CCType))
-				vp = ccs[i];
-		}
-		
-		//	Set Selection
-		
-		if (vp != null)
-		{
-			for (int i = 0; i < kTypeCombo.getItemCount(); i++)
-			{
-				ListItem item = kTypeCombo.getItemAtIndex(i);
-				ValueNamePair v = (ValueNamePair)item.getValue();
-				
-				if (v == vp)
-				{
-					kTypeCombo.setSelectedIndex(i);
-					break;
-				}
-			}
-		}
-		
-		/**
-		 *  Load Bank Accounts
-		 */
-		
-		SQL = MRole.getDefault().addAccessSQL(
-			"SELECT C_BankAccount_ID, Name || ' ' || AccountNo, IsDefault "
-			+ "FROM C_BankAccount ba"
-			+ " INNER JOIN C_Bank b ON (ba.C_Bank_ID=b.C_Bank_ID) "
-			+ "WHERE b.IsActive='Y'",
-			"ba", MRole.SQL_FULLYQUALIFIED, MRole.SQL_RO);
-		
-		kp = null;
-		
-		try
-		{
-			PreparedStatement pstmt = DB.prepareStatement(SQL, null);
-			ResultSet rs = pstmt.executeQuery();
-			while (rs.next())
-			{
-				int key = rs.getInt(1);
-				String name = rs.getString(2);
-				KeyNamePair pp = new KeyNamePair(key, name);
-				sBankAccountCombo.appendItem(pp.getName(), pp);
-				
-				if (key == m_C_BankAccount_ID)
-					kp = pp;
-				
-				if (kp == null && rs.getString(3).equals("Y"))    //  Default
-					kp = pp;
-			}
-			rs.close();
-			pstmt.close();
-		}
-		catch (SQLException ept)
-		{
-			log.log(Level.SEVERE, SQL, ept);
-		}
-		
-		//	Set Selection
-		
-		if (kp != null)
-		{
-			for (int i = 0; i < sBankAccountCombo.getItemCount(); i++)
-			{
-				ListItem item = sBankAccountCombo.getItemAtIndex(i);
-				KeyNamePair k = (KeyNamePair)item.getValue();
-				
-				if (k == kp)
-				{
-					sBankAccountCombo.setSelectedIndex(i);
-					break;
-				}
-			}
-		}
-
-		/**
-		 *  Load Cash Books
-		 */
-		
-		SQL = MRole.getDefault().addAccessSQL(
-			"SELECT C_CashBook_ID, Name, AD_Org_ID FROM C_CashBook WHERE IsActive='Y'",
-			"C_CashBook", MRole.SQL_NOTQUALIFIED, MRole.SQL_RO);
-		
-		kp = null;
-		
-		try
-		{
-			PreparedStatement pstmt = DB.prepareStatement(SQL, null);
-			ResultSet rs = pstmt.executeQuery();
-			while (rs.next())
-			{
-				int key = rs.getInt(1);
-				String name = rs.getString(2);
-				KeyNamePair pp = new KeyNamePair(key, name);
-				bCashBookCombo.appendItem(pp.getName(), pp);
-						
-				if (key == m_C_CashBook_ID)
-					kp = pp;
-				
-				if (kp == null && key == m_AD_Org_ID)       //  Default Org
-					kp = pp;
-			}
-			rs.close();
-			pstmt.close();
-		}
-		catch (SQLException epc)
-		{
-			log.log(Level.SEVERE, SQL, epc);
-		}
-		
-		//	Set Selection
-		
-		if (kp != null)
-		{
-			for (int i = 0; i < bCashBookCombo.getItemCount(); i++)
-			{
-				ListItem item = bCashBookCombo.getItemAtIndex(i);
-				KeyNamePair k = (KeyNamePair)item.getValue();
-				
-				if (k == kp)
-				{
-					bCashBookCombo.setSelectedIndex(i);
-					break;
-				}
-			}
-			
-			if (m_C_CashBook_ID == 0)
-				m_C_CashBook_ID = kp.getKey();  //  set to default to avoid 'cashbook changed' message
-		}
-
-		return true;
-	}	//	dynInit
-	
-	/**
-	 *	Init OK to be able to make changes?
-	 *  @return true if init OK
-	 */
-
-	public boolean isInitOK()
-	{
-		return m_initOK;
-	}	//	isInitOK
-
-	/**
-	 *	Fill s_Currencies with EMU currencies
-	 */
-	
-	private void loadCurrencies()
-	{
-		s_Currencies = new Hashtable<Integer,KeyNamePair>(12);	//	Currenly only 10+1
-		String SQL = "SELECT C_Currency_ID, ISO_Code FROM C_Currency "
-			+ "WHERE (IsEMUMember='Y' AND EMUEntryDate<SysDate) OR IsEuro='Y' "
-			+ "ORDER BY 2";
-
-		try
-		{
-			PreparedStatement pstmt = DB.prepareStatement(SQL, null);
-			ResultSet rs = pstmt.executeQuery();
-			while (rs.next())
-			{
-				int id = rs.getInt(1);
-				String name = rs.getString(2);
-				s_Currencies.put(new Integer(id), new KeyNamePair(id, name));
-			}
-			rs.close();
-			pstmt.close();
-		}
-		catch (SQLException e)
-		{
-			log.log(Level.SEVERE, SQL, e);
-		}
-	} // loadCurrencies
-	
-	public void onEvent(Event e) throws Exception 
-	{
-		log.fine( "VPayment.actionPerformed - " + e.getTarget());
-
-		//	Finish
-		
-		if (e.getTarget() == btnOk)
-		{
-			if (checkMandatory())
-			{
-				saveChanges(); // cannot recover
-				this.detach();
-			}
-		}
-		else if (e.getTarget() == btnCancel)
-			this.detach();
-
-		//	Payment Method Change
-		
-		if (e.getTarget() == paymentCombo)
-		{
-			//	get selection
-			
-			ListItem listitem = paymentCombo.getSelectedItem();
-			ValueNamePair pp = (ValueNamePair)listitem.getValue();
-			
-			if (pp != null)
-			{
-				String s = pp.getValue().toLowerCase();
-		
-				if (X_C_Order.PAYMENTRULE_DirectDebit.equalsIgnoreCase(s))
-					s = X_C_Order.PAYMENTRULE_DirectDeposit.toLowerCase();
-				
-				s += "Panel";
-				
-				//centerLayout.show(centerPanel, s);	//	switch to panel
-				
-				kPanel.setVisible(false);
-				tPanel.setVisible(false);
-				sPanel.setVisible(false);
-				pPanel.setVisible(false);
-				bPanel.setVisible(false);
-				
-				if (s.equals("kPanel"))
-					kPanel.setVisible(true);
-				else if (s.equals("tPanel"))
-					tPanel.setVisible(true);
-				else if (s.equals("sPanel"))
-					sPanel.setVisible(true);
-				else if (s.equals("pPanel"))
-					pPanel.setVisible(true);
-				else if (s.equals("bPanel"))
-					bPanel.setVisible(true);
-			}
-		}
-
-		//	Check Currency change
-		
-		else if (e.getTarget() == sCurrencyCombo)
-		{
-			ListItem listitem = sCurrencyCombo.getSelectedItem();
-			KeyNamePair pp = (KeyNamePair)listitem.getValue();
-			BigDecimal amt = MConversionRate.convert(Env.getCtx(),
-				m_Amount, m_C_Currency_ID, pp.getKey(), m_AD_Client_ID, m_AD_Org_ID);
-			sAmountField.setText(m_Format.format(amt));
-		}
-		
-		//	Cash Currency change
-		
-		else if (e.getTarget() == bCurrencyCombo)
-		{
-			ListItem listitem = bCurrencyCombo.getSelectedItem();
-			KeyNamePair pp = (KeyNamePair)listitem.getValue();
-			BigDecimal amt = MConversionRate.convert(Env.getCtx(),
-				m_Amount, m_C_Currency_ID, pp.getKey(), m_AD_Client_ID, m_AD_Org_ID);
-			bAmountField.setText(m_Format.format(amt));
-		}
-
-		//  Online
-		
-		else if (e.getTarget() == kOnline || e.getTarget() == sOnline )
-			processOnline();
-	}	//	actionPerformed
-
-	/**************************************************************************
-	 *	Save Changes
-	 *	@return true, if eindow can exit
-	 */
-	
-	private boolean saveChanges()
-	{
-		ListItem listitem = paymentCombo.getSelectedItem();
-		ValueNamePair vp = (ValueNamePair)listitem.getValue();
-		String newPaymentRule = vp.getValue();
-		log.info("New Rule: " + newPaymentRule);
-
-		//  only Payment Rule
-		
-		if (m_onlyRule)
-		{
-			if (!newPaymentRule.equals(m_PaymentRule))
-				m_mTab.setValue("PaymentRule", newPaymentRule);
-			return true;
-		}
-
-		//	New Values
-		
-		Timestamp newDateAcct = m_DateAcct;
-		int newC_PaymentTerm_ID = m_C_PaymentTerm_ID;
-		int newC_CashLine_ID = m_C_CashLine_ID;
-		int newC_CashBook_ID = m_C_CashBook_ID;
-		String newCCType = m_CCType;
-		int newC_BankAccount_ID = 0;
-		
-		//	B (Cash)		(Currency)
-		
-		if (newPaymentRule.equals(X_C_Order.PAYMENTRULE_Cash))
-		{
-			listitem = bCashBookCombo.getSelectedItem();
-			
-			KeyNamePair kp = null;
-			
-			if (listitem != null)
-				kp = (KeyNamePair)listitem.getValue();
-			
-			if (kp != null)
-				newC_CashBook_ID = kp.getKey();
-			
-			//bDateField.
-			
-			newDateAcct = (Timestamp)bDateField.getValue();
-			
-			// Get changes to cash amount
-			
-			m_mPayment.setAmount(m_C_Currency_ID, new BigDecimal(bAmountField.getText()));
-			m_Amount = new BigDecimal(bAmountField.getText());
-			
-			//ADialog.info(m_WindowNo, this, "MAJJ Debug", bAmountField.getText());			
-		}
-
-		//	K (CreditCard)  Type, Number, Exp, Approval
-		
-		else if (newPaymentRule.equals(X_C_Order.PAYMENTRULE_CreditCard))
-		{
-			listitem = kTypeCombo.getSelectedItem();
-			
-			if (listitem != null)
-				vp = (ValueNamePair)listitem.getValue();
-			else 
-				vp = null;
-			
-			if (vp != null)
-				newCCType = vp.getValue();
-		}
-
-		//	T (Transfer)	BPartner_Bank
-		
-		else if (newPaymentRule.equals(MOrder.PAYMENTRULE_DirectDeposit) 
-			|| newPaymentRule.equals(MOrder.PAYMENTRULE_DirectDebit) )
-		{
-			if (tAccountCombo.getSelectedItem() != null)
-				tAccountCombo.getSelectedItem();
-		}
-
-		//	P (PaymentTerm)	PaymentTerm
-		
-		else if (newPaymentRule.equals(X_C_Order.PAYMENTRULE_OnCredit))
-		{
-			listitem = pTermCombo.getSelectedItem();
-			
-			KeyNamePair kp = null;
-			
-			if (listitem != null)
-				kp = (KeyNamePair)listitem.getValue();
-			
-			if (kp != null)
-				newC_PaymentTerm_ID = kp.getKey();
-		}
-
-		//	S (Check)		(Currency) CheckNo, Routing
-		
-		else if (newPaymentRule.equals(X_C_Order.PAYMENTRULE_Check))
-		{
-			//	sCurrencyCombo.getSelectedItem();
-			
-			listitem = sBankAccountCombo.getSelectedItem();
-			
-			KeyNamePair kp = null;
-			
-			if (listitem != null)
-				kp = (KeyNamePair)listitem.getValue();
-			
-			if (kp != null)
-				newC_BankAccount_ID = kp.getKey();
-		}
-		else

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6282
          http://adempiere.svn.sourceforge.net/adempiere/?rev=6282&view=rev
Author:   globalqss
Date:     2008-08-29 22:51:42 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------
Adding cglib to classpath

Modified Paths:
--------------
    branches/adempiere341/.classpath

Modified: branches/adempiere341/.classpath
===================================================================
--- branches/adempiere341/.classpath	2008-08-29 21:46:46 UTC (rev 6281)
+++ branches/adempiere341/.classpath	2008-08-29 22:51:42 UTC (rev 6282)
@@ -1,277 +1,126 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="base/src"/>
-	<classpathentry kind="src" path="client/src"/>
-	<classpathentry kind="src" path="sqlj/src"/>
-	<classpathentry kind="src" path="print/src"/>
-	<classpathentry kind="src" path="looks/src"/>
-	<classpathentry kind="src" path="install/src"/>
-	<classpathentry kind="src" path="extend/src"/>
-	<classpathentry kind="src" path="serverRoot/src/main/ejb"/>
-	<classpathentry kind="src" path="serverRoot/src/main/server"/>
-	<classpathentry kind="src" path="serverRoot/src/main/servlet"/>
-	<classpathentry kind="src" path="interfaces/src"/>
-	<classpathentry kind="src" path="serverApps/src/main/servlet"/>
-	<classpathentry kind="src" path="posterita/src/main"/>
-	<classpathentry kind="src" path="tools/src"/>
-	<classpathentry kind="src" path="migration/src"/>
-	<classpathentry excluding="org/compiere/interfaces/" kind="src" path="JasperReports/src"/>
-	<classpathentry excluding="org/compiere/utils/DigestOfFile.java" kind="src" path="JasperReportsWebApp/src"/>
-	<classpathentry kind="src" path="webCM/src/main/servlet"/>
-	<classpathentry kind="src" path="zkwebui/WEB-INF/src"/>
-	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/activation.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/jstl.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/log4j.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/mail.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/standard.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/Verisign.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/ocrs12.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="jboss/lib/commons-httpclient.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/ant-commons-net.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/ant-launcher.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/ant.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/j2ee.jar"/>
-	<classpathentry exported="true" kind="lib" path="jboss/client/jnp-client.jar"/>
-	<classpathentry exported="true" kind="lib" path="jboss/client/jboss-common-client.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/jsp-api.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/servlet-api.jar"/>
-	<classpathentry exported="true" kind="lib" path="jboss/client/jboss-j2ee.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/ojdbc14.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/jpayment.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="jboss/client/jbossall-client.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/jnlp.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/commons-collections-3.1.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/commons-logging.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/commons-net-1.4.0.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/jgraph.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/barbecue-1.1.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/jcommon-1.0.5.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/jfreechart-1.0.2.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/postgresql.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="posterita/src/web/WEB-INF/lib/struts.jar"/>
-	<classpathentry exported="true" kind="lib" path="posterita/src/web/WEB-INF/lib/barcode4j.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/c3p0-0.9.1.2.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/c3p0-oracle-thin-extras-0.9.1.2.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/looks-2.0.4.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-beanutils.jar"/>
-	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-beanutils-bean-collections.jar"/>
-	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-beanutils-core.jar"/>
-	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-codec-1.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-digester-1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-fileupload.jar"/>
-	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-lang-2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-validator-1.2.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/xdoclet-1.2.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/xdoclet-ejb-module-1.2.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/xdoclet-web-module-1.2.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/xdoclet-xdoclet-module-1.2.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/xercesImpl.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/xjavadoc-1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/xml-apis.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/itext-1.4.8.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/jpedal.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="JasperReportsTools/lib/jasperreports-1.3.0.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/swingx-0.9.0.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/bsh-2.0b5.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/bsh-engine.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/groovy-all-1.5.1.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/groovy-engine.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/jython.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/jython-engine.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/script-api.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/poi-2.0-final-20040126.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="JasperReportsTools/lib/iReport.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="tools/lib/junit.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/asm.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/bsh.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/commons-el.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/commons-fileupload.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/commons-io.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/Filters.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/groovy.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/jcommon.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/jfreechart.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/jruby.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/js.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/json_simple.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/junit.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/mvel.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/ognl.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/sqlj.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/timelinez.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zcommon-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zcommon.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zcommons-el.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zhtml-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zhtml.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zk-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zk.jar" sourcepath="zkwebui/WEB-INF/lib/zk-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zkex.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zkmax.jar" sourcepath="zkwebui/WEB-INF/lib/zkmax-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zkplus-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zkplus.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zml.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zul-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zul.jar" sourcepath="zkwebui/WEB-INF/lib/zul-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zweb-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zweb.jar"/>
-	<classpathentry kind="var" path="TOMCAT_HOME/common/lib/servlet-api.jar"/>
-	<classpathentry kind="var" path="TOMCAT_HOME/common/lib/jasper-runtime.jar"/>
-	<classpathentry kind="var" path="TOMCAT_HOME/common/lib/jsp-api.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="base/src"/>
+	<classpathentry kind="src" path="client/src"/>
+	<classpathentry kind="src" path="sqlj/src"/>
+	<classpathentry kind="src" path="print/src"/>
+	<classpathentry kind="src" path="looks/src"/>
+	<classpathentry kind="src" path="install/src"/>
+	<classpathentry kind="src" path="extend/src"/>
+	<classpathentry kind="src" path="serverRoot/src/main/ejb"/>
+	<classpathentry kind="src" path="serverRoot/src/main/server"/>
+	<classpathentry kind="src" path="serverRoot/src/main/servlet"/>
+	<classpathentry kind="src" path="interfaces/src"/>
+	<classpathentry kind="src" path="serverApps/src/main/servlet"/>
+	<classpathentry kind="src" path="posterita/src/main"/>
+	<classpathentry kind="src" path="tools/src"/>
+	<classpathentry kind="src" path="migration/src"/>
+	<classpathentry excluding="org/compiere/interfaces/" kind="src" path="JasperReports/src"/>
+	<classpathentry excluding="org/compiere/utils/DigestOfFile.java" kind="src" path="JasperReportsWebApp/src"/>
+	<classpathentry kind="src" path="webCM/src/main/servlet"/>
+	<classpathentry kind="src" path="zkwebui/WEB-INF/src"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/activation.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/jstl.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/log4j.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/mail.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/standard.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/Verisign.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/ocrs12.jar"/>
+	<classpathentry exported="true" kind="lib" path="jboss/lib/commons-httpclient.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/ant-commons-net.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/ant-launcher.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/ant.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/j2ee.jar"/>
+	<classpathentry exported="true" kind="lib" path="jboss/client/jnp-client.jar"/>
+	<classpathentry exported="true" kind="lib" path="jboss/client/jboss-common-client.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/jsp-api.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/servlet-api.jar"/>
+	<classpathentry exported="true" kind="lib" path="jboss/client/jboss-j2ee.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/ojdbc14.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/jpayment.jar"/>
+	<classpathentry exported="true" kind="lib" path="jboss/client/jbossall-client.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/jnlp.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/commons-collections-3.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/commons-logging.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/commons-net-1.4.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/jgraph.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/barbecue-1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/jcommon-1.0.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/jfreechart-1.0.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/postgresql.jar"/>
+	<classpathentry exported="true" kind="lib" path="posterita/src/web/WEB-INF/lib/struts.jar"/>
+	<classpathentry exported="true" kind="lib" path="posterita/src/web/WEB-INF/lib/barcode4j.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/c3p0-0.9.1.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/c3p0-oracle-thin-extras-0.9.1.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/looks-2.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-beanutils.jar"/>
+	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-beanutils-bean-collections.jar"/>
+	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-beanutils-core.jar"/>
+	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-codec-1.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-digester-1.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-fileupload.jar"/>
+	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-lang-2.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-validator-1.2.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/xdoclet-1.2.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/xdoclet-ejb-module-1.2.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/xdoclet-web-module-1.2.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/xdoclet-xdoclet-module-1.2.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/xercesImpl.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/xjavadoc-1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/xml-apis.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/itext-1.4.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/jpedal.jar"/>
+	<classpathentry exported="true" kind="lib" path="JasperReportsTools/lib/jasperreports-1.3.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/swingx-0.9.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/bsh-2.0b5.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/bsh-engine.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/groovy-all-1.5.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/groovy-engine.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/jython.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/jython-engine.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/script-api.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/poi-2.0-final-20040126.jar"/>
+	<classpathentry exported="true" kind="lib" path="JasperReportsTools/lib/iReport.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/junit.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/asm.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/bsh.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/commons-el.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/commons-fileupload.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/commons-io.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/Filters.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/groovy.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/jcommon.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/jfreechart.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/jruby.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/js.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/json_simple.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/junit.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/mvel.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/ognl.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/sqlj.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/timelinez.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zcommon-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zcommon.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zcommons-el.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zhtml-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zhtml.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zk-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zk.jar" sourcepath="zkwebui/WEB-INF/lib/zk-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zkex.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zkmax.jar" sourcepath="zkwebui/WEB-INF/lib/zkmax-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zkplus-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zkplus.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zml.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zul-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zul.jar" sourcepath="zkwebui/WEB-INF/lib/zul-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zweb-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/zweb.jar"/>
+	<classpathentry exported="true" kind="lib" path="zkwebui/WEB-INF/lib/cglib.jar"/>
+	<classpathentry kind="var" path="TOMCAT_HOME/common/lib/servlet-api.jar"/>
+	<classpathentry kind="var" path="TOMCAT_HOME/common/lib/jasper-runtime.jar"/>
+	<classpathentry kind="var" path="TOMCAT_HOME/common/lib/jsp-api.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6279
          http://adempiere.svn.sourceforge.net/adempiere/?rev=6279&view=rev
Author:   globalqss
Date:     2008-08-29 20:45:31 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------
Release weekly patches 352a

Modified Paths:
--------------
    branches/patches_352/.classpath
    branches/patches_352/base/src/org/compiere/model/MBankStatement.java
    branches/patches_352/base/src/org/compiere/model/MResource.java
    branches/patches_352/base/src/org/compiere/model/Query.java
    branches/patches_352/base/src/org/compiere/process/DistributionRun.java
    branches/patches_352/base/src/org/compiere/util/DB.java
    branches/patches_352/base/src/org/compiere/wf/MWorkflow.java
    branches/patches_352/base/src/org/eevolution/model/LiberoValidator.java
    branches/patches_352/base/src/org/eevolution/model/MDDOrder.java
    branches/patches_352/base/src/org/eevolution/model/MPPMRP.java
    branches/patches_352/base/src/org/eevolution/model/MPPOrder.java
    branches/patches_352/base/src/org/eevolution/model/MPPOrderBOM.java
    branches/patches_352/base/src/org/eevolution/model/MPPOrderBOMLine.java
    branches/patches_352/base/src/org/eevolution/model/MPPOrderNode.java
    branches/patches_352/base/src/org/eevolution/model/MPPOrderWorkflow.java
    branches/patches_352/base/src/org/eevolution/model/MPPProductBOM.java
    branches/patches_352/base/src/org/eevolution/model/MPPProductBOMLine.java
    branches/patches_352/base/src/org/eevolution/model/MPPProductPlanning.java
    branches/patches_352/base/src/org/eevolution/process/DistributionRunOrders.java
    branches/patches_352/base/src/org/eevolution/process/MRP.java
    branches/patches_352/client/src/org/compiere/grid/VPanel.java
    branches/patches_352/generaJar.jardesc
    branches/patches_352/getlistmodsrc.sh

Added Paths:
-----------
    branches/patches_352/base/src/org/compiere/FA/
    branches/patches_352/base/src/org/compiere/FA/AssetDisposed.java
    branches/patches_352/base/src/org/compiere/FA/AssetRevalEntry.java
    branches/patches_352/base/src/org/compiere/FA/CalloutFA.java
    branches/patches_352/base/src/org/compiere/model/MAllocationHdr.java
    branches/patches_352/base/src/org/compiere/model/MCash.java
    branches/patches_352/base/src/org/compiere/model/MFactAcct.java
    branches/patches_352/base/src/org/compiere/model/MMatchInv.java
    branches/patches_352/base/src/org/compiere/model/MMatchPO.java
    branches/patches_352/base/src/org/compiere/model/MOrder.java
    branches/patches_352/base/src/org/compiere/model/MPriceList.java
    branches/patches_352/base/src/org/compiere/model/MProductPO.java
    branches/patches_352/base/src/org/compiere/model/MRequisition.java
    branches/patches_352/base/src/org/compiere/model/MRequisitionLine.java
    branches/patches_352/base/src/org/compiere/model/MWarehouse.java
    branches/patches_352/base/src/org/compiere/util/Trx.java
    branches/patches_352/base/src/org/compiere/util/TrxRunnable.java
    branches/patches_352/base/src/org/compiere/util/WebDoc.java
    branches/patches_352/base/src/org/compiere/wf/MWFEventAudit.java
    branches/patches_352/base/src/org/compiere/wf/MWFNode.java
    branches/patches_352/base/src/org/eevolution/model/MPPOrderCost.java
    branches/patches_352/base/src/org/eevolution/model/MPPOrderNodeNext.java
    branches/patches_352/base/src/org/eevolution/process/MRPUpdate.java
    branches/patches_352/base/src/org/eevolution/tools/
    branches/patches_352/base/src/org/eevolution/tools/DateTimeUtil.java
    branches/patches_352/client/src/org/compiere/apps/APanel.java
    branches/patches_352/extend/src/test/
    branches/patches_352/extend/src/test/functional/
    branches/patches_352/extend/src/test/functional/FunctionalTestSuite.java
    branches/patches_352/extend/src/test/functional/TrxTest.java
    branches/patches_352/migration/352a-stable/migr_20080829_or.sql
    branches/patches_352/migration/352a-stable/postgresql/migr_20080829_pg.sql
    branches/patches_352/posterita/
    branches/patches_352/posterita/src/
    branches/patches_352/posterita/src/main/
    branches/patches_352/posterita/src/main/org/
    branches/patches_352/posterita/src/main/org/posterita/
    branches/patches_352/posterita/src/main/org/posterita/businesslogic/
    branches/patches_352/posterita/src/main/org/posterita/businesslogic/LoginManager.java
    branches/patches_352/posterita/src/main/org/posterita/businesslogic/POSManager.java
    branches/patches_352/posterita/src/main/org/posterita/core/
    branches/patches_352/posterita/src/main/org/posterita/core/businesslogic/
    branches/patches_352/posterita/src/main/org/posterita/core/businesslogic/ElementManager.java
    branches/patches_352/posterita/src/main/org/posterita/struts/
    branches/patches_352/posterita/src/main/org/posterita/struts/pos/
    branches/patches_352/posterita/src/main/org/posterita/struts/pos/CustomPOSReportAction.java
    branches/patches_352/posterita/src/main/org/posterita/struts/pos/POSInfoAction.java
    branches/patches_352/posterita/src/main/org/posterita/struts/pos/POSOrderAction.java
    branches/patches_352/posterita/src/main/org/posterita/struts/pos/POSReportAction.java
    branches/patches_352/posterita/src/main/org/posterita/struts/pos/POSSalesReportAction.java
    branches/patches_352/posterita/src/main/org/posterita/struts/pos/PartialPOSOrderAction.java
    branches/patches_352/posterita/src/main/org/posterita/struts/pos/StockMovementReportAction.java

Modified: branches/patches_352/.classpath
===================================================================
--- branches/patches_352/.classpath	2008-08-29 08:24:02 UTC (rev 6278)
+++ branches/patches_352/.classpath	2008-08-29 20:45:31 UTC (rev 6279)
@@ -3,6 +3,7 @@
 	<classpathentry kind="src" path="base/src"/>
 	<classpathentry kind="src" path="client/src"/>
 	<classpathentry kind="src" path="extend/src"/>
+	<classpathentry kind="src" path="posterita/src/main"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/adempiere352a"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>

Added: branches/patches_352/base/src/org/compiere/FA/AssetDisposed.java
===================================================================
--- branches/patches_352/base/src/org/compiere/FA/AssetDisposed.java	                        (rev 0)
+++ branches/patches_352/base/src/org/compiere/FA/AssetDisposed.java	2008-08-29 20:45:31 UTC (rev 6279)
@@ -0,0 +1,222 @@
+/******************************************************************************
+ * The contents of this file are subject to the   Compiere License  Version 1.1
+ * ("License"); You may not use this file except in compliance with the License
+ * You may obtain a copy of the License at http://www.compiere.org/license.html
+ * Software distributed under the License is distributed on an  "AS IS"  basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+ * the specific language governing rights and limitations under the License.
+ * The Original Code is                  Compiere  ERP & CRM  Business Solution
+ * The Initial Developer of the Original Code is Jorg Janke  and ComPiere, Inc.
+ *
+ * Copyright (C) 2005 Robert KLEIN. robeklein@... * 
+ * Contributor(s): ______________________________________.
+ *****************************************************************************/
+package org.compiere.FA;
+
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+
+import org.compiere.model.MAssetChange;
+import org.compiere.model.MRefList_Ext;
+import org.compiere.model.X_A_Asset_Disposed;
+import org.compiere.model.X_A_Depreciation_Exp;
+import org.compiere.process.ProcessInfoParameter;
+import org.compiere.process.SvrProcess;
+import org.compiere.util.DB;
+
+
+/**
+ *	Dispose Asset
+ *	
+ *  @author Rob klein
+ *  @version $Id: AssetDisposed.java,v 1.0$
+ */
+public class AssetDisposed extends SvrProcess
+{
+	/** Record ID				*/
+	private int p_Asset_Disposed_ID = 0;
+	private boolean			m_DeleteOld = false;
+
+	/**
+	 *  Prepare - e.g., get Parameters.
+	 */
+	protected void prepare()
+	{
+		ProcessInfoParameter[] para = getParameter();
+		for (int i = 0; i < para.length; i++)
+		{
+			String name = para[i].getParameterName();
+			if (para[i].getParameter() == null)
+				;
+			else if (name.equals("DeleteOld"))
+				m_DeleteOld = "Y".equals(para[i].getParameter());
+			else
+				log.info("prepare - Unknown Parameter: " + name);
+		}
+		p_Asset_Disposed_ID = getRecord_ID();
+		
+		
+	}	//	prepare
+
+	
+	/**
+	 * 	Build Depreciation Workfile
+	 *	@return info
+	 *	@throws Exception
+	 */
+	protected String doIt() throws java.lang.Exception
+	{
+		log.info("doIt - Asset_Disposed_ID=" + p_Asset_Disposed_ID);
+		if (p_Asset_Disposed_ID == 0)
+			throw new IllegalArgumentException("No Record");
+		
+		String sql = null;
+		
+		//
+		int no = 0;
+		BigDecimal v_Balance = new BigDecimal("0.0");		
+		X_A_Asset_Disposed AssetDisposed = new X_A_Asset_Disposed (getCtx(), p_Asset_Disposed_ID, null);		
+		String clientCheck = " AND AD_Client_ID=" + AssetDisposed.getAD_Client_ID();
+		
+		if (m_DeleteOld)
+		{
+			sql =  "DELETE A_DEPRECIATION_EXP "
+				  + "WHERE Processed='Y'" 
+				  + " AND A_Entry_Type = 'DIS'" + clientCheck;
+			
+			no = DB.executeUpdate (sql,null);
+			log.info ("doIt - Delete old processed entries =" + no);
+		}
+		
+		sql = null;
+		log.info("doIt - Starting Disposal = " + no);
+		
+		sql = "SELECT A.A_ASSET_ID, A.POSTINGTYPE, A.A_DEPRECIATION_ACCT, "
+			+ " A.A_ACCUMDEPRECIATION_ACCT, A.A_DISPOSAL_LOSS, A.A_DISPOSAL_REVENUE, "
+			+ " A.A_ASSET_ACCT, A.A_SPLIT_PERCENT, A.AD_ORG_ID, A.AD_CLIENT_ID, "
+			+ " B.A_ASSET_COST, B.A_ACCUMULATED_DEPR "
+			+ " FROM A_ASSET_ACCT A,  A_DEPRECIATION_WORKFILE B "
+			+ " WHERE A.A_ASSET_ID = " + AssetDisposed.getA_Asset_ID()
+			+ " and B.A_ASSET_ID = " + AssetDisposed.getA_Asset_ID()
+			+ " and A.POSTINGTYPE = B.POSTINGTYPE"
+			+ " and A.AD_CLIENT_ID = B.AD_CLIENT_ID";
+			
+		PreparedStatement pstmt = null;
+		pstmt = DB.prepareStatement (sql,null);
+		log.info("doIt - SQL=" + sql);
+		String v_PostingType = null;
+		//X_A_Depreciation_Exp depexp = new X_A_Depreciation_Exp (getCtx(), 0, null);
+		ResultSet rs = null;
+		try {
+			rs = pstmt.executeQuery();		
+			while (rs.next()){
+			if (v_PostingType != null && (!v_PostingType.equals(rs.getString("PostingType"))))
+			{
+			      sql = "UPDATE A_DEPRECIATION_WORKFILE "
+			      	  + "SET A_ACCUMULATED_DEPR = " + v_Balance 
+			    	  + "WHERE A_DEPRECIATION_WORKFILE.A_ASSET_ID = " + AssetDisposed.getA_Asset_ID()
+			    	  + "AND A_DEPRECIATION_WORKFILE.POSTINGTYPE = '" + v_PostingType + "'";
+			      DB.executeUpdate(sql,null);
+			      
+			      v_Balance = new BigDecimal("0.0");
+			      v_PostingType = rs.getString("PostingType");
+			}
+			else if (v_PostingType == null)
+			{
+			      v_PostingType = rs.getString("PostingType");
+			}		
+
+			// Create JV for the asset disposal - remove cost of asset on balance sheet 
+			X_A_Depreciation_Exp depexp0 = new X_A_Depreciation_Exp (getCtx(), 0, null);
+			depexp0.setPostingType(rs.getString("PostingType"));
+			depexp0.setA_Asset_ID(AssetDisposed.getA_Asset_ID());			
+			depexp0.setExpense(rs.getBigDecimal("A_Asset_Cost").multiply(new BigDecimal(-1)).multiply(rs.getBigDecimal("A_Split_Percent")));
+			depexp0.setDateAcct(AssetDisposed.getDateAcct());
+			depexp0.setA_Account_Number(rs.getInt("A_Asset_Acct"));
+			depexp0.setDescription("Asset Disposed - Cost of Asset");
+			depexp0.setIsDepreciated(true);
+			depexp0.setA_Period(AssetDisposed.getC_Period_ID());
+			depexp0.setA_Entry_Type("DIS");
+			depexp0.save();
+			
+			X_A_Depreciation_Exp depexp1 = new X_A_Depreciation_Exp (getCtx(), 0, null);
+			depexp1.setPostingType(rs.getString("PostingType"));
+			depexp1.setA_Asset_ID(AssetDisposed.getA_Asset_ID());			
+			depexp1.setExpense(rs.getBigDecimal("A_Asset_Cost").multiply(rs.getBigDecimal("A_Split_Percent")));
+			depexp1.setDateAcct(AssetDisposed.getDateAcct());
+			depexp1.setA_Account_Number(rs.getInt("A_Disposal_Loss"));
+			depexp1.setDescription("Asset Disposed - Cost of Asset");
+			depexp1.setIsDepreciated(false);
+			depexp1.setA_Period(AssetDisposed.getC_Period_ID());
+			depexp1.setA_Entry_Type("DIS");
+			depexp1.save();
+			
+			v_Balance = v_Balance.add(rs.getBigDecimal("A_Asset_Cost").multiply(rs.getBigDecimal("A_Split_Percent")));
+			
+			// Create JV for the asset disposal - remove accumulated depreciation of the asset on balance sheet 
+			X_A_Depreciation_Exp depexp2 = new X_A_Depreciation_Exp (getCtx(), 0, null);
+			depexp2.setPostingType(rs.getString("PostingType"));
+			depexp2.setA_Asset_ID(AssetDisposed.getA_Asset_ID());			
+			depexp2.setExpense(rs.getBigDecimal("A_Accumulated_Depr").multiply(rs.getBigDecimal("A_Split_Percent")));
+			depexp2.setDateAcct(AssetDisposed.getDateAcct());
+			depexp2.setA_Account_Number(rs.getInt("A_Accumdepreciation_Acct"));
+			depexp2.setDescription("Asset Disposed - Accum Depr");
+			depexp2.setIsDepreciated(true);
+			depexp2.setA_Period(AssetDisposed.getC_Period_ID());
+			depexp2.setA_Entry_Type("DIS");
+			depexp2.save();
+			
+			X_A_Depreciation_Exp depexp3 = new X_A_Depreciation_Exp (getCtx(), 0, null);
+			depexp3.setPostingType(rs.getString("PostingType"));
+			depexp3.setA_Asset_ID(AssetDisposed.getA_Asset_ID());			
+			depexp3.setExpense(rs.getBigDecimal("A_Accumulated_Depr").multiply(new BigDecimal(-1)).multiply(rs.getBigDecimal("A_Split_Percent")));
+			depexp3.setDateAcct(AssetDisposed.getDateAcct());
+			depexp3.setA_Account_Number(rs.getInt("A_Disposal_Loss"));
+			depexp3.setDescription("Asset Disposed - Accum Depr");
+			depexp3.setIsDepreciated(false);
+			depexp3.setA_Period(AssetDisposed.getC_Period_ID());
+			depexp3.setA_Entry_Type("DIS");
+			depexp3.save();			
+			}
+			
+			sql = "UPDATE A_ASSET "
+			    + "SET ISDISPOSED = 'Y',"
+			    + " ASSETDISPOSALDATE = " + DB.TO_DATE(AssetDisposed.getA_Disposed_Date())
+			    + " WHERE A_ASSET_ID = " + AssetDisposed.getA_Asset_ID();
+			
+			DB.executeUpdate(sql,null);
+			
+			sql = "UPDATE A_DEPRECIATION_WORKFILE "
+		      	  + "SET A_ACCUMULATED_DEPR = " + v_Balance 
+		    	  + "WHERE A_DEPRECIATION_WORKFILE.A_ASSET_ID = " + AssetDisposed.getA_Asset_ID()
+		    	  + "AND A_DEPRECIATION_WORKFILE.POSTINGTYPE = '" + v_PostingType + "'";
+		    DB.executeUpdate(sql,null);
+		    
+		    MAssetChange change = new MAssetChange (getCtx(), 0, null);
+			change.setA_Asset_ID(AssetDisposed.getA_Asset_ID());			
+			change.setChangeType("DIS");
+		    MRefList_Ext RefList = new MRefList_Ext (getCtx(), 0, null);	
+			change.setTextDetails(RefList.getListDescription (getCtx(),"A_Update_Type" , "DIS"));   
+			change.setAssetDisposalDate(AssetDisposed.getA_Disposed_Date());
+			change.setAssetAccumDepreciationAmt(v_Balance);
+			change.setIsFullyDepreciated(true);
+			change.setIsDisposed(true);
+			change.save();
+			
+		}
+			catch (Exception e)
+			{
+				log.info("getDeliveries"+ e);
+			}
+			finally
+			{
+				DB.close(rs, pstmt);
+				rs = null; pstmt = null;
+
+			}
+			
+						return "";
+	}	//	doIt
+	
+}	//	AssetDisposed


Property changes on: branches/patches_352/base/src/org/compiere/FA/AssetDisposed.java
___________________________________________________________________
Added: svn:executable
   + *

Added: branches/patches_352/base/src/org/compiere/FA/AssetRevalEntry.java
===================================================================
--- branches/patches_352/base/src/org/compiere/FA/AssetRevalEntry.java	                        (rev 0)
+++ branches/patches_352/base/src/org/compiere/FA/AssetRevalEntry.java	2008-08-29 20:45:31 UTC (rev 6279)
@@ -0,0 +1,410 @@
+/******************************************************************************
+ * The contents of this file are subject to the   Compiere License  Version 1.1
+ * ("License"); You may not use this file except in compliance with the License
+ * You may obtain a copy of the License at http://www.compiere.org/license.html
+ * Software distributed under the License is distributed on an  "AS IS"  basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+ * the specific language governing rights and limitations under the License.
+ * The Original Code is                  Compiere  ERP & CRM  Business Solution
+ * The Initial Developer of the Original Code is Jorg Janke  and ComPiere, Inc.
+ *
+ * Copyright (C) 2005 Robert KLEIN. robeklein@... * 
+ * Contributor(s): ______________________________________.
+ *****************************************************************************/
+package org.compiere.FA;
+
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+
+import org.compiere.model.MAsset;
+import org.compiere.model.X_A_Asset_Reval_Entry;
+import org.compiere.model.X_A_Asset_Reval_Index;
+import org.compiere.model.X_A_Depreciation_Exp;
+import org.compiere.model.X_C_Period;
+import org.compiere.process.ProcessInfoParameter;
+import org.compiere.process.SvrProcess;
+import org.compiere.util.DB;
+
+
+/**
+ *	Asset Revaluation Entry
+ *	
+ *  @author Rob Klein
+ *  @version $Id: AssetRevalEntry.java,v 1.0$
+ */
+public class AssetRevalEntry extends SvrProcess
+{
+	/** Record ID				*/
+	private int p_Asset_Reval_Entry_ID = 0;
+	private boolean	m_DeleteOld = false;
+
+	/**
+	 *  Prepare - e.g., get Parameters.
+	 */
+	protected void prepare()
+	{
+		ProcessInfoParameter[] para = getParameter();
+		for (int i = 0; i < para.length; i++)
+		{
+			String name = para[i].getParameterName();
+			if (para[i].getParameter() == null)
+				;
+			else if (name.equals("DeleteOld"))
+				m_DeleteOld = "Y".equals(para[i].getParameter());
+			else
+				log.info("prepare - Unknown Parameter: " + name);
+		}
+		p_Asset_Reval_Entry_ID = getRecord_ID();
+	}	//	prepare
+
+	
+	/**
+	 * 	Build Depreciation Workfile
+	 *	@return info
+	 *	@throws Exception
+	 */
+	protected String doIt() throws java.lang.Exception
+	{
+		log.info("doIt - Asset_Reval_Entry_ID=" + p_Asset_Reval_Entry_ID);
+		if (p_Asset_Reval_Entry_ID == 0)
+			throw new IllegalArgumentException("No Record");
+		
+		//
+		int no = 0;
+		BigDecimal v_Cost_reval = new BigDecimal("0.0");
+		BigDecimal v_Cost_reval_pior = new BigDecimal("0.0");
+		BigDecimal v_Accum_reval = new BigDecimal("0.0");
+		BigDecimal v_Accum_reval_prior = new BigDecimal("0.0");
+		BigDecimal v_Current_exp_reval = new BigDecimal("0.0");
+		BigDecimal v_Multipler = new BigDecimal("0.0");
+		BigDecimal v_Dep_Exp_reval = new BigDecimal("0.0");
+		
+		X_A_Asset_Reval_Entry AssetReval = new X_A_Asset_Reval_Entry (getCtx(), p_Asset_Reval_Entry_ID, null);
+		X_C_Period Period = new X_C_Period (getCtx(), AssetReval.getC_Period_ID(), null);
+		
+		String sql = null;
+		log.info("doIt - Starting Transfer = " + no);
+		String clientCheck = " AND AD_Client_ID=" + AssetReval.getAD_Client_ID();
+		
+		sql = "SELECT A.A_REVAL_COST_OFFSET, A.A_REVAL_ACCUMDEP_OFFSET_CUR, A.A_REVAL_DEPEXP_OFFSET "
+			+ " A.A_ACCUMDEPRECIATION_ACCT, A.A_ASSET_ACCT, A.A_DEPRECIATION_ACCT, "
+			+ " A.A_REVAL_ACCUMDEP_OFFSET_PRIOR, A.A_REVAL_COST_OFFSET_PRIOR "
+			+ " B.A_ASSET_ID, B.A_ASSET_COST, B.A_ACCUMULATED_DEPR, B.A_ASSET_COST_REVAL, B.A_ACCUMULATED_DEPR_REVAL"
+			+ " FROM A_ASSET_ACCT A, A_DEPRECIATION_WORKFILE B"			 
+			+ " WHERE A.POSTINGTYPE = '" + AssetReval.getPostingType()		
+			+ " AND B.POSTINGTYPE = '" + AssetReval.getPostingType()
+			+ " AND A.AD_Client_ID=" + AssetReval.getAD_Client_ID()
+			+ " AND B.AD_Client_ID=" + AssetReval.getAD_Client_ID()
+			+ " AND A.AD_Asset_ID = A.AD_Asset_ID";
+		
+		PreparedStatement pstmt = null;
+		pstmt = DB.prepareStatement (sql,null);
+		log.info("doIt - SQL=" + sql);
+		ResultSet rs = null;
+		X_A_Depreciation_Exp depexp = new X_A_Depreciation_Exp (getCtx(), 0, null);
+		
+		if (m_DeleteOld)
+		{
+			sql =  "DELETE A_DEPRECIATION_EXP "
+				  + "WHERE Processed='Y'" 
+				  + " AND A_Entry_Type = 'RVL'" + clientCheck;
+			
+			no = DB.executeUpdate (sql,null);
+			log.info ("doIt - Delete old processed entries =" + no);
+		}
+		try {
+			
+			rs = pstmt.executeQuery();			
+			
+			while (rs.next()){		
+			
+				 String sql2 = "select A_ASSET_REVAL_INDEX_ID from A_ASSET_REVAL_INDEX where A_REVAL_CODE = " + AssetReval.getA_Rev_Code() 
+						   + " and A_EFFECTIVE_DATE = (select MAX(A_EFFECTIVE_DATE) from A_ASSET_REVAL_INDEX where  A_EFFECTIVE_DATE < " 
+						   + AssetReval.getA_Effective_Date() 
+						   + ")";
+				
+				 X_A_Asset_Reval_Index ARevalIndex = new X_A_Asset_Reval_Index (getCtx(), DB.getSQLValue(null ,sql), null);
+				 MAsset Asset = new MAsset (getCtx(), rs.getInt("A_Asset_ID"), null);
+				 
+				 if (AssetReval.getA_Reval_Multiplier().equals(X_A_Asset_Reval_Entry.A_REVAL_MULTIPLIER_Index))
+				 {
+				 	
+				 	if (AssetReval.getA_Reval_Effective_Date().equals(X_A_Asset_Reval_Entry.A_REVAL_EFFECTIVE_DATE_DateAquired)){
+				 		sql2 = "Select A_REVAL_MULTIPLIER from A_ASSET_REVAL_INDEX where A_REVAL_CODE = " + AssetReval.getA_Rev_Code()
+						   + " and A_EFFECTIVE_DATE = (select MAX(A_EFFECTIVE_DATE) from A_ASSET_REVAL_INDEX where  A_EFFECTIVE_DATE < "
+						   + Asset.getA_Asset_CreateDate()
+						   + ")";
+				 		
+				 	}
+				 	else if (AssetReval.getA_Reval_Effective_Date().equals(X_A_Asset_Reval_Entry.A_REVAL_EFFECTIVE_DATE_RevaluationDate)){
+				 		sql2 = "Select A_REVAL_MULTIPLIER from A_ASSET_REVAL_INDEX where A_REVAL_CODE = " + AssetReval.getA_Rev_Code()
+						   + " and A_EFFECTIVE_DATE = (select MAX(A_EFFECTIVE_DATE) from A_ASSET_REVAL_INDEX where  A_EFFECTIVE_DATE < "
+						   + Asset.getA_Asset_RevalDate()
+						   + ")";
+				 		
+				 	}
+				 	else if (AssetReval.getA_Reval_Effective_Date().equals(X_A_Asset_Reval_Entry.A_REVAL_EFFECTIVE_DATE_DateDepreciationStarted)){
+				 		sql2 = "Select A_REVAL_MULTIPLIER from A_ASSET_REVAL_INDEX where A_REVAL_CODE = " + AssetReval.getA_Rev_Code()
+						   + " and A_EFFECTIVE_DATE = (select MAX(A_EFFECTIVE_DATE) from A_ASSET_REVAL_INDEX where  A_EFFECTIVE_DATE < "
+						   + Asset.getAssetServiceDate()
+						   + ")";
+				 		
+				 	}
+				 	PreparedStatement pstmt2 = null;
+					pstmt2 = DB.prepareStatement (sql2,null);
+					ResultSet rs2 = null;
+					log.info("doIt - SQL2=" + sql2);
+					try {
+						rs2 = pstmt2.executeQuery();
+						while (rs2.next()){
+						v_Multipler = ARevalIndex.getA_Reval_Rate().divide(rs2.getBigDecimal("A_REVAL_MULTIPLIER"),8);							
+					}
+						
+					v_Cost_reval = ((rs.getBigDecimal("A_Asset_Cost").subtract(rs.getBigDecimal("A_ASSET_COST_REVAL"))).multiply( v_Multipler)).subtract(rs.getBigDecimal("A_Asset_Cost"));					
+					v_Accum_reval = ((rs.getBigDecimal("A_ACCUMULATED_DEPR").subtract(rs.getBigDecimal("A_ACCUMULATED_DEPR_REVAL"))).multiply( v_Multipler)).subtract(rs.getBigDecimal("A_ACCUMULATED_DEPR"));
+					
+					sql2 = "SELECT SUM(CHANGEAMT) AS SUM_CHANGEAMT FROM A_ASSET_CHANGE WHERE A_ASSET_ID = " 
+						 + rs.getInt("A_Asset_ID")+ " AND CHANGETYPE = 'D'";
+					pstmt2 = DB.prepareStatement (sql2,null);
+					log.info("doIt - SQL2=" + sql2);
+					try {
+						rs2 = pstmt2.executeQuery();
+						while (rs2.next()){
+							v_Dep_Exp_reval = (rs2.getBigDecimal("SUM_CHANGEAMT").multiply( v_Multipler)).subtract(rs.getBigDecimal("SUM_CHANGEAMT"));							
+						}	
+ 					}
+						catch (Exception e)
+						{
+							log.info("getDeliveries"+ e);
+						}
+						  finally
+						  {
+							  DB.close(rs, pstmt2);
+							  rs2 = null; pstmt2 = null;
+						  }
+							
+//							 Create JV for the Reval Cost Amounts
+							X_A_Depreciation_Exp depexp0 = new X_A_Depreciation_Exp (getCtx(), 0, null);
+							depexp0.setPostingType(AssetReval.getPostingType());
+							depexp0.setA_Asset_ID(Asset.getA_Asset_ID());
+							depexp0.setExpense(v_Cost_reval);
+							depexp0.setDateAcct(AssetReval.getDateAcct());
+							depexp0.setA_Account_Number(rs.getInt("A_ASSET_ACCT"));
+							depexp0.setDescription("Asset Revaluation");
+							depexp0.setIsDepreciated(false);
+							depexp0.setA_Period(AssetReval.getC_Period_ID());
+							depexp0.setA_Entry_Type("RVL");
+							depexp0.save();
+							
+							X_A_Depreciation_Exp depexp1 = new X_A_Depreciation_Exp (getCtx(), 0, null);
+							depexp1.setPostingType(AssetReval.getPostingType());
+							depexp1.setA_Asset_ID(Asset.getA_Asset_ID());
+							depexp1.setExpense(v_Cost_reval.multiply(new BigDecimal(-1)));
+							depexp1.setDateAcct(AssetReval.getDateAcct());
+							depexp1.setA_Account_Number(rs.getInt("A_REVAL_COST_OFFSET"));
+							depexp1.setDescription("Asset Revaluation");
+							depexp1.setIsDepreciated(false);
+							depexp1.setA_Period(AssetReval.getC_Period_ID());			
+							depexp1.setA_Entry_Type("RVL");
+							depexp1.save();
+							
+//							 Create JV for the Reval Accum Depr Amounts
+							X_A_Depreciation_Exp depexp2 = new X_A_Depreciation_Exp (getCtx(), 0, null);
+							depexp2.setPostingType(AssetReval.getPostingType());
+							depexp2.setA_Asset_ID(Asset.getA_Asset_ID());
+							depexp2.setExpense(v_Accum_reval);
+							depexp2.setDateAcct(AssetReval.getDateAcct());
+							depexp2.setA_Account_Number(rs.getInt("A_ACCUMDEPRECIATION_ACCT"));
+							depexp2.setDescription("Asset Revaluation");
+							depexp2.setIsDepreciated(false);
+							depexp2.setA_Period(AssetReval.getC_Period_ID());
+							depexp2.setA_Entry_Type("RVL");
+							depexp2.save();
+							
+							X_A_Depreciation_Exp depexp3 = new X_A_Depreciation_Exp (getCtx(), 0, null);
+							depexp3.setPostingType(AssetReval.getPostingType());
+							depexp3.setA_Asset_ID(Asset.getA_Asset_ID());
+							depexp3.setExpense(v_Accum_reval.multiply(new BigDecimal(-1)));
+							depexp3.setDateAcct(AssetReval.getDateAcct());
+							depexp3.setA_Account_Number(rs.getInt("A_ACCUMULATED_DEPR_REVAL"));
+							depexp3.setDescription("Asset Revaluation");
+							depexp3.setIsDepreciated(false);
+							depexp3.setA_Period(AssetReval.getC_Period_ID());			
+							depexp3.setA_Entry_Type("RVL");
+							depexp3.save();
+							
+//							 Create JV for the Reval Depreciation Expense Amounts
+							X_A_Depreciation_Exp depexp4 = new X_A_Depreciation_Exp (getCtx(), 0, null);
+							depexp4.setPostingType(AssetReval.getPostingType());
+							depexp4.setA_Asset_ID(Asset.getA_Asset_ID());
+							depexp4.setExpense(v_Dep_Exp_reval);
+							depexp4.setDateAcct(AssetReval.getDateAcct());
+							depexp4.setA_Account_Number(rs.getInt("A_DEPRECIATION_ACCT"));
+							depexp4.setDescription("Asset Revaluation");
+							depexp4.setIsDepreciated(false);
+							depexp4.setA_Period(AssetReval.getC_Period_ID());
+							depexp4.setA_Entry_Type("RVL");
+							depexp4.save();
+							
+							X_A_Depreciation_Exp depexp5 = new X_A_Depreciation_Exp (getCtx(), 0, null);
+							depexp5.setPostingType(AssetReval.getPostingType());
+							depexp5.setA_Asset_ID(Asset.getA_Asset_ID());
+							depexp5.setExpense(v_Dep_Exp_reval.multiply(new BigDecimal(-1)));
+							depexp5.setDateAcct(AssetReval.getDateAcct());
+							depexp5.setA_Account_Number(rs.getInt("A_REVAL_DEPEXP_OFFSET"));
+							depexp5.setDescription("Asset Revaluation");
+							depexp5.setIsDepreciated(false);
+							depexp5.setA_Period(AssetReval.getC_Period_ID());			
+							depexp5.setA_Entry_Type("RVL");
+							depexp5.save();
+	
+					}
+						catch (Exception e)
+						{
+							log.info("getDeliveries"+ e);
+						}
+						  finally
+						  {
+							  DB.close(rs, pstmt);
+							  rs = null; pstmt = null;
+						  }				 }
+				 else if (AssetReval.getA_Reval_Multiplier().equals(X_A_Asset_Reval_Entry.A_REVAL_MULTIPLIER_Factor))
+				 {
+
+				 	
+				 	if (AssetReval.getA_Reval_Effective_Date().equals(X_A_Asset_Reval_Entry.A_REVAL_EFFECTIVE_DATE_DateAquired)){
+				 		sql2 = "Select A_REVAL_MULTIPLIER from A_ASSET_REVAL_INDEX where A_REVAL_CODE = " + AssetReval.getA_Rev_Code()
+						   + " and A_EFFECTIVE_DATE = (select MAX(A_EFFECTIVE_DATE) from A_ASSET_REVAL_INDEX where  A_EFFECTIVE_DATE < "
+						   + Asset.getA_Asset_CreateDate()
+						   + ")";
+				 		
+				 	}
+				 	else if (AssetReval.getA_Reval_Effective_Date().equals(X_A_Asset_Reval_Entry.A_REVAL_EFFECTIVE_DATE_RevaluationDate)){
+				 		sql2 = "Select A_REVAL_MULTIPLIER from A_ASSET_REVAL_INDEX where A_REVAL_CODE = " + AssetReval.getA_Rev_Code()
+						   + " and A_EFFECTIVE_DATE = (select MAX(A_EFFECTIVE_DATE) from A_ASSET_REVAL_INDEX where  A_EFFECTIVE_DATE < "
+						   + Asset.getA_Asset_RevalDate()
+						   + ")";
+				 		
+				 	}
+				 	else if (AssetReval.getA_Reval_Effective_Date().equals(X_A_Asset_Reval_Entry.A_REVAL_EFFECTIVE_DATE_DateDepreciationStarted)){
+				 		sql2 = "Select A_REVAL_MULTIPLIER from A_ASSET_REVAL_INDEX where A_REVAL_CODE = " + AssetReval.getA_Rev_Code()
+						   + " and A_EFFECTIVE_DATE = (select MAX(A_EFFECTIVE_DATE) from A_ASSET_REVAL_INDEX where  A_EFFECTIVE_DATE < "
+						   + Asset.getAssetServiceDate()
+						   + ")";
+				 		
+				 	}
+				 	PreparedStatement pstmt2 = null;
+					pstmt2 = DB.prepareStatement (sql2,null);
+					log.info("doIt - SQL2=" + sql2);
+					try {
+						ResultSet rs2 = pstmt2.executeQuery();
+						while (rs2.next()){
+						v_Multipler = rs2.getBigDecimal("A_REVAL_MULTIPLIER");							
+					}
+						v_Cost_reval = ((rs.getBigDecimal("A_Asset_Cost").subtract(rs.getBigDecimal("A_ASSET_COST_REVAL"))).multiply( v_Multipler)).subtract(rs.getBigDecimal("A_Asset_Cost"));												
+						v_Accum_reval = ((rs.getBigDecimal("A_ACCUMULATED_DEPR").subtract(rs.getBigDecimal("A_ACCUMULATED_DEPR_REVAL"))).multiply( v_Multipler)).subtract(rs.getBigDecimal("A_ACCUMULATED_DEPR"));
+						
+					}
+						catch (Exception e)
+						{
+							log.info("getDeliveries"+ e);
+						}
+						  finally
+						  {
+							  DB.close(rs, pstmt);
+							  rs = null; pstmt = null;
+						  }				 }				 
+				 
+				v_Cost_reval = ((rs.getBigDecimal("A_Asset_Cost").subtract(rs.getBigDecimal("A_ASSET_COST_REVAL"))).multiply( v_Multipler)).subtract(rs.getBigDecimal("A_Asset_Cost"));
+				v_Accum_reval = ((rs.getBigDecimal("A_ACCUMULATED_DEPR").subtract(rs.getBigDecimal("A_ACCUMULATED_DEPR_REVAL"))).multiply( v_Multipler)).subtract(rs.getBigDecimal("A_ACCUMULATED_DEPR"));
+				 
+				// Create JV for the Reval Cost Amounts
+				X_A_Depreciation_Exp depexp0 = new X_A_Depreciation_Exp (getCtx(), 0, null);
+				depexp0.setPostingType(AssetReval.getPostingType());
+				depexp0.setA_Asset_ID(Asset.getA_Asset_ID());
+				depexp0.setExpense(v_Cost_reval);
+				depexp0.setDateAcct(AssetReval.getDateAcct());
+				depexp0.setA_Account_Number(rs.getInt("A_ASSET_ACCT"));
+				depexp0.setDescription("Asset Revaluation");
+				depexp0.setIsDepreciated(false);
+				depexp0.setA_Period(AssetReval.getC_Period_ID());
+				depexp0.setA_Entry_Type("RVL");
+				depexp0.save();
+				
+				X_A_Depreciation_Exp depexp1 = new X_A_Depreciation_Exp (getCtx(), 0, null);
+				depexp1.setPostingType(AssetReval.getPostingType());
+				depexp1.setA_Asset_ID(Asset.getA_Asset_ID());
+				depexp1.setExpense(v_Cost_reval.multiply(new BigDecimal(-1)));
+				depexp1.setDateAcct(AssetReval.getDateAcct());
+				depexp1.setA_Account_Number(rs.getInt("A_REVAL_COST_OFFSET"));
+				depexp1.setDescription("Asset Revaluation");
+				depexp1.setIsDepreciated(false);
+				depexp1.setA_Period(AssetReval.getC_Period_ID());			
+				depexp1.setA_Entry_Type("RVL");
+				depexp1.save();
+				
+//				 Create JV for the Reval Accum Depr Amounts
+				X_A_Depreciation_Exp depexp2 = new X_A_Depreciation_Exp (getCtx(), 0, null);
+				depexp2.setPostingType(AssetReval.getPostingType());
+				depexp2.setA_Asset_ID(Asset.getA_Asset_ID());
+				depexp2.setExpense(v_Accum_reval);
+				depexp2.setDateAcct(AssetReval.getDateAcct());
+				depexp2.setA_Account_Number(rs.getInt("A_ACCUMDEPRECIATION_ACCT"));
+				depexp2.setDescription("Asset Revaluation");
+				depexp2.setIsDepreciated(false);
+				depexp2.setA_Period(AssetReval.getC_Period_ID());
+				depexp2.setA_Entry_Type("RVL");
+				depexp2.save();
+				
+				X_A_Depreciation_Exp depexp3 = new X_A_Depreciation_Exp (getCtx(), 0, null);
+				depexp3.setPostingType(AssetReval.getPostingType());
+				depexp3.setA_Asset_ID(Asset.getA_Asset_ID());
+				depexp3.setExpense(v_Accum_reval.multiply(new BigDecimal(-1)));
+				depexp3.setDateAcct(AssetReval.getDateAcct());
+				depexp3.setA_Account_Number(rs.getInt("A_ACCUMULATED_DEPR_REVAL"));
+				depexp3.setDescription("Asset Revaluation");
+				depexp3.setIsDepreciated(false);
+				depexp3.setA_Period(AssetReval.getC_Period_ID());			
+				depexp3.setA_Entry_Type("RVL");
+				depexp3.save();
+				
+//				 Create JV for the Reval Depreciation Expense Amounts
+				X_A_Depreciation_Exp depexp4 = new X_A_Depreciation_Exp (getCtx(), 0, null);
+				depexp4.setPostingType(AssetReval.getPostingType());
+				depexp4.setA_Asset_ID(Asset.getA_Asset_ID());
+				depexp4.setExpense(v_Accum_reval);
+				depexp4.setDateAcct(AssetReval.getDateAcct());
+				depexp4.setA_Account_Number(rs.getInt("A_DEPRECIATION_ACCT"));
+				depexp4.setDescription("Asset Revaluation");
+				depexp4.setIsDepreciated(false);
+				depexp4.setA_Period(AssetReval.getC_Period_ID());
+				depexp4.setA_Entry_Type("RVL");
+				depexp4.save();
+				
+				X_A_Depreciation_Exp depexp5 = new X_A_Depreciation_Exp (getCtx(), 0, null);
+				depexp5.setPostingType(AssetReval.getPostingType());
+				depexp5.setA_Asset_ID(Asset.getA_Asset_ID());
+				depexp5.setExpense(v_Accum_reval.multiply(new BigDecimal(-1)));
+				depexp5.setDateAcct(AssetReval.getDateAcct());
+				depexp5.setA_Account_Number(rs.getInt("A_REVAL_DEPEXP_OFFSET"));
+				depexp5.setDescription("Asset Revaluation");
+				depexp5.setIsDepreciated(false);
+				depexp5.setA_Period(AssetReval.getC_Period_ID());			
+				depexp5.setA_Entry_Type("RVL");
+				depexp5.save();
+ 				}
+ 			}
+				catch (Exception e)
+				{
+					log.info("getDeliveries"+ e);
+				}
+				  finally
+				  {
+					  DB.close(rs, pstmt);
+					  rs = null; pstmt = null;
+				  }
+				return "";
+		}	//	doIt
+	
+}	//	AssetRevalEntry


Property changes on: branches/patches_352/base/src/org/compiere/FA/AssetRevalEntry.java
___________________________________________________________________
Added: svn:executable
   + *

Added: branches/patches_352/base/src/org/compiere/FA/CalloutFA.java
===================================================================
--- branches/patches_352/base/src/org/compiere/FA/CalloutFA.java	                        (rev 0)
+++ branches/patches_352/base/src/org/compiere/FA/CalloutFA.java	2008-08-29 20:45:31 UTC (rev 6279)
@@ -0,0 +1,142 @@
+/******************************************************************************
+ * The contents of this file are subject to the   Compiere License  Version 1.1
+ * ("License"); You may not use this file except in compliance with the License
+ * You may obtain a copy of the License at http://www.compiere.org/license.html
+ * Software distributed under the License is distributed on an  "AS IS"  basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+ * the specific language governing rights and limitations under the License.
+ * The Original Code is                  Compiere  ERP & CRM  Business Solution
+ * The Initial Developer of the Original Code is Jorg Janke  and ComPiere, Inc.
+ *
+ * Copyright (C) 2005 Robert KLEIN. robeklein@... * 
+ * Contributor(s): ______________________________________.
+ *****************************************************************************/
+package org.compiere.FA;
+
+import java.sql.*;
+import java.util.*;
+
+import org.compiere.util.*;
+import org.compiere.model.CalloutEngine;
+import org.compiere.model.GridField;
+import org.compiere.model.GridTab;
+
+/**
+ *	FA Callout.
+ *
+ *  @author Rob Klein
+ *  @version  $Id: CalloutFA.java,v 1.0 $
+ */
+public class CalloutFA extends CalloutEngine
+{
+	
+	/**
+	 *	Table_Period.  Used to set the Manual Period Field.  This allows
+	 *	the Spread Field to be displayed when there is a code that
+	 *  has been setup as Yearly. 
+	 *  The string in the Callout field is: 
+	 *  <code>com.compiere.custom.CalloutEngine.Table_Period</code> 
+	 *
+	 *  @param ctx      Context
+	 *  @param WindowNo current Window No
+	 *  @param mTab     Model Tab
+	 *  @param mField   Model Field
+	 *  @param value    The new value
+	 *  @param oldValue The old value
+	 *	@return error message or "" if OK
+	 */
+	public String Table_Period (Properties ctx, int WindowNo,
+			GridTab mTab, GridField mField, Object value, Object oldValue)
+		{
+		Integer A_Depreciation_Table_Header_ID = (Integer)value;
+			
+			try
+			{
+				if (A_Depreciation_Table_Header_ID != null){
+				String SQL = "SELECT A_Term "
+					+ "FROM A_Depreciation_Table_Header "
+					+ "WHERE A_Depreciation_Table_Header_ID='"
+					+A_Depreciation_Table_Header_ID
+					+"'";
+				
+				PreparedStatement pstmt = DB.prepareStatement(SQL,null);				
+				ResultSet rs = pstmt.executeQuery();
+				if (rs.next())
+				{
+//					Charges - Set Context
+						Env.setContext(ctx, WindowNo, "A_DEPRECIATION_MANUAL_PERIOD", rs.getString("A_Term"));					
+						mTab.setValue ("A_DEPRECIATION_MANUAL_PERIOD", rs.getString("A_Term"));
+		
+				}
+				rs.close();
+				pstmt.close();
+				}
+			}
+			catch (SQLException e)
+			{
+				log.info("PeriodType "+ e);
+				return e.getLocalizedMessage();
+			}
+			return "";
+		}	//	Period Type
+	
+	/**
+	 *	Field_Clear.  Used to set the Manual Period Field.  This allows
+	 *	the Spread Field to be displayed when there is a code that
+	 *  has been setup as Yearly. 
+	 *  The string in the Callout field is: 
+	 *  <code>com.compiere.custom.CalloutEngine.Table_Period</code> 
+	 *
+	 *  @param ctx      Context
+	 *  @param WindowNo current Window No
+	 *  @param mTab     Model Tab
+	 *  @param mField   Model Field
+	 *  @param value    The new value
+	 *  @param oldValue The old value
+	 *	@return error message or "" if OK
+	 */
+	public String Field_Clear (Properties ctx, int WindowNo,
+			GridTab mTab, GridField mField, Object value, Object oldValue)
+		{
+		Object A_Depreciation_ID = value;
+			
+			try
+			{
+				String SQL = "SELECT DepreciationType "
+					+ "FROM A_Depreciation "
+					+ "WHERE A_Depreciation_ID="
+					+ A_Depreciation_ID;
+				
+				PreparedStatement pstmt = DB.prepareStatement(SQL,null);				
+				ResultSet rs = pstmt.executeQuery();
+				if (rs.next())
+				{
+//					Charges - Set Context
+					if (  (!rs.getString("DepreciationType").equals("TAB")) || (!rs.getString("DepreciationType").equals("MAN")) )
+					{
+						Env.setContext(ctx, WindowNo, "A_DEPRECIATION_MANUAL_PERIOD", "");					
+						//mTab.setValue ("A_Depreciation_Manual_Period", null);
+						mTab.setValue ("A_Depreciation_Manual_Amount", null);
+						mTab.setValue ("A_Depreciation_Table_Header_ID", null);
+					}
+					if (rs.getString("DepreciationType").equals("TAB"))
+					{						
+						mTab.setValue ("A_Depreciation_Manual_Amount", null);
+					}
+					if (rs.getString("DepreciationType").equals("MAN"))
+					{
+						mTab.setValue ("A_Depreciation_Table_Header_ID", null);
+					}	
+				}
+				rs.close();
+				pstmt.close();
+			}
+			catch (SQLException e)
+			{
+				log.info("PeriodType "+ e);
+				return e.getLocalizedMessage();
+			}
+			return "";
+		}	//	Period Type	
+
+}	//	CalloutFA


Property changes on: branches/patches_352/base/src/org/compiere/FA/CalloutFA.java
___________________________________________________________________
Added: svn:executable
   + *

Added: branches/patches_352/base/src/org/compiere/model/MAllocationHdr.java
===================================================================
--- branches/patches_352/base/src/org/compiere/model/MAllocationHdr.java	                        (rev 0)
+++ branches/patches_352/base/src/org/compiere/model/MAllocationHdr.java	2008-08-29 20:45:31 UTC (rev 6279)
@@ -0,0 +1,761 @@
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution                        *
+ * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@... or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+package org.compiere.model;
+
+import java.io.File;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.process.DocAction;
+import org.compiere.process.DocumentEngine;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
+
+/**
+ *  Payment Allocation Model.
+ * 	Allocation Trigger update C_BPartner
+ *
+ *  @author 	Jorg Janke
+ *  @version 	$Id: MAllocationHdr.java,v 1.3 2006/07/30 00:51:03 jjanke Exp $
+ *  @author victor.perez@... http://www.e-evolution.com FR [ 1866214 ]  http://sourceforge.net/tracker/index.php?func=detail&aid=1866214&group_id=176962&atid=879335
+ */
+public final class MAllocationHdr extends X_C_AllocationHdr implements DocAction
+{
+	/**
+	 * 	Get Allocations of Payment
+	 *	@param ctx context
+	 *	@param C_Payment_ID payment
+	 *	@return allocations of payment
+	 *	@param trxName transaction
+	 */
+	public static MAllocationHdr[] getOfPayment (Properties ctx, int C_Payment_ID, String trxName)
+	{
+		String sql = "SELECT * FROM C_AllocationHdr h "
+			+ "WHERE IsActive='Y'"
+			+ " AND EXISTS (SELECT * FROM C_AllocationLine l "
+				+ "WHERE h.C_AllocationHdr_ID=l.C_AllocationHdr_ID AND l.C_Payment_ID=?)";
+		ArrayList<MAllocationHdr> list = new ArrayList<MAllocationHdr>();
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		try
+		{
+			pstmt = DB.prepareStatement(sql, trxName);
+			pstmt.setInt(1, C_Payment_ID);
+			rs = pstmt.executeQuery();
+			while (rs.next())
+				list.add (new MAllocationHdr(ctx, rs, trxName));
+		}
+		catch (Exception e)
+		{
+			s_log.log(Level.SEVERE, sql, e);
+		}
+		finally
+		{
+			DB.close(rs, pstmt);
+			rs = null; pstmt = null;
+		}
+		MAllocationHdr[] retValue = new MAllocationHdr[list.size()];
+		list.toArray(retValue);
+		return retValue;
+	}	//	getOfPayment
+
+	/**
+	 * 	Get Allocations of Invoice
+	 *	@param ctx context
+	 *	@param C_Invoice_ID payment
+	 *	@return allocations of payment
+	 *	@param trxName transaction
+	 */
+	public static MAllocationHdr[] getOfInvoice (Properties ctx, int C_Invoice_ID, String trxName)
+	{
+		String sql = "SELECT * FROM C_AllocationHdr h "
+			+ "WHERE IsActive='Y'"
+			+ " AND EXISTS (SELECT * FROM C_AllocationLine l "
+				+ "WHERE h.C_AllocationHdr_ID=l.C_AllocationHdr_ID AND l.C_Invoice_ID=?)";
+		ArrayList<MAllocationHdr> list = new ArrayList<MAllocationHdr>();
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		try
+		{
+			pstmt = DB.prepareStatement(sql, trxName);
+			pstmt.setInt(1, C_Invoice_ID);
+			rs = pstmt.executeQuery();
+			while (rs.next())
+				list.add (new MAllocationHdr(ctx, rs, trxName));
+		}
+		catch (Exception e)
+		{
+			s_log.log(Level.SEVERE, sql, e);
+		}
+		finally
+		{
+			DB.close(rs, pstmt);
+			rs = null; pstmt = null;
+		}
+		MAllocationHdr[] retValue = new MAllocationHdr[list.size()];
+		list.toArray(retValue);
+		return retValue;
+	}	//	getOfInvoice
+	
+	//FR [ 1866214 ]
+	/**
+	 * 	Get Allocations of Cash
+	 *	@param ctx context
+	 *	@param C_Cash_ID Cash ID
+	 *	@return allocations of payment
+	 *	@param trxName transaction
+	 */
+	public static MAllocationHdr[] getOfCash (Properties ctx, int C_Cash_ID, String trxName)
+	{
+		String whereClause = "IsActive='Y'"
+			+ " AND EXISTS (SELECT 1 FROM C_CashLine cl, C_AllocationLine al "
+				+ "where cl.C_Cash_ID=? and al.C_CashLine_ID=cl.C_CashLine_ID "
+						+ "and C_AllocationHdr.C_AllocationHdr_ID=al.C_AllocationHdr_ID)";
+		Query query = MTable.get(ctx, MAllocationHdr.Table_ID)
+							.createQuery(whereClause, trxName);
+		query.setParameters(new Object[]{C_Cash_ID});
+		List<MAllocationHdr> list = query.list();
+		MAllocationHdr[] retValue = new MAllocationHdr[list.size()];
+		list.toArray(retValue);
+		return retValue;
+	}	//	getOfCash
+	
+	/**	Logger						*/
+	private static CLogger s_log = CLogger.getCLogger(MAllocationHdr.class);
+	
+	
+	/**************************************************************************
+	 * 	Standard Constructor
+	 *	@param ctx context
+	 *	@param C_AllocationHdr_ID id
+	 *	@param trxName transaction
+	 */
+	public MAllocationHdr (Properties ctx, int C_AllocationHdr_ID, String trxName)
+	{
+		super (ctx, C_AllocationHdr_ID, trxName);
+		if (C_AllocationHdr_ID == 0)
+		{
+		//	setDocumentNo (null);
+			setDateTrx (new Timestamp(System.currentTimeMillis()));
+			setDateAcct (getDateTrx());
+			setDocAction (DOCACTION_Complete);	// CO
+			setDocStatus (DOCSTATUS_Drafted);	// DR
+		//	setC_Currency_ID (0);
+			setApprovalAmt (Env.ZERO);
+			setIsApproved (false);
+			setIsManual (false);
+			//
+			setPosted (false);
+			setProcessed (false);
+			setProcessing(false);
+		}
+	}	//	MAllocation
+
+	/**
+	 * 	Mandatory New Constructor
+	 *	@param ctx context
+	 *	@param IsManual manual trx
+	 *	@param DateTrx date (if null today)
+	 *	@param C_Currency_ID currency
+	 *	@param description description
+	 *	@param trxName transaction
+	 */
+	public MAllocationHdr (Properties ctx, boolean IsManual, Timestamp DateTrx, 
+		int C_Currency_ID, String description, String trxName)
+	{
+		this (ctx, 0, trxName);
+		setIsManual(IsManual);
+		if (DateTrx != null)
+		{
+			setDateTrx (DateTrx);
+			setDateAcct (DateTrx);
+		}
+		setC_Currency_ID (C_Currency_ID);
+		if (description != null)
+			setDescription(description);
+	}	//  create Allocation
+
+	/** 
+	 * 	Load Constructor
+	 * 	@param ctx context
+	 *	@param rs result set
+	 *	@param trxName transaction
+	 */
+	public MAllocationHdr (Properties ctx, ResultSet rs, String trxName)
+	{
+		super(ctx, rs, trxName);
+	}	//	MAllocation
+
+	/**	Lines						*/
+	private MAllocationLine[]	m_lines = null;
+	
+	/**
+	 * 	Get Lines
+	 *	@param requery if true requery
+	 *	@return lines
+	 */
+	public MAllocationLine[] getLines (boolean requery)
+	{
+		if (m_lines != null && m_lines.length != 0 && !requery) {
+			set_TrxName(m_lines, get_TrxName());
+			return m_lines;
+		}
+		//
+		String sql = "SELECT * FROM C_AllocationLine WHERE C_AllocationHdr_ID=?";
+		ArrayList<MAllocationLine> list = new ArrayList<MAllocationLine>();
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		try
+		{
+			pstmt = DB.prepareStatement (sql, get_TrxName());
+			pstmt.setInt (1, getC_AllocationHdr_ID());
+			rs = pstmt.executeQuery ();
+			while (rs.next ())
+			{
+				MAllocationLine line = new MAllocationLine(getCtx(), rs, get_TrxName());
+				line.setParent(this);
+				list.add (line);
+			}
+		} 
+		catch (Exception e)
+		{
+			log.log(Level.SEVERE, sql, e);
+		}
+		finally
+		{
+			DB.close(rs, pstmt);
+			rs = null; pstmt = null;
+		}
+		//
+		m_lines = new MAllocationLine[list.size ()];
+		list.toArray (m_lines);
+		return m_lines;
+	}	//	getLines
+
+	/**
+	 * 	Set Processed
+	 *	@param processed Processed
+	 */
+	public void setProcessed (boolean processed)
+	{
+		super.setProcessed (processed);
+		if (get_ID() == 0)
+			return;
+		String sql = "UPDATE C_AllocationHdr SET Processed='"
+			+ (processed ? "Y" : "N")
+			+ "' WHERE C_AllocationHdr_ID=" + getC_AllocationHdr_ID();
+		int no = DB.executeUpdate(sql, get_TrxName());
+		m_lines = null;
+		log.fine(processed + " - #" + no);
+	}	//	setProcessed
+	
+	
+	/**************************************************************************
+	 * 	Before Save
+	 *	@param newRecord
+	 *	@return save
+	 */
+	protected boolean beforeSave (boolean newRecord)
+	{
+		//	Changed from Not to Active
+		if (!newRecord && is_ValueChanged("IsActive") && isActive())
+		{
+			log.severe ("Cannot Re-Activate deactivated Allocations");
+			return false;
+		}
+		return true;
+	}	//	beforeSave
+
+	/**
+	 * 	Before Delete.
+	 *	@return true if acct was deleted
+	 */
+	protected boolean beforeDelete ()
+	{
+		String trxName = get_TrxName();
+		if (trxName == null || trxName.length() == 0)
+			log.warning ("No transaction");
+		if (isPosted())
+		{
+			if (!MPeriod.isOpen(getCtx(), getDateTrx(), MDocType.DOCBASETYPE_PaymentAllocation))
+			{
+				log.warning ("Period Closed");
+				return false;
+			}
+			setPosted(false);
+			MFactAcct.deleteEx (Table_ID, get_ID(), trxName);
+		}
+		//	Mark as Inactive
+		setIsActive(false);		//	updated DB for line delete/process
+		String sql = "UPDATE C_AllocationHdr SET IsActive='N' WHERE C_AllocationHdr_ID=?";
+		DB.executeUpdate(sql, getC_AllocationHdr_ID(), trxName);
+		
+		//	Unlink
+		getLines(true);
+		HashSet<Integer> bps = new HashSet<Integer>();
+		for (int i = 0; i < m_lines.length; i++)
+		{
+			MAllocationLine line = m_lines[i];
+			bps.add(new Integer(line.getC_BPartner_ID()));
+			if (!line.delete(true, trxName))
+				return false;
+		}
+		updateBP(bps);
+		return true;
+	}	//	beforeDelete
+
+	/**
+	 * 	After Save
+	 *	@param newRecord
+	 *	@param success
+	 *	@return success
+	 */
+	protected boolean afterSave (boolean newRecord, boolean success)
+	{
+		return success;
+	}	//	afterSave
+	
+	/**************************************************************************
+	 * 	Process document
+	 *	@param processAction document action
+	 *	@return true if performed
+	 */
+	public boolean processIt (String processAction)
+	{
+		m_processMsg = null;
+		DocumentEngine engine = new DocumentEngine (this, getDocStatus());
+		return engine.processIt (processAction, getDocAction());
+	}	//	processIt
+	
+	/**	Process Message 			*/
+	private String		m_processMsg = null;
+	/**	Just Prepared Flag			*/
+	private boolean		m_justPrepared = false;
+
+	/**
+	 * 	Unlock Document.
+	 * 	@return true if success 
+	 */
+	public boolean unlockIt()
+	{
+		log.info(toString());
+		setProcessing(false);
+		return true;
+	}	//	unlockIt
+	
+	/**
+	 * 	Invalidate Document
+	 * 	@return true if success 
+	 */
+	public boolean invalidateIt()
+	{
+		log.info(toString());
+		setDocAction(DOCACTION_Prepare);
+		return true;
+	}	//	invalidateIt
+	
+	/**
+	 *	Prepare Document
+	 * 	@return new status (In Progress or Invalid) 
+	 */
+	public String prepareIt()
+	{
+		log.info(toString());
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this, ModelValidator.TIMING_BEFORE_PREPARE);
+		if (m_processMsg != null)
+			return DocAction.STATUS_Invalid;
+
+		//	Std Period open?
+		if (!MPeriod.isOpen(getCtx(), getDateAcct(), MDocType.DOCBASETYPE_PaymentAllocation))
+		{
+			m_processMsg = "@PeriodClosed@";
+			return DocAction.STATUS_Invalid;
+		}
+		getLines(false);
+		if (m_lines.length == 0)
+		{
+			m_processMsg = "@NoLines@";
+			return DocAction.STATUS_Invalid;
+		}
+		//	Add up Amounts & validate
+		BigDecimal approval = Env.ZERO;
+		for (int i = 0; i < m_lines.length; i++)
+		{
+			MAllocationLine line = m_lines[i];
+			approval = approval.add(line.getWriteOffAmt()).add(line.getDiscountAmt());
+			//	Make sure there is BP
+			if (line.getC_BPartner_ID() == 0)
+			{
+				m_processMsg = "No Business Partner";
+				return DocAction.STATUS_Invalid;
+			}
+		}
+		setApprovalAmt(approval);
+		//
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this, ModelValidator.TIMING_AFTER_PREPARE);
+		if (m_processMsg != null)
+			return DocAction.STATUS_Invalid;
+		
+		m_justPrepared = true;
+		if (!DOCACTION_Complete.equals(getDocAction()))
+			setDocAction(DOCACTION_Complete);
+		
+		return DocAction.STATUS_InProgress;
+	}	//	prepareIt
+	
+	/**
+	 * 	Approve Document
+	 * 	@return true if success 
+	 */
+	public boolean  approveIt()
+	{
+		log.info(toString());
+		setIsApproved(true);
+		return true;
+	}	//	approveIt
+	
+	/**
+	 * 	Reject Approval
+	 * 	@return true if success 
+	 */
+	public boolean rejectIt()
+	{
+		log.info(toString());
+		setIsApproved(false);
+		return true;
+	}	//	rejectIt
+	
+	/**
+	 * 	Complete Document
+	 * 	@return new status (Complete, In Progress, Invalid, Waiting ..)
+	 */
+	public String completeIt()
+	{
+		//	Re-Check
+		if (!m_justPrepared)
+		{
+			String status = prepareIt();
+			if (!DocAction.STATUS_InProgress.equals(status))
+				return status;
+		}
+
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this, ModelValidator.TIMING_BEFORE_COMPLETE);
+		if (m_processMsg != null)
+			return DocAction.STATUS_Invalid;
+		
+		//	Implicit Approval
+		if (!isApproved())
+			approveIt();
+		log.info(toString());
+
+		//	Link
+		getLines(false);
+		HashSet<Integer> bps = new HashSet<Integer>();
+		for (int i = 0; i < m_lines.length; i++)
+		{
+			MAllocationLine line = m_lines[i];
+			bps.add(new Integer(line.processIt(false)));	//	not reverse
+		}
+		updateBP(bps);
+
+		//	User Validation
+		String valid = ModelValidationEngine.get().fireDocValidate(this, ModelValidator.TIMING_AFTER_COMPLETE);
+		if (valid != null)
+		{
+			m_processMsg = valid;
+			return DocAction.STATUS_Invalid;
+		}
+
+		setProcessed(true);
+		setDocAction(DOCACTION_Close);
+		return DocAction.STATUS_Completed;
+	}	//	completeIt
+	
+	/**
+	 * 	Void Document.
+	 * 	Same as Close.
+	 * 	@return true if success 
+	 */
+	public boolean voidIt()
+	{
+		log.info(toString());
+
+		// Before Void
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_BEFORE_VOID);
+		if (m_processMsg != null)
+			return false;
+
+		boolean retValue = reverseIt();
+
+		// After Void
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_VOID);
+		if (m_processMsg != null)
+			return false;
+		
+		setDocAction(DOCACTION_None);
+
+		return retValue;
+	}	//	voidIt
+	
+	/**
+	 * 	Close Document.
+	 * 	Cancel not delivered Qunatities
+	 * 	@return true if success 
+	 */
+	public boolean closeIt()
+	{
+		log.info(toString());
+		// Before Close
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_BEFORE_CLOSE);
+		if (m_processMsg != null)
+			return false;
+
+		// After Close
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_CLOSE);
+		if (m_processMsg != null)
+			return false;
+
+		setDocAction(DOCACTION_None);
+
+		return true;
+	}	//	closeIt
+	
+	/**
+	 * 	Reverse Correction
+	 * 	@return true if success 
+	 */
+	public boolean reverseCorrectIt()
+	{
+		log.info(toString());
+		// Before reverseCorrect
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_BEFORE_REVERSECORRECT);
+		if (m_processMsg != null)
+			return false;
+		
+		boolean retValue = reverseIt();
+
+		// After reverseCorrect
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_REVERSECORRECT);
+		if (m_processMsg != null)
+			return false;
+		
+		setDocAction(DOCACTION_None);
+		return retValue;
+	}	//	reverseCorrectionIt
+	
+	/**
+	 * 	Reverse Accrual - none
+	 * 	@return false 
+	 */
+	public boolean reverseAccrualIt()
+	{
+		log.info(toString());
+		// Before reverseAccrual
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_BEFORE_REVERSEACCRUAL);
+		if (m_processMsg != null)
+			return false;
+		
+		boolean retValue = reverseIt();
+
+		// After reverseAccrual
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_REVERSEACCRUAL);
+		if (m_processMsg != null)
+			return false;
+		
+		setDocAction(DOCACTION_None);
+		return retValue;
+	}	//	reverseAccrualIt
+	
+	/** 
+	 * 	Re-activate
+	 * 	@return false 
+	 */
+	public boolean reActivateIt()
+	{
+		log.info(toString());
+		// Before reActivate
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_BEFORE_REACTIVATE);
+		if (m_processMsg != null)
+			return false;	
+		
+		// After reActivate
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_REACTIVATE);
+		if (m_processMsg != null)
+			return false;
+		
+		return false;
+	}	//	reActivateIt
+
+	/**
+	 * 	String Representation
+	 *	@return info
+	 */
+	public String toString ()
+	{
+		StringBuffer sb = new StringBuffer ("MAllocationHdr[");
+		sb.append(get_ID()).append("-").append(getSummary()).append ("]");
+		return sb.toString ();
+	}	//	toString
+
+	/**
+	 * 	Get Document Info
+	 *	@return document info (untranslated)
+	 */
+	public String getDocumentInfo()
+	{
+		return Msg.getElement(getCtx(), "C_AllocationHdr_ID") + " " + getDocumentNo();
+	}	//	getDocumentInfo
+
+	/**
+	 * 	Create PDF
+	 *	@return File or null
+	 */
+	public File createPDF ()
+	{
+		try
+		{
+			File temp = File.createTempFile(get_TableName()+get_ID()+"_", ".pdf");
+			return createPDF (temp);
+		}
+		catch (Exception e)
+		{
+			log.severe("Could not create PDF - " + e.getMessage());
+		}
+		return null;
+	}	//	getPDF
+
+	/**
+	 * 	Create PDF file
+	 *	@param file output file
+	 *	@return file if success
+	 */
+	public File createPDF (File file)
+	{
+	//	ReportEngine re = ReportEngine.get (getCtx(), ReportEngine.INVOICE, getC_Invoice_ID());
+	//	if (re == null)
+			return null;
+	//	return re.getPDF(file);
+	}	//	createPDF
+
+	/*************************************************************************
+	 * 	Get Summary
+	 *	@return Summary of Document
+	 */
+	public String getSummary()
+	{
+		StringBuffer sb = new StringBuffer();
+		sb.append(getDocumentNo());
+		//	: Total Lines = 123.00 (#1)
+		sb.append(": ")
+			.append(Msg.translate(getCtx(),"ApprovalAmt")).append("=").append(getApprovalAmt())
+			.append(" (#").append(getLines(false).length).append(")");
+		//	 - Description
+		if (getDescription() != null && getDescription().length() > 0)
+			sb.append(" - ").append(getDescription());
+		return sb.toString();
+	}	//	getSummary
+	
+	/**
+	 * 	Get Process Message
+	 *	@return clear text error message
+	 */
+	public String getProcessMsg()
+	{
+		return m_processMsg;
+	}	//	getProcessMsg
+	
+	/**
+	 * 	Get Document Owner (Responsible)
+	 *	@return AD_User_ID
+	 */
+	public int getDoc_User_ID()
+	{
+		return getCreatedBy();
+	}	//	getDoc_User_ID
+
+	
+	/**************************************************************************
+	 * 	Reverse Allocation.
+	 * 	Period needs to be open
+	 *	@return true if reversed
+	 */
+	private boolean reverseIt() 
+	{
+		if (!isActive())
+			throw new IllegalStateException("Allocation already reversed (not active)");
+
+		//	Can we delete posting
+		if (!MPeriod.isOpen(getCtx(), getDateTrx(), MPeriodControl.DOCBASETYPE_PaymentAllocation))
+			throw new IllegalStateException("@PeriodClosed@");
+
+		//	Set Inactive
+		setIsActive (false);
+		setDocumentNo(getDocumentNo()+"^");
+		setDocStatus(DOCSTATUS_Reversed);	//	for direct calls
+		if (!save() || isActive())
+			throw new IllegalStateException("Cannot de-activate allocation");
+			
+		//	Delete Posting
+		MFactAcct.deleteEx(MAllocationHdr.Table_ID, getC_AllocationHdr_ID(), get_TrxName());
+		
+		//	Unlink Invoices
+		getLines(true);
+		HashSet<Integer> bps = new HashSet<Integer>();
+		for (int i = 0; i < m_lines.length; i++)
+		{
+			MAllocationLine line = m_lines[i];
+			line.setIsActive(false);
+			line.save();
+			bps.add(new Integer(line.processIt(true)));	//	reverse
+		}
+		updateBP(bps);
+		return true;
+	}	//	reverse
+
+	
+	/**
+	 * 	Update Open Balance of BP's
+	 *	@param bps list of business partners
+	 */
+	private void updateBP(HashSet<Integer> bps)
+	{
+		log.info("#" + bps.size());
+		Iterator<Integer> it = bps.iterator();
+		while (it.hasNext())
+		{
+			int C_BPartner_ID = it.next();
+			MBPartner bp = new MBPartner(getCtx(), C_BPartner_ID, get_TrxName());
+			bp.setTotalOpenBalance();		//	recalculates from scratch
+		//	bp.setSOCreditStatus();			//	called automatically
+			if (bp.save())
+				log.fine(bp.toString());
+			else
+				log.log(Level.SEVERE, "BP not updated - " + bp);
+		}
+	}	//	updateBP
+	
+}   //  MAllocation

Modified: branches/patches_352/base/src/org/compiere/model/MBankStatement.java
===================================================================
--- branches/patches_352/base/src/org/compiere/model/MBankStatement.java	2008-08-29 08:24:02 UTC (rev 6278)
+++ branches/patches_352/base/src/org/compiere/model/MBankStatement.java	2008-08-29 20:45:31 UTC (rev 6279)
@@ -466,8 +466,7 @@
 				m_processMsg = "@PeriodClosed@";
 				return false;
 			}
-			if (MFactAcct.delete(Table_ID, getC_BankStatement_ID(), get_TrxName()) < 0)
-				return false;	//	could not delete
+			MFactAcct.deleteEx(Table_ID, getC_BankStatement_ID(), get_TrxName());
 		}
 		
 		//Added Lines by AZ Goodwill

Added: branches/patches_352/base/src/org/compiere/model/MCash.java
===================================================================
--- branches/patches_352/base/src/org/compiere/model/MCash.java	                        (rev 0)
+++ branches/patches_352/base/src/org/compiere/model/MCash.java	2008-08-29 20:45:31 UTC (rev 6279)
@@ -0,0 +1,876 @@
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@... or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+package org.compiere.model;
+
+import java.io.File;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.process.DocAction;
+import org.compiere.process.DocumentEngine;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.DisplayType;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
+import org.compiere.util.TimeUtil;
+
+/**
+ *	Cash Journal Model
+ *	
+ *  @author Jorg Janke
+ *  @version $Id: MCash.java,v 1.3 2006/07/30 00:51:03 jjanke Exp $
+ *  @author victor.perez@... http://www.e-evolution.com FR [ 1866214 ]  http://sourceforge.net/tracker/index.php?func=detail&aid=1866214&group_id=176962&atid=879335
+ *  @author Teo Sarca, SC ARHIPAC SERVICE SRL
+ * 			<li>BF [ 1831997 ] Cash journal allocation reversed
+ * 			<li>BF [ 1894524 ] Pay an reversed invoice
+ */
+public class MCash extends X_C_Cash implements DocAction
+{
+	/**
+	 * 	Get Cash Journal for currency, org and date
+	 *	@param ctx context
+	 *	@param C_Currency_ID currency
+	 *	@param AD_Org_ID org
+	 *	@param dateAcct date
+	 *	@param trxName transaction
+	 *	@return cash
+	 */
+	public static MCash get (Properties ctx, int AD_Org_ID, 
+		Timestamp dateAcct, int C_Currency_ID, String trxName)
+	{
+		MCash retValue = null;
+		//	Existing Journal
+		String sql;
+	    sql = "SELECT * FROM C_Cash c "
+		+ "WHERE c.AD_Org_ID=?"						//	#1
+		+ " AND TRUNC(c.StatementDate)=?"			//	#2
+		+ " AND c.Processed='N'"
+		+ " AND EXISTS (SELECT * FROM C_CashBook cb "
+			+ "WHERE c.C_CashBook_ID=cb.C_CashBook_ID AND cb.AD_Org_ID=c.AD_Org_ID"
+			+ " AND cb.C_Currency_ID=?)";			//	#3
+		
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		try
+		{
+			pstmt = DB.prepareStatement (sql, trxName);
+			pstmt.setInt (1, AD_Org_ID);
+			pstmt.setTimestamp (2, TimeUtil.getDay(dateAcct));
+			pstmt.setInt (3, C_Currency_ID);
+			rs = pstmt.executeQuery ();
+			if (rs.next ())
+				retValue = new MCash (ctx, rs, trxName);
+		}
+		catch (Exception e)
+		{
+			s_log.log(Level.SEVERE, sql, e);
+		}
+		finally
+		{
+			DB.close(rs, pstmt);
+			rs = null; pstmt = null;
+		}
+		if (retValue != null)
+			return retValue;
+		
+		//	Get CashBook
+		MCashBook cb = MCashBook.get (ctx, AD_Org_ID, C_Currency_ID);
+		if (cb == null)
+		{
+			s_log.warning("No CashBook for AD_Org_ID=" + AD_Org_ID + ", C_Currency_ID=" + C_Currency_ID);
+			return null;
+		}
+		
+		//	Create New Journal
+		retValue = new MCash (cb, dateAcct);
+		retValue.save(trxName);
+		return retValue;
+	}	//	get
+
+	/**
+	 * 	Get Cash Journal for CashBook and date
+	 *	@param ctx context
+	 *	@param C_CashBook_ID cashbook
+	 *	@param dateAcct date
+	 *	@param trxName transaction
+	 *	@return cash
+	 */
+	public static MCash get (Properties ctx, int C_CashBook_ID, 
+		Timestamp dateAcct, String trxName)
+	{
+		MCash retValue = null;
+		//	Existing Journal
+		String sql = "SELECT * FROM C_Cash c "
+			+ "WHERE c.C_CashBook_ID=?"					//	#1
+			+ " AND TRUNC(c.StatementDate)=?"			//	#2
+			+ " AND c.Processed='N'";
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		try
+		{
+			pstmt = DB.prepareStatement (sql, trxName);
+			pstmt.setInt (1, C_CashBook_ID);
+			pstmt.setTimestamp (2, TimeUtil.getDay(dateAcct));
+			rs = pstmt.executeQuery ();
+			if (rs.next ())
+				retValue = new MCash (ctx, rs, trxName);
+		}
+		catch (Exception e)
+		{
+			s_log.log(Level.SEVERE, sql, e);
+		}
+		finally
+		{
+			DB.close(rs, pstmt);
+			rs = null; pstmt = null;
+		}
+		if (retValue != null)
+			return retValue;
+		
+		//	Get CashBook
+		MCashBook cb = new MCashBook (ctx, C_CashBook_ID, trxName);
+		if (cb.get_ID() ==0)
+		{
+			s_log.warning("Not found C_CashBook_ID=" + C_CashBook_ID);
+			return null;
+		}
+		
+		//	Create New Journal
+		retValue = new MCash (cb, dateAcct);
+		retValue.save(trxName);
+		return retValue;
+	}	//	get
+
+	/**	Static Logger	*/
+	private static CLogger	s_log	= CLogger.getCLogger (MCash.class);
+
+	
+	/**************************************************************************
+	 * 	Standard Constructor
+	 *	@param ctx context
+	 *	@param C_Cash_ID id
+	 *	@param trxName transaction
+	 */
+	public MCash (Properties ctx, int C_Cash_ID, String trxName)
+	{
+		super (ctx, C_Cash_ID, trxName);
+		if (C_Cash_ID == 0)
+		{
+		//	setC_CashBook_ID (0);		//	FK
+			setBeginningBalance (Env.ZERO);
+			setEndingBalance (Env.ZERO);
+			setStatementDifference(Env.ZERO);
+			setDocAction(DOCACTION_Complete);
+			setDocStatus(DOCSTATUS_Drafted);
+			//
+			Timestamp today = TimeUtil.getDay(System.currentTimeMillis());
+			setStatementDate (today);	// @#Date@
+			setDateAcct (today);	// @#Date@
+			String name = DisplayType.getDateFormat(DisplayType.Date).format(today)
+				+ " " + MOrg.get(ctx, getAD_Org_ID()).getValue();
+			setName (name);	
+			setIsApproved(false);
+			setPosted (false);	// N
+			setProcessed (false);
+		}
+	}	//	MCash
+
+	/**
+	 * 	Load Constructor
+	 *	@param ctx context
+	 *	@param rs result set
+	 *	@param trxName transaction
+	 */
+	public MCash (Properties ctx, ResultSet rs, String trxName)
+	{
+		super(ctx, rs, trxName);
+	}	//	MCash
+	
+	/**
+	 * 	Parent Constructor
+	 *	@param cb cash book
+	 *	@param today date - if null today
+	 */
+	public MCash (MCashBook cb, Timestamp today)
+	{
+		this (cb.getCtx(), 0, cb.get_TrxName());
+		setClientOrg(cb);
+		setC_CashBook_ID(cb.getC_CashBook_ID());
+		if (today != null)
+		{
+			setStatementDate (today);	
+			setDateAcct (today);
+			String name = DisplayType.getDateFormat(DisplayType.Date).format(today)
+				+ " " + cb.getName();
+			setName (name);	
+		}
+		m_book = cb;
+	}	//	MCash
+	
+	/**	Lines					*/
+	private MCashLine[]		m_lines = null;
+	/** CashBook				*/
+	private MCashBook		m_book = null;
+	
+	/**
+	 * 	Get Lines
+	 *	@param requery requery
+	 *	@return lines
+	 */
+	public MCashLine[] getLines (boolean requery)
+	{
+		if (m_lines != null && !requery) {
+			set_TrxName(m_lines, get_TrxName());
+			return m_lines;
+		}
+		ArrayList<MCashLine> list = new ArrayList<MCashLine>();
+		String sql = "SELECT * FROM C_CashLine WHERE C_Cash_ID=? ORDER BY Line";
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		try
+		{
+			pstmt = DB.prepareStatement (sql, get_TrxName());
+			pstmt.setInt (1, getC_Cash_ID());
+			rs = pstmt.executeQuery ();
+			while (rs.next ())
+				list.add (new MCashLine (getCtx(), rs, get_TrxName()));
+		}
+		catch (Exception e)
+		{
+			log.log(Level.SEVERE, sql, e);
+		}
+		finally
+		{
+			DB.close(rs, pstmt);
+			rs = null; pstmt = null;
+		}
+		
+		m_lines = new MCashLine[list.size ()];
+		list.toArray (m_lines);
+		return m_lines;
+	}	//	getLines
+
+	/**
+	 * 	Get Cash Book
+	 *	@return cash book
+	 */
+	public MCashBook getCashBook()
+	{
+		if (m_book == null)
+			m_book = MCashBook.get(getCtx(), getC_CashBook_ID());
+		return m_book;
+	}	//	getCashBook
+	
+	/**
+	 * 	Get Document No 
+	 *	@return name
+	 */
+	public String getDocumentNo()
+	{
+		return getName();
+	}	//	getDocumentNo
+
+	/**
+	 * 	Get Document Info
+	 *	@return document info (untranslated)
+	 */
+	public String getDocumentInfo()
+	{
+		return Msg.getElement(getCtx(), "C_Cash_ID") + " " + getDocumentNo();
+	}	//	getDocumentInfo
+
+	/**
+	 * 	Create PDF
+	 *	@return File or null
+	 */
+	public File createPDF ()
+	{
+		try
+		{
+			File temp = File.createTempFile(get_TableName()+get_ID()+"_", ".pdf");
+			return createPDF (temp);
+		}
+		catch (Exception e)
+		{
+			log.severe("Could not create PDF - " + e.getMessage());
+		}
+		return null;
+	}	//	getPDF
+
+	/**
+	 * 	Create PDF file
+	 *	@param file output file
+	 *	@return file if success
+	 */
+	public File createPDF (File file)
+	{
+	//	ReportEngine re = ReportEngine.get (getCtx(), ReportEngine.INVOICE, getC_Invoice_ID());
+	//	if (re == null)
+			return null;
+	//	return re.getPDF(file);
+	}	//	createPDF
+
+	/**
+	 * 	Before Save
+	 *	@param newRecord
+	 *	@return true
+	 */
+	protected boolean beforeSave (boolean newRecord)
+	{
+		setAD_Org_ID(getCashBook().getAD_Org_ID());
+		if (getAD_Org_ID() == 0)
+		{
+			log.saveError("Error", Msg.parseTranslation(getCtx(), "@AD_Org_ID@"));
+			return false;
+		}
+		//	Calculate End Balance
+		setEndingBalance(getBeginningBalance().add(getStatementDifference()));
+		return true;
+	}	//	beforeSave
+	
+	
+	/**************************************************************************
+	 * 	Process document
+	 *	@param processAction document action
+	 *	@return true if performed
+	 */
+	public boolean processIt (String processAction)
+	{
+		m_processMsg = null;
+		DocumentEngine engine = new DocumentEngine (this, getDocStatus());
+		return engine.processIt (processAction, getDocAction());
+	}	//	process
+	
+	/**	Process Message 			*/
+	private String		m_processMsg = null;
+	/**	Just Prepared Flag			*/
+	private boolean		m_justPrepared = false;
+
+	/**
+	 * 	Unlock Document.
+	 * 	@return true if success 
+	 */
+	public boolean unlockIt()
+	{
+		log.info(toString());
+		setProcessing(false);
+		return true;
+	}	//	unlockIt
+	
+	/**
+	 * 	Invalidate Document
+	 * 	@return true if success 
+	 */
+	public boolean invalidateIt()
+	{
+		log.info(toString());
+		setDocAction(DOCACTION_Prepare);
+		return true;
+	}	//	invalidateIt
+	
+	/**
+	 *	Prepare Document
+	 * 	@return new status (In Progress or Invalid) 
+	 */
+	public String prepareIt()
+	{
+		log.info(toString());
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this, ModelValidator.TIMING_BEFORE_PREPARE);
+		if (m_processMsg != null)
+			return DocAction.STATUS_Invalid;
+
+		//	Std Period open?
+		if (!MPeriod.isOpen(getCtx(), getDateAcct(), MDocType.DOCBASETYPE_CashJournal))
+		{
+			m_processMsg = "@PeriodClosed@";
+			return DocAction.STATUS_Invalid;
+		}
+		MCashLine[] lines = getLines(false);
+		if (lines.length == 0)
+		{
+			m_processMsg = "@NoLines@";
+			return DocAction.STATUS_Invalid;
+		}
+		//	Add up Amounts
+		BigDecimal difference = Env.ZERO;
+		int C_Currency_ID = getC_Currency_ID();
+		for (int i = 0; i < lines.length; i++)
+		{
+			MCashLine line = lines[i];
+			if (!line.isActive())
+				continue;
+			if (C_Currency_ID == line.getC_Currency_ID())
+				difference = difference.add(line.getAmount());
+			else
+			{
+				BigDecimal amt = MConversionRate.convert(getCtx(), line.getAmount(), 
+					line.getC_Currency_ID(), C_Currency_ID, getDateAcct(), 0, 
+					getAD_Client_ID(), getAD_Org_ID());
+				if (amt == null)
+				{
+					m_processMsg = "No Conversion Rate found - @C_CashLine_ID@= " + line.getLine();
+					return DocAction.STATUS_Invalid;
+				}
+				difference = difference.add(amt);
+			}
+		}
+		setStatementDifference(difference);
+	//	setEndingBalance(getBeginningBalance().add(getStatementDifference()));
+
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this, ModelValidator.TIMING_AFTER_PREPARE);
+		if (m_processMsg != null)
+			return DocAction.STATUS_Invalid;
+
+		m_justPrepared = true;
+		if (!DOCACTION_Complete.equals(getDocAction()))
+			setDocAction(DOCACTION_Complete);
+		return DocAction.STATUS_InProgress;
+	}	//	prepareIt
+	
+	/**
+	 * 	Approve Document
+	 * 	@return true if success 
+	 */
+	public boolean  approveIt()
+	{
+		log.info(toString());
+		setIsApproved(true);
+		return true;
+	}	//	approveIt
+	
+	/**
+	 * 	Reject Approval
+	 * 	@return true if success 
+	 */
+	public boolean rejectIt()
+	{
+		log.info(toString());
+		setIsApproved(false);
+		return true;
+	}	//	rejectIt
+	
+	/**
+	 * 	Complete Document
+	 * 	@return new status (Complete, In Progress, Invalid, Waiting ..)
+	 */
+	public String completeIt()
+	{
+		//	Re-Check
+		if (!m_justPrepared)
+		{
+			String status = prepareIt();
+			if (!DocAction.STATUS_InProgress.equals(status))
+				return status;
+		}
+		
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this, ModelValidator.TIMING_BEFORE_COMPLETE);
+		if (m_processMsg != null)
+			return DocAction.STATUS_Invalid;
+
+		
+		//	Implicit Approval
+		if (!isApproved())
+			approveIt();
+		//
+		log.info(toString());
+		
+		MCashLine[] lines = getLines(false);
+		for (int i = 0; i < lines.length; i++)
+		{
+			MCashLine line = lines[i];
+			if (MCashLine.CASHTYPE_Invoice.equals(line.getCashType()))
+			{
+				// Check if the invoice is completed - teo_sarca BF [ 1894524 ]
+				MInvoice invoice = line.getInvoice();
+				if (!MInvoice.DOCSTATUS_Completed.equals(invoice.getDocStatus())
+						&& !MInvoice.DOCSTATUS_Closed.equals(invoice.getDocStatus()))
+				{
+					m_processMsg = "@Line@ "+line.getLine()+": @InvoiceCreateDocNotCompleted@";
+					return DocAction.STATUS_Invalid;
+				}
+				//
+				String name = Msg.translate(getCtx(), "C_Cash_ID") + ": " + getName()
+								+ " - " + Msg.translate(getCtx(), "Line") + " " + line.getLine();
+				MAllocationHdr hdr = new MAllocationHdr(getCtx(), false, 
+						getDateAcct(), line.getC_Currency_ID(),
+						name, get_TrxName());
+				hdr.setAD_Org_ID(getAD_Org_ID());
+				if (!hdr.save())
+				{
+					m_processMsg = CLogger.retrieveErrorString("Could not create Allocation Hdr");
+					return DocAction.STATUS_Invalid;
+				}
+				//	Allocation Line
+				MAllocationLine aLine = new MAllocationLine (hdr, line.getAmount(),
+					line.getDiscountAmt(), line.getWriteOffAmt(), Env.ZERO);
+				aLine.setC_Invoice_ID(line.getC_Invoice_ID());
+				aLine.setC_CashLine_ID(line.getC_CashLine_ID());
+				if (!aLine.save())
+				{
+					m_processMsg = CLogger.retrieveErrorString("Could not create Allocation Line");
+					return DocAction.STATUS_Invalid;
+				}
+				//	Should start WF
+				if(!hdr.processIt(DocAction.ACTION_Complete)) {
+					m_processMsg = CLogger.retrieveErrorString("Could not process Allocation");
+					return DocAction.STATUS_Invalid;
+				}
+				if (!hdr.save()) {
+					m_processMsg = CLogger.retrieveErrorString("Could not save Allocation");
+					return DocAction.STATUS_Invalid;
+				}
+			}
+			else if (MCashLine.CASHTYPE_BankAccountTransfer.equals(line.getCashType()))
+			{
+				//	Payment just as intermediate info
+				MPayment pay = new MPayment (getCtx(), 0, get_TrxName());
+				pay.setAD_Org_ID(getAD_Org_ID());
+				String documentNo = getName();
+				pay.setDocumentNo(documentNo);
+				pay.setR_PnRef(documentNo);
+				pay.set_Value("TrxType", "X");		//	Transfer
+				pay.set_Value("TenderType", "X");
+				//
+				pay.setC_BankAccount_ID(line.getC_BankAccount_ID());
+				pay.setC_DocType_ID(true);	//	Receipt
+				pay.setDateTrx(getStatementDate());
+				pay.setDateAcct(getDateAcct());
+				pay.setAmount(line.getC_Currency_ID(), line.getAmount().negate());	//	Transfer
+				pay.setDescription(line.getDescription());
+				pay.setDocStatus(MPayment.DOCSTATUS_Closed);
+				pay.setDocAction(MPayment.DOCACTION_None);
+				pay.setPosted(true);
+				pay.setIsAllocated(true);	//	Has No Allocation!
+				pay.setProcessed(true);		
+				if (!pay.save())
+				{
+					m_processMsg = CLogger.retrieveErrorString("Could not create Payment");
+					return DocAction.STATUS_Invalid;
+				}
+				
+				line.setC_Payment_ID(pay.getC_Payment_ID());
+				if (!line.save())
+				{
+					m_processMsg = "Could not update Cash Line";
+					return DocAction.STATUS_Invalid;
+				}
+			}
+		}
+		
+		//	User Validation
+		String valid = ModelValidationEngine.get().fireDocValidate(this, ModelValidator.TIMING_AFTER_COMPLETE);
+		if (valid != null)
+		{
+			m_processMsg = valid;
+			return DocAction.STATUS_Invalid;
+		}
+		//
+		setProcessed(true);
+		setDocAction(DOCACTION_Close);
+		return DocAction.STATUS_Completed;
+	}	//	completeIt
+	
+	/**
+	 * 	Void Document.
+	 * 	Same as Close.
+	 * 	@return true if success 
+	 */
+	public boolean voidIt()
+	{
+		log.info(toString());
+		// Before Void
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_BEFORE_VOID);
+		if (m_processMsg != null)
+			return false;
+
+		//FR [ 1866214 ]
+		boolean retValue = reverseIt();
+		
+		if (retValue) {
+			// After Void
+			m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_VOID);
+			if (m_processMsg != null)
+				return false;		
+			setDocAction(DOCACTION_None);
+		}
+
+		return retValue;
+	}	//	voidIt
+	
+	//FR [ 1866214 ]
+	/**************************************************************************
+	 * 	Reverse Cash
+	 * 	Period needs to be open
+	 *	@return true if reversed
+	 */
+	private boolean reverseIt() 
+	{
+		if (DOCSTATUS_Closed.equals(getDocStatus())
+			|| DOCSTATUS_Reversed.equals(getDocStatus())
+			|| DOCSTATUS_Voided.equals(getDocStatus()))
+		{
+			m_processMsg = "Document Closed: " + getDocStatus();
+			setDocAction(DOCACTION_None);
+			return false;
+		}
+
+		//	Can we delete posting
+		if (!MPeriod.isOpen(getCtx(), this.getDateAcct(), MPeriodControl.DOCBASETYPE_CashJournal))
+			throw new IllegalStateException("@PeriodClosed@");
+		
+		//	Reverse Allocations
+		MAllocationHdr[] allocations = MAllocationHdr.getOfCash(getCtx(), getC_Cash_ID(), get_TrxName());
+		for(MAllocationHdr allocation : allocations)
+		{
+			allocation.reverseCorrectIt();
+			if(!allocation.save())
+				throw new IllegalStateException("Cannot reverse allocations");
+		}	
+
+		MCashLine[] cashlines = getLines(true);
+		for (MCashLine cashline : cashlines )
+		{
+			BigDecimal oldAmount = cashline.getAmount();
+			BigDecimal oldDiscount = cashline.getDiscountAmt();
+			BigDecimal oldWriteOff = cashline.getWriteOffAmt();
+			cashline.setAmount(Env.ZERO);
+			cashline.setDiscountAmt(Env.ZERO);
+			cashline.setWriteOffAmt(Env.ZERO);
+			cashline.addDescription(Msg.getMsg(getCtx(), "Voided")
+					+ " (Amount=" + oldAmount + ", Discount=" + oldDiscount
+					+ ", WriteOff=" + oldWriteOff + ", )");
+			if (MCashLine.CASHTYPE_BankAccountTransfer.equals(cashline.getCashType()))
+			{
+				if (cashline.getC_Payment_ID() == 0)
+					throw new IllegalStateException("Cannot reverse payment");
+					
+				MPayment payment = new MPayment(getCtx(), cashline.getC_Payment_ID(),get_TrxName());
+				payment.reverseCorrectIt();
+				if (!payment.save())
+					throw new IllegalStateException("Cannot reverse payment");
+			}
+		}
+		
+		setName(getName()+"^");
+		addDescription(Msg.getMsg(getCtx(), "Voided"));
+		setDocStatus(DOCSTATUS_Reversed);	//	for direct calls
+		setProcessed(true);
+		setDocAction(DOCACTION_None);
+		if (!save())
+			throw new IllegalStateException("Cannot save journal cash");
+			
+		//	Delete Posting
+		MFactAcct.deleteEx(Table_ID, getC_Cash_ID(), get_TrxName());
+		
+		return true;
+	}	//	reverse
+	
+	/**
+	 * 	Add to Description
+	 *	@param description text
+	 */
+	public void addDescription (String description)
+	{
+		String desc = getDescription();
+		if (desc == null)
+			setDescription(description);
+		else
+			setDescription(desc + " | " + description);
+	}	//	addDescription
+
+	/**
+	 * 	Close Document.
+	 * 	Cancel not delivered Quantities
+	 * 	@return true if success 
+	 */
+	public boolean closeIt()
+	{
+		log.info(toString());
+		// Before Close
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_BEFORE_CLOSE);
+		if (m_processMsg != null)
+			return false;
+		// After Close
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_CLOSE);
+		if (m_processMsg != null)
+			return false;
+		
+		setDocAction(DOCACTION_None);
+		return true;
+	}	//	closeIt
+	
+	/**
+	 * 	Reverse Correction
+	 * 	@return true if success 
+	 */
+	public boolean reverseCorrectIt()
+	{
+		log.info(toString());
+		// Before reverseCorrect
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_BEFORE_REVERSECORRECT);
+		if (m_processMsg != null)
+			return false;
+		
+		//FR [ 1866214 ]
+		boolean retValue = reverseIt();
+		
+		if (retValue) {
+			// After reverseCorrect
+			m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_REVERSECORRECT);
+			if (m_processMsg != null)
+				return false;		
+		}
+		
+		return retValue;
+	}	//	reverseCorrectionIt
+	
+	/**
+	 * 	Reverse Accrual - none
+	 * 	@return true if success 
+	 */
+	public boolean reverseAccrualIt()
+	{
+		log.info(toString());
+		// Before reverseAccrual
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_BEFORE_REVERSEACCRUAL);
+		if (m_processMsg != null)
+			return false;
+		
+		// After reverseAccrual
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_REVERSEACCRUAL);
+		if (m_processMsg != null)
+			return false;
+				
+		return false;
+	}	//	reverseAccrualIt
+	
+	/** 
+	 * 	Re-activate
+	 * 	@return true if success 
+	 */
+	public boolean reActivateIt()
+	{
+		log.info(toString());
+		// Before reActivate
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_BEFORE_REACTIVATE);
+		if (m_processMsg != null)
+			return false;	
+				
+		setProcessed(false);
+		if (reverseCorrectIt())
+			return true;
+
+		// After reActivate
+		m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_REACTIVATE);
+		if (m_processMsg != null)
+			return false;		
+		return false;
+	}	//	reActivateIt
+	
+	/**
+	 * 	Set Processed
+	 *	@param processed processed
+	 */
+	public void setProcessed (boolean processed)
+	{
+		super.setProcessed (processed);
+		String sql = "UPDATE C_CashLine SET Processed='"
+			+ (processed ? "Y" : "N")
+			+ "' WHERE C_Cash_ID=" + getC_Cash_ID();
+		int noLine = DB.executeUpdate (sql, get_TrxName());
+		m_lines = null;
+		log.fine(processed + " - Lines=" + noLine);
+	}	//	setProcessed
+	
+	/**
+	 * 	String Representation
+	 *	@return info
+	 */
+	public String toString ()
+	{
+		StringBuffer sb = new StringBuffer ("MCash[");
+		sb.append (get_ID ())
+			.append ("-").append (getName())
+			.append(", Balance=").append(getBeginningBalance())
+			.append("->").append(getEndingBalance())
+			.append ("]");
+		return sb.toString ();
+	}	//	toString
+	
+	/*************************************************************************
+	 * 	Get Summary
+	 *	@return Summary of Document
+	 */
+	public String getSummary()
+	{
+		StringBuffer sb = new StringBuffer();
+		sb.append(getName());
+		//	: Total Lines = 123.00 (#1)
+		sb.append(": ")
+			.append(Msg.translate(getCtx(),"BeginningBalance")).append("=").append(getBeginningBalance())
+			.append(",")
+			.append(Msg.translate(getCtx(),"EndingBalance")).append("=").append(getEndingBalance())
+			.append(" (#").append(getLines(false).length).append(")");
+		//	 - Description
+		if (getDescription() != null && getDescription().length() > 0)
+			sb.append(" - ").append(getDescription());
+		return sb.toString();
+	}	//	getSummary
+	
+	/**
+	 * 	Get Process Message
+	 *	@return clear text error message
+	 */
+	public String getProcessMsg()
+	{
+		return m_processMsg;
+	}	//	getProcessMsg
+	
+	/**
+	 * 	Get Document Owner (Responsible)
+	 *	@return AD_User_ID
+	 */
+	public int getDoc_User_ID()
+	{
+		return getCreatedBy();
+	}	//	getDoc_User_ID
+
+	/**
+	 * 	Get Document Approval Amount
+	 *	@return amount difference
+	 */
+	public BigDecimal getApprovalAmt()
+	{
+		return getStatementDifference();
+	}	//	getApprovalAmt
+
+	/**
+	 * 	Get Currency
+	 *	@return Currency
+	 */
+	public int getC_Currency_ID ()
+	{
+		return getCashBook().getC_Currency_ID();
+	}	//	getC_Currency_ID
+
+}	//	MCash

Added: branches/patches_352/base/src/org/compiere/model/MFactAcct.java
===================================================================
--- branches/patches_352/base/src/org/compiere/model/MFactAcct.java	                        (rev 0)
+++ branches/patches_352/base/src/org/compiere/model/MFactAcct.java	2008-08-29 20:45:31 UTC (rev 6279)
@@ -0,0 +1,135 @@
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution                        *
+ * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@... or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+package org.compiere.model;
+
+import java.sql.ResultSet;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.adempiere.exceptions.DBException;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+
+
+/**
+ *	Accounting Fact Model
+ *	
+ *  @author Jorg Janke
+ *  @version $Id: MFactAcct.java,v 1.3 2006/07/30 00:51:03 jjanke Exp $
+ *  
+ *  @author Teo Sarca, http://www.arhipac.ro
+ *  			<li>FR [ 2079083 ] Add MFactAcct.deleteEx method
+ */
+public class MFactAcct extends X_Fact_Acct
+{
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * Delete Accounting
+	 * @param AD_Table_ID table
+	 * @param Record_ID record
+	 * @param trxName transaction
+	 * @return number of rows or -1 for error
+	 * @deprecated Since ADempiere 3.5.2a; please use {@link #deleteEx(int, int, String)} instead.
+	 */
+	public static int delete (int AD_Table_ID, int Record_ID, String trxName)
+	{
+		int no = -1;
+		try {
+			no = deleteEx(AD_Table_ID, Record_ID, trxName);
+		}
+		catch (DBException e) {
+			s_log.log(Level.SEVERE, "failed: AD_Table_ID=" + AD_Table_ID + ", Record_ID" + Record_ID, e);
+			no = -1;
+		}
+		return no;
+	}	//	delete
+	
+	/**
+	 * Delete Accounting
+	 * @param AD_Table_ID table
+	 * @param Record_ID record
+	 * @param trxName transaction
+	 * @return number of rows deleted
+	 * @throws DBException on database exception
+	 */
+	public static int deleteEx(int AD_Table_ID, int Record_ID, String trxName)
+	throws DBException
+	{
+		final String sql = "DELETE Fact_Acct WHERE AD_Table_ID=? AND Record_ID=?";
+		int no = DB.executeUpdateEx(sql, new Object[]{AD_Table_ID, Record_ID}, trxName);
+		s_log.fine("delete - AD_Table_ID=" + AD_Table_ID + ", Record_ID=" + Record_ID + " - #" + no);
+		return no;
+	}
+
+	/**	Static Logger	*/
+	private static CLogger	s_log	= CLogger.getCLogger (MFactAcct.class);
+	
+	/**************************************************************************
+	 * 	Standard Constructor
+	 *	@param ctx context
+	 *	@param Fact_Acct_ID id
+	 *	@param trxName transaction
+	 */
+	public MFactAcct (Properties ctx, int Fact_Acct_ID, String trxName)
+	{
+		super (ctx, Fact_Acct_ID, trxName);
+	}	//	MFactAcct
+
+	/**
+	 * 	Load Constructor
+	 *	@param ctx context
+	 *	@param rs result set
+	 *	@param trxName transaction
+	 */
+	public MFactAcct (Properties ctx, ResultSet rs, String trxName)
+	{
+		super(ctx, rs, trxName);
+	}	//	MFactAcct
+
+	/**
+	 * 	String Representation
+	 *	@return info
+	 */
+	public String toString ()
+	{
+		StringBuffer sb = new StringBuffer ("MFactAcct[");
+		sb.append(get_ID()).append("-Acct=").append(getAccount_ID())
+			.append(",Dr=").append(getAmtSourceDr()).append("|").append(getAmtAcctDr())
+			.append(",Cr=").append(getAmtSourceCr()).append("|").append(getAmtAcctCr())
+			.append ("]");
+		return sb.toString ();
+	}	//	toString
+
+	/**
+	 * 	Derive MAccount from record
+	 *	@return Valid Account Combination
+	 */
+	public MAccount getMAccount()
+	{
+		MAccount acct = MAccount.get (getCtx(), getAD_Client_ID(), getAD_Org_ID(),
+			getC_AcctSchema_ID(), getAccount_ID(), getC_SubAcct_ID(),
+			getM_Product_ID(), getC_BPartner_ID(), getAD_OrgTrx_ID(), 
+			getC_LocFrom_ID(), getC_LocTo_ID(), getC_SalesRegion_ID(), 
+			getC_Project_ID(), getC_Campaign_ID(), getC_Activity_ID(),
+			getUser1_ID(), getUser2_ID(), getUserElement1_ID(), getUserElement2_ID());
+		if (acct != null && acct.get_ID() == 0)
+			acct.save();
+		return acct;
+	}	//	getMAccount
+	
+}	//	MFactAcct

Added: branches/patches_352/base/src/org/compiere/model/MMatchInv.java
===================================================================
--- branches/patches_352/base/src/org/compiere/model/MMatchInv.java	                        (rev 0)
+++ branches/patches_352/base/src/org/compiere/model/MMatchInv.java	2008-08-29 20:45:31 UTC (rev 6279)
@@ -0,0 +1,410 @@
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@... or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+
+/**
+ *	Match Invoice (Receipt<>Invoice) Model.
+ *	Accounting:
+ *	- Not Invoiced Receipts (relief)
+ *	- IPV
+ *	
+ *  @author Jorg Janke
+ *  @version $Id: MMatchInv.java,v 1.3 2006/07/30 00:51:05 jjanke Exp $
+ * 
+ * @author Teo Sarca, SC ARHIPAC SERVICE SRL
+ * 			<li>BF [ 1926113 ] MMatchInv.getNewerDateAcct() should work in trx
+ */
+public class MMatchInv extends X_M_MatchInv
+{
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 	Get InOut-Invoice Matches
+	 *	@param ctx context
+	 *	@param M_InOutLine_ID shipment
+	 *	@param C_InvoiceLine_ID invoice
+	 *	@param trxName transaction
+	 *	@return array of matches
+	 */
+	public static MMatchInv[] get (Properties ctx, 
+		int M_InOutLine_ID, int C_InvoiceLine_ID, String trxName)
+	{
+		if (M_InOutLine_ID == 0 || C_InvoiceLine_ID == 0)
+			return new MMatchInv[]{};
+		//
+		String sql = "SELECT * FROM M_MatchInv WHERE M_InOutLine_ID=? AND C_InvoiceLine_ID=?";
+		ArrayList<MMatchInv> list = new ArrayList<MMatchInv>();
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		try
+		{
+			pstmt = DB.prepareStatement (sql, trxName);
+			pstmt.setInt (1, M_InOutLine_ID);
+			pstmt.setInt (2, C_InvoiceLine_ID);
+			rs = pstmt.executeQuery ();
+			while (rs.next ())
+				list.add (new MMatchInv (ctx, rs, trxName));
+		}
+		catch (Exception e)
+		{
+			s_log.log(Level.SEVERE, sql, e); 
+		}
+		finally
+		{
+			DB.close(rs, pstmt);
+			rs = null; pstmt = null;
+		}
+		MMatchInv[] retValue = new MMatchInv[list.size()];
+		list.toArray (retValue);
+		return retValue;
+	}	//	get
+
+	// MZ Goodwill
+	/**
+	 * 	Get Inv Matches for InvoiceLine
+	 *	@param ctx context
+	 *	@param C_InvoiceLine_ID invoice
+	 *	@param trxName transaction
+	 *	@return array of matches
+	 */
+	public static MMatchInv[] getInvoiceLine (Properties ctx, int C_InvoiceLine_ID, String trxName)
+	{
+		if (C_InvoiceLine_ID == 0)
+			return new MMatchInv[]{};
+		//
+		String sql = "SELECT * FROM M_MatchInv WHERE C_InvoiceLine_ID=?";
+		ArrayList<MMatchInv> list = new ArrayList<MMatchInv>();
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		try
+		{
+			pstmt = DB.prepareStatement (sql, trxName);
+			pstmt.setInt (1, C_InvoiceLine_ID);
+			rs = pstmt.executeQuery ();
+			while (rs.next ())
+				list.add (new MMatchInv (ctx, rs, trxName));
+ 		}
+		catch (Exception e)
+		{
+			s_log.log(Level.SEVERE, sql, e); 
+		}
+		finally
+		{
+			DB.close(rs, pstmt);
+			rs = null; pstmt = null;
+		}
+		MMatchInv[] retValue = new MMatchInv[list.size()];
+		list.toArray (retValue);
+		return retValue;
+	}	//	getInvoiceLine
+	// end MZ
+	
+	/**
+	 * 	Get Inv Matches for InOut
+	 *	@param ctx context
+	 *	@param M_InOut_ID shipment
+	 *	@param trxName transaction
+	 *	@return array of matches
+	 */
+	public static MMatchInv[] getInOut (Properties ctx, 
+		int M_InOut_ID, String trxName)
+	{
+		if (M_InOut_ID == 0)
+			return new MMatchInv[]{};
+		//
+		String sql = "SELECT * FROM M_MatchInv m"
+			+ " INNER JOIN M_InOutLine l ON (m.M_InOutLine_ID=l.M_InOutLine_ID) "
+			+ "WHERE l.M_InOut_ID=?"; 
+		ArrayList<MMatchInv> list = new ArrayList<MMatchInv>();
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		try
+		{
+			pstmt = DB.prepareStatement (sql, trxName);
+			pstmt.setInt (1, M_InOut_ID);
+			rs = pstmt.executeQuery ();
+			while (rs.next ())
+				list.add (new MMatchInv (ctx, rs, trxName));
+		}
+		catch (Exception e)
+		{
+			s_log.log(Level.SEVERE, sql, e); 
+		}
+		finally
+		{
+			DB.close(rs, pstmt);
+			rs = null; pstmt = null;
+		}
+		MMatchInv[] retValue = new MMatchInv[list.size()];
+		list.toArray (retValue);
+		return retValue;
+	}	//	getInOut
+
+	/**
+	 * 	Get Inv Matches for Invoice
+	 *	@param ctx context
+	 *	@param C_Invoice_ID invoice
+	 *	@param trxName transaction
+	 *	@return array of matches
+	 */
+	public static MMatchInv[] getInvoice (Properties ctx, 
+		int C_Invoice_ID, String trxName)
+	{
+		if (C_Invoice_ID == 0)
+			return new MMatchInv[]{};
+		//
+		String sql = "SELECT * FROM M_MatchInv mi"
+			+ " INNER JOIN C_InvoiceLine il ON (mi.C_InvoiceLine_ID=il.C_InvoiceLine_ID) "
+			+ "WHERE il.C_Invoice_ID=?";
+		ArrayList<MMatchInv> list = new ArrayList<MMatchInv>();
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		try
+		{
+			pstmt = DB.prepareStatement (sql, trxName);
+			pstmt.setInt (1, C_Invoice_ID);
+			rs = pstmt.executeQuery ();
+			while (rs.next ())
+				list.add (new MMatchInv (ctx, rs, trxName));
+		}
+		catch (Exception e)
+		{
+			s_log.log(Level.SEVERE, sql, e); 
+		}
+		finally
+		{
+			DB.close(rs, pstmt);
+			rs = null; pstmt = null;
+		}
+		MMatchInv[] retValue = new MMatchInv[list.size()];
+		list.toArray (retValue);
+		return retValue;
+	}	//	getInvoice
+
+	
+	/**	Static Logger	*/
+	private static CLogger	s_log	= CLogger.getCLogger (MMatchInv.class);
+
+	
+	/**************************************************************************
+	 * 	Standard Constructor
+	 *	@param ctx context
+	 *	@param M_MatchInv_ID id
+	 *	@param trxName transaction
+	 */
+	public MMatchInv (Properties ctx, int M_MatchInv_ID, String trxName)
+	{
+		super (ctx, M_MatchInv_ID, trxName);
+		if (M_MatchInv_ID == 0)
+		{
+		//	setDateTrx (new Timestamp(System.currentTimeMillis()));
+		//	setC_InvoiceLine_ID (0);
+		//	setM_InOutLine_ID (0);
+		//	setM_Product_ID (0);
+			setM_AttributeSetInstance_ID(0);
+		//	setQty (Env.ZERO);
+			setPosted (false);
+			setProcessed (false);
+			setProcessing (false);
+		}
+	}	//	MMatchInv
+
+	/**
+	 * 	Load Constructor
+	 *	@param ctx context
+	 *	@param rs result set
+	 *	@param trxName transaction
+	 */
+	public MMatchInv (Properties ctx, ResultSet rs, String trxName)
+	{
+		super(ctx, rs, trxName);
+	}	//	MMatchInv
+	
+	/**
+	 * 	Invoice Line Constructor
+	 *	@param iLine invoice line
+	 *	@param dateTrx optional date
+	 *	@param qty matched quantity
+	 */
+	public MMatchInv (MInvoiceLine iLine, Timestamp dateTrx, BigDecimal qty)
+	{
+		this (iLine.getCtx(), 0, iLine.get_TrxName());
+		setClientOrg(iLine);
+		setC_InvoiceLine_ID(iLine.getC_InvoiceLine_ID());
+		setM_InOutLine_ID(iLine.getM_InOutLine_ID());
+		if (dateTrx != null)
+			setDateTrx (dateTrx);
+		setM_Product_ID (iLine.getM_Product_ID());
+		setM_AttributeSetInstance_ID(iLine.getM_AttributeSetInstance_ID());
+		setQty (qty);
+		setProcessed(true);		//	auto
+	}	//	MMatchInv
+
+	
+	
+	/**
+	 * 	Before Save
+	 *	@param newRecord new
+	 *	@return true
+	 */
+	protected boolean beforeSave (boolean newRecord)
+	{
+		//	Set Trx Date
+		if (getDateTrx() == null)
+			setDateTrx (new Timestamp(System.currentTimeMillis()));
+		//	Set Acct Date
+		if (getDateAcct() == null)
+		{
+			Timestamp ts = getNewerDateAcct();
+			if (ts == null)
+				ts = getDateTrx();
+			setDateAcct (ts);
+		}
+		if (getM_AttributeSetInstance_ID() == 0 && getM_InOutLine_ID() != 0)
+		{
+			MInOutLine iol = new MInOutLine (getCtx(), getM_InOutLine_ID(), get_TrxName());
+			setM_AttributeSetInstance_ID(iol.getM_AttributeSetInstance_ID());
+		}
+		return true;
+	}	//	beforeSave
+	
+	/**
+	 * 	Get the later Date Acct from invoice or shipment
+	 *	@return date or null
+	 */
+	public Timestamp getNewerDateAcct()
+	{
+		String sql = "SELECT i.DateAcct "
+			+ "FROM C_InvoiceLine il"
+			+ " INNER JOIN C_Invoice i ON (i.C_Invoice_ID=il.C_Invoice_ID) "
+			+ "WHERE C_InvoiceLine_ID=?";
+		Timestamp invoiceDate = DB.getSQLValueTS(get_TrxName(), sql, getC_InvoiceLine_ID());
+		//
+		sql = "SELECT io.DateAcct "
+			+ "FROM M_InOutLine iol"
+			+ " INNER JOIN M_InOut io ON (io.M_InOut_ID=iol.M_InOut_ID) "
+			+ "WHERE iol.M_InOutLine_ID=?";
+		Timestamp shipDate = DB.getSQLValueTS(get_TrxName(), sql, getM_InOutLine_ID());
+		//
+		if (invoiceDate == null)
+			return shipDate;
+		if (shipDate == null)
+			return invoiceDate;
+		if (invoiceDate.after(shipDate))
+			return invoiceDate;
+		return shipDate;
+	}	//	getNewerDateAcct
+	
+	
+	/**
+	 * 	Before Delete
+	 *	@return true if acct was deleted
+	 */
+	protected boolean beforeDelete ()
+	{
+		if (isPosted())
+		{
+			MPeriod.testPeriodOpen(getCtx(), getDateTrx(), MDocType.DOCBASETYPE_MatchInvoice);
+			setPosted(false);
+			MFactAcct.deleteEx (Table_ID, get_ID(), get_TrxName());
+		}
+		return true;
+	}	//	beforeDelete
+
+	
+	/**
+	 * 	After Delete
+	 *	@param success success
+	 *	@return success
+	 */
+	protected boolean afterDelete (boolean success)
+	{
+		if (success)
+		{
+			// MZ Goodwill
+			// update/delete Cost Detail and recalculate Current Cost
+			MCostDetail cd = MCostDetail.get (getCtx(), "C_InvoiceLine_ID=? AND M_AttributeSetInstance_ID=?", 
+					getC_InvoiceLine_ID(), getM_AttributeSetInstance_ID(), get_TrxName());
+			if (cd != null)
+			{
+				MInOut receipt = (new MInOutLine(getCtx(),getM_InOutLine_ID(),get_TrxName())).getParent();
+				BigDecimal qty = getQty();
+				if (receipt.getMovementType().equals(MInOut.MOVEMENTTYPE_VendorReturns))
+					qty = getQty().negate();
+				//
+				BigDecimal price = cd.getAmt().divide(cd.getQty(),12,BigDecimal.ROUND_HALF_UP);
+				cd.setDeltaAmt(price.multiply(qty.negate()));
+				cd.setDeltaQty(qty.negate());
+				cd.setProcessed(false);
+				//
+				cd.setAmt(price.multiply(cd.getQty().subtract(qty)));
+				cd.setQty(cd.getQty().subtract(qty));
+				if (!cd.isProcessed())
+				{
+					MClient client = MClient.get(getCtx(), getAD_Client_ID());
+					if (client.isCostImmediate())
+						cd.process();
+				}
+				if (cd.getQty().compareTo(Env.ZERO) == 0)
+				{
+					cd.setProcessed(false);
+					cd.delete(true);
+				}
+			}
+			// end MZ
+			
+			//	Get Order and decrease invoices
+			MInvoiceLine iLine = new MInvoiceLine (getCtx(), getC_InvoiceLine_ID(), get_TrxName());
+			int C_OrderLine_ID = iLine.getC_OrderLine_ID();
+			if (C_OrderLine_ID == 0)
+			{
+				MInOutLine ioLine = new MInOutLine (getCtx(), getM_InOutLine_ID(), get_TrxName());
+				C_OrderLine_ID = ioLine.getC_OrderLine_ID();
+			}
+			//	No Order Found
+			if (C_OrderLine_ID == 0)
+				return success;
+			//	Find MatchPO
+			MMatchPO[] mPO = MMatchPO.get(getCtx(), C_OrderLine_ID, 
+				getC_InvoiceLine_ID(), get_TrxName());
+			for (int i = 0; i < mPO.length; i++)
+			{
+				if (mPO[i].getM_InOutLine_ID() == 0)
+					mPO[i].delete(true);
+				else
+				{
+					mPO[i].setC_InvoiceLine_ID(null);
+					mPO[i].save();
+				}
+			}
+		}
+		return success;
+	}	//	afterDelete
+	
+}	//	MMatchInv

Added: branches/patches_352/base/src/org/compiere/model/MMatchPO.java
===================================================================
--- branches/patches_352/base/src/org/compiere/model/MMatchPO.java	                        (rev 0)
+++ branches/patches_352/base/src/org/compiere/model/MMatchPO.java	2008-08-29 20:45:31 UTC (rev 6279)
@@ -0,0 +1,811 @@
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@... or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+
+/**
+ *	Match PO Model.
+ *	= Created when processing Shipment or Order
+ *	- Updates Order (delivered, invoiced)
+ *	- Creates PPV acct
+ *	
+ *  @author Jorg Janke
+ *  @version $Id: MMatchPO.java,v 1.3 2006/07/30 00:51:03 jjanke Exp $
+ */
+public class MMatchPO extends X_M_MatchPO
+{
+	private static final long serialVersionUID = 1L;
+
+
+	/**
+	 * 	Get PO Match with order/invoice
+	 *	@param ctx context
+	 *	@param C_OrderLine_ID order
+	 *	@param C_InvoiceLine_ID invoice
+	 *	@param trxName transaction
+	 *	@return array of matches
+	 */
+	public static MMatchPO[] get (Properties ctx, 
+		int C_OrderLine_ID, int C_InvoiceLine_ID, String trxName)
+	{
+		if (C_OrderLine_ID == 0 || C_InvoiceLine_ID == 0)
+			return new MMatchPO[]{};
+		//
+		String sql = "SELECT * FROM M_MatchPO WHERE C_OrderLine_ID=? AND C_InvoiceLine_ID=?";
+		ArrayList<MMatchPO> list = new ArrayList<MMatchPO>();
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		try
+		{
+			pstmt = DB.prepareStatement (sql, trxName);
+			pstmt.setInt (1, C_OrderLine_ID);
+			pstmt.setInt (2, C_InvoiceLine_ID);
+			rs = pstmt.executeQuery ();
+			while (rs.next ())
+				list.add (new MMatchPO (ctx, rs, trxName));
+		}
+		catch (Exception e)
+		{
+			s_log.log(Level.SEVERE, sql, e); 
+		}
+		finally
+		{
+			DB.close(rs, pstmt);
+			rs = null; pstmt = null;
+		}
+		MMatchPO[] retValue = new MMatchPO[list.size()];
+		list.toArray (retValue);
+		return retValue;
+	}	//	get
+
+	/**
+	 * 	Get PO Matches of receipt
+	 *	@param ctx context
+	 *	@param M_InOut_ID receipt
+	 *	@param trxName transaction
+	 *	@return array of matches
+	 */
+	public static MMatchPO[] getInOut (Properties ctx, 
+		int M_InOut_ID, String trxName)
+	{
+		if (M_InOut_ID == 0)
+			return new MMatchPO[]{};
+		//
+		String sql = "SELECT * FROM M_MatchPO m"
+			+ " INNER JOIN M_InOutLine l ON (m.M_InOutLine_ID=l.M_InOutLine_ID) "

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6277
          http://adempiere.svn.sourceforge.net/adempiere/?rev=6277&view=rev
Author:   tspc
Date:     2008-08-29 08:19:14 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------


Added Paths:
-----------
    contributions/AD-ext/test/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6271
          http://adempiere.svn.sourceforge.net/adempiere/?rev=6271&view=rev
Author:   hengsin
Date:     2008-08-29 03:28:59 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------
* Ported 3.4.1 VPayment dialog

Modified Paths:
--------------
    branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WPayment.java
    branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/component/Listbox.java
    branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java

Modified: branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WPayment.java
===================================================================
--- branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WPayment.java	2008-08-29 02:59:34 UTC (rev 6270)
+++ branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/apps/form/WPayment.java	2008-08-29 03:28:59 UTC (rev 6271)
@@ -1,1931 +1,1531 @@
-/******************************************************************************
- * Product: Adempiere ERP & CRM Smart Business Solution                       *
- * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved.                *
- * This program is free software; you can redistribute it and/or modify it    *
- * under the terms version 2 of the GNU General Public License as published   *
- * by the Free Software Foundation. This program is distributed in the hope   *
- * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
- * See the GNU General Public License for more details.                       *
- * You should have received a copy of the GNU General Public License along    *
- * with this program; if not, write to the Free Software Foundation, Inc.,    *
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
- * For the text or an alternative of this public license, you may reach us    *
- * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
- * or via info@... or http://www.compiere.org/license.html           *
- *****************************************************************************/
-
-/**
- * 2007, Modified by Posterita Ltd.
- */
-
-package org.adempiere.webui.apps.form;
-
-import java.math.BigDecimal;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.text.DecimalFormat;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.logging.Level;
-
-import org.adempiere.webui.component.Button;
-import org.adempiere.webui.component.Datebox;
-import org.adempiere.webui.component.Label;
-import org.adempiere.webui.component.ListItem;
-import org.adempiere.webui.component.Listbox;
-import org.adempiere.webui.component.Textbox;
-import org.adempiere.webui.component.VerticalBox;
-import org.adempiere.webui.component.Window;
-import org.adempiere.webui.editor.WButtonEditor;
-import org.adempiere.webui.window.FDialog;
-import org.compiere.model.GridTab;
-import org.compiere.model.MCash;
-import org.compiere.model.MCashLine;
-import org.compiere.model.MConversionRate;
-import org.compiere.model.MInvoice;
-import org.compiere.model.MOrder;
-import org.compiere.model.MPayment;
-import org.compiere.model.MPaymentValidate;
-import org.compiere.model.MRole;
-import org.compiere.model.X_C_Order;
-import org.compiere.process.DocAction;
-import org.compiere.util.CLogger;
-import org.compiere.util.DB;
-import org.compiere.util.DisplayType;
-import org.compiere.util.Env;
-import org.compiere.util.KeyNamePair;
-import org.compiere.util.Msg;
-import org.compiere.util.TimeUtil;
-import org.compiere.util.ValueNamePair;
-import org.zkoss.zk.ui.event.Event;
-import org.zkoss.zk.ui.event.EventListener;
-import org.zkoss.zk.ui.event.Events;
-import org.zkoss.zul.Hbox;
-import org.zkoss.zul.Separator;
-
-/**
- *	Display (and process) Payment Options.
- *  <pre>
- *  Payment Rule
- *  -B- Cash          (Date)          -> Cash Entry
- *  -P- Payment Term  (Term)
- *  -S- Check         (Routing, ..)   -> Payment Entry
- *  -K- CreditCard    (No)            -> Payment Entry
- *  -U- ACH Transfer  (Routing)       -> Payment Entry
- *
- *  When processing:
- *  - If an invoice is a S/K/U, but has no Payment Entry, it is changed to P
- *  - If an invoive is B and has no Cash Entry, it is created
- *  - An invoice is "Open" if it is "P" and no Payment
- *
- *  Entry:
- *  - If not processed, an invoice has no Cash or Payment entry
- *  - The entry is created, during "Online" and when Saving
- *
- *  Changes/Reversals:
- *  - existing Cash Entries are reversed and newly created
- *  - existing Payment Entries are not changed and then "hang there" and need to be allocated
- *  </pre>
- *
- * 	@author 	Niraj Sohun
- * 				Payment Rule : Based on VPayment
- */
-
-public class WPayment extends Window implements EventListener
-{
-	private static final long serialVersionUID = 1L;
-
-	/**	Window						*/
-	private int m_WindowNo = 0;
-	
-	/**	Tab							*/
-	private GridTab m_mTab;
-
-	//	Data from Order/Invoice
-	private String              m_DocStatus = null;
-	
-	/** Start Payment Rule          */
-	private String m_PaymentRule = "";
-	
-	/** Start Payment Term          */
-	private int	m_C_PaymentTerm_ID = 0;
-	
-	/** Start Acct Date             */
-	private Timestamp m_DateAcct = null;
-	
-	/** Start Payment               */
-	private int m_C_Payment_ID = 0;
-	
-	private MPayment m_mPayment = null;
-	private MPayment m_mPaymentOriginal = null;
-	
-	/** Start CashBook Line         */
-	private int m_C_CashLine_ID = 0;
-	
-	private MCashLine m_cashLine = null;
-	
-	/** Start CreditCard            */
-	private String m_CCType = "";
-	
-	/** Start Bank Account			*/
-	private int m_C_BankAccount_ID = 0;
-	
-	/** Start CashBook              */
-	private int m_C_CashBook_ID = 0;
-
-	/** Is SOTrx					*/
-	private boolean m_isSOTrx = true;
-
-	/** Invoice Currency              */
-	private int	m_C_Currency_ID = 0;
-	
-	private int m_AD_Client_ID = 0;
-	private int m_AD_Org_ID = 0;
-	private int m_C_BPartner_ID = 0;
-	
-	//	Payment Amount
-	private BigDecimal m_Amount = Env.ZERO;
-
-	private boolean 			m_initOK = false;
-	
-	/** Only allow changing Rule        */
-	private boolean m_onlyRule = false;
-	
-	private DecimalFormat m_Format = DisplayType.getNumberFormat(DisplayType.Amount);
-	
-	//	EMU Currencies
-	private static Hashtable<Integer,KeyNamePair> s_Currencies = null;	
-	
-	private boolean	m_needSave = false;
-	
-	/**	Logger			*/
-	private static CLogger log = CLogger.getCLogger(WPayment.class);
-
-	/**	Date Editor 	*/
-	Datebox bDateField = new Datebox();
-
-	private Textbox bAmountField = new Textbox();
-	private Textbox sAmountField = new Textbox();
-	private Textbox kAmountField = new Textbox();
-	private Textbox kNumberField = new Textbox();
-	private Textbox kExpField = new Textbox();
-	private Textbox kApprovalField = new Textbox();
-	private Textbox sRoutingField = new Textbox();
-	private Textbox sNumberField = new Textbox();
-	private Textbox sCheckField = new Textbox();
-	private Textbox tRoutingField = new Textbox();
-	private Textbox tNumberField = new Textbox();
-
-	private Label kStatus = new Label();
-	private Label sStatus = new Label();
-	private Label tStatus = new Label();
-	private Label bCurrencyLabel = new Label();
-	private Label sCurrencyLabel = new Label();
-	private Label paymentLabel = new Label();
-	private Label kNumberLabel = new Label();
-	private Label kExpLabel = new Label();
-	private Label kApprovalLabel = new Label();
-	private Label kAmountLabel = new Label();
-	private Label kTypeLabel = new Label();
-	private Label tRoutingText = new Label();
-	private Label tNumberText = new Label();	
-	private Label tAccountLabel = new Label();
-	private Label sBankAccountLabel = new Label();
-	private Label sAmountLabel = new Label();
-	private Label sRoutingLabel = new Label();
-	private Label sNumberLabel = new Label();
-	private Label sCheckLabel = new Label();
-	private Label pTermLabel = new Label();
-	private Label bAmountLabel = new Label();
-	private Label bDateLabel = new Label();
-	private Label bCashBookLabel = new Label();
-
-	private Listbox kTypeCombo = new Listbox();
-	private Listbox bCurrencyCombo = new Listbox();
-	private Listbox sCurrencyCombo = new Listbox();
-	private Listbox paymentCombo = new Listbox();
-	private Listbox pTermCombo = new Listbox();
-	private Listbox tAccountCombo = new Listbox();
-	private Listbox sBankAccountCombo = new Listbox();
-	private Listbox bCashBookCombo = new Listbox();
-	
-	private Button kOnline = new Button();
-	private Button sOnline = new Button();
-	private Button btnOk = new Button();
-	private Button btnCancel = new Button();
-	private Button tOnline = new Button();
-	
-	private VerticalBox mainPanel = new VerticalBox();
-	private Hbox northPanel = new Hbox();
-	private VerticalBox centerPanel = new VerticalBox();
-	private VerticalBox kPanel = new VerticalBox();
-	private VerticalBox tPanel = new VerticalBox();
-	private VerticalBox sPanel = new VerticalBox();
-	private Hbox pPanel = new Hbox();
-	private VerticalBox bPanel = new VerticalBox();
-	
-	/**
-	 *	Constructor
-	 *
-	 *	@param WindowNo	owning window
-	 *  @param mTab     owning tab
-	 *	@param button	button with access information
-	 */
-	
-	public WPayment (int WindowNo, GridTab mTab, WButtonEditor button)
-	{
-		super();
-		
-		m_WindowNo = WindowNo;
-		m_isSOTrx = "Y".equals(Env.getContext(Env.getCtx(), WindowNo, "IsSOTrx"));
-		m_mTab = mTab;
-		
-		try
-		{
-			//bDateField = new WDateEditor("DateAcc", "", false, false, true);
-			bDateField.setValue(new Date(System.currentTimeMillis()));
-			
-			jbInit();
-			m_initOK = dynInit(button); // Null Pointer if order/invoice not saved yet
-		}
-		catch(Exception ex)
-		{
-			log.log(Level.SEVERE, "WPayment", ex);
-			m_initOK = false;
-		}
-
-		this.setVisible(true);
-		//show
-	}	//	VPayment
-	
-	/**
-	 *	Static Init
-	 *  @throws Exception
-	 */
-	
-	private void jbInit() throws Exception
-	{
-		this.setBorder("normal");
-		this.setWidth("400px");
-		this.setTitle("Payment");
-		this.setClosable(true);
-		this.appendChild(mainPanel);
-		
-		centerPanel.setWidth("100%");
-		
-		mainPanel.setWidth("100%");
-		mainPanel.appendChild(northPanel);
-		mainPanel.appendChild(new Separator());
-		mainPanel.appendChild(centerPanel);
-		
-		paymentLabel.setValue(Msg.translate(Env.getCtx(), "PaymentRule"));
-		
-		paymentCombo.setRows(0);
-		paymentCombo.setMold("select");
-		paymentCombo.addEventListener(Events.ON_SELECT, this);
-		
-		northPanel.setWidth("100%");
-		northPanel.setWidths("40%, 60%");
-		northPanel.appendChild(paymentLabel);
-		northPanel.appendChild(paymentCombo);
-		
-		// Credit Card
-		
-		kPanel.setWidth("100%");
-		
-		kTypeLabel.setValue(Msg.translate(Env.getCtx(), "CreditCardType"));
-		kNumberLabel.setValue(Msg.translate(Env.getCtx(), "CreditCardNumber"));
-		kExpLabel.setValue(Msg.getMsg(Env.getCtx(), "Expires"));
-		kApprovalLabel.setValue(Msg.translate(Env.getCtx(), "VoiceAuthCode"));
-		kAmountLabel.setValue(Msg.getMsg(Env.getCtx(), "Amount"));
-		kAmountField.setText("");
-		kOnline.setLabel(Msg.getMsg(Env.getCtx(), "Online"));
-		kOnline.addEventListener(Events.ON_CLICK, this);
-		kStatus.setValue(" ");
-		centerPanel.appendChild(kPanel);
-		
-		Hbox boxKType = new Hbox();
-		
-		kTypeCombo.setRows(0);
-		kTypeCombo.setMold("select");
-		kTypeCombo.addEventListener(Events.ON_SELECT, this);
-		
-		boxKType.setWidth("100%");
-		boxKType.setWidths("50%, 50%");
-		boxKType.appendChild(kTypeLabel);
-		boxKType.appendChild(kTypeCombo);
-		kPanel.appendChild(boxKType);
-		
-		Hbox boxKNumber = new Hbox();
-		boxKNumber.setWidth("100%");
-		boxKNumber.setWidths("50%, 50%");
-		boxKNumber.appendChild(kNumberLabel);
-		boxKNumber.appendChild(kNumberField);
-		kPanel.appendChild(boxKNumber);
-		
-		Hbox boxKExp = new Hbox();
-		boxKExp.setWidth("100%");
-		boxKExp.setWidths("50%, 50%");
-		boxKExp.appendChild(kExpLabel);
-		boxKExp.appendChild(kExpField);
-		kPanel.appendChild(boxKExp);
-		
-		Hbox boxKAmount = new Hbox();
-		boxKAmount.setWidth("100%");
-		boxKAmount.setWidths("50%, 50%");
-		boxKAmount.appendChild(kAmountLabel);
-		boxKAmount.appendChild(kAmountField);
-		kPanel.appendChild(boxKAmount);
-		
-		Hbox boxKApproval = new Hbox();
-		boxKApproval.setWidth("100%");
-		boxKApproval.setWidths("50%, 50%");
-		boxKApproval.appendChild(kApprovalLabel);
-		boxKApproval.appendChild(kApprovalField);
-		kPanel.appendChild(boxKApproval);
-		
-		kPanel.appendChild(kStatus);
-		kPanel.appendChild(kOnline);
-		
-		// Direct Debit/Credit
-		
-		tPanel.setWidth("100%");
-		
-		tAccountLabel.setValue(Msg.translate(Env.getCtx(), "C_BP_BankAccount_ID"));
-		//tRoutingField.setColumns(8);
-		//tNumberField.setColumns(10);
-		tRoutingText.setValue(Msg.translate(Env.getCtx(), "RoutingNo"));
-		tNumberText.setValue(Msg.translate(Env.getCtx(), "AccountNo"));
-		tOnline.setLabel(Msg.getMsg(Env.getCtx(), "Online"));
-		tOnline.addEventListener(Events.ON_CLICK, this);
-		tStatus.setValue(" ");
-		centerPanel.appendChild(tPanel);
-		
-		Hbox boxTAccount = new Hbox();
-		
-		tAccountCombo.setRows(0);
-		tAccountCombo.setMold("select");
-		tAccountCombo.addEventListener(Events.ON_SELECT, this);
-		
-		boxTAccount.setWidth("100%");
-		boxTAccount.setWidths("45%, 55%");
-		boxTAccount.appendChild(tAccountLabel);
-		boxTAccount.appendChild(tAccountCombo);
-		tPanel.appendChild(boxTAccount);
-		
-		Hbox boxTRouting = new Hbox();
-		boxTRouting.setWidth("100%");
-		boxTRouting.setWidths("45%, 55%");
-		boxTRouting.appendChild(tRoutingText);
-		boxTRouting.appendChild(tRoutingField);
-		tPanel.appendChild(boxTRouting);
-
-		Hbox boxTNumber = new Hbox();
-		boxTNumber.setWidth("100%");
-		boxTNumber.setWidths("45%, 55%");
-		boxTNumber.appendChild(tNumberText);
-		boxTNumber.appendChild(tNumberField);
-		tPanel.appendChild(boxTNumber);
-		
-		tPanel.appendChild(tStatus);
-		tPanel.appendChild(tOnline);
-		
-		// Cheque
-		
-		sPanel.setWidth("100%");
-		
-		sBankAccountLabel.setValue(Msg.translate(Env.getCtx(), "C_BankAccount_ID"));
-		sAmountLabel.setValue(Msg.getMsg(Env.getCtx(), "Amount"));
-		sAmountField.setText("");
-		sRoutingLabel.setValue(Msg.translate(Env.getCtx(), "RoutingNo"));
-		sNumberLabel.setValue(Msg.translate(Env.getCtx(), "AccountNo"));
-		sCheckLabel.setValue(Msg.translate(Env.getCtx(), "CheckNo"));
-		//sCheckField.setColumns(8);
-		sCurrencyLabel.setValue(Msg.translate(Env.getCtx(), "C_Currency_ID"));
-		//sNumberField.setPreferredSize(new Dimension(100, 21));
-		//sRoutingField.setPreferredSize(new Dimension(70, 21));
-		sStatus.setValue(" ");
-		sOnline.setLabel(Msg.getMsg(Env.getCtx(), "Online"));
-		sOnline.addEventListener(Events.ON_CLICK, this);
-		centerPanel.appendChild(sPanel);
-		
-		Hbox boxSBankAccount = new Hbox();
-		
-		sBankAccountCombo.setRows(0);
-		sBankAccountCombo.setMold("select");
-		sBankAccountCombo.addEventListener(Events.ON_SELECT, this);
-				
-		boxSBankAccount.setWidth("100%");
-		boxSBankAccount.setWidths("40%, 60%");
-		boxSBankAccount.appendChild(sBankAccountLabel);
-		boxSBankAccount.appendChild(sBankAccountCombo);
-		sPanel.appendChild(boxSBankAccount);
-		
-		Hbox boxSCurrency = new Hbox();
-		
-		sCurrencyCombo.setRows(0);
-		sCurrencyCombo.setMold("select");
-		sCurrencyCombo.addEventListener(Events.ON_SELECT, this);
-		
-		boxSCurrency.setWidth("100%");
-		boxSCurrency.setWidths("40%, 60%");
-		boxSCurrency.appendChild(sCurrencyLabel);
-		boxSCurrency.appendChild(sCurrencyCombo);
-		sPanel.appendChild(boxSCurrency);
-		
-		Hbox boxSAmount = new Hbox();
-		boxSAmount.setWidth("100%");
-		boxSAmount.setWidths("40%, 60%");
-		boxSAmount.appendChild(sAmountLabel);
-		boxSAmount.appendChild(sAmountField);
-		sPanel.appendChild(boxSAmount);
-		
-		Hbox boxSRouting = new Hbox();
-		boxSRouting.setWidth("100%");
-		boxSRouting.setWidths("40%, 60%");
-		boxSRouting.appendChild(sRoutingLabel);
-		boxSRouting.appendChild(sRoutingField);
-		sPanel.appendChild(boxSRouting);
-		
-		Hbox boxSNumber = new Hbox();
-		boxSNumber.setWidth("100%");
-		boxSNumber.setWidths("40%, 60%");
-		boxSNumber.appendChild(sNumberLabel);
-		boxSNumber.appendChild(sNumberField);
-		sPanel.appendChild(boxSNumber);
-		
-		Hbox boxSCheck = new Hbox();
-		boxSCheck.setWidth("100%");
-		boxSCheck.setWidths("40%, 60%");
-		boxSCheck.appendChild(sCheckLabel);
-		boxSCheck.appendChild(sCheckField);
-		sPanel.appendChild(boxSCheck);
-		
-		sPanel.appendChild(sOnline);
-		sPanel.appendChild(sStatus);
-		
-		// Cash
-		
-		pPanel.setWidth("100%");
-		pPanel.setWidths("40%, 60%");
-		
-		pTermLabel.setValue(Msg.translate(Env.getCtx(), "C_PaymentTerm_ID"));
-		centerPanel.appendChild(pPanel);
-		
-		pTermCombo.setRows(0);
-		pTermCombo.setMold("select");
-		pTermCombo.addEventListener(Events.ON_SELECT, this);
-		
-		pPanel.appendChild(pTermLabel);
-		pPanel.appendChild(pTermCombo);
-		
-		//
-		
-		bPanel.setWidth("100%");
-		
-		bCashBookLabel.setValue(Msg.translate(Env.getCtx(), "C_CashBook_ID"));
-		bCurrencyLabel.setValue(Msg.translate(Env.getCtx(), "C_Currency_ID"));
-		bAmountLabel.setValue(Msg.getMsg(Env.getCtx(), "Amount"));
-		bAmountField.setText("");
-		bDateLabel.setValue(Msg.translate(Env.getCtx(), "DateAcct"));
-		centerPanel.appendChild(bPanel);
-		
-		Hbox boxBCashBook = new Hbox();
-		
-		bCashBookCombo.setRows(0);
-		bCashBookCombo.setMold("select");
-		bCashBookCombo.addEventListener(Events.ON_SELECT, this);
-		
-		boxBCashBook.setWidth("100%");
-		boxBCashBook.setWidths("40%, 60%");
-		boxBCashBook.appendChild(bCashBookLabel);
-		boxBCashBook.appendChild(bCashBookCombo);
-		bPanel.appendChild(boxBCashBook);
-		
-		Hbox boxBCurrency = new Hbox();
-		
-		bCurrencyCombo.setRows(0);
-		bCurrencyCombo.setMold("select");
-		bCurrencyCombo.addEventListener(Events.ON_SELECT, this);
-		
-		boxBCurrency.setWidth("100%");
-		boxBCurrency.setWidths("40%, 60%");
-		boxBCurrency.appendChild(bCurrencyLabel);
-		boxBCurrency.appendChild(bCurrencyCombo);
-		bPanel.appendChild(boxBCurrency);
-		
-		Hbox boxBDate = new Hbox();
-		boxBDate.setWidth("100%");
-		boxBDate.setWidths("40%, 60%");
-		boxBDate.appendChild(bDateLabel);
-		boxBDate.appendChild(bDateField);
-		bPanel.appendChild(boxBDate);
-		
-		Hbox boxBAmount = new Hbox();
-		boxBAmount.setWidth("100%");
-		boxBAmount.setWidths("40%, 60%");
-		boxBAmount.appendChild(bAmountLabel);
-		boxBAmount.appendChild(bAmountField);
-		bPanel.appendChild(boxBAmount);
-		
-		Hbox boxButtons = new Hbox();
-		
-		btnCancel.setImage("/images/Cancel24.png");
-		btnCancel.addEventListener(Events.ON_CLICK, this);
-		btnOk.setImage("/images/Ok24.png");
-		btnOk.addEventListener(Events.ON_CLICK, this);
-		
-		boxButtons.appendChild(btnCancel);
-		boxButtons.appendChild(btnOk);
-		mainPanel.appendChild(new Separator());
-		mainPanel.appendChild(boxButtons);
-	}
-
-	/**************************************************************************
-	 *	Dynamic Init.
-	 *		B (Cash)		(Currency)
-	 *		K (CreditCard)  Type, Number, Exp, Approval
-	 *		L (DirectDebit)	BPartner_Bank
-	 *		P (PaymentTerm)	PaymentTerm
-	 *		S (Check)		(Currency) CheckNo, Routing
-	 *
-	 *	Currencies are shown, if member of EMU
-	 *  @param button payment type button
-	 *  @return true if init OK
-	 *  @throws Exception
-	 */
-	
-	private boolean dynInit (WButtonEditor button) throws Exception
-	{
-		m_DocStatus = (String)m_mTab.getValue("DocStatus");
-		log.config(m_DocStatus);
-
-		if (m_mTab.getValue("C_BPartner_ID") == null)
-		{
-			FDialog.error(0, this, "SaveErrorRowNotFound");
-			return false;
-		}
-
-		//	Is the Trx posted?
-		//	String Posted = (String)m_mTab.getValue("Posted");
-		//	if (Posted != null && Posted.equals("Y"))
-		//		return false;
-
-		//  DocStatus
-		
-		m_DocStatus = (String)m_mTab.getValue("DocStatus");
-		
-		if (m_DocStatus == null)
-			m_DocStatus = "";
-		
-		//	Is the Trx closed?		Reversed / Voided / Cloased
-		
-		if (m_DocStatus.equals("RE") || m_DocStatus.equals("VO") || m_DocStatus.equals("CL"))
-			return false;
-		
-		//  Document is not complete - allow to change the Payment Rule only
-		if (m_DocStatus.equals("CO") || m_DocStatus.equals("WP") )
-			m_onlyRule = false;
-		else
-			m_onlyRule = true;
-		
-		//	PO only  Rule
-		
-		if (!m_onlyRule		//	Only order has Warehouse
-			&& !m_isSOTrx && m_mTab.getValue("M_Warehouse_ID") != null)
-			m_onlyRule = true;
-		
-		centerPanel.setVisible(!m_onlyRule);
-		
-		//  Amount
-		
-		m_Amount = (BigDecimal)m_mTab.getValue("GrandTotal");
-		
-		if (!m_onlyRule && m_Amount.compareTo(Env.ZERO) == 0)
-		{
-			FDialog.error(m_WindowNo, this, "PaymentZero");
-			return false;
-		}
-		
-		bAmountField.setText(m_Format.format(m_Amount));
-		sAmountField.setText(m_Format.format(m_Amount));
-		kAmountField.setText(m_Format.format(m_Amount));
-
-		/**
-		 *	Get Data from Grid
-		 */
-		
-		m_AD_Client_ID = ((Integer)m_mTab.getValue("AD_Client_ID")).intValue();
-		m_AD_Org_ID = ((Integer)m_mTab.getValue("AD_Org_ID")).intValue();
-		m_C_BPartner_ID = ((Integer)m_mTab.getValue("C_BPartner_ID")).intValue();
-		m_PaymentRule = (String)m_mTab.getValue("PaymentRule");
-		m_C_Currency_ID = ((Integer)m_mTab.getValue("C_Currency_ID")).intValue();
-		m_DateAcct = (Timestamp)m_mTab.getValue("DateAcct");
-		
-		if (m_mTab.getValue("C_PaymentTerm_ID") != null)
-			m_C_PaymentTerm_ID = ((Integer)m_mTab.getValue("C_PaymentTerm_ID")).intValue();
-		
-		//  Existing Payment
-		
-		if (m_mTab.getValue("C_Payment_ID") != null)
-		{
-			m_C_Payment_ID = ((Integer)m_mTab.getValue("C_Payment_ID")).intValue();
-		
-			if (m_C_Payment_ID != 0)
-			{
-				m_mPayment = new MPayment(Env.getCtx(), m_C_Payment_ID, null);
-				m_mPaymentOriginal = new MPayment(Env.getCtx(), m_C_Payment_ID, null);	//	full copy
-			
-				//  CreditCard
-				m_CCType = m_mPayment.getCreditCardType();
-				kNumberField.setText(m_mPayment.getCreditCardNumber());
-				kExpField.setText(m_mPayment.getCreditCardExp(null));
-				kApprovalField.setText(m_mPayment.getVoiceAuthCode());
-				kStatus.setValue(m_mPayment.getR_PnRef());
-				kAmountField.setText(m_Format.format(m_mPayment.getPayAmt()));
-
-				//	if approved/paid, don't let it change
-				
-				kTypeCombo.setEnabled(!m_mPayment.isApproved());
-				kNumberField.setEnabled(!m_mPayment.isApproved());
-				kExpField.setEnabled(!m_mPayment.isApproved());
-				kApprovalField.setEnabled(!m_mPayment.isApproved());
-				kOnline.setEnabled(!m_mPayment.isApproved());
-				kAmountField.setEnabled(!m_mPayment.isApproved());
-				
-				//  Check
-				
-				m_C_BankAccount_ID = m_mPayment.getC_BankAccount_ID();
-				sRoutingField.setText(m_mPayment.getRoutingNo());
-				sNumberField.setText(m_mPayment.getAccountNo());
-				sCheckField.setText(m_mPayment.getCheckNo());
-				sStatus.setValue(m_mPayment.getR_PnRef());
-				sAmountField.setText(m_Format.format(m_mPayment.getPayAmt()));
-				
-				//  Transfer
-				
-				tRoutingField.setText(m_mPayment.getRoutingNo());
-				tNumberField.setText(m_mPayment.getAccountNo());
-				tStatus.setValue(m_mPayment.getR_PnRef());
-			}
-		}
-		if (m_mPayment == null)
-		{
-			m_mPayment = new MPayment (Env.getCtx (), 0, null);
-			m_mPayment.setAD_Org_ID(m_AD_Org_ID);
-			m_mPayment.setAmount (m_C_Currency_ID, m_Amount);
-		}
-
-		//  Existing Cashbook entry
-		
-		m_cashLine = null;
-		m_C_CashLine_ID = 0;
-		
-		if (m_mTab.getValue("C_CashLine_ID") != null)
-		{
-			m_C_CashLine_ID = ((Integer)m_mTab.getValue("C_CashLine_ID")).intValue();
-		
-			if (m_C_CashLine_ID == 0)
-				m_cashLine = null;
-			else
-			{
-				m_cashLine = new MCashLine (Env.getCtx(), m_C_CashLine_ID, null);
-				m_DateAcct = m_cashLine.getStatementDate();
-				bAmountField.setText(m_cashLine.getAmount().toString());
-			}
-		}
-
-		//	Accounting Date
-		
-		bDateField.setValue(m_DateAcct);
-
-		if (s_Currencies == null)
-			loadCurrencies();
-
-		//	Is the currency an EMU currency?
-
-		Integer C_Currency_ID = new Integer(m_C_Currency_ID);
-		
-		if (s_Currencies.containsKey(C_Currency_ID))
-		{
-			Enumeration en = s_Currencies.keys();
-			while (en.hasMoreElements())
-			{
-				Object key = en.nextElement();
-				bCurrencyCombo.appendItem(key.toString(), s_Currencies.get(key));
-				sCurrencyCombo.appendItem(key.toString(), s_Currencies.get(key));
-			}
-
-			ListItem listitem = new ListItem();
-			listitem.setValue(s_Currencies.get(C_Currency_ID));
-
-			sCurrencyCombo.addEventListener(Events.ON_SELECT, this);
-			sCurrencyCombo.setSelectedItem(listitem);
-			
-			bCurrencyCombo.addEventListener(Events.ON_SELECT, this);
-			bCurrencyCombo.setSelectedItem(listitem);
-		}
-		else	//	No EMU Currency
-		{
-			bCurrencyLabel.setVisible(false);	//	Cash
-			bCurrencyCombo.setVisible(false);
-			sCurrencyLabel.setVisible(false);	//	Check
-			sCurrencyCombo.setVisible(false);
-		}
-
-		/**
-		 *	Payment Combo
-		 */
-		
-		if (m_PaymentRule == null)
-			m_PaymentRule = "";
-		
-		ValueNamePair vp = null;
-		HashMap values = button.getValues();
-		Object[] a = values.keySet().toArray();
-		
-		for (int i = 0; i < a.length; i++)
-		{			
-			String PaymentRule = (String)a[i];		//	used for Panel selection
-			
-			if (X_C_Order.PAYMENTRULE_DirectDebit.equals(PaymentRule)			//	SO
-				&& !m_isSOTrx)
-				continue;
-			else if (X_C_Order.PAYMENTRULE_DirectDeposit.equals(PaymentRule)	//	PO 
-				&& m_isSOTrx)
-				continue;
-                                                
-			ValueNamePair pp = new ValueNamePair(PaymentRule, (String)values.get(a[i]));
-			paymentCombo.appendItem(pp.getName(), pp);
-			
-			if (PaymentRule.toString().equals(m_PaymentRule))	//	to select
-				vp = pp;
-		}
-
-		//	Set PaymentRule
-		
-		paymentCombo.addEventListener(Events.ON_SELECT, this);
-		
-		if (vp != null)
-		{
-			for (int i = 0; i < paymentCombo.getItemCount(); i++)
-			{
-				ListItem item = paymentCombo.getItemAtIndex(i);
-				ValueNamePair v = (ValueNamePair)item.getValue();
-				
-				if (v == vp)
-				{
-					paymentCombo.setSelectedIndex(i);
-					break;
-				}
-			}
-		}
-		
-		Event evt = new Event(Events.ON_SELECT, paymentCombo);
-		onEvent(evt);
-
-		/**
-		 * 	Load Payment Terms
-		 */
-		
-		String SQL = MRole.getDefault().addAccessSQL(
-			"SELECT C_PaymentTerm_ID, Name FROM C_PaymentTerm WHERE IsActive='Y' ORDER BY Name",
-			"C_PaymentTerm", MRole.SQL_NOTQUALIFIED, MRole.SQL_RO);
-		
-		KeyNamePair kp = null;
-		
-		try
-		{
-			PreparedStatement pstmt = DB.prepareStatement(SQL, null);
-			ResultSet rs = pstmt.executeQuery();
-			while (rs.next())
-			{
-				int key = rs.getInt(1);
-				String name = rs.getString(2);
-				KeyNamePair pp = new KeyNamePair(key, name);
-				pTermCombo.appendItem(pp.getName(), pp);
-				
-				if (key == m_C_PaymentTerm_ID)
-					kp = pp;
-			}
-			rs.close();
-			pstmt.close();
-		}
-		catch (SQLException ept)
-		{
-			log.log(Level.SEVERE, SQL, ept);
-		}
-		
-		//	Set Selection
-		
-		if (kp != null)
-		{
-			for (int i = 0; i < pTermCombo.getItemCount(); i++)
-			{
-				ListItem item = pTermCombo.getItemAtIndex(i);
-				KeyNamePair k = (KeyNamePair)item.getValue();
-				
-				if (k == kp)
-				{
-					pTermCombo.setSelectedIndex(i);
-					break;
-				}
-			}
-		}
-		
-		/**
-		 * 	Load Accounts
-		 */
-		
-		SQL = "SELECT a.C_BP_BankAccount_ID, NVL(b.Name, ' ')||a.AccountNo AS Acct "
-			+ "FROM C_BP_BankAccount a,C_Bank b "
-			+ "WHERE C_BPartner_ID=? AND a.IsActive='Y'";
-		
-		kp = null;
-		
-		try
-		{
-			PreparedStatement pstmt = DB.prepareStatement(SQL, null);
-			pstmt.setInt(1, m_C_BPartner_ID);
-			ResultSet rs = pstmt.executeQuery();
-		
-			while (rs.next())
-			{
-				int key = rs.getInt(1);
-				String name = rs.getString(2);
-				KeyNamePair pp = new KeyNamePair(key, name);
-				tAccountCombo.appendItem(pp.getName(), pp);
-				//	kp = pp;
-			}
-			rs.close();
-			pstmt.close();
-		}
-		catch (SQLException eac)
-		{
-			log.log(Level.SEVERE, SQL, eac);
-		}
-		
-		//	Set Selection
-		
-		if (kp != null)
-		{
-			for (int i = 0; i < tAccountCombo.getItemCount(); i++)
-			{
-				ListItem item = tAccountCombo.getItemAtIndex(i);
-				KeyNamePair k = (KeyNamePair)item.getValue();
-				
-				if (k == kp)
-				{
-					tAccountCombo.setSelectedIndex(i);
-					break;
-				}
-			}
-		}
-		
-		/**
-		 *	Load Credit Cards
-		 */
-		
-		ValueNamePair[] ccs = m_mPayment.getCreditCards();
-		vp = null;
-		
-		for (int i = 0; i < ccs.length; i++)
-		{
-			kTypeCombo.appendItem(ccs[i].getName(), ccs[i]);
-			
-			if (ccs[i].getValue().equals(m_CCType))
-				vp = ccs[i];
-		}
-		
-		//	Set Selection
-		
-		if (vp != null)
-		{
-			for (int i = 0; i < kTypeCombo.getItemCount(); i++)
-			{
-				ListItem item = kTypeCombo.getItemAtIndex(i);
-				ValueNamePair v = (ValueNamePair)item.getValue();
-				
-				if (v == vp)
-				{
-					kTypeCombo.setSelectedIndex(i);
-					break;
-				}
-			}
-		}
-		
-		/**
-		 *  Load Bank Accounts
-		 */
-		
-		SQL = MRole.getDefault().addAccessSQL(
-			"SELECT C_BankAccount_ID, Name || ' ' || AccountNo, IsDefault "
-			+ "FROM C_BankAccount ba"
-			+ " INNER JOIN C_Bank b ON (ba.C_Bank_ID=b.C_Bank_ID) "
-			+ "WHERE b.IsActive='Y'",
-			"ba", MRole.SQL_FULLYQUALIFIED, MRole.SQL_RO);
-		
-		kp = null;
-		
-		try
-		{
-			PreparedStatement pstmt = DB.prepareStatement(SQL, null);
-			ResultSet rs = pstmt.executeQuery();
-			while (rs.next())
-			{
-				int key = rs.getInt(1);
-				String name = rs.getString(2);
-				KeyNamePair pp = new KeyNamePair(key, name);
-				sBankAccountCombo.appendItem(pp.getName(), pp);
-				
-				if (key == m_C_BankAccount_ID)
-					kp = pp;
-				
-				if (kp == null && rs.getString(3).equals("Y"))    //  Default
-					kp = pp;
-			}
-			rs.close();
-			pstmt.close();
-		}
-		catch (SQLException ept)
-		{
-			log.log(Level.SEVERE, SQL, ept);
-		}
-		
-		//	Set Selection
-		
-		if (kp != null)
-		{
-			for (int i = 0; i < sBankAccountCombo.getItemCount(); i++)
-			{
-				ListItem item = sBankAccountCombo.getItemAtIndex(i);
-				KeyNamePair k = (KeyNamePair)item.getValue();
-				
-				if (k == kp)
-				{
-					sBankAccountCombo.setSelectedIndex(i);
-					break;
-				}
-			}
-		}
-
-		/**
-		 *  Load Cash Books
-		 */
-		
-		SQL = MRole.getDefault().addAccessSQL(
-			"SELECT C_CashBook_ID, Name, AD_Org_ID FROM C_CashBook WHERE IsActive='Y'",
-			"C_CashBook", MRole.SQL_NOTQUALIFIED, MRole.SQL_RO);
-		
-		kp = null;
-		
-		try
-		{
-			PreparedStatement pstmt = DB.prepareStatement(SQL, null);
-			ResultSet rs = pstmt.executeQuery();
-			while (rs.next())
-			{
-				int key = rs.getInt(1);
-				String name = rs.getString(2);
-				KeyNamePair pp = new KeyNamePair(key, name);
-				bCashBookCombo.appendItem(pp.getName(), pp);
-						
-				if (key == m_C_CashBook_ID)
-					kp = pp;
-				
-				if (kp == null && key == m_AD_Org_ID)       //  Default Org
-					kp = pp;
-			}
-			rs.close();
-			pstmt.close();
-		}
-		catch (SQLException epc)
-		{
-			log.log(Level.SEVERE, SQL, epc);
-		}
-		
-		//	Set Selection
-		
-		if (kp != null)
-		{
-			for (int i = 0; i < bCashBookCombo.getItemCount(); i++)
-			{
-				ListItem item = bCashBookCombo.getItemAtIndex(i);
-				KeyNamePair k = (KeyNamePair)item.getValue();
-				
-				if (k == kp)
-				{
-					bCashBookCombo.setSelectedIndex(i);
-					break;
-				}
-			}
-			
-			if (m_C_CashBook_ID == 0)
-				m_C_CashBook_ID = kp.getKey();  //  set to default to avoid 'cashbook changed' message
-		}
-
-		return true;
-	}	//	dynInit
-	
-	/**
-	 *	Init OK to be able to make changes?
-	 *  @return true if init OK
-	 */
-
-	public boolean isInitOK()
-	{
-		return m_initOK;
-	}	//	isInitOK
-
-	/**
-	 *	Fill s_Currencies with EMU currencies
-	 */
-	
-	private void loadCurrencies()
-	{
-		s_Currencies = new Hashtable<Integer,KeyNamePair>(12);	//	Currenly only 10+1
-		String SQL = "SELECT C_Currency_ID, ISO_Code FROM C_Currency "
-			+ "WHERE (IsEMUMember='Y' AND EMUEntryDate<SysDate) OR IsEuro='Y' "
-			+ "ORDER BY 2";
-
-		try
-		{
-			PreparedStatement pstmt = DB.prepareStatement(SQL, null);
-			ResultSet rs = pstmt.executeQuery();
-			while (rs.next())
-			{
-				int id = rs.getInt(1);
-				String name = rs.getString(2);
-				s_Currencies.put(new Integer(id), new KeyNamePair(id, name));
-			}
-			rs.close();
-			pstmt.close();
-		}
-		catch (SQLException e)
-		{
-			log.log(Level.SEVERE, SQL, e);
-		}
-	} // loadCurrencies
-	
-	public void onEvent(Event e) throws Exception 
-	{
-		log.fine( "VPayment.actionPerformed - " + e.getTarget());
-
-		//	Finish
-		
-		if (e.getTarget() == btnOk)
-		{
-			if (checkMandatory())
-			{
-				saveChanges(); // cannot recover
-				this.detach();
-			}
-		}
-		else if (e.getTarget() == btnCancel)
-			this.detach();
-
-		//	Payment Method Change
-		
-		if (e.getTarget() == paymentCombo)
-		{
-			//	get selection
-			
-			ListItem listitem = paymentCombo.getSelectedItem();
-			ValueNamePair pp = (ValueNamePair)listitem.getValue();
-			
-			if (pp != null)
-			{
-				String s = pp.getValue().toLowerCase();
-		
-				if (X_C_Order.PAYMENTRULE_DirectDebit.equalsIgnoreCase(s))
-					s = X_C_Order.PAYMENTRULE_DirectDeposit.toLowerCase();
-				
-				s += "Panel";
-				
-				//centerLayout.show(centerPanel, s);	//	switch to panel
-				
-				kPanel.setVisible(false);
-				tPanel.setVisible(false);
-				sPanel.setVisible(false);
-				pPanel.setVisible(false);
-				bPanel.setVisible(false);
-				
-				if (s.equals("kPanel"))
-					kPanel.setVisible(true);
-				else if (s.equals("tPanel"))
-					tPanel.setVisible(true);
-				else if (s.equals("sPanel"))
-					sPanel.setVisible(true);
-				else if (s.equals("pPanel"))
-					pPanel.setVisible(true);
-				else if (s.equals("bPanel"))
-					bPanel.setVisible(true);
-			}
-		}
-
-		//	Check Currency change
-		
-		else if (e.getTarget() == sCurrencyCombo)
-		{
-			ListItem listitem = sCurrencyCombo.getSelectedItem();
-			KeyNamePair pp = (KeyNamePair)listitem.getValue();
-			BigDecimal amt = MConversionRate.convert(Env.getCtx(),
-				m_Amount, m_C_Currency_ID, pp.getKey(), m_AD_Client_ID, m_AD_Org_ID);
-			sAmountField.setText(m_Format.format(amt));
-		}
-		
-		//	Cash Currency change
-		
-		else if (e.getTarget() == bCurrencyCombo)
-		{
-			ListItem listitem = bCurrencyCombo.getSelectedItem();
-			KeyNamePair pp = (KeyNamePair)listitem.getValue();
-			BigDecimal amt = MConversionRate.convert(Env.getCtx(),
-				m_Amount, m_C_Currency_ID, pp.getKey(), m_AD_Client_ID, m_AD_Org_ID);
-			bAmountField.setText(m_Format.format(amt));
-		}
-
-		//  Online
-		
-		else if (e.getTarget() == kOnline || e.getTarget() == sOnline )
-			processOnline();
-	}	//	actionPerformed
-
-	/**************************************************************************
-	 *	Save Changes
-	 *	@return true, if eindow can exit
-	 */
-	
-	private boolean saveChanges()
-	{
-		ListItem listitem = paymentCombo.getSelectedItem();
-		ValueNamePair vp = (ValueNamePair)listitem.getValue();
-		String newPaymentRule = vp.getValue();
-		log.info("New Rule: " + newPaymentRule);
-
-		//  only Payment Rule
-		
-		if (m_onlyRule)
-		{
-			if (!newPaymentRule.equals(m_PaymentRule))
-				m_mTab.setValue("PaymentRule", newPaymentRule);
-			return true;
-		}
-
-		//	New Values
-		
-		Timestamp newDateAcct = m_DateAcct;
-		int newC_PaymentTerm_ID = m_C_PaymentTerm_ID;
-		int newC_CashLine_ID = m_C_CashLine_ID;
-		int newC_CashBook_ID = m_C_CashBook_ID;
-		String newCCType = m_CCType;
-		int newC_BankAccount_ID = 0;
-		
-		//	B (Cash)		(Currency)
-		
-		if (newPaymentRule.equals(X_C_Order.PAYMENTRULE_Cash))
-		{
-			listitem = bCashBookCombo.getSelectedItem();
-			
-			KeyNamePair kp = null;
-			
-			if (listitem != null)
-				kp = (KeyNamePair)listitem.getValue();
-			
-			if (kp != null)
-				newC_CashBook_ID = kp.getKey();
-			
-			//bDateField.
-			
-			newDateAcct = (Timestamp)bDateField.getValue();
-			
-			// Get changes to cash amount
-			
-			m_mPayment.setAmount(m_C_Currency_ID, new BigDecimal(bAmountField.getText()));
-			m_Amount = new BigDecimal(bAmountField.getText());
-			
-			//ADialog.info(m_WindowNo, this, "MAJJ Debug", bAmountField.getText());			
-		}
-
-		//	K (CreditCard)  Type, Number, Exp, Approval
-		
-		else if (newPaymentRule.equals(X_C_Order.PAYMENTRULE_CreditCard))
-		{
-			listitem = kTypeCombo.getSelectedItem();
-			
-			if (listitem != null)
-				vp = (ValueNamePair)listitem.getValue();
-			else 
-				vp = null;
-			
-			if (vp != null)
-				newCCType = vp.getValue();
-		}
-
-		//	T (Transfer)	BPartner_Bank
-		
-		else if (newPaymentRule.equals(MOrder.PAYMENTRULE_DirectDeposit) 
-			|| newPaymentRule.equals(MOrder.PAYMENTRULE_DirectDebit) )
-		{
-			if (tAccountCombo.getSelectedItem() != null)
-				tAccountCombo.getSelectedItem();
-		}
-
-		//	P (PaymentTerm)	PaymentTerm
-		
-		else if (newPaymentRule.equals(X_C_Order.PAYMENTRULE_OnCredit))
-		{
-			listitem = pTermCombo.getSelectedItem();
-			
-			KeyNamePair kp = null;
-			
-			if (listitem != null)
-				kp = (KeyNamePair)listitem.getValue();
-			
-			if (kp != null)
-				newC_PaymentTerm_ID = kp.getKey();
-		}
-
-		//	S (Check)		(Currency) CheckNo, Routing
-		
-		else if (newPaymentRule.equals(X_C_Order.PAYMENTRULE_Check))
-		{
-			//	sCurrencyCombo.getSelectedItem();
-			
-			listitem = sBankAccountCombo.getSelectedItem();
-			
-			KeyNamePair kp = null;
-			
-			if (listitem != null)
-				kp = (KeyNamePair)listitem.getValue();
-			
-			if (kp != null)
-				newC_BankAccount_ID = kp.getKey();
-		}
-		else
-			return false;
-
-		//  find Bank Account if not qualified yet
-		
-		if ("KTSD".indexOf(newPaymentRule) != -1 && newC_BankAccount_ID == 0)
-		{
-			String tender = MPayment.TENDERTYPE_CreditCard;
-		
-			if (newPaymentRule.equals(MOrder.PAYMENTRULE_DirectDeposit))
-				tender = MPayment.TENDERTYPE_DirectDeposit;
-			else if (newPaymentRule.equals(MOrder.PAYMENTRULE_DirectDebit))
-				tender = MPayment.TENDERTYPE_DirectDebit;
-			else if (newPaymentRule.equals(MOrder.PAYMENTRULE_Check))
-				tender = MPayment.TENDERTYPE_Check;
-		}
-
-		/***********************
-		 *  Changed PaymentRule
-		 */
-		
-		if (!newPaymentRule.equals(m_PaymentRule))
-		{
-			log.fine("Changed PaymentRule: " + m_PaymentRule + " -> " + newPaymentRule);
-		
-			//  We had a CashBook Entry
-			
-			if (m_PaymentRule.equals(X_C_Order.PAYMENTRULE_Cash))
-			{
-				log.fine("Old Cash - " + m_cashLine);
-			
-				if (m_cashLine != null)
-				{
-					MCashLine cl = m_cashLine.createReversal();
-				
-					if (cl.save())
-						log.config( "CashCancelled");
-					else
-						FDialog.error(m_WindowNo, this, "PaymentError", "CashNotCancelled");
-				}
-				newC_CashLine_ID = 0;      //  reset
-			}
-			
-			//  We had a change in Payment type (e.g. Check to CC)
-			
-			else if ("KTSD".indexOf(m_PaymentRule) != -1 && "KTSD".indexOf(newPaymentRule) != -1 && m_mPaymentOriginal != null)
-			{
-				log.fine("Old Payment(1) - " + m_mPaymentOriginal);
-				m_mPaymentOriginal.setDocAction(DocAction.ACTION_Reverse_Correct);
-				boolean ok = m_mPaymentOriginal.processIt(DocAction.ACTION_Reverse_Correct);
-				m_mPaymentOriginal.save();
-			
-				if (ok)
-					log.info( "Payment Canecelled - " + m_mPaymentOriginal);
-				else
-					FDialog.error(m_WindowNo, this, "PaymentError", "PaymentNotCancelled " + m_mPaymentOriginal.getDocumentNo());
-				
-				m_mPayment.resetNew();
-			}
-			//	We had a Payment and something else (e.g. Check to Cash)
-			
-			else if ("KTSD".indexOf(m_PaymentRule) != -1 && "KTSD".indexOf(newPaymentRule) == -1)
-			{
-				log.fine("Old Payment(2) - " + m_mPaymentOriginal);
-			
-				if (m_mPaymentOriginal != null)
-				{
-					m_mPaymentOriginal.setDocAction(DocAction.ACTION_Reverse_Correct);
-					boolean ok = m_mPaymentOriginal.processIt(DocAction.ACTION_Reverse_Correct);
-					m_mPaymentOriginal.save();
-				
-					if (ok)        //  Cancel Payment
-					{
-						log.fine("PaymentCancelled " + m_mPayment.getDocumentNo ());
-						m_mTab.getTableModel().dataSave(true);
-						m_mPayment.resetNew();
-						m_mPayment.setAmount(m_C_Currency_ID, m_Amount);
-					}
-					else
-						FDialog.error(m_WindowNo, this, "PaymentError", "PaymentNotCancelled " + m_mPayment.getDocumentNo());
-				}
-			}
-		}
-
-		//  Get Order and optionally Invoice
-		
-		int C_Order_ID = Env.getContextAsInt(Env.getCtx(), m_WindowNo, "C_Order_ID");
-		int C_Invoice_ID = Env.getContextAsInt(Env.getCtx(), m_WindowNo, "C_Invoice_ID");
-		if (C_Invoice_ID == 0 && m_DocStatus.equals("CO"))
-			C_Invoice_ID = getInvoiceID (C_Order_ID);
-
-		//  Amount sign negative, if ARC (Credit Memo) or API (AP Invoice)
-		
-		boolean negateAmt = false;
-		MInvoice invoice = null;
-		
-		if (C_Invoice_ID != 0)
-		{
-			invoice = new MInvoice (Env.getCtx(), C_Invoice_ID, null);
-			negateAmt = invoice.isCreditMemo();
-		}
-		
-		MOrder order = null;
-		
-		if (invoice == null && C_Order_ID != 0)
-			order = new MOrder (Env.getCtx(), C_Order_ID, null);
-		
-		BigDecimal payAmount = m_Amount;
-		
-		if (negateAmt)
-			payAmount = m_Amount.negate();
-		
-		// Info
-		
-		log.config("C_Order_ID=" + C_Order_ID + ", C_Invoice_ID=" + C_Invoice_ID + ", NegateAmt=" + negateAmt);
-
-		/***********************
-		 *  CashBook
-		 */
-		
-		if (newPaymentRule.equals(X_C_Order.PAYMENTRULE_Cash))
-		{
-			log.fine("Cash");
-			String description = (String)m_mTab.getValue("DocumentNo");
-			
-			if (C_Invoice_ID == 0 && order == null)
-			{
-				log.config("No Invoice!");
-				FDialog.error(m_WindowNo, this, "PaymentError", "CashNotCreated");
-			}
-			else
-			{
-				payAmount = new BigDecimal(bAmountField.getText());
-			
-				//  Changed Amount
-				
-				if (m_cashLine != null
-					&& payAmount.compareTo(m_cashLine.getAmount()) != 0)
-				{
-					log.config("Changed CashBook Amount");
-				
-					//m_cashLine.setAmount(payAmount);
-					
-					m_cashLine.setAmount(new BigDecimal(bAmountField.getText()));
-					
-					// ADialog.info(m_WindowNo, this, "m_cashLine - Changed Amount", "Amount: "+m_cashLine.getAmount());
-					
-					if (m_cashLine.save())
-						log.config("CashAmt Changed");
-				}
-				
-				//	Different Date/CashBook
-				
-				if (m_cashLine != null
-					&& (newC_CashBook_ID != m_C_CashBook_ID 
-						|| !TimeUtil.isSameDay(m_cashLine.getStatementDate(), newDateAcct)))
-				{
-					log.config("Changed CashBook/Date: " + m_C_CashBook_ID + "->" + newC_CashBook_ID);
-					MCashLine reverse = m_cashLine.createReversal();
-					
-					if (!reverse.save())
-						FDialog.error(m_WindowNo, this, "PaymentError", "CashNotCancelled");
-					
-					m_cashLine = null;
-				}
-				
-				//	Create new
-				
-				if (m_cashLine == null)
-				{
-					log.config("New CashBook");
-					int C_Currency_ID = 0;
-				
-					if (invoice != null)
-						C_Currency_ID = invoice.getC_Currency_ID();
-					
-					if (C_Currency_ID == 0 && order != null)
-						C_Currency_ID = order.getC_Currency_ID();
-					
-					MCash cash = null;
-					
-					if (newC_CashBook_ID != 0)
-						cash = MCash.get (Env.getCtx(), newC_CashBook_ID, newDateAcct, null);
-					else	//	Default
-						cash = MCash.get (Env.getCtx(), m_AD_Org_ID, newDateAcct, C_Currency_ID, null);
-					
-					if (cash == null || cash.get_ID() == 0)
-						FDialog.error(m_WindowNo, this, "PaymentError", "CashNotCreated");
-					else
-					{
-						MCashLine cl = new MCashLine (cash);
-						
-						// cl.setAmount(new BigDecimal(bAmountField.getText()));
-						//ADialog.info(m_WindowNo, this, "m_cashLine - New Cashbook", "Amount: "+cl.getAmount());
-						
-						if (invoice != null)
-							cl.setInvoice(invoice);	// overrides amount
-						if (order != null)
-						{
-							cl.setOrder(order, null); // overrides amount
-							m_needSave = true;
-						}
-						
-						cl.setAmount(new BigDecimal(bAmountField.getText()));
-						
-						if (cl.save())
-						{	
-							log.config("CashCreated");
-						
-							if (invoice == null && C_Invoice_ID != 0)
-							{
-								invoice = new MInvoice (Env.getCtx(), C_Invoice_ID, null);	
-							}
-							
-							if (invoice != null) 
-							{
-								invoice.setC_CashLine_ID(cl.getC_CashLine_ID());
-								invoice.save();
-							}	
-							
-							if (order == null && C_Order_ID != 0)
-							{
-								order = new MOrder (Env.getCtx(), C_Order_ID, null);
-							}
-							
-							if (order != null) 
-							{
-								order.setC_CashLine_ID(cl.getC_CashLine_ID());
-								order.save();
-							}
-							
-							log.config("Update Order & Invoice with CashLine");
-						}	
-						else
-							FDialog.error(m_WindowNo, this, "PaymentError", "CashNotCreated");
-					}
-				}
-			}	//	have invoice
-		}
-		
-		/***********************
-		 *  Payments
-		 */
-		
-		if ("KS".indexOf(newPaymentRule) != -1)
-		{
-			log.fine("Payment - " + newPaymentRule);
-			
-			//  Set Amount
-			
-			m_mPayment.setAmount(m_C_Currency_ID, payAmount);
-			
-			if (newPaymentRule.equals(MOrder.PAYMENTRULE_CreditCard))
-			{
-				m_mPayment.setCreditCard(MPayment.TRXTYPE_Sales, newCCType,
-					kNumberField.getText(), "", kExpField.getText());
-			
-				// Get changes to credit card amount
-				
-				m_mPayment.setAmount(m_C_Currency_ID, new BigDecimal(kAmountField.getText()));
-				m_mPayment.setPaymentProcessor();
-			}
-			else if (newPaymentRule.equals(MOrder.PAYMENTRULE_DirectDeposit)
-				|| newPaymentRule.equals(MOrder.PAYMENTRULE_DirectDebit))
-			{
-				m_mPayment.setBankACH(newC_BankAccount_ID, m_isSOTrx, newPaymentRule, 
-					tRoutingField.getText(), tNumberField.getText());
-				
-				m_mPayment.setAmount(m_C_Currency_ID, payAmount);
-			}
-			else if (newPaymentRule.equals(MOrder.PAYMENTRULE_Check))
-			{
-				m_mPayment.setBankCheck(newC_BankAccount_ID, m_isSOTrx, sRoutingField.getText(),
-					sNumberField.getText(), sCheckField.getText());
-				
-				// Get changes to check amount
-				
-				m_mPayment.setAmount(m_C_Currency_ID, new BigDecimal(sAmountField.getText()));
-			}
-			
-			m_mPayment.setC_BPartner_ID(m_C_BPartner_ID);
-			m_mPayment.setC_Invoice_ID(C_Invoice_ID);
-			
-			if (order != null)
-			{
-				m_mPayment.setC_Order_ID(C_Order_ID);
-				m_needSave = true;
-			}
-			
-			m_mPayment.setDateTrx(m_DateAcct);
-			m_mPayment.setDateAcct(m_DateAcct);
-			m_mPayment.save();
-			
-			//  Save/Post
-			
-			if (MPayment.DOCSTATUS_Drafted.equals(m_mPayment.getDocStatus()))
-			{
-				boolean ok = m_mPayment.processIt(DocAction.ACTION_Complete);
-				m_mPayment.save();
-			
-				if (ok)
-					FDialog.info(m_WindowNo, this, "PaymentCreated", m_mPayment.getDocumentNo());
-				else
-					FDialog.error(m_WindowNo, this, "PaymentError", "PaymentNotCreated");
-			}
-			else
-				log.fine("NotDraft " + m_mPayment);
-		}
-
-
-		/**********************
-		 *	Save Values to mTab
-		 */
-		
-		log.config("Saving changes");
-
-		if (!newPaymentRule.equals(m_PaymentRule))
-			m_mTab.setValue("PaymentRule", newPaymentRule);
-
-		if (!newDateAcct.equals(m_DateAcct))
-			m_mTab.setValue("DateAcct", newDateAcct);
-
-		if (newC_PaymentTerm_ID != m_C_PaymentTerm_ID)
-			m_mTab.setValue("C_PaymentTerm_ID", new Integer(newC_PaymentTerm_ID));
-		
-		//	Set Payment
-		
-		if (m_mPayment.getC_Payment_ID() != m_C_Payment_ID)
-		{
-			if (m_mPayment.getC_Payment_ID() == 0)
-				m_mTab.setValue("C_Payment_ID", null);
-			else
-				m_mTab.setValue("C_Payment_ID", new Integer(m_mPayment.getC_Payment_ID()));
-		}
-		
-		//	Set Cash
-		
-		if (newC_CashLine_ID != m_C_CashLine_ID)
-		{
-			if (newC_CashLine_ID == 0)
-				m_mTab.setValue("C_CashLine_ID", null);
-			else
-				m_mTab.setValue("C_CashLine_ID", new Integer(newC_CashLine_ID));
-		}
-		return true;
-	}	//	saveChanges
-
-	/**
-	 *  Check Mandatory
-	 *  @return true if all mandatory items are OK
-	 */
-	
-	private boolean checkMandatory()
-	{
-		log.config( "WPayment.checkMandatory");
-
-		ListItem listitem = new ListItem();
-		listitem = paymentCombo.getSelectedItem();
-		ValueNamePair vp = (ValueNamePair)listitem.getValue();
-		String PaymentRule = vp.getValue();
-		
-		//  only Payment Rule
-		
-		if (m_onlyRule)
-			return true;
-
-		Timestamp DateAcct = m_DateAcct;
-		int C_PaymentTerm_ID = m_C_PaymentTerm_ID;
-		int C_CashBook_ID = m_C_CashBook_ID;
-		String CCType = m_CCType;
-		int C_BankAccount_ID = 0;
-
-		/***********************
-		 *	Mandatory Data Check
-		 */
-		
-		boolean dataOK = true;
-		
-		//	B (Cash)		(Currency)
-		
-		if (PaymentRule.equals(MOrder.PAYMENTRULE_Cash))
-		{
-			listitem = new ListItem();
-			listitem = bCashBookCombo.getSelectedItem(); 
-			
-			KeyNamePair kp = null;
-			
-			if (listitem != null)
-				kp = (KeyNamePair)listitem.getValue();
-			
-			if (kp != null)
-				C_CashBook_ID = kp.getKey();
-			
-			DateAcct = (Timestamp)bDateField.getValue();
-		}
-
-		//	K (CreditCard)  Type, Number, Exp, Approval
-
-		else if (PaymentRule.equals(MOrder.PAYMENTRULE_CreditCard))
-		{
-			listitem = kTypeCombo.getSelectedItem();
-			
-			if (listitem != null)
-				vp = (ValueNamePair)listitem.getValue();
-			else
-				vp = null;
-			
-			if (vp != null)
-				CCType = vp.getValue();
-
-			String error = MPaymentValidate.validateCreditCardNumber(kNumberField.getText(), CCType);
-			
-			if (error.length() != 0)
-			{
-				//kNumberField.setBackground(AdempierePLAF.getFieldBackground_Error());
-
-				if (error.indexOf('?') == -1)
-				{
-					FDialog.error(m_WindowNo, this, error);
-					dataOK = false;
-				}
-				else    //  warning
-				{
-					if (!FDialog.ask(m_WindowNo, this, error))
-						dataOK = false;
-				}
-			}
-			
-			error = MPaymentValidate.validateCreditCardExp(kExpField.getText());
-			
-			if (error.length() != 0)
-			{
-				//kExpField.setBackground(AdempierePLAF.getFieldBackground_Error());
-				FDialog.error(m_WindowNo, this, error);
-				dataOK = false;
-			}
-		}
-
-		//	T (Transfer)	BPartner_Bank
-		
-		else if (PaymentRule.equals(X_C_Order.PAYMENTRULE_DirectDeposit)
-			|| PaymentRule.equals(X_C_Order.PAYMENTRULE_DirectDebit))
-		{
-			listitem = tAccountCombo.getSelectedItem();
-			
-			KeyNamePair bpba =  null;
-			
-			if (listitem != null)
-				bpba = (KeyNamePair)listitem.getValue();
-			
-			if (bpba == null)
-			{
-				//tAccountCombo.setBackground(AdempierePLAF.getFieldBackground_Error());
-				FDialog.error(m_WindowNo, this, "PaymentBPBankNotFound");
-				dataOK = false;
-			}
-		}	//	Direct
-
-		//	P (PaymentTerm)	PaymentTerm
-		
-		else if (PaymentRule.equals(X_C_Order.PAYMENTRULE_OnCredit))
-		{
-			listitem = pTermCombo.getSelectedItem();
-			
-			KeyNamePair kp = null;
-			
-			if (listitem != null)
-				kp = (KeyNamePair)listitem.getValue();
-			
-			if (kp != null)
-				C_PaymentTerm_ID = kp.getKey();
-		}
-
-		//	S (Check)		(Currency) CheckNo, Routing
-		
-		else if (PaymentRule.equals(MOrder.PAYMENTRULE_Check))
-		{
-			//	sCurrencyCombo.getSelectedItem();
-			listitem = sBankAccountCombo.getSelectedItem();
-			
-			KeyNamePair kp = null;
-			
-			if (listitem != null)
-				kp = (KeyNamePair)listitem.getValue();
-			
-			if (kp != null)
-				C_BankAccount_ID = kp.getKey();
-			
-			String error = MPaymentValidate.validateRoutingNo(sRoutingField.getText());
-			
-			if (error.length() != 0)
-			{
-				//sRoutingField.setBackground(AdempierePLAF.getFieldBackground_Error());
-				FDialog.error(m_WindowNo, this, error);
-				dataOK = false;
-			}
-			
-			error = MPaymentValidate.validateAccountNo(sNumberField.getText());
-			
-			if (error.length() != 0)
-			{
-				//sNumberField.setBackground(AdempierePLAF.getFieldBackground_Error());
-				FDialog.error(m_WindowNo, this, error);
-				dataOK = false;
-			}
-			
-			error = MPaymentValidate.validateCheckNo(sCheckField.getText());
-			
-			if (error.length() != 0)
-			{
-				//sCheckField.setBackground(AdempierePLAF.getFieldBackground_Error());
-				FDialog.error(m_WindowNo, this, error);
-				dataOK = false;
-			}
-		}
-		else
-		{
-			log.log(Level.SEVERE, "Unknown PaymentRule " + PaymentRule);
-			return false;
-		}
-
-		//  find Bank Account if not qualified yet
-		
-		if ("KTSD".indexOf(PaymentRule) != -1 && C_BankAccount_ID == 0)
-		{
-			String tender = MPayment.TENDERTYPE_CreditCard;
-		
-			if (PaymentRule.equals(MOrder.PAYMENTRULE_DirectDeposit))
-				tender = MPayment.TENDERTYPE_DirectDeposit;
-			else if (PaymentRule.equals(MOrder.PAYMENTRULE_DirectDebit))
-				tender = MPayment.TENDERTYPE_DirectDebit;
-			else if (PaymentRule.equals(MOrder.PAYMENTRULE_Check))
-				tender = MPayment.TENDERTYPE_Check;
-			
-			//	Check must have a bank account
-			
-			if (C_BankAccount_ID == 0 && "S".equals(PaymentRule))
-            {
-				FDialog.error(m_WindowNo, this, "PaymentNoProcessor");
-				dataOK = false;
-			}
-		}
-
-		log.config("OK=" + dataOK);
-		return dataOK;
-	}   //  checkMandatory
-
-	/**
-	 *  Get Invoice ID for Order
-	 *  @param C_Order_ID order
-	 *  @return C_Invoice_ID or 0 if not found
-	 */
-	
-	private static int getInvoiceID (int C_Order_ID)
-	{
-		int retValue = 0;
-		String sql = "SELECT C_Invoice_ID FROM C_Invoice WHERE C_Order_ID=? "
-			+ "ORDER BY C_Invoice_ID DESC";     //  last invoice
-	
-		try
-		{
-			PreparedStatement pstmt = DB.prepareStatement(sql, null);
-			pstmt.setInt(1, C_Order_ID);
-			ResultSet rs = pstmt.executeQuery();
-		
-			if (rs.next())
-				retValue = rs.getInt(1);
-			rs.close();
-			pstmt.close();
-		}
-		catch (SQLException e)
-		{
-			log.log(Level.SEVERE, sql, e);
-		}
-		return retValue;
-	}   //  getInvoiceID
-
-	/**************************************************************************
-	 *  Process Online (sales only) - if approved - exit
-	 */
-	
-	private void processOnline()
-	{
-		log.config("");
-
-		if (!checkMandatory())
-			return;
-
-		boolean approved = false;
-		String info = "";
-
-		ListItem listitem = new ListItem();
-		listitem = paymentCombo.getSelectedItem();
-		ValueNamePair vp = (ValueNamePair)listitem.getValue();
-		String PaymentRule = vp.getValue();
-
-		//  --  CreditCard
-		
-		if (PaymentRule.equals(X_C_Order.PAYMENTRULE_CreditCard))
-		{
-			listitem = kTypeCombo.getSelectedItem();
-			vp = (ValueNamePair)listitem.getValue();
-			String CCType = vp.getValue();
-
-			m_mPayment.setCreditCard(MPayment.TRXTYPE_Sales, CCType,
-				kNumberField.getText(), "", kExpField.getText());
-			m_mPayment.setAmount(m_C_Currency_ID, m_Amount);
-			m_mPayment.setPaymentProcessor();
-			m_mPayment.setC_BPartner_ID(m_C_BPartner_ID);
-
-			int C_Invoice_ID = Env.getContextAsInt(Env.getCtx(), m_WindowNo, "C_Invoice_ID");
-			
-			if (C_Invoice_ID == 0 && m_DocStatus.equals("CO"))
-			{
-				int C_Order_ID = Env.getContextAsInt(Env.getCtx(), m_WindowNo, "C_Order_ID");
-				C_Invoice_ID = getInvoiceID (C_Order_ID);
-			}
-
-			m_mPayment.setC_Invoice_ID(C_Invoice_ID);
-			m_mPayment.setDateTrx(m_DateAcct);
-			
-			//  Set Amount
-			
-			m_mPayment.setAmount(m_C_Currency_ID, m_Amount);
-
-			approved = m_mPayment.processOnline();
-			info = m_mPayment.getR_RespMsg() + " (" + m_mPayment.getR_AuthCode()
-				+ ") ID=" + m_mPayment.getR_PnRef();
-			boolean saved = m_mPayment.save();
-
-			if (approved)
-			{
-				boolean ok = m_mPayment.processIt(DocAction.ACTION_Complete);
-				m_mPayment.save();
-			
-				if (ok)
-					FDialog.info(m_WindowNo, this, "PaymentProcessed", info + "\n" + m_mPayment.getDocumentNo());
-				else
-					FDialog.error(m_WindowNo, this, "PaymentError", "PaymentNotCreated");
-				
-				saveChanges();
-				//dispose();
-			}
-			else
-			{
-				FDialog.error(m_WindowNo, this, "PaymentNotProcessed", info);
-			}
-		}
-		else
-			FDialog.error(m_WindowNo, this, "PaymentNoProcessor");
-	}   //  online
-
-	/**
-	 * 	Need Save record (payment with waiting order)
-	 *	@return true if payment with waiting order
-	 */
-	
-	public boolean needSave()
-	{
-		return m_needSave;
-	}	//	needSave
-}
+/******************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution                        *
+ * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software; you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program; if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@... or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+package org.adempiere.webui.apps.form;
+
+import java.math.*;
+import java.sql.*;
+import java.text.*;
+import java.util.*;
+import java.util.logging.*;
+
+import org.adempiere.webui.apps.AEnv;
+import org.adempiere.webui.component.Button;
+import org.adempiere.webui.component.ConfirmPanel;
+import org.adempiere.webui.component.Grid;
+import org.adempiere.webui.component.GridFactory;
+import org.adempiere.webui.component.Label;
+import org.adempiere.webui.component.Listbox;
+import org.adempiere.webui.component.ListboxFactory;
+import org.adempiere.webui.component.Panel;
+import org.adempiere.webui.component.Row;
+import org.adempiere.webui.component.Rows;
+import org.adempiere.webui.component.Textbox;
+import org.adempiere.webui.component.Window;
+import org.adempiere.webui.editor.WButtonEditor;
+import org.adempiere.webui.editor.WDateEditor;
+import org.adempiere.webui.editor.WNumberEditor;
+import org.adempiere.webui.window.FDialog;
+import org.compiere.model.*;
+import org.compiere.process.*;
+import org.compiere.util.*;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
+import org.zkoss.zkex.zul.Borderlayout;
+import org.zkoss.zkex.zul.Center;
+import org.zkoss.zkex.zul.North;
+import org.zkoss.zkex.zul.South;
+import org.zkoss.zul.Space;
+
+/**
+ *	Display (and process) Payment Options.
+ *  <pre>
+ *  Payment Rule
+ *  -B- Cash          (Date)          -> Cash Entry
+ *  -P- Payment Term  (Term)
+ *  -S- Check         (Routing, ..)   -> Payment Entry
+ *  -K- CreditCard    (No)            -> Payment Entry
+ *  -U- ACH Transfer  (Routing)       -> Payment Entry
+ *
+ *  When processing:
+ *  - If an invoice is a S/K/U, but has no Payment Entry, it is changed to P
+ *  - If an invoive is B and has no Cash Entry, it is created
+ *  - An invoice is "Open" if it is "P" and no Payment
+ *
+ *  Entry:
+ *  - If not processed, an invoice has no Cash or Payment entry
+ *  - The entry is created, during "Online" and when Saving
+ *
+ *  Changes/Reversals:
+ *  - existing Cash Entries are reversed and newly created
+ *  - existing Payment Entries are not changed and then "hang there" and need to be allocated
+ *  </pre>
+ *
+ * 	@author 	Jorg Janke
+ * 	@version 	$Id: VPayment.java,v 1.2 2006/07/30 00:51:28 jjanke Exp $
+ * 
+ * @author Teo Sarca, SC ARHIPAC SERVICE SRL
+ * 				<li>BF [ 1763488 ] Error on cash payment
+ * 				<li>BF [ 1789949 ] VPayment: is displaying just "CashNotCreated"
+ */
+public class WPayment extends Window
+	implements EventListener
+{
+	/**
+	 *	Constructor
+	 *
+	 *	@param WindowNo	owning window
+	 *  @param mTab     owning tab
+	 *	@param button	button with access information
+	 */
+	public WPayment (int WindowNo, GridTab mTab, WButtonEditor button)
+	{
+		super();
+		this.setTitle(Msg.getMsg(Env.getCtx(), "Payment"));
+		this.setAttribute("mode", "modal");
+		m_WindowNo = WindowNo;
+		m_isSOTrx = "Y".equals(Env.getContext(Env.getCtx(), WindowNo, "IsSOTrx"));
+		m_mTab = mTab;
+		try
+		{
+			bDateField = new WDateEditor("DateAcct", false, false, true, DisplayType.Date, "DateAcct");
+			zkInit();
+			m_initOK = dynInit(button);     //  Null Pointer if order/invoice not saved yet
+		}
+		catch(Exception ex)
+		{
+			log.log(Level.SEVERE, "VPayment", ex);
+			m_initOK = false;
+		}
+		//
+		this.setHeight("400px");
+		this.setWidth("500px");
+		this.setBorder("normal");
+	}	//	VPayment
+
+	/**	Window						*/
+	private int                 m_WindowNo = 0;
+	/**	Tab							*/
+	private GridTab         		m_mTab;
+
+	//	Data from Order/Invoice
+	private String              m_DocStatus = null;
+	/** Start Payment Rule          */
+	private String				m_PaymentRule = "";
+	/** Start Payment Term          */
+	private int					m_C_PaymentTerm_ID = 0;
+	/** Start Acct Date             */
+	private Timestamp			m_DateAcct = null;
+	/** Start Payment               */
+	private int					m_C_Payment_ID = 0;
+	private MPayment            m_mPayment = null;
+	private MPayment            m_mPaymentOriginal = null;
+	/** Start CashBook Line         */
+	private int                 m_C_CashLine_ID = 0;
+	private MCashLine			m_cashLine = null;
+	/** Start CreditCard            */
+	private String              m_CCType = "";
+	/** Start Bank Account			*/
+	private int					m_C_BankAccount_ID = 0;
+	/** Start CashBook              */
+	private int                 m_C_CashBook_ID = 0;
+
+	/** Is SOTrx					*/
+	private boolean				m_isSOTrx = true;
+
+	/** Invoice Currency              */
+	private int	 				m_C_Currency_ID = 0;
+	private int                 m_AD_Client_ID = 0;
+	private int                 m_AD_Org_ID = 0;
+	private int                 m_C_BPartner_ID = 0;
+	private BigDecimal			m_Amount = Env.ZERO;	//	Payment Amount
+	//
+	private boolean 			m_initOK = false;
+	/** Only allow changing Rule        */
+	private boolean             m_onlyRule = false;
+	private DecimalFormat 		m_Format = DisplayType.getNumberFormat(DisplayType.Amount);
+	private static Hashtable<Integer,KeyNamePair> s_Currencies = null;	//	EMU Currencies
+	
+	private boolean				m_needSave = false;
+	/**	Logger			*/
+	private static CLogger log = CLogger.getCLogger(WPayment.class);
+
+	//
+	private Panel mainPanel = new Panel();
+	private Borderlayout mainLayout = new Borderlayout();
+	private Panel northPanel = new Panel();
+	private Panel centerPanel = new Panel();
+//	private FlowLayout northLayout = new FlowLayout();
+	private Listbox paymentCombo = ListboxFactory.newDropdownListbox();
+	private Label paymentLabel = new Label();
+	private List<Panel> centerLayout = new ArrayList<Panel>();
+	private Panel bPanel = new Panel();
+	private Panel kPanel = new Panel();
+	private Grid kLayout = GridFactory.newGridLayout();
+	private Label kTypeLabel = new Label();
+	private Listbox kTypeCombo = ListboxFactory.newDropdownListbox();
+	private Label kNumberLabel = new Label();
+	private Textbox kNumberField = new Textbox();
+	private Label kExpLabel = new Label();
+	private Textbox kExpField = new Textbox();
+	private Label kApprovalLabel = new Label();
+	private Textbox kApprovalField = new Textbox();
+	private Label kAmountLabel = new Label();
+	private WNumberEditor kAmountField = new WNumberEditor();
+	private Panel tPanel = new Panel();
+	private Label tAccountLabel = new Label();
+	private Listbox tAccountCombo = ListboxFactory.newDropdownListbox();
+	private Panel sPanel = new Panel();
+	private Grid sPanelLayout = GridFactory.newGridLayout();
+	private Label sNumberLabel = new Label();
+	private Textbox sNumberField = new Textbox();
+	private Label sRoutingLabel = new Label();
+	private Textbox sRoutingField = new Textbox();
+	private Label sCurrencyLabel = new Label();
+	private Listbox sCurrencyCombo = ListboxFactory.newDropdownListbox();
+	private Label bCurrencyLabel = new Label();
+	private Listbox bCurrencyCombo = ListboxFactory.newDropdownListbox();
+	private Panel pPanel = new Panel();
+	private Label pTermLabel = new Label();
+	private Listbox pTermCombo = ListboxFactory.newDropdownListbox();
+	private Grid bPanelLayout = GridFactory.newGridLayout();
+	private Label bAmountLabel = new Label();
+	private WNumberEditor bAmountField = new WNumberEditor();
+	private Label sAmountLabel = new Label();
+	private WNumberEditor sAmountField = new WNumberEditor();
+	private WDateEditor bDateField;
+	private Label bDateLabel = new Label();
+	private ConfirmPanel confirmPanel = new ConfirmPanel(true);
+	private Textbox sCheckField = new Textbox();
+	private Label sCheckLabel = new Label();
+	private Button kOnline = new Button();
+	private Button sOnline = new Button();
+	private Listbox sBankAccountCombo = ListboxFactory.newDropdownListbox();
+	private Label sBankAccountLabel = new Label();
+	private Grid pPanelLayout = GridFactory.newGridLayout();
+	private Label bCashBookLabel = new Label();
+	private Listbox bCashBookCombo = ListboxFactory.newDropdownListbox();
+	private Grid tPanelLayout = GridFactory.newGridLayout();
+	private Button tOnline = new Button();
+	private Label kStatus = new Label();
+	private Textbox tRoutingField = new Textbox();
+	private Textbox tNumberField = new Textbox();
+	private Label tStatus = new Label();
+	private Label tRoutingText = new Label();
+	private Label tNumberText = new Label();
+	private Label sStatus = new Label();
+
+	/**
+	 *	Static Init
+	 *  @throws Exception
+	 */
+	private void zkInit() throws Exception
+	{
+		this.appendChild(mainPanel);
+		mainPanel.appendChild(mainLayout);
+		mainPanel.setStyle("width: 100%; height: 100%; padding: 0; margin: 0");
+		mainLayout.setHeight("100%");
+		mainLayout.setWidth("100%");
+		Center center = new Center();
+		mainLayout.appendChild(center);
+		center.appendChild(centerPanel);
+		//
+//		northPanel.setLayout(northLayout);
+		paymentLabel.setText(Msg.translate(Env.getCtx(), "PaymentRule"));
+		North north = new North();
+		north.setStyle("border: none");
+		mainLayout.appendChild(north);
+		north.appendChild(northPanel);
+		northPanel.appendChild(paymentLabel);
+		northPanel.appendChild(new Space());
+		northPanel.appendChild(paymentCombo);
+		//
+		//      CreditCard
+		kPanel.appendChild(kLayout);
+		kNumberField.setWidth("160pt");
+//		kNumberField.setHeight("21em");
+		kExpField.setWidth("40pt");
+//		kExpField.setHeight("21em");
+		kApprovalField.setWidth("120pt");
+//		kApprovalField.setHeight("21em");
+		kTypeLabel.setText(Msg.translate(Env.getCtx(), "CreditCardType"));
+		kNumberLabel.setText(Msg.translate(Env.getCtx(), "CreditCardNumber"));
+		kExpLabel.setText(Msg.getMsg(Env.getCtx(), "Expires"));
+		kApprovalLabel.setText(Msg.translate(Env.getCtx(), "VoiceAuthCode"));
+		kAmountLabel.setText(Msg.getMsg(Env.getCtx(), "Amount"));
+		kOnline.setLabel(Msg.getMsg(Env.getCtx(), "Online"));
+		kOnline.setSclass("action-text-button");
+		kOnline.addActionListener(this);
+		kStatus.setText(" ");
+		kPanel.setId("kPanel");
+		centerPanel.appendChild(kPanel);
+		centerLayout.add(kPanel);
+		
+		Rows rows = kLayout.newRows();
+		Row row = rows.newRow();
+		row.appendChild(kTypeLabel.rightAlign());
+		row.appendChild(kTypeCombo);
+		row.appendChild(new Space());
+		row.appendChild(new Space());
+		
+		row = rows.newRow();
+		row.appendChild(kNumberLabel.rightAlign());
+		row.appendChild(kNumberField);
+		row.appendChild(new Space());
+		row.appendChild(new Space());
+		
+		row = rows.newRow();
+		row.appendChild(kExpLabel.rightAlign());
+		row.appendChild(kExpField);
+		row.appendChild(new Space());
+		row.appendChild(new Space());
+		
+		row = rows.newRow();
+		row.appendChild(kAmountLabel.rightAlign());
+		row.appendChild(kAmountField.getComponent());
+		row.appendChild(new Space());
+		row.appendChild(new Space());
+		
+		row = rows.newRow();
+		row.appendChild(kApprovalLabel.rightAlign());
+		row.appendChild(kApprovalField);
+		row.appendChild(new Space());
+		row.appendChild(kOnline);
+		
+		row = rows.newRow();
+		row.setSpans("3,1");
+		row.appendChild(kStatus);
+		row.appendChild(new Space());
+		
+		//	DircetDebit/Credit
+		tPanel.appendChild(tPanelLayout);
+		tAccountLabel.setText(Msg.translate(Env.getCtx(), "C_BP_BankAccount_ID"));
+		tRoutingField.setCols(8);
+		tNumberField.setCols(10);
+		tRoutingText.setText(Msg.translate(Env.getCtx(), "RoutingNo"));
+		tNumberText.setText(Msg.translate(Env.getCtx(), "AccountNo"));
+		tOnline.setLabel(Msg.getMsg(Env.getCtx(), "Online"));
+		tOnline.setSclass("action-text-button");
+		tStatus.setText(" ");
+		tPanel.setId("tPanel");
+		centerPanel.appendChild(tPanel);
+		centerLayout.add(tPanel);
+		
+		rows = tPanelLayout.newRows();
+		row = rows.newRow();
+		row.appendChild(tAccountLabel.rightAlign());
+		row.appendChild(tAccountCombo);
+		row.appendChild(new Space());
+		row.appendChild(new Space());
+		
+		row = rows.newRow();
+		row.appendChild(tRoutingText.rightAlign());
+		row.appendChild(tRoutingField);
+		row.appendChild(new Space());
+		row.appendChild(new Space());
+		
+		row = rows.newRow();
+		row.appendChild(tNumberText.rightAlign());
+		row.appendChild(tNumberField);
+		row.appendChild(new Space());
+		row.appendChild(tOnline);		
+		
+		row = rows.newRow();
+		row.setSpans("3,1");
+		row.appendChild(tStatus);
+		row.appendChild(new Space());
+						
+		// Cheque
+		sPanel.appendChild(sPanelLayout);
+		sBankAccountLabel.setText(Msg.translate(Env.getCtx(), "C_BankAccount_ID"));
+		sAmountLabel.setText(Msg.getMsg(Env.getCtx(), "Amount"));
+		//sAmountField.setText("");
+		sRoutingLabel.setText(Msg.translate(Env.getCtx(), "RoutingNo"));
+		sNumberLabel.setText(Msg.translate(Env.getCtx(), "AccountNo"));
+		sCheckLabel.setText(Msg.translate(Env.getCtx(), "CheckNo"));
+		sCheckField.setCols(8);
+		sCurrencyLabel.setText(Msg.translate(Env.getCtx(), "C_Currency_ID"));
+		sNumberField.setWidth("100pt");
+//		sNumberField.setHeight("100em");
+		sRoutingField.setWidth("70pt");
+//		sRoutingField.setHeight("21em");
+		sStatus.setText(" ");
+		sOnline.setLabel(Msg.getMsg(Env.getCtx(), "Online"));
+		sOnline.setSclass("action-text-button");
+		sPanel.setId("sPanel");
+		centerPanel.appendChild(sPanel);
+		centerLayout.add(sPanel);
+		
+		rows = sPanelLayout.newRows();
+		row = rows.newRow();
+		row.appendChild(sBankAccountLabel.rightAlign());
+		row.appendChild(sBankAccountCombo);
+		row.appendChild(new Space());
+		row.appendChild(new Space());
+		
+		row = rows.newRow();
+		row.appendChild(sCurrencyLabel.rightAlign());
+		row.appendChild(sCurrencyCombo);
+		row.appendChild(new Space());
+		row.appendChild(new Space());
+		
+		row = rows.newRow();
+		row.appendChild(sAmountLabel.rightAlign());
+		row.appendChild(sAmountField.getComponent());
+		row.appendChild(new Space());
+		row.appendChild(new Space());
+		
+		row = rows.newRow();
+		row.appendChild(sRoutingLabel.rightAlign());
+		row.appendChild(sRoutingField);
+		row.appendChild(new Space());
+		row.appendChild(new Space());
+		
+		row = rows.newRow();
+		row.appendChild(sNumberLabel.rightAlign());
+		row.appendChild(sNumberField);
+		row.appendChild(new Space());
+		row.appendChild(new Space());
+		
+		row = rows.newRow();
+		row.appendChild(sCheckLabel.rightAlign());
+		row.appendChild(sCheckField);
+		row.appendChild(new Space());
+		row.appendChild(sOnline);
+		
+		row = rows.newRow();
+		row.setSpans("3,1");
+		row.appendChild(sStatus);
+		row.appendChild(new Space());
+		
+		// Cash
+		pPanel.appendChild(pPanelLayout);
+		pTermLabel.setText(Msg.translate(Env.getCtx(), "C_PaymentTerm_ID"));
+		pPanel.setId("pPanel");
+		centerPanel.appendChild(pPanel);
+		centerLayout.add(pPanel);
+		
+		rows = pPanelLayout.newRows();
+		row = rows.newRow();
+		row.appendChild(pTermLabel.rightAlign());
+		row.appendChild(pTermCombo);
+		//
+		bCashBookLabel.setText(Msg.translate(Env.getCtx(), "C_CashBook_ID"));
+		bCurrencyLabel.setText(Msg.translate(Env.getCtx(), "C_Currency_ID"));
+		bPanel.appendChild(bPanelLayout);
+		bAmountLabel.setText(Msg.getMsg(Env.getCtx(), "Amount"));
+		//bAmountField.setText("");
+		bDateLabel.setText(Msg.translate(Env.getCtx(), "DateAcct"));
+		bPanel.setId("bPanel");
+		centerPanel.appendChild(bPanel);
+		centerLayout.add(bPanel);
+		
+		rows = bPanelLayout.newRows();
+		row = rows.newRow();
+		row.appendChild(bCashBookLabel.rightAlign());
+		row.appendChild(bCashBookCombo);
+		
+		row = rows.newRow();
+		row.appendChild(bCurrencyLabel.rightAlign());
+		row.appendChild(bCurrencyCombo);
+		
+		row = rows.newRow();
+		row.appendChild(bDateLabel.rightAlign());
+		row.appendChild(bDateField.getComponent());
+		
+		row = rows.newRow();
+		row.appendChild(bAmountLabel.rightAlign());
+		row.appendChild(bAmountField.getComponent());
+		//
+		South south = new South();
+		south.setStyle("border: none");
+		mainLayout.appendChild(south);
+		south.appendChild(confirmPanel);
+		confirmPanel.addActionListener(this);
+	}	//	jbInit
+
+	
+	/**************************************************************************
+	 *	Dynamic Init.
+	 *		B (Cash)		(Currency)
+	 *		K (CreditCard)  Type, Number, Exp, Approval
+	 *		L (DirectDebit)	BPartner_Bank
+	 *		P (PaymentTerm)	PaymentTerm
+	 *		S (Check)		(Currency) CheckNo, Routing
+	 *
+	 *	Currencies are shown, if member of EMU
+	 *  @param button payment type button
+	 *  @return true if init OK
+	 *  @throws Exception
+	 */
+	private boolean dynInit (WButtonEditor button) throws Exception
+	{
+		m_DocStatus = (String)m_mTab.getValue("DocStatus");
+		log.config(m_DocStatus);
+
+		if (m_mTab.getValue("C_BPartner_ID") == null)
+		{
+			FDialog.error(0, this, "SaveErrorRowNotFound");
+			return false;
+		}
+
+		//	Is the Trx posted?
+	//	String Posted = (String)m_mTab.getValue("Posted");
+	//	if (Posted != null && Posted.equals("Y"))
+	//		return false;
+
+		//  DocStatus
+		m_DocStatus = (String)m_mTab.getValue("DocStatus");
+		if (m_DocStatus == null)
+			m_DocStatus = "";
+		//	Is the Trx closed?		Reversed / Voided / Cloased
+		if (m_DocStatus.equals("RE") || m_DocStatus.equals("VO") || m_DocStatus.equals("CL"))
+			return false;
+		//  Document is not complete - allow to change the Payment Rule only
+		if (m_DocStatus.equals("CO") || m_DocStatus.equals("WP") )
+			m_onlyRule = false;
+		else
+			m_onlyRule = true;
+		//	PO only  Rule
+		if (!m_onlyRule		//	Only order has Warehouse
+			&& !m_isSOTrx && m_mTab.getValue("M_Warehouse_ID") != null)
+			m_onlyRule = true;
+		
+		centerPanel.setVisible(!m_onlyRule);
+		
+		
+		//  Amount
+		m_Amount = (BigDecimal)m_mTab.getValue("GrandTotal");
+		if (!m_onlyRule && m_Amount.compareTo(Env.ZERO) == 0)
+		{
+			FDialog.error(m_WindowNo, this, "PaymentZero");
+			return false;
+		}
+		
+
+		bAmountField.setValue(m_Amount);
+		sAmountField.setValue(m_Amount);
+		kAmountField.setValue(m_Amount);
+		
+
+		/**
+		 *	Get Data from Grid
+		 */
+		m_AD_Client_ID = ((Integer)m_mTab.getValue("AD_Client_ID")).intValue();
+		m_AD_Org_ID = ((Integer)m_mTab.getValue("AD_Org_ID")).intValue();
+		m_C_BPartner_ID = ((Integer)m_mTab.getValue("C_BPartner_ID")).intValue();
+		m_PaymentRule = (String)m_mTab.getValue("PaymentRule");
+		m_C_Currency_ID = ((Integer)m_mTab.getValue("C_Currency_ID")).intValue();
+		m_DateAcct = (Timestamp)m_mTab.getValue("DateAcct");
+		if (m_mTab.getValue("C_PaymentTerm_ID") != null)
+			m_C_PaymentTerm_ID = ((Integer)m_mTab.getValue("C_PaymentTerm_ID")).intValue();
+		//  Existing Payment
+		if (m_mTab.getValue("C_Payment_ID") != null)
+		{
+			m_C_Payment_ID = ((Integer)m_mTab.getValue("C_Payment_ID")).intValue();
+			if (m_C_Payment_ID != 0)
+			{
+				m_mPayment = new MPayment(Env.getCtx(), m_C_Payment_ID, null);
+				m_mPaymentOriginal = new MPayment(Env.getCtx(), m_C_Payment_ID, null);	//	full copy
+				//  CreditCard
+				m_CCType = m_mPayment.getCreditCardType();
+				kNumberField.setText(m_mPayment.getCreditCardNumber());
+				kExpField.setText(m_mPayment.getCreditCardExp(null));
+				kApprovalField.setText(m_mPayment.getVoiceAuthCode());
+				kStatus.setText(m_mPayment.getR_PnRef());
+				kAmountField.setValue(m_mPayment.getPayAmt());
+				
+				//	if approved/paid, don't let it change
+				kTypeCombo.setEnabled(!m_mPayment.isApproved());
+				kNumberField.setReadonly(m_mPayment.isApproved());
+				kExpField.setReadonly(m_mPayment.isApproved());
+				kApprovalField.setReadonly(m_mPayment.isApproved());
+				kOnline.setEnabled(!m_mPayment.isApproved());
+				kAmountField.setReadWrite(!m_mPayment.isApproved());
+				//  Check
+				m_C_BankAccount_ID = m_mPayment.getC_BankAccount_ID();
+				sRoutingField.setText(m_mPayment.getRoutingNo());
+				sNumberField.setText(m_mPayment.getAccountNo());
+				sCheckField.setText(m_mPayment.getCheckNo());
+				sStatus.setText(m_mPayment.getR_PnRef());
+				sAmountField.setValue(m_mPayment.getPayAmt());
+				//  Transfer
+				tRoutingField.setText(m_mPayment.getRoutingNo());
+				tNumberField.setText(m_mPayment.getAccountNo());
+				tStatus.setText(m_mPayment.getR_PnRef());
+			}
+		}
+		if (m_mPayment == null)
+		{
+			m_mPayment = new MPayment (Env.getCtx (), 0, null);
+			m_mPayment.setAD_Org_ID(m_AD_Org_ID);
+			m_mPayment.setAmount (m_C_Currency_ID, m_Amount);
+		}
+
+		//  Existing Cashbook entry
+		m_cashLine = null;
+		m_C_CashLine_ID = 0;
+		if (m_mTab.getValue("C_CashLine_ID") != null)
+		{
+			m_C_CashLine_ID = ((Integer)m_mTab.getValue("C_CashLine_ID")).intValue();
+			if (m_C_CashLine_ID == 0)
+				m_cashLine = null;
+			else
+			{
+				m_cashLine = new MCashLine (Env.getCtx(), m_C_CashLine_ID, null);
+				m_DateAcct = m_cashLine.getStatementDate();
+				m_C_CashBook_ID = m_cashLine.getCashBook().getC_CashBook_ID();
+				bAmountField.setValue(m_cashLine.getAmount()); 
+			}
+		}
+
+		//	Accounting Date
+		bDateField.setValue(m_DateAcct);
+
+		if (s_Currencies == null)
+			loadCurrencies();
+
+		//	Is the currency an EMU currency?
+		Integer C_Currency_ID = new Integer(m_C_Currency_ID);
+		if (s_Currencies.containsKey(C_Currency_ID))
+		{
+			Enumeration<Integer> en = s_Currencies.keys();
+			while (en.hasMoreElements())
+			{
+				Object key = en.nextElement();
+				bCurrencyCombo.addItem(s_Currencies.get(key));
+				sCurrencyCombo.addItem(s_Currencies.get(key));
+			}
+			sCurrencyCombo.addActionListener(this);
+			sCurrencyCombo.setSelectedKeyNamePair(s_Currencies.get(C_Currency_ID));
+			bCurrencyCombo.addActionListener(this);
+			bCurrencyCombo.setSelectedKeyNamePair(s_Currencies.get(C_Currency_ID));
+		}
+		else	//	No EMU Currency
+		{
+			bCurrencyLabel.setVisible(false);	//	Cash
+			bCurrencyCombo.setVisible(false);
+			sCurrencyLabel.setVisible(false);	//	Check
+			sCurrencyCombo.setVisible(false);
+		}
+
+		/**
+		 *	Payment Combo
+		 */
+		if (m_PaymentRule == null)
+			m_PaymentRule = "";
+		ValueNamePair vp = null;
+		HashMap values = button.getValues();
+		Object[] a = values.keySet().toArray();
+		for (int i = 0; i < a.length; i++)
+		{			
+			String PaymentRule = (String)a[i];		//	used for Panel selection
+			if (X_C_Order.PAYMENTRULE_DirectDebit.equals(PaymentRule)			//	SO
+				&& !m_isSOTrx)
+				continue;
+			else if (X_C_Order.PAYMENTRULE_DirectDeposit.equals(PaymentRule)	//	PO 
+				&& m_isSOTrx)
+				continue;
+                                                
+			ValueNamePair pp = new ValueNamePair(PaymentRule, (String)values.get(a[i]));
+			paymentCombo.addItem(pp);
+			if (PaymentRule.toString().equals(m_PaymentRule))	//	to select
+				vp = pp;
+		}
+
+		//	Set PaymentRule
+		paymentCombo.addActionListener(this);
+		if (vp != null) {
+			paymentCombo.setSelectedValueNamePair(vp);
+			onPaymentComboSelection();
+		}
+
+		/**
+		 * 	Load Payment Terms
+		 */
+		String SQL = MRole.getDefault().addAccessSQL(
+			"SELECT C_PaymentTerm_ID, Name FROM C_PaymentTerm WHERE IsActive='Y' ORDER BY Name",
+			"C_PaymentTerm", MRole.SQL_NOTQUALIFIED, MRole.SQL_RO);
+		KeyNamePair kp = null;
+		try
+		{
+			PreparedStatement pstmt = DB.prepareStatement(SQL, null);
+			ResultSet rs = pstmt.executeQuery();
+			while (rs.next())
+			{
+				int key = rs.getInt(1);
+				String name = rs.getString(2);
+				KeyNamePair pp = new KeyNamePair(key, name);
+				pTermCombo.addItem(pp);
+				if (key == m_C_PaymentTerm_ID)
+					kp = pp;
+			}
+			rs.close();
+			pstmt.close();
+		}
+		catch (SQLException ept)
+		{
+			log.log(Level.SEVERE, SQL, ept);
+		}
+		//	Set Selection
+		if (kp != null)
+			pTermCombo.setSelectedKeyNamePair(kp);
+
+		/**
+		 * 	Load Accounts
+		 */
+		SQL = "SELECT a.C_BP_BankAccount_ID, NVL(b.Name, ' ')||a.AccountNo AS Acct "
+			+ "FROM C_BP_BankAccount a,C_Bank b "
+			+ "WHERE C_BPartner_ID=? AND a.IsActive='Y'";
+		kp = null;
+		try
+		{
+			PreparedStatement pstmt = DB.prepareStatement(SQL, null);
+			pstmt.setInt(1, m_C_BPartner_ID);
+			ResultSet rs = pstmt.executeQuery();
+			while (rs.next())
+			{
+				int key = rs.getInt(1);
+				String name = rs.getString(2);
+				KeyNamePair pp = new KeyNamePair(key, name);
+				tAccountCombo.addItem(pp);
+		//			kp = pp;
+			}
+			rs.close();
+			pstmt.close();
+		}
+		catch (SQLException eac)
+		{
+			log.log(Level.SEVERE, SQL, eac);
+		}
+		//	Set Selection
+		if (kp != null)
+			tAccountCombo.setSelectedKeyNamePair(kp);
+
+		/**
+		 *	Load Credit Cards
+		 */
+		ValueNamePair[] ccs = m_mPayment.getCreditCards();
+		vp = null;
+		for (int i = 0; i < ccs.length; i++)
+		{
+			kTypeCombo.addItem(ccs[i]);
+			if (ccs[i].getValue().equals(m_CCType))
+				vp = ccs[i];
+		}
+		//	Set Selection
+		if (vp != null)
+			kTypeCombo.setSelectedValueNamePair(vp);
+
+		/**
+		 *  Load Bank Accounts
+		 */
+		SQL = MRole.getDefault().addAccessSQL(
+			"SELECT C_BankAccount_ID, Name || ' ' || AccountNo, IsDefault "
+			+ "FROM C_BankAccount ba"
+			+ " INNER JOIN C_Bank b ON (ba.C_Bank_ID=b.C_Bank_ID) "
+			+ "WHERE b.IsActive='Y'",
+			"ba", MRole.SQL_FULLYQUALIFIED, MRole.SQL_RO);
+		kp = null;
+		try
+		{
+			PreparedStatement pstmt = DB.prepareStatement(SQL, null);
+			ResultSet rs = pstmt.executeQuery();
+			while (rs.next())
+			{
+				int key = rs.getInt(1);
+				String name = rs.getString(2);
+				KeyNamePair pp = new KeyNamePair(key, name);
+				sBankAccountCombo.addItem(pp);
+				if (key == m_C_BankAccount_ID)
+					kp = pp;
+				if (kp == null && rs.getString(3).equals("Y"))    //  Default
+					kp = pp;
+			}
+			rs.close();
+			pstmt.close();
+		}
+		catch (SQLException ept)
+		{
+			log.log(Level.SEVERE, SQL, ept);
+		}
+		//	Set Selection
+		if (kp != null)
+			sBankAccountCombo.setSelectedKeyNamePair(kp);
+
+
+		/**
+		 *  Load Cash Books
+		 */
+		SQL = MRole.getDefault().addAccessSQL(
+			"SELECT C_CashBook_ID, Name, AD_Org_ID FROM C_CashBook WHERE IsActive='Y'",
+			"C_CashBook", MRole.SQL_NOTQUALIFIED, MRole.SQL_RO);
+		kp = null;
+		try
+		{
+			PreparedStatement pstmt = DB.prepareStatement(SQL, null);
+			ResultSet rs = pstmt.executeQuery();
+			while (rs.next())
+			{
+				int key = rs.getInt(1);
+				String name = rs.getString(2);
+				KeyNamePair pp = new KeyNamePair(key, name);
+				bCashBookCombo.addItem(pp);
+				if (key == m_C_CashBook_ID)
+					kp = pp;
+				if (kp == null && key == m_AD_Org_ID)       //  Default Org
+					kp = pp;
+			}
+			rs.close();
+			pstmt.close();
+		}
+		catch (SQLException epc)
+		{
+			log.log(Level.SEVERE, SQL, epc);
+		}
+		//	Set Selection
+		if (kp != null)
+		{
+			bCashBookCombo.setSelectedKeyNamePair(kp);
+			if (m_C_CashBook_ID == 0)
+				m_C_CashBook_ID = kp.getKey();  //  set to default to avoid 'cashbook changed' message
+		}
+
+		//
+		return true;
+	}	//	dynInit
+
+	/**
+	 *	Init OK to be able to make changes?
+	 *  @return true if init OK
+	 */
+	public boolean isInitOK()
+	{
+		return m_initOK;
+	}	//	isInitOK
+
+
+	/**
+	 *	Fill s_Currencies with EMU currencies
+	 */
+	private void loadCurrencies()
+	{
+		s_Currencies = new Hashtable<Integer,KeyNamePair>(12);	//	Currenly only 10+1
+		String SQL = "SELECT C_Currency_ID, ISO_Code FROM C_Currency "
+			+ "WHERE (IsEMUMember='Y' AND EMUEntryDate<SysDate) OR IsEuro='Y' "
+			+ "ORDER BY 2";
+		try
+		{
+			PreparedStatement pstmt = DB.prepareStatement(SQL, null);
+			ResultSet rs = pstmt.executeQuery();
+			while (rs.next())
+			{
+				int id = rs.getInt(1);
+				String name = rs.getString(2);
+				s_Currencies.put(new Integer(id), new KeyNamePair(id, name));
+			}
+			rs.close();
+			pstmt.close();
+		}
+		catch (SQLException e)
+		{
+			log.log(Level.SEVERE, SQL, e);
+		}
+	}	//	loadCurrencies
+
+
+	/**************************************************************************
+	 *	Action Listener
+	 *  @param e event
+	 */
+	public void onEvent(Event e)
+	{
+		log.fine( "WPayment.actionPerformed - " + e.getTarget().getId());
+
+		//	Finish
+		if (e.getTarget().getId().equals(ConfirmPanel.A_OK))
+		{
+			if (checkMandatory())
+			{
+				saveChanges (); // cannot recover
+				dispose ();
+			}
+		}
+		else if (e.getTarget().getId().equals(ConfirmPanel.A_CANCEL))
+			dispose();
+
+		//	Payment Method Change
+		else if (e.getTarget() == paymentCombo)
+		{
+			onPaymentComboSelection();
+		}
+
+		//	Check Currency change
+		else if (e.getTarget() == sCurrencyCombo)
+		{
+			KeyNamePair pp = sCurrencyCombo.getSelectedItem().toKeyNamePair();
+			BigDecimal amt = MConversionRate.convert(Env.getCtx(),
+				m_Amount, m_C_Currency_ID, pp.getKey(), m_AD_Client_ID, m_AD_Org_ID);
+			sAmountField.setValue(amt);
+		}
+		//	Cash Currency change
+		else if (e.getTarget() == bCurrencyCombo)
+		{
+			KeyNamePair pp = bCurrencyCombo.getSelectedItem().toKeyNamePair();
+			BigDecimal amt = MConversionRate.convert(Env.getCtx(),
+				m_Amount, m_C_Currency_ID, pp.getKey(), m_AD_Client_ID, m_AD_Org_ID);
+			bAmountField.setValue(amt);
+		}
+
+		//  Online
+		else if (e.getTarget() == kOnline || e.getTarget() == sOnline)
+			processOnline();
+	}	//	actionPerformed
+
+
+	private void onPaymentComboSelection() {
+		//	get selection
+		ValueNamePair pp = paymentCombo.getSelectedItem().toValueNamePair();
+		if (pp != null)
+		{
+			String s = pp.getValue().toLowerCase();
+			if (X_C_Order.PAYMENTRULE_DirectDebit.equalsIgnoreCase(s))
+				s = X_C_Order.PAYMENTRULE_DirectDeposit.toLowerCase();
+			s += "Panel";	
+			show(s);	//	switch to panel
+			//Bojana&Daniel
+			//If Invoice is Vendor invoice then Cash has to be created by negative amount
+			int C_Invoice_ID = Env.getContextAsInt(Env.getCtx(), m_WindowNo, "C_Invoice_ID");
+			MInvoice invoice_tmp = new MInvoice (Env.getCtx(), C_Invoice_ID, null);
+			if (! invoice_tmp.isSOTrx())
+			{
+				bAmountField.setValue(m_Amount.negate());
+			}else {
+				bAmountField.setValue(m_Amount);
+			}
+			invoice_tmp = null;
+			
+		}
+	}
+
+
+	private void show(String s) {
+		for (Panel p : centerLayout) {
+			if (p.getId().equals(s))
+			{
+				if (!p.isVisible())
+					p.setVisible(true);
+			}
+			else if (p.isVisible())
+			{
+				p.setVisible(false);
+			}
+		}
+	}
+
+
+	/**************************************************************************
+	 *	Save Changes
+	 *	@return true, if eindow can exit
+	 */
+	private boolean saveChanges()
+	{
+		ValueNamePair vp = paymentCombo.getSelectedItem().toValueNamePair();
+		String newPaymentRule = vp.getValue();
+		log.info("New Rule: " + newPaymentRule);
+
+		//  only Payment Rule
+		if (m_onlyRule)
+		{
+			if (!newPaymentRule.equals(m_PaymentRule))
+				m_mTab.setValue("PaymentRule", newPaymentRule);
+			return true;
+		}
+
+		//	New Values
+		Timestamp newDateAcct = m_DateAcct;
+		int newC_PaymentTerm_ID = m_C_PaymentTerm_ID;
+		int newC_CashLine_ID = m_C_CashLine_ID;
+		int newC_CashBook_ID = m_C_CashBook_ID;
+		String newCCType = m_CCType;
+		int newC_BankAccount_ID = 0;
+		
+		//	B (Cash)		(Currency)
+		if (newPaymentRule.equals(X_C_Order.PAYMENTRULE_Cash))
+		{
+			KeyNamePair kp = bCashBookCombo.getSelectedItem().toKeyNamePair();
+			if (kp != null)
+				newC_CashBook_ID = kp.getKey();
+			newDateAcct = (Timestamp)bDateField.getValue();
+			
+			// Get changes to cash amount
+			m_mPayment.setAmount(m_C_Currency_ID, (BigDecimal) bAmountField.getValue());
+			m_Amount = (BigDecimal) bAmountField.getValue();			
+		}
+
+		//	K (CreditCard)  Type, Number, Exp, Approval
+		else if (newPaymentRule.equals(X_C_Order.PAYMENTRULE_CreditCard))
+		{
+			vp = kTypeCombo.getSelectedItem().toValueNamePair();
+			if (vp != null)
+				newCCType = vp.getValue();
+		}
+
+		//	T (Transfer)	BPartner_Bank
+		else if (newPaymentRule.equals(MOrder.PAYMENTRULE_DirectDeposit) 
+			|| newPaymentRule.equals(MOrder.PAYMENTRULE_DirectDebit) )
+		{
+			tAccountCombo.getSelectedItem();
+		}
+
+		//	P (PaymentTerm)	PaymentTerm
+		else if (newPaymentRule.equals(X_C_Order.PAYMENTRULE_OnCredit))
+		{
+			KeyNamePair kp = pTermCombo.getSelectedItem().toKeyNamePair();
+			if (kp != null)
+				newC_PaymentTerm_ID = kp.getKey();
+		}
+
+		//	S (Check)		(Currency) CheckNo, Routing
+		else if (newPaymentRule.equals(X_C_Order.PAYMENTRULE_Check))
+		{
+		//	sCurrencyCombo.getSelectedItem();
+			KeyNamePair kp = sBankAccountCombo.getSelectedItem().toKeyNamePair();
+			if (kp != null)
+				newC_BankAccount_ID = kp.getKey();
+		}
+		else
+			return false;
+
+		//  find Bank Account if not qualified yet
+		if ("KTSD".indexOf(newPaymentRule) != -1 && newC_BankAccount_ID == 0)
+		{
+			String tender = MPayment.TENDERTYPE_CreditCard;
+			if (newPaymentRule.equals(MOrder.PAYMENTRULE_DirectDeposit))
+				tender = MPayment.TENDERTYPE_DirectDeposit;
+			else if (newPaymentRule.equals(MOrder.PAYMENTRULE_DirectDebit))
+				tender = MPayment.TENDERTYPE_DirectDebit;
+			else if (newPaymentRule.equals(MOrder.PAYMENTRULE_Check))
+				tender = MPayment.TENDERTYPE_Check;
+		}
+
+		/***********************
+		 *  Changed PaymentRule
+		 */
+		if (!newPaymentRule.equals(m_PaymentRule))
+		{
+			log.fine("Changed PaymentRule: " + m_PaymentRule + " -> " + newPaymentRule);
+			//  We had a CashBook Entry
+			if (m_PaymentRule.equals(X_C_Order.PAYMENTRULE_Cash))
+			{
+				log.fine("Old Cash - " + m_cashLine);
+				if (m_cashLine != null)
+				{
+					MCashLine cl = m_cashLine.createReversal();
+					if (cl.save())
+						log.config( "CashCancelled");
+					else
+						FDialog.error(m_WindowNo, this, "PaymentError", "CashNotCancelled");
+				}
+				newC_CashLine_ID = 0;      //  reset
+			}
+			//  We had a change in Payment type (e.g. Check to CC)
+			else if ("KTSD".indexOf(m_PaymentRule) != -1 && "KTSD".indexOf(newPaymentRule) != -1 && m_mPaymentOriginal != null)
+			{
+				log.fine("Old Payment(1) - " + m_mPaymentOriginal);
+				m_mPaymentOriginal.setDocAction(DocAction.ACTION_Reverse_Correct);
+				boolean ok = m_mPaymentOriginal.processIt(DocAction.ACTION_Reverse_Correct);
+				m_mPaymentOriginal.save();
+				if (ok)
+					log.info( "Payment Canecelled - " + m_mPaymentOriginal);
+				else
+					FDialog.error(m_WindowNo, this, "PaymentError", "PaymentNotCancelled " + m_mPaymentOriginal.getDocumentNo());
+				m_mPayment.resetNew();
+			}
+			//	We had a Payment and something else (e.g. Check to Cash)
+			else if ("KTSD".indexOf(m_PaymentRule) != -1 && "KTSD".indexOf(newPaymentRule) == -1)
+			{
+				log.fine("Old Payment(2) - " + m_mPaymentOriginal);
+				if (m_mPaymentOriginal != null)
+				{
+					m_mPaymentOriginal.setDocAction(DocAction.ACTION_Reverse_Correct);
+					boolean ok = m_mPaymentOriginal.processIt(DocAction.ACTION_Reverse_Correct);
+					m_mPaymentOriginal.save();
+					if (ok)        //  Cancel Payment
+					{
+						log.fine("PaymentCancelled " + m_mPayment.getDocumentNo ());
+						m_mTab.getTableModel().dataSave(true);
+						m_mPayment.resetNew();
+						m_mPayment.setAmount(m_C_Currency_ID, m_Amount);
+					}
+					else
+						FDialog.error(m_WindowNo, this, "PaymentError", "PaymentNotCancelled " + m_mPayment.getDocumentNo());
+				}
+			}
+		}
+
+		//  Get Order and optionally Invoice
+		int C_Order_ID = Env.getContextAsInt(Env.getCtx(), m_WindowNo, "C_Order_ID");
+		int C_Invoice_ID = Env.getContextAsInt(Env.getCtx(), m_WindowNo, "C_Invoice_ID");
+		if (C_Invoice_ID == 0 && m_DocStatus.equals("CO"))
+			C_Invoice_ID = getInvoiceID (C_Order_ID);
+
+		//  Amount sign negative, if ARC (Credit Memo) or API (AP Invoice)
+		boolean negateAmt = false;
+		MInvoice invoice = null;
+		if (C_Invoice_ID != 0)
+		{
+			invoice = new MInvoice (Env.getCtx(), C_Invoice_ID, null);
+			negateAmt = invoice.isCreditMemo();
+		}
+		MOrder order = null;
+		if (invoice == null && C_Order_ID != 0)
+			order = new MOrder (Env.getCtx(), C_Order_ID, null);
+		
+		BigDecimal payAmount = m_Amount;
+		
+
+		if (negateAmt)
+			payAmount = m_Amount.negate();
+		// Info
+		log.config("C_Order_ID=" + C_Order_ID + ", C_Invoice_ID=" + C_Invoice_ID + ", NegateAmt=" + negateAmt);
+
+		/***********************
+		 *  CashBook
+		 */
+		if (newPaymentRule.equals(X_C_Order.PAYMENTRULE_Cash))
+		{
+			log.fine("Cash");
+			String description = (String)m_mTab.getValue("DocumentNo");
+			
+			if (C_Invoice_ID == 0 && order == null)
+			{
+				log.config("No Invoice!");
+				FDialog.error(m_WindowNo, this, "PaymentError", "CashNotCreated");
+			}
+			else
+			{
+				payAmount = (BigDecimal) bAmountField.getValue();
+				//  Changed Amount
+				if (m_cashLine != null
+					&& payAmount.compareTo(m_cashLine.getAmount()) != 0)
+				{
+					log.config("Changed CashBook Amount");
+					//m_cashLine.setAmount(payAmount);
+					m_cashLine.setAmount((BigDecimal) bAmountField.getValue());
+					// ADialog.info(m_WindowNo, this, "m_cashLine - Changed Amount", "Amount: "+m_cashLine.getAmount());
+					if (m_cashLine.save())
+						log.config("CashAmt Changed");
+				}
+				//	Different Date/CashBook
+				if (m_cashLine != null
+					&& (newC_CashBook_ID != m_C_CashBook_ID 
+						|| !TimeUtil.isSameDay(m_cashLine.getStatementDate(), newDateAcct)))
+				{
+					log.config("Changed CashBook/Date: " + m_C_CashBook_ID + "->" + newC_CashBook_ID);
+					MCashLine reverse = m_cashLine.createReversal();
+					if (!reverse.save())
+						FDialog.error(m_WindowNo, this, "PaymentError", "CashNotCancelled");
+					m_cashLine = null;
+				}
+				
+				//	Create new
+				if (m_cashLine == null)
+				{
+					log.config("New CashBook");
+					int C_Currency_ID = 0;
+					if (invoice != null)
+						C_Currency_ID = invoice.getC_Currency_ID();
+					if (C_Currency_ID == 0 && order != null)
+						C_Currency_ID = order.getC_Currency_ID();
+					MCash cash = null;
+					if (newC_CashBook_ID != 0)
+						cash = MCash.get (Env.getCtx(), newC_CashBook_ID, newDateAcct, null);
+					else	//	Default
+						cash = MCash.get (Env.getCtx(), m_AD_Org_ID, newDateAcct, C_Currency_ID, null);
+					if (cash == null || cash.get_ID() == 0)
+						FDialog.error(m_WindowNo, this, "PaymentError", CLogger.retrieveErrorString("CashNotCreated"));
+					else
+					{
+						MCashLine cl = new MCashLine (cash);
+						// cl.setAmount(new BigDecimal(bAmountField.getText()));
+						//ADialog.info(m_WindowNo, this, "m_cashLine - New Cashbook", "Amount: "+cl.getAmount());
+						if (invoice != null)
+							cl.setInvoice(invoice);	// overrides amount
+						if (order != null)
+						{
+							cl.setOrder(order, null); // overrides amount
+							m_needSave = true;
+						}
+						cl.setAmount((BigDecimal)bAmountField.getValue());
+						if (cl.save())
+						{	
+							log.config("CashCreated");
+							if (invoice == null && C_Invoice_ID != 0)
+							{
+								invoice = new MInvoice (Env.getCtx(), C_Invoice_ID, null);	
+							}
+							if (invoice != null) {
+								invoice.setC_CashLine_ID(cl.getC_CashLine_ID());
+								invoice.save();
+							}	
+							if (order == null && C_Order_ID != 0)
+							{
+								order = new MOrder (Env.getCtx(), C_Order_ID, null);
+							}
+							if (order != null) {
+								order.setC_CashLine_ID(cl.getC_CashLine_ID());
+								order.save();
+							}
+							log.config("Update Order & Invoice with CashLine");
+						}	
+						else
+							FDialog.error(m_WindowNo, this, "PaymentError", "CashNotCreated");
+					}
+				}
+			}	//	have invoice
+		}
+		/***********************
+		 *  Payments
+		 */
+		if ("KS".indexOf(newPaymentRule) != -1)
+		{
+			log.fine("Payment - " + newPaymentRule);
+			//  Set Amount
+			m_mPayment.setAmount(m_C_Currency_ID, payAmount);
+			if (newPaymentRule.equals(MOrder.PAYMENTRULE_CreditCard))
+			{
+				m_mPayment.setCreditCard(MPayment.TRXTYPE_Sales, newCCType,
+					kNumberField.getText(), "", kExpField.getText());
+				// Get changes to credit card amount
+				m_mPayment.setAmount(m_C_Currency_ID, (BigDecimal) kAmountField.getValue());
+				m_mPayment.setPaymentProcessor();
+			}
+			else if (newPaymentRule.equals(MOrder.PAYMENTRULE_DirectDeposit)
+				|| newPaymentRule.equals(MOrder.PAYMENTRULE_DirectDebit))
+			{
+				m_mPayment.setBankACH(newC_BankAccount_ID, m_isSOTrx, newPaymentRule, 
+					tRoutingField.getText(), tNumberField.getText());
+				m_mPayment.setAmount(m_C_Currency_ID, payAmount);
+			}
+			else if (newPaymentRule.equals(MOrder.PAYMENTRULE_Check))
+			{
+				m_mPayment.setBankCheck(newC_BankAccount_ID, m_isSOTrx, sRoutingField.getText(),
+					sNumberField.getText(), sCheckField.getText());
+				// Get changes to check amount
+				m_mPayment.setAmount(m_C_Currency_ID, (BigDecimal) sAmountField.getValue());
+			}
+			m_mPayment.setC_BPartner_ID(m_C_BPartner_ID);
+			m_mPayment.setC_Invoice_ID(C_Invoice_ID);
+			if (order != null)
+			{
+				m_mPayment.setC_Order_ID(C_Order_ID);
+				m_needSave = true;
+			}
+			m_mPayment.setDateTrx(m_DateAcct);
+			m_mPayment.setDateAcct(m_DateAcct);
+			if (!m_mPayment.save())
+				FDialog.error(m_WindowNo, this, "PaymentError", "PaymentNotCreated");;
+			
+			//  Save/Post
+			if (m_mPayment.get_ID() > 0 && MPayment.DOCSTATUS_Drafted.equals(m_mPayment.getDocStatus()))
+			{
+				boolean ok = m_mPayment.processIt(DocAction.ACTION_Complete);
+				m_mPayment.save();
+				if (ok)
+					FDialog.info(m_WindowNo, this, "PaymentCreated", m_mPayment.getDocumentNo());
+				else
+					FDialog.error(m_WindowNo, this, "PaymentError", "PaymentNotCreated");
+			}
+			else
+				log.fine("NotDraft " + m_mPayment);
+		}
+
+
+		/**********************
+		 *	Save Values to mTab
+		 */
+		log.config("Saving changes");
+		//
+		if (!newPaymentRule.equals(m_PaymentRule))
+			m_mTab.setValue("PaymentRule", newPaymentRule);
+		//
+		if (!newDateAcct.equals(m_DateAcct))
+			m_mTab.setValue("DateAcct", newDateAcct);
+		//
+		if (newC_PaymentTerm_ID != m_C_PaymentTerm_ID)
+			m_mTab.setValue("C_PaymentTerm_ID", new Integer(newC_PaymentTerm_ID));
+		//	Set Payment
+		if (m_mPayment.getC_Payment_ID() != m_C_Payment_ID)
+		{
+			if (m_mPayment.getC_Payment_ID() == 0)
+				m_mTab.setValue("C_Payment_ID", null);
+			else
+				m_mTab.setValue("C_Payment_ID", new Integer(m_mPayment.getC_Payment_ID()));
+		}
+		//	Set Cash
+		if (newC_CashLine_ID != m_C_CashLine_ID)
+		{
+			if (newC_CashLine_ID == 0)
+				m_mTab.setValue("C_CashLine_ID", null);
+			else
+				m_mTab.setValue("C_CashLine_ID", new Integer(newC_CashLine_ID));
+		}
+		return true;
+	}	//	saveChanges
+
+	/**
+	 *  Check Mandatory
+	 *  @return true if all mandatory items are OK
+	 */
+	private boolean checkMandatory()
+	{
+		log.config( "VPayment.checkMandatory");
+
+		ValueNamePair vp = paymentCombo.getSelectedItem().toValueNamePair();
+		String PaymentRule = vp.getValue();
+		//  only Payment Rule
+		if (m_onlyRule)
+			return true;
+
+		Timestamp DateAcct = m_DateAcct;
+		int C_PaymentTerm_ID = m_C_PaymentTerm_ID;
+		int C_CashBook_ID = m_C_CashBook_ID;
+		String CCType = m_CCType;
+		//
+		int C_BankAccount_ID = 0;
+
+		/***********************
+		 *	Mandatory Data Check
+		 */
+		boolean dataOK = true;
+		//	B (Cash)		(Currency)
+		if (PaymentRule.equals(MOrder.PAYMENTRULE_Cash))
+		{
+			KeyNamePair kp = bCashBookCombo.getSelectedItem().toKeyNamePair();
+			if (kp != null)
+				C_CashBook_ID = kp.getKey();
+			DateAcct = (Timestamp)bDateField.getValue();
+		}
+
+		//	K (CreditCard)  Type, Number, Exp, Approval
+		else if (PaymentRule.equals(MOrder.PAYMENTRULE_CreditCard))
+		{
+			vp = kTypeCombo.getSelectedItem().toValueNamePair();
+			if (vp != null)
+				CCType = vp.getValue();
+			//
+			String error = MPaymentValidate.validateCreditCardNumber(kNumberField.getText(), CCType);
+			if (error.length() != 0)
+			{
+				if (error.indexOf('?') == -1)
+				{
+					FDialog.error(m_WindowNo, this, error);
+					dataOK = false;
+				}
+				else    //  warning
+				{
+					if (!FDialog.ask(m_WindowNo, this, error))
+						dataOK = false;
+				}
+			}
+			error = MPaymentValidate.validateCreditCardExp(kExpField.getText());
+			if(error.length() != 0)
+			{
+				FDialog.error(m_WindowNo, this, error);
+				dataOK = false;
+			}
+		}
+
+		//	T (Transfer)	BPartner_Bank
+		else if (PaymentRule.equals(X_C_Order.PAYMENTRULE_DirectDeposit)
+			|| PaymentRule.equals(X_C_Order.PAYMENTRULE_DirectDebit))
+		{
+			KeyNamePair bpba = tAccountCombo.getSelectedItem().toKeyNamePair();
+			if (bpba == null)
+
+			{
+				FDialog.error(m_WindowNo, this, "PaymentBPBankNotFound");
+				dataOK = false;
+			}
+		}	//	Direct
+
+		//	P (PaymentTerm)	PaymentTerm
+		else if (PaymentRule.equals(X_C_Order.PAYMENTRULE_OnCredit))
+		{
+			KeyNamePair kp = pTermCombo.getSelectedItem().toKeyNamePair();
+			if (kp != null)
+				C_PaymentTerm_ID = kp.getKey();
+		}
+
+		//	S (Check)		(Currency) CheckNo, Routing
+		else if (PaymentRule.equals(MOrder.PAYMENTRULE_Check))
+		{
+		//	sCurrencyCombo.getSelectedItem();
+			KeyNamePair kp = sBankAccountCombo.getSelectedItem().toKeyNamePair();
+			if (kp != null)
+				C_BankAccount_ID = kp.getKey();
+			String error = MPaymentValidate.validateRoutingNo(sRoutingField.getText());
+			if (error.length() != 0)
+			{
+				FDialog.error(m_WindowNo, this, error);
+				dataOK = false;
+			}
+			error = MPaymentValidate.validateAccountNo(sNumberField.getText());
+			if (error.length() != 0)
+			{
+				FDialog.error(m_WindowNo, this, error);
+				dataOK = false;
+			}
+			error = MPaymentValidate.validateCheckNo(sCheckField.getText());
+			if (error.length() != 0)
+			{
+				FDialog.error(m_WindowNo, this, error);
+				dataOK = false;
+			}
+		}
+		else
+		{
+			log.log(Level.SEVERE, "Unknown PaymentRule " + PaymentRule);
+			return false;
+		}
+
+		//  find Bank Account if not qualified yet
+		if ("KTSD".indexOf(PaymentRule) != -1 && C_BankAccount_ID == 0)
+		{
+			String tender = MPayment.TENDERTYPE_CreditCard;
+			if (PaymentRule.equals(MOrder.PAYMENTRULE_DirectDeposit))
+				tender = MPayment.TENDERTYPE_DirectDeposit;
+			else if (PaymentRule.equals(MOrder.PAYMENTRULE_DirectDebit))
+				tender = MPayment.TENDERTYPE_DirectDebit;
+			else if (PaymentRule.equals(MOrder.PAYMENTRULE_Check))
+				tender = MPayment.TENDERTYPE_Check;
+			//	Check must have a bank account
+			if (C_BankAccount_ID == 0 && "S".equals(PaymentRule))
+                        {
+				FDialog.error(m_WindowNo, this, "PaymentNoProcessor");
+				dataOK = false;
+			}
+		}
+		//
+		log.config("OK=" + dataOK);
+		return dataOK;
+	}   //  checkMandatory
+
+	/**
+	 *  Get Invoice ID for Order
+	 *  @param C_Order_ID order
+	 *  @return C_Invoice_ID or 0 if not found
+	 */
+	private static int getInvoiceID (int C_Order_ID)
+	{
+		int retValue = 0;
+		String sql = "SELECT C_Invoice_ID FROM C_Invoice WHERE C_Order_ID=? "
+			+ "ORDER BY C_Invoice_ID DESC";     //  last invoice
+		try
+		{
+			PreparedStatement pstmt = DB.prepareStatement(sql, null);
+			pstmt.setInt(1, C_Order_ID);
+			ResultSet rs = pstmt.executeQuery();
+			if (rs.next())
+				retValue = rs.getInt(1);
+			rs.close();
+			pstmt.close();
+		}
+		catch (SQLException e)
+		{
+			log.log(Level.SEVERE, sql, e);
+		}
+		return retValue;
+	}   //  getInvoiceID
+
+	
+	/**************************************************************************

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6274
          http://adempiere.svn.sourceforge.net/adempiere/?rev=6274&view=rev
Author:   hengsin
Date:     2008-08-29 04:56:16 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------
[ 2075221 ] Create PO from Requistion window does not close properly

Modified Paths:
--------------
    branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java

Modified: branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
===================================================================
--- branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java	2008-08-29 04:35:31 UTC (rev 6273)
+++ branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java	2008-08-29 04:56:16 UTC (rev 6274)
@@ -123,14 +123,14 @@
 		String label = Msg.getMsg(Env.getCtx(), "Ok");
 		bOK = new Button(label.replaceAll("&", ""));
 		bOK.setImage("/images/Ok16.png");
-		bOK.setName("ok");
+		bOK.setId("Ok");
 		bOK.addEventListener(Events.ON_CLICK, this);
 		hbox.appendChild(bOK);
 		
 		label = Msg.getMsg(Env.getCtx(), "Cancel");
 		Button btn = new Button(label.replaceAll("&", ""));
 		btn.setImage("/images/Cancel16.png");
-		btn.setName("cancel");
+		btn.setId("Cancel");
 		btn.addEventListener(Events.ON_CLICK, this);
 		
 		hbox.appendChild(btn);
@@ -306,12 +306,12 @@
 		Component component = event.getTarget(); 
 		if (component instanceof Button) {
 			Button element = (Button)component;
-			if ("ok".equalsIgnoreCase(element.getName())) {
+			if ("Ok".equalsIgnoreCase(element.getId())) {
 				if (element.getLabel().length() > 0)
 					this.startProcess();
 				else
 					this.dispose();
-			} else if ("cancel".equalsIgnoreCase(element.getName())) {
+			} else if ("Cancel".equalsIgnoreCase(element.getId())) {
 				this.dispose();
 			}
 		}
@@ -380,7 +380,9 @@
 			.append("</font></p>");
 		m_messageText.append(pi.getLogInfo(true));
 		message.setContent(m_messageText.toString());
-		//message.setCaretPosition(message.getDocument().getLength());	//	scroll down
+		
+		bOK.setLabel("");
+		
 		m_ids = pi.getIDs();
 		
 		//no longer needed, hide to give more space to display log


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6273
          http://adempiere.svn.sourceforge.net/adempiere/?rev=6273&view=rev
Author:   hengsin
Date:     2008-08-29 04:35:31 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------
[ 2077897 ] Cash Journal Advance LookUp Bug

Modified Paths:
--------------
    branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/window/FindWindow.java

Modified: branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
===================================================================
--- branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/window/FindWindow.java	2008-08-29 04:20:22 UTC (rev 6272)
+++ branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/window/FindWindow.java	2008-08-29 04:35:31 UTC (rev 6273)
@@ -631,6 +631,7 @@
         editor = WebEditorFactory.getEditor(mField, false);
         editor.setMandatory(false);
         editor.setReadWrite(true);
+        editor.dynamicDisplay();
         Label label = editor.getLabel();
         Component fieldLabel = editor.getComponent();
               
@@ -1182,6 +1183,7 @@
         m_editor.setValue(null);
         m_editor.setReadWrite(enabled);
         m_editor.setVisible(enabled);
+        m_editor.dynamicDisplay();
         //
         return m_editor.getComponent();
         


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6272
          http://adempiere.svn.sourceforge.net/adempiere/?rev=6272&view=rev
Author:   hengsin
Date:     2008-08-29 04:20:22 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------
[ 2078200 ] GL Journal account combination bug

Modified Paths:
--------------
    branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java

Modified: branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java
===================================================================
--- branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java	2008-08-29 03:28:59 UTC (rev 6271)
+++ branches/adempiere341/zkwebui/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java	2008-08-29 04:20:22 UTC (rev 6272)
@@ -477,6 +477,7 @@
 		m_row.appendChild(div);
 
 		m_row.appendChild(editor.getComponent());
+		editor.dynamicDisplay();
 		//
 		m_newRow = !m_newRow;
 	}	//	addLine


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6270
          http://adempiere.svn.sourceforge.net/adempiere/?rev=6270&view=rev
Author:   vpj-cd
Date:     2008-08-29 02:59:34 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------
fixes some issues

Modified Paths:
--------------
    branches/stable/base/src/org/compiere/process/DistributionRun.java
    branches/stable/base/src/org/eevolution/process/DistributionRunOrders.java

Modified: branches/stable/base/src/org/compiere/process/DistributionRun.java
===================================================================
--- branches/stable/base/src/org/compiere/process/DistributionRun.java	2008-08-29 00:51:57 UTC (rev 6269)
+++ branches/stable/base/src/org/compiere/process/DistributionRun.java	2008-08-29 02:59:34 UTC (rev 6270)
@@ -589,17 +589,16 @@
 			+"rl.AD_Client_ID,rl.AD_Org_ID, rl.IsActive, rl.Created,rl.CreatedBy, rl.Updated,rl.UpdatedBy, "
 			+"ll.C_BPartner_ID, ll.C_BPartner_Location_ID, rl.M_Product_ID,"
 			// Ration for this process is equal QtyToDeliver
-			+" (ol.QtyOrdered-ol.QtyDelivered-TargetQty) , "
+			+"COALESCE (ol.QtyOrdered-ol.QtyDelivered-TargetQty, 0) , "
 			// Min Qty for this process is equal to TargetQty
 			+" 0 , 0 FROM M_DistributionRunLine rl "
 			+"INNER JOIN M_DistributionList l ON (rl.M_DistributionList_ID=l.M_DistributionList_ID) "
 			+"INNER JOIN M_DistributionListLine ll ON (rl.M_DistributionList_ID=ll.M_DistributionList_ID) "
 			+"INNER JOIN DD_Order o ON (o.C_BPartner_ID=ll.C_BPartner_ID) "
-			+"INNER JOIN DD_OrderLine ol ON (ol.DD_Order_ID=o.DD_Order_ID AND ol.M_Product_ID=rl.M_Product_ID) AND ol.DatePromised"
-			//+ " BETWEEN "+ DB.TO_DATE(p_DatePromised)  +" AND "+ DB.TO_DATE(p_DatePromised_To) 
-			+ " <= "+DB.TO_DATE(p_DatePromised) 
-			+" INNER JOIN M_Locator loc ON (loc.M_Locator_ID=ol.M_Locator_ID AND loc.M_Warehouse_ID="+p_M_Warehouse_ID+") "
-			+" WHERE rl.M_DistributionRun_ID="+p_M_DistributionRun_ID+" AND rl.IsActive='Y' AND ll.IsActive='Y'";	
+			+"INNER JOIN DD_OrderLine ol ON (ol.DD_Order_ID=o.DD_Order_ID AND ol.M_Product_ID=rl.M_Product_ID) "		
+			+"INNER JOIN M_Locator loc ON (loc.M_Locator_ID=ol.M_Locator_ID AND loc.M_Warehouse_ID="+p_M_Warehouse_ID+") "
+			+"WHERE rl.M_DistributionRun_ID="+p_M_DistributionRun_ID+" AND rl.IsActive='Y' AND ll.IsActive='Y' AND ol.DatePromised <= "+DB.TO_DATE(p_DatePromised);	
+			//+ " BETWEEN "+ DB.TO_DATE(p_DatePromised)  +" AND "+ DB.TO_DATE(p_DatePromised_To) 	
 			no = DB.executeUpdate(sql, get_TrxName());
 			
 			Query query = MTable.get(getCtx(), MDistributionRunDetail.Table_ID).
@@ -780,9 +779,9 @@
 			 	   			line.setM_Product_ID(detail.getM_Product_ID());
 			 	   			line.setConfirmedQty(line.getTargetQty().add(detail.getActualAllocation()));
 			 	   			if(p_M_Warehouse_ID>0)
-			 	   			line.setDescription("Distribucion Pull");
+			 	   			line.setDescription(Msg.translate(getCtx(), "PlannedQty"));
 			 	   			else 
-			 	   			line.setDescription("Distribution Push");
+			 	   			line.setDescription(m_run.getDescription());
 			 	   			if (!line.save())
 			 	   			{
 			 	   				log.log(Level.SEVERE, "OrderLine not saved");
@@ -927,6 +926,7 @@
 											    //MDDOrder.COLUMNNAME_DatePromised   +" BETWEEN ? AND ? ", get_TrxName());			
 							//query.setParameters(new Object[]{lastC_BPartner_ID, ws[0].getM_Warehouse_ID(), p_DatePromised,p_DatePromised_To});
 							  query.setParameters(new Object[]{lastC_BPartner_ID, ws[0].getM_Warehouse_ID(), p_DatePromised});
+							  query.setOrderBy(MDDOrder.COLUMNNAME_DatePromised +" DESC");
 				
 			    order = query.first();
 			}
@@ -987,7 +987,7 @@
 			{
 
 				//String sql = "SELECT DD_OrderLine_ID FROM DD_OrderLine ol INNER JOIN DD_Order o ON (o.DD_Order_ID=ol.DD_Order_ID) WHERE o.DocStatus IN ('DR','IN') AND o.C_BPartner_ID = ? AND M_Product_ID=? AND  ol.M_Locator_ID=?  AND ol.DatePromised BETWEEN ? AND ? ";
-				String sql = "SELECT DD_OrderLine_ID FROM DD_OrderLine ol INNER JOIN DD_Order o ON (o.DD_Order_ID=ol.DD_Order_ID) WHERE o.DocStatus IN ('DR','IN') AND o.C_BPartner_ID = ? AND M_Product_ID=? AND  ol.M_Locator_ID=?  AND ol.DatePromised <= ?";				
+				String sql = "SELECT DD_OrderLine_ID FROM DD_OrderLine ol INNER JOIN DD_Order o ON (o.DD_Order_ID=ol.DD_Order_ID) WHERE o.DocStatus IN ('DR','IN') AND o.C_BPartner_ID = ? AND M_Product_ID=? AND  ol.M_Locator_ID=?  AND ol.DatePromised <= ? ORDER BY DatePromised DESC";				
 				//int DD_OrderLine_ID = DB.getSQLValue(get_TrxName(), sql, new Object[]{detail.getC_BPartner_ID(),product.getM_Product_ID(), m_locator.getM_Locator_ID(), p_DatePromised,p_DatePromised_To});
 				int DD_OrderLine_ID = DB.getSQLValue(get_TrxName(), sql, new Object[]{detail.getC_BPartner_ID(),product.getM_Product_ID(), m_locator.getM_Locator_ID(), p_DatePromised});	
 				if (DD_OrderLine_ID  <= 0)
@@ -1002,13 +1002,13 @@
 					line.setTargetQty(detail.getActualAllocation());
 					line.setQtyEntered(detail.getActualAllocation());
 					line.setConfirmedQty(detail.getActualAllocation());
-					line.setDescription("Distribution Push");
+					line.setDescription(m_run.getDescription());
 					line.saveEx();
 				}
 				else 
 				{
 					MDDOrderLine line = new MDDOrderLine(getCtx(), DD_OrderLine_ID, get_TrxName());		
-					line.setDescription(line.getDescription().concat(" "+Msg.translate(getCtx(), "Qty")+" Push " +m_run.getDescription()+ " " + detail.getActualAllocation()));
+					line.setDescription(line.getDescription().concat(" " +m_run.getDescription()+ Msg.translate(getCtx(), "Qty")+ " = " +detail.getActualAllocation()));
 					line.setConfirmedQty(line.getConfirmedQty().add(detail.getActualAllocation()));
 					line.saveEx();
 				}
@@ -1035,7 +1035,7 @@
 				line.setTargetQty(detail.getActualAllocation());
 				line.setQtyEntered(detail.getActualAllocation());
 				line.setConfirmedQty(detail.getActualAllocation());
-				line.setDescription("Distribution Push");
+				line.setDescription(m_run.getDescription());
 				if (!line.save())
 				{
 					log.log(Level.SEVERE, "OrderLine not saved");

Modified: branches/stable/base/src/org/eevolution/process/DistributionRunOrders.java
===================================================================
--- branches/stable/base/src/org/eevolution/process/DistributionRunOrders.java	2008-08-29 00:51:57 UTC (rev 6269)
+++ branches/stable/base/src/org/eevolution/process/DistributionRunOrders.java	2008-08-29 02:59:34 UTC (rev 6270)
@@ -29,6 +29,7 @@
 import org.compiere.model.MPInstancePara;
 import org.compiere.model.MProcess;
 import org.compiere.model.MStorage;
+import org.compiere.model.Query;
 import org.compiere.process.ProcessInfo;
 import org.compiere.process.ProcessInfoParameter;
 import org.compiere.process.SvrProcess;
@@ -37,6 +38,7 @@
 import org.compiere.util.Env;
 import org.compiere.util.Msg;
 import org.compiere.util.Trx;
+import org.eevolution.model.MDDOrderLine;
 
 /**
  * DistributionRun Orders 
@@ -198,8 +200,6 @@
     	StringBuffer sql = new StringBuffer("SELECT M_Product_ID , SUM (TargetQty) AS MinQty, SUM (QtyOrdered-QtyDelivered) AS TotalQty, l.M_Warehouse_ID FROM DD_OrderLine ol INNER JOIN M_Locator l ON (l.M_Locator_ID=ol.M_Locator_ID) INNER JOIN DD_Order o ON (o.DD_Order_ID=ol.DD_Order_ID) ");
     	//sql.append(" WHERE o.DocStatus IN ('DR','IN') AND ol.DatePromised BETWEEN ? AND ? AND l.M_Warehouse_ID=? GROUP BY M_Product_ID, l.M_Warehouse_ID");
     	sql.append(" WHERE o.DocStatus IN ('DR','IN') AND ol.DatePromised <= ? AND l.M_Warehouse_ID=? GROUP BY M_Product_ID, l.M_Warehouse_ID");
-
-    	
  	    PreparedStatement pstmt = null;
 	    ResultSet rs = null;
  	    try
@@ -265,38 +265,14 @@
      private BigDecimal getQtyReserved(int M_Product_ID)
  	{
  		StringBuffer sql = new StringBuffer("SELECT SUM (TargetQty)  FROM DD_OrderLine ol INNER JOIN M_Locator l ON (l.M_Locator_ID=ol.M_Locator_ID) INNER JOIN DD_Order o ON (o.DD_Order_ID=ol.DD_Order_ID) ");
-     	sql.append(" WHERE o.DocStatus IN ('DR','IN') AND ol.DatePromised BETWEEN ? AND ? AND l.M_Warehouse_ID=? AND ol.M_Product_ID=? GROUP BY M_Product_ID, l.M_Warehouse_ID");
-
-     	
-  	    PreparedStatement pstmt = null;
- 	    ResultSet rs = null;
- 	    Timestamp today = new Timestamp (System.currentTimeMillis());  
-  	    try
-  	    {
-            pstmt = DB.prepareStatement (sql.toString(), get_TrxName());
-    		pstmt.setTimestamp(1, today);
-    		pstmt.setTimestamp(2, p_DatePromised);
-    		pstmt.setInt(3, p_M_Warehouse_ID);
-    		pstmt.setInt(4, M_Product_ID);
-            rs = pstmt.executeQuery();
-            while (rs.next())
-            {
-            	return rs.getBigDecimal(1);
-            }
-  		}
-  	    catch (Exception e)
-  		{
-        	log.log(Level.SEVERE,"doIt - " + sql, e);
-            return Env.ZERO;
-  		}
-  		finally
-  		{
-  			DB.close(rs, pstmt);
-  			rs = null;
-  			pstmt = null;
-  		}	    
-     	 
-     	return Env.ZERO; 
+     	//sql.append(" WHERE o.DocStatus IN ('DR','IN') AND ol.DatePromised BETWEEN ? AND ? AND l.M_Warehouse_ID=? AND ol.M_Product_ID=? GROUP BY M_Product_ID, l.M_Warehouse_ID");
+ 		sql.append(" WHERE o.DocStatus IN ('DR','IN') AND ol.DatePromised <= ? AND l.M_Warehouse_ID=? AND ol.M_Product_ID=? GROUP BY M_Product_ID, l.M_Warehouse_ID");
+ 		BigDecimal qty = DB.getSQLValueBD(get_TrxName(), sql.toString(), new Object[]{p_DatePromised, p_M_Warehouse_ID, M_Product_ID}); 		
+		//	SQL may return no rows or null
+		if (qty == null)
+			return Env.ZERO;
+		
+ 		return qty;
       }
      
      /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6269
          http://adempiere.svn.sourceforge.net/adempiere/?rev=6269&view=rev
Author:   vpj-cd
Date:     2008-08-29 00:51:57 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------
Fixed the setSalesRep and getLine Method  

Modified Paths:
--------------
    branches/stable/base/src/org/eevolution/model/MDDOrder.java

Modified: branches/stable/base/src/org/eevolution/model/MDDOrder.java
===================================================================
--- branches/stable/base/src/org/eevolution/model/MDDOrder.java	2008-08-28 22:20:45 UTC (rev 6268)
+++ branches/stable/base/src/org/eevolution/model/MDDOrder.java	2008-08-29 00:51:57 UTC (rev 6269)
@@ -316,8 +316,12 @@
 		//	Default Invoice/Payment Rule
 		ss = bp.getInvoiceRule();
 
-		if (ii != 0)
-		setSalesRep_ID(ii);
+		if (getSalesRep_ID() == 0)
+		{
+			ii = Env.getContextAsInt(getCtx(), "#AD_User_ID");
+			if (ii != 0)
+				setSalesRep_ID (ii);
+		}
 
 
 		//	Set Locations
@@ -474,7 +478,7 @@
 		if (m_lines != null && !requery)
 			return m_lines;
 		//
-		String orderClause = "ORDER BY ";
+		String orderClause = "";
 		if (orderBy != null && orderBy.length() > 0)
 			orderClause += orderBy;
 		else
@@ -661,7 +665,7 @@
 		//	Default Sales Rep
 		if (getSalesRep_ID() == 0)
 		{
-			int ii = Env.getContextAsInt(getCtx(), "#SalesRep_ID");
+			int ii = Env.getContextAsInt(getCtx(), "#AD_User_ID");
 			if (ii != 0)
 				setSalesRep_ID (ii);
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.