OFBiz › OFBiz - Commits

svn commit: r757683 - in /ofbiz/trunk: applications/accounting/config/ applications/accounting/webapp/accounting/WEB-INF/ applications/accounting/webapp/accounting/WEB-INF/actions/period/ applications/accounting/webapp/accounting/period/ applications/a...

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jonesde
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r757683 - in /ofbiz/trunk: applications/accounting/config/ applications/accounting/webapp/accounting/WEB-INF/ applications/accounting/webapp/accounting/WEB-INF/actions/period/ applications/accounting/webapp/accounting/period/ applications/a...

jonesde
Author: jonesde
Date: Tue Mar 24 08:11:22 2009
New Revision: 757683

URL: http://svn.apache.org/viewvc?rev=757683&view=rev
Log:
Moved EditCustomTimePeriods page from webtools to accounting in the Global GL Settings tab, plus fixed the groovy script so that screen would actually work, general framework independence changes

Added:
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/period/
      - copied from r757671, ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/period/
    ofbiz/trunk/applications/accounting/webapp/accounting/period/
      - copied from r757671, ofbiz/trunk/framework/webtools/webapp/webtools/period/
    ofbiz/trunk/applications/accounting/widget/PeriodScreens.xml   (with props)
Removed:
    ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/period/
    ofbiz/trunk/framework/webtools/webapp/webtools/period/
Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/period/EditCustomTimePeriod.groovy
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl
    ofbiz/trunk/applications/accounting/widget/Menus.xml
    ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
    ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
    ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl
    ofbiz/trunk/framework/webtools/widget/MiscScreens.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=757683&r1=757682&r2=757683&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue Mar 24 08:11:22 2009
@@ -201,6 +201,12 @@
         <value xml:lang="nl">Voeg categorie van GB-rekening toe</value>
         <value xml:lang="th">เพิ่มหมวดหมู่บัญชีแยกประเภททั่วไป</value>
     </property>
+    <property key="AccountingAddCustomTimePeriod">
+        <value xml:lang="en">Add Custom Time Period</value>
+        <value xml:lang="fr">Ajouter une période de temps</value>
+        <value xml:lang="it">Aggiungi Periodi di Tempo Personalizzati</value>
+        <value xml:lang="th">เพิ่มการกำหนดระยะเวลา</value>
+    </property>
     <property key="AccountingAddFinAccountTypeGlAccount">
         <value xml:lang="de">Finanzkonten-Art Hauptkonto hinzufügen</value>
         <value xml:lang="en">Add FinAccount Type Gl Account</value>
@@ -1999,6 +2005,12 @@
         <value xml:lang="th">เกิดปัญหาในการตรวจสอบความถูกต้องของคุณ; กรุณาเช็คบัตรของคุณและรหัสส่วนตัวของคุณและทำอีกครั้ง</value>
         <value xml:lang="zh">检查你的余额时出现问题；请检查你的卡和密码，然后重试</value>
     </property>
+    <property key="AccountingCurrentCustomTimePeriod">
+        <value xml:lang="en">Current Custom Time Period</value>
+        <value xml:lang="fr">Période de temps spécifique courante</value>
+        <value xml:lang="it">Periodi di Tempo Personalizzati Attuale</value>
+        <value xml:lang="th">ช่วงเวลาของลูกค้าในปัจจุบัน</value>
+    </property>
     <property key="AccountingCustNr">
         <value xml:lang="ar">رقم الزبون</value>
         <value xml:lang="en">Cust.Nr</value>
@@ -2171,6 +2183,14 @@
         <value xml:lang="th">แก้ไขบัตรเครดิต</value>
         <value xml:lang="zh">编辑信用卡</value>
     </property>
+    <property key="AccountingEditCustomTimePeriods">
+        <value xml:lang="en">Edit Custom Time Periods</value>
+        <value xml:lang="fr">Modifier les périodes de temps</value>
+        <value xml:lang="it">Aggiorna Periodi di Tempo Personalizzati</value>
+        <value xml:lang="ro">Actualizeaza Perioadele de Timp Personalizate</value>
+        <value xml:lang="th">แก้ไขการกำหนดเวลา</value>
+        <value xml:lang="zh">编辑定制时间段</value>
+    </property>
     <property key="AccountingEditFinAccount">
         <value xml:lang="en">Create/Update Financial Account</value>
         <value xml:lang="fr">Créer/ mettre à jour un compte financier</value>
@@ -4887,6 +4907,19 @@
         <value xml:lang="th">เวลาที่กำหนดยอดรวมของบัญชีไม่มี</value>
         <value xml:lang="zh">不存在账单账户条件。</value>
     </property>
