svn commit: r1599101 - in /ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./ applications/accounting/script/org/ofbiz/accounting/payment/ applications/order/data/ applications/product/config/ applications/product/entitydef/ applications/prod...

Author: jleroux
Date: Mon Jun  2 07:15:03 2014
New Revision: 1599101

URL: http://svn.apache.org/r1599101
Log:
Merged revision(s) 1597158-1599099 from ofbiz/trunk:
A (slightly modified) patch from Yvan Cauchy for "Trigger for service to run upon subscription expiry" https://issues.apache.org/jira/browse/OFBIZ-5333

We are also proposing to add the following fields:

    ProductSubscriptionResource.gracePeriodOnExpiry
    ProductSubscriptionResource.gracePeriodOnExpiryUomId
    Subscription.gracePeriodOnExpiry
    Subscription.gracePeriodOnExpiryUomId

This will allow the runServiceOnSubscriptionExpiry to trigger the service in SubscriptionResource.serviceNameOnExpiry only after

nowTimeStamp >= Subscription.thruDate + Subscription.gracePeriodOnExpiry.

This provides flexibility in managing the triggering of the deprovisioning service, similar to the flexibility in automatic subscription extensions enabled by Subscription.canclAutmExtTime for runSubscriptionAutoReorders.

jleroux:
I replaced tabs by spaces
Will commit the change in serviceResult.ftl apart
Slightly reformatted SubscriptionServices.runServiceOnSubscriptionExpiry()
Slightly reformatted and added comment in services_subscription.xml for the 2 new services

........
Improves serviceResult.ftl, from Yvan Cauchy (reformatted: we use 2 spaces for indentation in FTL files)
........
Closes OFBIZ-5648 - Extend primary keys
........
Completes OFBIZ-5648 - Extend primary keys, by adding XSD documentation about current restrictions

........
Completes OFBIZ-5648 - Extend primary keys, removes trailing blanks

........
Better French label and clearly separate the label and the error in all languages
........
2 patches from Deepak Dixit for "If customer pay higher than amount due, POS issues an error 'Problem with order change'." https://issues.apache.org/jira/browse/OFBIZ-5611

If customer pay higher than amount due, POS issues an error 'Problem with order change'.

Deepak:
This is due to changes done at r#1186102 (http://ofbiz.markmail.org/message/orewmkxnalebolke?q=1186102)
Removed incorrect condition form createPaymentApplication service.
Also found type in PaymentEvents.java file (Xuilabels == > XuiLabels).

........
"Applied fix from trunk for revision: 1597464  "
------------------------------------------------------------------------
r1597464 | jleroux | 2014-05-25 22:04:08 +0200 (dim. 25 mai 2014) | 9 lignes

2 patches from Deepak Dixit for "If customer pay higher than amount due, POS issues an error 'Problem with order change'." https://issues.apache.org/jira/browse/OFBIZ-5611

If customer pay higher than amount due, POS issues an error 'Problem with order change'.

Deepak:
This is due to changes done at r#1186102 (http://ofbiz.markmail.org/message/orewmkxnalebolke?q=1186102)
Removed incorrect condition form createPaymentApplication service.
Also found type in PaymentEvents.java file (Xuilabels == > XuiLabels).

------------------------------------------------------------------------

........
Adds the gitinfo and the clean-gitinfo (last one used in build target) targets
Uses the new runtime/gitinfo.ftl in footers (all themes) like is the runtime/ftlinfo.ftl one
Actually both are shown (if you have a mix of repos, like I do) or one or the other
Adds the runtime/gitinfo.ftl file in both .gitignore and svn ignore
........
Removes duplication
........
Updates Tomcat to 7.0.54
........
Updates Tomcat to 7.0.54 (done by hand)
........
Fixes a typo in .gitignore (this is why I got a duplicated entry at some point)
........
This slipped in inadvertently with r1521589
........
At r1598113 forgot to update .classpath
........
Revert r1598122, I only did an "ant clean build". Today after willing to update .classpath, I tried an "ant start", does not work
........
Completes r1598125 for LICENSE
........
Reverts 1548973, I forgot ecj name changed :/ and want to backport in one shoot
........
Completes r1598113 for LICENSE (2nd time)
........
New self signed SSL certificate created on the OFBiz demo VM with own CA following http://httpd.apache.org/docs/current/ssl/ssl_faq.html#realcert
This certificate is valid for 10 years (until May 27 08:43:19 2024 GMT)
Characteristics: C=US, ST=DE, L=Wilmington, O=Apache Software Fundation, OU=Apache OFBiz, CN=ofbiz-vm.apache.org/emailAddress=[hidden email]
The password is still the same: changeit, I checked: HTTPS works locally

........
"Applied fix from trunk for revision: 1598544  "
------------------------------------------------------------------------
r1598544 | jleroux | 2014-05-30 12:46:54 +0200 (ven. 30 mai 2014) | 7 lignes

Adds a new self signed SSL certificate created on the OFBiz demo VM with own CA following http://httpd.apache.org/docs/current/ssl/ssl_faq.html#realcert
This certificate is valid for 10 years (until May 27 08:43:19 2024 GMT)
Characteristics: C=US, ST=DE, L=Wilmington, O=Apache Software Fundation, OU=Apache OFBiz, CN=ofbiz-vm.apache.org/emailAddress=[hidden email]
The password is still the same: changeit, I checked: HTTPS works locally

I don't really understand the content and the need of framework/base/cert/ so I only added framework/base/cert/demoCA/newcerts/03.pem and framework/base/cert/README which explains this change

------------------------------------------------------------------------

........
"Applied fix from trunk for revision: 1598913  "
------------------------------------------------------------------------
r1598913 | jleroux | 2014-05-31 22:10:54 +0200 (sam. 31 mai 2014) | 8 lignes

A patche from Olivier Heintz for "ProductStoreFacilities page does not refresh information after actions are performed" https://issues.apache.org/jira/browse/OFBIZ-5408

The ProductStoreFacilities page does not refresh when actions are performed.  When adding or deleting a facility from the store, the result of either action is not reflected on the page even though both are performed.  A loading icon appears after clicking action buttons/links so AJAX is probably being used.  

Olivier:
bug corrections :
1) areaId was wrong in on-event for edit and in delete button in list
2) replace wrong view-map ListProductStoreFacilityFormOnly by ListProductStoreFacility
------------------------------------------------------------------------

........

