Commit 0254eb66 authored by Vincent Pelletier's avatar Vincent Pelletier Committed by Georgios Dagkakis

erp5_core: Remove a few trailing whitespaces.

parent 397af016
...@@ -63,7 +63,7 @@ FROM ...@@ -63,7 +63,7 @@ FROM
<dtml-var from_expression> <dtml-var from_expression>
<dtml-else> <dtml-else>
catalog catalog
<dtml-in prefix="table" expr="from_table_list"> <dtml-in prefix="table" expr="from_table_list">
<dtml-if expr="table_key not in ('catalog', stock_table_id)"> <dtml-if expr="table_key not in ('catalog', stock_table_id)">
, <dtml-var table_item> AS <dtml-var table_key> , <dtml-var table_item> AS <dtml-var table_key>
</dtml-if> </dtml-if>
...@@ -71,7 +71,7 @@ FROM ...@@ -71,7 +71,7 @@ FROM
, <dtml-var stock_table_id> , <dtml-var stock_table_id>
</dtml-if> </dtml-if>
<dtml-if quantity_unit_uid> <dtml-comment>XXX quantity unit conversion will not work when using implict_join=False</dtml-comment> <dtml-if quantity_unit_uid> <dtml-comment>XXX quantity unit conversion will not work when using implict_join=False</dtml-comment>
LEFT JOIN quantity_unit_conversion ON LEFT JOIN quantity_unit_conversion ON
(quantity_unit_conversion.resource_uid = <dtml-var stock_table_id>.resource_uid (quantity_unit_conversion.resource_uid = <dtml-var stock_table_id>.resource_uid
AND quantity_unit_conversion.quantity_unit_uid = <dtml-sqlvar quantity_unit_uid type=int>) AND quantity_unit_conversion.quantity_unit_uid = <dtml-sqlvar quantity_unit_uid type=int>)
</dtml-if> </dtml-if>
......
...@@ -8,11 +8,11 @@ SET @running_total_quantity := <dtml-var initial_running_total_quantity>, ...@@ -8,11 +8,11 @@ SET @running_total_quantity := <dtml-var initial_running_total_quantity>,
@running_total_price := <dtml-var initial_running_total_price>; @running_total_price := <dtml-var initial_running_total_price>;
<dtml-var sql_delimiter> <dtml-var sql_delimiter>
SELECT SELECT
q1.*, q1.*,
@running_total_quantity := q1.total_quantity + @running_total_quantity := q1.total_quantity +
@running_total_quantity AS running_total_quantity, @running_total_quantity AS running_total_quantity,
@running_total_price := IFNULL(q1.total_price, 0) + @running_total_price := IFNULL(q1.total_price, 0) +
@running_total_price AS running_total_price @running_total_price AS running_total_price
FROM ( FROM (
SELECT SELECT
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment