details: /erp/devel/pi/rev/5b79026d84eb
changeset: 11635:5b79026d84eb
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Tue Apr 12 13:52:52 2011 +0200
summary: Reformatted file. No code change
details: /erp/devel/pi/rev/3f0c0c2ce654
changeset: 11636:3f0c0c2ce654
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Tue Apr 12 13:54:45 2011 +0200
summary: Fixes issue 16090.
Re-readding the client object
details: /erp/devel/pi/rev/0a95b66e07c2
changeset: 11637:0a95b66e07c2
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Wed Apr 13 16:46:27 2011 +0200
summary: Fixes issue 15686.
Modified help and description of the tab.
details: /erp/devel/pi/rev/7f6adf1fa00e
changeset: 11638:7f6adf1fa00e
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Fri Apr 15 16:57:44 2011 +0200
summary: Fixes issue 16374.
diffstat:
src-db/database/sourcedata/AD_TAB.xml | 4 +-
src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 4 +-
src/org/openbravo/erpCommon/businessUtility/InitialOrgSetup.java | 38
+++++-----
3 files changed, 23 insertions(+), 23 deletions(-)
diffs (132 lines):
diff -r 3e993613f156 -r 7f6adf1fa00e src-db/database/sourcedata/AD_TAB.xml
--- a/src-db/database/sourcedata/AD_TAB.xml Thu Apr 21 12:15:54 2011 +0200
+++ b/src-db/database/sourcedata/AD_TAB.xml Fri Apr 15 16:57:44 2011 +0200
@@ -7400,8 +7400,8 @@
<!--800012--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--800012--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--800012--> <NAME><![CDATA[Shipment Route]]></NAME>
-<!--800012--> <DESCRIPTION><![CDATA[Create a delivery position for this
business partner on a defined shipment route.]]></DESCRIPTION>
-<!--800012--> <HELP><![CDATA[Create a delivery position for this business
partner on a defined shipment route.]]></HELP>
+<!--800012--> <DESCRIPTION><![CDATA[Create a delivery position for this
business partner on a defined shipment route, in case the wharehouse is defined
as Shipment Vehicle.]]></DESCRIPTION>
+<!--800012--> <HELP><![CDATA[Create a delivery position for this business
partner on a defined shipment route, in case the wharehouse is defined as
Shipment Vehicle.]]></HELP>
<!--800012--> <AD_TABLE_ID><![CDATA[800009]]></AD_TABLE_ID>
<!--800012--> <AD_WINDOW_ID><![CDATA[123]]></AD_WINDOW_ID>
<!--800012--> <SEQNO><![CDATA[150]]></SEQNO>
diff -r 3e993613f156 -r 7f6adf1fa00e
src/org/openbravo/erpCommon/ad_forms/DocInvoice.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java Thu Apr 21
12:15:54 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java Fri Apr 15
16:57:44 2011 +0200
@@ -11,7 +11,7 @@
* Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
* created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved.
* Contributor(s): Openbravo SLU
- * Contributions are Copyright (C) 2001-2009 Openbravo S.L.U.
+ * Contributions are Copyright (C) 2001-2011 Openbravo S.L.U.
******************************************************************************
*/
package org.openbravo.erpCommon.ad_forms;
@@ -287,7 +287,7 @@
m_debt_payments[i].dpStatus, conn), this.C_Currency_ID,
getConvertedAmt(
m_debt_payments[i].Amount,
m_debt_payments[i].C_Currency_ID_From,
this.C_Currency_ID, DateAcct, "", AD_Client_ID, AD_Org_ID,
conn), "",
- Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
+ Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
else
fact.createLine(m_debt_payments[i],
getAccountBPartner(C_BPartner_ID, as, false,
m_debt_payments[i].dpStatus, conn), this.C_Currency_ID, "",
getConvertedAmt(
diff -r 3e993613f156 -r 7f6adf1fa00e
src/org/openbravo/erpCommon/businessUtility/InitialOrgSetup.java
--- a/src/org/openbravo/erpCommon/businessUtility/InitialOrgSetup.java Thu Apr
21 12:15:54 2011 +0200
+++ b/src/org/openbravo/erpCommon/businessUtility/InitialOrgSetup.java Fri Apr
15 16:57:44 2011 +0200
@@ -152,10 +152,11 @@
OBDal.getInstance().flush();
OBDal.getInstance().commitAndClose();
org = OBDal.getInstance().get(Organization.class, strOrgId);
+ client = org.getClient();
if (strcLocationId != null && !strcLocationId.equals(""))
try {
- InitialSetupUtility.updateOrgLocation(org,
- OBDal.getInstance().get(Location.class, strcLocationId));
+ InitialSetupUtility.updateOrgLocation(org,
OBDal.getInstance().get(Location.class,
+ strcLocationId));
} catch (final Exception err) {
return logErrorAndRollback(
"@CreateOrgFailed@",
@@ -258,9 +259,9 @@
try {
log4j.debug("createReferenceData() - There exists accounting modules
to process");
obeResult = insertAccountingModule(strSourcePath, strModules,
partner, product, project,
- campaign, salesRegion,
- InitialSetupUtility.getTranslatedColumnName(language,
"Account_ID"),
- InitialSetupUtility.getTranslatedColumnName(language,
"C_Calendar_ID"), strCurrency);
+ campaign, salesRegion,
InitialSetupUtility.getTranslatedColumnName(language,
+ "Account_ID"),
InitialSetupUtility.getTranslatedColumnName(language,
+ "C_Calendar_ID"), strCurrency);
if (!obeResult.getType().equals(OKTYPE))
return obeResult;
log4j.debug("createReferenceData() - Accounting module processed. ");
@@ -498,17 +499,16 @@
try {
istrFileCoA = fileCoAFilePath.getInputStream();
} catch (IOException e) {
- return logErrorAndRollback(
- "@CreateAccountingFailed@",
+ return logErrorAndRollback("@CreateAccountingFailed@",
"createAccounting() - Exception occured while reading the file "
+ fileCoAFilePath.getName(), e);
}
try {
obResult = coaUtility.createAccounting(vars, istrFileCoA, partner,
product, project,
- campaign, salesRegion,
- InitialSetupUtility.getTranslatedColumnName(language, "Account_ID"),
"US", "A",
- InitialSetupUtility.getTranslatedColumnName(language,
"C_Calendar_ID"),
- InitialSetupUtility.getCurrency(strCurrency));
+ campaign, salesRegion, InitialSetupUtility
+ .getTranslatedColumnName(language, "Account_ID"), "US", "A",
InitialSetupUtility
+ .getTranslatedColumnName(language, "C_Calendar_ID"),
InitialSetupUtility
+ .getCurrency(strCurrency));
if (!obResult.getType().equals(OKTYPE))
return obResult;
} catch (final Exception err) {
@@ -529,8 +529,8 @@
if (client.getClientInformationList().get(0).getYourCompanyDocumentImage()
!= null)
try {
InitialSetupUtility.setOrgImage(client, org,
client.getClientInformationList().get(0)
- .getYourCompanyDocumentImage().getBindaryData(),
-
client.getClientInformationList().get(0).getYourCompanyDocumentImage().getName());
+ .getYourCompanyDocumentImage().getBindaryData(),
client.getClientInformationList().get(
+ 0).getYourCompanyDocumentImage().getName());
} catch (final Exception err) {
obResult.setMessage(err.getMessage());
return obResult;
@@ -579,8 +579,8 @@
log4j.debug("insertUser() - Organization User Name: " + strOrgUser);
try {
- user = InitialSetupUtility.insertUser(client, null, strOrgUser,
- FormatUtilities.sha1Base64(strPassword), null, language);
+ user = InitialSetupUtility.insertUser(client, null, strOrgUser,
FormatUtilities
+ .sha1Base64(strPassword), null, language);
} catch (final Exception err) {
return logErrorAndRollback("@CreateOrgFailed@",
"insertUser() - ERROR - Not able to insert the user " + strOrgUser,
err);
@@ -670,8 +670,8 @@
}
try {
- InitialSetupUtility.updateOrgTree(orgTree, orgNode,
- OBDal.getInstance().get(Organization.class, strParentOrg));
+ InitialSetupUtility.updateOrgTree(orgTree, orgNode,
OBDal.getInstance().get(
+ Organization.class, strParentOrg));
} catch (final Exception err) {
return logErrorAndRollback(
"@CreateOrgFailed@",
@@ -688,8 +688,8 @@
}
public String getLog() {
- return strHeaderLog.append(NEW_LINE).append(STRSEPARATOR).append(NEW_LINE
+ NEW_LINE)
- .append(strLog).toString();
+ return strHeaderLog.append(NEW_LINE).append(STRSEPARATOR).append(NEW_LINE
+ NEW_LINE).append(
+ strLog).toString();
}
/**
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
