You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/03/15 23:22:41 UTC
svn commit: r1577942 [1/2] - in
/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./
applications/accounting/ applications/accounting/config/
applications/accounting/data/
applications/accounting/script/org/ofbiz/accounting/budget/ application...
Author: jleroux
Date: Sat Mar 15 22:22:39 2014
New Revision: 1577942
URL: http://svn.apache.org/r1577942
Log:
Merges trunk HEAD in SEO branch
Added:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/data/DemoBudgetData.xml
- copied unchanged from r1577887, ofbiz/trunk/applications/accounting/data/DemoBudgetData.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/budget/
- copied from r1577887, ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/budget/
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_budget.xml
- copied unchanged from r1577887, ofbiz/trunk/applications/accounting/servicedef/services_budget.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/BudgetForms.xml
- copied unchanged from r1577887, ofbiz/trunk/applications/accounting/widget/BudgetForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/BudgetScreens.xml
- copied unchanged from r1577887, ofbiz/trunk/applications/accounting/widget/BudgetScreens.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/accounting/index.jsp
- copied unchanged from r1577887, ofbiz/trunk/specialpurpose/birt/webapp/accounting/index.jsp
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/facility/index.jsp
- copied unchanged from r1577887, ofbiz/trunk/specialpurpose/birt/webapp/facility/index.jsp
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/ordermgr/index.jsp
- copied unchanged from r1577887, ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/index.jsp
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/lib/lucene-analyzers-common-4.7.0.jar
- copied unchanged from r1573527, ofbiz/trunk/specialpurpose/lucene/lib/lucene-analyzers-common-4.7.0.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/lib/lucene-core-4.7.0.jar
- copied unchanged from r1573527, ofbiz/trunk/specialpurpose/lucene/lib/lucene-core-4.7.0.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/lib/lucene-queryparser-4.7.0.jar
- copied unchanged from r1573527, ofbiz/trunk/specialpurpose/lucene/lib/lucene-queryparser-4.7.0.jar
Removed:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/lib/lucene-analyzers-common-4.6.0.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/lib/lucene-core-4.6.0.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/lib/lucene-queryparser-4.6.0.jar
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ (props changed)
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/config/AccountingUiLabels.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/data/AccountingTypeData.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/ofbiz-component.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/AccountingMenus.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FieldLookupForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/LookupScreens.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/PaymentGatewayConfigForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/TransactionForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/config/ContentUiLabels.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/ofbiz-component.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/compdoc/CompDocMenus.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/website/WebAnalyticsForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/EmplLeaveForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/LookupForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/PersonTrainingForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/RecruitmentForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/config/ManufacturingUiLabels.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/CalendarForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/widget/MarketingReportScreens.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/RequirementForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/widget/partymgr/LookupForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_view.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductPromoContentWrapper.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/supplier/SupplierProductServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/FieldLookupForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/facility/ShipmentGatewayConfigForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/GenericEntity.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareCondition.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/Config.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/start/src/org/ofbiz/base/start/Start.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-form.xsd
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-menu.xsd
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/menu/MacroMenuRenderer.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlFormMacroLibrary.ftl
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/LICENSE
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebay/widget/EbayForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/webapp/content/WEB-INF/actions/SearchProducts.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/widget/forms/TaskForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/widget/TaskForms.xml
Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1571262-1577887
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath Sat Mar 15 22:22:39 2014
@@ -158,9 +158,9 @@
<classpathentry kind="lib" path="specialpurpose/ebaystore/lib/ebaycalls.jar"/>
<classpathentry kind="lib" path="specialpurpose/ebaystore/lib/ebaysdkcore.jar"/>
<classpathentry kind="lib" path="specialpurpose/ebaystore/lib/helper.jar"/>
- <classpathentry kind="lib" path="specialpurpose/lucene/lib/lucene-analyzers-common-4.6.0.jar"/>
- <classpathentry kind="lib" path="specialpurpose/lucene/lib/lucene-core-4.6.0.jar"/>
- <classpathentry kind="lib" path="specialpurpose/lucene/lib/lucene-queryparser-4.6.0.jar"/>
+ <classpathentry kind="lib" path="specialpurpose/lucene/lib/lucene-analyzers-common-4.7.0.jar"/>
+ <classpathentry kind="lib" path="specialpurpose/lucene/lib/lucene-core-4.7.0.jar"/>
+ <classpathentry kind="lib" path="specialpurpose/lucene/lib/lucene-queryparser-4.7.0.jar"/>
<classpathentry excluding="org/ofbiz/accounting/thirdparty/cybersource/**|org/ofbiz/accounting/thirdparty/verisign/**|org/ofbiz/accounting/thirdparty/worldpay/**|org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java|org/ofbiz/accounting/thirdparty/orbital/**|org/ofbiz/accounting/thirdparty/securepay/**|org/ofbiz/accounting/thirdparty/ideal/**" kind="src" path="applications/accounting/src"/>
<classpathentry excluding="org/ofbiz/content/openoffice/|org/ofbiz/content/report/" kind="src" path="applications/content/src"/>
<classpathentry kind="src" path="applications/manufacturing/src"/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/config/AccountingUiLabels.xml?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/config/AccountingUiLabels.xml Sat Mar 15 22:22:39 2014
@@ -2392,6 +2392,51 @@
<value xml:lang="zh">å票ç¼å·ï¼InvoiceIdï¼åè´¦åè´¦æ·ç¼å·ï¼BillingAccountIdï¼é½æ¯ç©ºç</value>
<value xml:lang="zh_TW">ç¼ç¥¨ç·¨èï¼InvoiceIdï¼å賬å®è³¬æ¶ç·¨èï¼BillingAccountIdï¼é½æ¯ç©ºç</value>
</property>
+ <property key="AccountingBudgetFind">
+ <value xml:lang="en">Find</value>
+ </property>
+ <property key="AccountingBudgetHeader">
+ <value xml:lang="en">Header</value>
+ </property>
+ <property key="AccountingBudgetItems">
+ <value xml:lang="en">Items</value>
+ </property>
+ <property key="AccountingBudgetItemsAdd">
+ <value xml:lang="en">Add a new budget Item</value>
+ </property>
+ <property key="AccountingBudgetOverview">
+ <value xml:lang="en">Overview</value>
+ </property>
+ <property key="AccountingBudgetReviewAdd">
+ <value xml:lang="en">Add a new Budget Review</value>
+ </property>
+ <property key="AccountingBudgetReviewResult">
+ <value xml:lang="en">Budget Review Result</value>
+ </property>
+ <property key="AccountingBudgetReviews">
+ <value xml:lang="en">Reviews</value>
+ </property>
+ <property key="AccountingBudgetRoles">
+ <value xml:lang="en">Roles</value>
+ </property>
+ <property key="AccountingBudgets">
+ <value xml:lang="en">Budgets</value>
+ </property>
+ <property key="AccountingBudgetStatus">
+ <value xml:lang="en">Status</value>
+ </property>
+ <property key="AccountingBudgetStatusToApproved">
+ <value xml:lang="en">Status To 'Approved'</value>
+ </property>
+ <property key="AccountingBudgetStatusToReviewed">
+ <value xml:lang="en">Status To 'Reviewed'</value>
+ </property>
+ <property key="AccountingBudgetStatusToRejected">
+ <value xml:lang="en">Status To 'Rejected'</value>
+ </property>
+ <property key="AccountingBudgetType">
+ <value xml:lang="en">Budget Type</value>
+ </property>
<property key="AccountingByAccount">
<value xml:lang="de">Nach Konto</value>
<value xml:lang="en">By Account</value>
@@ -4482,6 +4527,9 @@
<value xml:lang="zh">ç¼è¾è´¦æ·å¯¹è´¦</value>
<value xml:lang="zh_TW">ä¿®æ¹å¸³æ¶èª¿ç¯</value>
</property>
+ <property key="AccountingEditBudget">
+ <value xml:lang="en">Edit Budget</value>
+ </property>
<property key="AccountingEditCreditCard">
<value xml:lang="cs">Zpracovat kreditnà kartu</value>
<value xml:lang="de">Kreditkarte bearbeiten</value>
@@ -5310,6 +5358,9 @@
<value xml:lang="zh">æ¥æ¾åºæ¶æ¯ä»</value>
<value xml:lang="zh_TW">æ¾å°ææ¶æ¯ä»</value>
</property>
+ <property key="AccountingFindBudgets">
+ <value xml:lang="en">Find Budgets</value>
+ </property>
<property key="AccountingFindDepositSlip">
<value xml:lang="de">Finde Einzahlungsscheine für Finanzkonto : ${finAccount.finAccountName} [${finAccountId}]</value>
<value xml:lang="en">Find Deposit Slips for Financial Account : ${finAccount.finAccountName} [${finAccountId}]</value>
@@ -8958,6 +9009,9 @@
<value xml:lang="zh">æ°å»ºååæ¡ä»¶</value>
<value xml:lang="zh_TW">æ°å»ºååæ¢ä»¶</value>
</property>
+ <property key="AccountingNewBudget">
+ <value xml:lang="en">Create New Budget</value>
+ </property>
<property key="AccountingNewCompany">
<value xml:lang="en">Create new accounting company</value>
</property>
@@ -19870,6 +19924,9 @@
<value xml:lang="zh">æ¹éæ¯ä»</value>
<value xml:lang="zh_TW">æ¹æ¬¡ä»æ¬¾</value>
</property>
+ <property key="PageTitleBudgetOverview">
+ <value xml:lang="en">Budget Overview</value>
+ </property>
<property key="PageTitleCopyAgreement">
<value xml:lang="en">Copy Agreement</value>
<value xml:lang="fr">Copie d'accords commerciaux</value>
@@ -20133,6 +20190,9 @@
<value xml:lang="zh">ç¼è¾è´¦åè´¦æ·æ¡ä»¶</value>
<value xml:lang="zh_TW">編輯賬å®è³¬æ¶æ¢ä»¶</value>
</property>
+ <property key="PageTitleEditBudget">
+ <value xml:lang="en">Edit Budget</value>
+ </property>
<property key="PageTitleEditFinAccount">
<value xml:lang="en">Edit Financial Account</value>
<value xml:lang="fr">Modifier un compte financier</value>
@@ -20966,6 +21026,15 @@
<value xml:lang="zh">ååæ¡ä»¶å表</value>
<value xml:lang="zh_TW">ååæ¢ä»¶å表</value>
</property>
+ <property key="PageTitleListBudget">
+ <value xml:lang="en">List Budget</value>
+ </property>
+ <property key="PageTitleListBudgetReviews">
+ <value xml:lang="en">List Budget Reviews</value>
+ </property>
+ <property key="PageTitleListBudgetRoles">
+ <value xml:lang="en">List Budget Roles</value>
+ </property>
<property key="PageTitleListEditInvoiceApplications">
<value xml:lang="en">List Edit Invoice Applications</value>
<value xml:lang="es">Lista Editar Aplicaciones de Factura</value>
@@ -21256,6 +21325,9 @@
<value xml:lang="zh">æå称æ¥æ¾è´¦åè´¦æ·</value>
<value xml:lang="zh_TW">æå稱æ¥æ¾è³¬å®è³¬æ¶</value>
</property>
+ <property key="PageTitleLookupCustomTimePeriod">
+ <value xml:lang="en">Lookup Custom Time Period</value>
+ </property>
<property key="PageTitleLookupFixedAsset">
<value xml:lang="en">Lookup Fixed Asset</value>
<value xml:lang="es">Buscar Activo Fijo</value>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/data/AccountingTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/data/AccountingTypeData.xml?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/data/AccountingTypeData.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/data/AccountingTypeData.xml Sat Mar 15 22:22:39 2014
@@ -1090,4 +1090,20 @@ under the License.
<!-- invoice export replacement Id types -->
<GoodIdentificationType description="replacement value for partyId in the invoice export function in accounting" goodIdentificationTypeId="INVOICE_EXPORT"/>
<PartyIdentificationType description="replacement value for partyId in the invoice export function in accounting" partyIdentificationTypeId="INVOICE_EXPORT"/>
+
+ <!-- Budget Type Data -->
+ <StatusItem description="Created" sequenceId="00" statusCode="CREATED" statusId="BG_CREATED" statusTypeId="BUDGET_STATUS"/>
+ <StatusItem description="Reviewed" sequenceId="01" statusCode="REVIEWED" statusId="BG_REVIEWED" statusTypeId="BUDGET_STATUS"/>
+ <StatusItem description="Approved" sequenceId="02" statusCode="APPROVED" statusId="BG_APPROVED" statusTypeId="BUDGET_STATUS"/>
+ <StatusItem description="Rejected" sequenceId="03" statusCode="REJECTED" statusId="BG_REJECTED" statusTypeId="BUDGET_STATUS"/>
+ <StatusValidChange condition="" statusId="BG_CREATED" statusIdTo="BG_REVIEWED" transitionName="Review Budget"/>
+ <StatusValidChange condition="" statusId="BG_CREATED" statusIdTo="BG_APPROVED" transitionName="Submit Budget"/>
+ <StatusValidChange condition="" statusId="BG_CREATED" statusIdTo="BG_REJECTED" transitionName="Reject Budget"/>
+ <StatusValidChange condition="" statusId="BG_REVIEWED" statusIdTo="BG_APPROVED" transitionName="Approved Budget"/>
+ <StatusValidChange condition="" statusId="BG_REVIEWED" statusIdTo="BG_REJECTED" transitionName="Reject Budget"/>
+ <StatusValidChange condition="" statusId="BG_APPROVED" statusIdTo="BG_CREATED" transitionName="Accept Budget"/>
+ <StatusValidChange condition="" statusId="BG_APPROVED" statusIdTo="BG_REJECTED" transitionName="Reject Budget"/>
+
+ <BudgetReviewResultType description="Accepted" budgetReviewResultTypeId="BGR_ACCEPTED"/>
+ <BudgetReviewResultType description="Rejected" budgetReviewResultTypeId="BGR_REJECTED"/>
</entity-engine-xml>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/ofbiz-component.xml?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/ofbiz-component.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/ofbiz-component.xml Sat Mar 15 22:22:39 2014
@@ -53,11 +53,13 @@ under the License.
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoPaymentsInvoices.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoAccountingUserData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoAssetMaintData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoBudgetData.xml"/>
<!-- General Payment Service Definitions -->
<service-resource type="model" loader="main" location="servicedef/services_agreement.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_admin.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_billing.xml"/>
+ <service-resource type="model" loader="main" location="servicedef/services_budget.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_finaccount.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_fixedasset.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_invoice.xml"/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml Sat Mar 15 22:22:39 2014
@@ -219,7 +219,6 @@ under the License.
<simple-method method-name="createPartyTaxAuthInfo" short-description="create a PartyTaxAuthInfo">
<set value="_CREATE" field="securityAction"/>
<check-permission permission="ACCOUNTING" action="${securityAction}">
- <accept-userlogin-party/>
<fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
</check-permission>
@@ -238,7 +237,6 @@ under the License.
<simple-method method-name="updatePartyTaxAuthInfo" short-description="update a PartyTaxAuthInfo">
<set value="_UPDATE" field="securityAction"/>
<check-permission permission="ACCOUNTING" action="${securityAction}">
- <accept-userlogin-party/>
<fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
</check-permission>
@@ -274,7 +272,6 @@ under the License.
<simple-method method-name="deletePartyTaxAuthInfo" short-description="delete a PartyTaxAuthInfo">
<set value="_DELETE" field="securityAction"/>
<check-permission permission="ACCOUNTING" action="${securityAction}">
- <accept-userlogin-party/>
<fail-property resource="AccountingUiLabels" property="AccountingPermissionError"/>
</check-permission>
<check-errors/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java Sat Mar 15 22:22:39 2014
@@ -21,11 +21,11 @@ package org.ofbiz.accounting.finaccount;
import java.math.BigDecimal;
import java.sql.Timestamp;
+import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javolution.util.FastList;
import javolution.util.FastMap;
import org.ofbiz.accounting.payment.PaymentGatewayServices;
@@ -908,7 +908,7 @@ public class FinAccountPaymentServices {
opts.setMaxRows(1);
opts.setFetchSize(1);
- List<EntityExpr> exprs = FastList.newInstance();
+ List<EntityExpr> exprs = new ArrayList<EntityExpr>();
exprs.add(EntityCondition.makeCondition("finAccountTransTypeId", EntityOperator.EQUALS, "DEPOSIT"));
exprs.add(EntityCondition.makeCondition("finAccountId", EntityOperator.EQUALS, finAccountId));
exprs.add(EntityCondition.makeCondition("orderId", EntityOperator.NOT_EQUAL, null));
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/WEB-INF/controller.xml Sat Mar 15 22:22:39 2014
@@ -1140,7 +1140,76 @@ under the License.
<response name="success" type="view" value="EditFixedAssetMaintOrders"/>
<response name="error" type="view" value="EditFixedAssetMaintOrders"/>
</request-map>
-
+
+ <!-- =============== Budget mapping =================-->
+ <request-map uri="ListBudgets"><security https="true" auth="true"/><response name="success" type="view" value="ListBudgets"/></request-map>
+ <request-map uri="BudgetSearchResults"><security https="true" auth="false"/><response name="success" type="view" value="BudgetSearchResults"/></request-map>
+ <request-map uri="EditBudget"><security https="true" auth="true"/><response name="success" type="view" value="EditBudget"/></request-map>
+ <request-map uri="BudgetOverview"><security https="true" auth="true"/><response name="success" type="view" value="BudgetOverview"/></request-map>
+ <request-map uri="EditBudgetItems"><security https="true" auth="true"/><response name="success" type="view" value="EditBudgetItems"/></request-map>
+ <request-map uri="BudgetRoles"><security https="true" auth="true"/><response name="success" type="view" value="BudgetRoles"/></request-map>
+ <request-map uri="BudgetReviews"><security https="true" auth="true"/><response name="success" type="view" value="BudgetReviews"/></request-map>
+ <request-map uri="createBudget">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createBudget"/>
+ <response name="success" type="view" value="EditBudget"/>
+ <response name="error" type="view" value="EditBudget"/>
+ </request-map>
+ <request-map uri="updateBudget">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateBudget"/>
+ <response name="success" type="view" value="EditBudget"/>
+ <response name="error" type="view" value="EditBudget"/>
+ </request-map>
+ <request-map uri="updateBudgetStatus">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateBudgetStatus"/>
+ <response name="success" type="view" value="BudgetOverview"/>
+ <response name="error" type="view" value="BudgetOverview"/>
+ </request-map>
+ <request-map uri="createBudgetItem">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createBudgetItem"/>
+ <response name="success" type="view" value="EditBudgetItems"/>
+ <response name="error" type="view" value="EditBudgetItems"/>
+ </request-map>
+ <request-map uri="updateBudgetItem">
+ <security https="true" auth="true"/>
+ <event type="service-multi" invoke="updateBudgetItem"/>
+ <response name="success" type="request-redirect" value="EditBudgetItems"/>
+ <response name="error" type="view" value="EditBudgetItems"/>
+ </request-map>
+ <request-map uri="removeBudgetItem">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="removeBudgetItem"/>
+ <response name="success" type="view" value="EditBudgetItems"/>
+ <response name="error" type="view" value="EditBudgetItems"/>
+ </request-map>
+ <request-map uri="createBudgetRole">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createBudgetRole"/>
+ <response name="success" type="view" value="BudgetRoles"/>
+ <response name="error" type="view" value="BudgetRoles"/>
+ </request-map>
+ <request-map uri="removeBudgetRole">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="removeBudgetRole"/>
+ <response name="success" type="view" value="BudgetRoles"/>
+ <response name="error" type="view" value="BudgetRoles"/>
+ </request-map>
+ <request-map uri="createBudgetReview">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createBudgetReview"/>
+ <response name="success" type="view" value="BudgetReviews"/>
+ <response name="error" type="view" value="BudgetReviews"/>
+ </request-map>
+ <request-map uri="removeBudgetReview">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="removeBudgetReview"/>
+ <response name="success" type="view" value="BudgetReviews"/>
+ <response name="error" type="view" value="BudgetReviews"/>
+ </request-map>
+
<!-- =============== Agreement mapping =================-->
<request-map uri="FindAgreement"><security https="true" auth="true"/><response name="success" type="view" value="FindAgreement"/></request-map>
<request-map uri="cancelAgreement">
@@ -2237,7 +2306,7 @@ under the License.
<request-map uri="LookupAgreementItem"><security auth="true" https="true"/><response name="success" type="view" value="LookupAgreementItem"/></request-map>
<request-map uri="LookupPaymentGroupMember"><security auth="true" https="true"/><response name="success" type="view" value="LookupPaymentGroupMember"/></request-map>
<request-map uri="LookupGlReconciliation"><security auth="true" https="true"/><response name="success" type="view" value="LookupGlReconciliation"/></request-map>
-
+ <request-map uri="LookupCustomTimePeriod"><security auth="true" https="true"/><response name="success" type="view" value="LookupCustomTimePeriod"/></request-map>
<request-map uri="viewprofile"><security https="true" auth="true"/><response name="success" type="view" value="viewprofile"/></request-map>
@@ -2698,6 +2767,15 @@ under the License.
<view-map name="EditFixedAsset" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#EditFixedAsset"/>
<view-map name="ListFixedAssetProducts" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssetProducts"/>
+ <!-- Budget -->
+ <view-map name="ListBudgets" type="screen" page="component://accounting/widget/BudgetScreens.xml#ListBudgets"/>
+ <view-map name="BudgetSearchResults" type="screen" page="component://accounting/widget/BudgetScreens.xml#BudgetSearchResults"/>
+ <view-map name="EditBudget" type="screen" page="component://accounting/widget/BudgetScreens.xml#EditBudget"/>
+ <view-map name="BudgetOverview" type="screen" page="component://accounting/widget/BudgetScreens.xml#BudgetOverview"/>
+ <view-map name="EditBudgetItems" type="screen" page="component://accounting/widget/BudgetScreens.xml#EditBudgetItems"/>
+ <view-map name="BudgetRoles" type="screen" page="component://accounting/widget/BudgetScreens.xml#BudgetRoles"/>
+ <view-map name="BudgetReviews" type="screen" page="component://accounting/widget/BudgetScreens.xml#BudgetReviews"/>
+
<!-- TO BE REMOVED
<view-map name="addFixedAssetProduct" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#addFixedAssetProduct"/>
<view-map name="updateFixedAssetProduct" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#updateFixedAssetProduct"/>
@@ -2822,6 +2900,7 @@ under the License.
<view-map name="LookupBillingAccount" page="component://accounting/widget/LookupScreens.xml#LookupBillingAccount" type="screen"/>
<view-map name="LookupPayment" page="component://accounting/widget/LookupScreens.xml#LookupPayment" type="screen"/>
<view-map name="LookupInvoice" page="component://accounting/widget/LookupScreens.xml#LookupInvoice" type="screen"/>
+ <view-map name="LookupCustomTimePeriod" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupCustomTimePeriod"/>
<view-map name="LookupWorkEffort" type="screen" page="component://workeffort/widget/LookupScreens.xml#LookupWorkEffort"/>
<view-map name="LookupOrderHeader" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeader"/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/AccountingMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/AccountingMenus.xml?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/AccountingMenus.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/AccountingMenus.xml Sat Mar 15 22:22:39 2014
@@ -48,6 +48,7 @@ under the License.
<menu-item name="TaxAuthorities" title="${uiLabelMap.AccountingTaxAuthorities}"><link target="FindTaxAuthority"/></menu-item>
<menu-item name="agreements" title="${uiLabelMap.AccountingAgreements}"><link target="FindAgreement"/></menu-item>
<menu-item name="ListFixedAssets" title="${uiLabelMap.AccountingFixedAssets}"><link target="ListFixedAssets"/></menu-item>
+ <menu-item name="ListBudgets" title="${uiLabelMap.AccountingBudgets}"><link target="ListBudgets"/></menu-item>
<menu-item name="GlobalGLSettings" title="${uiLabelMap.AccountingGlobalGLSettings}"><link target="globalGLSettings"/></menu-item>
<menu-item name="companies" title="${uiLabelMap.AccountingOrgGlSettings}"><link target="ListCompanies"/></menu-item>
</menu>
@@ -672,6 +673,117 @@ under the License.
</menu-item>
</menu>
+ <menu name="BudgetTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+ default-menu-item-name="EditBudget">
+ <menu-item name="ListBudgets" title="${uiLabelMap.AccountingBudgetFind}">
+ <link target="ListBudgets"/>
+ </menu-item>
+ <menu-item name="BudgetOverview" title="${uiLabelMap.AccountingBudgetOverview}">
+ <link target="BudgetOverview">
+ <parameter param-name="budgetId"/>
+ </link>
+ </menu-item>
+ <menu-item name="EditBudget" title="${uiLabelMap.AccountingBudgetHeader}">
+ <condition>
+ <and>
+ <not><if-empty field="budgetId"/></not>
+ <or>
+ <if-compare field="statusId" operator="equals" value="BG_CREATED"/>
+ <if-compare field="statusId" operator="equals" value="BG_REVIEWED"/>
+ </or>
+ </and>
+ </condition>
+ <link target="EditBudget">
+ <parameter param-name="budgetId"/>
+ </link>
+ </menu-item>
+ <menu-item name="BudgetItem" title="${uiLabelMap.AccountingBudgetItems}">
+ <condition>
+ <and>
+ <not><if-empty field="budgetId"/></not>
+ <or>
+ <if-compare field="statusId" operator="equals" value="BG_CREATED"/>
+ <if-compare field="statusId" operator="equals" value="BG_REVIEWED"/>
+ </or>
+ </and>
+ </condition>
+ <link target="EditBudgetItems">
+ <parameter param-name="budgetId"/>
+ </link>
+ </menu-item>
+ <menu-item name="BudgetRoles" title="${uiLabelMap.AccountingBudgetRoles}">
+ <condition>
+ <and>
+ <not><if-empty field="budgetId"/></not>
+ <or>
+ <if-compare field="statusId" operator="equals" value="BG_CREATED"/>
+ <if-compare field="statusId" operator="equals" value="BG_REVIEWED"/>
+ </or>
+ </and>
+ </condition>
+ <link target="BudgetRoles">
+ <parameter param-name="budgetId"/>
+ </link>
+ </menu-item>
+ <menu-item name="BudgetReviews" title="${uiLabelMap.AccountingBudgetReviews}">
+ <condition>
+ <and>
+ <not><if-empty field="budgetId"/></not>
+ <if-compare field="statusId" operator="not-equals" value="BG_REJECTED"/>
+ </and>
+ </condition>
+ <link target="BudgetReviews">
+ <parameter param-name="budgetId"/>
+ </link>
+ </menu-item>
+ </menu>
+
+ <menu name="BudgetSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected">
+ <menu-item name="statusToApproved" title="${uiLabelMap.AccountingBudgetStatusToApproved}">
+ <condition>
+ <and>
+ <not><if-empty field="budgetId"/></not>
+ <or>
+ <if-compare field="statusId" operator="equals" value="BG_CREATED"/>
+ <if-compare field="statusId" operator="equals" value="BG_REVIEWED"/>
+ </or>
+ </and>
+ </condition>
+ <link target="updateBudgetStatus">
+ <parameter param-name="budgetId" from-field="budgetId"/>
+ <parameter param-name="statusId" value="BG_APPROVED"/>
+ </link>
+ </menu-item>
+ <menu-item name="statusToReview" title="${uiLabelMap.AccountingBudgetStatusToReviewed}">
+ <condition>
+ <and>
+ <not><if-empty field="budgetId"/></not>
+ <if-compare field="statusId" operator="equals" value="BG_CREATED"/>
+ </and>
+ </condition>
+ <link target="updateBudgetStatus">
+ <parameter param-name="budgetId" from-field="budgetId"/>
+ <parameter param-name="statusId" value="BG_REVIEWED"/>
+ </link>
+ </menu-item>
+ <menu-item name="statusToReject" title="${uiLabelMap.AccountingBudgetStatusToRejected}">
+ <condition>
+ <and>
+ <not><if-empty field="budgetId"/></not>
+ <or>
+ <if-compare field="statusId" operator="equals" value="BG_CREATED"/>
+ <if-compare field="statusId" operator="equals" value="BG_REVIEWED"/>
+ <if-compare field="statusId" operator="equals" value="BG_APPROVED"/>
+ </or>
+ </and>
+ </condition>
+ <link target="updateBudgetStatus">
+ <parameter param-name="budgetId" from-field="budgetId"/>
+ <parameter param-name="statusId" value="BG_REJECTED"/>
+ </link>
+ </menu-item>
+ </menu>
+
<menu name="PartyGlShortCuts">
<menu-item name="CreateSalesAcctgTrans">
<link target="CreateAcctgTransAndEntries" text="${uiLabelMap.AccountingCreateSalesAcctgTrans}" style="buttontext">
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FieldLookupForms.xml?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FieldLookupForms.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FieldLookupForms.xml Sat Mar 15 22:22:39 2014
@@ -52,6 +52,38 @@ under the License.
<field name="fixedAssetName" title="${uiLabelMap.CommonName}"><display/></field>
<field name="fixedAssetTypeId" title="${uiLabelMap.AccountingFixedAssetTypeId}"><display-entity entity-name="FixedAssetType"/></field>
</form>
+ <form name="lookupBudget" target="LookupBudget" title="" type="single"
+ header-row-style="header-row" default-table-style="basic-table">
+ <auto-fields-entity entity-name="Budget" default-field-type="hidden"/>
+ <field name="budgetId"><text-find/></field>
+ <field name="budgetTypeId" title="${uiLabelMap.AccountingBudgetType}">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="BudgetType" description="${description}">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="customTimePeriodId"><text-find/></field>
+ <field name="comments"><text-find/></field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+ <form name="listLookupBudget" list-name="listIt" title="" type="list" paginate-target="LookupBudget"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <actions>
+ <service service-name="performFind" result-map="result" result-map-list="listIt">
+ <field-map field-name="inputFields" from-field="parameters"/>
+ <field-map field-name="entityName" value="FixedAsset"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
+ </service>
+ </actions>
+ <field name="fixedAssetId" widget-style="buttontext">
+ <hyperlink also-hidden="false" target-type="plain" description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')"/>
+ </field>
+ <field name="fixedAssetName" title="${uiLabelMap.CommonName}"><display/></field>
+ <field name="fixedAssetTypeId" title="${uiLabelMap.AccountingFixedAssetTypeId}"><display-entity entity-name="FixedAssetType"/></field>
+ </form>
<form name="lookupBillingAccount" target="LookupBillingAccount" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="BillingAccount" default-field-type="hidden"/>
@@ -308,4 +340,51 @@ under the License.
<field name="organizationPartyId"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${firstName} ${lastName}[${partyId}]"/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
</form>
+
+ <form name="lookupCustomTimePeriod" target="LookupCustomTimePeriod" title="" type="single"
+ header-row-style="header-row" default-table-style="basic-table">
+ <auto-fields-entity entity-name="CustomTimePeriod" default-field-type="hidden"/>
+ <field name="customTimePeriodId"><text-find/></field>
+ <field name="parentPeriodId"><text-find/></field>
+ <field name="periodTypeId">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="PeriodType" description="${description}">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="periodNum"><text-find/></field>
+ <field name="periodName"><text-find/></field>
+ <field name="fromDate"><date-time/></field>
+ <field name="thruDate"><date-time/></field>
+ <field name="isClosed">
+ <drop-down allow-empty="true">
+ <option key="Y" description="${uiLabelMap.CommonY}"/>
+ <option key="N" description="${uiLabelMap.CommonN}"/>
+ </drop-down>
+ </field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
+ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+ <form name="listLookupCustomTimePeriod" list-name="listIt" title="" type="list" paginate-target="LookupCustomTimePeriod"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <actions>
+ <service service-name="performFind" result-map="result" result-map-list="listIt">
+ <field-map field-name="inputFields" from-field="parameters"/>
+ <field-map field-name="entityName" value="CustomTimePeriod"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
+ </service>
+ </actions>
+ <field name="customTimePeriodId" widget-style="buttontext">
+ <hyperlink also-hidden="false" target-type="plain" description="${customTimePeriodId}" target="javascript:set_value('${customTimePeriodId}')"/>
+ </field>
+ <field name="parentPeriodId"><display/></field>
+ <field name="periodTypeId"><display-entity entity-name="PeriodType"/></field>
+ <field name="periodNum"><display/></field>
+ <field name="periodName"><display/></field>
+ <field name="fromDate"><display/></field>
+ <field name="thruDate"><display/></field>
+ <field name="isClosed"><display/></field>
+ </form>
</forms>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/LookupScreens.xml?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/LookupScreens.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/LookupScreens.xml Sat Mar 15 22:22:39 2014
@@ -268,4 +268,29 @@ under the License.
</widgets>
</section>
</screen>
+
+ <screen name="LookupCustomTimePeriod">
+ <section>
+ <actions>
+ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="title" value="${uiLabelMap.PageTitleLookupCustomTimePeriod}"/>
+ <set field="queryString" from-field="result.queryString"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
+ <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>
+ <set field="entityName" value="CustomTimePeriod"/>
+ <set field="searchFields" value="[customTimePeriodId, periodName]"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-options">
+ <include-form name="lookupCustomTimePeriod" location="component://accounting/widget/FieldLookupForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="listLookupCustomTimePeriod" location="component://accounting/widget/FieldLookupForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/PaymentGatewayConfigForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/PaymentGatewayConfigForms.xml?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/PaymentGatewayConfigForms.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/PaymentGatewayConfigForms.xml Sat Mar 15 22:22:39 2014
@@ -31,7 +31,7 @@ under the License.
</drop-down>
</field>
<field name="performSearch"><hidden value="Y"/></field>
- <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit">
<submit button-type="button"/>
</field>
@@ -411,7 +411,7 @@ under the License.
<field name="paymentGatewayConfigTypeId" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeId}"><text-find ignore-case="true"/></field>
<field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigDescription}"><text-find ignore-case="true"/></field>
<field name="performSearch"><hidden value="Y"/></field>
- <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit">
<submit button-type="button"/>
</field>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/TransactionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/TransactionForms.xml?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/TransactionForms.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/TransactionForms.xml Sat Mar 15 22:22:39 2014
@@ -55,7 +55,7 @@ under the License.
<text-find size="60" maxlength="60"/>
</field>
<field name="performSearch"><hidden value="Y"/></field>
- <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit">
<submit button-type="button"/>
</field>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/config/ContentUiLabels.xml?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/config/ContentUiLabels.xml Sat Mar 15 22:22:39 2014
@@ -704,15 +704,15 @@
<value xml:lang="zh_TW">åæææªç¶åç¯æ¬</value>
</property>
<property key="ContentCompDocDown">
- <value xml:lang="da">vNed</value>
- <value xml:lang="en">vDn</value>
- <value xml:lang="fr">vBas</value>
- <value xml:lang="it">vGiù</value>
- <value xml:lang="ja">vä¸</value>
- <value xml:lang="pt">vDn</value>
- <value xml:lang="vi">Tải vỠ(vDn)</value>
- <value xml:lang="zh">vä¸</value>
- <value xml:lang="zh_TW">vä¸</value>
+ <value xml:lang="da">v Ned</value>
+ <value xml:lang="en">v Dn</value>
+ <value xml:lang="fr">v Bas</value>
+ <value xml:lang="it">v Giù</value>
+ <value xml:lang="ja">v ä¸</value>
+ <value xml:lang="pt">v Dn</value>
+ <value xml:lang="vi">Tải vỠ(v Dn)</value>
+ <value xml:lang="zh">v ä¸</value>
+ <value xml:lang="zh_TW">v ä¸</value>
</property>
<property key="ContentCompDocGeneratePDF">
<value xml:lang="da">Generer sammensat PDF</value>
@@ -832,15 +832,15 @@
<value xml:lang="zh_TW">åæææªç¯æ¬å稱</value>
</property>
<property key="ContentCompDocUp">
- <value xml:lang="da">^Op</value>
- <value xml:lang="en">^Up</value>
- <value xml:lang="fr">^Haut</value>
- <value xml:lang="it">^Sù</value>
- <value xml:lang="ja">^ä¸</value>
- <value xml:lang="pt">^Cima</value>
- <value xml:lang="vi">Tải lên (^Up)</value>
- <value xml:lang="zh">^ä¸</value>
- <value xml:lang="zh_TW">^ä¸</value>
+ <value xml:lang="da">^ Op</value>
+ <value xml:lang="en">^ Up</value>
+ <value xml:lang="fr">^ Haut</value>
+ <value xml:lang="it">^ Sù</value>
+ <value xml:lang="ja">^ ä¸</value>
+ <value xml:lang="pt">^ Cima</value>
+ <value xml:lang="vi">Tải lên (^ Up)</value>
+ <value xml:lang="zh">^ ä¸</value>
+ <value xml:lang="zh_TW">^ ä¸</value>
</property>
<property key="ContentCompDocViewInstances">
<value xml:lang="da">Se instanser</value>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/ofbiz-component.xml?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/ofbiz-component.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/ofbiz-component.xml Sat Mar 15 22:22:39 2014
@@ -68,7 +68,7 @@ under the License.
title="Content"
server="default-server"
location="webapp/content"
- base-permission="CONTENTMGR"
+ base-permission="OFBTOOLS,CONTENTMGR"
mount-point="/content"/>
</ofbiz-component>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/compdoc/CompDocMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/compdoc/CompDocMenus.xml?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/compdoc/CompDocMenus.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/compdoc/CompDocMenus.xml Sat Mar 15 22:22:39 2014
@@ -162,7 +162,7 @@ under the License.
-->
</menu>
- <menu name="childTemplateLine" menu-container-style="button-bar button-style-1" default-menu-item-name="content" selected-menuitem-context-field-name="currentMenuItemName" title="" type="simple">
+ <menu extra-index="${contentId}" name="childTemplateLine" menu-container-style="button-bar button-style-1" default-menu-item-name="content" selected-menuitem-context-field-name="currentMenuItemName" title="" type="simple">
<menu-item name="edit-inplace" title="${contentName} [${contentId}]">
<link target="EditChildCompDoc">
<parameter param-name="contentId"/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/website/WebAnalyticsForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/website/WebAnalyticsForms.xml?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/website/WebAnalyticsForms.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/website/WebAnalyticsForms.xml Sat Mar 15 22:22:39 2014
@@ -70,7 +70,7 @@ under the License.
<text size="20" maxlength="20"/>
</field>
<field name="webSiteId" title="${uiLabelMap.CommonWebsite}"><hidden value="${parameters.webSiteId}"/></field>
- <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field use-when="webAnalyticsConfig!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field use-when="webAnalyticsConfig==null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java Sat Mar 15 22:22:39 2014
@@ -21,6 +21,7 @@ package org.ofbiz.humanres;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -188,7 +189,7 @@ public class HumanResEvents {
}
- List<EntityExpr> exprs = FastList.newInstance();
+ List<EntityExpr> exprs = new ArrayList<EntityExpr>();
exprs.add(EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, partyId));
exprs.add(EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "EMPL_POS_INACTIVE"));
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/EmplLeaveForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/EmplLeaveForms.xml?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/EmplLeaveForms.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/EmplLeaveForms.xml Sat Mar 15 22:22:39 2014
@@ -116,7 +116,7 @@
</form>
<form name="FindLeaveApprovals" target="FindLeaveApprovals" type="single">
<auto-fields-entity entity-name="EmplLeave" default-field-type="find"/>
- <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<!--<field name="approverPartyId" use-when="!hasAdminPermission"><hidden value="${approverPartyId}"/></field>-->
<field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="leaveStatus">
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/LookupForms.xml?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/LookupForms.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/LookupForms.xml Sat Mar 15 22:22:39 2014
@@ -333,7 +333,7 @@ under the License.
</entity-options>
</drop-down>
</field>
- <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListLookupJobRequisition" type="list" list-name="listIt" paginate-target="LookupJobRequisition">
@@ -357,7 +357,7 @@ under the License.
<field name="trainingClassTypeId" title="${uiLabelMap.HumanResTrainingClassType}"><text-find ignore-case="true"/></field>
<field name="parentTypeId" title="${uiLabelMap.HumanResPreRequisiteSkill}"><text-find ignore-case="true"/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><text-find ignore-case="true"/></field>
- <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListLookupTraining" type="list" list-name="listIt" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/PersonTrainingForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/PersonTrainingForms.xml?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/PersonTrainingForms.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/PersonTrainingForms.xml Sat Mar 15 22:22:39 2014
@@ -96,7 +96,7 @@ under the License.
</field>
<field name="approverId" use-when="!hasAdminPermission"><hidden value="${loginPartyId}"/></field>
<field name="reason"><text-find ignore-case="true"/></field>
- <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListTrainingApprovals" type="list" list-name="listIt" target="updateTrainingStatus" title="" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
@@ -166,7 +166,7 @@ under the License.
<field name="approverId"><lookup target-form-name="LookupPartyName"/></field>
<field name="approvalStatus"><text-find ignore-case="true"/></field>
<field name="reason"><text-find ignore-case="true"/></field>
- <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonSearch}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListTrainingStatus" list-name="listIt" title="" type="list" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/RecruitmentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/RecruitmentForms.xml?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/RecruitmentForms.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/RecruitmentForms.xml Sat Mar 15 22:22:39 2014
@@ -24,7 +24,7 @@ under the License.
<set field="jobRequisitionId" from-field="parameters.jobRequisitionId"/>
</actions>
<auto-fields-entity entity-name="JobRequisition" default-field-type="find"/>
- <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="jobRequisitionId"><lookup target-form-name="LookupJobRequisition"/></field>
<field name="skillTypeId">
<drop-down allow-empty="true">
@@ -154,7 +154,7 @@ under the License.
</entity-options>
</drop-down>
</field>
- <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="jobRequisitionId"><lookup target-form-name="LookupJobRequisition"/></field>
<field name="approverPartyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="emplPositionId"><hidden/></field>
@@ -228,7 +228,7 @@ under the License.
</form>
<form name="FindJobInterview" type="single" target="FindJobInterview">
<auto-fields-entity entity-name="JobInterview" default-field-type="find"/>
- <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="jobIntervieweePartyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="jobRequisitionId"><lookup target-form-name="LookupJobRequisition"/></field>
<field name="jobInterviewerPartyId"><lookup target-form-name="LookupPartyName"/></field>
@@ -271,15 +271,15 @@ under the License.
<parameter param-name="jobInterviewId"/>
</hyperlink>
</field>
- <field name="jobIntervieweePartyId" field-name="partyId">
- <display-entity entity-name="PartyNameView" description="${firstName} ${lastName}">
+ <field name="jobIntervieweePartyId" field-name="jobIntervieweePartyId">
+ <display-entity entity-name="PartyNameView" description="${firstName} ${lastName}" key-field-name="partyId">
<sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${jobIntervieweePartyId}" link-style="buttontext">
<parameter param-name="partyId" from-field="jobIntervieweePartyId"/>
</sub-hyperlink>
</display-entity>
</field>
- <field name="jobInterviewerPartyId" field-name="partyId">
- <display-entity entity-name="PartyNameView" description="${firstName} ${lastName}">
+ <field name="jobIntervieweePartyId" field-name="jobIntervieweePartyId">
+ <display-entity entity-name="PartyNameView" description="${firstName} ${lastName}" key-field-name="partyId">
<sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${jobInterviewerPartyId}" link-style="buttontext">
<parameter param-name="partyId" from-field="jobInterviewerPartyId"/>
</sub-hyperlink>
@@ -328,7 +328,7 @@ under the License.
</form>
<form name="FindApprovals" target="FindApprovals" type="single">
<auto-fields-entity entity-name="EmploymentApp" default-field-type="find"/>
- <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="applicationId"><lookup target-form-name="LookupEmploymentApp"/></field>
<field name="approverPartyId" use-when="!hasAdminPermission"><hidden value="${partyId}"/></field>
<field name="applyingPartyId"><lookup target-form-name="LookupPartyName"/></field>
@@ -415,7 +415,7 @@ under the License.
</field>
<field name="reportingDate"><date-find/></field>
<field name="location"><text-find/></field>
- <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListRelocation" list-name="listIt" type="list" odd-row-style="alternate-row" header-row-style="header-row-2"
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/config/ManufacturingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/config/ManufacturingUiLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/config/ManufacturingUiLabels.xml Sat Mar 15 22:22:39 2014
@@ -5061,6 +5061,11 @@
<value xml:lang="zh">å®å
¨é误ï¼è¦è¿è¡è¿ä¸ªæä½ï¼ä½ å¿
é¡»å
·æ MANUFACTURING_UPDATE æ MANUFACTURING_ADMIN æé</value>
<value xml:lang="zh_TW">å®å
¨é¯èª¤ï¼è¦éè¡éåæä½ï¼ä½ å¿
é å
·æ MANUFACTURING_UPDATE æ MANUFACTURING_ADMIN æ¬é</value>
</property>
+ <property key="ManufacturingUsedCapacity">
+ <value xml:lang="en">Manufacturing Used Capacity</value>
+ <value xml:lang="fr">Capacité de fabrication utilisée</value>
+ </property>
+
<property key="ManufacturingViewPermissionError">
<value xml:lang="de">Sie haben keine Berechtigung um diese Seite anzuzeigen. ("MANUFACTURING_VIEWW oder WMANUFACTURING_ADMINW wird benötigt)</value>
<value xml:lang="en">You do not have permission to view this page. ("MANUFACTURING_VIEW" or "MANUFACTURING_ADMIN" needed)</value>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/CalendarForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/CalendarForms.xml?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/CalendarForms.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/CalendarForms.xml Sat Mar 15 22:22:39 2014
@@ -54,9 +54,10 @@ under the License.
<form name="ListCalendarExceptionDay" type="list" target="UpdateCalendarExceptionDay" title="" list-name="calendarExceptionDays"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="calendarId"><hidden/></field>
- <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="exceptionDateStartTime" title="${uiLabelMap.ManufacturingExceptionDateStartTime}"><display/></field>
+ <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="exceptionCapacity" title="${uiLabelMap.ManufacturingCalendarCapacity}" ><display/></field>
+ <field name="usedCapacity" title="${uiLabelMap.ManufacturingUsedCapacity}" ><display/></field>
<field name="updateLink" title=" " widget-style="buttontext">
<hyperlink target="EditCalendarExceptionDay" description="${uiLabelMap.CommonSelect}" >
<parameter param-name="calendarId"/>
@@ -75,14 +76,16 @@ under the License.
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="updateCalendarExceptionDay" map-name="calendarExceptionDay"/>
<field name="calendarId" ><hidden/></field>
- <field name="exceptionDateStartTime" title="${uiLabelMap.ManufacturingExceptionDateStartTime}" ><display/></field>
+ <field name="exceptionDateStartTime" title="${uiLabelMap.ManufacturingExceptionDateStartTime}" position="1"><display/></field>
<field name="description" title="${uiLabelMap.CommonDescription}" position="2" ></field>
- <field name="exceptionCapacity" title="${uiLabelMap.ManufacturingCalendarCapacity}" position="3" ></field>
- <field name="submitButton" title="${uiLabelMap.CommonUpdate}" position="4" ><submit button-type="button"/></field>
+ <field name="exceptionCapacity" title="${uiLabelMap.ManufacturingCalendarCapacity}" position="3" ></field>
+ <field name="usedCapacity" title="${uiLabelMap.ManufacturingUsedCapacity}" position="4" ></field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" position="5" ><submit button-type="button"/></field>
<sort-order>
<sort-field name="exceptionDateStartTime"/>
<sort-field name="description"/>
<sort-field name="exceptionCapacity"/>
+ <sort-field name="usedCapacity"/>
</sort-order>
</form>
@@ -93,6 +96,7 @@ under the License.
<field name="description" title="${uiLabelMap.CommonDescription}" ></field>
<field name="exceptionDateStartTime" title="${uiLabelMap.ManufacturingExceptionDateStartTime}" ></field>
<field name="exceptionCapacity" title="${uiLabelMap.ManufacturingCalendarCapacity}"></field>
+ <field name="usedCapacity" title="${uiLabelMap.ManufacturingUsedCapacity}"></field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.groovy?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.groovy Sat Mar 15 22:22:39 2014
@@ -24,23 +24,22 @@ import org.ofbiz.entity.condition.Entity
import org.ofbiz.entity.condition.EntityConditionList
import org.ofbiz.marketing.report.ReportHelper
-trackingCodeIdStr = request.getParameter("trackingCodeId");
// query for both number of visits and number of orders
visitConditionList = [] as LinkedList;
orderConditionList = [] as LinkedList;
-if (parameters.fromDate) {
- visitConditionList.add(EntityCondition.makeCondition("fromDate", EntityOperator.GREATER_THAN_EQUAL_TO, parameters.fromDate));
- orderConditionList.add(EntityCondition.makeCondition("orderDate", EntityOperator.GREATER_THAN_EQUAL_TO, parameters.fromDate));
+if (fromDate) {
+ visitConditionList.add(EntityCondition.makeCondition("fromDate", EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
+ orderConditionList.add(EntityCondition.makeCondition("orderDate", EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
}
-if (parameters.thruDate) {
- visitConditionList.add(EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, parameters.thruDate));
- orderConditionList.add(EntityCondition.makeCondition("orderDate", EntityOperator.LESS_THAN_EQUAL_TO, parameters.thruDate));
+if (thruDate) {
+ visitConditionList.add(EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, thruDate));
+ orderConditionList.add(EntityCondition.makeCondition("orderDate", EntityOperator.LESS_THAN_EQUAL_TO, thruDate));
}
-if (parameters.trackingCodeId) {
- visitConditionList.add(EntityCondition.makeCondition("trackingCodeId", EntityOperator.EQUALS, parameters.trackingCodeId));
- orderConditionList.add(EntityCondition.makeCondition("trackingCodeId", EntityOperator.EQUALS, parameters.trackingCodeId));
+if (trackingCodeId) {
+ visitConditionList.add(EntityCondition.makeCondition("trackingCodeId", EntityOperator.EQUALS, trackingCodeId));
+ orderConditionList.add(EntityCondition.makeCondition("trackingCodeId", EntityOperator.EQUALS, trackingCodeId));
}
visitConditions = EntityCondition.makeCondition(visitConditionList, EntityOperator.AND);
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/widget/MarketingReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/widget/MarketingReportScreens.xml?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/widget/MarketingReportScreens.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/widget/MarketingReportScreens.xml Sat Mar 15 22:22:39 2014
@@ -86,6 +86,7 @@ under the License.
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<set field="fromDate" from-field="requestParameters.fromDate" type="Timestamp"/>
<set field="thruDate" from-field="requestParameters.thruDate" type="Timestamp"/>
+ <set field="trackingCodeId" from-field="requestParameters.trackingCodeId"/>
<script location="component://marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.groovy"/>
</actions>
<widgets>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java Sat Mar 15 22:22:39 2014
@@ -2174,15 +2174,19 @@ public class OrderServices {
"OrderYouDoNotHavePermissionToChangeThisOrdersStatus",locale));
}
- Map<String, String> fields = UtilMisc.<String, String>toMap("orderId", orderId);
- if (orderItemSeqId != null)
- fields.put("orderItemSeqId", orderItemSeqId);
- if (fromStatusId != null)
- fields.put("statusId", fromStatusId);
+ List<EntityExpr> exprs = new ArrayList<EntityExpr>();
+ exprs.add(EntityCondition.makeCondition("orderId", orderId));
+ if (orderItemSeqId != null) {
+ exprs.add(EntityCondition.makeCondition("orderItemSeqId", orderItemSeqId));
+ } if (fromStatusId != null) {
+ exprs.add(EntityCondition.makeCondition("statusId", fromStatusId));
+ } else {
+ exprs.add(EntityCondition.makeCondition("statusId", EntityOperator.NOT_IN, UtilMisc.toList("ITEM_COMPLETED", "ITEM_CANCELLED")));
+ }
List<GenericValue> orderItems = null;
try {
- orderItems = delegator.findByAnd("OrderItem", fields, null, false);
+ orderItems = delegator.findList("OrderItem", EntityCondition.makeCondition(exprs, EntityOperator.AND), null, null, null, false);
} catch (GenericEntityException e) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,
"OrderErrorCannotGetOrderItemEntity",locale) + e.getMessage());
@@ -4293,7 +4297,7 @@ public class OrderServices {
// remove any order item attributes that were set to empty
try {
- delegator.removeAll(toRemove,true);
+ delegator.removeAll(toRemove);
} catch (GenericEntityException e) {
Debug.logError(e, module);
throw new GeneralException(e.getMessage());
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1577942&r1=1577941&r2=1577942&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Sat Mar 15 22:22:39 2014
@@ -5040,7 +5040,7 @@ public class ShoppingCart implements Ite
BigDecimal minQuantity = BigDecimal.ZERO;
BigDecimal minimumOrderPrice = BigDecimal.ZERO;
- List<EntityExpr> exprs = FastList.newInstance();
+ List<EntityExpr> exprs = new ArrayList<EntityExpr>();
exprs.add(EntityCondition.makeCondition("productId", EntityOperator.EQUALS, itemProductId));
exprs.add(EntityCondition.makeCondition("productPriceTypeId", EntityOperator.EQUALS, "MINIMUM_ORDER_PRICE"));