+    <property key="AccountingNoChildPeriodsFound">
+        <value xml:lang="en">No child periods found</value>
+        <value xml:lang="fr">Aucune période enfant trouvée</value>
+        <value xml:lang="it">Nessun periodo figlio trovato</value>
+        <value xml:lang="th">ไม่พบช่วงเวลาสั้น ๆ</value>
+    </property>
+    <property key="AccountingNoCurrentCustomTimePeriodSelected">
+        <value xml:lang="en">No Current Custom Time Period Selected; "Children" below have no Parent Period.</value>
+        <value xml:lang="fr">Aucune période de temps sélectionnée; la période "fille" ci-dessous n'a aucune période parente.</value>
+        <value xml:lang="it">Nessun periodo di tempo personalizzato selezionato; i "Periodi figli" sottostanti non hanno alcun "Periodo padre".</value>
+        <value xml:lang="th">ไม่มีลูกค้าในช่วงเวลาที่เลือก; "Children" ด้านล่างนี้ไม่มีกลุ่มช่วงเวลา
+        </value>
+    </property>
     <property key="AccountingNoGenBilAddressFound">
         <value xml:lang="ar">لا عنوان عام/فوترة موجود للطرف</value>
         <value xml:lang="en">No general/billing address found for party:</value>
@@ -5148,6 +5181,9 @@
         <value xml:lang="th">สั่งซื้อ</value>
         <value xml:lang="zh">定单</value>
     </property>
+    <property key="AccountingOrgGlSettings">
+        <value xml:lang="en">Organization GL Settings</value>
+    </property>
     <property key="AccountingOrganizationPartyId">
         <value xml:lang="ar">تعريف طرف المؤسسة</value>
         <value xml:lang="de">Firmen-ID</value>
@@ -6010,6 +6046,42 @@
         <value xml:lang="th">คุณไม่ได้รับการอนุญาตสำหรับการทำงานนี้</value>
         <value xml:lang="zh">你没有执行这个功能的权限。</value>
     </property>
+    <property key="AccountingPermissionPeriod">
+        <value xml:lang="en">You do not have permission to use this page (PERIOD_MAINT needed)</value>
+        <value xml:lang="fr">Vous n'avez pas l'autorisation d'utiliser cette page (PERIOD_MAINT est nécessaire)</value>
+        <value xml:lang="it">Tu non hai il permesso di usare questa pagina (necessario PERIOD_MAINT)</value>
+        <value xml:lang="th">คุณไม่ได้รับอนุญาตให้ใช้งานในหน้านี้ (PERIOD_MAINT ที่ต้องการ)</value>
+    </property>
+    <property key="AccountingOrgPartyId">
+        <value xml:lang="en">Org Party Id</value>
+        <value xml:lang="fr">Réf. d'org.</value>
+        <value xml:lang="it">Organizzazione</value>
+        <value xml:lang="th">รหัสองค์กรกลุ่มผู้ใช้</value>
+    </property>
+    <property key="AccountingChildPeriods">
+        <value xml:lang="en">Child Periods</value>
+        <value xml:lang="fr">Périodes enfants</value>
+        <value xml:lang="it">Periodi Figli</value>
+        <value xml:lang="th">ช่วงเวลาสั้น ๆ</value>
+    </property>
+    <property key="AccountingPeriodName">
+        <value xml:lang="en">Period Name</value>
+        <value xml:lang="fr">Nom de période</value>
+        <value xml:lang="it">Nome Periodo</value>
+        <value xml:lang="th">ชื่อช่วงเวลา</value>
+    </property>
+    <property key="AccountingPeriodNumber">
+        <value xml:lang="en">Period Number</value>
+        <value xml:lang="fr">N° de période</value>
+        <value xml:lang="it">Numero Periodo</value>
+        <value xml:lang="th">หมายเลขช่วงเวลา</value>
+    </property>
+    <property key="AccountingPeriodType">
+        <value xml:lang="en">Period Type</value>
+        <value xml:lang="fr">Type de période</value>
+        <value xml:lang="it">Tipo Periodo</value>
+        <value xml:lang="th">ประเภทช่วงเวลา</value>
+    </property>
     <property key="AccountingPhysicalCard">
         <value xml:lang="de">Physikalische Karte</value>
         <value xml:lang="en">Physical Card</value>
@@ -6559,6 +6631,12 @@
         <value xml:lang="nl">Toon alle velden</value>
         <value xml:lang="th">แสดงการค้นหาฟิลด์</value>
     </property>
