svn commit: r1746969 - /ofbiz/branches/release15.12/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl

[pranayp]

Author: pranayp
Date: Mon Jun  6 06:50:53 2016
New Revision: 1746969

URL: http://svn.apache.org/viewvc?rev=1746969&view=rev
Log:
[OFBIZ-7162] No functional changes, corrected formatting.

Modified:
    ofbiz/branches/release15.12/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl

Modified: ofbiz/branches/release15.12/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl?rev=1746969&r1=1746968&r2=1746969&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl (original)
+++ ofbiz/branches/release15.12/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl Mon Jun  6 06:50:53 2016
@@ -47,9 +47,6 @@ under the License.
       </#if>
     </div>
     <#if currentCustomTimePeriod?has_content>
-        <form method="post" action="<@ofbizUrl>updateCustomTimePeriod</@ofbizUrl>" name="updateCustomTimePeriodForm">
-          <input type="hidden" name="findOrganizationPartyId" value="${findOrganizationPartyId!}" />
-          <input type="hidden" name="customTimePeriodId" value="${currentCustomTimePeriodId!}" />
       <table class="basic-table" cellspacing="0">
         <tr class="header-row">
           <td>${uiLabelMap.CommonId}</td>
@@ -62,7 +59,10 @@ under the License.
           <td>${uiLabelMap.CommonThruDate}</td>
           <td colspan="2">&nbsp;</td>
         </tr>
-          <tr>
+        <tr>
+          <form method="post" action="<@ofbizUrl>updateCustomTimePeriod</@ofbizUrl>" name="updateCustomTimePeriodForm">
+            <input type="hidden" name="findOrganizationPartyId" value="${findOrganizationPartyId!}" />
+            <input type="hidden" name="customTimePeriodId" value="${currentCustomTimePeriodId!}" />
             <td>${currentCustomTimePeriod.customTimePeriodId}</td>
             <td>
               <select name="parentPeriodId">
@@ -125,14 +125,14 @@ under the License.
             <td class="button-col">
               <input type="submit" value='${uiLabelMap.CommonUpdate}'/>
             </td>
-        </form>
-            <td class="button-col">
-              <form method="post" action='<@ofbizUrl>deleteCustomTimePeriod</@ofbizUrl>' name='deleteCustomTimePeriodForm'>
-                <input type="hidden" name="customTimePeriodId" value="${currentCustomTimePeriod.customTimePeriodId!}" />
-                <input type="submit" value='${uiLabelMap.CommonDelete}'/>
-              </form>
-            </td>
-          </tr>
+          </form>
+          <td class="button-col">
+            <form method="post" action='<@ofbizUrl>deleteCustomTimePeriod</@ofbizUrl>' name='deleteCustomTimePeriodForm'>
+              <input type="hidden" name="customTimePeriodId" value="${currentCustomTimePeriod.customTimePeriodId!}" />
+              <input type="submit" value='${uiLabelMap.CommonDelete}'/>
+            </form>
+          </td>
+        </tr>
       </table>
     <#else>
       <div class="screenlet-body">${uiLabelMap.AccountingNoCurrentCustomTimePeriodSelected}</div>
@@ -165,73 +165,73 @@ under the License.
           <tr>
             <form method="post" action='<@ofbizUrl>updateCustomTimePeriod</@ofbizUrl>' name='lineForm${line}'>
               <input type="hidden" name="customTimePeriodId" value="${customTimePeriod.customTimePeriodId!}" />
-            <td>${customTimePeriod.customTimePeriodId}</td>
-            <td>
-              <select name="parentPeriodId">
-                <option value=''>&nbsp;</option>
-                <#list allCustomTimePeriods as allCustomTimePeriod>
-                  <#assign allPeriodType = allCustomTimePeriod.getRelatedOne("PeriodType", true)>
-                  <#assign isDefault = false>
-                  <#if (currentCustomTimePeriod.parentPeriodId)??>
-                    <#if currentCustomTimePeriod.customTimePeriodId = allCustomTimePeriod.customTimePeriodId>
-                      <#assign isDefault = true>
+              <td>${customTimePeriod.customTimePeriodId}</td>
+              <td>
+                <select name="parentPeriodId">
+                  <option value=''>&nbsp;</option>
+                  <#list allCustomTimePeriods as allCustomTimePeriod>
+                    <#assign allPeriodType = allCustomTimePeriod.getRelatedOne("PeriodType", true)>
+                    <#assign isDefault = false>
+                    <#if (currentCustomTimePeriod.parentPeriodId)??>
+                      <#if currentCustomTimePeriod.customTimePeriodId = allCustomTimePeriod.customTimePeriodId>
+                        <#assign isDefault = true>
+                      </#if>
                     </#if>
