svn commit: r1814278 - in /ofbiz/branches/release16.11: ./ applications/order/entitydef/entitymodel_view.xml applications/order/template/reports/SalesByStoreReport.fo.ftl applications/order/widget/ordermgr/ReportScreens.xml

Author: jleroux
Date: Sat Nov  4 11:37:52 2017
New Revision: 1814278

URL: http://svn.apache.org/viewvc?rev=1814278&view=rev
Log:
"Applied fix from trunk framework for revision: 1814277  "
------------------------------------------------------------------------
r1814277 | jleroux | 2017-11-04 12:36:25 +0100 (sam., 04 nov. 2017) | 10 lines

Fixed: Sales by Store report calculates Value Sold incorrectly
(OFBIZ-9958)

Sales by Store report calculate Value Sold without taking into account order
item quantity.

jleroux: I also noticed that given products (free ones, due to^promotion) are
counted as paid products, another thing to fix

Thanks: Oleg Andreyev
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/applications/order/entitydef/entitymodel_view.xml
    ofbiz/branches/release16.11/applications/order/template/reports/SalesByStoreReport.fo.ftl
    ofbiz/branches/release16.11/applications/order/widget/ordermgr/ReportScreens.xml

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov  4 11:37:52 2017
@@ -10,5 +10,5 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277
 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: ofbiz/branches/release16.11/applications/order/entitydef/entitymodel_view.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/entitydef/entitymodel_view.xml?rev=1814278&r1=1814277&r2=1814278&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/entitydef/entitymodel_view.xml (original)
+++ ofbiz/branches/release16.11/applications/order/entitydef/entitymodel_view.xml Sat Nov  4 11:37:52 2017
@@ -1194,7 +1194,15 @@ under the License.
           <complex-alias-field entity-alias="OI" field="cancelQuantity" default-value="0"/>
         </complex-alias>
       </alias>
-      <alias entity-alias="OI" name="unitPrice" function="sum"/>
+      <alias entity-alias="OI" name="amount" function="sum">
+        <complex-alias operator="*">
+          <complex-alias operator="-">
+            <complex-alias-field entity-alias="OI" field="quantity" default-value="0"/>
+            <complex-alias-field entity-alias="OI" field="cancelQuantity" default-value="0"/>
+          </complex-alias>
+          <complex-alias-field entity-alias="OI" field="unitPrice" default-value="0"/>
+        </complex-alias>
+      </alias>
       <view-link entity-alias="OH" rel-entity-alias="OI">
         <key-map field-name="orderId"/>
       </view-link>

Modified: ofbiz/branches/release16.11/applications/order/template/reports/SalesByStoreReport.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/template/reports/SalesByStoreReport.fo.ftl?rev=1814278&r1=1814277&r2=1814278&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/template/reports/SalesByStoreReport.fo.ftl (original)
+++ ofbiz/branches/release16.11/applications/order/template/reports/SalesByStoreReport.fo.ftl Sat Nov  4 11:37:52 2017
@@ -87,7 +87,7 @@ under the License.
                                 <fo:block>${productReport.quantityOrdered!}</fo:block>
                             </fo:table-cell>
                             <fo:table-cell padding="2pt" background-color="${rowColor}">
-                                <fo:block>${productReport.unitPrice!}</fo:block>
+                                <fo:block>${productReport.amount!}</fo:block>
                             </fo:table-cell>
                         </fo:table-row>
                         <#-- toggle the row color -->

Modified: ofbiz/branches/release16.11/applications/order/widget/ordermgr/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/widget/ordermgr/ReportScreens.xml?rev=1814278&r1=1814277&r2=1814278&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/widget/ordermgr/ReportScreens.xml (original)
+++ ofbiz/branches/release16.11/applications/order/widget/ordermgr/ReportScreens.xml Sat Nov  4 11:37:52 2017
@@ -225,7 +225,7 @@ under the License.
                     <select-field field-name="productId"/>
                     <select-field field-name="internalName"/>
                     <select-field field-name="quantityOrdered"/>
-                    <select-field field-name="unitPrice"/>
+                    <select-field field-name="amount"/>
                     <order-by field-name="storeName"/>
                     <order-by field-name="internalName"/>
                 </entity-condition>