svn commit: r597349 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.properties webapp/accounting/WEB-INF/controller.xml webapp/accounting/admin/AdminForms.xml widget/AdminScreens.xml

[jacopoc]

Author: jacopoc
Date: Thu Nov 22 01:32:23 2007
New Revision: 597349

URL: http://svn.apache.org/viewvc?rev=597349&view=rev
Log:
Enhanced screen to manage the accounting time periods of a Company.

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml
    ofbiz/trunk/applications/accounting/widget/AdminScreens.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties?rev=597349&r1=597348&r2=597349&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties Thu Nov 22 01:32:23 2007
@@ -115,6 +115,7 @@
 AccountingChartOfAcctsMenu=Chart of Accounts
 AccountingCheckAmount=Check Amount
 AccountingChecks=Checks
+AccountingClosedTimePeriods=Closed Time Periods
 AccountingComments=Comments
 AccountingCompanies=Companies
 AccountingCompanyName=OFBiz: Accounting Manager
@@ -306,6 +307,7 @@
 AccountingNotModificationRecrationGlAccount=This cannot be changed without re-creating the GL Account.
 AccountingOfflinePayment=Offline Payment
 AccountingOpenPayments=Open
+AccountingOpenTimePeriods=Open Time Periods
 AccountingOrders=Orders
 AccountingOrderNr=Order #
 AccountingOrderPaymentPreferenceId=Accounting Order Payment Preference Id

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=597349&r1=597348&r2=597349&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Thu Nov 22 01:32:23 2007
@@ -1107,6 +1107,12 @@
         <security https="true" auth="true"/>
         <response name="success" type="view" value="TimePeriods"/>
     </request-map>
+    <request-map uri="createCustomTimePeriod">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createCustomTimePeriod"/>
+        <response name="success" type="view" value="TimePeriods"/>
+        <response name="error" type="view" value="TimePeriods"/>
+    </request-map>
     <request-map uri="PartyAcctgPreference">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="PartyAcctgPreference"/>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml?rev=597349&r1=597348&r2=597349&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml Thu Nov 22 01:32:23 2007
@@ -385,6 +385,53 @@
         <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit/></field>
     </form>
 
+    <!-- Accounting Time Period forms-->
+    <form name="ListClosedTimePeriods" type="list" list-name="closedTimePeriods">
+        <auto-fields-entity entity-name="CustomTimePeriod" default-field-type="display"/>
+        <field name="organizationPartyId"><hidden/></field>    
+        <field name="isClosed"><hidden/></field>
+        <field name="periodTypeId">
+          <display-entity entity-name="PeriodType"/>
+        </field>
+        <field name="parentPeriodId">
+          <display-entity entity-name="CustomTimePeriod" key-field-name="customTimePeriodId" description="[${customTimePeriodId}] ${periodName} ${uiLabelMap.CommonFrom} ${fromDate} ${uiLabelMap.CommonTo} ${thruDate}"/>
+        </field>
+    </form>
+    <form name="ListOpenTimePeriods" type="list" list-name="openTimePeriods">
+        <auto-fields-entity entity-name="CustomTimePeriod" default-field-type="display"/>
+        <field name="organizationPartyId"><hidden/></field>
+        <field name="isClosed"><hidden/></field>
+        <field name="periodTypeId">
+          <display-entity entity-name="PeriodType"/>
+        </field>
+        <field name="parentPeriodId">
+          <display-entity entity-name="CustomTimePeriod" key-field-name="customTimePeriodId" description="[${customTimePeriodId}] ${periodName} ${uiLabelMap.CommonFrom} ${fromDate} ${uiLabelMap.CommonTo} ${thruDate}"/>
+        </field>
+    </form>
+    <form name="CreateTimePeriod" type="single" title="" target="createCustomTimePeriod">
+        <auto-fields-service service-name="createCustomTimePeriod"/>
+        <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
+        <field name="isClosed">
+            <drop-down>
+                <option description="${uiLabelMap.CommonNo}" key="N"/>
+                <option description="${uiLabelMap.CommonYes}" key="Y"/>
+            </drop-down>
+        </field>
+        <field name="parentPeriodId">
+            <drop-down allow-empty="true">
+                <list-options list-name="openTimePeriods" key-name="customTimePeriodId" description="[${customTimePeriodId}] ${periodName} ${uiLabelMap.CommonFrom} ${fromDate} ${uiLabelMap.CommonTo} ${thruDate}"/>
+            </drop-down>
+        </field>
+        <field name="periodTypeId">
+            <drop-down>
+                <entity-options entity-name="PeriodType" description="${description}">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>  
+        </field>
+        <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit/></field>
+    </form>
+
     <form name="ListChecksToPrint" type="multi" list-name="payments" target="printChecks" separate-columns="true">
         <field name="paymentId">
             <hyperlink target="paymentOverview?paymentId=${paymentId}" description="${paymentId}"/>

Modified: ofbiz/trunk/applications/accounting/widget/AdminScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AdminScreens.xml?rev=597349&r1=597348&r2=597349&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AdminScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AdminScreens.xml Thu Nov 22 01:32:23 2007
@@ -91,9 +91,12 @@
             <widgets>
                 <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://accounting/webapp/accounting/admin/timePeriods.ftl"/></html>
-                        </platform-specific>                    
+                        <label style="head1">${uiLabelMap.AccountingOpenTimePeriods}</label>
+                        <include-form name="ListOpenTimePeriods" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
+                        <label style="head1">${uiLabelMap.AccountingClosedTimePeriods}</label>
+                        <include-form name="ListClosedTimePeriods" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
+                        <label style="head1">${uiLabelMap.CommonNew}</label>
+                        <include-form name="CreateTimePeriod" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>