svn commit: r760069 - in /ofbiz/trunk/applications/acco
Locked
svn commit: r760069 - in /ofbiz/trunk/applications/acco
 
|
Author: jleroux
Date: Mon Mar 30 17:55:17 2009 New Revision: 760069 URL: http://svn.apache.org/viewvc?rev=760069&view=rev Log: Cleaning things (notably secured URLS missing) and rather making a local patch for changes still pending... Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml?rev=760069&r1=760068&r2=760069&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml Mon Mar 30 17:55:17 2009 @@ -18,7 +18,7 @@ under the License. --> -<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> <form name="FindTaxAuthority" type="list" list-name="taxAuthorityList" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -29,11 +29,13 @@ </entity-condition> </actions> <auto-fields-entity entity-name="TaxAuthority" default-field-type="display"/> - + <field name="taxAuthGeoId"><display-entity entity-name="Geo" key-field-name="geoId" description="${geoName} [${geoCode}] [${geoId}]"/></field> <field name="taxAuthPartyId"> <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}"> - <sub-hyperlink description="${taxAuthPartyId}" target="/partymgr/control/viewprofile?partyId=${taxAuthPartyId}" target-type="inter-app" link-style="buttontext"/> + <sub-hyperlink description="${taxAuthPartyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext"> + <parameter param-name="partyId" from-field="taxAuthPartyId"/> + </sub-hyperlink> </display-entity> </field> @@ -44,12 +46,12 @@ </hyperlink> </field> </form> - + <form name="EditTaxAuthority" type="single" target="updateTaxAuthority" title="" default-map-name="taxAuthority" - header-row-style="header-row" default-table-style="basic-table"> + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="taxAuthority==null" target="createTaxAuthority"/> <auto-fields-service service-name="updateTaxAuthority" map-name="taxAuthority"/> - + <field use-when="taxAuthority!=null" name="taxAuthPartyId" title="${uiLabelMap.PartyParty}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field use-when="taxAuthority==null&&taxAuthPartyId==null" name="taxAuthPartyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName"/></field> <field use-when="taxAuthority==null&&taxAuthPartyId!=null" name="taxAuthPartyId" title="${uiLabelMap.PartyParty}" tooltip="${uiLabelMap.CommonCannotBeFound}:[${taxAuthPartyId}]"><lookup target-form-name="LookupPartyName"/></field> @@ -57,7 +59,7 @@ <field use-when="taxAuthority!=null" name="taxAuthGeoId" title="${uiLabelMap.CommonGeo}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field use-when="taxAuthority==null&&taxAuthGeoId==null" name="taxAuthGeoId" title="${uiLabelMap.CommonGeo}"><lookup target-form-name="LookupGeo"/></field> <field use-when="taxAuthority==null&&taxAuthGeoId!=null" name="taxAuthGeoId" title="${uiLabelMap.CommonGeo}" tooltip="${uiLabelMap.CommonCannotBeFound}:[${taxAuthGeoId}]"><lookup target-form-name="LookupGeo"/></field> - + <field name="requireTaxIdForExemption" widget-style="smallSelect"> <drop-down no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> @@ -65,7 +67,7 @@ <drop-down no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> <field name="taxIdFormatPattern" tooltip="${uiLabelMap.AccountingValidationPattern}"></field> - + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -85,7 +87,9 @@ <field name="taxAuthGeoId"><hidden/></field> <field name="productCategoryId" title="${uiLabelMap.ProductCategory}"> <display-entity entity-name="ProductCategory" description="${description}"> - <sub-hyperlink description="${productCategoryId}" target="/catalog/control/EditCategory?productCategoryId=${productCategoryId}" target-type="inter-app" link-style="buttontext"/> + <sub-hyperlink description="${productCategoryId}" target="/catalog/control/EditCategory" target-type="inter-app" link-style="buttontext"> + <parameter param-name="productCategoryId" from-field="productCategoryId"/> + </sub-hyperlink> </display-entity> </field> @@ -95,7 +99,7 @@ </field> </form> <form name="AddTaxAuthorityCategory" type="single" target="createTaxAuthorityCategory" title="" default-map-name="taxAuthorityCategory" - header-row-style="header-row" default-table-style="basic-table"> + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createTaxAuthorityCategory"/> <field name="taxAuthPartyId"><hidden/></field> <field name="taxAuthGeoId"><hidden/></field> @@ -115,13 +119,15 @@ </entity-condition> </actions> <auto-fields-service service-name="updateTaxAuthorityAssoc"/> - + <field name="taxAuthPartyId"><hidden/></field> <field name="taxAuthGeoId"><hidden/></field> <field name="toTaxAuthPartyId"> <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}"> - <sub-hyperlink description="${toTaxAuthPartyId}" target="/partymgr/control/viewprofile?partyId=${toTaxAuthPartyId}" target-type="inter-app" link-style="buttontext"/> + <sub-hyperlink description="${toTaxAuthPartyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext"> + <parameter param-name="partyId" from-field="toTaxAuthPartyId"/> + </sub-hyperlink> </display-entity> </field> <field name="toTaxAuthGeoId"><display-entity entity-name="Geo" key-field-name="geoId" description="${geoName} [${geoCode}] [${geoId}]"/></field> @@ -134,7 +140,7 @@ </entity-options> </drop-down> </field> - + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteTaxAuthorityAssoc?taxAuthPartyId=${taxAuthPartyId}&taxAuthGeoId=${taxAuthGeoId}&toTaxAuthPartyId=${toTaxAuthPartyId}&toTaxAuthGeoId=${toTaxAuthGeoId}&fromDate=${fromDate}" @@ -142,7 +148,7 @@ </field> </form> <form name="AddTaxAuthorityAssoc" type="single" target="createTaxAuthorityAssoc" title="" default-map-name="taxAuthorityAssoc" - header-row-style="header-row" default-table-style="basic-table"> + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createTaxAuthorityAssoc"/> <field name="taxAuthPartyId"><hidden/></field> <field name="taxAuthGeoId"><hidden/></field> @@ -156,7 +162,7 @@ </entity-options> </drop-down> </field> - + <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -171,27 +177,31 @@ <order-by field-name="glAccountId"/> </entity-condition> </actions> - + <field name="taxAuthPartyId"><hidden/></field> <field name="taxAuthGeoId"><hidden/></field> <field name="glAccountId" title="${uiLabelMap.AccountingGlAccount}"> <display-entity entity-name="GlAccount" description="${accountName}"> - <sub-hyperlink description="${glAccountId}" target="EditGlAccount?glAccountId=${glAccountId}" link-style="buttontext"/> + <sub-hyperlink description="${glAccountId}" target="EditGlAccount" link-style="buttontext"> + <parameter param-name="glAccountId" from-field="glAccountId"/> + </sub-hyperlink> </display-entity> </field> <field name="organizationPartyId" title="${uiLabelMap.PartyOrganizationParty}"> <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}"> - <sub-hyperlink description="${organizationPartyId}" target="/partymgr/control/viewprofile?partyId=${organizationPartyId}" target-type="inter-app" link-style="buttontext"/> + <sub-hyperlink description="${organizationPartyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext"> + <parameter param-name="partyId" from-field="organizationPartyId"/> + </sub-hyperlink> </display-entity> </field> - + <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteTaxAuthorityGlAccount?taxAuthPartyId=${taxAuthPartyId}&taxAuthGeoId=${taxAuthGeoId}&glAccountId=${glAccountId}&organizationPartyId=${organizationPartyId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> <form name="AddTaxAuthorityGlAccount" type="single" target="createTaxAuthorityGlAccount" title="" default-map-name="taxAuthorityGlAccount" - header-row-style="header-row" default-table-style="basic-table"> + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createTaxAuthorityGlAccount"/> <field name="taxAuthPartyId"><hidden/></field> <field name="taxAuthGeoId"><hidden/></field> @@ -199,7 +209,7 @@ <field name="glAccountId" title="${uiLabelMap.AccountingGlAccount}"><lookup target-form-name="LookupGlAccount"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - + <form name="ListTaxAuthorityRateProducts" type="list" list-name="taxAuthorityRateProductList" target="updateTaxAuthorityRateProduct" separate-columns="true" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> @@ -212,7 +222,7 @@ </entity-condition> </actions> <auto-fields-service service-name="updateTaxAuthorityRateProduct"/> - + <field name="taxAuthorityRateSeqId"><hidden/></field> <field name="taxAuthPartyId"><hidden/></field> <field name="taxAuthGeoId"><hidden/></field> @@ -242,7 +252,7 @@ </entity-options> </drop-down> </field> - + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteTaxAuthorityRateProduct?taxAuthPartyId=${taxAuthPartyId}&taxAuthGeoId=${taxAuthGeoId}&taxAuthorityRateSeqId=${taxAuthorityRateSeqId}" @@ -250,7 +260,7 @@ </field> </form> <form name="AddTaxAuthorityRateProduct" type="single" target="createTaxAuthorityRateProduct" title="" default-map-name="taxAuthorityRateProduct" - header-row-style="header-row" default-table-style="basic-table"> + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createTaxAuthorityRateProduct"/> <field name="taxAuthPartyId"><hidden/></field> @@ -284,12 +294,12 @@ <field name="taxShipping"> <drop-down allow-empty="false" no-current-selected-key="Y"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> - + <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="FindTaxAuthorityParties" type="single" target="ListTaxAuthorityParties" title="" - header-row-style="header-row" default-table-style="basic-table"> + header-row-style="header-row" default-table-style="basic-table"> <field name="taxAuthPartyId"><hidden/></field> <field name="taxAuthGeoId"><hidden/></field> @@ -304,7 +314,7 @@ <field name="isNexus" widget-style="smallSelect"> <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> </field> - + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> <form name="ListTaxAuthorityParties" type="list" title="" list-name="listIt" @@ -316,13 +326,15 @@ <field-map field-name="entityName" value="PartyTaxAuthInfo"/> </service> </actions> - + <field name="taxAuthPartyId"><hidden/></field> <field name="taxAuthGeoId"><hidden/></field> <field name="partyId"> <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}"> - <sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" link-style="buttontext"/> + <sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext"> + <parameter param-name="partyId" from-field="partyId"/> + </sub-hyperlink> </display-entity> </field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> @@ -331,7 +343,7 @@ <field name="partyTaxId"><display/></field> <field name="isExempt"><display/></field> <field name="isNexus"><display/></field> - + <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="EditTaxAuthorityPartyInfo?taxAuthPartyId=${taxAuthPartyId}&taxAuthGeoId=${taxAuthGeoId}&partyId=${partyId}&fromDate=${fromDate}" description="${uiLabelMap.CommonEdit}" also-hidden="false"/> @@ -342,28 +354,30 @@ </field> </form> <form name="EditTaxAuthorityPartyInfo" type="single" target="updateTaxAuthorityPartyInfo" title="" default-map-name="partyTaxAuthInfo" - header-row-style="header-row" default-table-style="basic-table"> + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="partyTaxAuthInfo==null" target="createTaxAuthorityPartyInfo"/> - + <field name="taxAuthPartyId"><hidden/></field> <field name="taxAuthGeoId"><hidden/></field> - + <field use-when="partyTaxAuthInfo!=null" name="partyId" title="${uiLabelMap.PartyPartyId}"> <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}"> - <sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" link-style="buttontext"/> + <sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile" target-type="inter-app" link-style="buttontext"> + <parameter param-name="partyId" from-field="partyId"/> + </sub-hyperlink> </display-entity> </field> <field use-when="partyTaxAuthInfo!=null" name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> <field use-when="partyTaxAuthInfo==null" name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field> <field use-when="partyTaxAuthInfo==null" name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field> - + <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field> <field name="partyTaxId"><text/></field> <field name="isExempt" widget-style="smallSelect"><drop-down no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> <field name="isNexus" widget-style="smallSelect"><drop-down no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field> - + <field use-when="partyTaxAuthInfo!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field> <field use-when="partyTaxAuthInfo==null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml?rev=760069&r1=760068&r2=760069&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml Mon Mar 30 17:55:17 2009 @@ -18,9 +18,9 @@ under the License. --> -<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> - + <screen name="FindTaxAuthority"> <section> <actions> @@ -38,7 +38,7 @@ </container> <container style="screenlet-body"> <section> - <widgets> + <widgets> <container><link target="EditTaxAuthority" text="${uiLabelMap.AccountingNewTaxAuthority}" style="buttontext"/></container> <include-form name="FindTaxAuthority" location="component://accounting/widget/TaxAuthorityForms.xml"/> </widgets> @@ -57,7 +57,7 @@ <set field="titleProperty" value="PageTitleEditTaxAuthority"/> <set field="tabButtonItem" value="EditTaxAuthority"/> <set field="labelTitleProperty" value="PageTitleEditTaxAuthority"/> - + <set field="taxAuthPartyId" from-field="parameters.taxAuthPartyId"/> <set field="taxAuthGeoId" from-field="parameters.taxAuthGeoId"/> <entity-one entity-name="TaxAuthority" value-field="taxAuthority"/> @@ -73,18 +73,18 @@ </container> <container style="screenlet-body"> <section> - <widgets> + <widgets> <include-form name="EditTaxAuthority" location="component://accounting/widget/TaxAuthorityForms.xml"/> </widgets> </section> </container> - </container> + </container> </decorator-section> </decorator-screen> </widgets> </section> </screen> - + <screen name="EditTaxAuthorityCategories"> <section> <actions> @@ -113,7 +113,7 @@ <set field="titleProperty" value="PageTitleEditTaxAuthorityAssocs"/> <set field="tabButtonItem" value="EditTaxAuthorityAssocs"/> <set field="labelTitleProperty" value="PageTitleEditTaxAuthorityAssocs"/> - + <set field="taxAuthPartyId" from-field="parameters.taxAuthPartyId"/> <set field="taxAuthGeoId" from-field="parameters.taxAuthGeoId"/> </actions> @@ -135,7 +135,7 @@ <set field="titleProperty" value="PageTitleEditTaxAuthorityGlAccounts"/> <set field="tabButtonItem" value="EditTaxAuthorityGlAccounts"/> <set field="labelTitleProperty" value="PageTitleEditTaxAuthorityGlAccounts"/> - + <set field="taxAuthPartyId" from-field="parameters.taxAuthPartyId"/> <set field="taxAuthGeoId" from-field="parameters.taxAuthGeoId"/> </actions> @@ -157,7 +157,7 @@ <set field="titleProperty" value="PageTitleEditTaxAuthorityRateProducts"/> <set field="tabButtonItem" value="EditTaxAuthorityRateProducts"/> <set field="labelTitleProperty" value="PageTitleEditTaxAuthorityRateProducts"/> - + <set field="taxAuthPartyId" from-field="parameters.taxAuthPartyId"/> <set field="taxAuthGeoId" from-field="parameters.taxAuthGeoId"/> </actions> @@ -173,7 +173,7 @@ </widgets> </section> </screen> - + <screen name="ListTaxAuthorityParties"> <section> <actions> @@ -195,13 +195,13 @@ </container> <container style="screenlet-body"> <section> - <widgets> + <widgets> <container><link target="EditTaxAuthorityPartyInfo?taxAuthPartyId=${taxAuthPartyId}&taxAuthGeoId=${taxAuthGeoId}" text="${uiLabelMap.AccountingNewTaxAuthorityPartyInfo}" style="buttontext"/></container> - <include-form name="FindTaxAuthorityParties" location="component://accounting/widget/TaxAuthorityForms.xml"/> + <include-form name="FindTaxAuthorityParties" location="component://accounting/widget/TaxAuthorityForms.xml"/> </widgets> </section> </container> - </container> + </container> <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> @@ -210,12 +210,12 @@ </container> <container style="screenlet-body"> <section> - <widgets> - <include-form name="ListTaxAuthorityParties" location="component://accounting/widget/TaxAuthorityForms.xml"/> + <widgets> + <include-form name="ListTaxAuthorityParties" location="component://accounting/widget/TaxAuthorityForms.xml"/> </widgets> </section> </container> - </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -226,12 +226,12 @@ <actions> <set field="titleProperty" value="PageTitleEditTaxAuthorityPartyInfo"/> <set field="tabButtonItem" value="EditTaxAuthorityPartyInfo"/> - + <set field="taxAuthPartyId" from-field="parameters.taxAuthPartyId"/> <set field="taxAuthGeoId" from-field="parameters.taxAuthGeoId"/> <set field="partyId" from-field="parameters.partyId"/> <set field="fromDate" from-field="parameters.fromDate"/> - + <entity-one entity-name="PartyTaxAuthInfo" value-field="partyTaxAuthInfo"/> </actions> <widgets> @@ -245,7 +245,7 @@ </container> <container style="screenlet-body"> <section> - <widgets> + <widgets> <container><link target="EditTaxAuthorityPartyInfo?taxAuthPartyId=${taxAuthPartyId}&taxAuthGeoId=${taxAuthGeoId}" text="${uiLabelMap.AccountingNewTaxAuthorityPartyInfo}" style="buttontext"/></container> <include-form name="EditTaxAuthorityPartyInfo" location="component://accounting/widget/TaxAuthorityForms.xml"/> </widgets> @@ -257,4 +257,4 @@ </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |