svn commit: r960999 - in /ofbiz/branches/release10.04: ./ applications/order/webapp/ordermgr/entry/billsettings.ftl

[erwan]

Author: erwan
Date: Tue Jul  6 19:57:22 2010
New Revision: 960999

URL: http://svn.apache.org/viewvc?rev=960999&view=rev
Log:
Applied fix from trunk for revision: 960997
 OFBIZ-3849 - Removed hard coded year and month from 'Order Entry Payment Settings' screen for credit card

Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/billsettings.ftl

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul  6 19:57:22 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958953,960491
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958953,960491,960997

Modified: ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/billsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/billsettings.ftl?rev=960999&r1=960998&r2=960999&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/billsettings.ftl (original)
+++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/billsettings.ftl Tue Jul  6 19:57:22 2010
@@ -383,34 +383,17 @@ function makeExpDate() {
                   </#if>
                   <select name="expMonth" onchange="javascript:makeExpDate();">
                     <#if creditCard?has_content && expMonth?has_content><#assign ccExprMonth = expMonth><#else><#assign ccExprMonth = requestParameters.expMonth?if_exists></#if>
-                    <option value="${ccExprMonth?if_exists}">${ccExprMonth?if_exists}</option>
-                    <option></option>
-                    <option value="01">01</option>
-                    <option value="02">02</option>
-                    <option value="03">03</option>
-                    <option value="04">04</option>
-                    <option value="05">05</option>
-                    <option value="06">06</option>
-                    <option value="07">07</option>
-                    <option value="08">08</option>
-                    <option value="09">09</option>
-                    <option value="10">10</option>
-                    <option value="11">11</option>
-                    <option value="12">12</option>
+                    <#if ccExprMonth?has_content>
+                      <option value="${ccExprMonth?if_exists}">${ccExprMonth?if_exists}</option>
+                    </#if>
+                    ${screens.render("component://common/widget/CommonScreens.xml#ccmonths")}
                   </select>
                   <select name="expYear" onchange="javascript:makeExpDate();">
                     <#if creditCard?has_content && expYear?has_content><#assign ccExprYear = expYear><#else><#assign ccExprYear = requestParameters.expYear?if_exists></#if>
-                    <option value="${ccExprYear?if_exists}">${ccExprYear?if_exists}</option>
-                    <option></option>
-                    <option value="2005">2005</option>
-                    <option value="2006">2006</option>
-                    <option value="2007">2007</option>
-                    <option value="2008">2008</option>
-                    <option value="2009">2009</option>
-                    <option value="2010">2010</option>
-                    <option value="2011">2011</option>
-                    <option value="2012">2012</option>
-                    <option value="2013">2013</option>
+                    <#if ccExprYear?has_content>
+                      <option value="${ccExprYear?if_exists}">${ccExprYear?if_exists}</option>
+                    </#if>
+                    ${screens.render("component://common/widget/CommonScreens.xml#ccyears")}
                   </select>
                 *</td>
               </tr>