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

Implement [ adempiere-Feature Requests-2582181 ] Make BPLocation Name generation configurable 

https://sourceforge.net/tracker2/?func=detail&aid=2582181&group_id=176962&atid=879335
This commit is contained in:
Carlos Ruiz 2009-02-09 18:13:50 +00:00
parent 68de88a928
commit 03132ecb8e
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
base/src/org/compiere/model/MBPartnerLocation.java
View File

@ -169,7 +169,9 @@ public class MBPartnerLocation extends X_C_BPartner_Location
return true;
MLocation address = getLocation(true);
m_uniqueName = getName();
m_unique = 0;
m_unique = MSysConfig.getIntValue("START_VALUE_BPLOCATION_NAME", 0, getAD_Client_ID(), getAD_Org_ID());
if (m_unique < 0 || m_unique > 4)
m_unique = 0;
if (m_uniqueName != null && m_uniqueName.equals(".")) {
// default
m_uniqueName = null;
@ -190,6 +192,7 @@ public class MBPartnerLocation extends X_C_BPartner_Location
if (m_uniqueName.equals(location.getName()))
{
//m_uniqueName = null;
m_unique++;
makeUnique(address);
unique = false;
break;
@ -207,20 +210,17 @@ public class MBPartnerLocation extends X_C_BPartner_Location
private void makeUnique (MLocation address)
{
if (m_uniqueName == null)
m_uniqueName = "";
m_unique++;
m_uniqueName = "";
// 0 - City
if (m_uniqueName.length() == 0)
if (m_unique >= 0 || m_uniqueName.length() == 0)
{
String xx = address.getCity();
if (xx != null && xx.length() > 0)
m_uniqueName = xx;
m_unique = 0;
}
// 1 + Address1
if (m_unique == 1 || m_uniqueName.length() == 0)
if (m_unique >= 1 || m_uniqueName.length() == 0)
{
String xx = address.getAddress1();
if (xx != null && xx.length() > 0)
@ -229,10 +229,9 @@ public class MBPartnerLocation extends X_C_BPartner_Location
m_uniqueName += " ";
m_uniqueName += xx;
}
m_unique = 1;
}
// 2 + Address2
if (m_unique == 2 || m_uniqueName.length() == 0)
if (m_unique >= 2 || m_uniqueName.length() == 0)
{
String xx = address.getAddress2();
if (xx != null && xx.length() > 0)
@ -241,27 +240,25 @@ public class MBPartnerLocation extends X_C_BPartner_Location
m_uniqueName += " ";
m_uniqueName += xx;
}
m_unique = 2;
}
// 3 - Region
if (m_unique == 3 || m_uniqueName.length() == 0)
if (m_unique >= 3 || m_uniqueName.length() == 0)
{
String xx = address.getRegionName(true);
if (xx != null && xx.length() > 0)
{
if (m_uniqueName.length() > 0)
m_uniqueName += " ";
m_uniqueName += xx;
}
m_unique = 3;
}
// 4 - ID
if (m_unique == 4 || m_uniqueName.length() == 0)
if (m_unique >= 4 || m_uniqueName.length() == 0)
{
int id = get_ID();
if (id == 0)
id = address.get_ID();
m_uniqueName += "#" + id;
m_unique = 4;
}
} // makeUnique

5
migration/353a-trunk/oracle/417_FR2582181.sql Normal file
View File

@ -0,0 +1,5 @@
-- Feb 9, 2009 12:43:12 PM COT
-- [2582181 ] Make BPLocation Name generation configurable
INSERT INTO AD_SysConfig (AD_Client_ID,AD_Org_ID,AD_SysConfig_ID,ConfigurationLevel,Created,CreatedBy,Description,EntityType,IsActive,Name,Updated,UpdatedBy,Value) VALUES (0,0,50017,'O',TO_DATE('2009-02-09 12:43:11','YYYY-MM-DD HH24:MI:SS'),100,'Define the start value for C_BPartner_Location.Name (possible values 0 to 4) - complete definition here http://adempiere.com/wiki/index.php/ManPageW_SystemConfigurator','D','Y','START_VALUE_BPLOCATION_NAME',TO_DATE('2009-02-09 12:43:11','YYYY-MM-DD HH24:MI:SS'),100,'0')
;

5
migration/353a-trunk/postgresql/417_FR2582181.sql Normal file
View File

@ -0,0 +1,5 @@
-- Feb 9, 2009 12:43:12 PM COT
-- [2582181 ] Make BPLocation Name generation configurable
INSERT INTO AD_SysConfig (AD_Client_ID,AD_Org_ID,AD_SysConfig_ID,ConfigurationLevel,Created,CreatedBy,Description,EntityType,IsActive,Name,Updated,UpdatedBy,Value) VALUES (0,0,50017,'O',TO_TIMESTAMP('2009-02-09 12:43:11','YYYY-MM-DD HH24:MI:SS'),100,'Define the start value for C_BPartner_Location.Name (possible values 0 to 4) - complete definition here http://adempiere.com/wiki/index.php/ManPageW_SystemConfigurator','D','Y','START_VALUE_BPLOCATION_NAME',TO_TIMESTAMP('2009-02-09 12:43:11','YYYY-MM-DD HH24:MI:SS'),100,'0')
;