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
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
a5dcb27b
Commit
a5dcb27b
authored
Jun 11, 2018
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_accounting] WIP: uids are deprecated
parent
0bf19426
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
47 additions
and
41 deletions
+47
-41
bt5/erp5_accounting/ActionTemplateItem/portal_types/Account/grouping_reference_fast_input.xml
...em/portal_types/Account/grouping_reference_fast_input.xml
+2
-2
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/accounting_line_export.xml
...ounting%20Transaction%20Module/accounting_line_export.xml
+2
-2
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/create_related_payments.xml
...unting%20Transaction%20Module/create_related_payments.xml
+2
-2
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/create_reversal.xml
...pes/Accounting%20Transaction%20Module/create_reversal.xml
+2
-2
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/grouping_reference_fast_input.xml
...%20Transaction%20Module/grouping_reference_fast_input.xml
+2
-2
bt5/erp5_accounting/ActionTemplateItem/portal_types/Organisation/grouping_reference_fast_input.xml
...rtal_types/Organisation/grouping_reference_fast_input.xml
+2
-2
bt5/erp5_accounting/ActionTemplateItem/portal_types/Person/grouping_reference_fast_input.xml
...tem/portal_types/Person/grouping_reference_fast_input.xml
+2
-2
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_createRelatedPaymentTransactionList.py
...gTransactionModule_createRelatedPaymentTransactionList.py
+10
-7
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_setGroupingReference.py
...nting/AccountingTransactionModule_setGroupingReference.py
+23
-20
No files found.
bt5/erp5_accounting/ActionTemplateItem/portal_types/Account/grouping_reference_fast_input.xml
View file @
a5dcb27b
...
@@ -16,13 +16,13 @@
...
@@ -16,13 +16,13 @@
<key>
<string>
categories
</string>
</key>
<key>
<string>
categories
</string>
</key>
<value>
<value>
<tuple>
<tuple>
<string>
action_type/object_button
</string>
<string>
action_type/object_
jio_
button
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
category
</string>
</key>
<key>
<string>
category
</string>
</key>
<value>
<string>
object_button
</string>
</value>
<value>
<string>
object_
jio_
button
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
condition
</string>
</key>
<key>
<string>
condition
</string>
</key>
...
...
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/accounting_line_export.xml
View file @
a5dcb27b
...
@@ -16,13 +16,13 @@
...
@@ -16,13 +16,13 @@
<key>
<string>
categories
</string>
</key>
<key>
<string>
categories
</string>
</key>
<value>
<value>
<tuple>
<tuple>
<string>
action_type/object_exchange
</string>
<string>
action_type/object_
jio_
exchange
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
category
</string>
</key>
<key>
<string>
category
</string>
</key>
<value>
<string>
object_exchange
</string>
</value>
<value>
<string>
object_
jio_
exchange
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
condition
</string>
</key>
<key>
<string>
condition
</string>
</key>
...
...
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/create_related_payments.xml
View file @
a5dcb27b
...
@@ -16,13 +16,13 @@
...
@@ -16,13 +16,13 @@
<key>
<string>
categories
</string>
</key>
<key>
<string>
categories
</string>
</key>
<value>
<value>
<tuple>
<tuple>
<string>
action_type/object_action
</string>
<string>
action_type/object_
jio_
action
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
category
</string>
</key>
<key>
<string>
category
</string>
</key>
<value>
<string>
object_action
</string>
</value>
<value>
<string>
object_
jio_
action
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
condition
</string>
</key>
<key>
<string>
condition
</string>
</key>
...
...
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/create_reversal.xml
View file @
a5dcb27b
...
@@ -16,13 +16,13 @@
...
@@ -16,13 +16,13 @@
<key>
<string>
categories
</string>
</key>
<key>
<string>
categories
</string>
</key>
<value>
<value>
<tuple>
<tuple>
<string>
action_type/object_action
</string>
<string>
action_type/object_
jio_
action
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
category
</string>
</key>
<key>
<string>
category
</string>
</key>
<value>
<string>
object_action
</string>
</value>
<value>
<string>
object_
jio_
action
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
condition
</string>
</key>
<key>
<string>
condition
</string>
</key>
...
...
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/grouping_reference_fast_input.xml
View file @
a5dcb27b
...
@@ -16,13 +16,13 @@
...
@@ -16,13 +16,13 @@
<key>
<string>
categories
</string>
</key>
<key>
<string>
categories
</string>
</key>
<value>
<value>
<tuple>
<tuple>
<string>
action_type/object_button
</string>
<string>
action_type/object_
jio_
button
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
category
</string>
</key>
<key>
<string>
category
</string>
</key>
<value>
<string>
object_button
</string>
</value>
<value>
<string>
object_
jio_
button
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
condition
</string>
</key>
<key>
<string>
condition
</string>
</key>
...
...
bt5/erp5_accounting/ActionTemplateItem/portal_types/Organisation/grouping_reference_fast_input.xml
View file @
a5dcb27b
...
@@ -16,13 +16,13 @@
...
@@ -16,13 +16,13 @@
<key>
<string>
categories
</string>
</key>
<key>
<string>
categories
</string>
</key>
<value>
<value>
<tuple>
<tuple>
<string>
action_type/object_button
</string>
<string>
action_type/object_
jio_
button
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
category
</string>
</key>
<key>
<string>
category
</string>
</key>
<value>
<string>
object_button
</string>
</value>
<value>
<string>
object_
jio_
button
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
condition
</string>
</key>
<key>
<string>
condition
</string>
</key>
...
...
bt5/erp5_accounting/ActionTemplateItem/portal_types/Person/grouping_reference_fast_input.xml
View file @
a5dcb27b
...
@@ -16,13 +16,13 @@
...
@@ -16,13 +16,13 @@
<key>
<string>
categories
</string>
</key>
<key>
<string>
categories
</string>
</key>
<value>
<value>
<tuple>
<tuple>
<string>
action_type/object_button
</string>
<string>
action_type/object_
jio_
button
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
category
</string>
</key>
<key>
<string>
category
</string>
</key>
<value>
<string>
object_button
</string>
</value>
<value>
<string>
object_
jio_
button
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
condition
</string>
</key>
<key>
<string>
condition
</string>
</key>
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_createRelatedPaymentTransactionList.py
View file @
a5dcb27b
...
@@ -4,9 +4,13 @@ portal = context.getPortalObject()
...
@@ -4,9 +4,13 @@ portal = context.getPortalObject()
countMessage
=
portal
.
portal_activities
.
countMessage
countMessage
=
portal
.
portal_activities
.
countMessage
invoice_type_list
=
portal
.
getPortalInvoiceTypeList
()
invoice_type_list
=
portal
.
getPortalInvoiceTypeList
()
portal
.
portal_selections
.
updateSelectionCheckedUidList
(
selection_name
,
listbox_uid
,
uids
)
if
selection_name
:
selection_uid_list
=
portal
.
portal_selections
.
getSelectionCheckedUidsFor
(
portal
.
portal_selections
.
updateSelectionCheckedUidList
(
selection_name
,
listbox_uid
,
uids
)
selection_uid_list
=
portal
.
portal_selections
.
getSelectionCheckedUidsFor
(
selection_name
)
selection_name
)
else
:
selection_uid_list
=
uids
if
selection_uid_list
:
if
selection_uid_list
:
object_list
=
[
brain
.
getObject
()
for
brain
in
portal
.
portal_catalog
(
uid
=
selection_uid_list
)]
object_list
=
[
brain
.
getObject
()
for
brain
in
portal
.
portal_catalog
(
uid
=
selection_uid_list
)]
else
:
else
:
...
@@ -20,10 +24,9 @@ portal.portal_selections.setSelectionParamsFor('accounting_create_related_paymen
...
@@ -20,10 +24,9 @@ portal.portal_selections.setSelectionParamsFor('accounting_create_related_paymen
# XXX prevent to call this on the whole module:
# XXX prevent to call this on the whole module:
if
len
(
object_list
)
>=
1000
:
if
len
(
object_list
)
>=
1000
:
return
context
.
Base_redirect
(
return
context
.
Base_renderMessage
(
form_id
,
translateString
(
'Refusing to process more than 1000 objects, check your selection.'
),
keep_items
=
{
'portal_status_message'
:
translateString
(
'warning'
)
'Refusing to process more than 1000 objects, check your selection.'
)})
tag
=
'payment_creation_%s'
%
random
.
randint
(
0
,
1000
)
tag
=
'payment_creation_%s'
%
random
.
randint
(
0
,
1000
)
activated
=
0
activated
=
0
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_setGroupingReference.py
View file @
a5dcb27b
...
@@ -8,11 +8,13 @@ psm = Base_translateString('Nothing matches.')
...
@@ -8,11 +8,13 @@ psm = Base_translateString('Nothing matches.')
request
=
container
.
REQUEST
request
=
container
.
REQUEST
# update selected uids
# update selected uids
portal
.
portal_selections
.
updateSelectionCheckedUidList
(
if
list_selection_name
:
portal
.
portal_selections
.
updateSelectionCheckedUidList
(
list_selection_name
,
uids
=
uids
,
listbox_uid
=
listbox_uid
,
REQUEST
=
request
)
list_selection_name
,
uids
=
uids
,
listbox_uid
=
listbox_uid
,
REQUEST
=
request
)
uids
=
portal
.
portal_selections
.
getSelectionCheckedUidsFor
(
list_selection_name
)
uids
=
portal
.
portal_selections
.
getSelectionCheckedUidsFor
(
list_selection_name
)
# XXX when should it be validated ?
# XXX when should it be validated ?
# Kato: It is already validated because this is Form Dialog script
if
node
==
''
:
if
node
==
''
:
node
=
context
.
REQUEST
.
get
(
'field_your_node'
,
node
)
node
=
context
.
REQUEST
.
get
(
'field_your_node'
,
node
)
if
mirror_section
==
''
:
if
mirror_section
==
''
:
...
@@ -22,9 +24,9 @@ if grouping == '':
...
@@ -22,9 +24,9 @@ if grouping == '':
grouping
=
request
.
get
(
'your_grouping'
,
grouping
=
request
.
get
(
'your_grouping'
,
request
.
get
(
'field_your_grouping'
,
request
.
get
(
'field_your_grouping'
,
grouping
))
grouping
))
if
list_selection_name
:
# edit selection for dialog parameters
# edit selection for dialog parameters
portal
.
portal_selections
.
setSelectionParamsFor
(
portal
.
portal_selections
.
setSelectionParamsFor
(
'grouping_reference_fast_input_selection'
,
'grouping_reference_fast_input_selection'
,
params
=
dict
(
node
=
node
,
params
=
dict
(
node
=
node
,
grouping
=
grouping
,
grouping
=
grouping
,
...
@@ -42,8 +44,8 @@ if uids:
...
@@ -42,8 +44,8 @@ if uids:
request
.
set
(
'total_selected_amount'
,
total_selected_amount
)
request
.
set
(
'total_selected_amount'
,
total_selected_amount
)
if
update
:
if
update
:
re
quest
.
set
(
'portal_status_message'
,
Base_translateString
(
'Updated'
))
re
turn
context
.
Base_renderForm
(
'AccountingTransactionModule_viewGroupingFastInputDialog'
,
return
context
.
AccountingTransactionModule_viewGroupingFastInputDialog
(
request
)
keep_items
=
{
'portal_status_message'
:
Base_translateString
(
'Updated'
)}
)
# otherwise, try to group...
# otherwise, try to group...
...
@@ -53,7 +55,7 @@ if grouping == 'grouping':
...
@@ -53,7 +55,7 @@ if grouping == 'grouping':
if
grouped_line_list
:
if
grouped_line_list
:
psm
=
Base_translateString
(
'${grouped_line_count} lines grouped.'
,
psm
=
Base_translateString
(
'${grouped_line_count} lines grouped.'
,
mapping
=
dict
(
grouped_line_count
=
len
(
grouped_line_list
)))
mapping
=
dict
(
grouped_line_count
=
len
(
grouped_line_list
)))
if
list_selection_name
:
# make sure nothing will be checked next time
# make sure nothing will be checked next time
portal
.
portal_selections
.
setSelectionCheckedUidsFor
(
list_selection_name
,
[])
portal
.
portal_selections
.
setSelectionCheckedUidsFor
(
list_selection_name
,
[])
...
@@ -119,8 +121,9 @@ else:
...
@@ -119,8 +121,9 @@ else:
psm
=
Base_translateString
(
'${ungrouped_line_count} lines ungrouped.'
,
psm
=
Base_translateString
(
'${ungrouped_line_count} lines ungrouped.'
,
mapping
=
dict
(
ungrouped_line_count
=
len
(
ungrouped_line_list
)))
mapping
=
dict
(
ungrouped_line_count
=
len
(
ungrouped_line_list
)))
if
list_selection_name
:
# make sure nothing will be checked next time
# make sure nothing will be checked next time
portal
.
portal_selections
.
setSelectionCheckedUidsFor
(
list_selection_name
,
[])
portal
.
portal_selections
.
setSelectionCheckedUidsFor
(
list_selection_name
,
[])
re
quest
.
set
(
'portal_status_message'
,
psm
)
re
turn
context
.
Base_renderForm
(
'AccountingTransactionModule_viewGroupingFastInputDialog'
,
return
context
.
AccountingTransactionModule_viewGroupingFastInputDialog
(
request
)
keep_items
=
{
'portal_status_message'
:
psm
}
)
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