-                  </#if>
-                  <option value='${allCustomTimePeriod.customTimePeriodId}'<#if isDefault> selected="selected"</#if>>
-                    ${allCustomTimePeriod.organizationPartyId}
-                    <#if allPeriodType??> ${allPeriodType.description}: </#if>
-                    ${allCustomTimePeriod.periodNum!}
-                    [${allCustomTimePeriod.customTimePeriodId}]
-                  </option>
-                </#list>
-              </select>
-            </td>
-            <td><input type="text" size='12' name="organizationPartyId" value="${customTimePeriod.organizationPartyId!}" /></td>
-            <td>
-              <select name="periodTypeId">
-                <#list periodTypes as periodType>
-                  <#assign isDefault = false>
-                  <#if (customTimePeriod.periodTypeId)??>
-                    <#if customTimePeriod.periodTypeId = periodType.periodTypeId>
-                     <#assign isDefault = true>
+                    <option value='${allCustomTimePeriod.customTimePeriodId}'<#if isDefault> selected="selected"</#if>>
+                      ${allCustomTimePeriod.organizationPartyId}
+                      <#if allPeriodType??> ${allPeriodType.description}: </#if>
+                      ${allCustomTimePeriod.periodNum!}
+                      [${allCustomTimePeriod.customTimePeriodId}]
+                    </option>
+                  </#list>
+                </select>
+              </td>
+              <td><input type="text" size='12' name="organizationPartyId" value="${customTimePeriod.organizationPartyId!}" /></td>
+              <td>
+                <select name="periodTypeId">
+                  <#list periodTypes as periodType>
+                    <#assign isDefault = false>
+                    <#if (customTimePeriod.periodTypeId)??>
+                      <#if customTimePeriod.periodTypeId = periodType.periodTypeId>
+                       <#assign isDefault = true>
+                      </#if>
                     </#if>
-                  </#if>
-                  <option value='${periodType.periodTypeId}'<#if isDefault> selected="selected"</#if>>${periodType.description} [${periodType.periodTypeId}]</option>
-                </#list>
-              </select>
+                    <option value='${periodType.periodTypeId}'<#if isDefault> selected="selected"</#if>>${periodType.description} [${periodType.periodTypeId}]</option>
+                  </#list>
+                </select>
+              </td>
+              <td><input type="text" size='4' name="periodNum" value="${customTimePeriod.periodNum!}" /></td>
+              <td><input type="text" size='10' name="periodName" value="${customTimePeriod.periodName!}" /></td>
+              <td>
+                <#assign hasntStarted = false>
+                <#assign compareDate = customTimePeriod.getTimestamp("fromDate")>
+                <#if compareDate?has_content>
+                  <#if nowTimestamp.before(compareDate)><#assign hasntStarted = true></#if>
+                </#if>
+                <input type="text" size='13' name="fromDate" value="${customTimePeriod.fromDate?string("yyyy-MM-dd")}"<#if hasntStarted> class="alert"</#if> />
+              </td>
+              <td>
+                <#assign hasExpired = false>
+                <#assign compareDate = customTimePeriod.getTimestamp("thruDate")>
+                <#if compareDate?has_content>
+                  <#if nowTimestamp.after(compareDate)><#assign hasExpired = true></#if>
+                </#if>
+                <input type="text" size='13' name="thruDate" value="${customTimePeriod.thruDate?string("yyyy-MM-dd")}"<#if hasExpired> class="alert"</#if> />
+              </td>
+              <td class="button-col">
+                <input type="submit" value='${uiLabelMap.CommonUpdate}'/>
+              </td>
+            </form>
+            <td class="button-col">
+              <form method="post" action='<@ofbizUrl>deleteCustomTimePeriod</@ofbizUrl>' name='lineForm${line}'>
+                <input type="hidden" name="customTimePeriodId" value="${customTimePeriod.customTimePeriodId!}" />
+                <input type="submit" value='${uiLabelMap.CommonDelete}'/>
+              </form>
             </td>
-            <td><input type="text" size='4' name="periodNum" value="${customTimePeriod.periodNum!}" /></td>
-            <td><input type="text" size='10' name="periodName" value="${customTimePeriod.periodName!}" /></td>
-            <td>
-              <#assign hasntStarted = false>
-              <#assign compareDate = customTimePeriod.getTimestamp("fromDate")>
-              <#if compareDate?has_content>
-                <#if nowTimestamp.before(compareDate)><#assign hasntStarted = true></#if>
-              </#if>
-              <input type="text" size='13' name="fromDate" value="${customTimePeriod.fromDate?string("yyyy-MM-dd")}"<#if hasntStarted> class="alert"</#if> />
+            <td class="button-col">
+              <a href='<@ofbizUrl>EditCustomTimePeriod?currentCustomTimePeriodId=${customTimePeriod.customTimePeriodId!}&amp;findOrganizationPartyId=${findOrganizationPartyId!}</@ofbizUrl>'>
+              ${uiLabelMap.CommonSetAsCurrent}</a>
             </td>
-            <td>
-              <#assign hasExpired = false>
-              <#assign compareDate = customTimePeriod.getTimestamp("thruDate")>
-              <#if compareDate?has_content>
-                <#if nowTimestamp.after(compareDate)><#assign hasExpired = true></#if>
-              </#if>
-              <input type="text" size='13' name="thruDate" value="${customTimePeriod.thruDate?string("yyyy-MM-dd")}"<#if hasExpired> class="alert"</#if> />
-             </td>
-             <td class="button-col">
-              <input type="submit" value='${uiLabelMap.CommonUpdate}'/>
-             </td>
-             </form>
-             <td class="button-col">
-               <form method="post" action='<@ofbizUrl>deleteCustomTimePeriod</@ofbizUrl>' name='lineForm${line}'>
-                 <input type="hidden" name="customTimePeriodId" value="${customTimePeriod.customTimePeriodId!}" />
-                 <input type="submit" value='${uiLabelMap.CommonDelete}'/>
-               </form>
-             </td>
-             <td class="button-col">
-               <a href='<@ofbizUrl>EditCustomTimePeriod?currentCustomTimePeriodId=${customTimePeriod.customTimePeriodId!}&amp;findOrganizationPartyId=${findOrganizationPartyId!}</@ofbizUrl>'>
-               ${uiLabelMap.CommonSetAsCurrent}</a>
-             </td>
           </tr>
         </#list>
       </table>