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
francois
erp5
Commits
d1ecbe29
Commit
d1ecbe29
authored
Sep 27, 2016
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
accounting: allow to choose ledger in grouping fast input
parent
edda8b58
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
304 additions
and
1 deletion
+304
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getTransactionLineListForGroupingReference.py
...ctionModule_getTransactionLineListForGroupingReference.py
+4
-0
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getTransactionLineListForGroupingReference.xml
...tionModule_getTransactionLineListForGroupingReference.xml
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewGroupingFastInputDialog.xml
...countingTransactionModule_viewGroupingFastInputDialog.xml
+1
-0
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewGroupingFastInputDialog/your_ledger.xml
...sactionModule_viewGroupingFastInputDialog/your_ledger.xml
+84
-0
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_ledger.html.xml
...test_grouping_reference/test_group_dialog_ledger.html.xml
+58
-0
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_ledger.html.zpt
...test_grouping_reference/test_group_dialog_ledger.html.zpt
+156
-0
No files found.
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getTransactionLineListForGroupingReference.py
View file @
d1ecbe29
...
@@ -44,6 +44,10 @@ mirror_section = mirror_section or request.get('mirror_section')
...
@@ -44,6 +44,10 @@ mirror_section = mirror_section or request.get('mirror_section')
if
mirror_section
:
if
mirror_section
:
search_kw
[
'mirror_section_uid'
]
=
portal
.
restrictedTraverse
(
search_kw
[
'mirror_section_uid'
]
=
portal
.
restrictedTraverse
(
mirror_section
).
getUid
()
mirror_section
).
getUid
()
ledger
=
ledger
or
request
.
get
(
'ledger'
)
if
ledger
:
search_kw
[
'ledger_uid'
]
=
[
portal
.
portal_categories
.
restrictedTraverse
(
x
).
getUid
()
for
x
in
ledger
]
if
grouping
==
'grouping'
:
if
grouping
==
'grouping'
:
search_kw
[
'grouping_reference'
]
=
None
search_kw
[
'grouping_reference'
]
=
None
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getTransactionLineListForGroupingReference.xml
View file @
d1ecbe29
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
_params
</string>
</key>
<key>
<string>
_params
</string>
</key>
<value>
<string>
selection=None, grouping=\'grouping\', node=\'\', mirror_section=\'\', title=None, delivery_reference=None, debit_price=None, credit_price=None, date=None, **kw
</string>
</value>
<value>
<string>
selection=None, grouping=\'grouping\', node=\'\', mirror_section=\'\',
ledger=\'\',
title=None, delivery_reference=None, debit_price=None, credit_price=None, date=None, **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/AccountingTransactionModule_viewGroupingFastInputDialog.xml
View file @
d1ecbe29
...
@@ -75,6 +75,7 @@
...
@@ -75,6 +75,7 @@
<list>
<list>
<string>
your_node
</string>
<string>
your_node
</string>
<string>
your_mirror_section
</string>
<string>
your_mirror_section
</string>
<string>
your_ledger
</string>
</list>
</list>
</value>
</value>
</item>
</item>
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewGroupingFastInputDialog/your_ledger.xml
0 → 100644
View file @
d1ecbe29
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
your_ledger
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
your_ledger
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
AccountModule_viewDialogFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_ledger.html.xml
0 → 100644
View file @
d1ecbe29
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ZopePageTemplate"
module=
"Products.PageTemplates.ZopePageTemplate"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_bind_names
</string>
</key>
<value>
<object>
<klass>
<global
name=
"NameAssignments"
module=
"Shared.DC.Scripts.Bindings"
/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key>
<string>
_asgns
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
name_subpath
</string>
</key>
<value>
<string>
traverse_subpath
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key>
<string>
content_type
</string>
</key>
<value>
<string>
text/html
</string>
</value>
</item>
<item>
<key>
<string>
expand
</string>
</key>
<value>
<int>
0
</int>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
test_group_dialog_ledger.html
</string>
</value>
</item>
<item>
<key>
<string>
output_encoding
</string>
</key>
<value>
<string>
utf-8
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<unicode></unicode>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_ledger.html.zpt
0 → 100644
View file @
d1ecbe29
<html>
<head><title>
Using Ledger in Grouping Dialog
</title></head>
<body>
<table
cellpadding=
"1"
cellspacing=
"1"
border=
"1"
>
<thead>
<tr><td
rowspan=
"1"
colspan=
"4"
>
Using Ledger in Grouping Dialog
</td></tr>
</thead><tbody
tal:define=
"init_method string:AccountingZuite_createAccountingTransactionList?add_draft_transactions:int=0&add_related_payments:int=1&set_ledger:int=1"
>
<!-- Setup {{{ -->
<tal:block
metal:use-macro=
"here/AccountingZuite_CommonTemplate/macros/init"
/>
<tr>
<td>
selectAndWait
</td>
<td>
select_module
</td>
<td>
Organisations
</td>
</tr>
<tr>
<td>
clickAndWait
</td>
<td>
Folder_show:method
</td>
<td></td>
</tr>
<tr>
<td>
type
</td>
<!-- title -->
<td>
//tr[@class='listbox-search-line']/th[2]/input
</td>
<td>
Client 1
</td>
</tr>
<tr>
<td>
clickAndWait
</td>
<td>
//input[@class="listbox-select-action"]
</td>
<td></td>
</tr>
<!-- }}} -->
<!-- {{{ Select Client 1 Organisation and use grouping fast input -->
<tr>
<td>
clickAndWait
</td>
<td>
link=Client 1
</td>
<td></td>
</tr>
<tr>
<td>
clickAndWait
</td>
<td>
//img[@alt='Grouping Reference Fast Input']
</td>
<td></td>
</tr>
<!-- The mode should be 'grouping' by default -->
<tr>
<td>
verifyValue
</td>
<td>
//input[@name='field_your_grouping' and @value='grouping']
</td>
<td>
on
</td>
</tr>
<tr>
<td>
verifyText
</td>
<td>
//label[contains(text(),"Total Selected Amount")]/../div[1]/
</td>
<td>
0.00
</td>
</tr>
<tr>
<td>
select
</td>
<td>
field_your_node
</td>
<td>
label=41 - Receivable
</td>
</tr>
<tr>
<td>
clickAndWait
</td>
<td>
//button[@id="dialog_update_button"]
</td>
<td></td>
</tr>
<tr>
<td>
assertPortalStatusMessage
</td>
<td>
Updated
</td>
<td></td>
</tr>
<tr>
<td>
assertText
</td>
<td>
//span[@class="listbox-current-page-total-number"]
</td>
<td>
2 records
</td>
</tr>
<!-- in test ledger 2, we have no transactions. -->
<tr>
<td>
select
</td>
<td>
field_your_ledger
</td>
<td>
label=Test Accounting/Test Ledger 2
</td>
</tr>
<tr>
<td>
clickAndWait
</td>
<td>
//button[@id="dialog_update_button"]
</td>
<td></td>
</tr>
<tr>
<td>
assertPortalStatusMessage
</td>
<td>
Updated
</td>
<td></td>
</tr>
<tr>
<td>
assertText
</td>
<td>
//span[@class="listbox-current-page-total-number"]
</td>
<td>
0 records
</td>
</tr>
<!-- in test ledger 1, we have 2 transactions. -->
<tr>
<td>
select
</td>
<td>
field_your_ledger
</td>
<td>
label=Test Accounting/Test Ledger 1
</td>
</tr>
<tr>
<td>
clickAndWait
</td>
<td>
//button[@id="dialog_update_button"]
</td>
<td></td>
</tr>
<tr>
<td>
assertPortalStatusMessage
</td>
<td>
Updated
</td>
<td></td>
</tr>
<tr>
<td>
assertText
</td>
<td>
//span[@class="listbox-current-page-total-number"]
</td>
<td>
2 records
</td>
</tr>
<!-- in test ledger 1 and 2, we have 2 transactions. -->
<tr>
<td>
addSelection
</td>
<td>
field_your_ledger
</td>
<td>
label=Test Accounting/Test Ledger 1
</td>
</tr>
<tr>
<td>
addSelection
</td>
<td>
field_your_ledger
</td>
<td>
label=Test Accounting/Test Ledger 2
</td>
</tr>
<tr>
<td>
clickAndWait
</td>
<td>
//button[@id="dialog_update_button"]
</td>
<td></td>
</tr>
<tr>
<td>
assertPortalStatusMessage
</td>
<td>
Updated
</td>
<td></td>
</tr>
<tr>
<td>
assertText
</td>
<td>
//span[@class="listbox-current-page-total-number"]
</td>
<td>
2 records
</td>
</tr>
<!-- }}} -->
</tbody></table>
</body>
</html>
<!-- vim: syntax=html foldmethod=marker
-->
\ No newline at end of file
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