+    <property key="AccountingShowOnlyPeriodsWithOrganization">
+        <value xml:lang="en">Show Only Periods with Organization Party ID</value>
+        <value xml:lang="fr">Montrer seulement les périodes ayant la réf. d'acteur de l'organisation</value>
+        <value xml:lang="it">Mostra Solo Periodi con Organizzazioni</value>
+        <value xml:lang="th">แสดงช่วงเวลากับรหัสองค์กรกลุ่มผู้ใช้อย่างเดียว</value>
+    </property>
     <property key="AccountingShowPayments">
         <value xml:lang="ar">عرض التسديدات</value>
         <value xml:lang="de">Zahlung anzeigen</value>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/period/EditCustomTimePeriod.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/period/EditCustomTimePeriod.groovy?rev=757683&r1=757671&r2=757683&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/period/EditCustomTimePeriod.groovy (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/period/EditCustomTimePeriod.groovy Tue Mar 24 08:11:22 2009
@@ -43,10 +43,9 @@
     context.currentPeriodType = currentPeriodType;
 }
 
-findMap = [organizationPartyId : findOrganizationPartyId];
-if (currentCustomTimePeriodId) {
-    findMap.parentPeriodId = currentCustomTimePeriodId;
-}
+findMap = [ : ];
+if (findOrganizationPartyId) findMap.organizationPartyId = findOrganizationPartyId;
+if (currentCustomTimePeriodId) findMap.parentPeriodId = currentCustomTimePeriodId;
 
 customTimePeriods = delegator.findByAnd("CustomTimePeriod", findMap, ["periodTypeId", "periodNum", "fromDate"]);
 context.customTimePeriods = customTimePeriods;

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=757683&r1=757682&r2=757683&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Tue Mar 24 08:11:22 2009
@@ -659,6 +659,30 @@
         <response name="error" type="view" value="EditPartyGlAccount"/>
     </request-map>    
     
+    <!-- CustomTimePeriod requests -->
+    <request-map uri="EditCustomTimePeriod">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditCustomTimePeriod"/>
+    </request-map>
+    <request-map uri="createCustomTimePeriod">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="createCustomTimePeriod"/>
+        <response name="success" type="view" value="EditCustomTimePeriod"/>
+        <response name="error" type="view" value="EditCustomTimePeriod"/>
+    </request-map>
+    <request-map uri="updateCustomTimePeriod">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="updateCustomTimePeriod"/>
+        <response name="success" type="view" value="EditCustomTimePeriod"/>
+        <response name="error" type="view" value="EditCustomTimePeriod"/>
+    </request-map>
+    <request-map uri="deleteCustomTimePeriod">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="deleteCustomTimePeriod"/>
+        <response name="success" type="view" value="EditCustomTimePeriod"/>
+        <response name="error" type="view" value="EditCustomTimePeriod"/>
+    </request-map>
+    
     <!-- =============== Fixed Asset mapping =================-->
     <request-map uri="ListFixedAssets"><security https="true" auth="true"/><response name="success" type="view" value="ListFixedAssets"/></request-map>
     <request-map uri="FixedAssetSearchResults"><security https="true" auth="false"/><response name="success" type="view" value="FixedAssetSearchResults"/></request-map>
@@ -1979,6 +2003,8 @@
     <view-map name="ListAcctgTransEntries" type="screen" page="component://accounting/widget/GlobalGlAccountsScreens.xml#ListAcctgTransEntries"/>
     <view-map name="EditPartyGlAccount" type="screen" page="component://accounting/widget/GlSetupScreens.xml#EditPartyGlAccount"/>
     
+    <view-map name="EditCustomTimePeriod" type="screen" page="component://accounting/widget/PeriodScreens.xml#EditCustomTimePeriod"/>
+    
     <!-- FinAccount -->
     <view-map name="FindFinAccount" type="screen" page="component://accounting/widget/FinAccountScreens.xml#FindFinAccount"/>
     

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl?rev=757683&r1=757671&r2=757683&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl Tue Mar 24 08:11:22 2009
@@ -17,21 +17,19 @@
 under the License.
 -->
 
-<#assign nowDate = Static["org.ofbiz.base.util.UtilDateTime"].nowDate()>
-
-<h1>${uiLabelMap.WebtoolsEditCustomTimePeriods}</h1>
+<h1>${uiLabelMap.AccountingEditCustomTimePeriods}</h1>
 <br />
 <#if security.hasPermission("PERIOD_MAINT", session)>
    <div class="screenlet">
      <div class="screenlet-title-bar">      
          <ul>
-           <li class="h3">${uiLabelMap.WebtoolsShowOnlyPeriodsWithOrganization}</li>
+           <li class="h3">${uiLabelMap.AccountingShowOnlyPeriodsWithOrganization}</li>
          </ul>
          <br class="clear"/>
      </div>
      <form method="post" action="<@ofbizUrl>EditCustomTimePeriod</@ofbizUrl>" name="setOrganizationPartyIdForm">
          <input type="hidden" name="currentCustomTimePeriodId" value="${currentCustomTimePeriodId?if_exists}">