Added:
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/cert/README
      - copied unchanged from r1599099, ofbiz/trunk/framework/base/cert/README
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/cert/demoCA/newcerts/03.pem
      - copied unchanged from r1599099, ofbiz/trunk/framework/base/cert/demoCA/newcerts/03.pem
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/ecj-P20140317-1600.jar
      - copied unchanged from r1599099, ofbiz/trunk/framework/catalina/lib/ecj-P20140317-1600.jar
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.54-catalina-ha.jar
      - copied unchanged from r1599099, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.54-catalina-ha.jar
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.54-catalina-tribes.jar
      - copied unchanged from r1599099, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.54-catalina-tribes.jar
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.54-catalina.jar
      - copied unchanged from r1599099, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.54-catalina.jar
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.54-jasper.jar
      - copied unchanged from r1599099, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.54-jasper.jar
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.54-tomcat-api.jar
      - copied unchanged from r1599099, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.54-tomcat-api.jar
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.54-tomcat-coyote.jar
      - copied unchanged from r1599099, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.54-tomcat-coyote.jar
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.54-tomcat-juli.jar
      - copied unchanged from r1599099, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.54-tomcat-juli.jar
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.54-tomcat-util.jar
      - copied unchanged from r1599099, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.54-tomcat-util.jar
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/date/FromThruDateCheck.js
      - copied unchanged from r1599099, ofbiz/trunk/framework/images/webapp/images/date/FromThruDateCheck.js
