From baeaa60825289084f5c5ced904560c336c599618 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 1 Mar 2007 04:51:11 +0000 Subject: [PATCH] other two little bug fixes reported --- base/src/org/compiere/model/MCost.java | 6 +++--- base/src/org/compiere/process/ImportBPartner.java | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/base/src/org/compiere/model/MCost.java b/base/src/org/compiere/model/MCost.java index 161cf9546b..ed3609bfd6 100644 --- a/base/src/org/compiere/model/MCost.java +++ b/base/src/org/compiere/model/MCost.java @@ -726,16 +726,16 @@ public class MCost extends X_M_Cost for (int o = 0; o < orgs.length; o++) { MCost cost = MCost.get (product, M_ASI_ID, - as, orgs[i].getAD_Org_ID(), ce.getM_CostElement_ID()); + as, orgs[o].getAD_Org_ID(), ce.getM_CostElement_ID()); if (cost.is_new()) { if (cost.save()) s_log.config("Std.Cost for " + product.getName() - + " - " + orgs[i].getName() + + " - " + orgs[o].getName() + " - " + as.getName()); else s_log.warning("Not created: Std.Cost for " + product.getName() - + " - " + orgs[i].getName() + + " - " + orgs[o].getName() + " - " + as.getName()); } } // for all orgs diff --git a/base/src/org/compiere/process/ImportBPartner.java b/base/src/org/compiere/process/ImportBPartner.java index 16552951c1..732e968feb 100644 --- a/base/src/org/compiere/process/ImportBPartner.java +++ b/base/src/org/compiere/process/ImportBPartner.java @@ -305,7 +305,9 @@ public class ImportBPartner extends SvrProcess if (impBP.getTaxID() != null) bp.setTaxID(impBP.getTaxID()); if (impBP.getNAICS() != null) - bp.setNAICS(impBP.getNAICS()); + bp.setNAICS(impBP.getNAICS()); + if (impBP.getDescription() != null) + bp.setDescription(impBP.getDescription()); if (impBP.getC_BP_Group_ID() != 0) bp.setC_BP_Group_ID(impBP.getC_BP_Group_ID()); // @@ -470,7 +472,7 @@ public class ImportBPartner extends SvrProcess user.setDescription(impBP.getContactDescription()); user.setComments(impBP.getComments()); user.setPhone(impBP.getPhone()); - user.setPhone(impBP.getPhone2()); + user.setPhone2(impBP.getPhone2()); user.setFax(impBP.getFax()); user.setEMail(impBP.getEMail()); user.setBirthday(impBP.getBirthday());