-         <span class="label">${uiLabelMap.WebtoolsShowOnlyPeriodsWithOrganization}</span>
+         <span class="label">${uiLabelMap.AccountingShowOnlyPeriodsWithOrganization}</span>
          <input type="text" size="20" name="findOrganizationPartyId" value="${findOrganizationPartyId?if_exists}">
          <input type="submit" value='${uiLabelMap.CommonUpdate}'>
      </form>
@@ -41,22 +39,22 @@
     <div class="screenlet-title-bar">
       <#if currentCustomTimePeriod?has_content>
         <ul>
-          <li class="h3">${uiLabelMap.WebtoolsCurrentCustomTimePeriod}</li>
+          <li class="h3">${uiLabelMap.AccountingCurrentCustomTimePeriod}</li>
           <li><a href="<@ofbizUrl>EditCustomTimePeriod?findOrganizationPartyId=${findOrganizationPartyId?if_exists}</@ofbizUrl>">${uiLabelMap.WebtoolsClearCurrent}</a></li>
         </ul>
       <#else>
-        <h3>${uiLabelMap.WebtoolsCurrentCustomTimePeriod}</h3>
+        <h3>${uiLabelMap.AccountingCurrentCustomTimePeriod}</h3>
       </#if>
     </div>
     <#if currentCustomTimePeriod?has_content>
       <table class="basic-table" cellspacing="0">
         <tr class="header-row">
           <td>${uiLabelMap.CommonId}</td>
-          <td>${uiLabelMap.WebtoolsParent}</td>
-          <td>${uiLabelMap.WebtoolsOrgPartyId}</td>
-          <td>${uiLabelMap.WebtoolsPeriodType}</td>
+          <td>${uiLabelMap.CommonParent}</td>
+          <td>${uiLabelMap.AccountingOrgPartyId}</td>
+          <td>${uiLabelMap.AccountingPeriodType}</td>
           <td>#</td>
-          <td>${uiLabelMap.WebtoolsPeriodName}</td>
+          <td>${uiLabelMap.AccountingPeriodName}</td>
           <td>${uiLabelMap.CommonFromDate}</td>
           <td>${uiLabelMap.CommonThruDate}</td>
           <td>&nbsp;</td>
@@ -112,7 +110,7 @@
               <#assign hasntStarted = false>
               <#assign compareDate = currentCustomTimePeriod.getDate("fromDate")>
               <#if compareDate?has_content>
-                <#if nowDate.before(compareDate)><#assign hasntStarted = true></#if>
+                <#if nowTimestamp.before(compareDate)><#assign hasntStarted = true></#if>
               </#if>
               <input type="text" size='13' name="fromDate" value="${currentCustomTimePeriod.fromDate?string("yyyy-MM-dd")}"<#if hasntStarted> class="alert"</#if>>
             </td>
@@ -120,7 +118,7 @@
               <#assign hasExpired = false>
               <#assign compareDate = currentCustomTimePeriod.getDate("thruDate")>
               <#if compareDate?has_content>
-                <#if nowDate.after(compareDate)><#assign hasExpired = true></#if>
+                <#if nowTimestamp.after(compareDate)><#assign hasExpired = true></#if>
               </#if>
               <input type="text" size='13' name="thruDate" value="${currentCustomTimePeriod.thruDate?string("yyyy-MM-dd")}"<#if hasntStarted> class="alert"</#if>>
             </td>
@@ -133,22 +131,22 @@
         </form>
       </table>
     <#else>
-      <div class="screenlet-body">${uiLabelMap.WebtoolsNoCurrentCustomTimePeriodSelected}</div>
+      <div class="screenlet-body">${uiLabelMap.AccountingNoCurrentCustomTimePeriodSelected}</div>
     </#if>
   </div>
   <div class="screenlet">
     <div class="screenlet-title-bar">
-      <h3>${uiLabelMap.WebtoolsChildPeriods}</h3>
+      <h3>${uiLabelMap.AccountingChildPeriods}</h3>
     </div>
     <#if customTimePeriods?has_content>
       <table class="basic-table" cellspacing="0">
         <tr class="header-row">
           <td>${uiLabelMap.CommonId}</td>
           <td>${uiLabelMap.WebtoolsParent}</td>
-          <td>${uiLabelMap.WebtoolsOrgPartyId}</td>
-          <td>${uiLabelMap.WebtoolsPeriodType}</td>
+          <td>${uiLabelMap.AccountingOrgPartyId}</td>
+          <td>${uiLabelMap.AccountingPeriodType}</td>
           <td>#</td>
-          <td>${uiLabelMap.WebtoolsPeriodName}</td>
+          <td>${uiLabelMap.AccountingPeriodName}</td>
           <td>${uiLabelMap.CommonFromDate}</td>
           <td>${uiLabelMap.CommonThruDate}</td>
           <td>&nbsp;</td>