Removed:
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/ecj-4.3.1.jar
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.52-catalina-ha.jar
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.52-catalina-tribes.jar
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.52-catalina.jar
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.52-jasper.jar
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.52-tomcat-api.jar
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.52-tomcat-coyote.jar
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.52-tomcat-juli.jar
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/lib/tomcat-7.0.52-tomcat-util.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/.gitignore
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/data/OrderScheduledServices.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/entitydef/entitymodel.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_subscription.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/controller.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/StoreForms.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/StoreScreens.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/SubscriptionForms.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/config/ofbizssl.jks
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/j2eespecs/annotations-api-3.0.jar
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/j2eespecs/el-api-2.2.jar
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/j2eespecs/jsp-api-2.2.jar
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/j2eespecs/servlet-api-3.0.jar
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/bi/widget/BiScreens.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonUiLabels.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/CommonScreens.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entitymodel.xsd
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/selectall.js
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/config/WebappUiLabels.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/serviceResult.ftl
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/runtime/   (props changed)
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoProduct.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/bizznesstime/includes/footer.ftl
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/droppingcrumbs/includes/footer.ftl
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/includes/footer.ftl
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/includes/footer.ftl

Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1597158-1599099

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=1599101&r1=1599100&r2=1599101&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 Mon Jun  2 07:15:03 2014
@@ -101,15 +101,15 @@
     <classpathentry kind="lib" path="framework/base/lib/scripting/jython-nooro.jar"/>
     <classpathentry kind="lib" path="specialpurpose/birt/lib/org.eclipse.birt.runtime_4.3.1.v20130918-1142.jar"/>
     <classpathentry kind="lib" path="specialpurpose/birt/lib/viewservlets.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/ecj-4.3.1.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.52-catalina-ha.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.52-catalina-tribes.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.52-catalina.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.52-jasper.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.52-tomcat-api.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.52-tomcat-coyote.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.52-tomcat-juli.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.52-tomcat-util.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/ecj-P20140317-1600.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-catalina-ha.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-catalina-tribes.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-catalina.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-jasper.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-tomcat-api.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-tomcat-coyote.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-tomcat-juli.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.54-tomcat-util.jar"/>
     <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.4.jar"/>
     <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-3.1.1.jar"/>
     <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-3.1.1.jar"/>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.gitignore
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.gitignore?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.gitignore (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.gitignore Mon Jun  2 07:15:03 2014
@@ -12,6 +12,7 @@ ofbiz.jar
 changelog
 runtime/git-rebase/*
 runtime/svninfo.ftl
+runtime/gitinfo.ftl
 runtime/test-list-build.xml
 runtime/logs/access_log.*
 runtime/logs/cobertura-base.dat
@@ -38,4 +39,4 @@ themes/flatgrey/webapp/flatgrey/mainrtl-
 *#
 .*.swp
 .*.swo
-framework/entity/lib/jdbc
+framework/entity/lib/jdbc
\ No newline at end of file

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE Mon Jun  2 07:15:03 2014
@@ -76,14 +76,14 @@ framework/base/lib/scripting/jansi-1.2.1
 framework/base/lib/xmlrpc-client-3.1.2.jar
 framework/base/lib/xmlrpc-common-3.1.2.jar
 framework/base/lib/xmlrpc-server-3.1.2.jar
-framework/catalina/lib/tomcat-7.0.52-catalina-ha.jar
-framework/catalina/lib/tomcat-7.0.52-catalina-tribes.jar
-framework/catalina/lib/tomcat-7.0.52-catalina.jar
-framework/catalina/lib/tomcat-7.0.52-jasper.jar
-framework/catalina/lib/tomcat-7.0.52-tomcat-api.jar
-framework/catalina/lib/tomcat-7.0.52-tomcat-coyote.jar
-framework/catalina/lib/tomcat-7.0.52-tomcat-juli.jar
-framework/catalina/lib/tomcat-7.0.52-tomcat-util.jar
+framework/catalina/lib/tomcat-7.0.54-catalina-ha.jar
+framework/catalina/lib/tomcat-7.0.54-catalina-tribes.jar
+framework/catalina/lib/tomcat-7.0.54-catalina.jar
+framework/catalina/lib/tomcat-7.0.54-jasper.jar
+framework/catalina/lib/tomcat-7.0.54-tomcat-api.jar
+framework/catalina/lib/tomcat-7.0.54-tomcat-coyote.jar
+framework/catalina/lib/tomcat-7.0.54-tomcat-juli.jar
+framework/catalina/lib/tomcat-7.0.54-tomcat-util.jar
 framework/entity/lib/commons-dbcp-1.4.jar
 framework/entity/lib/jdbc/derby-10.10.1.1.jar
 framework/entity/lib/jdbc/derbytools-10.8.2.2.jar
@@ -2188,7 +2188,7 @@ of California, with venue lying in Santa
 =========================================================================
 The following libraries distributed with Apache OFBiz are licensed under the
 Eclipse Public License - v 1.0:
-framework/catalina/lib/ecj-4.3.1.jar
+framework/catalina/lib/ecj-P20140317-1600.jar
 =========================================================================
 Eclipse Public License - v 1.0
 

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Mon Jun  2 07:15:03 2014
@@ -219,15 +219,13 @@ under the License.
                 <field field="invoice" type="GenericValue"/>
             </call-class-method>
 
-            <if-empty field="paymentAppl.amountApplied">
-                <if-compare-field field="notAppliedInvoice" operator="less-equals" to-field="notAppliedPayment">
+                <if-compare-field field="notAppliedInvoice" operator="less-equals" to-field="notAppliedPayment" type="BigDecimal">
                     <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>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/data/OrderScheduledServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/data/OrderScheduledServices.xml?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/data/OrderScheduledServices.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/data/OrderScheduledServices.xml Mon Jun  2 07:15:03 2014
@@ -31,5 +31,5 @@ under the License.
     <JobSandbox jobId="8007" jobName="Replacement Held Order Auto-Cancel" runTime="2000-01-01 00:00:00.000" serviceName="autoCancelReplacementOrders" poolId="pool" runAsUser="system" tempExprId="MIDNIGHT_DAILY" maxRecurrenceCount="-1"/>
     <JobSandbox jobId="8008" jobName="Create Also Bought Product Associations" runTime="2000-01-01 00:00:00.000" serviceName="createAlsoBoughtProductAssocs" poolId="pool" runAsUser="system" tempExprId="MIDNIGHT_DAILY" maxRecurrenceCount="-1"/>
     <JobSandbox jobId="8009" jobName="Delete auto-save shopping list for anonymous users" runTime="2000-01-01 00:00:00.000" serviceName="autoDeleteAutoSaveShoppingList" poolId="pool" runAsUser="system" tempExprId="MIDNIGHT_DAILY" maxRecurrenceCount="-1"/>
-
+    <JobSandbox jobId="8010" jobName="Run Nominated Service on Subscription Expiry" runTime="2014-04-21 00:00:00.000" serviceName="runServiceOnSubscriptionExpiry" poolId="pool" runAsUser="system" tempExprId="MIDNIGHT_DAILY" maxRecurrenceCount="-1"/>
 </entity-engine-xml>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml Mon Jun  2 07:15:03 2014
@@ -17566,6 +17566,9 @@
         <value xml:lang="zh">商品收据</value>
         <value xml:lang="zh_TW">成品收據</value>
     </property>
+    <property key="ProductGracePeriodUomId">
+        <value xml:lang="en">Grace Period UOM Id</value>
+    </property>
     <property key="ProductGrams">
         <value xml:lang="de">Gramm</value>
         <value xml:lang="en">Grams</value>
@@ -28795,7 +28798,7 @@
         <value xml:lang="ja">リソースID ${subscriptionResourceId} の処理で申込作成中にエラー</value>
         <value xml:lang="vi">Lỗi tạo Bảo lãnh bán hàng khi xá»­ lý Tài nguyên có Id ${subscriptionResourceId}</value>
         <value xml:lang="zh">创建订阅、当处理资源标识 ${subscriptionResourceId} 时出错</value>
-    </property>
+    </property>    
     <property key="ProductSubscriptionUpdateError">
         <value xml:lang="en">Error processing subscription update with ID ${subscriptionId}</value>
         <value xml:lang="it">Errore durante l'aggiornamento dell'abbonamento ${subscriptionId}</value>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/entitydef/entitymodel.xml?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/entitydef/entitymodel.xml Mon Jun  2 07:15:03 2014
@@ -4394,6 +4394,8 @@ under the License.
         <field name="automaticExtend" type="indicator"><description>If this subscription is automatically extended with the same period as the initial period.</description></field>
         <field name="canclAutmExtTime" type="numeric"><description>The time period (before the end of the thruDate) after which the automatic extension of the subscription will be executed.</description></field>
         <field name="canclAutmExtTimeUomId" type="id"><description>Unit Of Measure used for the automatic extension of the subscription.</description></field>
+        <field name="gracePeriodOnExpiry" type="numeric"><description>The time period (after the end of the thruDate) after which the subscription will be expired.</description></field>
+        <field name="gracePeriodOnExpiryUomId" type="id"><description>Unit Of Measure used for the grace period of the subscription.</description></field>
         <prim-key field="productId"/>
         <prim-key field="subscriptionResourceId"/>
         <prim-key field="fromDate"/>
@@ -4418,6 +4420,9 @@ under the License.
         <relation type="one" fk-name="PROD_SBRS_MTU" title="MaxLifeTime" rel-entity-name="Uom">
             <key-map field-name="maxLifeTimeUomId" rel-field-name="uomId"/>
         </relation>
+        <relation type="one" fk-name="PROD_SBRS_GTU" title="GracePeriod" rel-entity-name="Uom">
+            <key-map field-name="gracePeriodOnExpiryUomId" rel-field-name="uomId"/>
+        </relation>
     </entity>
     <entity entity-name="Subscription"
             package-name="org.ofbiz.product.subscription"
@@ -4455,6 +4460,9 @@ under the License.
         <field name="automaticExtend" type="indicator"><description>If this subscription is automatically extended with the same period as the initial period.</description></field>
         <field name="canclAutmExtTime" type="numeric"><description>The time period (before the end of the thruDate) after which the automatic extension of the subscription will be executed.</description></field>
         <field name="canclAutmExtTimeUomId" type="id"><description>Unit Of Measure used for the automatic extension of the subscription.</description></field>
+        <field name="gracePeriodOnExpiry" type="numeric"><description>The time period (before the end of the thruDate) after which the automatic extension of the subscription will be executed.</description></field>
+        <field name="gracePeriodOnExpiryUomId" type="id"><description>Unit Of Measure used for the automatic extension of the subscription.</description></field>
+        <field name="serviceNameOnExpiry" type="long-varchar"><description>Name of service which will run on subscription expiration.</description></field>
         <prim-key field="subscriptionId"/>
         <relation type="one" fk-name="SUBSC_SRESRC" rel-entity-name="SubscriptionResource">
             <key-map field-name="subscriptionResourceId"/>
@@ -4526,6 +4534,9 @@ under the License.
         <relation type="many" rel-entity-name="SubscriptionTypeAttr">
             <key-map field-name="subscriptionTypeId"/>
         </relation>
+        <relation type="one" fk-name="SUBSC_GTU" title="GracePeriod" rel-entity-name="Uom">
+            <key-map field-name="gracePeriodOnExpiryUomId" rel-field-name="uomId"/>
+        </relation>
     </entity>
     <entity entity-name="SubscriptionActivity" package-name="org.ofbiz.product.subscription" title="Subscription Activity Entity">
         <field name="subscriptionActivityId" type="id-ne"></field>
@@ -4568,6 +4579,7 @@ under the License.
         <field name="description" type="description"></field>
         <field name="contentId" type="id"><description>Optional (use if applicable) ID of a Content record that this would represent a subscription to.</description></field>
         <field name="webSiteId" type="id"><description>Optional (use if applicable) ID of a WebSite record that this would represent a subscription to.</description></field>
+        <field name="serviceNameOnExpiry" type="long-varchar"><description>Name of service which will run on subscription expiration.</description></field>
         <prim-key field="subscriptionResourceId"/>
         <relation type="one" fk-name="SUBSC_RES_PARENT" title="Parent" rel-entity-name="SubscriptionResource">
             <key-map field-name="parentResourceId" rel-field-name="subscriptionResourceId"/>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_subscription.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_subscription.xml?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_subscription.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services_subscription.xml Mon Jun  2 07:15:03 2014
@@ -110,6 +110,8 @@ under the License.
         <attribute name="canclAutmExtTime" type="Integer" mode="IN" optional="true"/>
         <attribute name="canclAutmExtTimeUomId" type="String" mode="IN" optional="true"/>
         <attribute name="alwaysCreateNewRecord" type="String" mode="IN" optional="true"><!-- This defaults to Y (true) which means new Subscription records will be created instead of updating old ones with new thruDates. This keeps a more complete history of subscription activity. --></attribute>
+        <attribute name="gracePeriodOnExpiry" type="Integer" mode="IN" optional="true"/>
+        <attribute name="gracePeriodOnExpiryUomId" type="String" mode="IN" optional="true"/>
         <attribute name="subscriptionId" type="String" mode="OUT" optional="false"/>
     </service>
     <service name="processExtendSubscriptionByProduct" engine="java" auth="true"
@@ -155,4 +157,17 @@ under the License.
         <description>Subscription Permission Checking Logic</description>
         <implements service="permissionInterface"/>
     </service>
+    
+    <service name="runServiceOnSubscriptionExpiry" engine="java" auth="true" use-transaction="true"
+        location="org.ofbiz.product.subscription.SubscriptionServices" invoke="runServiceOnSubscriptionExpiry">
+        <description>A service designed to be automatically run by job scheduler to trigger another service to run for each subscription which has expired.
+            This is done by looking for all subscriptions for which thruDate and gracePeriodOnExpiry are expired and where the automaticExtend flag is set to "N".
+            The service to run is found in SubscriptionResource.ServiceNameOnExpiry (by default OOTB: runSubscriptionExpired, see below)</description>
+    </service>
+    <service name="runSubscriptionExpired" engine="java" auth="true" use-transaction="true"
+        location="org.ofbiz.product.subscription.SubscriptionServices" invoke="runSubscriptionExpired">
+        <description>A dummy service to test subscription expiration, expected to change depending upon the specific service logic that providers will write.
+            See https://issues.apache.org/jira/browse/OFBIZ-5333 for more information</description>
+        <attribute name="subscriptionId" type="String" mode="IN" optional="false"/>
+    </service>
 </services>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java Mon Jun  2 07:15:03 2014
@@ -20,6 +20,7 @@ package org.ofbiz.product.subscription;
 
 import java.math.BigDecimal;
 import java.sql.Timestamp;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -35,6 +36,8 @@ import org.ofbiz.common.uom.UomWorker;
 import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
+import org.ofbiz.entity.condition.EntityCondition;
+import org.ofbiz.entity.condition.EntityOperator;
 import org.ofbiz.entity.util.EntityUtil;
 import org.ofbiz.service.DispatchContext;
 import org.ofbiz.service.GenericServiceException;
@@ -219,6 +222,8 @@ public class SubscriptionServices {
                 subContext.put("automaticExtend", productSubscriptionResource.get("automaticExtend"));
                 subContext.put("canclAutmExtTime", productSubscriptionResource.get("canclAutmExtTime"));
                 subContext.put("canclAutmExtTimeUomId", productSubscriptionResource.get("canclAutmExtTimeUomId"));
+                subContext.put("gracePeriodOnExpiry", productSubscriptionResource.get("gracePeriodOnExpiry"));
+                subContext.put("gracePeriodOnExpiryUomId", productSubscriptionResource.get("gracePeriodOnExpiryUomId"));
 
                 Map<String, Object> ctx = dctx.getModelService("processExtendSubscription").makeValid(subContext, ModelService.IN_PARAM);
                 Map<String, Object> processExtendSubscriptionResult = dispatcher.runSync("processExtendSubscription", ctx);
@@ -298,4 +303,97 @@ public class SubscriptionServices {
 
         return ServiceUtil.returnSuccess();
     }
+    
+    public static Map<String, Object> runServiceOnSubscriptionExpiry( DispatchContext dctx, Map<String, ? extends Object> context) {
+        LocalDispatcher dispatcher = dctx.getDispatcher();
+        Delegator delegator = dctx.getDelegator();
+        
+        GenericValue userLogin = (GenericValue) context.get("userLogin");        
+        Map<String, Object> result = new HashMap<String, Object>();
+        Map<String, Object> expiryMap = new HashMap<String, Object>();
+        String gracePeriodOnExpiry = null;
+        String gracePeriodOnExpiryUomId = null;
+        String subscriptionId = null;
+        
+        try {
+            EntityCondition cond1 = EntityCondition.makeCondition("automaticExtend", EntityOperator.EQUALS, "N");
+            EntityCondition cond2 = EntityCondition.makeCondition("automaticExtend", EntityOperator.EQUALS, null);
+            EntityCondition cond = EntityCondition.makeCondition(UtilMisc.toList(cond1, cond2), EntityOperator.OR);
+            List<GenericValue> subscriptionList = null;
+            subscriptionList = delegator.findList("Subscription", cond, null,null, null, false);
+            
+            if (subscriptionList != null) {
+                for (GenericValue subscription : subscriptionList) {
+                    Calendar currentDate = Calendar.getInstance();
+                    currentDate.setTime(UtilDateTime.nowTimestamp());
+                    // check if the thruDate + grace period (if provided) is earlier than today's date
+                    Calendar endDateSubscription = Calendar.getInstance();
+                    int field = Calendar.MONTH;
+                    String subscriptionResourceId = subscription.getString("subscriptionResourceId");
+                    GenericValue subscriptionResource = null;
+                    subscriptionResource = delegator.findOne("SubscriptionResource", UtilMisc.toMap("subscriptionResourceId", subscriptionResourceId), false);
+                    subscriptionId = subscription.getString("subscriptionId");
+                    gracePeriodOnExpiry = subscription.getString("gracePeriodOnExpiry");
+                    gracePeriodOnExpiryUomId = subscription.getString("gracePeriodOnExpiryUomId");
+                    String serviceNameOnExpiry = subscriptionResource.getString("serviceNameOnExpiry");
+                    endDateSubscription.setTime(subscription.getTimestamp("thruDate"));
+                    
+                    if (gracePeriodOnExpiry != null && gracePeriodOnExpiryUomId != null) {
+                        if ("TF_day".equals(gracePeriodOnExpiryUomId)) {
+                            field = Calendar.DAY_OF_YEAR;
+                        } else if ("TF_wk".equals(gracePeriodOnExpiryUomId)) {
+                            field = Calendar.WEEK_OF_YEAR;
+                        } else if ("TF_mon".equals(gracePeriodOnExpiryUomId)) {
+                            field = Calendar.MONTH;
+                        } else if ("TF_yr".equals(gracePeriodOnExpiryUomId)) {
+                            field = Calendar.YEAR;
+                        } else {
+                            Debug.logWarning("Don't know anything about gracePeriodOnExpiryUomId [" + gracePeriodOnExpiryUomId + "], defaulting to month", module);
+                        }
+                        endDateSubscription.add(field, Integer.valueOf(gracePeriodOnExpiry).intValue());
+                    }
+                    
+                    if ((currentDate.after(endDateSubscription) || currentDate.equals(endDateSubscription)) && serviceNameOnExpiry != null) {
+                        if (userLogin != null) {
+                            expiryMap.put("userLogin", userLogin);
+                        }
+                        if (subscriptionId != null) {
+                            expiryMap.put("subscriptionId", subscriptionId);
+                        }
+                        result = dispatcher.runSync(serviceNameOnExpiry, expiryMap);
+                        if (ServiceUtil.isSuccess(result)) {
+                            Debug.logInfo("Subscription expired successfully for subscription ID:" + subscriptionId, module);
+                        } else if (ServiceUtil.isError(result)) {
+                            result = null;
+                            Debug.logError("Error expiring subscription while processing with subscriptionId: " + subscriptionId, module);
+                        }
+
+                        if (result != null && subscriptionId != null) {
+                            Debug.logInfo("Service mentioned in serviceNameOnExpiry called with result: " + result.get("successMessage"), module);
+                        } else if (result == null && subscriptionId != null) {
+                            Debug.logError("Subscription couldn't be expired for subscriptionId: " + subscriptionId, module);
+                            return ServiceUtil.returnError("Subscription couldn't be expired for subscriptionId: " + subscriptionId);
+                        }
+                    }
+                }
+            }
+        } catch (GenericServiceException e) {
+            Debug.logError("Error while calling service specified in serviceNameOnExpiry", module);
+            return ServiceUtil.returnError(e.toString());
+        } catch (GenericEntityException e) {
+            Debug.logError(e, module);
+        }
+
+        return result;
+    }
+
+    public static Map<String, Object> runSubscriptionExpired(
+            DispatchContext dctx, Map<String, ? extends Object> context) {
+        String subscriptionId = (String) context.get("subscriptionId");
+        Map<String, Object> result = new HashMap<String, Object>();
+        if (subscriptionId != null) {
+            return ServiceUtil.returnSuccess("runSubscriptionExpired service called successfully with subscriptionId " + subscriptionId);
+        }
+        return result;
+    }
 }

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/controller.xml Mon Jun  2 07:15:03 2014
@@ -2367,7 +2367,7 @@ under the License.
     </request-map>
     <request-map uri="ListProductStoreFacilityFormOnly">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="ListProductStoreFacilityFormOnly"/>
+        <response name="success" type="view" value="ListProductStoreFacility"/>
     </request-map>
     <request-map uri="editProductStoreFacility"><security https="true" auth="true"/>
         <response name="success" type="view" value="EditProductStoreFacility"/>
@@ -2387,8 +2387,8 @@ under the License.
     <request-map uri="deleteProductStoreFacility">
         <security https="true" auth="true"/>
         <event type="service" invoke="deleteProductStoreFacility"/>
-        <response name="success" type="view" value="ListProductStoreFacilityFormOnly"/>
-        <response name="error" type="view" value="ListProductStoreFacilityFormOnly"/>
+        <response name="success" type="view" value="ListProductStoreFacility"/>
+        <response name="error" type="view" value="ListProductStoreFacility"/>
     </request-map>
 
     <!-- ================ Keyword Thesaurus Requests ================= -->
@@ -3207,7 +3207,6 @@ under the License.
     <view-map name="EditProductStoreVendorShipments" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreVendorShipments"/>
     <view-map name="ProductStoreFacilities" page="component://product/widget/catalog/CommonScreens.xml#ProductStoreFacilities" type="screen"/>
     <view-map name="ListProductStoreFacility" page="component://product/widget/catalog/StoreScreens.xml#ListProductStoreFacility" type="screen"/>
-    <view-map name="ListProductStoreFacilityFormOnly" page="component://product/widget/catalog/StoreScreens.xml#ListProductStoreFacilityFormOnly" type="screen"/>
     <view-map name="EditProductStoreFacility" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreFacility" type="screen"/>
     <view-map name="EditVendorProduct" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditVendorProduct"/>
     <view-map name="EditKeywordThesaurus" type="screen" page="component://product/widget/catalog/ThesaurusScreens.xml#EditKeywordThesaurus"/>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/StoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/StoreForms.xml?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/StoreForms.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/StoreForms.xml Mon Jun  2 07:15:03 2014
@@ -127,7 +127,7 @@ under the License.
         <field name="fromDate" ><display type="date-time" /></field>
         <field name="thruDate" ><display type="date-time" /></field>
         <field name="deleteLink" title=" " >
-            <hyperlink target="javascript:ajaxUpdateArea('PrdStoreFacilityMgmtArea', 'deleteProductStoreFacility', 'productStoreId=${productStoreId}&amp;facilityId=${facilityId}&amp;fromDate=${fromDate}');"
+            <hyperlink target="javascript:ajaxUpdateArea('PP_ProductStoreFacilityPrdStoreFacilityMgmt00001', 'deleteProductStoreFacility', 'productStoreId=${productStoreId}&amp;facilityId=${facilityId}&amp;fromDate=${fromDate}');"
                target-type="plain" request-confirmation="true" image-location="/images/mini-trash.png" image-title="${uiLabelMap.CommonRemove}">
             </hyperlink>
         </field>
@@ -151,7 +151,7 @@ under the License.
         <field name="submitButton" title="${groovy: productStoreFacility == null ? uiLabelMap.CommonAdd : uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
-        <on-event-update-area event-type="submit" area-id="PrdStoreFacilityMgmtArea" area-target="ListProductStoreFacilityFormOnly?portalPortletId=PrdStoreFacilityMgmt&amp;productStoreId=${parameters.productStoreId}"/>
+        <on-event-update-area event-type="submit" area-id="PP_ProductStoreFacilityPrdStoreFacilityMgmt00001" area-target="ListProductStoreFacilityFormOnly?portalPortletId=PrdStoreFacilityMgmt&amp;productStoreId=${parameters.productStoreId}"/>
      </form>
 
      <!-- ProductStoreGroup Forms -->

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/StoreScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/StoreScreens.xml?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/StoreScreens.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/StoreScreens.xml Mon Jun  2 07:15:03 2014
@@ -564,6 +564,8 @@ under the License.
                 <set field="titleProperty" value="ProductStoreFacilityAssocList"/>
                 <set field="tabButtonItem" value="EditProductStoreFacilities"/>
                 <set field="productStoreId" from-field="parameters.productStoreId"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="portalPageId" value="ProductStoreFacility"/>
             </actions>
             <widgets>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/SubscriptionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/SubscriptionForms.xml?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/SubscriptionForms.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/SubscriptionForms.xml Mon Jun  2 07:15:03 2014
@@ -296,6 +296,15 @@ under the License.
                 </entity-options>
             </drop-down>
         </field>
+        <field name="gracePeriodOnExpiryUomId" title="${uiLabelMap.ProductGracePeriodUomId}">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="Uom" key-field-name="uomId" description="${description}">
+                    <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="serviceNameOnExpiry" ><ignored/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
 

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml Mon Jun  2 07:15:03 2014
@@ -223,6 +223,29 @@ under the License.
         <echo message=" " file="runtime/svninfo.ftl"/>
         <echo message="Done!"/>
     </target>
+    
+    <target name="gitinfo"
+        description="Update the Git Branch-revision info in the footer.">
+        <echo message="Creating gitinfo..."/>
+        <exec executable="git" outputproperty="branch">
+            <arg value="rev-parse"/>
+            <arg value="--abbrev-ref"/>
+            <arg value="HEAD"/>
+        </exec>
+        <exec executable="git" outputproperty="revision">
+            <arg value="rev-parse"/>
+            <arg value="HEAD"/>
+        </exec>
+        <echo message="Found Branch-revision: ${branch}-${revision}"/>
+        <echo message=" - Branch-revision: ${branch}-${revision}" file="runtime/gitinfo.ftl"/>
+        <echo message="Done!"/>
+    </target>
+
+    <target name="clean-gitinfo">
+        <echo message="Resetting gitinfo..."/>
+        <echo message=" " file="runtime/gitinfo.ftl"/>
+        <echo message="Done!"/>
+    </target>
 
     <!-- ================================================================== -->
     <!-- Apply patches where needed                                         -->
@@ -301,6 +324,7 @@ under the License.
 
         <hotdeployant/>
         <antcall target="clean-svninfo"/>
+        <antcall target="clean-gitinfo"/>
 
         <echo message="[build] ========== Done Building (Compile) =========="/>
     </target>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/config/ofbizssl.jks
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/config/ofbizssl.jks?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/j2eespecs/annotations-api-3.0.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/j2eespecs/annotations-api-3.0.jar?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/j2eespecs/el-api-2.2.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/j2eespecs/el-api-2.2.jar?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/j2eespecs/jsp-api-2.2.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/j2eespecs/jsp-api-2.2.jar?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/j2eespecs/servlet-api-3.0.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/j2eespecs/servlet-api-3.0.jar?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/bi/widget/BiScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/bi/widget/BiScreens.xml?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/bi/widget/BiScreens.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/bi/widget/BiScreens.xml Mon Jun  2 07:15:03 2014
@@ -110,7 +110,6 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                <label>fromDateProp = ${fromDateProp}</label>
                         <screenlet>
                             <container>
                                 <platform-specific>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonUiLabels.xml?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonUiLabels.xml Mon Jun  2 07:15:03 2014
@@ -4457,6 +4457,10 @@
         <value xml:lang="zh-CN">起始日期 / 终止日期</value>
         <value xml:lang="zh-TW">開始日/結束日</value>
     </property>
+    <property key="CommonFromDateThruDateCheck">
+        <value xml:lang="en">Thru date can't be same or smaller than from date</value>
+        <value xml:lang="fr">La date de fin ne peut être égale ou plus récente que la date de début</value>
+    </property>
     <property key="CommonFromDateTime">
         <value xml:lang="ar">تاريخ  Ùˆ وقت البدء</value>
         <value xml:lang="cs">Od data a času</value>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/CommonScreens.xml?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/CommonScreens.xml Mon Jun  2 07:15:03 2014
@@ -162,6 +162,7 @@ under the License.
                 <set field="layoutSettings.javaScripts[]" value="/images/miscAjaxFunctions.js" global="true" />
                 <set field="layoutSettings.javaScripts[]" value="/images/selectMultipleRelatedValues.js" global="true" />
                 <set field="layoutSettings.javaScripts[]" value="/images/util.js" global="true" />
+                <set field="layoutSettings.javaScripts[]" value="/images/date/FromThruDateCheck.js" global="true"/>                
                 <set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" global="true" />
                 <service service-name="getVisualThemeResources">
                     <field-map field-name="visualThemeId" />

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entitymodel.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entitymodel.xsd?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entitymodel.xsd (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entitymodel.xsd Mon Jun  2 07:15:03 2014
@@ -499,7 +499,13 @@ under the License.
     <xs:element name="extend-entity">
         <xs:complexType>
             <xs:sequence>
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="field"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="field">
+                    <xs:annotation>
+                        <xs:documentation>
+                            Only overrides of type, colName, description and enable-audit-log are currently supported
+                        </xs:documentation>
+                    </xs:annotation>
+                </xs:element>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="relation"/>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="index"/>
             </xs:sequence>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java Mon Jun  2 07:15:03 2014
@@ -47,8 +47,8 @@ import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.GenericEntity;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
-import org.ofbiz.entity.config.model.Datasource;
 import org.ofbiz.entity.config.EntityConfigUtil;
+import org.ofbiz.entity.config.model.Datasource;
 import org.ofbiz.entity.jdbc.DatabaseUtil;
 import org.ofbiz.entity.model.ModelIndex.Field;
 import org.w3c.dom.Document;
@@ -366,11 +366,15 @@ public class ModelEntity implements Comp
                 this.fieldsList.add(newField);
                 this.fieldsMap.put(newField.getName(), newField);
                 if (!newField.getIsPk()) {
-                    // this will always be true for now as extend-entity fields are always nonpks
                     if (existingField != null) {
                         this.nopks.remove(existingField);
                     }
                     this.nopks.add(newField);
+                } else {
+                    if (existingField != null) {
+                        this.pks.remove(existingField);
+                    }
+                    this.pks.add(newField);
                 }
             }
         }

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/selectall.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/selectall.js?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/selectall.js (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/selectall.js Mon Jun  2 07:15:03 2014
@@ -915,6 +915,8 @@ function showErrorAlertLoadUiLabel(errBo
                 }
             }
         });
+    } else {
+      alert(labels[uiResource][0]);
     }
 }
 
@@ -985,4 +987,4 @@ function submitPagination(obj, url) {
             return true;
         }
     }
-}
\ No newline at end of file
+}

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/config/WebappUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/config/WebappUiLabels.xml?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/config/WebappUiLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/config/WebappUiLabels.xml Mon Jun  2 07:15:03 2014
@@ -233,17 +233,17 @@
         <value xml:lang="zh_TW">你沒有被授權使用這個功能</value>
     </property>
     <property key="coreEvents.service_dispatcher_exception">
-        <value xml:lang="de">Der Service Dispatcher hat eine Exception geworfen</value>
+        <value xml:lang="de">Der Service Dispatcher hat eine Exception geworfen: </value>
         <value xml:lang="en">Service dispatcher threw an exception: </value>
-        <value xml:lang="es">Service dispatcher lanzo una excepción</value>
-        <value xml:lang="fr">Le service dispatcher a envoyer une exception</value>
-        <value xml:lang="it">Dispatcher servizio ha lanciato una eccezione</value>
-        <value xml:lang="ja">サービスディスパッチャが例外を投げました</value>
-        <value xml:lang="ro">Dispeceratul de serviciu a lansat o exceptie</value>
-        <value xml:lang="ru">Диспетчер служб вызвал исключение</value>
-        <value xml:lang="th">Service dispatcher threw an exception</value>
-        <value xml:lang="zh">服务执行程序抛出一个意外错误</value>
-        <value xml:lang="zh_TW">服務執行程式拋出一個意外錯誤</value>
+        <value xml:lang="es">Service dispatcher lanzo una excepción: </value>
+        <value xml:lang="fr">Le service dispatcher a renvoyé une exception : </value>
+        <value xml:lang="it">Dispatcher servizio ha lanciato una eccezione: </value>
+        <value xml:lang="ja">サービスディスパッチャが例外を投げました: </value>
+        <value xml:lang="ro">Dispeceratul de serviciu a lansat o exceptie: </value>
+        <value xml:lang="ru">Диспетчер служб вызвал исключение: </value>
+        <value xml:lang="th">Service dispatcher threw an exception: </value>
+        <value xml:lang="zh">服务执行程序抛出一个意外错误: </value>
+        <value xml:lang="zh_TW">服務執行程式拋出一個意外錯誤: </value>
     </property>
     <property key="coreEvents.service_eventhandler_exception">
         <value xml:lang="de">Der ServiceEventHandler hat eine Exception geworfen</value>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/serviceResult.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/serviceResult.ftl?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/serviceResult.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/service/serviceResult.ftl Mon Jun  2 07:15:03 2014
@@ -28,17 +28,19 @@ under the License.
             <td>${uiLabelMap.WebtoolsParameterValue}</td>
             <td>${uiLabelMap.WebtoolsServiceSaveValue} ?</td>
           </tr>
-          <#list serviceResultList as srl>
-            <tr>
-              <#if srl.hasChild=="Y">
-                <td><a href="<@ofbizUrl>/serviceResult?servicePath=</@ofbizUrl><#if parameters.servicePath?exists>${parameters.servicePath}||</#if>${srl.key?if_exists}">${srl.key?if_exists}</a></td>
-              <#else>
-                <td>${srl.key?if_exists}</td>
-              </#if>
-              <td>${srl.value?if_exists}</td>
-              <td><input type="checkbox" name="<#if parameters.servicePath?exists>${parameters.servicePath}||</#if>${srl.key?if_exists}" /></td>
-            </tr>
-          </#list>
+            <#if serviceResultList?has_content>
+              <#list serviceResultList as srl>
+                <tr>
+                  <#if srl.hasChild=="Y">
+                    <td><a href="<@ofbizUrl>/serviceResult?servicePath=</@ofbizUrl><#if parameters.servicePath?exists>${parameters.servicePath}||</#if>${srl.key?if_exists}">${srl.key?if_exists}</a></td>
+                  <#else>
+                    <td>${srl.key?if_exists}</td>
+                  </#if>
+                    <td>${srl.value?if_exists}</td>
+                    <td><input type="checkbox" name="<#if parameters.servicePath?exists>${parameters.servicePath}||</#if>${srl.key?if_exists}" /></td>
+                  </tr>
+               </#list>
+            </#if>
           <tr>
             <td>&nbsp;</td>
             <td class="label">${uiLabelMap.WebtoolsServiceClearPreviousParams} ? <input type="checkbox" name="_CLEAR_PREVIOUS_PARAMS_" /></td>
@@ -47,4 +49,4 @@ under the License.
         </table>
       </form>
   </div>
-</div>
\ No newline at end of file
+</div>

Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/runtime/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun  2 07:15:03 2014
@@ -3,3 +3,4 @@ svninfo.ftl
 data.zip
 test-list-build.xml
 uploads
+gitinfo.ftl

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoProduct.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoProduct.xml?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoProduct.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoProduct.xml Mon Jun  2 07:15:03 2014
@@ -617,8 +617,8 @@ under the License.
 
     <!-- test Subscription product, a Gizmo Newsletter -->
     <Product productId="GZ-NEWS-1MO" productTypeId="DIGITAL_GOOD" primaryProductCategoryId="101" productName="Gizmo Newsletter 1 Month" internalName="Gizmo Newsletter 1 Month Subscription" description="A 1 month subscription to the Gizmo Newsletter: can be used immediately after purchase." longDescription="This newsletter will give you regular updates on the wonderful world of Gizmos!" taxable="Y" chargeShipping="N" autoCreateKeywords="Y" isVirtual="N" isVariant="N" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
-    <SubscriptionResource subscriptionResourceId="GZ-NEWS" description="Gizmo Newsletter"/>
-    <ProductSubscriptionResource productId="GZ-NEWS-1MO" subscriptionResourceId="GZ-NEWS" fromDate="2001-05-13 12:00:00.0" useTime="1" useTimeUomId="TF_mon"/>
+    <SubscriptionResource subscriptionResourceId="GZ-NEWS" description="Gizmo Newsletter" serviceNameOnExpiry="runSubscriptionExpired"/>
+    <ProductSubscriptionResource productId="GZ-NEWS-1MO" subscriptionResourceId="GZ-NEWS" fromDate="2001-05-13 12:00:00.0" useTime="1" useTimeUomId="TF_mon" gracePeriodOnExpiry="1" gracePeriodOnExpiryUomId="TF_mon"/>
     <ProductPrice productId="GZ-NEWS-1MO" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="3.99" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
     <ProductPrice productId="GZ-NEWS-1MO" productPricePurposeId="PURCHASE" productPriceTypeId="LIST_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="5.0" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
     <DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="GZ-NEWS-1MO-ALT" localeString="en"/>
@@ -628,8 +628,8 @@ under the License.
     <Content contentId="GZ-NEWS-1MO-ALT" contentTypeId="DOCUMENT" dataResourceId="GZ-NEWS-1MO-ALT" localeString="en"/>
     <Content contentId="CGZ-NEWS-1MO-ALTEN" contentTypeId="DOCUMENT" dataResourceId="DRGZ-NEWS-1MO-ALTEN" localeString="en_US"/>
     <ContentAssoc contentId="GZ-NEWS-1MO-ALT" contentIdTo="CGZ-NEWS-1MO-ALTEN" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2011-04-26 12:00:00.0"/>
-    <ProductContent productId="GZ-NEWS-1MO" contentId="GZ-NEWS-1MO-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/>
-
+    <ProductContent productId="GZ-NEWS-1MO" contentId="GZ-NEWS-1MO-ALT" productContentTypeId="ALTERNATIVE_URL" fromDate="2001-05-13 12:00:00.0"/>    
+  
     <!-- test Digital Download product -->
     <Product productId="GZ-DIG" productTypeId="DIGITAL_GOOD" primaryProductCategoryId="101" productName="Digital Gizmo" internalName="Digital Gizmo" description="A digital gizmo: can be downloaded immediately after purchase." longDescription="This gizmo is part of an exciting new breed that needs no corporeal form: it is all digital! Buy and download it now!" taxable="Y" chargeShipping="N" autoCreateKeywords="Y" isVirtual="N" isVariant="N" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
     <DataResource dataResourceId="GZ-DIG" dataResourceTypeId="OFBIZ_FILE_BIN" mimeTypeId="image/gif" dataResourceName="Digital Gizmo Image" objectInfo="framework/images/webapp/images/ofbiz_logo.gif"/>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java Mon Jun  2 07:15:03 2014
@@ -356,7 +356,7 @@ public class PaymentEvents {
             PosScreen newPos = pos.showPage("pospanel");
             newPos.showDialog("dialog/error/noitems");
         } else if (trans.getTotalDue().compareTo(BigDecimal.ZERO) > 0) {
-            pos.showDialog("dialog/error/exception", UtilProperties.getMessage("Xuilabels", "NOT_ENOUGH_FUNDS", defaultLocale));
+            pos.showDialog("dialog/error/exception", UtilProperties.getMessage("XuiLabels", "NOT_ENOUGH_FUNDS", defaultLocale));
             trans.clearPayment("CASH");
         } else {
             // manual locks (not secured; will be unlocked on clear)

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/bizznesstime/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/bizznesstime/includes/footer.ftl?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/bizznesstime/includes/footer.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/bizznesstime/includes/footer.ftl Mon Jun  2 07:15:03 2014
@@ -25,7 +25,7 @@ under the License.
 </div>
 <!-- footer -->
 <div id="footer">
-    <div class="poweredBy"><span>Powered by <a href="http://ofbiz.apache.org" class="noicon">OFBiz</a></span><span>Copyright 2001-${nowTimestamp?string("yyyy")} <a href="http://www.apache.org" class="noicon">The Apache Software Foundation - www.apache.org</a></span><span><#include "ofbizhome://runtime/svninfo.ftl" /></span></div>
+    <div class="poweredBy"><span>Powered by <a href="http://ofbiz.apache.org" class="noicon">OFBiz</a></span><span>Copyright 2001-${nowTimestamp?string("yyyy")} <a href="http://www.apache.org" class="noicon">The Apache Software Foundation - www.apache.org</a></span><span><#include "ofbizhome://runtime/svninfo.ftl" /> <#include "ofbizhome://runtime/gitinfo.ftl" /></span></div>
 
 </div>
 <!-- footer -->

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/droppingcrumbs/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/droppingcrumbs/includes/footer.ftl?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/droppingcrumbs/includes/footer.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/droppingcrumbs/includes/footer.ftl Mon Jun  2 07:15:03 2014
@@ -27,7 +27,7 @@ under the License.
   <a href="http://validator.w3.org/check?uri=referer"><img src="<@ofbizContentUrl>/images/valid-xhtml10.png</@ofbizContentUrl>" alt="Valid XHTML 1.0!"/></a></p>
   <p>
   ${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" target="_blank">www.apache.org</a><br />
-  ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a> <#include "ofbizhome://runtime/svninfo.ftl" /></p>
+  ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a> <#include "ofbizhome://runtime/svninfo.ftl" /> <#include "ofbizhome://runtime/gitinfo.ftl" /></p>
 </div>
 <#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>
   <#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/includes/footer.ftl?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/includes/footer.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/includes/footer.ftl Mon Jun  2 07:15:03 2014
@@ -23,7 +23,7 @@ under the License.
         <li class="last"><a href="<@ofbizUrl>ListVisualThemes</@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li>
     </ul>
   <p>
-  ${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} <a href="http://www.apache.org" target="_blank">The Apache Software Foundation</a>. ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz.</a> <#include "ofbizhome://runtime/svninfo.ftl" />
+  ${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} <a href="http://www.apache.org" target="_blank">The Apache Software Foundation</a>. ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz.</a> <#include "ofbizhome://runtime/svninfo.ftl" /> <#include "ofbizhome://runtime/gitinfo.ftl" />
   </p>
 </div>
 </div>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/includes/footer.ftl?rev=1599101&r1=1599100&r2=1599101&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/includes/footer.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/includes/footer.ftl Mon Jun  2 07:15:03 2014
@@ -23,7 +23,7 @@ under the License.
   <ul>
     <li>
       ${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" target="_blank">www.apache.org</a><br/>
-      ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a> <#include "ofbizhome://runtime/svninfo.ftl" />
+      ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a> <#include "ofbizhome://runtime/svninfo.ftl" /> <#include "ofbizhome://runtime/gitinfo.ftl" />
     </li>
     <li class="opposed">${nowTimestamp?datetime?string.short} -
   <a href="<@ofbizUrl>ListTimezones</@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(), Static["java.util.TimeZone"].LONG, locale)}</a>