Author: pranayp
Date: Sat Sep 17 09:57:54 2016
New Revision: 1761171
URL: http://svn.apache.org/viewvc?rev=1761171&view=rev
Log:
Applied fix from trunk for revision: 1761170
===
Fix for: Pagination error in Accounting FixedAssetForms.
(OFBIZ-8263)
Added paginate target to these forms for fixing the issue.
Thanks: Chandan Khandelwal for reporting and providing the patch.
Modified:
ofbiz/branches/release15.12/ (props changed)
ofbiz/branches/release15.12/applications/accounting/widget/FixedAssetForms.xml
Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 09:57:54 2016
@@ -9,4 +9,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,
1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747402,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,1748223,1748260,1748357,1748394,1748401,1748543,1748559,1748628,1748689,1748693,1748703,1748837,1748854,1748907,1748925,1748929,1748944,1748972,1749026,1749083,1749092,1749111,1749220,1749282,1749519,1749525,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750555,1750624,1750651,1750922,1750925,1750940,1750959,1750964,1751030,1751042,1751357,1751362,1751423,1752928,1752933,1752941,1752947,1752954,1752956,1752966,1753834,1757963,1757968,1757992,1758017,1758089,1758143,1758280,1759002,1759005,1759014,1759024,1759678,1759941,1761127
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,
1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747402,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,1748223,1748260,1748357,1748394,1748401,1748543,1748559,1748628,1748689,1748693,1748703,1748837,1748854,1748907,1748925,1748929,1748944,1748972,1749026,1749083,1749092,1749111,1749220,1749282,1749519,1749525,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750555,1750624,1750651,1750922,1750925,1750940,1750959,1750964,1751030,1751042,1751357,1751362,1751423,1752928,1752933,1752941,1752947,1752954,1752956,1752966,1753834,1757963,1757968,1757992,1758017,1758089,1758143,1758280,1759002,1759005,1759014,1759024,1759678,1759941,1761127,1761170
Modified:
ofbiz/branches/release15.12/applications/accounting/widget/FixedAssetForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/widget/FixedAssetForms.xml?rev=1761171&r1=1761170&r2=1761171&view=diff
==============================================================================
---
ofbiz/branches/release15.12/applications/accounting/widget/FixedAssetForms.xml
(original)
+++
ofbiz/branches/release15.12/applications/accounting/widget/FixedAssetForms.xml
Sat Sep 17 09:57:54 2016
@@ -125,7 +125,7 @@ under the License.
</form>
<form name="ListFixedAssetProducts" type="list"
list-name="fixedAssetProducts" target="updateFixedAssetProduct"
- odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar"
paginate-target="ListFixedAssetProducts">
<field name="productId"
title="${uiLabelMap.AccountingProduct}"><display-entity entity-name="Product"
description="${description}[${productId}]"/></field>
<field name="fixedAssetProductTypeId"
title="${uiLabelMap.AccountingFixedAssetProductType}"><display-entity
entity-name="FixedAssetProductType"/></field>
<field name="fromDate"
title="${uiLabelMap.CommonFromDate}"><display/></field>
@@ -241,7 +241,7 @@ under the License.
<!-- List all fixed asset idents -->
<form name="ListFixedAssetIdents" type="list" list-name="fixedAssetIdents"
target="updateFixedAssetIdent"
- odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar"
paginate-target="EditFixedAssetIdents">
<actions>
<entity-condition entity-name="FixedAssetIdent">
<condition-expr field-name="fixedAssetId"
from-field="fixedAssetId"/>
@@ -280,7 +280,7 @@ under the License.
<!-- List all fixed asset Registration -->
<form name="ListFixedAssetRegistrations" type="list"
list-name="fixedAssetRegistrations" target="updateFixedAssetRegistration"
- odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar"
paginate-target="EditFixedAssetRegistrations">
<actions>
<entity-condition entity-name="FixedAssetRegistration">
<condition-expr field-name="fixedAssetId"
from-field="fixedAssetId"/>
@@ -469,7 +469,7 @@ under the License.
</form>
<!-- List all fixed asset Maintenance Order -->
<form name="ListFixedAssetMaintOrders" type="list"
list-name="fixedAssetMaintOrders" target="updateFixedAssetMaintOrder"
- odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar"
paginate-target="EditFixedAssetMaintOrders">
<actions>
<entity-condition entity-name="FixedAssetMaintOrder"
list="fixedAssetMaintOrders">
<condition-list combine="and">
@@ -508,7 +508,7 @@ under the License.
<!-- =====================Party Fixed Asset Assignment Forms==============
-->
<form name="ListPartyFixedAssetAssignments" type="list"
list-name="listPartyFixedAssets" target="updatePartyFixedAssetAssignment"
- odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar"
paginate-target="EditPartyFixedAssetAssignments">
<actions>
<entity-condition entity-name="PartyFixedAssetAssignment"
list="listPartyFixedAssets">
<condition-expr field-name="fixedAssetId"
from-field="fixedAssetId"/>
@@ -589,7 +589,7 @@ under the License.
<field name="submitButton" title="${uiLabelMap.CommonAdd}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListFixedAssetDepMethods" type="list"
list-name="fixedAssetDepMethods"
- odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar"
paginate-target="showFixedAssetDepreciation">
<actions>
<entity-condition entity-name="FixedAssetDepMethod"
list="fixedAssetDepMethods">
<condition-expr field-name="fixedAssetId"
from-field="parameters.fixedAssetId"/>
@@ -609,7 +609,7 @@ under the License.
</field>
</form>
<form name="ListFixedAssetDepreciations" type="list"
list-name="assetDepreciationInfoList" default-map-name="assetDepreciationInfo"
- odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar"
paginate-target="showFixedAssetDepreciation">
<field name="index"><display description="${itemIndex + 1}"/></field>
<field name="year"><display/></field>
<field name="depreciation"><display type="currency"
currency="${fixedAsset.purchaseCostUomId}"/></field>
@@ -617,7 +617,7 @@ under the License.
<field name="nbv" title="Net Book Value"><display type="currency"
currency="${fixedAsset.purchaseCostUomId}"/></field>
</form>
<form name="FixedAssetTransactions" type="list"
- odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar" list-name="fixedAssetTransactions">
+ odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar" list-name="fixedAssetTransactions"
paginate-target="showFixedAssetDepreciation">
<actions>
<entity-condition entity-name="AcctgTransAndEntries"
list="fixedAssetTransactions">
<condition-expr field-name="fixedAssetId"
from-field="fixedAssetId"/>
@@ -703,7 +703,7 @@ under the License.
<field name="submitButton" title="${uiLabelMap.CommonAdd}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="GlobalFixedAssetTypeGlAccounts" type="list"
list-name="globalFixedAssetTypeGlAccounts"
- odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar"
paginate-target="showFixedAssetDepreciation">
<actions>
<entity-condition entity-name="FixedAssetTypeGlAccount"
list="globalFixedAssetTypeGlAccounts">
<condition-list combine="and">
@@ -723,7 +723,7 @@ under the License.
<field name="lossGlAccountId"><display-entity entity-name="GlAccount"
key-field-name="glAccountId" description="${accountCode} - ${accountName}
[${glAccountId}]"/></field>
</form>
<form name="FixedAssetTypeGlAccounts" type="list"
list-name="fixedAssetTypeGlAccounts"
- odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
+ odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar"
paginate-target="showFixedAssetDepreciation">
<actions>
<entity-condition entity-name="FixedAssetTypeGlAccount"
list="fixedAssetTypeGlAccounts">
<condition-expr field-name="fixedAssetId"
from-field="fixedAssetId"/>