@@ -203,7 +201,7 @@
               <#assign hasntStarted = false>
               <#assign compareDate = customTimePeriod.getDate("fromDate")>
               <#if compareDate?has_content>
-                <#if nowDate.before(compareDate)><#assign hasntStarted = true></#if>
+                <#if nowTimestamp.before(compareDate)><#assign hasntStarted = true></#if>
               </#if>
               <input type="text" size='13' name="fromDate" value="${customTimePeriod.fromDate?if_exists}"<#if hasntStarted> class="alert"</#if>>
             </td>
@@ -211,7 +209,7 @@
               <#assign hasExpired = false>
               <#assign compareDate = customTimePeriod.getDate("thruDate")>
               <#if compareDate?has_content>
-                <#if nowDate.after(compareDate)><#assign hasExpired = true></#if>
+                <#if nowTimestamp.after(compareDate)><#assign hasExpired = true></#if>
               </#if>
               <input type="text" size='13' name="thruDate" value="${customTimePeriod.thruDate?if_exists}"<#if hasExpired> class="alert"</#if>>
              </td>
@@ -227,12 +225,12 @@
         </#list>
       </table>
     <#else>
-      <div class="screenlet-body">${uiLabelMap.WebtoolsNoChildPeriodsFound}</div>
+      <div class="screenlet-body">${uiLabelMap.AccountingNoChildPeriodsFound}</div>
     </#if>
   </div>
   <div class="screenlet">
     <div class="screenlet-title-bar">
-      <h3>${uiLabelMap.WebtoolsAddCustomTimePeriod}</h3>
+      <h3>${uiLabelMap.AccountingAddCustomTimePeriod}</h3>
     </div>
     <div class="screenlet-body">
       <form method="POST" action="<@ofbizUrl>createCustomTimePeriod</@ofbizUrl>" name="createCustomTimePeriodForm">
@@ -240,7 +238,7 @@
         <input type="hidden" name="currentCustomTimePeriodId" value="${currentCustomTimePeriodId?if_exists}">
         <input type="hidden" name="useValues" value="true">
         <div>
-          <span class="label">${uiLabelMap.WebtoolsParent}</span>
+          <span class="label">${uiLabelMap.CommonParent}</span>
           <select name="parentPeriodId">
             <option value=''>&nbsp;</option>
             <#list allCustomTimePeriods as allCustomTimePeriod>
@@ -262,9 +260,9 @@
           </select>
         </div>
         <div>
-          <span class="label">${uiLabelMap.WebtoolsOrgPartyId}</span>
+          <span class="label">${uiLabelMap.AccountingOrgPartyId}</span>
           <input type="text" size='20' name='organizationPartyId'>
-          <span class="label">${uiLabelMap.WebtoolsPeriodType}</span>
+          <span class="label">${uiLabelMap.AccountingPeriodType}</span>
           <select name="periodTypeId">
             <#list periodTypes as periodType>
               <#assign isDefault = false>
@@ -276,9 +274,9 @@
               <option value="${periodType.periodTypeId}" <#if isDefault>selected="selected"</#if>>${periodType.description} [${periodType.periodTypeId}]</option>
             </#list>
           </select>
-          <span class="label">${uiLabelMap.WebtoolsPeriodNumber}</span>
+          <span class="label">${uiLabelMap.AccountingPeriodNumber}</span>
           <input type="text" size='4' name='periodNum'>
-          <span class="label">${uiLabelMap.WebtoolsPeriodName}</span>
+          <span class="label">${uiLabelMap.AccountingPeriodName}</span>
           <input type="text" size='10' name='periodName'>
         </div>
         <div>
@@ -292,5 +290,5 @@
     </div>
   </div>
 <#else>
-  <h3>${uiLabelMap.WebtoolsPermissionPeriod}.</h3>
+  <h3>${uiLabelMap.AccountingPermissionPeriod}.</h3>
 </#if>

Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=757683&r1=757682&r2=757683&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Tue Mar 24 08:11:22 2009
@@ -36,7 +36,7 @@
         <menu-item name="agreements" title="${uiLabelMap.AccountingAgreements}"><link target="FindAgreement"/></menu-item>
         <menu-item name="ListFixedAssets" title="${uiLabelMap.AccountingFixedAssets}"><link target="ListFixedAssets"/></menu-item>
         <menu-item name="GlobalGLSettings" title="${uiLabelMap.AccountingGlobalGLSettings}"><link target="globalGLSettings"/></menu-item>
-        <menu-item name="companies" title="${uiLabelMap.AccountingGeneralLedger}"><link target="ListCompanies"/></menu-item>
+        <menu-item name="companies" title="${uiLabelMap.AccountingOrgGlSettings}"><link target="ListCompanies"/></menu-item>
     </menu>
     
     <menu name="InvoiceTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
