Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
amrani
erp5
Commits
0254eb66
Commit
0254eb66
authored
Sep 25, 2017
by
Vincent Pelletier
Committed by
Georgios Dagkakis
Oct 03, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_core: Remove a few trailing whitespaces.
parent
397af016
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.sql
...tem/portal_skins/erp5_core/Resource_zGetInventoryList.sql
+2
-2
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.sql
...rtal_skins/erp5_core/Resource_zGetMovementHistoryList.sql
+3
-3
No files found.
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.sql
View file @
0254eb66
...
...
@@ -63,7 +63,7 @@ FROM
<
dtml
-
var
from_expression
>
<
dtml
-
else
>
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
-
var
table_item
>
AS
<
dtml
-
var
table_key
>
</
dtml
-
if
>
...
...
@@ -71,7 +71,7 @@ FROM
,
<
dtml
-
var
stock_table_id
>
</
dtml
-
if
>
<
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
AND
quantity_unit_conversion
.
quantity_unit_uid
=
<
dtml
-
sqlvar
quantity_unit_uid
type
=
int
>
)
</
dtml
-
if
>
...
...
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.sql
View file @
0254eb66
...
...
@@ -8,11 +8,11 @@ SET @running_total_quantity := <dtml-var initial_running_total_quantity>,
@
running_total_price
:
=
<
dtml
-
var
initial_running_total_price
>
;
<
dtml
-
var
sql_delimiter
>
SELECT
SELECT
q1
.
*
,
@
running_total_quantity
:
=
q1
.
total_quantity
+
@
running_total_quantity
:
=
q1
.
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
FROM
(
SELECT
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment