FR [2170521] Add charge to Import Order

This commit is contained in:
Carlos Ruiz 2008-10-16 14:20:35 +00:00
parent f2a7d111fd
commit 90c4880ccc
1 changed files with 18 additions and 7 deletions

View File

@ -1,5 +1,5 @@
/****************************************************************************** /******************************************************************************
* Product: Adempiere ERP & CRM Smart Business Solution * * Product: Adempiere ERP & CRM Smart Business Solution *
* Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved. * * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved. *
* This program is free software; you can redistribute it and/or modify it * * 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 * * under the terms version 2 of the GNU General Public License as published *
@ -16,11 +16,22 @@
*****************************************************************************/ *****************************************************************************/
package org.compiere.process; package org.compiere.process;
import java.math.*; import java.math.BigDecimal;
import java.sql.*; import java.sql.PreparedStatement;
import java.util.logging.*; import java.sql.ResultSet;
import org.compiere.model.*; import java.sql.SQLException;
import org.compiere.util.*; import java.sql.Timestamp;
import java.util.logging.Level;
import org.compiere.model.MBPartner;
import org.compiere.model.MBPartnerLocation;
import org.compiere.model.MLocation;
import org.compiere.model.MOrder;
import org.compiere.model.MOrderLine;
import org.compiere.model.MUser;
import org.compiere.model.X_I_Order;
import org.compiere.util.DB;
import org.compiere.util.Env;
/** /**
* Import Order from I_Order * Import Order from I_Order
@ -440,7 +451,7 @@ public class ImportOrder extends SvrProcess
log.warning ("Invalid Charge=" + no); log.warning ("Invalid Charge=" + no);
// //
sql = new StringBuffer ("UPDATE I_Invoice " sql = new StringBuffer ("UPDATE I_Order "
+ "SET I_IsImported='E', I_ErrorMsg=I_ErrorMsg||'ERR=Product and Charge, ' " + "SET I_IsImported='E', I_ErrorMsg=I_ErrorMsg||'ERR=Product and Charge, ' "
+ "WHERE M_Product_ID IS NOT NULL AND C_Charge_ID IS NOT NULL " + "WHERE M_Product_ID IS NOT NULL AND C_Charge_ID IS NOT NULL "
+ " AND I_IsImported<>'Y'").append (clientCheck); + " AND I_IsImported<>'Y'").append (clientCheck);