@@ -588,7 +588,11 @@
           default-menu-item-name="chartofaccounts">
         <menu-item name="Chartofaccounts" title="${uiLabelMap.AccountingChartOfAcctsMenu}">
             <link target="FindGlobalGlAccount"/>
-        </menu-item>        
+        </menu-item>
+        <menu-item name="EditCustomTimePeriod" title="${uiLabelMap.AccountingEditCustomTimePeriods}">
+            <condition><if-has-permission permission="PERIOD_MAINT"/></condition>
+            <link target="EditCustomTimePeriod"/>
+        </menu-item>
         <menu-item name="Costs" title="${uiLabelMap.ManufacturingCostCalcs}">
             <link target="EditCostCalcs"/>
         </menu-item>  

Added: ofbiz/trunk/applications/accounting/widget/PeriodScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PeriodScreens.xml?rev=757683&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PeriodScreens.xml (added)
+++ ofbiz/trunk/applications/accounting/widget/PeriodScreens.xml Tue Mar 24 08:11:22 2009
@@ -0,0 +1,40 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+    
+    <screen name="EditCustomTimePeriod">
+        <section>
+            <actions>
+                <set field="headerItem" value="main"/>
+                <set field="titleProperty" value="AccountingEditCustomTimePeriods"/>
+                <set field="tabButtonItem" value="EditCustomTimePeriod"/>
+                <script location="component://accounting/webapp/accounting/WEB-INF/actions/period/EditCustomTimePeriod.groovy"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="GlobalGLSettingsDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <platform-specific><html><html-template location="component://accounting/webapp/accounting/period/EditCustomTimePeriod.ftl"/></html></platform-specific>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+</screens>

Propchange: ofbiz/trunk/applications/accounting/widget/PeriodScreens.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/accounting/widget/PeriodScreens.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/accounting/widget/PeriodScreens.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=757683&r1=757682&r2=757683&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Tue Mar 24 08:11:22 2009
@@ -373,12 +373,6 @@
         <value xml:lang="it">Monitor Flussi di Lavoro Attivi</value>
         <value xml:lang="th">ตรวจสอบขั้นตอนการทำงาน</value>
     </property>
-    <property key="WebtoolsAddCustomTimePeriod">
-        <value xml:lang="en">Add Custom Time Period</value>
-        <value xml:lang="fr">Ajouter une période de temps</value>
-        <value xml:lang="it">Aggiungi Periodi di Tempo Personalizzati</value>
-        <value xml:lang="th">เพิ่มการกำหนดระยะเวลา</value>
-    </property>
     <property key="WebtoolsAddLoggerFormDescription">
         <value xml:lang="en">This form allows you to enable a logger for a specific package or class.</value>
         <value xml:lang="fr">Cette page vous permet d'activer un enregistreur (logger) pour un paquet ou une classe spécifique.</value>
@@ -561,12 +555,6 @@
         <value xml:lang="th">ตรวจสอบ/เปลี่ยนแปลง ฐานข้อมูล</value>
         <value xml:lang="zh">检查/更新数据库</value>
     </property>
-    <property key="WebtoolsChildPeriods">
-        <value xml:lang="en">Child Periods</value>
-        <value xml:lang="fr">Périodes enfants</value>
-        <value xml:lang="it">Periodi Figli</value>
-        <value xml:lang="th">ช่วงเวลาสั้น ๆ</value>
-    </property>
     <property key="WebtoolsClearAllCaches">
         <value xml:lang="en">Clear All Caches</value>
         <value xml:lang="fr">Vider tous les caches</value>
@@ -745,12 +733,6 @@
         <value xml:lang="it">Creare/Rimuovere Chiave Primaria</value>
         <value xml:lang="th">ล้าง/ลบ Primary Keys</value>
     </property>
-    <property key="WebtoolsCurrentCustomTimePeriod">
-        <value xml:lang="en">Current Custom Time Period</value>
-        <value xml:lang="fr">Période de temps spécifique courante</value>
-        <value xml:lang="it">Periodi di Tempo Personalizzati Attuale</value>
-        <value xml:lang="th">ช่วงเวลาของลูกค้าในปัจจุบัน</value>
-    </property>
     <property key="WebtoolsDaemon">
         <value xml:lang="en">Daemon</value>
         <value xml:lang="fr">Démon</value>
@@ -872,14 +854,6 @@
         <value xml:lang="th">ชื่อ Dispatcher</value>
         <value xml:lang="zh">执行程序名称</value>
     </property>
-    <property key="WebtoolsEditCustomTimePeriods">
-        <value xml:lang="en">Edit Custom Time Periods</value>
-        <value xml:lang="fr">Modifier les périodes de temps</value>
-        <value xml:lang="it">Aggiorna Periodi di Tempo Personalizzati</value>
-        <value xml:lang="ro">Actualizeaza Perioadele de Timp Personalizate</value>
-        <value xml:lang="th">แก้ไขการกำหนดเวลา</value>
-        <value xml:lang="zh">编辑定制时间段</value>
-    </property>
     <property key="WebtoolsElements">
         <value xml:lang="en">Elements</value>
         <value xml:lang="fr">Elements</value>
