details: /erp/devel/pi/rev/dc8e040a0407
changeset: 9936:dc8e040a0407
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Wed Jan 19 13:22:30 2011 +0100
summary: Code formatted file InitialSetupUtility.java
details: /erp/devel/pi/rev/516a8b8fe061
changeset: 9937:516a8b8fe061
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Wed Jan 19 13:23:37 2011 +0100
summary: Fixes issue 15695: Initial Organization Setup
process does always insert reference data belonging to "*" Organization
diffstat:
src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java | 268
+++++----
1 files changed, 138 insertions(+), 130 deletions(-)
diffs (truncated from 456 to 300 lines):
diff -r 4212b60b2a7c -r 516a8b8fe061
src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java
--- a/src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java
Wed Jan 19 12:38:15 2011 +0100
+++ b/src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java
Wed Jan 19 13:23:37 2011 +0100
@@ -292,8 +292,8 @@
yourCompanyDocumentImage.setOrganization(org);
yourCompanyDocumentImage.setBindaryData(image);
yourCompanyDocumentImage.setName(strImageName);
- org.getOrganizationInformationList().get(0).setYourCompanyDocumentImage(
- yourCompanyDocumentImage);
+ org.getOrganizationInformationList().get(0)
+ .setYourCompanyDocumentImage(yourCompanyDocumentImage);
yourCompanyDocumentImage.setOrganization(org);
OBDal.getInstance().save(yourCompanyDocumentImage);
OBDal.getInstance().save(org);
@@ -967,72 +967,72 @@
Client client = defaultElementValues.get(strDefault).getClient();
Organization org =
defaultElementValues.get(strDefault).getOrganization();
if (strDefault.equals("W_INVENTORY_ACCT"))
- newAcctSchemaDefault.setWarehouseInventory(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setWarehouseInventory(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("W_DIFFERENCES_ACCT"))
- newAcctSchemaDefault.setWarehouseDifferences(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setWarehouseDifferences(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("W_REVALUATION_ACCT"))
- newAcctSchemaDefault.setInventoryRevaluation(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setInventoryRevaluation(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("W_INVACTUALADJUST_ACCT"))
- newAcctSchemaDefault.setInventoryAdjustment(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setInventoryAdjustment(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("P_REVENUE_ACCT"))
- newAcctSchemaDefault.setProductRevenue(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setProductRevenue(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("P_EXPENSE_ACCT"))
- newAcctSchemaDefault.setProductExpense(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setProductExpense(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("P_ASSET_ACCT"))
- newAcctSchemaDefault.setFixedAsset(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setFixedAsset(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("P_COGS_ACCT"))
- newAcctSchemaDefault.setProductCOGS(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setProductCOGS(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("P_PURCHASEPRICEVARIANCE_ACCT"))
- newAcctSchemaDefault.setPurchasePriceVariance(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setPurchasePriceVariance(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("P_INVOICEPRICEVARIANCE_ACCT"))
- newAcctSchemaDefault.setInvoicePriceVariance(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setInvoicePriceVariance(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("P_TRADEDISCOUNTREC_ACCT"))
- newAcctSchemaDefault.setTradeDiscountReceived(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setTradeDiscountReceived(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("P_TRADEDISCOUNTGRANT_ACCT"))
- newAcctSchemaDefault.setTradeDiscountGranted(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setTradeDiscountGranted(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("C_RECEIVABLE_ACCT"))
- newAcctSchemaDefault.setCustomerReceivablesNo(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setCustomerReceivablesNo(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("C_PREPAYMENT_ACCT"))
- newAcctSchemaDefault.setCustomerPrepayment(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setCustomerPrepayment(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("V_LIABILITY_ACCT"))
- newAcctSchemaDefault.setVendorLiability(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setVendorLiability(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("V_LIABILITY_SERVICES_ACCT"))
newAcctSchemaDefault.setVendorServiceLiability(getAcctComb(client, org,
defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("V_PREPAYMENT_ACCT"))
- newAcctSchemaDefault.setVendorPrepayment(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setVendorPrepayment(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("PAYDISCOUNT_EXP_ACCT"))
newAcctSchemaDefault.setPaymentDiscountExpense(getAcctComb(client, org,
@@ -1043,170 +1043,170 @@
defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("WRITEOFF_ACCT"))
- newAcctSchemaDefault.setWriteoff(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setWriteoff(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("UNREALIZEDGAIN_ACCT"))
- newAcctSchemaDefault.setUnrealizedGainsAcct(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setUnrealizedGainsAcct(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("UNREALIZEDLOSS_ACCT"))
- newAcctSchemaDefault.setUnrealizedLossesAcct(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setUnrealizedLossesAcct(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("REALIZEDGAIN_ACCT"))
- newAcctSchemaDefault.setRealizedGainAcct(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setRealizedGainAcct(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("REALIZEDLOSS_ACCT"))
- newAcctSchemaDefault.setRealizedLossAcct(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setRealizedLossAcct(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("WITHHOLDING_ACCT"))
- newAcctSchemaDefault.setWithholdingAccount(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setWithholdingAccount(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("E_PREPAYMENT_ACCT"))
- newAcctSchemaDefault.setEmployeePrepayments(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setEmployeePrepayments(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("E_EXPENSE_ACCT"))
- newAcctSchemaDefault.setEmployeeExpenses(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setEmployeeExpenses(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("PJ_ASSET_ACCT"))
- newAcctSchemaDefault.setProjectAsset(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setProjectAsset(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("PJ_WIP_ACCT"))
- newAcctSchemaDefault.setWorkInProgress(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setWorkInProgress(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("T_EXPENSE_ACCT"))
- newAcctSchemaDefault.setTaxExpense(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setTaxExpense(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("T_LIABILITY_ACCT"))
- newAcctSchemaDefault.setTaxLiability(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setTaxLiability(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("T_RECEIVABLES_ACCT"))
- newAcctSchemaDefault.setTaxReceivables(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setTaxReceivables(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("T_DUE_ACCT"))
- newAcctSchemaDefault.setTaxDue(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setTaxDue(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("T_CREDIT_ACCT"))
- newAcctSchemaDefault.setTaxCredit(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setTaxCredit(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("B_INTRANSIT_ACCT"))
- newAcctSchemaDefault.setBankInTransit(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setBankInTransit(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("B_ASSET_ACCT"))
- newAcctSchemaDefault.setBankAsset(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setBankAsset(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("B_EXPENSE_ACCT"))
- newAcctSchemaDefault.setBankExpense(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setBankExpense(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("B_INTERESTREV_ACCT"))
- newAcctSchemaDefault.setBankInterestRevenue(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setBankInterestRevenue(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("B_INTERESTEXP_ACCT"))
- newAcctSchemaDefault.setBankInterestExpense(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setBankInterestExpense(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("B_UNIDENTIFIED_ACCT"))
newAcctSchemaDefault.setBankUnidentifiedReceipts(getAcctComb(client,
org,
defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("B_SETTLEMENTGAIN_ACCT"))
- newAcctSchemaDefault.setBankSettlementGain(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setBankSettlementGain(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("B_SETTLEMENTLOSS_ACCT"))
- newAcctSchemaDefault.setBankSettlementLoss(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setBankSettlementLoss(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("B_REVALUATIONGAIN_ACCT"))
- newAcctSchemaDefault.setBankRevaluationGain(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setBankRevaluationGain(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("B_REVALUATIONLOSS_ACCT"))
- newAcctSchemaDefault.setBankRevaluationLoss(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setBankRevaluationLoss(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("B_PAYMENTSELECT_ACCT"))
- newAcctSchemaDefault.setPaymentSelection(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setPaymentSelection(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("B_UNALLOCATEDCASH_ACCT"))
- newAcctSchemaDefault.setUnallocatedCash(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setUnallocatedCash(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("CH_EXPENSE_ACCT"))
- newAcctSchemaDefault.setChargeExpense(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setChargeExpense(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("CH_REVENUE_ACCT"))
- newAcctSchemaDefault.setChargeRevenue(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setChargeRevenue(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
if (strDefault.equals("UNEARNEDREVENUE_ACCT"))
- newAcctSchemaDefault.setUnearnedRevenue(getAcctComb(client, org,
defaultElementValues
- .get(strDefault), acctSchema, true));
+ newAcctSchemaDefault.setUnearnedRevenue(getAcctComb(client, org,
+ defaultElementValues.get(strDefault), acctSchema, true));
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
