svn commit: r1709235 - in /ofbiz/branches: release12.04/ release12.04/applications/huma
Locked
svn commit: r1709235 - in /ofbiz/branches: release12.04/ release12.04/applications/huma
 
|
Author: jleroux
Date: Sun Oct 18 05:09:57 2015 New Revision: 1709235 URL: http://svn.apache.org/viewvc?rev=1709235&view=rev Log: Reverts all not trunk changes done for "SalaryStep entity missing From and Thru dates" at https://issues.apache.org/jira/browse/OFBIZ-5758 (ie reverts in R12/13/14) Modified: ofbiz/branches/release12.04/ (props changed) ofbiz/branches/release12.04/applications/humanres/entitydef/entitymodel.xml ofbiz/branches/release12.04/applications/humanres/servicedef/services.xml ofbiz/branches/release12.04/applications/humanres/widget/LookupScreens.xml ofbiz/branches/release12.04/applications/humanres/widget/forms/LookupForms.xml ofbiz/branches/release12.04/applications/humanres/widget/forms/PayGradeForms.xml ofbiz/branches/release13.07/ (props changed) ofbiz/branches/release13.07/applications/humanres/entitydef/entitymodel.xml ofbiz/branches/release13.07/applications/humanres/servicedef/services.xml ofbiz/branches/release13.07/applications/humanres/widget/LookupScreens.xml ofbiz/branches/release13.07/applications/humanres/widget/forms/LookupForms.xml ofbiz/branches/release13.07/applications/humanres/widget/forms/PayGradeForms.xml ofbiz/branches/release14.12/ (props changed) ofbiz/branches/release14.12/applications/humanres/entitydef/entitymodel.xml ofbiz/branches/release14.12/applications/humanres/servicedef/services.xml ofbiz/branches/release14.12/applications/humanres/widget/LookupScreens.xml ofbiz/branches/release14.12/applications/humanres/widget/forms/LookupForms.xml ofbiz/branches/release14.12/applications/humanres/widget/forms/PayGradeForms.xml Propchange: ofbiz/branches/release12.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 18 05:09:57 2015 @@ -4,4 +4,4 @@ /ofbiz/branches/jquery:952958-1044489 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1668198,1668272,1668283 -/ofbiz/trunk:1332097,1333439,1333885,1334201,1334336,1334483,1335047,1335343,1335347,1335351,1335946,1336921,1337046,1337057-1337059,1337202,1337502,1337524,1337644,1337789,1337800,1338065,1338101,1338224,1338570,1338591,1338700,1338831,1338845,1338974,1339081,1339122,1340273,1340352,1340357,1340400,1340405,1340415,1340657,1340661,1340774,1340821,1340826,1340943,1341314,1341399,1342852,1342875,1342893,1342980,1343088,1345473,1345484,1345532,1345547,1345553,1347559,1347762,1351778,1351999,1353135,1353681,1355660,1355801,1355859,1355975,1358735,1359500,1359599-1359600,1360689,1361056,1361073,1361476,1361662,1361931,1361944,1361958,1364046,1364052,1364216,1364218,1366660,1366960,1369555,1369561,1377253,1377382,1377386,1377388,1379334,1379340,1379345,1381146,1384251,1384894,1387878,1387884,1388832,1389802,1392773,1393948,1394995,1395104,1395460,1395953,1396105,1399539,1399761,1400388,1400393,1400421,1402766,1403370,1406727,1407634,1408408,1413307,1421662,1422207,1423117,1425155,1425662, 1426231,1426734,1426787,1430332,1430336,1431191,1432392,1432833,1435528,1435701,1438498,1444356,1446575,1446876,1447107,1451183,1451879,1452382,1458429,1459220,1459222,1460116,1460276,1461551,1462948,1463989,1465351,1470151,1470483,1471283-1471284,1471687,1471739,1476296,1480407,1481287,1484279,1485432,1487130,1487854,1488000,1488127,1488188,1489461,1492112,1492673,1493352,1493393,1493658,1493683,1494202,1494682,1497376,1497822,1497839,1499732,1500760,1500772,1502121,1502944,1502946,1504864,1506269,1506499,1506504,1506828,1509164,1510042,1512376,1512573,1517629,1517702,1517780,1517947,1518336,1518950,1519245,1524361,1524676,1524704,1524769,1524950,1525523,1526387,1526463,1527254,1528144,1528146,1528149,1528298,1529412,1529418,1531848,1532342,1532366,1535961,1536656,1537023,1537179,1537996,1538096,1539147,1539156,1543744,1543766,1543781,1544444,1547548,1548143,1550255,1550515,1551744,1552290,1552500,1552901,1552908,1554290,1554536,1554681,1554685,1554706,1554764,1554787,1555142,15574 09-1557410,1557440,1557447,1557457,1557462,1557593,1558373,1559814,1560048,1560056,1560176,1560203,1560205,1560699,1561286,1561290,1561305,1561311,1561327,1561467,1562767,1563238,1563683,1563958,1564111,1564113,1564463,1564473,1564493,1566096,1566273,1569078,1569743,1571219,1573161,1573498,1573639,1574019,1575508,1576259,1576331,1576378,1576506,1576511,1576757,1576839,1577268,1579155,1579161,1579309,1580455,1581386,1581997,1582762,1583040,1583427-1583428,1583551,1583674,1583681,1583689,1583696,1584873,1585033,1585574,1585958-1585959,1586987,1587841,1587843,1588733,1589602,1589606,1589612,1589625,1589669,1592530,1592588,1592745,1592977,1593902,1593908,1593952,1597464,1598544,1598913,1603732,1603739,1604357,1604363,1604522,1604554,1605348,1605354,1605707,1607457,1608355,1608491,1608495,1608698,1609047,1609065,1609076,1609087,1609167,1609184,1609389,1609394,1609406,1609418,1609885,1610355,1610385,1610425,1610685,1610918,1610925,1611321,1612190,1612205,1613121,1614019,1614025,1614355,16 14366,1614556,1615296-1615297,1616684,1616940,1617229,1618354,1618411,1618570,1619098,1622050,1622672,1623370,1627230,1627776,1628096,1629391,1631203,1632733,1632745,1632764,1632797,1632801,1632803,1633100,1636493,1639835,1639840-1639841,1639846,1639863,1639867,1639873,1639884,1639887,1639892,1640288,1640515,1640717,1641066,1641131,1641165,1641548,1641804,1642409,1642423,1643341,1644904,1646204,1646977,1646984,1647266,1647338,1647559,1648668,1649393,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652604,1652611,1652617,1652627,1652725,1652731,1652739,1653456,1654175,1654273,1655795,1656983,1660444,1661287,1661358,1661612,1661778,1661853,1661864,1661873,1661940,1661951,1661977,1662361,1662500,1663912,1666633,1666836,1667253,1668214,1668246,1668258,1668265,1668314,1669317,1670952,1673764,1674447,1674491,1674496,1674908,1678294,1678882,1679689,1679697,1680155,1680840,1682415,1683998,1686545,1686566,1686583,1686651,1690086,1690581,1692458,1692600,1692604,1693579,1696018 ,1696234,1697993,1701441,1701936,1702704,1703586,1703981,1703988,1704043,1704052,1704082,1704140,1704230,1705004,1706316,1706561,1706591,1707837,1708742,1709192,1709214,1709231 +/ofbiz/trunk:1332097,1333439,1333885,1334201,1334336,1334483,1335047,1335343,1335347,1335351,1335946,1336921,1337046,1337057-1337059,1337202,1337502,1337524,1337644,1337789,1337800,1338065,1338101,1338224,1338570,1338591,1338700,1338831,1338845,1338974,1339081,1339122,1340273,1340352,1340357,1340400,1340405,1340415,1340657,1340661,1340774,1340821,1340826,1340943,1341314,1341399,1342852,1342875,1342893,1342980,1343088,1345473,1345484,1345532,1345547,1345553,1347559,1347762,1351778,1351999,1353135,1353681,1355660,1355801,1355859,1355975,1358735,1359500,1359599-1359600,1360689,1361056,1361073,1361476,1361662,1361931,1361944,1361958,1364046,1364052,1364216,1364218,1366660,1366960,1369555,1369561,1377253,1377382,1377386,1377388,1379334,1379340,1379345,1381146,1384251,1384894,1387878,1387884,1388832,1389802,1392773,1393948,1394995,1395104,1395460,1395953,1396105,1399539,1399761,1400388,1400393,1400421,1402766,1403370,1406727,1407634,1408408,1413307,1421662,1422207,1423117,1425155,1425662, 1426231,1426734,1426787,1430332,1430336,1431191,1432392,1432833,1435528,1435701,1438498,1444356,1446575,1446876,1447107,1451183,1451879,1452382,1458429,1459220,1459222,1460116,1460276,1461551,1462948,1463989,1465351,1470151,1470483,1471283-1471284,1471687,1471739,1476296,1480407,1481287,1484279,1485432,1487130,1487854,1488000,1488127,1488188,1489461,1492112,1492673,1493352,1493393,1493658,1493683,1494202,1494682,1497376,1497822,1497839,1499732,1500760,1500772,1502121,1502944,1502946,1504864,1506269,1506499,1506504,1506828,1509164,1510042,1512376,1512573,1517629,1517702,1517780,1517947,1518336,1518950,1519245,1524361,1524676,1524704,1524769,1524950,1525523,1526387,1526463,1527254,1528144,1528146,1528149,1528298,1529412,1529418,1531848,1532342,1532366,1535961,1536656,1537023,1537179,1537996,1538096,1539147,1539156,1543744,1543766,1543781,1544444,1547548,1548143,1550255,1550515,1551744,1552290,1552500,1552901,1552908,1554290,1554536,1554681,1554685,1554706,1554764,1554787,1555142,15574 09-1557410,1557440,1557447,1557457,1557462,1557593,1558373,1559814,1560048,1560056,1560176,1560203,1560205,1560699,1561286,1561290,1561305,1561311,1561327,1561467,1562767,1563238,1563683,1563958,1564111,1564113,1564463,1564473,1564493,1566096,1566273,1569078,1569743,1571219,1573161,1573498,1573639,1574019,1575508,1576259,1576331,1576378,1576506,1576511,1576757,1576839,1577268,1579155,1579161,1579309,1580455,1581386,1581997,1582762,1583040,1583427-1583428,1583551,1583674,1583681,1583689,1583696,1584873,1585033,1585574,1585958-1585959,1586987,1587841,1587843,1588733,1589602,1589606,1589612,1589625,1589669,1592530,1592588,1592745,1592977,1593902,1593908,1593952,1597464,1598544,1598913,1603732,1603739,1604357,1604363,1604522,1604554,1605348,1605354,1605707,1607457,1608355,1608491,1608495,1608698,1609047,1609065,1609076,1609087,1609167,1609184,1609389,1609394,1609406,1609418,1609885,1610355,1610385,1610425,1610685,1610918,1610925,1611321,1612190,1612205,1613121,1614019,1614025,1614355,16 14366,1614556,1615296-1615297,1616684,1616940,1617229,1618354,1618411,1618570,1619098,1622050,1622672,1623370,1627230,1627776,1628096,1629391,1631203,1632733,1632745,1632764,1632797,1632801,1632803,1633100,1636493,1639835,1639840-1639841,1639846,1639863,1639867,1639873,1639884,1639887,1639892,1640288,1640515,1640717,1641066,1641131,1641165,1641548,1641804,1642409,1642423,1643341,1644904,1646204,1646977,1646984,1647266,1647338,1647559,1648668,1649393,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652604,1652611,1652617,1652627,1652725,1652731,1652739,1653456,1654175,1654273,1655795,1656983,1660444,1661287,1661358,1661612,1661778,1661853,1661864,1661873,1661940,1661951,1661977,1662361,1662500,1663912,1666633,1666836,1667253,1668214,1668246,1668258,1668265,1668314,1669317,1670952,1673764,1674447,1674491,1674496,1674908,1678294,1678882,1679689,1679697,1680155,1680840,1682415,1683998,1686545,1686566,1686583,1686651,1690086,1690581,1692458,1692600,1692604,1693579,1696018 ,1696234,1697993,1701441,1701936,1702704,1703586,1703981,1703988,1704043,1704052,1704082,1704140,1704230,1705004,1706316,1706561,1706591,1707837,1708742 Modified: ofbiz/branches/release12.04/applications/humanres/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/humanres/entitydef/entitymodel.xml?rev=1709235&r1=1709234&r2=1709235&view=diff ============================================================================== --- ofbiz/branches/release12.04/applications/humanres/entitydef/entitymodel.xml (original) +++ ofbiz/branches/release12.04/applications/humanres/entitydef/entitymodel.xml Sun Oct 18 05:09:57 2015 @@ -551,7 +551,6 @@ under the License. <relation type="one-nofk" fk-name="PAY_HIST_SSTP" rel-entity-name="SalaryStep"> <key-map field-name="salaryStepSeqId"/> <key-map field-name="payGradeId"/> - <key-map field-name="fromDate"/> </relation> <relation type="one" fk-name="PAY_HIST_PDTP" rel-entity-name="PeriodType"> <key-map field-name="periodTypeId"/> @@ -598,15 +597,10 @@ under the License. title="Salary Step Entity"> <field name="salaryStepSeqId" type="id-ne"></field> <field name="payGradeId" type="id-ne"></field> - <field name="fromDate" type="date-time"></field> - <field name="thruDate" type="date-time"></field> <field name="dateModified" type="date-time"></field> <field name="amount" type="currency-amount"></field> - <field name="createdByUserLogin" type="id-vlong"></field> - <field name="lastModifiedByUserLogin" type="id-vlong"></field> <prim-key field="salaryStepSeqId"/> <prim-key field="payGradeId"/> - <prim-key field="fromDate"/> <relation type="one" fk-name="SLRY_STP_PGRD" rel-entity-name="PayGrade"> <key-map field-name="payGradeId"/> </relation> @@ -841,7 +835,6 @@ under the License. <relation type="one-nofk" fk-name="EMPL_PTPRT_SSTP" rel-entity-name="SalaryStep"> <key-map field-name="salaryStepSeqId"/> <key-map field-name="payGradeId"/> - <key-map field-name="fromDate"/> </relation> <relation type="one-nofk" fk-name="EMPL_PTPRT_RTTYP" rel-entity-name="RateType"> <key-map field-name="rateTypeId"/> Modified: ofbiz/branches/release12.04/applications/humanres/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/humanres/servicedef/services.xml?rev=1709235&r1=1709234&r2=1709235&view=diff ============================================================================== --- ofbiz/branches/release12.04/applications/humanres/servicedef/services.xml (original) +++ ofbiz/branches/release12.04/applications/humanres/servicedef/services.xml Sun Oct 18 05:09:57 2015 @@ -316,13 +316,13 @@ under the License. <auto-attributes mode="IN" include="pk" optional="false"/> </service> - <service name="createSalaryStep" engine="entity-auto" default-entity-name="SalaryStep" invoke="create" auth="true"> + <service name="createSalaryStep" engine="simple" default-entity-name="SalaryStep" + location="component://humanres/script/org/ofbiz/humanres/HumanResServices.xml" invoke="createSalaryStep" auth="true"> <description>Create Salary Step</description> <permission-service service-name="humanResManagerPermission" main-action="CREATE"/> + <auto-attributes mode="IN" include="pk" optional="false"/> <auto-attributes mode="IN" include="nonpk" optional="true"/> - <attribute name="payGradeId" mode="IN" type="String"/> - <attribute name="fromDate" mode="IN" type="Timestamp"/> - <attribute name="salaryStepSeqId" mode="OUT" type="String"/> + <override type="String" mode="IN" name="salaryStepSeqId" optional="true"/> </service> <service name="updateSalaryStep" engine="simple" default-entity-name="SalaryStep" Modified: ofbiz/branches/release12.04/applications/humanres/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/humanres/widget/LookupScreens.xml?rev=1709235&r1=1709234&r2=1709235&view=diff ============================================================================== --- ofbiz/branches/release12.04/applications/humanres/widget/LookupScreens.xml (original) +++ ofbiz/branches/release12.04/applications/humanres/widget/LookupScreens.xml Sun Oct 18 05:09:57 2015 @@ -102,7 +102,6 @@ <section> <actions> <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="title" value="${uiLabelMap.HumanResLookupSalaryStepSeqId}"/> </actions> <widgets> Modified: ofbiz/branches/release12.04/applications/humanres/widget/forms/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/humanres/widget/forms/LookupForms.xml?rev=1709235&r1=1709234&r2=1709235&view=diff ============================================================================== --- ofbiz/branches/release12.04/applications/humanres/widget/forms/LookupForms.xml (original) +++ ofbiz/branches/release12.04/applications/humanres/widget/forms/LookupForms.xml Sun Oct 18 05:09:57 2015 @@ -142,7 +142,6 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="SalaryStep" default-field-type="hidden"/> <field name="salaryStepSeqId" title="${uiLabelMap.HumanResLookupSalaryStepSeqId}"><text-find/></field> - <field name="fromDate" title="${uiLabelMap.CommonFrom}"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -159,9 +158,7 @@ under the License. <field name="salaryStepSeqId" title="${uiLabelMap.HumanResLookupSalaryStepSeqId}" widget-style="buttontext"> <hyperlink also-hidden="false" target-type="plain" description="${salaryStepSeqId}" target="javascript:set_value('${salaryStepSeqId}')"/> </field> - <field name="fromDate" title="${uiLabelMap.CommonFrom}"><display/></field> - <field name="thruDate" title="${uiLabelMap.CommonThru}"><display/></field> - <field name="amount" title="${uiLabelMap.AccountingAmount}"><display/></field> + <field name="description"><display/></field> </form> <form name="LookupPayGrade" type="single" target="LookupPayGrade" header-row-style="header-row" default-table-style="basic-table"> Modified: ofbiz/branches/release12.04/applications/humanres/widget/forms/PayGradeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/humanres/widget/forms/PayGradeForms.xml?rev=1709235&r1=1709234&r2=1709235&view=diff ============================================================================== --- ofbiz/branches/release12.04/applications/humanres/widget/forms/PayGradeForms.xml (original) +++ ofbiz/branches/release12.04/applications/humanres/widget/forms/PayGradeForms.xml Sun Oct 18 05:09:57 2015 @@ -74,7 +74,6 @@ <hyperlink target="deleteSalaryStep" description="${uiLabelMap.CommonDelete}"> <parameter param-name="salaryStepSeqId"/> <parameter param-name="payGradeId"/> - <parameter param-name="fromDate"/> </hyperlink> </field> </form> Propchange: ofbiz/branches/release13.07/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 18 05:09:57 2015 @@ -5,4 +5,4 @@ /ofbiz/branches/jquery:952958-1044489 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release12.04:1557118 -/ofbiz/trunk:1506269,1506499,1506504,1506828,1509164,1510042,1511279,1512376,1512573,1516094,1517629,1517702,1517780,1517947,1518336,1518950,1519245,1519999,1520319,1520321,1520326,1524361,1524676,1524704,1524769,1524835,1524950,1525523,1526276,1526387,1526463,1527212,1527254,1527609,1527626,1527810,1528144,1528146,1528149,1528298,1529412,1529418,1529588,1530273,1530634,1530876,1530972,1530976,1531848,1532342,1532366,1533542,1533839,1535961,1536170,1536656,1537023,1537086,1537179,1537996,1538096,1539147,1539156,1539781,1542264,1542388,1542442,1543744,1543766,1543781,1543994,1544444,1547548,1548143,1549015,1550255,1550258,1550515,1551585,1551744,1552149,1552290,1552500,1552901,1552908,1554064,1554242,1554265,1554290,1554373,1554536,1554681,1554685,1554706,1554764,1554787,1555142,1557409-1557410,1557427,1557440,1557443,1557447,1557456-1557457,1557462,1557593,1558145,1558241,1558373,1558774,1559814,1560048,1560056,1560176,1560203,1560205,1560699,1561286,1561290,1561305,1561311,1561327, 1561467,1562767,1563238,1563683,1563958,1564111,1564113,1564463,1564473,1564493,1566096,1566273,1569078,1569743,1570611,1570622,1570639-1570640,1571207,1571219,1571247,1573161,1573498,1573639,1574019,1574201,1574404,1575508,1576259,1576331,1576378,1576506,1576511,1576757,1576839,1577268,1577744,1579155,1579161,1579277,1579309,1580455,1580850,1581386,1581972,1581997,1582762,1583040,1583427-1583428,1583551,1583674,1583681,1583689,1583696,1584873,1585033,1585574,1585958-1585959,1586987,1587841,1587843,1588733,1589589,1589602,1589606,1589612,1589625,1589669,1592530,1592588,1592745,1592977,1593902,1593908,1593952,1597239,1597464,1598113,1598327,1598475,1598544,1598913,1603439,1603732,1603739,1604357,1604363,1604522,1604554,1605029,1605269,1605348,1605354,1605707,1607457,1608355,1608495,1608526,1608698,1609047,1609065,1609076,1609087,1609149,1609155,1609167,1609184,1609389,1609394,1609398,1609406,1609418,1609885,1609889,1610355,1610420,1610425,1610685,1610918,1610925,1611321,1612190,16122 02,1613121,1614019,1614025,1614280,1614355,1614366,1614556,1615296-1615297,1616272,1616684,1616940,1617229,1617473,1617480,1617936,1617938,1618395,1618397,1618570,1618831,1619087,1619098,1619300,1621335,1621363,1621413,1621436,1621438-1621439,1621442,1621599,1621683,1622050,1622170,1622672,1623370,1624538,1624767,1624809,1624817,1626797,1627230,1627763,1628096,1628130,1628937,1628940,1629382,1629391,1629426,1631203,1631299-1631300,1632764,1632793,1633100,1633188,1633550,1636864,1637883,1639606,1639835,1639840-1639841,1639846,1639863,1639887,1640288,1640299,1640515,1640717,1641066,1641131,1641165,1641548,1641804,1642423,1643341,1644904,1645950,1646204,1646935,1646977,1646984,1647266,1647338,1647559,1647606,1648668,1649239,1649393,1650240,1650583,1650642,1650678,1650882,1650938,1651593,1652361,1652725,1652731,1652739,1653456,1654175,1654273,1655046,1655795,1656983,1660389,1660444,1661358,1661612,1661778,1661853,1661873,1661940,1661951,1661977,1662361,1662500,1663912,1663979,1664602,16 64604,1666633,1666836,1666939,1666949,1667055,1667253,1668214,1668246,1668258,1668265,1668314,1669317,1670952,1672862,1672873,1673764,1674447,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1680155,1680304,1680672,1680733,1680840,1680873,1680881,1682272,1682415,1683998,1686566,1686569,1686574,1686583,1686635,1686651,1687427,1690086,1692458,1693579,1696018,1696234,1697993,1701164,1702704,1703121,1703586,1703965,1703977,1703981,1704000,1704018,1704043,1704052,1704082,1704140,1704230,1705004,1706316,1706561,1706591,1706694,1707837,1708341,1708742,1709192,1709214,1709231 +/ofbiz/trunk:1506269,1506499,1506504,1506828,1509164,1510042,1511279,1512376,1512573,1516094,1517629,1517702,1517780,1517947,1518336,1518950,1519245,1519999,1520319,1520321,1520326,1524361,1524676,1524704,1524769,1524835,1524950,1525523,1526276,1526387,1526463,1527212,1527254,1527609,1527626,1527810,1528144,1528146,1528149,1528298,1529412,1529418,1529588,1530273,1530634,1530876,1530972,1530976,1531848,1532342,1532366,1533542,1533839,1535961,1536170,1536656,1537023,1537086,1537179,1537996,1538096,1539147,1539156,1539781,1542264,1542388,1542442,1543744,1543766,1543781,1543994,1544444,1547548,1548143,1549015,1550255,1550258,1550515,1551585,1551744,1552149,1552290,1552500,1552901,1552908,1554064,1554242,1554265,1554290,1554373,1554536,1554681,1554685,1554706,1554764,1554787,1555142,1557409-1557410,1557427,1557440,1557443,1557447,1557456-1557457,1557462,1557593,1558145,1558241,1558373,1558774,1559814,1560048,1560056,1560176,1560203,1560205,1560699,1561286,1561290,1561305,1561311,1561327, 1561467,1562767,1563238,1563683,1563958,1564111,1564113,1564463,1564473,1564493,1566096,1566273,1569078,1569743,1570611,1570622,1570639-1570640,1571207,1571219,1571247,1573161,1573498,1573639,1574019,1574201,1574404,1575508,1576259,1576331,1576378,1576506,1576511,1576757,1576839,1577268,1577744,1579155,1579161,1579277,1579309,1580455,1580850,1581386,1581972,1581997,1582762,1583040,1583427-1583428,1583551,1583674,1583681,1583689,1583696,1584873,1585033,1585574,1585958-1585959,1586987,1587841,1587843,1588733,1589589,1589602,1589606,1589612,1589625,1589669,1592530,1592588,1592745,1592977,1593902,1593908,1593952,1597239,1597464,1598113,1598327,1598475,1598544,1598913,1603439,1603732,1603739,1604357,1604363,1604522,1604554,1605029,1605269,1605348,1605354,1605707,1607457,1608355,1608495,1608526,1608698,1609047,1609065,1609076,1609087,1609149,1609155,1609167,1609184,1609389,1609394,1609398,1609406,1609418,1609885,1609889,1610355,1610420,1610425,1610685,1610918,1610925,1611321,1612190,16122 02,1613121,1614019,1614025,1614280,1614355,1614366,1614556,1615296-1615297,1616272,1616684,1616940,1617229,1617473,1617480,1617936,1617938,1618395,1618397,1618570,1618831,1619087,1619098,1619300,1621335,1621363,1621413,1621436,1621438-1621439,1621442,1621599,1621683,1622050,1622170,1622672,1623370,1624538,1624767,1624809,1624817,1626797,1627230,1627763,1628096,1628130,1628937,1628940,1629382,1629391,1629426,1631203,1631299-1631300,1632764,1632793,1633100,1633188,1633550,1636864,1637883,1639606,1639835,1639840-1639841,1639846,1639863,1639887,1640288,1640299,1640515,1640717,1641066,1641131,1641165,1641548,1641804,1642423,1643341,1644904,1645950,1646204,1646935,1646977,1646984,1647266,1647338,1647559,1647606,1648668,1649239,1649393,1650240,1650583,1650642,1650678,1650882,1650938,1651593,1652361,1652725,1652731,1652739,1653456,1654175,1654273,1655046,1655795,1656983,1660389,1660444,1661358,1661612,1661778,1661853,1661873,1661940,1661951,1661977,1662361,1662500,1663912,1663979,1664602,16 64604,1666633,1666836,1666939,1666949,1667055,1667253,1668214,1668246,1668258,1668265,1668314,1669317,1670952,1672862,1672873,1673764,1674447,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1680155,1680304,1680672,1680733,1680840,1680873,1680881,1682272,1682415,1683998,1686566,1686569,1686574,1686583,1686635,1686651,1687427,1690086,1692458,1693579,1696018,1696234,1697993,1701164,1702704,1703121,1703586,1703965,1703977,1703981,1704000,1704018,1704043,1704052,1704082,1704140,1704230,1705004,1706316,1706561,1706591,1706694,1707837,1708341,1708742 Modified: ofbiz/branches/release13.07/applications/humanres/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/humanres/entitydef/entitymodel.xml?rev=1709235&r1=1709234&r2=1709235&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/humanres/entitydef/entitymodel.xml (original) +++ ofbiz/branches/release13.07/applications/humanres/entitydef/entitymodel.xml Sun Oct 18 05:09:57 2015 @@ -551,7 +551,6 @@ under the License. <relation type="one-nofk" fk-name="PAY_HIST_SSTP" rel-entity-name="SalaryStep"> <key-map field-name="salaryStepSeqId"/> <key-map field-name="payGradeId"/> - <key-map field-name="fromDate"/> </relation> <relation type="one" fk-name="PAY_HIST_PDTP" rel-entity-name="PeriodType"> <key-map field-name="periodTypeId"/> @@ -598,15 +597,10 @@ under the License. title="Salary Step Entity"> <field name="salaryStepSeqId" type="id-ne"></field> <field name="payGradeId" type="id-ne"></field> - <field name="fromDate" type="date-time"></field> - <field name="thruDate" type="date-time"></field> <field name="dateModified" type="date-time"></field> <field name="amount" type="currency-amount"></field> - <field name="createdByUserLogin" type="id-vlong"></field> - <field name="lastModifiedByUserLogin" type="id-vlong"></field> <prim-key field="salaryStepSeqId"/> <prim-key field="payGradeId"/> - <prim-key field="fromDate"/> <relation type="one" fk-name="SLRY_STP_PGRD" rel-entity-name="PayGrade"> <key-map field-name="payGradeId"/> </relation> @@ -841,7 +835,6 @@ under the License. <relation type="one-nofk" fk-name="EMPL_PTPRT_SSTP" rel-entity-name="SalaryStep"> <key-map field-name="salaryStepSeqId"/> <key-map field-name="payGradeId"/> - <key-map field-name="fromDate"/> </relation> <relation type="one-nofk" fk-name="EMPL_PTPRT_RTTYP" rel-entity-name="RateType"> <key-map field-name="rateTypeId"/> Modified: ofbiz/branches/release13.07/applications/humanres/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/humanres/servicedef/services.xml?rev=1709235&r1=1709234&r2=1709235&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/humanres/servicedef/services.xml (original) +++ ofbiz/branches/release13.07/applications/humanres/servicedef/services.xml Sun Oct 18 05:09:57 2015 @@ -316,13 +316,13 @@ under the License. <auto-attributes mode="IN" include="pk" optional="false"/> </service> - <service name="createSalaryStep" engine="entity-auto" default-entity-name="SalaryStep" invoke="create" auth="true"> + <service name="createSalaryStep" engine="simple" default-entity-name="SalaryStep" + location="component://humanres/script/org/ofbiz/humanres/HumanResServices.xml" invoke="createSalaryStep" auth="true"> <description>Create Salary Step</description> <permission-service service-name="humanResManagerPermission" main-action="CREATE"/> + <auto-attributes mode="IN" include="pk" optional="false"/> <auto-attributes mode="IN" include="nonpk" optional="true"/> - <attribute name="payGradeId" mode="IN" type="String"/> - <attribute name="fromDate" mode="IN" type="Timestamp"/> - <attribute name="salaryStepSeqId" mode="OUT" type="String"/> + <override type="String" mode="IN" name="salaryStepSeqId" optional="true"/> </service> <service name="updateSalaryStep" engine="simple" default-entity-name="SalaryStep" Modified: ofbiz/branches/release13.07/applications/humanres/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/humanres/widget/LookupScreens.xml?rev=1709235&r1=1709234&r2=1709235&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/humanres/widget/LookupScreens.xml (original) +++ ofbiz/branches/release13.07/applications/humanres/widget/LookupScreens.xml Sun Oct 18 05:09:57 2015 @@ -114,7 +114,6 @@ <section> <actions> <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="title" value="${uiLabelMap.HumanResLookupSalaryStepSeqId}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> Modified: ofbiz/branches/release13.07/applications/humanres/widget/forms/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/humanres/widget/forms/LookupForms.xml?rev=1709235&r1=1709234&r2=1709235&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/humanres/widget/forms/LookupForms.xml (original) +++ ofbiz/branches/release13.07/applications/humanres/widget/forms/LookupForms.xml Sun Oct 18 05:09:57 2015 @@ -142,7 +142,6 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="SalaryStep" default-field-type="hidden"/> <field name="salaryStepSeqId" title="${uiLabelMap.HumanResLookupSalaryStepSeqId}"><text-find/></field> - <field name="fromDate" title="${uiLabelMap.CommonFrom}"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -159,9 +158,7 @@ under the License. <field name="salaryStepSeqId" title="${uiLabelMap.HumanResLookupSalaryStepSeqId}" widget-style="buttontext"> <hyperlink also-hidden="false" target-type="plain" description="${salaryStepSeqId}" target="javascript:set_value('${salaryStepSeqId}')"/> </field> - <field name="fromDate" title="${uiLabelMap.CommonFrom}"><display/></field> - <field name="thruDate" title="${uiLabelMap.CommonThru}"><display/></field> - <field name="amount" title="${uiLabelMap.AccountingAmount}"><display/></field> + <field name="description"><display/></field> </form> <form name="LookupPayGrade" type="single" target="LookupPayGrade" header-row-style="header-row" default-table-style="basic-table"> Modified: ofbiz/branches/release13.07/applications/humanres/widget/forms/PayGradeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/humanres/widget/forms/PayGradeForms.xml?rev=1709235&r1=1709234&r2=1709235&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/humanres/widget/forms/PayGradeForms.xml (original) +++ ofbiz/branches/release13.07/applications/humanres/widget/forms/PayGradeForms.xml Sun Oct 18 05:09:57 2015 @@ -74,7 +74,6 @@ <hyperlink target="deleteSalaryStep" description="${uiLabelMap.CommonDelete}"> <parameter param-name="salaryStepSeqId"/> <parameter param-name="payGradeId"/> - <parameter param-name="fromDate"/> </hyperlink> </field> </form> Propchange: ofbiz/branches/release14.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 18 05:09:57 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,1709192,1709214,1709231 +/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 Modified: ofbiz/branches/release14.12/applications/humanres/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/humanres/entitydef/entitymodel.xml?rev=1709235&r1=1709234&r2=1709235&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/humanres/entitydef/entitymodel.xml (original) +++ ofbiz/branches/release14.12/applications/humanres/entitydef/entitymodel.xml Sun Oct 18 05:09:57 2015 @@ -551,7 +551,6 @@ under the License. <relation type="one-nofk" fk-name="PAY_HIST_SSTP" rel-entity-name="SalaryStep"> <key-map field-name="salaryStepSeqId"/> <key-map field-name="payGradeId"/> - <key-map field-name="fromDate"/> </relation> <relation type="one" fk-name="PAY_HIST_PDTP" rel-entity-name="PeriodType"> <key-map field-name="periodTypeId"/> @@ -598,15 +597,10 @@ under the License. title="Salary Step Entity"> <field name="salaryStepSeqId" type="id-ne"></field> <field name="payGradeId" type="id-ne"></field> - <field name="fromDate" type="date-time"></field> - <field name="thruDate" type="date-time"></field> <field name="dateModified" type="date-time"></field> <field name="amount" type="currency-amount"></field> - <field name="createdByUserLogin" type="id-vlong"></field> - <field name="lastModifiedByUserLogin" type="id-vlong"></field> <prim-key field="salaryStepSeqId"/> <prim-key field="payGradeId"/> - <prim-key field="fromDate"/> <relation type="one" fk-name="SLRY_STP_PGRD" rel-entity-name="PayGrade"> <key-map field-name="payGradeId"/> </relation> @@ -841,7 +835,6 @@ under the License. <relation type="one-nofk" fk-name="EMPL_PTPRT_SSTP" rel-entity-name="SalaryStep"> <key-map field-name="salaryStepSeqId"/> <key-map field-name="payGradeId"/> - <key-map field-name="fromDate"/> </relation> <relation type="one-nofk" fk-name="EMPL_PTPRT_RTTYP" rel-entity-name="RateType"> <key-map field-name="rateTypeId"/> Modified: ofbiz/branches/release14.12/applications/humanres/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/humanres/servicedef/services.xml?rev=1709235&r1=1709234&r2=1709235&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/humanres/servicedef/services.xml (original) +++ ofbiz/branches/release14.12/applications/humanres/servicedef/services.xml Sun Oct 18 05:09:57 2015 @@ -288,7 +288,6 @@ under the License. <permission-service service-name="humanResManagerPermission" main-action="CREATE"/> <auto-attributes mode="IN" include="nonpk" optional="true"/> <attribute name="payGradeId" mode="IN" type="String"/> - <attribute name="fromDate" mode="IN" type="Timestamp"/> <attribute name="salaryStepSeqId" mode="OUT" type="String"/> </service> Modified: ofbiz/branches/release14.12/applications/humanres/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/humanres/widget/LookupScreens.xml?rev=1709235&r1=1709234&r2=1709235&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/humanres/widget/LookupScreens.xml (original) +++ ofbiz/branches/release14.12/applications/humanres/widget/LookupScreens.xml Sun Oct 18 05:09:57 2015 @@ -114,7 +114,6 @@ <section> <actions> <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="title" value="${uiLabelMap.HumanResLookupSalaryStepSeqId}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> Modified: ofbiz/branches/release14.12/applications/humanres/widget/forms/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/humanres/widget/forms/LookupForms.xml?rev=1709235&r1=1709234&r2=1709235&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/humanres/widget/forms/LookupForms.xml (original) +++ ofbiz/branches/release14.12/applications/humanres/widget/forms/LookupForms.xml Sun Oct 18 05:09:57 2015 @@ -142,7 +142,6 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="SalaryStep" default-field-type="hidden"/> <field name="salaryStepSeqId" title="${uiLabelMap.HumanResLookupSalaryStepSeqId}"><text-find/></field> - <field name="fromDate" title="${uiLabelMap.CommonFrom}"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -159,9 +158,7 @@ under the License. <field name="salaryStepSeqId" title="${uiLabelMap.HumanResLookupSalaryStepSeqId}" widget-style="buttontext"> <hyperlink also-hidden="false" target-type="plain" description="${salaryStepSeqId}" target="javascript:set_value('${salaryStepSeqId}')"/> </field> - <field name="fromDate" title="${uiLabelMap.CommonFrom}"><display/></field> - <field name="thruDate" title="${uiLabelMap.CommonThru}"><display/></field> - <field name="amount" title="${uiLabelMap.AccountingAmount}"><display/></field> + <field name="description"><display/></field> </form> <form name="LookupPayGrade" type="single" target="LookupPayGrade" header-row-style="header-row" default-table-style="basic-table"> Modified: ofbiz/branches/release14.12/applications/humanres/widget/forms/PayGradeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/humanres/widget/forms/PayGradeForms.xml?rev=1709235&r1=1709234&r2=1709235&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/humanres/widget/forms/PayGradeForms.xml (original) +++ ofbiz/branches/release14.12/applications/humanres/widget/forms/PayGradeForms.xml Sun Oct 18 05:09:57 2015 @@ -74,7 +74,6 @@ <hyperlink target="deleteSalaryStep" description="${uiLabelMap.CommonDelete}"> <parameter param-name="salaryStepSeqId"/> <parameter param-name="payGradeId"/> - <parameter param-name="fromDate"/> </hyperlink> </field> </form> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |