midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-1443 leadconversion - can't translate

This commit is contained in:
Carlos Ruiz 2013-10-30 12:15:42 -05:00
parent 1b879bcd2a
commit e2b9f877ee
3 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
migration/i1.0c-release/oracle/201310301212_IDEMPIERE-1443.sql Normal file
View File

@ -0,0 +1,16 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- 30/10/2013 12:11:00 PM COT
-- IDEMPIERE-1443 leadconversion - can't translate
UPDATE AD_Field SET IsAllowCopy='N',Updated=TO_DATE('2013-10-30 12:11:00','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62137
;
-- 30/10/2013 12:12:23 PM COT
-- IDEMPIERE-1443 leadconversion - can't translate
UPDATE AD_Field SET IsAllowCopy='N',Updated=TO_DATE('2013-10-30 12:12:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62149
;
SELECT register_migration_script('201310301212_IDEMPIERE-1443.sql') FROM dual
;

13
migration/i1.0c-release/postgresql/201310301212_IDEMPIERE-1443.sql Normal file
View File

@ -0,0 +1,13 @@
-- 30/10/2013 12:11:00 PM COT
-- IDEMPIERE-1443 leadconversion - can't translate
UPDATE AD_Field SET IsAllowCopy='N',Updated=TO_TIMESTAMP('2013-10-30 12:11:00','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62137
;
-- 30/10/2013 12:12:23 PM COT
-- IDEMPIERE-1443 leadconversion - can't translate
UPDATE AD_Field SET IsAllowCopy='N',Updated=TO_TIMESTAMP('2013-10-30 12:12:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62149
;
SELECT register_migration_script('201310301212_IDEMPIERE-1443.sql') FROM dual
;

10
org.adempiere.base.process/src/org/compiere/process/ConvertLead.java
View File

@ -68,7 +68,7 @@ public class ConvertLead extends SvrProcess {
bp.setName(lead.getName()); bp.setName(lead.getName());
bp.saveEx(); bp.saveEx();
addLog("Business Partner created."); addLog(bp.getC_BPartner_ID(), null, null, "@C_BPartner_ID@ @Created@", MBPartner.Table_ID, bp.getC_BPartner_ID());
lead.setC_BPartner_ID(bp.getC_BPartner_ID()); lead.setC_BPartner_ID(bp.getC_BPartner_ID());
@ -88,7 +88,7 @@ public class ConvertLead extends SvrProcess {
lead.setC_BPartner_Location_ID(loc.getC_BPartner_Location_ID()); lead.setC_BPartner_Location_ID(loc.getC_BPartner_Location_ID());
addLog("Contact Location added."); addLog("@C_BPartner_Location_ID@ @Created@");
} }
// company address // company address
@ -103,7 +103,7 @@ public class ConvertLead extends SvrProcess {
loc.setC_Location_ID(address.getC_Location_ID()); loc.setC_Location_ID(address.getC_Location_ID());
loc.saveEx(); loc.saveEx();
addLog("BP Address added."); addLog("@C_Location_ID@ @Created@");
} }
if (p_createOpportunity ) if (p_createOpportunity )
@ -139,15 +139,13 @@ public class ConvertLead extends SvrProcess {
op.saveEx(); op.saveEx();
addLog("Opportunity created."); addLog(op.getC_Opportunity_ID(), null, null, "@C_Opportunity_ID@ @Created@", MOpportunity.Table_ID, op.getC_Opportunity_ID());
} }
lead.setIsSalesLead(false); lead.setIsSalesLead(false);
lead.setLeadStatus(MUser.LEADSTATUS_Converted); lead.setLeadStatus(MUser.LEADSTATUS_Converted);
lead.saveEx(); lead.saveEx();
addLog("Lead converted.");
return "@OK@"; return "@OK@";
} }