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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
preetwinder
erp5
Commits
67688270
Commit
67688270
authored
Jun 08, 2017
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
accounting: fix P&L and BS reports using non existant styles
( see existing styles in Base_getODSStyleSheet )
parent
6aa6ebbd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewBalanceSheetReport.oot
.../erp5_accounting/AccountModule_viewBalanceSheetReport.oot
+4
-4
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewProfitAndLossReport.oot
...erp5_accounting/AccountModule_viewProfitAndLossReport.oot
+8
-8
No files found.
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewBalanceSheetReport.oot
View file @
67688270
...
@@ -430,7 +430,7 @@
...
@@ -430,7 +430,7 @@
<!-- TOTAL LEVEL 1 {{{ -->
<!-- TOTAL LEVEL 1 {{{ -->
<table:table-row
table:style-name=
'ro7'
>
<table:table-row
table:style-name=
'ro7'
>
<table:table-cell
table:style-name=
'report-stat1'
office:value-type=
'string'
tal:define=
"global level1_counter python:level1_counter + 1"
>
<table:table-cell
table:style-name=
'report-stat
-heading
1'
office:value-type=
'string'
tal:define=
"global level1_counter python:level1_counter + 1"
>
<text:p
i18n:translate=
""
i18n:domain=
"ui"
>
Total
<tal:block
i18n:name=
"category_level_1_title"
tal:content=
'level1_title'
>
<text:p
i18n:translate=
""
i18n:domain=
"ui"
>
Total
<tal:block
i18n:name=
"category_level_1_title"
tal:content=
'level1_title'
>
</tal:block>
<tal:block
i18n:name=
"level1_counter"
tal:content=
'level1_counter'
>
</tal:block>
<tal:block
i18n:name=
"level1_counter"
tal:content=
'level1_counter'
>
</tal:block></text:p>
</tal:block></text:p>
...
@@ -480,7 +480,7 @@
...
@@ -480,7 +480,7 @@
<!-- TOTAL LEVEL 2 {{{ -->
<!-- TOTAL LEVEL 2 {{{ -->
<table:table-row>
<table:table-row>
<table:table-cell
table:style-name=
'report-stat2'
office:value-type=
'string'
>
<table:table-cell
table:style-name=
'report-stat
-heading
2'
office:value-type=
'string'
>
<text:p
i18n:translate=
""
i18n:domain=
"ui"
>
Total
<tal:block
i18n:name=
"class"
<text:p
i18n:translate=
""
i18n:domain=
"ui"
>
Total
<tal:block
i18n:name=
"class"
i18n:translate=
''
i18n:domain=
"ui"
tal:content=
'string:Asset'
></tal:block></text:p>
i18n:translate=
''
i18n:domain=
"ui"
tal:content=
'string:Asset'
></tal:block></text:p>
</table:table-cell>
</table:table-cell>
...
@@ -883,7 +883,7 @@
...
@@ -883,7 +883,7 @@
<!-- TOTAL LEVEL 1 {{{ -->
<!-- TOTAL LEVEL 1 {{{ -->
<table:table-row
table:style-name=
'ro7'
>
<table:table-row
table:style-name=
'ro7'
>
<table:table-cell
table:style-name=
'report-stat1'
<table:table-cell
table:style-name=
'report-stat
-heading
1'
office:value-type=
'string'
office:value-type=
'string'
table:number-rows-spanned=
'1'
table:number-rows-spanned=
'1'
table:number-columns-spanned=
'3'
>
table:number-columns-spanned=
'3'
>
...
@@ -919,7 +919,7 @@
...
@@ -919,7 +919,7 @@
<!-- TOTAL LEVEL 2 {{{ -->
<!-- TOTAL LEVEL 2 {{{ -->
<table:table-row>
<table:table-row>
<table:table-cell
table:style-name=
'report-stat2'
<table:table-cell
table:style-name=
'report-stat
-heading
2'
office:value-type=
'string'
office:value-type=
'string'
table:number-rows-spanned=
'1'
table:number-rows-spanned=
'1'
table:number-columns-spanned=
'3'
>
table:number-columns-spanned=
'3'
>
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewProfitAndLossReport.oot
View file @
67688270
...
@@ -403,7 +403,7 @@
...
@@ -403,7 +403,7 @@
<!-- TOTAL LEVEL 1 {{{ -->
<!-- TOTAL LEVEL 1 {{{ -->
<table:table-row
table:style-name=
'ro7'
>
<table:table-row
table:style-name=
'ro7'
>
<table:table-cell
table:style-name=
'report-stat1'
<table:table-cell
table:style-name=
'report-stat
-heading
1'
office:value-type=
'string'
office:value-type=
'string'
table:number-columns-spanned=
'3'
table:number-columns-spanned=
'3'
table:number-rows-spanned=
'1'
table:number-rows-spanned=
'1'
...
@@ -439,7 +439,7 @@
...
@@ -439,7 +439,7 @@
<!-- loop level 2 -->
<!-- loop level 2 -->
<!-- Total expense {{{ -->
<!-- Total expense {{{ -->
<table:table-row>
<table:table-row>
<table:table-cell
table:style-name=
'report-stat2'
<table:table-cell
table:style-name=
'report-stat
-heading
2'
table:number-columns-spanned=
'3'
table:number-columns-spanned=
'3'
table:number-rows-spanned=
'1'
table:number-rows-spanned=
'1'
office:value-type=
'string'
>
office:value-type=
'string'
>
...
@@ -460,7 +460,7 @@
...
@@ -460,7 +460,7 @@
<!-- NET PROFIT {{{ -->
<!-- NET PROFIT {{{ -->
<table:table-row
tal:condition=
"python: net_income < 0 or net_income_previous_period < 0"
>
<table:table-row
tal:condition=
"python: net_income < 0 or net_income_previous_period < 0"
>
<table:table-cell
table:style-name=
'report-stat2'
<table:table-cell
table:style-name=
'report-stat
-heading
2'
office:value-type=
'string'
office:value-type=
'string'
table:number-rows-spanned=
'1'
table:number-rows-spanned=
'1'
table:number-columns-spanned=
'3'
>
table:number-columns-spanned=
'3'
>
...
@@ -479,7 +479,7 @@
...
@@ -479,7 +479,7 @@
<!-- TOTAL LEVEL 2 {{{ -->
<!-- TOTAL LEVEL 2 {{{ -->
<table:table-row>
<table:table-row>
<table:table-cell
table:style-name=
'report-stat2'
<table:table-cell
table:style-name=
'report-stat
-heading
2'
table:number-columns-spanned=
'3'
table:number-columns-spanned=
'3'
table:number-rows-spanned=
'1'
table:number-rows-spanned=
'1'
office:value-type=
'string'
>
office:value-type=
'string'
>
...
@@ -757,7 +757,7 @@
...
@@ -757,7 +757,7 @@
<!-- TOTAL LEVEL 1 {{{ -->
<!-- TOTAL LEVEL 1 {{{ -->
<table:table-row
table:style-name=
'ro7'
>
<table:table-row
table:style-name=
'ro7'
>
<table:table-cell
table:style-name=
'report-stat1'
<table:table-cell
table:style-name=
'report-stat
-heading
1'
office:value-type=
'string'
office:value-type=
'string'
table:number-rows-spanned=
'1'
table:number-rows-spanned=
'1'
table:number-columns-spanned=
'3'
>
table:number-columns-spanned=
'3'
>
...
@@ -793,7 +793,7 @@
...
@@ -793,7 +793,7 @@
<!-- TOTAL INCOME {{{ -->
<!-- TOTAL INCOME {{{ -->
<table:table-row>
<table:table-row>
<table:table-cell
table:style-name=
'report-stat2'
<table:table-cell
table:style-name=
'report-stat
-heading
2'
office:value-type=
'string'
office:value-type=
'string'
table:number-rows-spanned=
'1'
table:number-rows-spanned=
'1'
table:number-columns-spanned=
'3'
>
table:number-columns-spanned=
'3'
>
...
@@ -811,7 +811,7 @@
...
@@ -811,7 +811,7 @@
<!-- NET LOSS {{{ -->
<!-- NET LOSS {{{ -->
<table:table-row
tal:condition=
"python: net_income > 0 or net_income_previous_period > 0"
>
<table:table-row
tal:condition=
"python: net_income > 0 or net_income_previous_period > 0"
>
<table:table-cell
table:style-name=
'report-stat2'
<table:table-cell
table:style-name=
'report-stat
-heading
2'
office:value-type=
'string'
office:value-type=
'string'
table:number-rows-spanned=
'1'
table:number-rows-spanned=
'1'
table:number-columns-spanned=
'3'
>
table:number-columns-spanned=
'3'
>
...
@@ -830,7 +830,7 @@
...
@@ -830,7 +830,7 @@
<!-- TOTAL LEVEL 2 {{{ -->
<!-- TOTAL LEVEL 2 {{{ -->
<table:table-row>
<table:table-row>
<table:table-cell
table:style-name=
'report-stat2'
<table:table-cell
table:style-name=
'report-stat
-heading
2'
office:value-type=
'string'
office:value-type=
'string'
table:number-rows-spanned=
'1'
table:number-rows-spanned=
'1'
table:number-columns-spanned=
'3'
>
table:number-columns-spanned=
'3'
>
...
...
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