svn commit: r1030408 [1/3] - in /ofbiz/branches/jquery: ./ applications/accounting/data/ applications/accounting/script
Locked
svn commit: r1030408 [1/3] - in /ofbiz/branches/jquery: ./ applications/accounting/data/ applications/accounting/script
 
|
Author: jleroux
Date: Wed Nov 3 11:03:43 2010 New Revision: 1030408 URL: http://svn.apache.org/viewvc?rev=1030408&view=rev Log: Merges the trunk at r1030397 Added: ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/images/button_sprite.png - copied unchanged from r1030401, ofbiz/trunk/themes/tomahawk/webapp/tomahawk/images/button_sprite.png Removed: ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/images/ptrn_create.gif ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/images/ptrn_delete.jpg ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/images/ptrn_find.jpg ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/images/ptrn_hot_create.gif ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/images/ptrn_hot_delete.jpg ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/images/ptrn_hot_find.jpg ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/images/ptrn_hot_refresh.png ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/images/ptrn_hot_search.png ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/images/ptrn_refresh.png ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/images/ptrn_search.png Modified: ofbiz/branches/jquery/ (props changed) ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml ofbiz/branches/jquery/applications/accounting/data/DemoGlSetupData.xml ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign ofbiz/branches/jquery/applications/accounting/widget/GlSetupForms.xml ofbiz/branches/jquery/applications/accounting/widget/PaymentForms.xml ofbiz/branches/jquery/applications/humanres/config/HumanResUiLabels.xml ofbiz/branches/jquery/applications/humanres/data/HumanResSecurityData.xml ofbiz/branches/jquery/applications/humanres/data/HumanResTypeData.xml ofbiz/branches/jquery/applications/humanres/webapp/humanres/humanres/findEmployee.ftl ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderServices.java ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/checkinits.ftl ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml ofbiz/branches/jquery/applications/product/entitydef/entitymodel.xml ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/price/PriceServices.xml ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) ofbiz/branches/jquery/applications/product/servicedef/services.xml ofbiz/branches/jquery/applications/product/widget/catalog/CatalogMenus.xml ofbiz/branches/jquery/applications/product/widget/catalog/CommonScreens.xml ofbiz/branches/jquery/applications/product/widget/catalog/SubscriptionScreens.xml ofbiz/branches/jquery/applications/product/widget/catalog/WebAnalyticsScreens.xml ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml ofbiz/branches/jquery/framework/common/servicedef/services_email.xml ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml (props changed) ofbiz/branches/jquery/framework/images/webapp/images/htmledit/whizzywig.js ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java ofbiz/branches/jquery/framework/webtools/config/WebtoolsUiLabels.xml ofbiz/branches/jquery/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl ofbiz/branches/jquery/framework/webtools/widget/EntityScreens.xml ofbiz/branches/jquery/specialpurpose/assetmaint/config/AssetMaintUiLabels.xml ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ (props changed) ofbiz/branches/jquery/specialpurpose/ecommerce/config/EcommerceUiLabels.xml ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/login.ftl ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/style.css ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/images/login_bkgd.jpg Propchange: ofbiz/branches/jquery/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 3 11:03:43 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:951708-1028265 +/ofbiz/trunk:951708-1030401 Modified: ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml (original) +++ ofbiz/branches/jquery/applications/accounting/data/AccountingTypeData.xml Wed Nov 3 11:03:43 2010 @@ -211,6 +211,8 @@ under the License. DEBIT |___> NON_POSTING | + |___> CONTRA_REVENUE + | |___> ASSET | |_________> LONGTERM_ASSET | | Modified: ofbiz/branches/jquery/applications/accounting/data/DemoGlSetupData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/data/DemoGlSetupData.xml?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/data/DemoGlSetupData.xml (original) +++ ofbiz/branches/jquery/applications/accounting/data/DemoGlSetupData.xml Wed Nov 3 11:03:43 2010 @@ -327,7 +327,7 @@ under the License. <PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="COMMISSION_PAYMENT" glAccountTypeId="COMMISSIONS_PAYABLE"/> <PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="PAY_CHECK" glAccountTypeId="ACCPAYABLE_UNAPPLIED"/> <PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="GC_WITHDRAWAL" glAccountTypeId="CUSTOMER_CREDIT"/> - <PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="SALES_TAX_PAYMENT" glAccountTypeId="TAX_ACCOUNT"/> + <PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="SALES_TAX_PAYMENT" glAccountTypeId="ACCPAYABLE_UNAPPLIED"/> <PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="PAYROL_PAYMENT" glAccountTypeId="OPERATING_EXPENSE"/> <PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="PAYROLL_TAX_PAYMENT" glAccountTypeId="TAX_ACCOUNT"/> <PaymentGlAccountTypeMap organizationPartyId="Company" paymentTypeId="INCOME_TAX_PAYMENT" glAccountTypeId="TAX_ACCOUNT"/> Modified: ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original) +++ ofbiz/branches/jquery/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Wed Nov 3 11:03:43 2010 @@ -2591,9 +2591,9 @@ under the License. <else> <if-not-empty field="paymentApplication.taxAuthGeoId"> <entity-one entity-name="TaxAuthorityGlAccount" value-field="taxAuthorityGlAccount"> - <field-map field-name="organizationPartyId" from-field="organizationPartyId"/> + <field-map field-name="organizationPartyId" from-field="payment.partyIdFrom"/> <field-map field-name="taxAuthGeoId" from-field="paymentApplication.taxAuthGeoId"/> - <field-map field-name="taxAuthPartyId" from-field="partyId"/> + <field-map field-name="taxAuthPartyId" from-field="payment.partyIdTo"/> </entity-one> <set field="debitEntry.glAccountId" from-field="taxAuthorityGlAccount.glAccountId"/> </if-not-empty> Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy Wed Nov 3 11:03:43 2010 @@ -44,6 +44,8 @@ partyIds.add(organizationPartyId); // Get the group of account classes that will be used to position accounts in the proper section of the financial statement GenericValue revenueGlAccountClass = delegator.findOne("GlAccountClass", UtilMisc.toMap("glAccountClassId", "REVENUE"), true); List revenueAccountClassIds = UtilAccounting.getDescendantGlAccountClassIds(revenueGlAccountClass); +GenericValue contraRevenueGlAccountClass = delegator.findOne("GlAccountClass", UtilMisc.toMap("glAccountClassId", "CONTRA_REVENUE"), true); +List contraRevenueAccountClassIds = UtilAccounting.getDescendantGlAccountClassIds(contraRevenueGlAccountClass); GenericValue incomeGlAccountClass = delegator.findOne("GlAccountClass", UtilMisc.toMap("glAccountClassId", "INCOME"), true); List incomeAccountClassIds = UtilAccounting.getDescendantGlAccountClassIds(incomeGlAccountClass); GenericValue expenseGlAccountClass = delegator.findOne("GlAccountClass", UtilMisc.toMap("glAccountClassId", "EXPENSE"), true); @@ -107,7 +109,48 @@ if (transactionTotals) { context.revenueAccountBalanceList = accountBalanceList; context.revenueAccountBalanceList.add(UtilMisc.toMap("accountName", "TOTAL REVENUES", "balance", balanceTotal)); context.revenueBalanceTotal = balanceTotal; -balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingTotalNetSales", "balance", balanceTotal)); + +// CONTRA REVENUE +// account balances +accountBalanceList = []; +transactionTotals = []; +balanceTotal = BigDecimal.ZERO; +List contraRevenueAndExprs = FastList.newInstance(mainAndExprs); +contraRevenueAndExprs.add(EntityCondition.makeCondition("glAccountClassId", EntityOperator.IN, contraRevenueAccountClassIds)); +transactionTotals = delegator.findList("AcctgTransEntrySums", EntityCondition.makeCondition(cogsExpenseAndExprs, EntityOperator.AND), UtilMisc.toSet("glAccountId", "accountName", "accountCode", "debitCreditFlag", "amount"), UtilMisc.toList("glAccountId"), null, false); +if (transactionTotals) { + Map transactionTotalsMap = [:]; + balanceTotalCredit = BigDecimal.ZERO; + balanceTotalDebit = BigDecimal.ZERO; + transactionTotals.each { transactionTotal -> + Map accountMap = (Map)transactionTotalsMap.get(transactionTotal.glAccountId); + if (!accountMap) { + accountMap = UtilMisc.makeMapWritable(transactionTotal); + accountMap.remove("debitCreditFlag"); + accountMap.remove("amount"); + accountMap.put("D", BigDecimal.ZERO); + accountMap.put("C", BigDecimal.ZERO); + accountMap.put("balance", BigDecimal.ZERO); + } + UtilMisc.addToBigDecimalInMap(accountMap, transactionTotal.debitCreditFlag, transactionTotal.amount); + if ("D".equals(transactionTotal.debitCreditFlag)) { + balanceTotalDebit = balanceTotalDebit.add(transactionTotal.amount); + } else { + balanceTotalCredit = balanceTotalCredit.add(transactionTotal.amount); + } + BigDecimal debitAmount = (BigDecimal)accountMap.get("D"); + BigDecimal creditAmount = (BigDecimal)accountMap.get("C"); + // contra revenues are accounts of class DEBIT: the balance is given by debits minus credits + BigDecimal balance = debitAmount.subtract(creditAmount); + accountMap.put("balance", balance); + transactionTotalsMap.put(transactionTotal.glAccountId, accountMap); + } + accountBalanceList = UtilMisc.sortMaps(transactionTotalsMap.values().asList(), UtilMisc.toList("accountCode")); + // contra revenues are accounts of class DEBIT: the balance is given by debits minus credits + balanceTotal = balanceTotalDebit.subtract(balanceTotalCredit); +} +context.contraRevenueBalanceTotal = balanceTotal; +balanceTotalList.add(UtilMisc.toMap("totalName", "TOTAL CONTRA REVENUE", "balance", balanceTotal)); // EXPENSE // account balances @@ -319,8 +362,11 @@ context.incomeAccountBalanceList = accou context.incomeAccountBalanceList.add(UtilMisc.toMap("accountName", "TOTAL INCOME", "balance", balanceTotal)); context.incomeBalanceTotal = balanceTotal; +// NET SALES = REVENUES - CONTRA REVENUES +context.netSales = (context.revenueBalanceTotal).subtract(context.contraRevenueBalanceTotal); +balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingTotalNetSales", "balance", context.netSales)); // GROSS MARGIN = NET SALES - COSTS OF GOODS SOLD -context.grossMargin = (context.revenueBalanceTotal).subtract(context.cogsExpense); +context.grossMargin = (context.netSales).subtract(context.cogsExpense); balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingGrossMargin", "balance", context.grossMargin)); // OPERATING EXPENSES context.sgaExpense = sgaExpense; @@ -332,8 +378,7 @@ balanceTotalList.add(UtilMisc.toMap("tot context.incomeFromOperations = (context.grossMargin).subtract(context.sgaExpense); balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingIncomeFromOperations", "balance", context.incomeFromOperations)); // NET INCOME -context.netIncome = (context.revenueBalanceTotal).add(context.incomeBalanceTotal).subtract(context.expenseBalanceTotal); +context.netIncome = (context.netSales).add(context.incomeBalanceTotal).subtract(context.expenseBalanceTotal); balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingNetIncome", "balance", context.netIncome)); context.balanceTotalList = balanceTotalList; - Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign Wed Nov 3 11:03:43 2010 @@ -17,6 +17,9 @@ organizationPartyGroup = delegator.findO // set logo image url logoImageUrl = organizationPartyGroup.getString("logoImageUrl"); +if (!logoImageUrl) { + logoImageUrl = FileUtil.getFile("component://images/webapp/images/ofbiz_logo.gif").getPath(); +} dateFormatter = new java.text.SimpleDateFormat("dd MMMMM yyyy"); @@ -901,7 +904,7 @@ return true; <page-setup> <simple-master-page name="Simple MasterPage" id="2"> <property name="orientation">landscape</property> - <property name="headerHeight">2in</property> + <property name="headerHeight">2.9in</property> <page-header> <grid id="7"> <property name="width">10.363636363636363in</property> @@ -928,10 +931,12 @@ return true; <property name="rowSpan">1</property> <property name="textAlign">left</property> <image id="28"> - <property name="height">43px</property> - <property name="width">238px</property> <method name="onCreate"><![CDATA[if (logoImageUrl) { - this.URL = logoImageUrl; + if (logoImageUrl.startsWith("http")) { + this.URL = logoImageUrl; + } else { + this.file = logoImageUrl; + } }]]></method> <property name="source">url</property> <property name="fitToContainer">false</property> Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign Wed Nov 3 11:03:43 2010 @@ -27,6 +27,9 @@ partyNameView = delegator.findOne("Party // set logo image url logoImageUrl = organizationPartyGroup.getString("logoImageUrl"); +if (!logoImageUrl) { + logoImageUrl = FileUtil.getFile("component://images/webapp/images/ofbiz_logo.gif").getPath(); +} fromDate = null; if (params["fromDate"].value) { @@ -454,11 +457,11 @@ return true;]]></method> </styles> <page-setup> <simple-master-page name="Simple MasterPage" id="2"> - <property name="headerHeight">1.75in</property> + <property name="headerHeight">2.5in</property> <page-header> <grid id="8"> <property name="backgroundColor">#FFFFFF</property> - <property name="height">1.6979166666666667in</property> + <property name="height">2.3434343434343434in</property> <property name="width">7.875in</property> <column id="9"> <property name="width">1.28125in</property> @@ -477,16 +480,17 @@ return true;]]></method> <property name="width">2.6770833333333335in</property> </column> <row id="12"> - <property name="height">0.5416666666666666in</property> <cell id="13"> <property name="colSpan">2</property> <property name="rowSpan">1</property> <property name="textAlign">left</property> <image id="28"> - <property name="height">43px</property> - <property name="width">238px</property> <method name="onCreate"><![CDATA[if (logoImageUrl) { - this.URL = logoImageUrl; + if (logoImageUrl.startsWith("http")) { + this.URL = logoImageUrl; + } else { + this.file = logoImageUrl; + } }]]></method> <property name="source">url</property> <property name="fitToContainer">false</property> Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign Wed Nov 3 11:03:43 2010 @@ -27,6 +27,9 @@ partyNameView = delegator.findOne("Party // set logo image url logoImageUrl = organizationPartyGroup.getString("logoImageUrl"); +if (!logoImageUrl) { + logoImageUrl = FileUtil.getFile("component://images/webapp/images/ofbiz_logo.gif").getPath(); +} fromDate = null; if (params["fromDate"].value) { @@ -407,10 +410,11 @@ return true;]]></method> </styles> <page-setup> <simple-master-page name="Simple MasterPage" id="2"> - <property name="headerHeight">2in</property> + <property name="leftMargin">0.25in</property> + <property name="headerHeight">2.6in</property> <page-header> <grid id="8"> - <property name="height">2.875in</property> + <property name="height">2.6666666666666665in</property> <property name="width">7.84375in</property> <column id="9"> <property name="width">1.2916666666666667in</property> @@ -434,10 +438,12 @@ return true;]]></method> <property name="rowSpan">1</property> <property name="textAlign">left</property> <image id="28"> - <property name="height">43px</property> - <property name="width">238px</property> <method name="onCreate"><![CDATA[if (logoImageUrl) { - this.URL = logoImageUrl; + if (logoImageUrl.startsWith("http")) { + this.URL = logoImageUrl; + } else { + this.file = logoImageUrl; + } }]]></method> <property name="source">url</property> <property name="fitToContainer">false</property> @@ -527,7 +533,7 @@ return true;]]></method> <cell id="26"/> </row> <row id="32"> - <property name="height">0.5104166666666666in</property> + <property name="height">0.21212121212121213in</property> <cell id="33"> <label id="37"> <property name="fontWeight">bold</property> Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign Wed Nov 3 11:03:43 2010 @@ -43,6 +43,9 @@ companyLogoCtx.put("parameters", paramet companyLogoCtx.put("delegator", delegator); GroovyUtil.runScriptAtLocation("component://order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy", companyLogoCtx); logoImageUrl = companyLogoCtx.get("logoImageUrl"); +if (!logoImageUrl) { + logoImageUrl = FileUtil.getFile("component://images/webapp/images/ofbiz_logo.gif").getPath(); +} // create application list var context = FastMap.newInstance(); @@ -569,7 +572,7 @@ return true;]]></method> <page-setup> <simple-master-page name="Simple MasterPage" id="2"> <property name="orientation">landscape</property> - <property name="headerHeight">2in</property> + <property name="headerHeight">2.7in</property> <page-header> <grid id="7"> <property name="width">10.363636363636363in</property> @@ -596,10 +599,12 @@ return true;]]></method> <property name="rowSpan">1</property> <property name="textAlign">left</property> <image id="28"> - <property name="height">43px</property> - <property name="width">238px</property> <method name="onCreate"><![CDATA[if (logoImageUrl) { - this.URL = logoImageUrl; + if (logoImageUrl.startsWith("http")) { + this.URL = logoImageUrl; + } else { + this.file = logoImageUrl; + } }]]></method> <property name="source">url</property> <property name="fitToContainer">false</property> Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign Wed Nov 3 11:03:43 2010 @@ -33,6 +33,9 @@ organizationPartyGroup = delegator.findO // set logo image url logoImageUrl = organizationPartyGroup.getString("logoImageUrl"); +if (!logoImageUrl) { + logoImageUrl = FileUtil.getFile("component://images/webapp/images/ofbiz_logo.gif").getPath(); +} // create debit/credit total variable debitTotal = 0; @@ -546,7 +549,7 @@ return true;]]></method> <page-setup> <simple-master-page name="Simple MasterPage" id="2"> <property name="orientation">landscape</property> - <property name="headerHeight">2.25in</property> + <property name="headerHeight">3in</property> <page-header> <grid id="7"> <property name="width">10.363636363636363in</property> @@ -573,10 +576,12 @@ return true;]]></method> <property name="rowSpan">1</property> <property name="textAlign">left</property> <image id="28"> - <property name="height">43px</property> - <property name="width">238px</property> <method name="onCreate"><![CDATA[if (logoImageUrl) { - this.URL = logoImageUrl; + if (logoImageUrl.startsWith("http")) { + this.URL = logoImageUrl; + } else { + this.file = logoImageUrl; + } }]]></method> <property name="source">url</property> <property name="fitToContainer">false</property> Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign (original) +++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign Wed Nov 3 11:03:43 2010 @@ -26,6 +26,9 @@ customerTimePeriod = delegator.findOne(" // set logo image url logoImageUrl = organizationPartyGroup.getString("logoImageUrl"); +if (!logoImageUrl) { + logoImageUrl = FileUtil.getFile("component://images/webapp/images/ofbiz_logo.gif").getPath(); +} // prepare parties list partyIds = org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, organizationPartyId, "GROUP_ROLLUP"); @@ -267,11 +270,11 @@ return true;]]></method> <page-setup> <simple-master-page name="Simple MasterPage" id="2"> <property name="orientation">landscape</property> - <property name="headerHeight">1.5in</property> + <property name="headerHeight">2.5in</property> <page-header> <grid id="8"> <property name="backgroundColor">#FFFFFF</property> - <property name="height">1.6979166666666667in</property> + <property name="height">2.292929292929293in</property> <property name="width">10.424242424242424in</property> <column id="9"> <property name="width">2.272727272727273in</property> @@ -290,16 +293,17 @@ return true;]]></method> <property name="width">2.727272727272727in</property> </column> <row id="12"> - <property name="height">0.5416666666666666in</property> <cell id="13"> <property name="colSpan">2</property> <property name="rowSpan">1</property> <property name="textAlign">left</property> <image id="28"> - <property name="height">43px</property> - <property name="width">238px</property> <method name="onCreate"><![CDATA[if (logoImageUrl) { - this.URL = logoImageUrl; + if (logoImageUrl.startsWith("http")) { + this.URL = logoImageUrl; + } else { + this.file = logoImageUrl; + } }]]></method> <property name="source">url</property> <property name="fitToContainer">false</property> Modified: ofbiz/branches/jquery/applications/accounting/widget/GlSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/GlSetupForms.xml?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/GlSetupForms.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/GlSetupForms.xml Wed Nov 3 11:03:43 2010 @@ -206,67 +206,67 @@ under the License. </field> <field name="fiscalYearStartDay" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(partyAcctgPreference!= null&&partyAcctgPreference.get('fiscalYearStartDay')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('fiscalYearStartDay')!=null)return - (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}"> + (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <display/> </field> <field name="taxFormId" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(partyAcctgPreference!= null&&partyAcctgPreference.get('taxFormId')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('taxFormId')!=null)return - (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}"> + (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <display-entity entity-name="Enumeration" key-field-name="enumId"/> </field> <field name="cogsMethodId" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(partyAcctgPreference!= null&&partyAcctgPreference.get('cogsMethodId')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('cogsMethodId')!=null)return - (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}"> + (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <display-entity entity-name="Enumeration" key-field-name="enumId"/> </field> <field name="baseCurrencyUomId" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(partyAcctgPreference!= null&&partyAcctgPreference.get('baseCurrencyUomId')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('baseCurrencyUomId')!=null)return - (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}"> + (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <display/> </field> <field name="invoiceIdPrefix" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(partyAcctgPreference!= null&&partyAcctgPreference.get('invoiceIdPrefix')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('invoiceIdPrefix')!=null)return - (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}"> + (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <display/> </field> <field name="invoiceSequenceEnumId" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(partyAcctgPreference!= null&&partyAcctgPreference.get('invoiceSequenceEnumId')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('invoiceSequenceEnumId')!=null)return - (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}"> + (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <display-entity entity-name="Enumeration" key-field-name="enumId"/> </field> <field name="useInvoiceIdForReturns" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(partyAcctgPreference!= null&&partyAcctgPreference.get('useInvoiceIdForReturns')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('useInvoiceIdForReturns')!=null)return - (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}"> + (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <display/> </field> <field name="quoteSequenceEnumId" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(partyAcctgPreference!= null&&partyAcctgPreference.get('quoteSequenceEnumId')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('quoteSequenceEnumId')!=null)return - (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}"> + (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <display-entity entity-name="Enumeration" key-field-name="enumId"/> </field> <field name="quoteIdPrefix" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(partyAcctgPreference!= null&&partyAcctgPreference.get('quoteIdPrefix')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('quoteIdPrefix')!=null)return - (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}"> + (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <display/> </field> <field name="lastQuoteNumber" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(partyAcctgPreference!= null&&partyAcctgPreference.get('lastQuoteNumber')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('lastQuoteNumber')!=null)return - (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}"> + (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <display/> </field> <field name="orderSequenceEnumId" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(partyAcctgPreference!= null&&partyAcctgPreference.get('orderSequenceEnumId')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('orderSequenceEnumId')!=null)return - (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}"> + (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <display-entity entity-name="Enumeration" key-field-name="enumId"/> </field> <field name="orderIdPrefix" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(partyAcctgPreference!= null&&partyAcctgPreference.get('orderIdPrefix')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('orderIdPrefix')!=null)return - (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}"> + (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <display/> </field> <field name="lastOrderNumber" use-when="partyAcctgPreference!=null" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(partyAcctgPreference!= null&&partyAcctgPreference.get('lastOrderNumber')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('lastOrderNumber')!=null)return - (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}"> + (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <display/> </field> @@ -274,19 +274,19 @@ under the License. <field name="lastInvoiceNumber" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if((partyAcctgPreference==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('lastInvoiceNumber')!=null) || (partyAcctgPreference!=null&&partyAcctgPreference.get('lastInvoiceNumber')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('lastInvoiceNumber')!=null))return - (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}"> + (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <display/> </field> <field name="lastInvoiceRestartDate" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if((partyAcctgPreference==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('lastInvoiceRestartDate')!=null) || - (partyAcctgPreference!=null&&partyAcctgPreference.get('lastInvoiceRestartDate')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('lastInvoiceRestartDate')!=null))return (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}"> + (partyAcctgPreference!=null&&partyAcctgPreference.get('lastInvoiceRestartDate')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('lastInvoiceRestartDate')!=null))return (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <display/> </field> <!-- these 2 are always can be updated --> <field name="refundPaymentMethodId" tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if((partyAcctgPreference==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('refundPaymentMethodId')!=null) || (partyAcctgPreference!=null&&partyAcctgPreference.get('refundPaymentMethodId')==null&&aggregatedPartyAcctgPreference!= null&&aggregatedPartyAcctgPreference.get('refundPaymentMethodId')!=null))return - (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale);)}"> + (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}"> <drop-down> <entity-options entity-name="PaymentMethod" description="${description}" key-field-name="paymentMethodId"> <entity-constraint name="partyId" operator="equals" env-name="organizationPartyId"/> Modified: ofbiz/branches/jquery/applications/accounting/widget/PaymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/widget/PaymentForms.xml?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/accounting/widget/PaymentForms.xml (original) +++ ofbiz/branches/jquery/applications/accounting/widget/PaymentForms.xml Wed Nov 3 11:03:43 2010 @@ -333,14 +333,7 @@ under the License. odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="paymentApplicationId"><hidden/></field> <field name="paymentId"><hidden/></field> - <field name="taxAuthGeoId"> - <drop-down allow-empty="true"> - <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName}" cache="true"> - <entity-constraint name="geoTypeId" operator="equals" value="COUNTRY"/> - <entity-order-by field-name="geoId"/> - </entity-options> - </drop-down> - </field> + <field name="taxAuthGeoId"><lookup target-form-name="LookupGeo"/></field> <field name="amountApplied"><text size="15"/></field> <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field> <field name="removeButton" title="${uiLabelMap.CommonRemove}" widget-style="buttontext"> @@ -397,14 +390,7 @@ under the License. <field name="invoiceItemSeqId" use-when=""${uiConfigMap.invoiceProcessing}".equals("YY")"><text size="10"/></field> <field name="toPaymentId"><lookup target-form-name="LookupPayment"/></field> <field name="billingAccountId"><lookup target-form-name="LookupBillingAccount"/></field> - <field name="taxAuthGeoId"> - <drop-down allow-empty="true"> - <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName}" cache="true"> - <entity-constraint name="geoTypeId" operator="equals" value="COUNTRY"/> - <entity-order-by field-name="geoId"/> - </entity-options> - </drop-down> - </field> + <field name="taxAuthGeoId"><lookup target-form-name="LookupGeo"/></field> <field name="amountToApply" parameter-name="amountApplied" tooltip="${uiLabelMap.AccountingLeaveEmptyForMaximumAmount}"><text/></field> <field name="invoiceProcessing" use-when=""${uiConfigMap.invoiceProcessing}".equals("Y")"><check/></field> <field name="invoiceProcessing" use-when=""${uiConfigMap.invoiceProcessing}".equals("N")"><check/></field> Modified: ofbiz/branches/jquery/applications/humanres/config/HumanResUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/config/HumanResUiLabels.xml?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/config/HumanResUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/humanres/config/HumanResUiLabels.xml Wed Nov 3 11:03:43 2010 @@ -253,15 +253,17 @@ <property key="FormFieldTitle_experienceMonths"> <value xml:lang="en">Experience in months</value> <value xml:lang="fr">Expérience en mois</value> + <value xml:lang="it">Esperienza in mesi</value> </property> <property key="FormFieldTitle_experienceYears"> <value xml:lang="en">Experience in years</value> <value xml:lang="fr">Expérience en années</value> + <value xml:lang="it">Esperienza in anni</value> </property> <property key="FormFieldTitle_flatAmount"> <value xml:lang="en">Flat Amount</value> <value xml:lang="fr">Montant fixe</value> - <value xml:lang="it">Importo Fisso</value> + <value xml:lang="it">Importo fisso</value> <value xml:lang="pt_BR">Quantia fixa</value> <value xml:lang="th">à¸à¸³à¸à¸§à¸à¸£à¸°à¸à¸±à¸</value> <value xml:lang="zh">åºå®å·¥èµ</value> @@ -269,7 +271,7 @@ <property key="FormFieldTitle_fulltimeFlag"> <value xml:lang="en">Fulltime Flag</value> <value xml:lang="fr">Balise de plein temps</value> - <value xml:lang="it">Flag Tempo Pieno</value> + <value xml:lang="it">Flag tempo pieno</value> <value xml:lang="pt_BR">Sinal de perÃodo integral</value> <value xml:lang="th">à¹à¸à¸£à¸·à¹à¸à¸à¸«à¸¡à¸²à¸¢à¹à¸à¹à¸¡à¹à¸§à¸¥à¸²</value> <value xml:lang="zh">æ¯å¦ä¸ºå ¨è</value> @@ -277,14 +279,17 @@ <property key="FormFieldTitle_jobLocation"> <value xml:lang="en">Job Location</value> <value xml:lang="fr">Lieu de travail</value> + <value xml:lang="it">Luogo di lavoro</value> </property> <property key="FormFieldTitle_jobPostingEnumId"> <value xml:lang="en">Job Posting Enum Id</value> <value xml:lang="fr">Référence d'offre d'emploi</value> + <value xml:lang="it">Codice offerta di impiego</value> </property> <property key="FormFieldTitle_jobPostingTypeEnumId"> <value xml:lang="en">Job Posting Type</value> <value xml:lang="fr">Type d'offre d'emploi</value> + <value xml:lang="it">Tipo di offerta di impiego</value> </property> <property key="FormFieldTitle_jobRequisitionId"> <value xml:lang="en">Job Requisition Id</value> @@ -748,7 +753,7 @@ <property key="HumanResAgreementEmploymentAppl"> <value xml:lang="en">Agreement Employment Appl</value> <value xml:lang="fr">Application d'accord d'emploi</value> - <value xml:lang="it">Applicazione impiegato contratto</value> + <value xml:lang="it">Applicazione contratti d'impiego</value> <value xml:lang="pt_BR">Candidatura ao acordo empregatÃcio</value> <value xml:lang="zh">éä½£åå</value> </property> @@ -801,14 +806,14 @@ <property key="HumanResCurrentEmploymentData"> <value xml:lang="en">Current Employment information</value> <value xml:lang="fr">Information actuelles sur l'emploi</value> - <value xml:lang="it">Attuali informazioni impiegato</value> + <value xml:lang="it">Informazioni attuali sull'impiego</value> <value xml:lang="pt_BR">Informação atual de empregado</value> <value xml:lang="zh">å½åéä½£å ³ç³»ä¿¡æ¯</value> </property> <property key="HumanResEditAgreementEmploymentAppl"> <value xml:lang="en">Edit Agreement Employment Appl</value> <value xml:lang="fr">Modifier l'accord d'application d'emploi</value> - <value xml:lang="it">Aggiorna applicazioni contratti impiegato</value> + <value xml:lang="it">Aggiorna applicazione contratto d'impiego</value> <value xml:lang="pt_BR">Alterar acordo de candidatura ao emprego</value> <value xml:lang="zh">ç¼è¾éä½£åå</value> </property> @@ -856,7 +861,7 @@ <property key="HumanResEditEmployment"> <value xml:lang="en">Edit Employment</value> <value xml:lang="fr">Modifier l'emploi</value> - <value xml:lang="it">Aggiorna Impiegato</value> + <value xml:lang="it">Aggiorna impiego</value> <value xml:lang="pt_BR">Alterar emprego</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸²à¸£à¸à¹à¸²à¸à¸à¸²à¸</value> <value xml:lang="zh">ç¼è¾éä½£å ³ç³»</value> @@ -864,7 +869,7 @@ <property key="HumanResEditEmploymentApp"> <value xml:lang="en">Edit Employment Application</value> <value xml:lang="fr">Modifier la demande d'emploi</value> - <value xml:lang="it">Aggiorna Applicazione Impiego</value> + <value xml:lang="it">Aggiorna la candidatura d'impiego</value> <value xml:lang="pt_BR">Alterar candidatura ao emprego</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¹à¸à¸£à¹à¸à¸£à¸¡à¸à¸£à¸°à¸¢à¸¸à¸à¸à¹à¹à¸à¹à¸à¸²à¸£à¸à¹à¸²à¸à¸à¸²à¸</value> <value xml:lang="zh">ç¼è¾éä½£å ³ç³»ç³è¯·</value> @@ -1131,7 +1136,7 @@ <value xml:lang="de">Anstellungen</value> <value xml:lang="en">Employments</value> <value xml:lang="fr">Emplois</value> - <value xml:lang="it">Impiegato</value> + <value xml:lang="it">Impieghi</value> <value xml:lang="pt_BR">Empregos</value> <value xml:lang="th">à¸à¸²à¸£à¸à¹à¸²à¸à¸à¸²à¸</value> <value xml:lang="zh">é¨é¨ç®¡ç</value> @@ -1141,7 +1146,7 @@ <value xml:lang="en">Employment Applications</value> <value xml:lang="es">Aplicaciones de Empleo</value> <value xml:lang="fr">Demandes d'emploi</value> - <value xml:lang="it">Applicazione Impiegato</value> + <value xml:lang="it">Candidature d'impiego</value> <value xml:lang="pt_BR">Candidaturas a emprego</value> <value xml:lang="th">à¹à¸à¸£à¹à¸à¸£à¸¡à¸à¸£à¸°à¸¢à¸¸à¸à¸à¹à¹à¸à¹à¸à¸²à¸£à¸à¹à¸²à¸à¸à¸²à¸</value> <value xml:lang="zh">åºè管ç</value> @@ -1149,7 +1154,7 @@ <property key="HumanResEmploymentPartyIdFrom"> <value xml:lang="en">Internal Organization</value> <value xml:lang="fr">Organisation interne</value> - <value xml:lang="it">Codice Soggetto Da</value> + <value xml:lang="it">Organizzazione interna</value> <value xml:lang="pt_BR">Organização interna</value> <value xml:lang="th">à¸à¸²à¸à¸£à¸«à¸±à¸ªà¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> <value xml:lang="zh">ç»ç»æºæ</value> @@ -1189,7 +1194,7 @@ <value xml:lang="de">Einstellung finden</value> <value xml:lang="en">Find Employment</value> <value xml:lang="fr">Rechercher un emploi</value> - <value xml:lang="it">Ricerca impiegato</value> + <value xml:lang="it">Ricerca impieghi</value> <value xml:lang="pt_BR">Encontrar emprego</value> <value xml:lang="zh">æ¥æ¾éä½£å ³ç³»</value> </property> @@ -1197,7 +1202,7 @@ <value xml:lang="de">Bewerbungssuche</value> <value xml:lang="en">Find Employment Application</value> <value xml:lang="fr">Rechercher la demande d'emploi</value> - <value xml:lang="it">Ricerca applicazioni impiegato</value> + <value xml:lang="it">Ricerca candidature d'impiego</value> <value xml:lang="pt_BR">Encontrar candidatura a emprego</value> <value xml:lang="zh">æ¥æ¾æ±èåºèç³è¯·</value> </property> @@ -1300,7 +1305,7 @@ <property key="HumanResListEmployments"> <value xml:lang="en">List Employment</value> <value xml:lang="fr">Liste d'emplois</value> - <value xml:lang="it">Lista Impiegato</value> + <value xml:lang="it">Lista impieghi</value> <value xml:lang="pt_BR">Listar empregos</value> <value xml:lang="th">รายà¸à¸²à¸£à¸à¸²à¸£à¸à¹à¸²à¸à¸à¸²à¸</value> <value xml:lang="zh">éä½£å ³ç³»å表</value> @@ -1355,7 +1360,7 @@ <property key="HumanResLookupAgreementEmploymentAppl"> <value xml:lang="en">Lookup AgreementEmploymentAppl</value> <value xml:lang="fr">Consultation d'accord sur demande d'emploi</value> - <value xml:lang="it">Ricerca applicazioni contratto impiegato</value> + <value xml:lang="it">Ricerca contratti d'impiego</value> <value xml:lang="pt_BR">Procurar acordo de candidatura ao emprego</value> <value xml:lang="zh">éä½£ååæ¥è¯¢</value> </property> @@ -1407,7 +1412,7 @@ <property key="HumanResLookupEmploymentApp"> <value xml:lang="en">Lookup EmploymentApp</value> <value xml:lang="fr">Consultation des demandes d'emploi</value> - <value xml:lang="it">Ricerca applicazioni impiegato</value> + <value xml:lang="it">Ricerca candidature d'impiego</value> <value xml:lang="pt_BR">Procurar candidatura de emprego</value> <value xml:lang="zh">éä½£å ³ç³»ç³è¯·æ¥è¯¢</value> </property> @@ -1568,7 +1573,7 @@ <value xml:lang="de">Einstellung</value> <value xml:lang="en">New Employment</value> <value xml:lang="fr">Nouvel emploi</value> - <value xml:lang="it">Nuovo Impiegato</value> + <value xml:lang="it">Nuovo impiego</value> <value xml:lang="pt_BR">Novo emprego</value> <value xml:lang="th">à¸à¸²à¸£à¸à¹à¸²à¸à¸à¸²à¸à¹à¸«à¸¡à¹</value> <value xml:lang="zh">æ°å»ºé¨é¨äººå</value> @@ -1577,7 +1582,7 @@ <value xml:lang="de">Neue Bewerbung</value> <value xml:lang="en">New Employment Application</value> <value xml:lang="fr">Nouvelle demande d'emploi</value> - <value xml:lang="it">Nuova Applicazione Impiegato</value> + <value xml:lang="it">Nuova candidatura d'impiego</value> <value xml:lang="pt_BR">Nova candidatura a emprego</value> <value xml:lang="th">à¹à¸à¸£à¹à¸à¸£à¸¡à¸à¸£à¸°à¸¢à¸¸à¸à¸à¹à¹à¸à¹à¸à¸²à¸£à¸à¹à¸²à¸à¸à¸²à¸à¹à¸«à¸¡à¹</value> <value xml:lang="zh">æ°å»ºåºèæ±èç³è¯·</value> @@ -1870,6 +1875,7 @@ <property key="HumanResRecruitment"> <value xml:lang="en">Recruitment</value> <value xml:lang="fr">Recrutement</value> + <value xml:lang="it">Reclutamento</value> <value xml:lang="pt_BR">Recrutamento</value> </property> <property key="HumanResRelocation"> @@ -2277,7 +2283,7 @@ <property key="PageTitleViewEmploymentApp"> <value xml:lang="en">View Employment App</value> <value xml:lang="fr">Voir les demandes d'emploi</value> - <value xml:lang="it">Mostra applicazioni impiegato</value> + <value xml:lang="it">Mostra candidature d'impiego</value> <value xml:lang="pt_BR">Visualizar candidatura de emprego</value> <value xml:lang="zh">æ¥çåºèæ±èç³è¯·</value> </property> Modified: ofbiz/branches/jquery/applications/humanres/data/HumanResSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/data/HumanResSecurityData.xml?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/data/HumanResSecurityData.xml (original) +++ ofbiz/branches/jquery/applications/humanres/data/HumanResSecurityData.xml Wed Nov 3 11:03:43 2010 @@ -19,6 +19,7 @@ under the License. --> <entity-engine-xml> + <SecurityPermission description="All operations in the HumanRes Manager." permissionId="HUMANRES_ADMIN"/> <SecurityPermission description="View operations in the HumanRes Manager." permissionId="HUMANRES_VIEW"/> <SecurityPermission description="Create operations in the HumanRes Manager." permissionId="HUMANRES_CREATE"/> <SecurityPermission description="Update operations in the HumanRes Manager." permissionId="HUMANRES_UPDATE"/> Modified: ofbiz/branches/jquery/applications/humanres/data/HumanResTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/data/HumanResTypeData.xml?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/data/HumanResTypeData.xml (original) +++ ofbiz/branches/jquery/applications/humanres/data/HumanResTypeData.xml Wed Nov 3 11:03:43 2010 @@ -122,12 +122,14 @@ under the License. <EmplPositionType emplPositionTypeId="_NA_"/> <!-- OFBiz Recruitment security --> + <SecurityGroup groupId="HUMANRES_ADMIN" description="This security group is for those who have full access to the human resource component."/> <SecurityGroup groupId="HUMANRES_APPROVER" description="This security group is for those who will approve the internal job posting application."/> <SecurityGroup groupId="HUMANRES_EMPLOYEE" description="This security group is for all the employees who want to apply for internal Job Posting."/> <!-- Recruitment permission --> <SecurityPermission description="Approver can update the IJP approval status with this permission." permissionId="HUMANRES_APPROVE"/> + <SecurityGroupPermission groupId="HUMANRES_ADMIN" permissionId="HUMANRES_ADMIN"/> <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_VIEW"/> <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_CREATE"/> <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="PARTYMGR_VIEW"/> Modified: ofbiz/branches/jquery/applications/humanres/webapp/humanres/humanres/findEmployee.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/humanres/webapp/humanres/humanres/findEmployee.ftl?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/humanres/webapp/humanres/humanres/findEmployee.ftl (original) +++ ofbiz/branches/jquery/applications/humanres/webapp/humanres/humanres/findEmployee.ftl Wed Nov 3 11:03:43 2010 @@ -18,9 +18,6 @@ under the License. --> <#assign extInfo = parameters.extInfo?default("N")> -<#assign inventoryItemId = parameters.inventoryItemId?default("")> -<#assign serialNumber = parameters.serialNumber?default("")> -<#assign softIdentifier = parameters.softIdentifier?default("")> <div id="findEmployee" class="screenlet"> <div class="screenlet-title-bar"> Propchange: ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 3 11:03:43 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264 -/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1028265 +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1030401 Modified: ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java (original) +++ ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java Wed Nov 3 11:03:43 2010 @@ -209,8 +209,12 @@ public class OrderReturnServices { // get the return items List returnItems = null; + List<GenericValue> returnAdjustments = FastList.newInstance(); try { returnItems = returnHeader.getRelated("ReturnItem"); + returnAdjustments = delegator.findList("ReturnAdjustment", EntityCondition.makeCondition( + EntityCondition.makeCondition("returnId", EntityOperator.EQUALS, returnId), EntityOperator.AND, + EntityCondition.makeCondition("returnItemSeqId", EntityOperator.EQUALS, "_NA_")), null, UtilMisc.toList("returnAdjustmentTypeId"), null, true); } catch (GenericEntityException e) { Debug.logError(e, module); return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "OrderErrorUnableToGetReturnItemRecordsFromReturnHeader", locale)); @@ -260,7 +264,7 @@ public class OrderReturnServices { uiLabelMap.addBottomResourceBundle("OrderUiLabels"); uiLabelMap.addBottomResourceBundle("CommonUiLabels"); - Map bodyParameters = UtilMisc.toMap("returnHeader", returnHeader, "returnItems", returnItems, "uiLabelMap", uiLabelMap, "locale", locale, "userLogin", userLogin); + Map bodyParameters = UtilMisc.toMap("returnHeader", returnHeader, "returnItems", returnItems, "returnAdjustments", returnAdjustments, "uiLabelMap", uiLabelMap, "locale", locale, "userLogin", userLogin); sendMap.put("bodyParameters", bodyParameters); sendMap.put("subject", productStoreEmail.getString("subject")); Modified: ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderServices.java (original) +++ ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderServices.java Wed Nov 3 11:03:43 2010 @@ -3908,12 +3908,35 @@ public class OrderServices { // Creating objects for New Shipping and Handling Charges Adjustment and Sales Tax Adjustment toStore.addAll(cart.makeAllShipGroupInfos()); toStore.addAll(cart.makeAllOrderPaymentInfos(dispatcher)); - toStore.addAll(cart.makeAllOrderItemAttributes(orderId, ShoppingCart.FILLED_ONLY)); + toStore.addAll(cart.makeAllOrderItemAttributes(orderId, ShoppingCart.FILLED_ONLY)); // get the empty order item atrributes from the cart and remove them List toRemove = FastList.newInstance(); toRemove.addAll(cart.makeAllOrderItemAttributes(orderId, ShoppingCart.EMPTY_ONLY)); + // get the promo uses and codes + for (String promoCodeEntered : cart.getProductPromoCodesEntered()) { + GenericValue orderProductPromoCode = delegator.makeValue("OrderProductPromoCode"); + orderProductPromoCode.set("orderId", orderId); + orderProductPromoCode.set("productPromoCodeId", promoCodeEntered); + toStore.add(orderProductPromoCode); + } + for (GenericValue promoUse : cart.makeProductPromoUses()) { + promoUse.set("orderId", orderId); + toStore.add(promoUse); + } + + List<GenericValue> existingPromoCodes = null; + List<GenericValue> existingPromoUses = null; + try { + existingPromoCodes = delegator.findByAnd("OrderProductPromoCode", UtilMisc.toMap("orderId", orderId)); + existingPromoUses = delegator.findByAnd("ProductPromoUse", UtilMisc.toMap("orderId", orderId)); + } catch (GenericEntityException e) { + Debug.logError(e, module); + } + toRemove.addAll(existingPromoCodes); + toRemove.addAll(existingPromoUses); + // set the orderId & other information on all new value objects List dropShipGroupIds = FastList.newInstance(); // this list will contain the ids of all the ship groups for drop shipments (no reservations) Iterator tsi = toStore.iterator(); Modified: ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original) +++ ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Wed Nov 3 11:03:43 2010 @@ -130,7 +130,7 @@ public class ShoppingCart implements Ite /** Contains a List for each productPromoId (key) containing a productPromoCodeId (or empty string for no code) for each use of the productPromoId */ private List<ProductPromoUseInfo> productPromoUseInfoList = FastList.newInstance(); /** Contains the promo codes entered */ - private Set productPromoCodes = new HashSet(); + private Set<String> productPromoCodes = new HashSet<String>(); private List freeShippingProductPromoActions = new ArrayList(); /** Note that even though this is promotion info, it should NOT be cleared when the promos are cleared, it is a preference that will be used in the next promo calculation */ private Map desiredAlternateGiftByAction = new HashMap(); @@ -3267,7 +3267,7 @@ public class ShoppingCart implements Ite } } - public Set getProductPromoCodesEntered() { + public Set<String> getProductPromoCodesEntered() { return this.productPromoCodes; } @@ -3775,7 +3775,7 @@ public class ShoppingCart implements Ite return allInfos; } - public List makeProductPromoUses() { + public List<GenericValue> makeProductPromoUses() { List<GenericValue> productPromoUses = FastList.newInstance(); String partyId = this.getPartyId(); int sequenceValue = 0; Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy Wed Nov 3 11:03:43 2010 @@ -185,6 +185,11 @@ if (selEmails) { } // website +websiteUrls = EntityUtil.filterByDate(delegator.findByAnd("PartyContactMechPurpose", [partyId : partyId, contactMechPurposeTypeId : "PRIMARY_WEB_URL"])); +if (websiteUrls) { + websiteUrl = EntityUtil.getFirst(websiteUrls); + context.website = delegator.findOne("ContactMech", [contactMechId : websiteUrl.contactMechId], false); +} else { //get web address from party contact mech contacts = delegator.findByAnd("PartyContactMech", [partyId : partyId]); selContacts = EntityUtil.filterByDate(contacts, nowTimestamp, "fromDate", "thruDate", true); if (selContacts) { @@ -197,6 +202,7 @@ if (selContacts) { } } } +} //Bank account paymentMethods = delegator.findByAnd("PaymentMethod", [partyId : partyId, paymentMethodTypeId : "EFT_ACCOUNT"]); Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy Wed Nov 3 11:03:43 2010 @@ -116,4 +116,12 @@ if (returnHeader) { postalAddressTo = delegator.findOne("PostalAddress", [contactMechId : contactMechTo.contactMechId], true); context.postalAddressTo = postalAddressTo; } + + party = delegator.findOne("Party", [partyId : partyId], true); + if (party) { + shippingContactMechList = ContactHelper.getContactMech(party, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false); + if (shippingContactMechList) { + context.postalAddressFrom = delegator.findOne("PostalAddress", [contactMechId : EntityUtil.getFirst(shippingContactMechList).contactMechId], true); + } + } } Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/checkinits.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/checkinits.ftl?rev=1030408&r1=1030407&r2=1030408&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/checkinits.ftl (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/checkinits.ftl Wed Nov 3 11:03:43 2010 @@ -47,7 +47,7 @@ under the License. <input type="hidden" name="originOrderId" value="${parameters.originOrderId?if_exists}"/> <input type="hidden" name="finalizeMode" value="type"/> <input type="hidden" name="orderMode" value="SALES_ORDER"/> - <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxbottom"> + <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td > </td> <td width="300" align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.ProductProductStore}</div></td> @@ -138,7 +138,7 @@ under the License. <form method="post" name="poentryform" action="<@ofbizUrl>initorderentry</@ofbizUrl>"> <input type='hidden' name='finalizeMode' value='type'/> <input type='hidden' name='orderMode' value='PURCHASE_ORDER'/> - <table width="100%" border='0' cellspacing='0' cellpadding='0' class='boxbottom'> + <table width="100%" border='0' cellspacing='0' cellpadding='0'> <#if partyId?exists> <#assign thisPartyId = partyId> <#else> Propchange: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 3 11:03:43 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456 /ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264 -/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1028265 +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1030401 |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |