svn commit: r701848 - in /ofbiz/trunk/applications/acco
Locked
 
|
Author: mrisaliti
Date: Sun Oct 5 11:58:29 2008 New Revision: 701848 URL: http://svn.apache.org/viewvc?rev=701848&view=rev Log: Some cleanup on accounting component (Part of issue OFBIZ-1982) Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=701848&r1=701847&r2=701848&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Sun Oct 5 11:58:29 2008 @@ -8750,16 +8750,6 @@ <value xml:lang="it">Lista Transazioni Conto Finanziario</value> <value xml:lang="th">List Fin Account Trans</value> </property> - <property key="PageTitleListFixedAssetCalendar"> - <value xml:lang="en">List Fixed Asset Calendar</value> - <value xml:lang="es">Lista Calendario de Activo Fijo</value> - <value xml:lang="fr">Liste des calendriers d'immobilisations</value> - <value xml:lang="it">Lista Calendario Cespite</value> - <value xml:lang="ro">Lista Calendar Mijloc Fix</value> - <value xml:lang="ru">СпиÑок календаÑÑ ÐС</value> - <value xml:lang="th">รายà¸à¸²à¸£à¸à¸à¸´à¸à¸´à¸à¸à¸£à¸±à¸à¸¢à¹à¸ªà¸´à¸à¹à¸¡à¹à¸«à¸¡à¸¸à¸à¹à¸§à¸µà¸¢à¸</value> - <value xml:lang="zh">åºå®èµäº§æ¥åå表</value> - </property> <property key="PageTitleListFixedAssetChildren"> <value xml:lang="en">Fixed Asset Children</value> <value xml:lang="es">Activo Fijo Hijo</value> Modified: ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml?rev=701848&r1=701847&r2=701848&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml (original) +++ ofbiz/trunk/applications/accounting/servicedef/services_fixedasset.xml Sun Oct 5 11:58:29 2008 @@ -67,7 +67,7 @@ <auto-attributes include="pk" mode="IN" optional="false"/> </service> - <!-- Fixed Asset calendar --> + <!-- TO BE REMOVED : Fixed Asset calendar <service name="updateFixedAssetCalendar" engine="simple" location="org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="updateFixedAssetCalendar" auth="true"> <description>Update the Capacity available of Calendar of a Fixed Asset information</description> @@ -76,6 +76,8 @@ <attribute name="exceptionCapacity" type="Timestamp" mode="IN" optional="false"/> <attribute name="capacity" type="Double" mode="IN" optional="true"/> </service> + --> + <!-- FixedAssetStdCost --> <service name="createFixedAssetStdCost" default-entity-name="FixedAssetStdCost" engine="simple" location="org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="createFixedAssetStdCost" auth="true"> 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=701848&r1=701847&r2=701848&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Sun Oct 5 11:58:29 2008 @@ -185,11 +185,7 @@ <request-map uri="listInvoiceItems"> <security https="true" auth="true"/> <response name="success" type="view" value="listInvoiceItems"/> - </request-map> - <request-map uri="editInvoiceItem"> - <security https="true" auth="true"/> - <response name="success" type="view" value="listInvoiceItems"/> - </request-map> + </request-map> <request-map uri="createInvoiceItem"> <security https="true" auth="true"/> <event type="service" invoke="createInvoiceItem"/> @@ -407,10 +403,12 @@ <response name="success" type="view" value="ManualTransaction"/> </request-map> + <!-- TO BE REMOVED <request-map uri="TransactionReports"> <security https="true" auth="true"/> <response name="success" type="view" value="TransactionReports"/> </request-map> + --> <!-- transaction action requests --> <request-map uri="processAuthorizeTransaction"> @@ -522,10 +520,14 @@ <security https="true" auth="true"/> <response name="success" type="view" value="GlAccountNavigate"/> </request-map> + + <!-- TO BE REMOVED <request-map uri="ListGlobalGlAccount"> <security https="true" auth="true"/> <response name="success" type="view" value="ListGlobalGlAccount"/> </request-map> + --> + <request-map uri="FindGlobalGlAccount"> <security https="true" auth="true"/> <response name="success" type="view" value="FindGlobalGlAccount"/> @@ -561,7 +563,11 @@ </request-map> <request-map uri="ListGlAccountOrganization"><security https="true" auth="true"/><response name="success" type="view" value="ListGlAccountOrganization"/></request-map> + + <!-- TO BE REMOVED <request-map uri="EditGlobalGlAccountOrganizations"><security https="true" auth="true"/><response name="success" type="view" value="EditGlobalGlAccountOrganizations"/></request-map> + --> + <request-map uri="createGlAccountOrganization"> <security https="true" auth="true"/> <event type="service" invoke="createGlAccountOrganization"/> @@ -571,10 +577,11 @@ <request-map uri="updateGlAccountOrganization"> <security https="true" auth="true"/> <event type="service" invoke="updateGlAccount"/> - <response name="success" type="view" value="EditGlobalGlAccountOrganizations"/> - <response name="error" type="view" value="EditGlobalGlAccountOrganizations"/> + <response name="success" type="view" value="ListGlAccountOrganization"/> + <response name="error" type="view" value="ListGlAccountOrganization"/> </request-map> + <!-- TO BE REMOVED <request-map uri="EditGlobalGlAccountRoles"><security https="true" auth="true"/><response name="success" type="view" value="EditGlobalGlAccountRoles"/></request-map> <request-map uri="createGlAccountRole"> <security https="true" auth="true"/> @@ -588,6 +595,8 @@ <response name="success" type="view" value="EditGlobalGlAccountRoles"/> <response name="error" type="view" value="EditGlobalGlAccountRoles"/> </request-map> + --> + <request-map uri="ListGlAccountEntries"> <security https="true" auth="true"/> <response name="success" type="view" value="ListGlAccountEntries"/> @@ -682,7 +691,7 @@ <response name="error" type="view" value="ListFixedAssetProducts"/> </request-map> - <!-- ================ Fixed Asset Calendar Requests ================= --> + <!-- TO BE REMOVED ?? <request-map uri="ListFixedAssetCalendar"> <security https="true" auth="true"/> <response name="success" type="view" value="ListFixedAssetCalendar"/> @@ -693,7 +702,7 @@ <response name="success" type="view" value="ListFixedAssetCalendar"/> <response name="error" type="view" value="ListFixedAssetCalendar"/> </request-map> - <!-- ================ FixedAsset Roles Requests ================= --> + <request-map uri="ListFixedAssetParties"> <security https="true" auth="true"/> <response name="success" type="view" value="ListFixedAssetParties"/> @@ -721,7 +730,6 @@ <response name="error" type="view" value="EditFixedAssetParties"/> </request-map> - <!-- ================ FixedAsset Rollup Requests ================= --> <request-map uri="ListFixedAssetRollUp"><security https="true" auth="true"/><response name="success" type="view" value="ListFixedAssetRollUp"/></request-map> <request-map uri="EditFixedAssetRollup"><security https="true" auth="true"/><response name="success" type="view" value="EditFixedAssetRollup"/></request-map> <request-map uri="addFixedAssetToFixedAsset"> @@ -742,7 +750,9 @@ <response name="success" type="view" value="EditFixedAssetRollup"/> <response name="error" type="view" value="EditFixedAssetRollup"/> </request-map> - <!-- ================ FixedAsset Standard Costs Requests ================= --> + --> + + <!-- ================ FixedAsset Standard Costs Requests ================= --> <request-map uri="FixedAssetChildren"><security https="true" auth="true"/><response name="success" type="view" value="FixedAssetChildren"/></request-map> <request-map uri="EditFixedAssetStdCosts"> @@ -1523,7 +1533,7 @@ <response name="error" type="view" value="EditCreditCardTypeGlAccounts"/> </request-map> - <!-- Actually reconcile account --> + <!-- TO BE REMOVED <request-map uri="reconcileGlAccount"> <security https="true" auth="true"/> <event type="service" invoke="reconcileGlAccount"/> @@ -1534,10 +1544,12 @@ <security https="true" auth="true"/> <response name="success" type="view" value="ViewGlAccountBalance"/> </request-map> + <request-map uri="viewGlReconciliation"> <security https="true" auth="true"/> <response name="success" type="view" value="ViewGlReconciliation"/> </request-map> + --> <request-map uri="findGlAccountReconciliation"> <security https="true" auth="true"/> @@ -1879,7 +1891,6 @@ <view-map name="newInvoice" type="screen" page="component://accounting/widget/InvoiceScreens.xml#NewInvoice"/> <view-map name="editInvoice" type="screen" page="component://accounting/widget/InvoiceScreens.xml#EditInvoice"/> <view-map name="listInvoiceItems" type="screen" page="component://accounting/widget/InvoiceScreens.xml#EditInvoiceItems"/> - <view-map name="editInvoiceItem" type="screen" page="component://accounting/widget/InvoiceScreens.xml#EditInvoiceItem"/> <view-map name="editInvoiceTimeEntries" type="screen" page="component://accounting/widget/InvoiceScreens.xml#EditInvoiceTimeEntries"/> <view-map name="invoiceStatus" type="screen" page="component://accounting/widget/InvoiceScreens.xml#InvoiceStatus"/> <view-map name="editInvoiceApplications" type="screen" page="component://accounting/widget/InvoiceScreens.xml#EditInvoiceApplications"/> @@ -1921,9 +1932,10 @@ <view-map name="EditGlReconciliation" type="screen" page="component://accounting/widget/GlScreens.xml#EditGlReconciliation"/> <view-map name="EditGlobalGlAccount" type="screen" page="component://accounting/widget/GlobalGlAccountsScreens.xml#AddGlAccount"/> - <!-- NOTE/TODO: these 2 appear to never have been implemented all the way, just request and view defs so far... --> + <!-- NOTE/TODO: these 2 appear to never have been implemented all the way, just request and view defs so far... <view-map name="EditGlobalGlAccountOrganizations" type="screen" page="component://accounting/widget/GlobalGlAccountsScreens.xml#EditGlobalGlAccountOrganizations"/> <view-map name="EditGlobalGlAccountRoles" type="screen" page="component://accounting/widget/GlobalGlAccountsScreens.xml#EditGlobalGlAccountRoles"/> + --> <view-map name="ListGlAccountEntries" type="screen" page="component://accounting/widget/GlobalGlAccountsScreens.xml#ListGlAccountEntries"/> <view-map name="ListAcctgTransEntries" type="screen" page="component://accounting/widget/GlobalGlAccountsScreens.xml#ListAcctgTransEntries"/> @@ -1931,7 +1943,11 @@ <!-- FinAccount --> <view-map name="FindFinAccount" type="screen" page="component://accounting/widget/FinAccountScreens.xml#FindFinAccount"/> + + <!-- TO BE REMOVED <view-map name="ListFinAccount" type="screen" page="component://accounting/widget/FinAccountScreens.xml#ListFinAccount"/> + --> + <view-map name="EditFinAccount" type="screen" page="component://accounting/widget/FinAccountScreens.xml#EditFinAccount"/> <view-map name="EditFinAccountRoles" type="screen" page="component://accounting/widget/FinAccountScreens.xml#EditFinAccountRoles"/> <view-map name="EditFinAccountTrans" type="screen" page="component://accounting/widget/FinAccountScreens.xml#EditFinAccountTrans"/> @@ -1943,13 +1959,19 @@ <view-map name="FixedAssetSearchResults" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#FixedAssetSearchResults"/> <view-map name="EditFixedAsset" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#EditFixedAsset"/> <view-map name="ListFixedAssetProducts" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssetProducts"/> + + <!-- TO BE REMOVED <view-map name="addFixedAssetProduct" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#addFixedAssetProduct"/> <view-map name="updateFixedAssetProduct" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#updateFixedAssetProduct"/> <view-map name="removeFixedAssetProduct" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#removeFixedAssetProduct"/> + <view-map name="ListFixedAssetCalendar" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssetCalendar"/> <view-map name="updateFixedAssetCalendar" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#updateFixedAssetCalendar"/> + <view-map name="ListFixedAssetParties" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssetParties"/> <view-map name="ListFixedAssetsRollUp" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssetRollUp"/> + --> + <view-map name="EditFixedAssetStdCosts" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#EditFixedAssetStdCosts"/> <view-map name="FixedAssetChildren" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#FixedAssetChildren"/> @@ -2023,8 +2045,11 @@ <view-map name="ViewGatewayResponse" page="component://accounting/widget/TransactionScreens.xml#ViewGatewayResponse" type="screen"/> <view-map name="AuthorizeTransaction" page="component://accounting/widget/TransactionScreens.xml#AuthorizeTransaction" type="screen"/> <view-map name="CaptureTransaction" page="component://accounting/widget/TransactionScreens.xml#CaptureTransaction" type="screen"/> - <view-map name="TransactionReports" page="component://accounting/widget/TransactionScreens.xml#TransactionReports" type="screen"/> + <!-- TO BE REMOVED + <view-map name="TransactionReports" page="component://accounting/widget/TransactionScreens.xml#TransactionReports" type="screen"/> + --> + <!-- Lookup mappings --> <view-map name="viewprofile" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#viewprofile"/> <view-map name="LookupPerson" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson"/> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml?rev=701848&r1=701847&r2=701848&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml Sun Oct 5 11:58:29 2008 @@ -144,7 +144,7 @@ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <!-- list availability/occupation period on a fixed asset --> + <!-- TO BE REMOVED <form name="listFixedAssetCalendar" type="list" list-name="weeks" target="updateFixedAssetProductCalendar" default-table-style="calendar-table"> <field name="productId"><hidden value="${parameters.productId}"/></field> <field name="week" title="${uiLabelMap.Common${month}} ${year}" widget-area-style="calendarWeek"><display description="${uiLabelMap.CommonWeek} ${week}"/></field> @@ -163,7 +163,7 @@ <field name="Sunday" title="${uiLabelMap.CommonEmptyHeader}"><display/></field> <field name="SundayData" title="${uiLabelMap.CommonSunday}" widget-style="calendarContent"><display/></field> </form> - <!-- update the availability on a date basis of a fixed asset --> + <form name="updateFixedAssetCalendar" type="single" target="updateFixedAssetCalendar" title="Update the fixed Asset calendar" default-map-name="fixedAssetCalendar" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="updateFixedAssetCalendar" map-name="parameters"/> @@ -171,6 +171,7 @@ <field name="fixedAssetId"><hidden/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> + --> <form name="WorkEffortSummary" type="single" default-map-name="workEffort" header-row-style="header-row" default-table-style="basic-table"> Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=701848&r1=701847&r2=701848&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml Sun Oct 5 11:58:29 2008 @@ -171,7 +171,7 @@ <form name="ListGlReconciliations" type="list" list-name="glReconciliations" default-entity-name="GlReconciliation" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="glReconciliationId"> - <hyperlink also-hidden="false" description="${glReconciliationId}" target="viewGlReconciliation?glReconciliationId=${glReconciliationId}&amp;organizationPartyId=${organizationPartyId}&amp;glAccountId=${glAccountId}"/> + <hyperlink also-hidden="false" description="${glReconciliationId}" target="EditGlReconciliation?glReconciliationId=${glReconciliationId}&amp;organizationPartyId=${organizationPartyId}&amp;glAccountId=${glAccountId}"/> </field> <field name="glReconciliationName"><display/></field> <field name="description"><display/></field> Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml?rev=701848&r1=701847&r2=701848&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml Sun Oct 5 11:58:29 2008 @@ -417,7 +417,7 @@ <widgets> <decorator-screen name="CommonAccountDecorator"> <decorator-section name="body"> - <include-form name="EditGlobalAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> + <include-form name="EditGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |