Author: jleroux
Date: Sun Nov 1 12:23:59 2015 New Revision: 1711738 URL: http://svn.apache.org/viewvc?rev=1711738&view=rev Log: "Applied fix from trunk for revision: 1686002" ------------------------------------------------------------------------ r1686002 | jleroux | 2015-06-17 14:37:06 +0200 (mer. 17 juin 2015) | 6 lignes OFBIZ-6513 - countyGeoId and geoPointId fields are missing in PartyAndPostalAddress entity view Rather than adding both fields, I rather adds an allias-all. Then if ever we add new fields to PostalAddress they will not miss there. Being only an addition, this does not need any data migration explanations ------------------------------------------------------------------------ Modified: ofbiz/branches/release14.12/ (props changed) ofbiz/branches/release14.12/applications/party/entitydef/entitymodel.xml Propchange: ofbiz/branches/release14.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Nov 1 12:23:59 2015 @@ -8,4 +8,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207, 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,1706569,17065 77,1706591,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513 +/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207, 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686002,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,17065 69,1706577,1706591,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513 Modified: ofbiz/branches/release14.12/applications/party/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/party/entitydef/entitymodel.xml?rev=1711738&r1=1711737&r2=1711738&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/party/entitydef/entitymodel.xml (original) +++ ofbiz/branches/release14.12/applications/party/entitydef/entitymodel.xml Sun Nov 1 12:23:59 2015 @@ -1346,6 +1346,7 @@ under the License. <member-entity entity-alias="PCM" entity-name="PartyContactMech"/> <member-entity entity-alias="CM" entity-name="ContactMech"/> <member-entity entity-alias="PA" entity-name="PostalAddress"/> + <alias-all entity-alias="PA"/> <alias entity-alias="CM" name="contactMechId"/> <alias entity-alias="PTY" name="partyId"/> <alias entity-alias="PTY" name="statusId"/> @@ -1357,17 +1358,6 @@ under the License. <alias entity-alias="PCM" name="comments"/> <alias entity-alias="PCM" name="extension"/> <alias entity-alias="PCM" name="allowSolicitation"/> - <alias entity-alias="PA" name="toName"/> - <alias entity-alias="PA" name="attnName"/> - <alias entity-alias="PA" name="address1"/> - <alias entity-alias="PA" name="address2"/> - <alias entity-alias="PA" name="directions"/> - <alias entity-alias="PA" name="city"/> - <alias entity-alias="PA" name="postalCode"/> - <alias entity-alias="PA" name="postalCodeExt"/> - <alias entity-alias="PA" name="countryGeoId"/> - <alias entity-alias="PA" name="stateProvinceGeoId"/> - <alias entity-alias="PA" name="postalCodeGeoId"/> <view-link entity-alias="PTY" rel-entity-alias="PCM"> <key-map field-name="partyId"/> </view-link> |
Free forum by Nabble | Edit this page |