date:20150418

svn commit: r1674496 - in /ofbiz/trunk/applications/manufacturing: webapp/manufacturing/reports/ShipmentLabel.fo.ftl widget/manufacturing/ReportScreens.xml

2015-04-18 Thread deepak

Author: deepak
Date: Sat Apr 18 12:57:47 2015
New Revision: 1674496

URL: http://svn.apache.org/r1674496
Log:
Applied patch from jira issue OFBIZ-6196 - Package Labels Report error for 
Manufacturing Shipment Plan

Thanks Christian Carlow for reporting the issue and thanks   Amardeep Jhajj for 
verifying it the patch.

Modified:

ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl

ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml

Modified: 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl?rev=1674496r1=1674495r2=1674496view=diff
==
--- 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl
 (original)
+++ 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl
 Sat Apr 18 12:57:47 2015
@@ -36,7 +36,7 @@ under the License.
 #if index == 1
fo:table border=0.5pt solid black
 fo:table-column column-width=252pt/
-fo:table-header
+fo:table-body
 fo:table-row
 fo:table-cell padding=2pt
 
fo:block${uiLabelMap.ManufacturingShipTo}:/fo:block
@@ -44,21 +44,20 @@ under the License.
 /fo:table-row
 fo:table-row
 fo:table-cell padding=2pt
-fo:block 
font-size=18pt${record.get(shippingAddressName)}/fo:block
+fo:block 
font-size=18pt${record.get(shippingAddressName)?if_exists}/fo:block
 /fo:table-cell
 /fo:table-row
 fo:table-row
 fo:table-cell padding=2pt
-
fo:block${record.get(shippingAddressAddress)}/fo:block
+
fo:block${record.get(shippingAddressAddress)?if_exists}/fo:block
 /fo:table-cell
 /fo:table-row
 fo:table-row
 fo:table-cell padding=2pt
-
fo:block${record.get(shippingAddressCity)}/fo:block
+
fo:block${record.get(shippingAddressCity)?if_exists}/fo:block
 /fo:table-cell
 /fo:table-row
-/fo:table-header
-fo:table-body/
+/fo:table-body
 /fo:table
 fo:block space-after.optimum=10pt 
font-size=10pt/
 fo:table
@@ -66,7 +65,7 @@ under the License.
 fo:table-column column-width=63pt/
 fo:table-column column-width=93pt/
 fo:table-column column-width=33pt/
-fo:table-header border=0.5pt solid black
+fo:table-body border=0.5pt solid black
 fo:table-row
 fo:table-cell padding=2pt
 
fo:block${uiLabelMap.OrderOrderId}/fo:block
@@ -81,8 +80,7 @@ under the License.
 
fo:block${uiLabelMap.CommonQuantity}/fo:block
 /fo:table-cell
 /fo:table-row
-/fo:table-header
-fo:table-body/
+/fo:table-body
 /fo:table
 /#if
 fo:table
@@ -90,27 +88,26 @@ under the License.
 fo:table-column column-width=63pt/
 fo:table-column column-width=93pt/
 fo:table-column column-width=33pt/
-fo:table-header/
 fo:table-body
 fo:table-row
 fo:table-cell padding=2pt
 fo:block
-${record.get(orderId)} 
${record.get(orderItemSeqId)}
+

svn commit: r1674503 - /ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/actions/category/CategoryTree.groovy

2015-04-18 Thread deepak

Author: deepak
Date: Sat Apr 18 13:15:07 2015
New Revision: 1674503

URL: http://svn.apache.org/r1674503
Log:
Fixed broken CategroyTree.groovy, fixed incorrect map assignment, also found 
unused variable so removed it.

Modified:

ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/actions/category/CategoryTree.groovy

Modified: 
ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/actions/category/CategoryTree.groovy
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/actions/category/CategoryTree.groovy?rev=1674503r1=1674502r2=1674503view=diff
==
--- 
ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/actions/category/CategoryTree.groovy
 (original)
+++ 
ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/actions/category/CategoryTree.groovy
 Sat Apr 18 13:15:07 2015
@@ -35,7 +35,6 @@ import java.util.List;
 
 completedTree =  [];
 completedTreeContext = [];
-existParties = [];
 subtopLists = [];
 
 //internalOrg list
