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
10071e19
Commit
10071e19
authored
Dec 26, 2017
by
Tomáš Peterka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_accounting] Replace unserializable `selection` for `selection_name` in stat scripts
parent
ca4256e4
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
32 additions
and
17 deletions
+32
-17
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_statCredit.py
...teItem/portal_skins/erp5_accounting/Account_statCredit.py
+7
-4
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_statCredit.xml
...eItem/portal_skins/erp5_accounting/Account_statCredit.xml
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_statDebit.py
...ateItem/portal_skins/erp5_accounting/Account_statDebit.py
+8
-3
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_statDebit.xml
...teItem/portal_skins/erp5_accounting/Account_statDebit.xml
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_statCredit.py
...em/portal_skins/erp5_accounting/BankAccount_statCredit.py
+3
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_statCredit.xml
...m/portal_skins/erp5_accounting/BankAccount_statCredit.xml
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_statDebit.py
...tem/portal_skins/erp5_accounting/BankAccount_statDebit.py
+3
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_statDebit.xml
...em/portal_skins/erp5_accounting/BankAccount_statDebit.xml
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_statCredit.py
...ateItem/portal_skins/erp5_accounting/Entity_statCredit.py
+2
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_statCredit.xml
...teItem/portal_skins/erp5_accounting/Entity_statCredit.xml
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_statDebit.py
...lateItem/portal_skins/erp5_accounting/Entity_statDebit.py
+3
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_statDebit.xml
...ateItem/portal_skins/erp5_accounting/Entity_statDebit.xml
+1
-1
No files found.
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_statCredit.py
View file @
10071e19
"""Total credit of all accounting transactions having this
"""Total credit of all accounting transactions having this
account as node
account as
a
node
"""
"""
kw
[
'node_uid'
]
=
context
.
getUid
()
kw
.
update
(
kw
[
'omit_asset_increase'
]
=
1
node_uid
=
context
.
getUid
(),
kw
.
update
(
kw
[
'selection'
].
getParams
())
omit_asset_increase
=
1
,
)
kw
.
update
(
**
context
.
getPortalObject
().
portal_selections
.
getSelectionParamsFor
(
selection_name
))
# here, or 0 is to prevent displaying "- 0"
# here, or 0 is to prevent displaying "- 0"
return
-
context
.
Node_statAccountingBalance
(
**
kw
)
or
0
return
-
context
.
Node_statAccountingBalance
(
**
kw
)
or
0
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_statCredit.xml
View file @
10071e19
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
_params
</string>
</key>
<key>
<string>
_params
</string>
</key>
<value>
<string>
**kw
</string>
</value>
<value>
<string>
selection_name,
**kw
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_statDebit.py
View file @
10071e19
"""Total debit of all accounting transactions having this
"""Total debit of all accounting transactions having this
account as a node
account as a node
"""
"""
kw
[
'node_uid'
]
=
context
.
getUid
()
kw
[
'omit_asset_decrease'
]
=
1
kw
.
update
(
kw
.
update
(
kw
[
'selection'
].
getParams
())
node_uid
=
context
.
getUid
(),
omit_asset_decrease
=
1
)
# force second update to overwrite anything by selection params
kw
.
update
(
**
context
.
getPortalObject
().
portal_selections
.
getSelectionParamsFor
(
selection_name
,
REQUEST
=
kw
.
get
(
'REQUEST'
,
None
)))
return
context
.
Node_statAccountingBalance
(
**
kw
)
return
context
.
Node_statAccountingBalance
(
**
kw
)
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_statDebit.xml
View file @
10071e19
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
_params
</string>
</key>
<key>
<string>
_params
</string>
</key>
<value>
<string>
**kw
</string>
</value>
<value>
<string>
selection_name,
**kw
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_statCredit.py
View file @
10071e19
...
@@ -5,7 +5,9 @@ kw['payment_uid'] = context.getUid()
...
@@ -5,7 +5,9 @@ kw['payment_uid'] = context.getUid()
kw
[
'omit_asset_increase'
]
=
1
kw
[
'omit_asset_increase'
]
=
1
kw
[
'asset_price'
]
=
False
kw
[
'asset_price'
]
=
False
kw
[
'node_category'
]
=
'account_type/asset/cash/bank'
kw
[
'node_category'
]
=
'account_type/asset/cash/bank'
kw
.
update
(
kw
[
'selection'
].
getParams
())
kw
.
update
(
**
context
.
getPortalObject
().
portal_selections
.
getSelectionParamsFor
(
selection_name
,
REQUEST
=
kw
.
get
(
'REQUEST'
,
None
)))
# here, or 0 is to prevent displaying "- 0"
# here, or 0 is to prevent displaying "- 0"
return
-
context
.
Node_statAccountingBalance
(
**
kw
)
or
0
return
-
context
.
Node_statAccountingBalance
(
**
kw
)
or
0
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_statCredit.xml
View file @
10071e19
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
_params
</string>
</key>
<key>
<string>
_params
</string>
</key>
<value>
<string>
**kw
</string>
</value>
<value>
<string>
selection_name,
**kw
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_statDebit.py
View file @
10071e19
...
@@ -5,6 +5,8 @@ kw['payment_uid'] = context.getUid()
...
@@ -5,6 +5,8 @@ kw['payment_uid'] = context.getUid()
kw
[
'omit_asset_decrease'
]
=
1
kw
[
'omit_asset_decrease'
]
=
1
kw
[
'asset_price'
]
=
False
kw
[
'asset_price'
]
=
False
kw
[
'node_category'
]
=
'account_type/asset/cash/bank'
kw
[
'node_category'
]
=
'account_type/asset/cash/bank'
kw
.
update
(
kw
[
'selection'
].
getParams
())
kw
.
update
(
**
context
.
getPortalObject
().
portal_selections
.
getSelectionParamsFor
(
selection_name
,
REQUEST
=
kw
.
get
(
'REQUEST'
,
None
)))
return
context
.
Node_statAccountingBalance
(
**
kw
)
return
context
.
Node_statAccountingBalance
(
**
kw
)
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_statDebit.xml
View file @
10071e19
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
_params
</string>
</key>
<key>
<string>
_params
</string>
</key>
<value>
<string>
**kw
</string>
</value>
<value>
<string>
selection_name,
**kw
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_statCredit.py
View file @
10071e19
...
@@ -6,7 +6,8 @@ kw['mirror_section_uid'] = context.getUid()
...
@@ -6,7 +6,8 @@ kw['mirror_section_uid'] = context.getUid()
kw
[
'omit_asset_increase'
]
=
1
kw
[
'omit_asset_increase'
]
=
1
kw
[
'node_category_strict_membership'
]
=
[
'account_type/asset/receivable'
,
kw
[
'node_category_strict_membership'
]
=
[
'account_type/asset/receivable'
,
'account_type/liability/payable'
]
'account_type/liability/payable'
]
kw
.
update
(
kw
[
'selection'
].
getParams
())
kw
.
update
(
**
context
.
getPortalObject
().
portal_selections
.
getSelectionParamsFor
(
selection_name
,
REQUEST
=
kw
.
get
(
'REQUEST'
,
None
)))
# here, or 0 is to prevent displaying "- 0"
# here, or 0 is to prevent displaying "- 0"
return
-
context
.
Node_statAccountingBalance
(
**
kw
)
or
0
return
-
context
.
Node_statAccountingBalance
(
**
kw
)
or
0
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_statCredit.xml
View file @
10071e19
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
_params
</string>
</key>
<key>
<string>
_params
</string>
</key>
<value>
<string>
**kw
</string>
</value>
<value>
<string>
selection_name,
**kw
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_statDebit.py
View file @
10071e19
...
@@ -5,6 +5,8 @@ kw['mirror_section_uid'] = context.getUid()
...
@@ -5,6 +5,8 @@ kw['mirror_section_uid'] = context.getUid()
kw
[
'omit_asset_decrease'
]
=
1
kw
[
'omit_asset_decrease'
]
=
1
kw
[
'node_category_strict_membership'
]
=
[
'account_type/asset/receivable'
,
kw
[
'node_category_strict_membership'
]
=
[
'account_type/asset/receivable'
,
'account_type/liability/payable'
]
'account_type/liability/payable'
]
kw
.
update
(
kw
[
'selection'
].
getParams
())
kw
.
update
(
**
context
.
getPortalObject
().
portal_selections
.
getSelectionParamsFor
(
selection_name
,
REQUEST
=
kw
.
get
(
'REQUEST'
,
None
)))
return
context
.
Node_statAccountingBalance
(
**
kw
)
return
context
.
Node_statAccountingBalance
(
**
kw
)
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_statDebit.xml
View file @
10071e19
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
_params
</string>
</key>
<key>
<string>
_params
</string>
</key>
<value>
<string>
**kw
</string>
</value>
<value>
<string>
selection_name,
**kw
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
...
...
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