@@ -1878,19 +1852,6 @@
         <value xml:lang="th">ชื่อหรือหน้าที่</value>
         <value xml:lang="zh">名称或角色</value>
     </property>
-    <property key="WebtoolsNoChildPeriodsFound">
-        <value xml:lang="en">No child periods found</value>
-        <value xml:lang="fr">Aucune période enfant trouvée</value>
-        <value xml:lang="it">Nessun periodo figlio trovato</value>
-        <value xml:lang="th">ไม่พบช่วงเวลาสั้น ๆ</value>
-    </property>
-    <property key="WebtoolsNoCurrentCustomTimePeriodSelected">
-        <value xml:lang="en">No Current Custom Time Period Selected; "Children" below have no Parent Period.</value>
-        <value xml:lang="fr">Aucune période de temps sélectionnée; la période "fille" ci-dessous n'a aucune période parente.</value>
-        <value xml:lang="it">Nessun periodo di tempo personalizzato selezionato; i "Periodi figli" sottostanti non hanno alcun "Periodo padre".</value>
-        <value xml:lang="th">ไม่มีลูกค้าในช่วงเวลาที่เลือก; "Children" ด้านล่างนี้ไม่มีกลุ่มช่วงเวลา
-        </value>
-    </property>
     <property key="WebtoolsNoEntitiesRead">
         <value xml:lang="en">No entities read</value>
         <value xml:lang="fr">Aucune entité lue</value>
@@ -2049,12 +2010,6 @@
         <value xml:lang="th">ทางเลือก</value>
         <value xml:lang="zh">可选</value>
     </property>
-    <property key="WebtoolsOrgPartyId">
-        <value xml:lang="en">Org Party Id</value>
-        <value xml:lang="fr">Réf. d'org.</value>
-        <value xml:lang="it">Organizzazione</value>
-        <value xml:lang="th">รหัสองค์กรกลุ่มผู้ใช้</value>
-    </property>
     <property key="WebtoolsOutParameters">
         <value xml:lang="en">Out parameters</value>
         <value xml:lang="fr">Paramètres en sortie</value>
@@ -2155,24 +2110,6 @@
         <value xml:lang="th">การดำเนินการทดสอบ</value>
         <value xml:lang="zh">性能测试</value>
     </property>
-    <property key="WebtoolsPeriodName">
-        <value xml:lang="en">Period Name</value>
-        <value xml:lang="fr">Nom de période</value>
-        <value xml:lang="it">Nome Periodo</value>
-        <value xml:lang="th">ชื่อช่วงเวลา</value>
-    </property>
-    <property key="WebtoolsPeriodNumber">
-        <value xml:lang="en">Period Number</value>
-        <value xml:lang="fr">N° de période</value>
-        <value xml:lang="it">Numero Periodo</value>
-        <value xml:lang="th">หมายเลขช่วงเวลา</value>
-    </property>
-    <property key="WebtoolsPeriodType">
-        <value xml:lang="en">Period Type</value>
-        <value xml:lang="fr">Type de période</value>
-        <value xml:lang="it">Tipo Periodo</value>
-        <value xml:lang="th">ประเภทช่วงเวลา</value>
-    </property>
     <property key="WebtoolsPermissionError">
         <value xml:lang="en">Webtools Permission Error</value>
         <value xml:lang="fr">Erreur d'autorisation sur les outils web</value>
@@ -2187,12 +2124,6 @@
         <value xml:lang="it">Tu non hai il permesso di usare questa pagina (necessario ENTITY_MAINT)</value>
         <value xml:lang="th">คุณไม่ได้รับอนุญาตให้ใช้งานในหน้านี้ (ENTITY_MAINT ที่ต้องการ)</value>
     </property>
-    <property key="WebtoolsPermissionPeriod">
-        <value xml:lang="en">You do not have permission to use this page (PERIOD_MAINT needed)</value>
-        <value xml:lang="fr">Vous n'avez pas l'autorisation d'utiliser cette page (PERIOD_MAINT est nécessaire)</value>
-        <value xml:lang="it">Tu non hai il permesso di usare questa pagina (necessario PERIOD_MAINT)</value>
-        <value xml:lang="th">คุณไม่ได้รับอนุญาตให้ใช้งานในหน้านี้ (PERIOD_MAINT ที่ต้องการ)</value>
-    </property>
     <property key="WebtoolsPermissionType">
         <value xml:lang="en">Permission Type</value>
         <value xml:lang="fr">Type d'autorisation</value>
