You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by sa...@apache.org on 2011/10/20 19:33:40 UTC
svn commit: r1186950 [1/4] - in /ofbiz/branches/jackrabbit20100709: ./
applications/accounting/ applications/accounting/config/
applications/accounting/data/
applications/accounting/script/org/ofbiz/accounting/payment/
applications/accounting/script/or...
Author: sascharodekamp
Date: Thu Oct 20 17:33:36 2011
New Revision: 1186950
URL: http://svn.apache.org/viewvc?rev=1186950&view=rev
Log:
Update the Jackrabbit branch with the current trunk version to keep the branch up to date
Added:
ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/test/PaymentApplicationTests.xml
- copied unchanged from r1186940, ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/PaymentApplicationTests.xml
ofbiz/branches/jackrabbit20100709/applications/accounting/testdef/data/PaymentApplicationTestsData.xml
- copied unchanged from r1186940, ofbiz/trunk/applications/accounting/testdef/data/PaymentApplicationTestsData.xml
ofbiz/branches/jackrabbit20100709/applications/accounting/testdef/paymentappltests.xml
- copied unchanged from r1186940, ofbiz/trunk/applications/accounting/testdef/paymentappltests.xml
ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/shipment/test/ (props changed)
- copied from r1186940, ofbiz/trunk/applications/product/src/org/ofbiz/shipment/test/
ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/shipment/test/IssuanceTest.java
- copied unchanged from r1186940, ofbiz/trunk/applications/product/src/org/ofbiz/shipment/test/IssuanceTest.java
ofbiz/branches/jackrabbit20100709/applications/product/testdef/data/IssuanceTestData.xml
- copied unchanged from r1186940, ofbiz/trunk/applications/product/testdef/data/IssuanceTestData.xml
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/humanres/
- copied from r1186940, ofbiz/trunk/framework/images/webapp/images/humanres/
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/humanres/Drawer_Closed.png
- copied unchanged from r1186940, ofbiz/trunk/framework/images/webapp/images/humanres/Drawer_Closed.png
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/humanres/User.png
- copied unchanged from r1186940, ofbiz/trunk/framework/images/webapp/images/humanres/User.png
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/humanres/Users.png
- copied unchanged from r1186940, ofbiz/trunk/framework/images/webapp/images/humanres/Users.png
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/humanres/humanres.css
- copied unchanged from r1186940, ofbiz/trunk/framework/images/webapp/images/humanres/humanres.css
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/README.md
- copied unchanged from r1186940, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/README.md
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.css
- copied unchanged from r1186940, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.css
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.js
- copied unchanged from r1186940, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.js
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/ (props changed)
- copied from r1186940, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-cs.js
- copied unchanged from r1186940, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-cs.js
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-de.js
- copied unchanged from r1186940, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-de.js
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-el.js
- copied unchanged from r1186940, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-el.js
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js
- copied unchanged from r1186940, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-et.js
- copied unchanged from r1186940, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-et.js
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fr.js
- copied unchanged from r1186940, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fr.js
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-hu.js
- copied unchanged from r1186940, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-hu.js
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-id.js
- copied unchanged from r1186940, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-id.js
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-it.js
- copied unchanged from r1186940, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-it.js
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-lt.js
- copied unchanged from r1186940, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-lt.js
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-nl.js
- copied unchanged from r1186940, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-nl.js
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ru.js
- copied unchanged from r1186940, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ru.js
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-tr.js
- copied unchanged from r1186940, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-tr.js
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-vi.js
- copied unchanged from r1186940, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-vi.js
Removed:
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.js
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js
Modified:
ofbiz/branches/jackrabbit20100709/ (props changed)
ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml
ofbiz/branches/jackrabbit20100709/applications/accounting/data/DemoOrganizationData.xml
ofbiz/branches/jackrabbit20100709/applications/accounting/ofbiz-component.xml
ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/services_payment.xml
ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java
ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy
ofbiz/branches/jackrabbit20100709/applications/accounting/widget/PaymentForms.xml
ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml
ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentUrlFilter.java
ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/cms/CMSSites.ftl
ofbiz/branches/jackrabbit20100709/applications/humanres/config/HumanResUiLabels.xml
ofbiz/branches/jackrabbit20100709/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml
ofbiz/branches/jackrabbit20100709/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java
ofbiz/branches/jackrabbit20100709/applications/humanres/widget/CommonScreens.xml
ofbiz/branches/jackrabbit20100709/applications/humanres/widget/forms/EmplPositionForms.xml
ofbiz/branches/jackrabbit20100709/applications/marketing/config/MarketingUiLabels.xml
ofbiz/branches/jackrabbit20100709/applications/order/config/OrderErrorUiLabels.xml
ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml
ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed)
ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy
ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml
ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy
ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed)
ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/editShoppingList.ftl
ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/visit/visitdetail.ftl
ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyForms.xml
ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyInvitationForms.xml
ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyInvitationScreens.xml
ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/ProfileScreens.xml
ofbiz/branches/jackrabbit20100709/applications/product/config/ProductEntityLabels.xml
ofbiz/branches/jackrabbit20100709/applications/product/config/ProductErrorUiLabels.xml
ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml
ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed)
ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
ofbiz/branches/jackrabbit20100709/applications/product/servicedef/secas_olap.xml
ofbiz/branches/jackrabbit20100709/applications/product/testdef/FacilityTest.xml
ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/controller.xml
ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy
ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/facility/PickMoveStock.ftl
ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/shipment/FindShipment.ftl
ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/FeatureForms.xml
ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/FeatureScreens.xml
ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/LookupScreens.xml
ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/StoreScreens.xml
ofbiz/branches/jackrabbit20100709/applications/product/widget/facility/CommonScreens.xml
ofbiz/branches/jackrabbit20100709/applications/product/widget/facility/FacilityScreens.xml
ofbiz/branches/jackrabbit20100709/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java
ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/UtilXml.java
ofbiz/branches/jackrabbit20100709/framework/bi/config/BiUiLabels.xml
ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml
ofbiz/branches/jackrabbit20100709/framework/common/servicedef/services.xml
ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java
ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java
ofbiz/branches/jackrabbit20100709/framework/common/template/JsLanguageFilesMapping.ftl
ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml
ofbiz/branches/jackrabbit20100709/framework/common/widget/HelpScreens.xml (props changed)
ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericEntity.java
ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/fieldlookup.gif
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/fieldlookup.js
ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/selectall.js
ofbiz/branches/jackrabbit20100709/framework/security/data/PasswordSecurityData.xml (props changed)
ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java
ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/website/WebSiteWorker.java
ofbiz/branches/jackrabbit20100709/framework/webtools/config/WebtoolsUiLabels.xml
ofbiz/branches/jackrabbit20100709/framework/webtools/widget/GeoManagementForms.xml
ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/lib/ (props changed)
ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy
ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml
ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl
ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js
ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml
ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/ShoppingListScreens.xml
ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml
ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/webapp/googlebase/find/googleExportLink.ftl
ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/widget/GoogleBaseScreens.xml
ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed)
ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed)
ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed)
ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml
ofbiz/branches/jackrabbit20100709/themes/bizznesstime/includes/header.ftl
ofbiz/branches/jackrabbit20100709/themes/bizznesstime/webapp/bizznesstime/css/style.css
ofbiz/branches/jackrabbit20100709/themes/bluelight/includes/header.ftl
ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/includes/header.ftl
ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
ofbiz/branches/jackrabbit20100709/themes/flatgrey/includes/header.ftl
ofbiz/branches/jackrabbit20100709/themes/flatgrey/webapp/flatgrey/maincss.css
ofbiz/branches/jackrabbit20100709/themes/tomahawk/includes/header.ftl
ofbiz/branches/jackrabbit20100709/themes/tomahawk/webapp/tomahawk/css/style.css
Propchange: ofbiz/branches/jackrabbit20100709/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 20 17:33:36 2011
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4:951708-952957
/ofbiz/branches/jquery:952958-1044489
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:962442-1178182
+/ofbiz/trunk:962442-1186940
Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml Thu Oct 20 17:33:36 2011
@@ -3085,6 +3085,9 @@
<value xml:lang="hi_IN">à¤à¤®à¤¾</value>
<value xml:lang="pt">Cr</value>
</property>
+ <property key="AccountingCurrenciesOfInvoiceAndPaymentNotCompatible">
+ <value xml:lang="en">Currencies of invoice and payment not compatible</value>
+ </property>
<property key="AccountingCurrency">
<value xml:lang="de">Währung</value>
<value xml:lang="en">Currency</value>
@@ -8408,6 +8411,9 @@
<value xml:lang="fr">Factures en attente de règlement</value>
<value xml:lang="pt">Faturas passdas em débito</value>
</property>
+ <property key="AccountingPaymentParentTypesNotCompatible">
+ <value xml:lang="en">Payment parent types not compatible for application</value>
+ </property>
<property key="AccountingPayOnlyWithBillingAccount">
<value xml:lang="de">Bezahlung nur mit Rechnungskonto</value>
<value xml:lang="en">Pay only with Billing Account</value>
Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/data/DemoOrganizationData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/data/DemoOrganizationData.xml?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/data/DemoOrganizationData.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/data/DemoOrganizationData.xml Thu Oct 20 17:33:36 2011
@@ -20,7 +20,7 @@ under the License.
<entity-engine-xml>
<!-- The main Company Internal Organization -->
<Party partyId="Company" partyTypeId="PARTY_GROUP"/>
- <PartyGroup partyId="Company" groupName="Your Company Name Here" logoImageUrl="http://ofbiz.apache.org/images/ofbiz_logo.gif"/>
+ <PartyGroup partyId="Company" groupName="Your Company Name Here"/>
<PartyRole partyId="Company" roleTypeId="BILL_FROM_VENDOR"/>
<PartyRole partyId="Company" roleTypeId="BILL_TO_CUSTOMER"/>
<PartyRole partyId="Company" roleTypeId="INTERNAL_ORGANIZATIO"/>
Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/ofbiz-component.xml?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/ofbiz-component.xml Thu Oct 20 17:33:36 2011
@@ -97,6 +97,7 @@ under the License.
<test-suite loader="main" location="testdef/accountingtests.xml"/>
<test-suite loader="main" location="testdef/paymenttests.xml"/>
+ <test-suite loader="main" location="testdef/paymentappltests.xml"/>
<test-suite loader="main" location="testdef/invoicetests.xml"/>
<test-suite loader="main" location="testdef/fixedassettests.xml"/>
Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Thu Oct 20 17:33:36 2011
@@ -149,7 +149,7 @@ under the License.
<if-empty field="parameters.invoiceId">
<if-empty field="parameters.billingAccountId">
<if-empty field="parameters.taxAuthGeoId">
- <if-empty field="parameters.overrideGlAccountId">
+ <if-empty field="parameters.toPaymentId">
<add-error>
<fail-property resource="AccountingUiLabels" property="AccountingPaymentApplicationParameterMissing"/>
</add-error>
@@ -162,25 +162,121 @@ under the License.
<make-value entity-name="PaymentApplication" value-field="paymentAppl"/>
<set-nonpk-fields map="parameters" value-field="paymentAppl"/>
- <!-- get the invoice and do some further validation against it -->
+ <entity-one entity-name="Payment" value-field="payment"/>
+ <if-empty field="payment">
+ <add-error>
+ <fail-property resource="AccountingUiLabels" property="AccountingPaymentApplicationParameterMissing"/>
+ </add-error>
+ <check-errors/>
+ </if-empty>
+
+ <call-class-method method-name="getPaymentNotApplied" class-name="org.ofbiz.accounting.payment.PaymentWorker" ret-field="notAppliedPayment">
+ <field field="payment" type="GenericValue"/>
+ </call-class-method>
+
<if-not-empty field="parameters.invoiceId">
+ <!-- get the invoice and do some further validation against it -->
<entity-one entity-name="Invoice" value-field="invoice"/>
+ <!-- check the currencies if they are compatible -->
+ <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/>
+ <if>
+ <condition>
+ <or>
+ <if-compare-field field="invoice.currencyUomId" operator="equals" to-field="defaultCurrencyUomId"/>
+ <and>
+ <if-compare-field field="invoice.currencyUomId" operator="not-equals" to-field="defaultCurrencyUomId"/>
+ <if-compare-field field="invoice.currencyUomId" operator="equals" to-field="payment.actualCurrencyUomId"/>
+ </and>
+ </or>
+ </condition>
+ <then><!-- if required get the payment amount in foreign currency (local we already have) -->
+ <if-compare-field field="invoice.currencyUomId" operator="not-equals" to-field="defaultCurrencyUomId">
+ <set field="actual" value="true" type="Boolean"/>
+ <call-class-method method-name="getPaymentNotApplied" class-name="org.ofbiz.accounting.payment.PaymentWorker" ret-field="notAppliedPayment">
+ <field field="payment" type="GenericValue"/>
+ <field field="actual"/>
+ </call-class-method>
+ </if-compare-field>
+ </then>
+ <else>
+ <add-error>
+ <fail-property resource="AccountingUiLabels" property="AccountingCurrenciesOfInvoiceAndPaymentNotCompatible"/>
+ </add-error>
+ </else>
+ </if>
+ <check-errors/>
<!-- get the amount that has not been applied yet for the invoice (outstanding amount) -->
- <set field="notApplied" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}" type="BigDecimal"/>
-
- <!-- if the amount to apply goes over the outstanding amount, then use the notApplied amount and log a warning -->
- <if-compare-field field="paymentAppl.amountApplied" to-field="notApplied" operator="greater" type="BigDecimal">
- <log level="warning" message="Create Payment Application: Amount to apply [${paymentAppl.amountApplied}] is greater than the outstanding amount [${notApplied}] of the invoice [${invoice.invoiceId}]. Creating Payment Application for outstanding amount [${notApplied}] instead."/>
- <set field="paymentAppl.amountApplied" from-field="notApplied"/>
- </if-compare-field>
-
+ <call-class-method method-name="getInvoiceNotApplied" class-name="org.ofbiz.accounting.invoice.InvoiceWorker" ret-field="notAppliedInvoice">
+ <field field="invoice" type="GenericValue"/>
+ </call-class-method>
+
+ <if-empty field="paymentAppl.amountApplied">
+ <if-compare-field field="notAppliedInvoice" operator="less-equals" to-field="notAppliedPayment">
+ <set field="paymentAppl.amountApplied" from-field="notAppliedInvoice"/>
+ <else>
+ <set field="paymentAppl.amountApplied" from-field="notAppliedPayment"/>
+ </else>
+ </if-compare-field>
+ </if-empty>
+
<if-not-empty field="invoice.billingAccountId">
<set field="paymentAppl.billingAccountId" from-field="invoice.billingAccountId"/>
</if-not-empty>
</if-not-empty>
+ <if-not-empty field="parameters.toPaymentId">
+ <!-- get the to payment and check the parent types are compatible -->
+ <entity-one entity-name="Payment" value-field="toPayment">
+ <field-map field-name="paymentId" from-field="parameters.toPaymentId"/>
+ </entity-one>
+ <entity-one value-field="toPaymentType" entity-name="PaymentType">
+ <field-map field-name="paymentTypeId" from-field="toPayment.paymentTypeId"/>
+ </entity-one>
+ <entity-one entity-name="Payment" value-field="payment">
+ <field-map field-name="paymentId" from-field="parameters.paymentId"/>
+ </entity-one>
+ <entity-one value-field="paymentType" entity-name="PaymentType">
+ <field-map field-name="paymentTypeId" from-field="payment.paymentTypeId"/>
+ </entity-one>
+ <if-compare-field operator="equals" field="toPayment.parentTypeId" to-field="payment.parentTypeId">
+ <add-error>
+ <fail-property resource="AccountingUiLabels" property="AccountingPaymentParentTypesNotCompatible"/>
+ </add-error>
+ </if-compare-field>
+
+ <!-- when amount not provided use the the lowest value available -->
+ <if-empty field="parameters.amountApplied">
+ <call-class-method method-name="getPaymentNotApplied" class-name="org.ofbiz.accounting.payment.PaymentWorker" ret-field="notAppliedPayment">
+ <field field="payment" type="GenericValue"/>
+ </call-class-method>
+ <call-class-method method-name="getPaymentNotApplied" class-name="org.ofbiz.accounting.payment.PaymentWorker" ret-field="notAppliedToPayment">
+ <field field="toPayment" type="GenericValue"/>
+ </call-class-method>
+ <if-compare-field operator="less" field="notAppliedPayment" to-field="notAppliedToPayment">
+ <set field="paymentAppl.amountApplied" from-field="notAppliedPayment"/>
+ <else>
+ <set field="paymentAppl.amountApplied" from-field="notAppliedToPayment"/>
+ </else>
+ </if-compare-field>
+ </if-empty>
+ </if-not-empty>
+
+
+ <if-not-empty field="parameters.billingAccountId">
+ <if-empty field="paymentAppl.amountApplied">
+ <set field="paymentAppl.amountApplied" from-field="notAppliedPayment"/>
+ </if-empty>
+ </if-not-empty>
+
+ <if-not-empty field="parameters.taxAuthGeoId">
+ <if-empty field="paymentAppl.amountApplied">
+ <set field="paymentAppl.amountApplied" from-field="notAppliedPayment"/>
+ </if-empty>
+ </if-not-empty>
+
<sequenced-id sequence-name="PaymentApplication" field="paymentAppl.paymentApplicationId"/>
+ <field-to-result field="paymentAppl.amountApplied" result-name="amountApplied"/>
<field-to-result field="paymentAppl.paymentApplicationId" result-name="paymentApplicationId"/>
<create-value value-field="paymentAppl"/>
Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/services_payment.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/services_payment.xml?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/services_payment.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/services_payment.xml Thu Oct 20 17:33:36 2011
@@ -70,12 +70,11 @@ under the License.
location="component://accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml" invoke="createPaymentApplication" auth="true">
<description>Create a payment application</description>
<attribute name="paymentId" type="String" mode="IN" optional="false"/>
+ <attribute name="toPaymentId" type="String" mode="IN" optional="true"/>
<attribute name="invoiceId" type="String" mode="IN" optional="true"/>
- <attribute name="invoiceItemSeqId" type="String" mode="IN" optional="true"/>
<attribute name="billingAccountId" type="String" mode="IN" optional="true"/>
- <attribute name="overrideGlAccountId" type="String" mode="IN" optional="true"/>
<attribute name="taxAuthGeoId" type="String" mode="IN" optional="true"/>
- <attribute name="amountApplied" type="BigDecimal" mode="IN" optional="false"/>
+ <attribute name="amountApplied" type="BigDecimal" mode="INOUT" optional="true"/>
<attribute name="paymentApplicationId" type="String" mode="OUT" optional="false"/>
<attribute name="paymentTypeId" type="String" mode="OUT" optional="false"/>
</service>
Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java Thu Oct 20 17:33:36 2011
@@ -305,7 +305,7 @@ public class PaymentWorker {
if (actual.equals(Boolean.TRUE) && UtilValidate.isNotEmpty(payment.getBigDecimal("actualCurrencyAmount"))) {
return payment.getBigDecimal("actualCurrencyAmount").subtract(getPaymentApplied(payment, actual)).setScale(decimals,rounding);
}
- return payment.getBigDecimal("amount").subtract(getPaymentApplied(payment)).setScale(decimals,rounding);
+ return payment.getBigDecimal("amount").subtract(getPaymentApplied(payment)).setScale(decimals,rounding);
}
public static BigDecimal getPaymentNotApplied(Delegator delegator, String paymentId) {
Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy Thu Oct 20 17:33:36 2011
@@ -41,7 +41,7 @@ exprList = [EntityCondition.makeConditio
partyCond = EntityCondition.makeCondition(exprList, EntityOperator.AND);
exprList1 = [EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "INVOICE_APPROVED"),
- EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "INVOICE_SEND"),
+ EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "INVOICE_SENT"),
EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "INVOICE_READY"),
EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "INVOICE_RECEIVED")];
statusCond = EntityCondition.makeCondition(exprList1, EntityOperator.OR);
Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/widget/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/widget/PaymentForms.xml?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/widget/PaymentForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/widget/PaymentForms.xml Thu Oct 20 17:33:36 2011
@@ -277,7 +277,7 @@ under the License.
<field position="1" name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="editPaymentApplicationsInv" default-entity-name="PaymentApplication" list-name="paymentApplicationsInv" target="updatePaymentApplication" type="list" separate-columns="false"
+ <form name="editPaymentApplicationsInv" default-entity-name="PaymentApplication" list-name="paymentApplicationsInv" target="removePaymentApplication" type="list" separate-columns="false"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="paymentApplicationId"><hidden/></field>
<field name="paymentId"><hidden/></field>
@@ -290,58 +290,32 @@ under the License.
</field>
<field name="invoiceItemSeqId"><display/></field>
<field name="amountApplied"><display/></field>
- <!-- TODO: this is commented out because updating (instead of removing and recreating) payment application can cause wrong gl postings.
- <field name="updateButton" widget-style="buttontext"><submit button-type="text-link"/></field>
- -->
- <field name="removeButton" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
- <hyperlink description="${uiLabelMap.CommonRemove}" target="removePaymentApplication">
- <parameter param-name="paymentApplicationId"/>
- <parameter param-name="paymentId"/>
- </hyperlink>
- </field>
+ <field name="removeButton" title="${uiLabelMap.CommonEmptyHeader}"><submit/></field>
</form>
- <form name="editPaymentApplicationsPay" default-entity-name="PaymentApplication" list-name="paymentApplicationsPay" target="updatePaymentApplication" type="list" separate-columns="false"
+ <form name="editPaymentApplicationsPay" default-entity-name="PaymentApplication" list-name="paymentApplicationsPay" target="removePaymentApplication" type="list" separate-columns="false"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="paymentApplicationId"><hidden/></field>
<field name="paymentId"><hidden/></field>
- <field name="toPaymentId"><lookup target-form-name="LookupPayment"></lookup></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">
- <hyperlink description="${uiLabelMap.CommonRemove}" target="removePaymentApplication">
- <parameter param-name="paymentApplicationId"/>
- <parameter param-name="paymentId"/>
- </hyperlink>
- </field>
+ <field name="toPaymentId"><display/></field>
+ <field name="amountApplied"><display/></field>
+ <field name="removeButton" title="${uiLabelMap.CommonRemove}"><submit/></field>
</form>
- <form name="editPaymentApplicationsBil" default-entity-name="PaymentApplication" list-name="paymentApplicationsBil" target="updatePaymentApplication" type="list" separate-columns="false"
+ <form name="editPaymentApplicationsBil" default-entity-name="PaymentApplication" list-name="paymentApplicationsBil" target="removePaymentApplication" type="list" separate-columns="false"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="paymentApplicationId"><hidden/></field>
<field name="paymentId"><hidden/></field>
- <field name="billingAccountId"><lookup target-form-name="LookupBillingAccount"/></field>
+ <field name="billingAccountId"><display/></field>
<field name="invoiceId"><hidden/></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">
- <hyperlink description="${uiLabelMap.CommonRemove}" target="removePaymentApplication">
- <parameter param-name="paymentApplicationId"/>
- <parameter param-name="paymentId"/>
- </hyperlink>
- </field>
+ <field name="amountApplied"><display/></field>
+ <field name="removeButton" title="${uiLabelMap.CommonRemove}"><submit/></field>
</form>
- <form name="editPaymentApplicationsTax" default-entity-name="PaymentApplication" list-name="paymentApplicationsTax" target="updatePaymentApplication" type="list" separate-columns="false"
+ <form name="editPaymentApplicationsTax" default-entity-name="PaymentApplication" list-name="paymentApplicationsTax" target="removePaymentApplication" type="list" separate-columns="false"
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"><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">
- <hyperlink description="${uiLabelMap.CommonRemove}" target="removePaymentApplication">
- <parameter param-name="paymentApplicationId"/>
- <parameter param-name="paymentId"/>
- </hyperlink>
- </field>
+ <field name="taxAuthGeoId"><display/></field>
+ <field name="amountApplied"><display/></field>
+ <field name="removeButton" title="${uiLabelMap.CommonRemove}"><submit/></field>
</form>
<form name="listInvoicesNotApplied" type="list" list-name="invoices" target="createPaymentApplication" title=""
@@ -366,7 +340,7 @@ under the License.
<form name="listInvoicesNotAppliedOtherCurrency" extends="listInvoicesNotApplied" list-name="invoicesOtherCurrency"/>
- <form name="listPaymentsNotApplied" type="list" list-name="payments" target="updatePaymentApplication" title=""
+ <form name="listPaymentsNotApplied" type="list" list-name="payments" target="createPaymentApplication" title=""
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="paymentId"><hidden/></field>
<field name="toPaymentId" widget-style="buttontext">
@@ -383,7 +357,7 @@ under the License.
</field>
</form>
- <form name="addPaymentApplication" type="single" target="updatePaymentApplication" title=""
+ <form name="addPaymentApplication" type="single" target="createPaymentApplication" title=""
header-row-style="header-row" default-table-style="basic-table">
<field name="paymentId"><hidden/></field>
<field name="invoiceId"><lookup target-form-name="LookupInvoice"/></field>
Modified: ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml Thu Oct 20 17:33:36 2011
@@ -59,6 +59,17 @@ under the License.
<entity-one entity-name="PartyAcctgPrefAndGroup" value-field="orgParty">
<field-map field-name="partyId" from-field="defaultOrganizationPartyId"/>
</entity-one>
+ <entity-one value-field="orgPartyLogoMap" entity-name="PartyGroup">
+ <field-map field-name="partyId" from-field="defaultOrganizationPartyId"/>
+ </entity-one>
+ <entity-and list="orgPartyContentMap" entity-name="PartyContent">
+ <field-map field-name="partyId" from-field="defaultOrganizationPartyId"/>
+ <field-map field-name="partyContentTypeId" value="LGOIMGURL"/>
+ <order-by field-name="-fromDate"/>
+ </entity-and>
+ <set field="orgContentId" from-field="orgPartyContentMap[0].contentId"/>
+ <set field="orgPartyContent" value="${groovy: orgContentId!=null?"stream?contentId=" + orgContentId : ""}"/>
+ <set field="layoutSettings.organizationLogoLinkUrl" from-field="orgPartyContent" default-value="${orgPartyLogoMap.logoImageUrl}" global="true"/>
<set field="defaultOrganizationPartyCurrencyUomId" from-field="orgParty.baseCurrencyUomId" default-value="${defaultCurrencyUomId}" global="true"/>
<set field="defaultOrganizationPartyGroupName" from-field="orgParty.groupName" global="true"/>
<set field="dropdown.hiddenFieldList" from-field="hiddenFields" global="true"/>
Modified: ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentUrlFilter.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentUrlFilter.java?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentUrlFilter.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentUrlFilter.java Thu Oct 20 17:33:36 2011
@@ -74,6 +74,7 @@ public class ContentUrlFilter extends Co
try {
List<GenericValue> contentDataResourceViews = delegator.findByAnd("ContentDataResourceView", UtilMisc.toMap("drObjectInfo", alternativeUrl));
if (contentDataResourceViews.size() > 0) {
+ contentDataResourceViews = EntityUtil.orderBy(contentDataResourceViews, UtilMisc.toList("createdDate DESC"));
GenericValue contentDataResourceView = EntityUtil.getFirst(contentDataResourceViews);
List<GenericValue> contents = EntityUtil.filterByDate(delegator.findByAnd("ContentAssoc", UtilMisc.toMap("contentAssocTypeId", "ALTERNATIVE_URL", "contentIdTo", contentDataResourceView.getString("contentId"))));
if (contents.size() > 0) {
@@ -123,6 +124,10 @@ public class ContentUrlFilter extends Co
url = contentAssocDataResource.getString("drObjectInfo");
try {
url = StringUtil.defaultWebEncoder.decodeFromURL(url);
+ String mountPoint = request.getContextPath();
+ if (!(mountPoint.equals("/")) && !(mountPoint.equals(""))) {
+ url = mountPoint + url;
+ }
} catch (EncodingException e) {
Debug.logError(e, module);
}
Modified: ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/cms/CMSSites.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/cms/CMSSites.ftl?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/cms/CMSSites.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/cms/CMSSites.ftl Thu Oct 20 17:33:36 2011
@@ -238,9 +238,7 @@ function call_fieldlookup4(rootForumId,
</#list>
<tr>
<td valign="middle">
- <div class="boxhead"><input type="text" name="partyId_o_${rowCount}" value=""/>
- <a href="javascript:call_fieldlookup3('<@o...@ofbizUrl>')"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}" /></a></div>
- <#--@htmlTemplate.lookupField3 formName="siteRoleForm" name="partyId_o_${rowCount}" id="partyId_o_${rowCount}" fieldFormName="LookupPerson"/--><#-- FIXME check if should be changed -->
+ <@htmlTemplate.lookupField formName="siteRoleForm" name="partyId_o_${rowCount}" id="partyId_o_${rowCount}" fieldFormName="LookupPerson"/><#-- FIXME check if should be changed -->
</td>
<#list blogRoleIdList as roleTypeId>
<#assign cappedSiteRole= Static["org.ofbiz.entity.model.ModelUtil"].dbNameToVarName(roleTypeId) />
Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/config/HumanResUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/config/HumanResUiLabels.xml?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/humanres/config/HumanResUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/humanres/config/HumanResUiLabels.xml Thu Oct 20 17:33:36 2011
@@ -1226,7 +1226,7 @@
</property>
<property key="HumanResEmployeePosition">
<value xml:lang="de">Stellen</value>
- <value xml:lang="en">Employee Positions</value>
+ <value xml:lang="en">Employee Position</value>
<value xml:lang="fr">Positions d'employé</value>
<value xml:lang="it">Posizione Impiegato</value>
<value xml:lang="pt_BR">Posição do empregado</value>
Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml Thu Oct 20 17:33:36 2011
@@ -72,7 +72,7 @@
</entity-and>
<if-empty field="workEffortList">
<call-service service-name="createWorkEffortAndPartyAssign" in-map-name="parameters">
- <default-message>Successfully created.</default-message>
+ <default-message resource="CommonUiLabels" property="CommonSuccessfullyCreated"/>
</call-service>
<else>
<add-error>
Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java Thu Oct 20 17:33:36 2011
@@ -95,6 +95,7 @@ public class HumanResEvents {
hrefStr = hrefStr + hrefString2;
}
dataAttrMap.put("href", hrefStr);
+ attrMap.put("rel", "P");
dataMap.put("attr", dataAttrMap);
attrMap.put("id", memberId);
josonMap.put("attr",attrMap);
Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/widget/CommonScreens.xml?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/humanres/widget/CommonScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/humanres/widget/CommonScreens.xml Thu Oct 20 17:33:36 2011
@@ -37,6 +37,7 @@ under the License.
<set field="activeApp" value="humanres" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/partymgr/static/partymgr.js" global="true"/>
<set field="layoutSettings.styleSheets[]" value="/partymgr/static/partymgr.css" global="true"/>
+ <set field="layoutSettings.styleSheets[]" value="/images/humanres/humanres.css" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/external/jquery.cookie.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jsTree/jquery.jstree.js" global="true"/>
<set field="applicationMenuName" value="HumanResAppBar" global="true"/>
Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/widget/forms/EmplPositionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/widget/forms/EmplPositionForms.xml?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/humanres/widget/forms/EmplPositionForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/humanres/widget/forms/EmplPositionForms.xml Thu Oct 20 17:33:36 2011
@@ -63,7 +63,7 @@ under the License.
<field use-when="emplPosition!=null" name="emplPositionId" title="${uiLabelMap.HumanResEmplPositionId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field use-when="emplPosition==null&&emplPositionId==null" name="emplPositionId" title="${uiLabelMap.HumanResEmplPositionId}"><lookup target-form-name="LookupEmplPosition"/></field>
<field use-when="emplPosition==null&&emplPositionId!=null" name="emplPositionId" title="${uiLabelMap.HumanResEmplPositionId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${emplPositionId}]"><display/></field>
- <field name="partyId" parameter-name="partyId">
+ <field name="partyId" use-when="emplPosition!=null" parameter-name="partyId" title="organization partyId">
<drop-down allow-empty="false">
<entity-options description="${partyId}" entity-name="PartyRole" key-field-name="partyId">
<entity-constraint name="roleTypeId" value="INTERNAL_ORGANIZATIO"/>
@@ -71,13 +71,13 @@ under the License.
</entity-options>
</drop-down>
</field>
- <field name="partyId" use-when="emplPosition!=null" title="${uiLabelMap.PartyPartyId}">
+ <!--<field name="partyId" title="Organization PartyId">
<display-entity description="${groupName}" entity-name="PartyNameView">
<sub-hyperlink target="viewprofile" link-style="smallSubmit" target-type="inter-app" description="${partyId}">
<parameter param-name="partyId"/>
</sub-hyperlink>
</display-entity>
- </field>
+ </field>-->
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="false">
<entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
Modified: ofbiz/branches/jackrabbit20100709/applications/marketing/config/MarketingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/marketing/config/MarketingUiLabels.xml?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/marketing/config/MarketingUiLabels.xml Thu Oct 20 17:33:36 2011
@@ -2680,7 +2680,7 @@
<property key="SfaSelectExistingAccountOrLeaveBlankToCreateNew">
<value xml:lang="de">Wählen Sie ein existierendes Konto oder lassen Sie es leer um ein neues Konto zu erstellen"</value>
<value xml:lang="en">Either select existing account or leave blank to create new account"</value>
- <value xml:lang="fr">Sélectionner un compte existant ou laissez un espace vide pour créer un nouveau compte"</value>
+ <value xml:lang="fr">Sélectionnez un compte existant ou laissez un espace vide pour créer un nouveau compte"</value>
<value xml:lang="it">Selezione entrambi utente esistente o lasciare vuoto per creare un nuovo utente</value>
<value xml:lang="pt_BR">Ou selecione uma conta existente ou deixe em branco para criar uma nova conta</value>
<value xml:lang="zh">æè
éæ©å·²æè´¦æ·ï¼æè
ç空æ¥æ°å»ºè´¦æ·</value>
Modified: ofbiz/branches/jackrabbit20100709/applications/order/config/OrderErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/config/OrderErrorUiLabels.xml?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/config/OrderErrorUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/config/OrderErrorUiLabels.xml Thu Oct 20 17:33:36 2011
@@ -3072,7 +3072,7 @@
<property key="OrderSelectASuplierOrAProduct">
<value xml:lang="en">Select A Suplier Or A Product</value>
<value xml:lang="es">Seleccione un proveedor o un producto</value>
- <value xml:lang="fr">Sélectionner un fournisseur ou un article</value>
+ <value xml:lang="fr">Sélectionnez un fournisseur ou un article</value>
<value xml:lang="it">Seleziona un fornitore o un prodotto</value>
<value xml:lang="pt_BR">Selecione um fornecedor ou um produto</value>
<value xml:lang="th">à¹à¸¥à¸·à¸à¸à¸à¸¹à¹à¸à¸±à¸à¸«à¸²à¸ªà¸´à¹à¸à¸à¸à¸à¸«à¸£à¸·à¸à¸ªà¸´à¸à¸à¹à¸²</value>
@@ -3082,7 +3082,7 @@
<property key="OrderSelectOnlySupplierOrProduct">
<value xml:lang="en">Select Only Supplier Or Product</value>
<value xml:lang="es">Seleccione solamente el proveedor O el producto</value>
- <value xml:lang="fr">Sélectionner seulement un fournisseur ou seulement un article</value>
+ <value xml:lang="fr">Sélectionnez seulement un fournisseur ou seulement un article</value>
<value xml:lang="it">Seleziona solo fornitore o prodotto</value>
<value xml:lang="pt_BR">Selecione apenas um fornecedor ou ou produto</value>
<value xml:lang="th">à¹à¸¥à¸·à¸à¸à¹à¸à¸à¸²à¸°à¸à¸¹à¹à¸à¸±à¸à¸«à¸²à¸ªà¸´à¹à¸à¸à¸à¸à¸«à¸£à¸·à¸à¸ªà¸´à¸à¸à¹à¸²</value>
Modified: ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml Thu Oct 20 17:33:36 2011
@@ -10240,7 +10240,7 @@
<value xml:lang="de">Wählen Sie eine Lieferadresse</value>
<value xml:lang="en">Select A Shipping Address</value>
<value xml:lang="es">Seleccione una dirección de envÃo</value>
- <value xml:lang="fr">Sélectionner une adresse d'expédition</value>
+ <value xml:lang="fr">Sélectionnez une adresse d'expédition</value>
<value xml:lang="hi_IN">माल à¤à¥à¤à¤¨à¥ वाला पता दिà¤à¥à¤¯à¥</value>
<value xml:lang="it">Seleziona un indirizzo di spedizione</value>
<value xml:lang="ja">Select A Shipping Address</value>
@@ -10256,7 +10256,7 @@
<value xml:lang="de">Zuerst Adresse wählen</value>
<value xml:lang="en">Select Address First</value>
<value xml:lang="es">Seleccione la dirección primero</value>
- <value xml:lang="fr">Sélectionner l'adresse d'abord</value>
+ <value xml:lang="fr">Sélectionnez l'adresse d'abord</value>
<value xml:lang="hi_IN">पहलॠपता à¤à¥à¤¨à¥à¤</value>
<value xml:lang="it">Seleziona l'indirizzo prima</value>
<value xml:lang="ja">Select Address First</value>
@@ -10330,7 +10330,7 @@
<value xml:lang="de">Wählen Sie einen Akteurtyp aus, um ihn dem Auftrag zuzuordnen</value>
<value xml:lang="en">Select type of party to associate to order</value>
<value xml:lang="es">Seleccione el tipo de participante a asociar al pedido</value>
- <value xml:lang="fr">Sélectionner le type d'acteurs à associer à la commande</value>
+ <value xml:lang="fr">Sélectionnez le type d'acteurs à associer à la commande</value>
<value xml:lang="it">Seleziona il tipo di Soggetto da associare all'ordine</value>
<value xml:lang="nl">Select type of party to associate to bestelling</value>
<value xml:lang="pt_BR">Selecione o tipo de participante para associar ao pedido</value>
@@ -10345,7 +10345,7 @@
<value xml:lang="de">Zahlungsmethode wählen</value>
<value xml:lang="en">Select Payment Method</value>
<value xml:lang="es">Seleccionar método de pago</value>
- <value xml:lang="fr">Sélectionner un moyen de paiement</value>
+ <value xml:lang="fr">Sélectionnez un moyen de paiement</value>
<value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ विधॠà¤à¥à¤¨à¥à¤</value>
<value xml:lang="it">Seleziona metodo pagamento</value>
<value xml:lang="ja">Select Payment Method</value>
@@ -10363,7 +10363,7 @@
<value xml:lang="en">Please select a ship from address</value>
<value xml:lang="en_GB">Please select a deliver from address</value>
<value xml:lang="es">Seleccione por favor una dirección de envÃo</value>
- <value xml:lang="fr">Sélectionner l'adresse d'expédition</value>
+ <value xml:lang="fr">Sélectionnez l'adresse d'expédition</value>
<value xml:lang="it">Per favore seleziona un indirizzo di spedizione</value>
<value xml:lang="ja">Please select a ship from address</value>
<value xml:lang="nl">Selecteer het adres waarvandaan verstuurd zal worden</value>
@@ -10379,7 +10379,7 @@
<value xml:lang="de">Lieferadresse auswählen</value>
<value xml:lang="en">Select Shipping Address</value>
<value xml:lang="es">Seleccionar dirección de envÃo</value>
- <value xml:lang="fr">Sélectionner une adresse de livraison</value>
+ <value xml:lang="fr">Sélectionnez une adresse de livraison</value>
<value xml:lang="hi_IN">माल à¤à¥à¤à¤¨à¥ à¤à¤¾ पता à¤à¤¹à¤¿à¤</value>
<value xml:lang="it">Seleziona indirizzo spedizione</value>
<value xml:lang="ja">Select Shipping Address</value>
@@ -10394,7 +10394,7 @@
<value xml:lang="de">Versandmethode auswählen</value>
<value xml:lang="en">Select Shipping Method</value>
<value xml:lang="es">Seleccionar método de envñio</value>
- <value xml:lang="fr">Sélectionner une méthode d'expédition</value>
+ <value xml:lang="fr">Sélectionnez une méthode d'expédition</value>
<value xml:lang="hi_IN">माल à¤à¥à¤à¤¨à¥ à¤à¤¾ तरà¥à¤à¤¾ à¤à¤¹à¤¿à¤</value>
<value xml:lang="it">Seleziona metodo spedizione</value>
<value xml:lang="ja">Select Shipping Method</value>
Propchange: ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 20 17:33:36 2011
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-952957
/ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:952958-1044489
/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:962442-1178182
+/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:962442-1186940
Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy Thu Oct 20 17:33:36 2011
@@ -24,6 +24,7 @@ import org.ofbiz.entity.util.*;
import org.ofbiz.base.util.*;
import org.ofbiz.order.shoppingcart.*;
import org.ofbiz.party.party.PartyWorker;
+import org.ofbiz.party.contact.ContactHelper;
import org.ofbiz.product.catalog.CatalogWorker;
import org.ofbiz.product.store.ProductStoreWorker;
import org.ofbiz.order.shoppingcart.product.ProductDisplayWorker;
@@ -50,3 +51,15 @@ context.suppliers = suppliers;
organizations = delegator.findByAnd("PartyRole", [roleTypeId : "INTERNAL_ORGANIZATIO"]);
context.organizations = organizations;
+
+// Set Shipping From the Party
+partyId = null;
+partyId = parameters.partyId;
+if (partyId) {
+ party = delegator.findByPrimaryKey("Person", [partyId : partyId]);
+ contactMech = EntityUtil.getFirst(ContactHelper.getContactMech(party, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false));
+ if (contactMech) {
+ ShoppingCart shoppingCart = ShoppingCartEvents.getCartObject(request);
+ shoppingCart.setShippingContactMechId(contactMech.contactMechId);
+ }
+}
\ No newline at end of file
Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Thu Oct 20 17:33:36 2011
@@ -154,15 +154,6 @@ function getConfigDetails() {
data: jQuery('configFormId').serialize(),
type: "POST",
success: function(data) {
- if (data._ERROR_MESSAGE_LIST_ != undefined) {
- //console.log(data._ERROR_MESSAGE_LIST_);
- //alert(data._ERROR_MESSAGE_LIST_);
- }else if (data._ERROR_MESSAGE_ != undefined) {
- //console.log(data._ERROR_MESSAGE_);
- //alert(data._ERROR_MESSAGE_);
- }else {
- //console.log(data.totalPrice);
- //console.log(data.configId);
var totalPrice = data.totalPrice;
var configId = data.configId;
document.getElementById('totalPrice').innerHTML = totalPrice;
Modified: ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml Thu Oct 20 17:33:36 2011
@@ -6186,11 +6186,23 @@
<value xml:lang="zh">æ°å»ºä¼åé请</value>
<value xml:lang="zh_TW">æ°å»ºæå¡éè«</value>
</property>
+ <property key="PartyInvitationNewOrder">
+ <value xml:lang="de">Erstellen Sie einen Auftrag von der Einladung</value>
+ <value xml:lang="en">Create An Order From Invitation</value>
+ <value xml:lang="es">Crear una orden de Invitación</value>
+ <value xml:lang="fr">Créer une commande à partir de l'invitation</value>
+ <value xml:lang="it">Creare un ordine da invito</value>
+ <value xml:lang="nl">Maak een Order van de Uitnodiging</value>
+ <value xml:lang="pt_BR">Criar uma ordem de Convite</value>
+ <value xml:lang="th">สรà¹à¸²à¸à¸à¸³à¸ªà¸±à¹à¸à¸à¸·à¹à¸à¸à¸²à¸à¸à¸³à¹à¸à¸´à¸</value>
+ <value xml:lang="zh">åµå»ºçéè«ç§©åº</value>
+ <value xml:lang="zh_TW">å建çé请秩åº</value>
+ </property>
<property key="PartyInvitationNotValidError">
<value xml:lang="de">Dies ist keine gültige Akteur Einladung</value>
<value xml:lang="en">This is not a valid Party Invitation</value>
<value xml:lang="es">Esto no es una invitación de participante válida</value>
- <value xml:lang="fr">Ceci n'est pas une invitation vlable</value>
+ <value xml:lang="fr">Ceci n'est pas une invitation valable</value>
<value xml:lang="hi_IN">यह à¤à¤ वà¥à¤§ पारà¥à¤à¥ à¤à¤¾ निमà¤à¤¤à¥à¤°à¤£ नहà¥à¤ हà¥</value>
<value xml:lang="it">Questo non è un'Invito Soggetto valido</value>
<value xml:lang="nl">Dit is geen valide uitnodiging</value>
@@ -9768,7 +9780,7 @@
<value xml:lang="de">Kontakttyp auswählen</value>
<value xml:lang="en">Select Contact Type</value>
<value xml:lang="es">Seleccionar tipo de contacto</value>
- <value xml:lang="fr">Sélectionner un type de coordonnées</value>
+ <value xml:lang="fr">Sélectionnez un type de coordonnées</value>
<value xml:lang="hi_IN">सà¤à¤ªà¤°à¥à¤ पà¥à¤°à¤à¤¾à¤° à¤à¥à¤¨à¥à¤</value>
<value xml:lang="it">Seleziona tipo di contatto</value>
<value xml:lang="ja">Select Contact Type</value>
@@ -9784,7 +9796,7 @@
<property key="PartySelectMimeType">
<value xml:lang="de">Mime Typ auswählen</value>
<value xml:lang="en">Select Mime Type</value>
- <value xml:lang="fr">Sélectionner le type Mime</value>
+ <value xml:lang="fr">Sélectionnez le type Mime</value>
<value xml:lang="hi_IN">माà¤à¤® पà¥à¤°à¤à¤¾à¤° à¤à¥à¤¨à¥à¤</value>
<value xml:lang="it">Selezione tipo mime</value>
<value xml:lang="nl">Selecteer mime-type</value>
@@ -9798,7 +9810,7 @@
<value xml:lang="de">Zweck auswählen</value>
<value xml:lang="en">Select Purpose</value>
<value xml:lang="es">Seleccione proposito</value>
- <value xml:lang="fr">Sélectionner le but</value>
+ <value xml:lang="fr">Sélectionnez le but</value>
<value xml:lang="hi_IN">पà¥à¤°à¤¯à¥à¤à¤¨ à¤à¥à¤¨à¥à¤</value>
<value xml:lang="it">Seleziona Funzione</value>
<value xml:lang="nl">Selecteer doel</value>
@@ -9812,7 +9824,7 @@
<value xml:lang="de">Rolle auswählen</value>
<value xml:lang="en">Select Role</value>
<value xml:lang="es">Seleccione rol</value>
- <value xml:lang="fr">Sélectionner le rôle</value>
+ <value xml:lang="fr">Sélectionnez le rôle</value>
<value xml:lang="hi_IN">à¤à¥à¤®à¤¿à¤à¤¾ à¤à¥à¤¨à¥à¤</value>
<value xml:lang="it">Seleziona Ruolo</value>
<value xml:lang="nl">Selecteer rol</value>
@@ -9826,7 +9838,7 @@
<value xml:lang="de">Rolle(n) für diesen Akteur auswählen</value>
<value xml:lang="en">Select role(s) for this party</value>
<value xml:lang="es">Seleccione rol(es) para este participante</value>
- <value xml:lang="fr">Sélectionner les rôle(s) pour cet acteur</value>
+ <value xml:lang="fr">Sélectionnez les rôle(s) pour cet acteur</value>
<value xml:lang="hi_IN">à¤à¤¸ पारà¥à¤à¥ à¤à¥ लिठà¤à¥à¤®à¤¿à¤à¤¾(à¤à¤) à¤à¥à¤¨à¥à¤</value>
<value xml:lang="it">Selezione ruolo(i) per questo Soggetto</value>
<value xml:lang="nl">Selecteer rol(len) voor deze relatie</value>
Modified: ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy Thu Oct 20 17:33:36 2011
@@ -99,6 +99,24 @@ if (shoppingListId) {
shoppingListItemDatas.add(shoppingListItemData);
}
context.shoppingListItemDatas = shoppingListItemDatas;
+ // pagination for the shopping list
+ viewIndex = Integer.valueOf(parameters.VIEW_INDEX ?: 0);
+ viewSize = Integer.valueOf(parameters.VIEW_SIZE ?: 20);
+ listSize = 0;
+ if (shoppingListItemDatas)
+ listSize = shoppingListItemDatas.size();
+
+ lowIndex = viewIndex * viewSize + 1;
+ highIndex = (viewIndex + 1) * viewSize;
+
+ if (highIndex > listSize) {
+ highIndex = listSize;
+ }
+ context.viewIndex = viewIndex;
+ context.viewSize = viewSize;
+ context.listSize = listSize;
+ context.lowIndex = lowIndex;
+ context.highIndex = highIndex;
}
shoppingListType = shoppingList.getRelatedOne("ShoppingListType");
Propchange: ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 20 17:33:36 2011
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-952957
/ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:952958-1044489
/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:962442-1178182
+/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:962442-1186940
Modified: ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/editShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/editShoppingList.ftl?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/editShoppingList.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/editShoppingList.ftl Thu Oct 20 17:33:36 2011
@@ -169,6 +169,16 @@ under the License.
</div>
<div class="screenlet-body">
<#if shoppingListItemDatas?has_content>
+ <#-- Pagination -->
+ <#include "component://common/webcommon/includes/htmlTemplate.ftl"/>
+ <#assign commonUrl = "editShoppingList?partyId=" + partyId + "&"/>
+ <#assign viewIndexFirst = 0/>
+ <#assign viewIndexPrevious = viewIndex - 1/>
+ <#assign viewIndexNext = viewIndex + 1/>
+ <#assign viewIndexLast = Static["java.lang.Math"].floor(listSize/viewSize)/>
+ <#assign messageMap = Static["org.ofbiz.base.util.UtilMisc"].toMap("lowCount", lowIndex, "highCount", highIndex, "total", listSize)/>
+ <#assign commonDisplaying = Static["org.ofbiz.base.util.UtilProperties"].getMessage("CommonUiLabels", "CommonDisplaying", messageMap, locale)/>
+ <@nextPrev commonUrl=commonUrl ajaxEnabled=false javaScriptEnabled=false paginateStyle="nav-pager" paginateFirstStyle="nav-first" viewIndex=viewIndex highIndex=highIndex listSize=listSize viewSize=viewSize ajaxFirstUrl="" firstUrl="" paginateFirstLabel="" paginatePreviousStyle="nav-previous" ajaxPreviousUrl="" previousUrl="" paginatePreviousLabel="" pageLabel="" ajaxSelectUrl="" selectUrl="" ajaxSelectSizeUrl="" selectSizeUrl="" commonDisplaying=commonDisplaying paginateNextStyle="nav-next" ajaxNextUrl="" nextUrl="" paginateNextLabel="" paginateLastStyle="nav-last" ajaxLastUrl="" lastUrl="" paginateLastLabel="" paginateViewSizeLabel="" />
<table class="basic-table" cellspacing="0">
<tr class="header-row">
<td>${uiLabelMap.PartyProduct}</td>
@@ -179,7 +189,7 @@ under the License.
<td> </td>
</tr>
<#assign alt_row = false>
- <#list shoppingListItemDatas as shoppingListItemData>
+ <#list shoppingListItemDatas[lowIndex..highIndex-1] as shoppingListItemData>
<#assign shoppingListItem = shoppingListItemData.shoppingListItem>
<#assign product = shoppingListItemData.product>
<#assign productContentWrapper = Static["org.ofbiz.product.product.ProductContentWrapper"].makeProductContentWrapper(product, request)>
Modified: ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/visit/visitdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/visit/visitdetail.ftl?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/visit/visitdetail.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/visit/visitdetail.ftl Thu Oct 20 17:33:36 2011
@@ -168,13 +168,19 @@ under the License.
</#if>
</div>
</div>
+
+<!--
+*******************************************************************************
+JIRA OFBIZ-4488: BEGIN
+https://issues.apache.org/jira/browse/OFBIZ-4488
+*******************************************************************************
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
<li class="h3">${uiLabelMap.PartyPagePushFollowing}</li>
</ul>
<br class="clear"/>
- </div>
+ </div>
<div class="screenlet-body">
<#if security.hasPermission("SEND_CONTROL_APPLET", session)>
<table class="basic-table" cellspacing="0">
@@ -207,3 +213,8 @@ under the License.
</#if>
</div>
</div>
+*******************************************************************************
+JIRA OFBIZ-4488: END
+*******************************************************************************
+-->
+
Modified: ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyForms.xml?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyForms.xml Thu Oct 20 17:33:36 2011
@@ -134,6 +134,7 @@ under the License.
<form name="ViewPartyGroup" type="single" default-map-name="lookupGroup">
<auto-fields-entity entity-name="PartyGroup" default-field-type="display"/>
+ <field name="logo" use-when="organizationLogoLinkURL!=null" title="${uiLabelMap.CommonOrganizationLogo}"><image alternate="${uiLabelMap.CommonOrganizationLogo}" value="${organizationLogoLinkURL}"/></field>
<field name="partyTypeId"><ignored/></field>
<field name="comments"><ignored/></field>
<field name="logoImageUrl"><ignored/></field>
@@ -141,6 +142,20 @@ under the License.
<field name="preferredCurrencyUomId" title="${uiLabelMap.CommonCurrency}"><display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/></field>
<field name="externalId"><display/></field>
<field name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+ <sort-order>
+ <sort-field name="logo"/>
+ <sort-field name="partyId"/>
+ <sort-field name="groupName"/>
+ <sort-field name="groupNameLocal"/>
+ <sort-field name="officeSiteName"/>
+ <sort-field name="annualRevenue"/>
+ <sort-field name="numEmployees"/>
+ <sort-field name="tickerSymbol"/>
+ <sort-field name="description"/>
+ <sort-field name="preferredCurrencyUomId"/>
+ <sort-field name="externalId"/>
+ <sort-field name="statusId"/>
+ </sort-order>
</form>
<form name="ViewPartyPerson" type="single" default-map-name="lookupPerson">
Modified: ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyInvitationForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyInvitationForms.xml?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyInvitationForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyInvitationForms.xml Thu Oct 20 17:33:36 2011
@@ -22,12 +22,13 @@ under the License.
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<form name="FindPartyInvitations" type="single" default-map-name="partyInvitations" target="partyInvitation"
header-row-style="header-row" default-table-style="basic-table">
- <field name="partyInvitationId"><text-find ignore-case="true"/></field>
- <field position="1" name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><lookup target-form-name="LookupPartyName"/></field>
- <field position="2" name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
- <field position="1" name="emailAddress"><text-find ignore-case="true"/></field>
+ <field position="1" name="partyInvitationId"><text-find ignore-case="true"/></field>
+ <field position="2" name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><lookup target-form-name="LookupPartyName"/></field>
+ <field position="1" name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
<field position="2" name="toName"><text-find ignore-case="true"/></field>
- <field name="statusId">
+ <field position="1" name="emailAddress"><text-find ignore-case="true"/></field>
+ <field position="2" name="datefrom" title="${uiLabelMap.CommonFromDate}"><date-time/></field>
+ <field name="statusId" position="1">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
<entity-constraint name="statusTypeId" operator="equals" value="PARTY_INV_STATUS"/>
@@ -35,6 +36,7 @@ under the License.
</entity-options>
</drop-down>
</field>
+ <field position="2" name="dateThru" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
<field name="performSearch"><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>
@@ -43,6 +45,10 @@ under the License.
<form name="ListPartyInvitations" type="list" list-name="listIt" default-entity-name="PartyInvitation"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
+ <set field="parameters.lastInviteDate_fld0_value" from-field="parameters.datefrom"/>
+ <set field="parameters.lastInviteDate_fld0_op" value="greaterThanEqualTo"/>
+ <set field="parameters.lastInviteDate" from-field="parameters.dateThru"/>
+ <set field="parameters.lastInviteDate_op" value="lessThanEqualTo"/>
<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="PartyInvitation"/>
Modified: ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyInvitationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyInvitationScreens.xml?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyInvitationScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/PartyInvitationScreens.xml Thu Oct 20 17:33:36 2011
@@ -54,7 +54,10 @@ under the License.
<not><if-empty field="partyInvitation"/></not>
</condition>
<widgets>
- <container style="button-bar"><link target="editPartyInvitation" text="${uiLabelMap.PartyInvitationNewPartyInvitation}" style="buttontext create"/></container>
+ <container style="button-bar">
+ <link target="editPartyInvitation" text="${uiLabelMap.PartyInvitationNewPartyInvitation}" style="buttontext create"/>
+ <link target="/ordermgr/control/orderentry?partyId=${partyInvitation.partyIdFrom}" text="${uiLabelMap.PartyInvitationNewOrder}" style="buttontext create" url-mode="inter-app"/>
+ </container>
<container style="button-bar"><label style="h1">${uiLabelMap[titleProperty]}</label><label style="h2"> ${uiLabelMap.CommonFor} "${partyInvitation.partyIdFrom}" [${partyInvitationId}]</label></container>
</widgets>
</section>