@@ -43,7 +42,7 @@ partyRelationships = from(PartyRelation
 if (partyRelationships) {
 //root
 partyRoot = from(PartyGroup).where(partyId, partyId).queryOne();
-partyRootMap = [];
+partyRootMap = [:];
 partyRootMap.put(partyId, partyId);
 partyRootMap.put(groupName, partyRoot.getString(groupName));

svn commit: r1674506 - in /ofbiz/branches/release13.07: ./ applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ applications/manufacturing/webapp/manufacturing/reports/ application

2015-04-18 Thread jleroux

Author: jleroux
Date: Sat Apr 18 13:27:12 2015
New Revision: 1674506

URL: http://svn.apache.org/r1674506
Log:
Applied fix from trunk for revision: 1674491 

r1674491 | deepak | 2015-04-18 14:34:33 +0200 (sam. 18 avr. 2015) | 2 lignes

Applied patch from jira issue OFBIZ-6188 - Task Report error for Manufacturing 
Shipment Plan
Thanks Christian Carlow for reporting the issue and thanks   Amardeep Jhajj for 
verifying it the patch.



Modified:
ofbiz/branches/release13.07/   (props changed)

ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy

ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl

ofbiz/branches/release13.07/applications/manufacturing/widget/manufacturing/ReportScreens.xml

Propchange: ofbiz/branches/release13.07/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 18 13:27:12 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,151,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,154,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,133,1666836,1666939,1666949,1667055,1667253,1668214,1668246,1668258,1668265,1668314,1669317,1670952,1672862,1672873,1673764,1674447,1674496

svn commit: r1674507 - in /ofbiz/branches/release12.04: ./ applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ applications/manufacturing/webapp/manufacturing/reports/ application

2015-04-18 Thread jleroux

Author: jleroux
Date: Sat Apr 18 13:27:14 2015
New Revision: 1674507

URL: http://svn.apache.org/r1674507
Log:
Applied fix from trunk for revision: 1674491 

r1674491 | deepak | 2015-04-18 14:34:33 +0200 (sam. 18 avr. 2015) | 2 lignes

Applied patch from jira issue OFBIZ-6188 - Task Report error for Manufacturing 
Shipment Plan
Thanks Christian Carlow for reporting the issue and thanks   Amardeep Jhajj for 
verifying it the patch.



Modified:
ofbiz/branches/release12.04/   (props changed)

ofbiz/branches/release12.04/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy

ofbiz/branches/release12.04/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl

ofbiz/branches/release12.04/applications/manufacturing/widget/manufacturing/ReportScreens.xml

Propchange: ofbiz/branches/release12.04/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 18 13:27:14 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,130,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,154,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

svn commit: r1674491 - in /ofbiz/trunk/applications/manufacturing: webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.f

2015-04-18 Thread deepak

Author: deepak
Date: Sat Apr 18 12:34:33 2015
New Revision: 1674491

URL: http://svn.apache.org/r1674491
Log:
Applied patch from jira issue OFBIZ-6188 - Task Report error for Manufacturing 
Shipment Plan
Thanks Christian Carlow for reporting the issue and thanks   Amardeep Jhajj for 
verifying it the patch.

Modified:

ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy

ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl

ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml

Modified: 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy?rev=1674491r1=1674490r2=1674491view=diff
==
--- 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy
 (original)
+++ 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy
 Sat Apr 18 12:34:33 2015
@@ -25,7 +25,7 @@ shipment = from(Shipment).where(shipm
 context.shipmentIdPar = shipment.shipmentId;
 context.date = new Date();
 Double fixedAssetTime = new Double(0);
-
+records = [];
 if (shipment) {
 shipmentPlans = from(OrderShipment).where(shipmentId, 
shipmentId).queryList();
 shipmentPlans.each { shipmentPlan -
@@ -51,7 +51,9 @@ if (shipment) {
 record.taskEstimatedTime = 
task.getDouble(estimatedMilliSeconds);
 record.taskEstimatedSetup = 
task.getDouble(estimatedSetupMillis);
 records.add(record);
-fixedAssetTime = fixedAssetTime + 
task.getDouble(estimatedMilliSeconds);
+if(task.getDouble(estimatedMilliSeconds) != null){
+fixedAssetTime = fixedAssetTime + 
task.getDouble(estimatedMilliSeconds);
+}
 }
 }
 }

Modified: 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl?rev=1674491r1=1674490r2=1674491view=diff
==
--- 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl
 (original)
+++ 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl
 Sat Apr 18 12:34:33 2015
@@ -65,60 +65,48 @@ under the License.
 fo:table-cell padding=2pt
 
fo:block${uiLabelMap.ManufacturingOperationCodeAndDescription}/fo:block
 /fo:table-cell
-fo:table-cell padding=2pt
+fo:table-cell padding=2pt 
text-align=right
 
fo:block${uiLabelMap.ManufacturingTaskRunTime}/fo:block
 /fo:table-cell
-fo:table-cell padding=2pt
+fo:table-cell padding=2pt 
text-align=right
 
fo:block${uiLabelMap.ManufacturingTaskSetupTime}/fo:block
 /fo:table-cell
 /fo:table-row
 /fo:table-header
-fo:table-body/
-/fo:table
-#list records as record
-fo:table font-size=8pt
-fo:table-column column-width=45pt/
-   fo:table-column column-width=45pt/
-fo:table-column column-width=60pt/
-fo:table-column column-width=90pt/
-fo:table-column column-width=90pt/
-fo:table-column column-width=60pt/
-fo:table-column column-width=60pt/
-fo:table-header/
-fo:table-body
+fo:table-body
+#list records as record
 fo:table-row
 fo:table-cell padding=2pt
-
fo:block${record.get(workEffortId)}/fo:block
+
fo:block${record.get(workEffortId)?if_exists}/fo:block
 /fo:table-cell
 fo:table-cell padding=2pt
-fo:block#if

svn commit: r1674498 - in /ofbiz/branches/release14.12: ./ applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl applications/manufacturing/widget/manufacturing/ReportScreens.xm

2015-04-18 Thread deepak

Author: deepak
Date: Sat Apr 18 13:02:55 2015
New Revision: 1674498

URL: http://svn.apache.org/r1674498
Log:
Applied fix from trunk r#r1674496

Applied patch from jira issue OFBIZ-6196 - Package Labels Report error for 
Manufacturing Shipment Plan

Thanks Christian Carlow for reporting the issue and thanks   Amardeep Jhajj for 
verifying it the patch.

Modified:
ofbiz/branches/release14.12/   (props changed)

ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl

ofbiz/branches/release14.12/applications/manufacturing/widget/manufacturing/ReportScreens.xml

Propchange: ofbiz/branches/release14.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 18 13:02:55 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,133,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
+/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,133,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

Modified: 
ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl?rev=1674498r1=1674497r2=1674498view=diff
==
--- 
ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl
 (original)
+++ 
ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl
 Sat Apr 18 13:02:55 2015
@@ -36,7 +36,7 @@ under the License.
 #if index == 1
fo:table border=0.5pt solid black
 fo:table-column column-width=252pt/
-fo:table-header
+fo:table-body
 fo:table-row
 fo:table-cell padding=2pt
 
fo:block${uiLabelMap.ManufacturingShipTo}:/fo:block
@@ -44,21 +44,20 @@ under the License.
 /fo:table-row
 fo:table-row
 fo:table-cell padding=2pt
-fo:block 
font-size=18pt${record.get(shippingAddressName)}/fo:block
+fo:block

svn commit: r1674513 - in /ofbiz/trunk/framework/widget/templates: foFormMacroLibrary.ftl foScreenMacroLibrary.ftl

2015-04-18 Thread ashish

Author: ashish
Date: Sat Apr 18 14:11:37 2015
New Revision: 1674513

URL: http://svn.apache.org/r1674513
Log:
Applied patch from jira issue - OFBIZ-6260 - foScreenMacroLibrary.ftl 
renderLabel doesn't apply style parameter.
Thanks Christian for creating the issue and contributing the patch for the 
same. Thanks Aditya for reviewing the patch.

Modified:
ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl

Modified: ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl?rev=1674513r1=1674512r2=1674513view=diff
==
--- ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl Sat Apr 18 
14:11:37 2015
@@ -33,8 +33,10 @@ under the License.
 h2:font-weight=\bold\,
 h3:font-weight=\bold\ font-style=\italic\,
 error:color=\red\}/
-#assign foStyle = foStyles[style]?default()/
-${foStyle?default()}
+#list style?split(' ') as styleItem
+#assign foStyle = foStyles[styleItem]?default()/
+${foStyle?default()}
+/#list
 /#macro
 
 #escape x as x?xml

Modified: ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl?rev=1674513r1=1674512r2=1674513view=diff
==
--- ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/foScreenMacroLibrary.ftl Sat Apr 18 
14:11:37 2015
@@ -31,8 +31,10 @@ under the License.
 h2:font-weight=\bold\,
 h3:font-weight=\bold\ font-style=\italic\,
 error:color=\red\}/
-#assign foStyle = foStyles[style]?default()/
-${foStyle?default()}
+#list style?split(' ') as styleItem
+#assign foStyle = foStyles[styleItem]?default()/
+${foStyle?default()}
+/#list
 /#macro
 
 #escape x as x?xml
@@ -59,7 +61,7 @@ under the License.
 #macro renderSubContentEnd urlString editMode editContainerStyle editRequest 
enableEditValue/#macro
 
 #macro renderHorizontalSeparator id stylefo:blockfo:leader 
leader-length=100% leader-pattern=rule rule-style=solid 
rule-thickness=0.1mm color=black//fo:block/#macro
-#macro renderLabel text id style#if text?has_contentfo:block #if 
id?has_content id=${id}/#if${text}/fo:block/#if/#macro
+#macro renderLabel text id style#if text?has_contentfo:block #if 
style?has_content@getFoStyle style//#if #if id?has_content 
id=${id}/#if${text}/fo:block/#if/#macro
 #macro renderLink parameterList targetWindow target uniqueItemName linkType 
actionUrl id style name linkUrl text imgStr/#macro
 #macro renderImage src id style wid hgt border alt urlString/#macro

svn commit: r1674482 - in /ofbiz/trunk: ./ framework/start/src/org/ofbiz/base/start/ specialpurpose/ specialpurpose/jetty/ themes/bizznesstime/ themes/bluelight/ themes/droppingcrumbs/ themes/flatgrey

2015-04-18 Thread jleroux

Author: jleroux
Date: Sat Apr 18 11:44:52 2015
New Revision: 1674482

URL: http://svn.apache.org/r1674482
Log:
A patch from Pierre Smits Move special purpose/jetty to attic 
https://issues.apache.org/jira/browse/OFBIZ-6223

As per outcome of http://ofbiz.markmail.org/message/xoqjhbitdj5fi3bl remove 
special purpose/jetty from the trunk branch and add a notification to the attic 
document.

Removed:
ofbiz/trunk/framework/start/src/org/ofbiz/base/start/jetty.properties
ofbiz/trunk/specialpurpose/jetty/
Modified:
ofbiz/trunk/.classpath
ofbiz/trunk/.gitignore
ofbiz/trunk/build.xml
ofbiz/trunk/specialpurpose/LICENSE
ofbiz/trunk/specialpurpose/NOTICE
ofbiz/trunk/specialpurpose/build.xml
ofbiz/trunk/specialpurpose/component-load.xml
ofbiz/trunk/themes/bizznesstime/ofbiz-component.xml
ofbiz/trunk/themes/bluelight/ofbiz-component.xml
ofbiz/trunk/themes/droppingcrumbs/ofbiz-component.xml
ofbiz/trunk/themes/flatgrey/ofbiz-component.xml
ofbiz/trunk/themes/multiflex/ofbiz-component.xml
ofbiz/trunk/themes/tomahawk/ofbiz-component.xml

Modified: ofbiz/trunk/.classpath
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1674482r1=1674481r2=1674482view=diff
==
--- ofbiz/trunk/.classpath (original)
+++ ofbiz/trunk/.classpath Sat Apr 18 11:44:52 2015
@@ -124,21 +124,6 @@
 classpathentry kind=lib 
path=specialpurpose/ebaystore/lib/ebaysdkcore.jar/
 classpathentry kind=lib path=specialpurpose/ebaystore/lib/helper.jar/
 classpathentry kind=lib 
path=specialpurpose/googlecheckout/lib/checkout-sdk-0.8.8.jar/
-classpathentry kind=lib 
path=specialpurpose/jetty/lib/com.sun.el-2.2.0.v20110806.jar/
-classpathentry kind=lib 
path=specialpurpose/jetty/lib/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar/
-classpathentry kind=lib 
path=specialpurpose/jetty/lib/jetty-ajp-8.1.2.v20120308.jar/
-classpathentry kind=lib 
path=specialpurpose/jetty/lib/jetty-continuation-8.1.2.v20120308.jar/
-classpathentry kind=lib 
path=specialpurpose/jetty/lib/jetty-http-8.1.2.v20120308.jar/
-classpathentry kind=lib 
path=specialpurpose/jetty/lib/jetty-io-8.1.2.v20120308.jar/
-classpathentry kind=lib 
path=specialpurpose/jetty/lib/jetty-security-8.1.2.v20120308.jar/
-classpathentry kind=lib 
path=specialpurpose/jetty/lib/jetty-server-8.1.2.v20120308.jar/
-classpathentry kind=lib 
path=specialpurpose/jetty/lib/jetty-servlet-8.1.2.v20120308.jar/
-classpathentry kind=lib 
path=specialpurpose/jetty/lib/jetty-util-8.1.2.v20120308.jar/
-classpathentry kind=lib 
path=specialpurpose/jetty/lib/jetty-webapp-8.1.2.v20120308.jar/
-classpathentry kind=lib 
path=specialpurpose/jetty/lib/jetty-xml-8.1.2.v20120308.jar/
-classpathentry kind=lib 
path=specialpurpose/jetty/lib/org.apache.jasper.glassfish-2.2.2.v201112011158.jar/
-classpathentry kind=lib 
path=specialpurpose/jetty/lib/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar/
-classpathentry kind=lib 
path=specialpurpose/jetty/lib/org.eclipse.jdt.core-3.7.1.jar/
 classpathentry kind=lib 
path=specialpurpose/ldap/lib/cas-server-core-3.3.jar/
 classpathentry kind=lib 
path=specialpurpose/pos/lib/XuiCoreSwing-v3.2rc2b.jar/
 classpathentry kind=lib 
path=specialpurpose/pos/lib/XuiOptional-v3.2rc2b.jar/
@@ -182,7 +167,6 @@
 classpathentry kind=src path=specialpurpose/googlebase/src/
 classpathentry kind=src path=specialpurpose/googlecheckout/src/
 classpathentry kind=src path=specialpurpose/hhfacility/src/
-classpathentry kind=src path=specialpurpose/jetty/src/
 classpathentry kind=src path=specialpurpose/ldap/src/
 classpathentry kind=src path=specialpurpose/oagis/src/
 classpathentry kind=src path=specialpurpose/pos/src/

Modified: ofbiz/trunk/.gitignore
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/.gitignore?rev=1674482r1=1674481r2=1674482view=diff
==
--- ofbiz/trunk/.gitignore (original)
+++ ofbiz/trunk/.gitignore Sat Apr 18 11:44:52 2015
@@ -26,7 +26,6 @@ runtime/logs/test-results/*
 runtime/data/derby/*
 runtime/data/utilcache.*
 runtime/catalina/work/*
-runtime/jetty
 runtime/tempfiles/*
 !runtime/tempfiles/README
 runtime/indexes/products/

Modified: ofbiz/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1674482r1=1674481r2=1674482view=diff
==
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Sat Apr 18 11:44:52 2015
@@ -522,7 +522,6 @@ under the License.
   fileset dir=${ofbiz.home.dir}/specialpurpose/googlecheckout/lib 
includes=*.jar/
   fileset dir=${ofbiz.home.dir}/specialpurpose/ldap/lib 
includes=*.jar/
   fileset dir=${ofbiz.home.dir}/specialpurpose/pos/lib 
includes=*.jar/
-  fileset

svn commit: r1674517 - in /ofbiz/branches/release13.07/framework/widget/templates: foFormMacroLibrary.ftl foScreenMacroLibrary.ftl

2015-04-18 Thread ashish

Author: ashish
Date: Sat Apr 18 14:16:45 2015
New Revision: 1674517

URL: http://svn.apache.org/r1674517
Log:
Applied bug fix from trunk r1674513.
==
Applied patch from jira issue - OFBIZ-6260 - foScreenMacroLibrary.ftl 
renderLabel doesn't apply style parameter.
Thanks Christian for creating the issue and contributing the patch for the 
same. Thanks Aditya for reviewing the patch.
==

Modified:

ofbiz/branches/release13.07/framework/widget/templates/foFormMacroLibrary.ftl

ofbiz/branches/release13.07/framework/widget/templates/foScreenMacroLibrary.ftl

Modified: 
ofbiz/branches/release13.07/framework/widget/templates/foFormMacroLibrary.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/widget/templates/foFormMacroLibrary.ftl?rev=1674517r1=1674516r2=1674517view=diff
==
--- 
ofbiz/branches/release13.07/framework/widget/templates/foFormMacroLibrary.ftl 
(original)
+++ 
ofbiz/branches/release13.07/framework/widget/templates/foFormMacroLibrary.ftl 
Sat Apr 18 14:16:45 2015
@@ -33,8 +33,10 @@ under the License.
 h2:font-weight=\bold\,
 h3:font-weight=\bold\ font-style=\italic\,
 error:color=\red\}/
-#assign foStyle = foStyles[style]?default()/
-${foStyle?default()}
+#list style?split(' ') as styleItem
+#assign foStyle = foStyles[styleItem]?default()/
+${foStyle?default()}
+/#list
 /#macro
 
 #escape x as x?xml

Modified: 
ofbiz/branches/release13.07/framework/widget/templates/foScreenMacroLibrary.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/widget/templates/foScreenMacroLibrary.ftl?rev=1674517r1=1674516r2=1674517view=diff
==
--- 
ofbiz/branches/release13.07/framework/widget/templates/foScreenMacroLibrary.ftl 
(original)
+++ 
ofbiz/branches/release13.07/framework/widget/templates/foScreenMacroLibrary.ftl 
Sat Apr 18 14:16:45 2015
@@ -31,8 +31,10 @@ under the License.
 h2:font-weight=\bold\,
 h3:font-weight=\bold\ font-style=\italic\,
 error:color=\red\}/
-#assign foStyle = foStyles[style]?default()/
-${foStyle?default()}
+#list style?split(' ') as styleItem
+#assign foStyle = foStyles[styleItem]?default()/
+${foStyle?default()}
+/#list
 /#macro
 
 #escape x as x?xml
@@ -59,7 +61,7 @@ under the License.
 #macro renderSubContentEnd urlString editMode editContainerStyle editRequest 
enableEditValue/#macro
 
 #macro renderHorizontalSeparator id stylefo:blockfo:leader 
leader-length=100% leader-pattern=rule rule-style=solid 
rule-thickness=0.1mm color=black//fo:block/#macro
-#macro renderLabel text id style#if text?has_contentfo:block #if 
id?has_content id=${id}/#if${text}/fo:block/#if/#macro
+#macro renderLabel text id style#if text?has_contentfo:block #if 
style?has_content@getFoStyle style//#if #if id?has_content 
id=${id}/#if${text}/fo:block/#if/#macro
 #macro renderLink parameterList targetWindow target uniqueItemName linkType 
actionUrl id style name linkUrl text imgStr/#macro
 #macro renderImage src id style wid hgt border alt urlString/#macro

svn commit: r1674501 - in /ofbiz/branches/release12.04: ./ applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl applications/manufacturing/widget/manufacturing/ReportScreens.xm

2015-04-18 Thread deepak

Author: deepak
Date: Sat Apr 18 13:09:47 2015
New Revision: 1674501

URL: http://svn.apache.org/r1674501
Log:
Applied fix from trunk r#r1674496

Applied patch from jira issue OFBIZ-6196 - Package Labels Report error for 
Manufacturing Shipment Plan

Thanks Christian Carlow for reporting the issue and thanks   Amardeep Jhajj for 
verifying it the patch.

Modified:
ofbiz/branches/release12.04/   (props changed)

ofbiz/branches/release12.04/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl

ofbiz/branches/release12.04/applications/manufacturing/widget/manufacturing/ReportScreens.xml

Propchange: ofbiz/branches/release12.04/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 18 13:09:47 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,130,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,154,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,133,1666836,1667253,1668214,1668246,1668258,1668265,1668314,1669317,1670952,1673764,1674447

svn commit: r1674500 - in /ofbiz/branches/release13.07: ./ applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl applications/manufacturing/widget/manufacturing/ReportScreens.xm

2015-04-18 Thread deepak

Author: deepak
Date: Sat Apr 18 13:09:16 2015
New Revision: 1674500

URL: http://svn.apache.org/r1674500
Log:
Applied fix from trunk r#r1674496

Applied patch from jira issue OFBIZ-6196 - Package Labels Report error for 
Manufacturing Shipment Plan

Thanks Christian Carlow for reporting the issue and thanks   Amardeep Jhajj for 
verifying it the patch.

Modified:
ofbiz/branches/release13.07/   (props changed)

ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl

ofbiz/branches/release13.07/applications/manufacturing/widget/manufacturing/ReportScreens.xml

Propchange: ofbiz/branches/release13.07/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 18 13:09:16 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,151,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,154,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,133,1666836,1666939,1666949,1667055,1667253,1668214,1668246,1668258,1668265,1668314,1669317,1670952,1672862,1672873,1673764,1674447

svn commit: r1674515 - in /ofbiz/branches/release14.12/framework/widget/templates: foFormMacroLibrary.ftl foScreenMacroLibrary.ftl

2015-04-18 Thread ashish

Author: ashish
Date: Sat Apr 18 14:14:10 2015
New Revision: 1674515

URL: http://svn.apache.org/r1674515
Log:
Applied bug fix from trunk r1674513.
==
Applied patch from jira issue - OFBIZ-6260 - foScreenMacroLibrary.ftl 
renderLabel doesn't apply style parameter.
Thanks Christian for creating the issue and contributing the patch for the 
same. Thanks Aditya for reviewing the patch.
==

Modified:

ofbiz/branches/release14.12/framework/widget/templates/foFormMacroLibrary.ftl

ofbiz/branches/release14.12/framework/widget/templates/foScreenMacroLibrary.ftl

Modified: 
ofbiz/branches/release14.12/framework/widget/templates/foFormMacroLibrary.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/widget/templates/foFormMacroLibrary.ftl?rev=1674515r1=1674514r2=1674515view=diff
==
--- 
ofbiz/branches/release14.12/framework/widget/templates/foFormMacroLibrary.ftl 
(original)
+++ 
ofbiz/branches/release14.12/framework/widget/templates/foFormMacroLibrary.ftl 
Sat Apr 18 14:14:10 2015
@@ -33,8 +33,10 @@ under the License.
 h2:font-weight=\bold\,
 h3:font-weight=\bold\ font-style=\italic\,
 error:color=\red\}/
-#assign foStyle = foStyles[style]?default()/
-${foStyle?default()}
+#list style?split(' ') as styleItem
+#assign foStyle = foStyles[styleItem]?default()/
+${foStyle?default()}
+/#list
 /#macro
 
 #escape x as x?xml

Modified: 
ofbiz/branches/release14.12/framework/widget/templates/foScreenMacroLibrary.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/widget/templates/foScreenMacroLibrary.ftl?rev=1674515r1=1674514r2=1674515view=diff
==
--- 
ofbiz/branches/release14.12/framework/widget/templates/foScreenMacroLibrary.ftl 
(original)
+++ 
ofbiz/branches/release14.12/framework/widget/templates/foScreenMacroLibrary.ftl 
Sat Apr 18 14:14:10 2015
@@ -31,8 +31,10 @@ under the License.
 h2:font-weight=\bold\,
 h3:font-weight=\bold\ font-style=\italic\,
 error:color=\red\}/
-#assign foStyle = foStyles[style]?default()/
-${foStyle?default()}
+#list style?split(' ') as styleItem
+#assign foStyle = foStyles[styleItem]?default()/
+${foStyle?default()}
+/#list
 /#macro
 
 #escape x as x?xml
@@ -59,7 +61,7 @@ under the License.
 #macro renderSubContentEnd urlString editMode editContainerStyle editRequest 
enableEditValue/#macro
 
 #macro renderHorizontalSeparator id stylefo:blockfo:leader 
leader-length=100% leader-pattern=rule rule-style=solid 
rule-thickness=0.1mm color=black//fo:block/#macro
-#macro renderLabel text id style#if text?has_contentfo:block #if 
id?has_content id=${id}/#if${text}/fo:block/#if/#macro
+#macro renderLabel text id style#if text?has_contentfo:block #if 
style?has_content@getFoStyle style//#if #if id?has_content 
id=${id}/#if${text}/fo:block/#if/#macro
 #macro renderLink parameterList targetWindow target uniqueItemName linkType 
actionUrl id style name linkUrl text imgStr/#macro
 #macro renderImage src id style wid hgt border alt urlString/#macro

svn commit: r1674492 - in /ofbiz/branches/release14.12: ./ applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ applications/manufacturing/webapp/manufacturing/reports/ application

2015-04-18 Thread deepak

Author: deepak
Date: Sat Apr 18 12:43:46 2015
New Revision: 1674492

URL: http://svn.apache.org/r1674492
Log:
Applied fix from trunk r#1674491

Applied patch from jira issue OFBIZ-6188 - Task Report error for Manufacturing 
Shipment Plan.

Thanks Christian Carlow for reporting the issue and thanks   Amardeep Jhajj for 
verifying it the patch.

Modified:
ofbiz/branches/release14.12/   (props changed)

ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy

ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl

ofbiz/branches/release14.12/applications/manufacturing/widget/manufacturing/ReportScreens.xml

Propchange: ofbiz/branches/release14.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 18 12:43:46 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,133,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
+/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,133,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

Modified: 
ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy?rev=1674492r1=1674491r2=1674492view=diff
==
--- 
ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy
 (original)
+++ 
ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy
 Sat Apr 18 12:43:46 2015
@@ -25,7 +25,7 @@ shipment = from(Shipment).where(shipm
 context.shipmentIdPar = shipment.shipmentId;
 context.date = new Date();
 Double fixedAssetTime = new Double(0);
-
+records = [];
 if (shipment) {
 shipmentPlans = from(OrderShipment).where(shipmentId, 
shipmentId).queryList();
 shipmentPlans.each { shipmentPlan -
@@ -51,7 +51,9 @@ if (shipment) {
 record.taskEstimatedTime = 
task.getDouble(estimatedMilliSeconds);
 record.taskEstimatedSetup = 
task.getDouble(estimatedSetupMillis);
 records.add(record);
-fixedAssetTime = fixedAssetTime + 
task.getDouble(estimatedMilliSeconds);
+

svn commit: r1674546 - /ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Config.java

2015-04-18 Thread adrianc

Author: adrianc
Date: Sat Apr 18 17:45:20 2015
New Revision: 1674546

URL: http://svn.apache.org/r1674546
Log:
Some trivial optimizations in Config.java.

Modified:
ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Config.java

Modified: ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Config.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Config.java?rev=1674546r1=1674545r2=1674546view=diff
==
--- ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Config.java (original)
+++ ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Config.java Sat Apr 18 
17:45:20 2015
@@ -28,6 +28,7 @@ import org.xml.sax.SAXException;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FileInputStream;
@@ -46,6 +47,17 @@ import java.util.TimeZone;
 
 public class Config {
 
+private static final FileFilter componentLoadFilter = new FileFilter() {
+public boolean accept(File pathname) {
+return component-load.xml.equals(pathname.getName());
+}
+};
+private static final FileFilter folderFilter = new FileFilter() {
+public boolean accept(File pathname) {
+return pathname.isDirectory();
+}
+};
+
 public final InetAddress adminAddress;
 public final String adminKey;
 public final int adminPort;
@@ -183,7 +195,7 @@ public class Config {
 instrumenterFile = getProp(props, ofbiz.instrumenterFile, null);
 
 // loader classes
-ListMapString, String loadersTmp = new ArrayListMapString, 
String();
+ArrayListMapString, String loadersTmp = new ArrayListMapString, 
String();
 int currentPosition = 1;
 MapString, String loader = null;
 while (true) {
@@ -198,6 +210,7 @@ public class Config {
 currentPosition++;
 }
 }
+loadersTmp.trimToSize();
 loaders = Collections.unmodifiableList(loadersTmp);
 
 // set the port offset
@@ -302,16 +315,6 @@ public class Config {
 if (!folder.exists()  !folder.isDirectory()) {
 return;
 }
-FileFilter componentLoadFilter = new FileFilter() {
-public boolean accept(File pathname) {
-return component-load.xml.equals(pathname.getName());
-}
-};
-FileFilter folderFilter = new FileFilter() {
-public boolean accept(File pathname) {
-return pathname.isDirectory();
-}
-};
 DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 DocumentBuilder builder = factory.newDocumentBuilder();
 File[] componentLoadFiles;

svn commit: r1674586 - in /ofbiz/trunk: applications/content/webapp/content/fonts.fo.ftl specialpurpose/example/config/ExampleUiLabels.xml specialpurpose/example/webapp/example/WEB-INF/controller.xml

2015-04-18 Thread jleroux

Author: jleroux
Date: Sat Apr 18 22:45:30 2015
New Revision: 1674586

URL: http://svn.apache.org/r1674586
Log:
I wanted to be sure the degree symbol could be printed with FOP using NoTo 
fonts and to have this more handy I decided to put a menu link to the FOP fonts 
file in content from example.

Modified:
ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl
ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml
ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/example/widget/example/ExampleMenus.xml

Modified: ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl?rev=1674586r1=1674585r2=1674586view=diff
==
--- ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl Sat Apr 18 
22:45:30 2015
@@ -1576,6 +1576,9 @@ Euro symbol in Helvetica 12 ( dec 8364,
 Ruppe symbol in NotoSans 12 (dec 8377, hex 20B9): #x20B9;
   /fo:block
   fo:block font-family=NotoSans  font-size=12pt
+0 #x00B0;C = 32 #x00B0;F :)
+  /fo:block
+  fo:block font-family=NotoSans  font-size=12pt
 I #x2665; NotoSans!
   /fo:block
 

Modified: ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml?rev=1674586r1=1674585r2=1674586view=diff
==
--- ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml Sat Apr 18 
22:45:30 2015
@@ -19,6 +19,10 @@
 under the License.
 --
 resource xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:noNamespaceSchemaLocation=http://ofbiz.apache.org/dtds/ofbiz-properties.xsd;
+property key=ContentFopFonts
+value xml:lang=enFOP fonts in a PDF/value
+value xml:lang=frPolices FOP dans un PDF/value
+/property
 property key=ExampleAjaxExamples
 value xml:lang=enAjax Examples/value
 value xml:lang=frExemples Ajax/value
@@ -71,6 +75,10 @@
 value xml:lang=zhå¦æéæ©specify 
otherï¼ä¸ææ¡æè¾¹ä¼åºç°æ¬ææ¡ãåèformçdrop-downåç´ 
çother-field-sizeå±æ§è¯´æ/value
 value xml:lang=zh-TWå¦æé¸æspecify other,ä¸ææ¸
å®æéæåºç¾æ¬ææ¡.åèformçdrop-downåç´ 
çother-field-sizeå±¬æ§èªªæ/value
 /property
+property key=ExampleBarChart
+value xml:lang=enBar Chart/value
+value xml:lang=frHistogramme/value
+/property
 property key=ExampleBaseNodeVersion
 value xml:lang=deVerion des Content Knoten/value
 value xml:lang=enVersion of the base content node/value
@@ -122,6 +130,10 @@
 value xml:lang=zh-CNOFBizçä¸é¨å/value
 value xml:lang=zh-TWéæºè»é«OFBizå®¶æçä¸é¨å/value
 /property
+property key=ExampleChart
+value xml:lang=enChart examples/value
+value xml:lang=frGraphes/value
+/property
 property key=ExampleDashboard
 value xml:lang=enDashboard/value
 value xml:lang=frPersonnalisation des pages/value
@@ -765,6 +777,10 @@
 value 
xml:lang=zhå¨ç¨äºexampleGenericPermissionæå¡çpermission-serviceåç´ 
ä¸ï¼ç¼ºå°å¿é¡»çmain-actionå±æ§/value
 value 
xml:lang=zh-TWå¨ç¨æ¼exampleGenericPermissionæåçpermission-serviceå
ç´ ä¸,ç¼ºå°å¿é çmain-actionå±¬æ§/value
 /property
+property key=ExamplePieChart
+value xml:lang=enPie Chart/value
+value xml:lang=frCamembert/value
+/property
 property key=ExamplePointAddress
 value xml:lang=enGeolocation via address/value
 value xml:lang=frGÃ©olocalisation par l'adresse/value

Modified: 
ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml?rev=1674586r1=1674585r2=1674586view=diff
==
--- ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml 
(original)
+++ ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml 
Sat Apr 18 22:45:30 2015
@@ -194,6 +194,11 @@ under the License.
   security https=true auth=true/
   response name=success type=view value=printExampleFOPFonts/
 /request-map
+
+request-map uri=fonts.pdf
+security https=true auth=true/
+response name=success type=view value=fonts.fo/
+/request-map
 
 request-map uri=views
 security https=true auth=false/
@@ -261,6 +266,9 @@ under the License.
 !-- Flot view mapping --
 view-map name=ExampleBarChart

svn commit: r1674587 - in /ofbiz/trunk/applications/accounting: webapp/accounting/WEB-INF/controller.xml widget/TaxAuthorityForms.xml widget/TaxAuthorityMenus.xml widget/TaxAuthorityScreens.xml

2015-04-18 Thread jleroux

Author: jleroux
Date: Sat Apr 18 22:48:01 2015
New Revision: 1674587

URL: http://svn.apache.org/r1674587
Log:
A patch from Pierre Smits Add a basic VAT report with frequency setting 
https://issues.apache.org/jira/browse/OFBIZ-6225

This is a 1st stage, we will add more later, notably totals as a 1st step and 
then a more complete report but still basic

Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml
ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml
ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml

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=1674587r1=1674586r2=1674587view=diff
==
--- 
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml 
(original)
+++ 
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml 
Sat Apr 18 22:48:01 2015
@@ -1566,6 +1566,12 @@ under the License.
 response name=success type=view 
value=EditTaxAuthorityPartyInfo/
 response name=error type=view value=EditTaxAuthorityPartyInfo/
 /request-map
+request-map uri=FindTaxAuthorityReport
+security https=true auth=true/
+response name=success type=view value=FindTaxAuthorityReport/
+response name=error type=view value=FindTaxAuthorityReport/
+/request-map
+
 
 !--  Administratvie Requests  --
 request-map uri=ListCompanies
@@ -2844,7 +2850,8 @@ under the License.
 view-map name=EditTaxAuthorityRateProducts type=screen 
page=component://accounting/widget/TaxAuthorityScreens.xml#EditTaxAuthorityRateProducts/
 view-map name=ListTaxAuthorityParties type=screen 
page=component://accounting/widget/TaxAuthorityScreens.xml#ListTaxAuthorityParties/
 view-map name=EditTaxAuthorityPartyInfo type=screen 
page=component://accounting/widget/TaxAuthorityScreens.xml#EditTaxAuthorityPartyInfo/
-
+view-map name=FindTaxAuthorityReport type=screen 
page=component://accounting/widget/TaxAuthorityScreens.xml#FindTaxAuthorityReport/
+
 !-- administrative pages --
 view-map name=ListCompanies type=screen 
page=component://accounting/widget/GlSetupScreens.xml#ListCompanies/
 view-map name=AddCompany type=screen 
page=component://accounting/widget/GlSetupScreens.xml#AddCompany/

Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml?rev=1674587r1=1674586r2=1674587view=diff
==
--- ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml Sat Apr 18 
22:48:01 2015
@@ -405,4 +405,33 @@ under the License.
 field use-when=partyTaxAuthInfo!=null name=submitButton 
title=${uiLabelMap.CommonUpdate} widget-style=buttontextsubmit 
button-type=text-link//field
 field use-when=partyTaxAuthInfo==null name=submitButton 
title=${uiLabelMap.CommonCreate} widget-style=buttontextsubmit 
button-type=text-link//field
 /form
+
+
+!-- Tax Authority Tax Reports forms --
+form name=FindTaxAuthorityReport type=single 
target=FindTaxAuthorityReport
+title=Find and list VAT report for a tax authority, my month, quater 
or other period
+header-row-style=header-row default-table-style=basic-table
+field name=noConditionFindhidden value=Y/!-- if this isn't 
there then with all fields empty no query will be done --/field
+field name=hideSearchhidden value=Y//field
+field name=taxAuthPartyIdhidden//field
+field name=taxAuthGeoIdhidden//field
+field name=invoiceDatedate-find type=date 
default-option-from=greaterThanFromDayStart 
default-option-thru=upThruDay//field
+field name=submitButton title=${uiLabelMap.CommonSearch} 
widget-style=buttontext 
+submit button-type=button/
+/field
+/form
+
+form name=ListTaxAuthorityReport list-name=listIt title= 
type=list 
+odd-row-style=alternate-row header-row-style=header-row-2 
+default-table-style=basic-table hover-bar
+actions
+service service-name=performFind result-map=result 
result-map-list=listIt
+field-map field-name=inputFields from-field=parameters/
+field-map field-name=entityName value=InvoiceItem/
+field-map field-name=viewIndex from-field=viewIndex/
+field-map field-name=viewSize from-field=viewSize/
+/service
+/actions
+auto-fields-entity

svn commit: r1674451 - /ofbiz/trunk/applications/content/ofbiz-component.xml

2015-04-18 Thread adrianc

Author: adrianc
Date: Sat Apr 18 07:33:29 2015
New Revision: 1674451

URL: http://svn.apache.org/r1674451
Log:
Fix OFBiz looking for web.xml in wrong place - 
https://issues.apache.org/jira/browse/OFBIZ-6259.

Modified:
ofbiz/trunk/applications/content/ofbiz-component.xml

Modified: ofbiz/trunk/applications/content/ofbiz-component.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/ofbiz-component.xml?rev=1674451r1=1674450r2=1674451view=diff
==
--- ofbiz/trunk/applications/content/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/content/ofbiz-component.xml Sat Apr 18 07:33:29 
2015
@@ -74,7 +74,7 @@ under the License.
 webapp name=contentimages
 title=Content Images
 server=default-server
-location=webapp/content/images
+location=webapp/contentimages
 mount-point=/contentimages/
 app-bar-display=false/

svn commit: r1674453 - in /ofbiz/trunk/framework/base/src/org/ofbiz/base/util: Debug.java UtilProperties.java

2015-04-18 Thread adrianc

Author: adrianc
Date: Sat Apr 18 08:30:03 2015
New Revision: 1674453

URL: http://svn.apache.org/r1674453
Log:
A small change to the behavior of the UtilProperties.createProperties() method: 
if the file is not found, return null instead of throwing an exception.

https://issues.apache.org/jira/browse/OFBIZ-6261

Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java?rev=1674453r1=1674452r2=1674453view=diff
==
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/Debug.java Sat Apr 18 
08:30:03 2015
@@ -66,8 +66,12 @@ public final class Debug {
 
 // initialize levelOnCache
 Properties properties = 
UtilProperties.createProperties(debug.properties);
-for (int i = 0; i  levelOnCache.length; i++) {
-levelOnCache[i] = (i == Debug.ALWAYS || 
true.equalsIgnoreCase(properties.getProperty(levelProps[i])));
+if (properties != null) {
+for (int i = 0; i  levelOnCache.length; i++) {
+levelOnCache[i] = (i == Debug.ALWAYS || 
true.equalsIgnoreCase(properties.getProperty(levelProps[i])));
+}
+} else {
+throw new IllegalStateException(debug.properties file not found);
 }
 }
 

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java?rev=1674453r1=1674452r2=1674453view=diff
==
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java 
(original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java Sat 
Apr 18 08:30:03 2015
@@ -287,9 +287,10 @@ public class UtilProperties implements S
  * properties files before OFBiz has been fully initialized./p
  * 
  * @param fileName The full name of the properties file (foo.properties)
- * @return A new codeProperties/code instance created from 
codefileName/code
+ * @return A new codeProperties/code instance created from 
codefileName/code, or
+ * codenull/code if the file was not found
  * @throws IllegalArgumentException if codefileName/code is empty
- * @throws IllegalStateException if there were any problems reading the 
file
+ * @throws IllegalStateException if there was a problem reading the file
  */
 public static Properties createProperties(String fileName) {
 Assert.notEmpty(fileName, fileName);
@@ -297,14 +298,14 @@ public class UtilProperties implements S
 try {
 URL url = 
Thread.currentThread().getContextClassLoader().getResource(fileName);
 if (url == null) {
-throw new IllegalStateException(fileName +  not found);
+return null;
 }
 inStream = url.openStream();
 Properties properties = new Properties();
 properties.load(inStream);
 return properties;
 } catch (Exception e) {
-throw new IllegalStateException(Exception thrown while reading 
debug.properties:  + e);
+throw new IllegalStateException(Exception thrown while reading  
+ fileName + :  + e);
 } finally {
 if (inStream != null) {
 try {

svn commit: r1674447 - /ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/Record.java

2015-04-18 Thread deepak

Author: deepak
Date: Sat Apr 18 06:40:32 2015
New Revision: 1674447

URL: http://svn.apache.org/r1674447
Log:
Applied patch from jira issue OFBIZ-4837 - Separator Error in data file tools.

Thanks   Gil Portenseigne for reporting and providing the patch for the issue, 
Thanks Aditya for uploading the update patch and verifying it.

Modified:
ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/Record.java

Modified: ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/Record.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/Record.java?rev=1674447r1=1674446r2=1674447view=diff
==
--- ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/Record.java (original)
+++ ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/Record.java Sat Apr 
18 06:40:32 2015
@@ -580,7 +580,14 @@ public class Record implements Serializa
 }
 }
 try {
-if (textDelimiter != null  (strVal.startsWith(textDelimiter)  
strVal.endsWith(textDelimiter))) {
+if (textDelimiter != null  strVal != null  
(strVal.startsWith(textDelimiter)  (!strVal.endsWith(textDelimiter) || 
strVal.length()==1))) {
+strVal = strVal.concat(+delimiter);
+while (!strVal.endsWith(textDelimiter)) {
+strVal = strVal.concat(st.nextToken());
+}
+st.nextToken();
+}
+if (textDelimiter != null  strVal != null  
(strVal.startsWith(textDelimiter)  strVal.endsWith(textDelimiter))) {
 strVal = strVal.substring(textDelimiter.length(), strVal.length() 
- textDelimiter.length());
 }
 record.setString(modelField.name, strVal);

svn commit: r1674449 - in /ofbiz/branches/release13.07: ./ framework/datafile/src/org/ofbiz/datafile/Record.java

2015-04-18 Thread deepak

Author: deepak
Date: Sat Apr 18 06:43:32 2015
New Revision: 1674449

URL: http://svn.apache.org/r1674449
Log:
Applied fix from trunk r#1674447

Applied patch from jira issue OFBIZ-4837 - Separator Error in data file tools.

Thanks   Gil Portenseigne for reporting and providing the patch for the issue, 
Thanks Aditya for uploading the update patch and verifying it.

Modified:
ofbiz/branches/release13.07/   (props changed)

ofbiz/branches/release13.07/framework/datafile/src/org/ofbiz/datafile/Record.java

Propchange: ofbiz/branches/release13.07/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 18 06:43:32 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,151,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,154,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,133,1666836,1666939,1666949,1667055,1667253,1668214,1668246,1668258,1668265,1668314,1669317,1670952,1672862,1673764

svn commit: r1674448 - in /ofbiz/branches/release14.12: ./ framework/datafile/src/org/ofbiz/datafile/Record.java

2015-04-18 Thread deepak

Author: deepak
Date: Sat Apr 18 06:43:13 2015
New Revision: 1674448

URL: http://svn.apache.org/r1674448
Log:
Applied fix from trunk r#1674447

Applied patch from jira issue OFBIZ-4837 - Separator Error in data file tools.

Thanks   Gil Portenseigne for reporting and providing the patch for the issue, 
Thanks Aditya for uploading the update patch and verifying it.

Modified:
ofbiz/branches/release14.12/   (props changed)

ofbiz/branches/release14.12/framework/datafile/src/org/ofbiz/datafile/Record.java

Propchange: ofbiz/branches/release14.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 18 06:43:13 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,133,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
+/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,133,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

Modified: 
ofbiz/branches/release14.12/framework/datafile/src/org/ofbiz/datafile/Record.java
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/datafile/src/org/ofbiz/datafile/Record.java?rev=1674448r1=1674447r2=1674448view=diff
==
--- 
ofbiz/branches/release14.12/framework/datafile/src/org/ofbiz/datafile/Record.java
 (original)
+++ 
ofbiz/branches/release14.12/framework/datafile/src/org/ofbiz/datafile/Record.java
 Sat Apr 18 06:43:13 2015
@@ -580,7 +580,14 @@ public class Record implements Serializa
 }
 }
 try {
-if (textDelimiter != null  (strVal.startsWith(textDelimiter)  
strVal.endsWith(textDelimiter))) {
+if (textDelimiter != null  strVal != null  
(strVal.startsWith(textDelimiter)  (!strVal.endsWith(textDelimiter) || 
strVal.length()==1))) {
+strVal = strVal.concat(+delimiter);
+while (!strVal.endsWith(textDelimiter)) {
+strVal = strVal.concat(st.nextToken());
+}
+st.nextToken();
+}
+if (textDelimiter != null  strVal != null  
(strVal.startsWith(textDelimiter)  strVal.endsWith(textDelimiter))) {
 strVal = strVal.substring(textDelimiter.length(), strVal.length() 
- textDelimiter.length());
 }
 record.setString(modelField.name, strVal);

svn commit: r1674450 - in /ofbiz/branches/release12.04: ./ framework/datafile/src/org/ofbiz/datafile/Record.java

2015-04-18 Thread deepak

Author: deepak
Date: Sat Apr 18 06:50:56 2015
New Revision: 1674450

URL: http://svn.apache.org/r1674450
Log:
Applied fix from trunk r#1674447

Applied patch from jira issue OFBIZ-4837 - Separator Error in data file tools.

Thanks   Gil Portenseigne for reporting and providing the patch for the issue, 
Thanks Aditya for uploading the update patch and verifying it.

Modified:
ofbiz/branches/release12.04/   (props changed)

ofbiz/branches/release12.04/framework/datafile/src/org/ofbiz/datafile/Record.java

Propchange: ofbiz/branches/release12.04/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 18 06:50:56 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,130,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,154,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,133,1666836,1667253,1668214,1668246,1668258,1668265,1668314,1669317,1670952,1673764

svn commit: r1674464 - /ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl

2015-04-18 Thread deepak

Author: deepak
Date: Sat Apr 18 08:49:56 2015
New Revision: 1674464

URL: http://svn.apache.org/r1674464
Log:
Applied slightly modified patch from jira issue OFBIZ-6202 - Expected hash 
Freemarker error in FindInventoryEventPlan

Thanks Paul Foxworthy for reporting and providing the patch for the issue.

Modified:

ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl

Modified: 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl?rev=1674464r1=1674463r2=1674464view=diff
==
--- 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
 (original)
+++ 
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
 Sat Apr 18 08:49:56 2015
@@ -103,9 +103,8 @@ document.lookupinventory.productId.focus
 table class=basic-table cellspacing=0
   tr
 td width='100%'
-  #if inventoryList??
-  #if 0  inventoryList?size
-   #assign rowClass = alternate-row
+  #if inventoryList?has_content
+ #assign rowClass = alternate-row
  table class=basic-table cellspacing=0
   tr
td width=50% 
class=boxhead${uiLabelMap.CommonElementsFound}/td
@@ -149,7 +148,7 @@ document.lookupinventory.productId.focus
 #assign productTmp = 
 #list inventoryList[lowIndex..highIndex-1] as inven
 #assign product = inven.getRelatedOne(Product, false)
-#if facilityId??  facilityId?has_content
+#if facilityId?has_content
 /#if
 #if ! product.equals( productTmp )
 #assign quantityAvailableAtDate = 0
@@ -161,7 +160,7 @@ document.lookupinventory.productId.focus
 #if qohEvents?has_content
 #assign initialQohEvent = 
Static[org.ofbiz.entity.util.EntityUtil].getFirst(qohEvents)
 /#if
-#if initialQohEvent??
+#if initialQohEvent?has_content
 #if initialQohEvent.quantity?has_content
 #assign quantityAvailableAtDate = 
initialQohEvent.quantity
 /#if
@@ -227,7 +226,6 @@ document.lookupinventory.productId.focus
div align=center${uiLabelMap.CommonNoElementFound}/div
br /
   /#if
-/#if
 /td
   /tr
 /table

svn commit: r1674468 - in /ofbiz/branches/release14.12: ./ applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl

2015-04-18 Thread deepak

Author: deepak
Date: Sat Apr 18 09:09:35 2015
New Revision: 1674468

URL: http://svn.apache.org/r1674468
Log:
Applied fix from trunk r#1674464

Applied slightly modified patch from jira issue OFBIZ-6202 - Expected hash 
Freemarker error in FindInventoryEventPlan

Thanks Paul Foxworthy for reporting and providing the patch for the issue.

Modified:
ofbiz/branches/release14.12/   (props changed)

ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl

Propchange: ofbiz/branches/release14.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 18 09:09:35 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,133,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
+/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,133,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

Modified: 
ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl?rev=1674468r1=1674467r2=1674468view=diff
==
--- 
ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
 (original)
+++ 
ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
 Sat Apr 18 09:09:35 2015
@@ -103,9 +103,8 @@ document.lookupinventory.productId.focus
 table class=basic-table cellspacing=0
   tr
 td width='100%'
-  #if inventoryList??
-  #if 0  inventoryList?size
-   #assign rowClass = alternate-row
+  #if inventoryList?has_content
+ #assign rowClass = alternate-row
  table class=basic-table cellspacing=0
   tr
td width=50% 
class=boxhead${uiLabelMap.CommonElementsFound}/td
@@ -149,7 +148,7 @@ document.lookupinventory.productId.focus
 #assign productTmp = 
 #list inventoryList[lowIndex..highIndex-1] as inven
 #assign product = inven.getRelatedOne(Product, false)
-#if facilityId??  facilityId?has_content
+#if facilityId?has_content
 /#if
 #if ! product.equals( productTmp )
 #assign quantityAvailableAtDate = 0
@@ -161,7 +160,7 @@ document.lookupinventory.productId.focus
 #if qohEvents?has_content
 #assign initialQohEvent =

svn commit: r1674469 - /ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl

2015-04-18 Thread deepak

Author: deepak
Date: Sat Apr 18 09:20:33 2015
New Revision: 1674469

URL: http://svn.apache.org/r1674469
Log:
Applied fix from trunk r#1674464

Applied slightly modified patch from jira issue OFBIZ-6202 - Expected hash 
Freemarker error in FindInventoryEventPlan

Thanks Paul Foxworthy for reporting and providing the patch for the issue.

Modified:

ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl

Modified: 
ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl?rev=1674469r1=1674468r2=1674469view=diff
==
--- 
ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
 (original)
+++ 
ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
 Sat Apr 18 09:20:33 2015
@@ -103,8 +103,7 @@ document.lookupinventory.productId.focus
 table class=basic-table cellspacing=0
   tr
 td width='100%'
-  #if inventoryList?exists
-  #if 0  inventoryList?size
+  #if inventoryList?has_content
#assign rowClass = alternate-row
  table class=basic-table cellspacing=0
   tr
@@ -149,7 +148,7 @@ document.lookupinventory.productId.focus
 #assign productTmp = 
 #list inventoryList[lowIndex..highIndex-1] as inven
 #assign product = inven.getRelatedOne(Product, false)
-#if facilityId?exists  facilityId?has_content
+#if facilityId?has_content
 /#if
 #if ! product.equals( productTmp )
 #assign quantityAvailableAtDate = 0
@@ -161,7 +160,7 @@ document.lookupinventory.productId.focus
 #if qohEvents?has_content
 #assign initialQohEvent = 
Static[org.ofbiz.entity.util.EntityUtil].getFirst(qohEvents)
 /#if
-#if initialQohEvent??
+#if initialQohEvent?has_content
 #if initialQohEvent.quantity?has_content
 #assign quantityAvailableAtDate = 
initialQohEvent.quantity
 /#if
@@ -227,7 +226,6 @@ document.lookupinventory.productId.focus
div align=center${uiLabelMap.CommonNoElementFound}/div
br /
   /#if
-/#if
 /td
   /tr
 /table

svn commit: r1674477 - /ofbiz/branches/release12.04/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl

2015-04-18 Thread deepak

Author: deepak
Date: Sat Apr 18 10:09:06 2015
New Revision: 1674477

URL: http://svn.apache.org/r1674477
Log:
Applied fix from trunk r#1674464

Applied slightly modified patch from jira issue OFBIZ-6202 - Expected hash 
Freemarker error in FindInventoryEventPlan

Thanks Paul Foxworthy for reporting and providing the patch for the issue.

Modified:

ofbiz/branches/release12.04/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl

Modified: 
ofbiz/branches/release12.04/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl?rev=1674477r1=1674476r2=1674477view=diff
==
--- 
ofbiz/branches/release12.04/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
 (original)
+++ 
ofbiz/branches/release12.04/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
 Sat Apr 18 10:09:06 2015
@@ -103,8 +103,7 @@ document.lookupinventory.productId.focus
 table class=basic-table cellspacing=0
   tr
 td width='100%'
-  #if inventoryList?exists
-  #if 0  inventoryList?size
+  #if inventoryList?has_content
#assign rowClass = alternate-row
  table class=basic-table cellspacing=0
   tr
@@ -149,7 +148,7 @@ document.lookupinventory.productId.focus
 #assign productTmp = 
 #list inventoryList[lowIndex..highIndex-1] as inven
 #assign product = inven.getRelatedOne(Product)
-#if facilityId?exists  facilityId?has_content
+#if facilityId?has_content
 /#if
 #if ! product.equals( productTmp )
 #assign quantityAvailableAtDate = 0
@@ -161,7 +160,7 @@ document.lookupinventory.productId.focus
 #if qohEvents?has_content
 #assign initialQohEvent = 
Static[org.ofbiz.entity.util.EntityUtil].getFirst(qohEvents)
 /#if
-#if initialQohEvent??
+#if initialQohEvent?has_content
 #if initialQohEvent.quantity?has_content
 #assign quantityAvailableAtDate = 
initialQohEvent.quantity
 /#if
@@ -227,7 +226,6 @@ document.lookupinventory.productId.focus
div align=center${uiLabelMap.CommonNoElementFound}/div
br /
   /#if
-/#if
 /td
   /tr
 /table

svn commit: r1674496 - in /ofbiz/trunk/applications/manufacturing: webapp/manufacturing/reports/ShipmentLabel.fo.ftl widget/manufacturing/ReportScreens.xml

svn commit: r1674503 - /ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/actions/category/CategoryTree.groovy

svn commit: r1674506 - in /ofbiz/branches/release13.07: ./ applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ applications/manufacturing/webapp/manufacturing/reports/ application

svn commit: r1674507 - in /ofbiz/branches/release12.04: ./ applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ applications/manufacturing/webapp/manufacturing/reports/ application

svn commit: r1674491 - in /ofbiz/trunk/applications/manufacturing: webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.f

svn commit: r1674498 - in /ofbiz/branches/release14.12: ./ applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl applications/manufacturing/widget/manufacturing/ReportScreens.xm

svn commit: r1674513 - in /ofbiz/trunk/framework/widget/templates: foFormMacroLibrary.ftl foScreenMacroLibrary.ftl

svn commit: r1674482 - in /ofbiz/trunk: ./ framework/start/src/org/ofbiz/base/start/ specialpurpose/ specialpurpose/jetty/ themes/bizznesstime/ themes/bluelight/ themes/droppingcrumbs/ themes/flatgrey

svn commit: r1674517 - in /ofbiz/branches/release13.07/framework/widget/templates: foFormMacroLibrary.ftl foScreenMacroLibrary.ftl

svn commit: r1674501 - in /ofbiz/branches/release12.04: ./ applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl applications/manufacturing/widget/manufacturing/ReportScreens.xm

svn commit: r1674500 - in /ofbiz/branches/release13.07: ./ applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl applications/manufacturing/widget/manufacturing/ReportScreens.xm

svn commit: r1674515 - in /ofbiz/branches/release14.12/framework/widget/templates: foFormMacroLibrary.ftl foScreenMacroLibrary.ftl

svn commit: r1674492 - in /ofbiz/branches/release14.12: ./ applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ applications/manufacturing/webapp/manufacturing/reports/ application

svn commit: r1674546 - /ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Config.java

svn commit: r1674586 - in /ofbiz/trunk: applications/content/webapp/content/fonts.fo.ftl specialpurpose/example/config/ExampleUiLabels.xml specialpurpose/example/webapp/example/WEB-INF/controller.xml

svn commit: r1674587 - in /ofbiz/trunk/applications/accounting: webapp/accounting/WEB-INF/controller.xml widget/TaxAuthorityForms.xml widget/TaxAuthorityMenus.xml widget/TaxAuthorityScreens.xml

svn commit: r1674451 - /ofbiz/trunk/applications/content/ofbiz-component.xml

svn commit: r1674453 - in /ofbiz/trunk/framework/base/src/org/ofbiz/base/util: Debug.java UtilProperties.java

svn commit: r1674447 - /ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/Record.java

svn commit: r1674449 - in /ofbiz/branches/release13.07: ./ framework/datafile/src/org/ofbiz/datafile/Record.java

svn commit: r1674448 - in /ofbiz/branches/release14.12: ./ framework/datafile/src/org/ofbiz/datafile/Record.java

svn commit: r1674450 - in /ofbiz/branches/release12.04: ./ framework/datafile/src/org/ofbiz/datafile/Record.java

svn commit: r1674464 - /ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl

svn commit: r1674468 - in /ofbiz/branches/release14.12: ./ applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl

svn commit: r1674469 - /ofbiz/branches/release13.07/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl

svn commit: r1674477 - /ofbiz/branches/release12.04/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl

26 matches

Site Navigation

Mail list logo

Footer information