@@ -2643,12 +2574,6 @@
         <value xml:lang="it">Imposta Come Attuale</value>
         <value xml:lang="th">ตั้งเป็นปัจจุบัน</value>
     </property>
-    <property key="WebtoolsShowOnlyPeriodsWithOrganization">
-        <value xml:lang="en">Show Only Periods with Organization Party ID</value>
-        <value xml:lang="fr">Montrer seulement les périodes ayant la réf. d'acteur de l'organisation</value>
-        <value xml:lang="it">Mostra Solo Periodi con Organizzazioni</value>
-        <value xml:lang="th">แสดงช่วงเวลากับรหัสองค์กรกลุ่มผู้ใช้อย่างเดียว</value>
-    </property>
     <property key="WebtoolsShowShowWSDL">
         <value xml:lang="en">Show wsdl</value>
         <value xml:lang="fr">Montrer WSDL</value>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=757683&r1=757682&r2=757683&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Tue Mar 24 08:11:22 2009
@@ -353,30 +353,6 @@
         <response name="error" type="view" value="ServiceList"/>
     </request-map>
     
-    <!-- CustomTimePeriod requests -->
-    <request-map uri="EditCustomTimePeriod">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditCustomTimePeriod"/>
-    </request-map>
-    <request-map uri="createCustomTimePeriod">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="createCustomTimePeriod"/>
-        <response name="success" type="view" value="EditCustomTimePeriod"/>
-        <response name="error" type="view" value="EditCustomTimePeriod"/>
-    </request-map>
-    <request-map uri="updateCustomTimePeriod">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="updateCustomTimePeriod"/>
-        <response name="success" type="view" value="EditCustomTimePeriod"/>
-        <response name="error" type="view" value="EditCustomTimePeriod"/>
-    </request-map>
-    <request-map uri="deleteCustomTimePeriod">
-        <security https="true" auth="true"/>
-        <event type="service" path="" invoke="deleteCustomTimePeriod"/>
-        <response name="success" type="view" value="EditCustomTimePeriod"/>
-        <response name="error" type="view" value="EditCustomTimePeriod"/>
-    </request-map>
-
     <!-- PerformanceTest requests -->
     <request-map uri="EntityPerformanceTest">
         <security https="true" auth="true"/>
@@ -620,8 +596,6 @@
 
     <view-map name="EntityPerformanceTest" type="screen" page="component://webtools/widget/EntityScreens.xml#EntityPerformanceTest"/>
 
-    <view-map name="EditCustomTimePeriod" type="screen" page="component://webtools/widget/MiscScreens.xml#EditCustomTimePeriod"/>
-
     <view-map name="ServiceLog" type="screen" page="component://webtools/widget/ServiceScreens.xml#ServiceLog"/>
     <view-map name="ServiceList" type="screen" page="component://webtools/widget/ServiceScreens.xml#ServiceList"/>
     <view-map name="FindJob" type="screen" page="component://webtools/widget/ServiceScreens.xml#FindJob"/>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl?rev=757683&r1=757682&r2=757683&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl Tue Mar 24 08:11:22 2009
@@ -122,9 +122,6 @@
           <li><a href="<@ofbizUrl>viewdatafile</@ofbizUrl>">${uiLabelMap.WebtoolsWorkWithDataFiles}</a></li>
         </#if>
         <li><h3>${uiLabelMap.WebtoolsMiscSetupTools}</h3></li>
-        <#if security.hasPermission("PERIOD_MAINT", session)>
-          <li><a href="<@ofbizUrl>EditCustomTimePeriod</@ofbizUrl>">${uiLabelMap.WebtoolsEditCustomTimePeriods}</a></li>
-        </#if>
         <#if security.hasPermission("ENUM_STATUS_MAINT", session)>
           <#--
           <li><a href="<@ofbizUrl>EditEnumerationTypes</@ofbizUrl>">Edit Enumerations</a></li>

Modified: ofbiz/trunk/framework/webtools/widget/MiscScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/MiscScreens.xml?rev=757683&r1=757682&r2=757683&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/MiscScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/MiscScreens.xml Tue Mar 24 08:11:22 2009
@@ -36,23 +36,6 @@
         </section>
     </screen>
     
-    <screen name="EditCustomTimePeriod">
-        <section>
-            <actions>
-                <set field="headerItem" value="main"/>
-                <set field="titleProperty" value="WebtoolsEditCustomTimePeriods"/>
-                <script location="component://webtools/webapp/webtools/WEB-INF/actions/period/EditCustomTimePeriod.groovy"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://webtools/webapp/webtools/period/EditCustomTimePeriod.ftl"/></html></platform-specific>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    
     <screen name="viewdatafile">
         <section>
             <actions>


Free forum by Nabble Edit this page