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
Eteri
erp5
Commits
98473cae
Commit
98473cae
authored
Mar 06, 2013
by
Aurel
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into syncml
parents
d4304e2e
5719e3e2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
11 deletions
+25
-11
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getListBoxColumnList.xml
...accounting/AccountingTransaction_getListBoxColumnList.xml
+23
-9
bt5/erp5_accounting/bt/revision
bt5/erp5_accounting/bt/revision
+1
-1
product/ERP5Type/tests/_testSQLBench.py
product/ERP5Type/tests/_testSQLBench.py
+1
-1
No files found.
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getListBoxColumnList.xml
View file @
98473cae
...
...
@@ -56,17 +56,23 @@
\n
If there is more than one mirror_section on lines, the listbox will have an\n
extra column showing mirror_section_title.\n
The same for apply for
payment / payment_reference
.\n
The same for apply for
most line categories
.\n
"""\n
section_dict = {None: 1}\n
payment_dict = {None: 1}\n
section_set = set((None,))\n
payment_set = set((None,))\n
payment_request_set = set((None,))\n
resource_set = set((context.getResource(),))\n
\n
for line in context.getMovementList():\n
resource_set.add(line.getResource())\n
if source:\n
section_dict[line.getDestinationSection()] = 1\n
payment_dict[line.getSourcePayment()] = 1\n
section_set.add(line.getDestinationSection())\n
payment_set.add(line.getSourcePayment())\n
payment_request_set.add(line.getSourcePaymentRequest())\n
else:\n
section_dict[line.getSourceSection()] = 1\n
payment_dict[line.getDestinationPayment()] = 1\n
section_set.add(line.getSourceSection())\n
payment_set.add(line.getDestinationPayment())\n
payment_request_set.add(line.getDestinationPaymentRequest())\n
\n
if context.getSourcePayment() or context.getDestinationSection():\n
min_payment_count = 2\n
...
...
@@ -80,8 +86,8 @@ else:\n
# a line, we have to show the column\n
min_section_count = 1\n
\n
multiple_sections = len(section_
dic
t) >
min_section_count\n
multiple_payment = len(payment_
dic
t) > min_payment_count\n
multiple_sections = len(section_
se
t) >
min_section_count\n
multiple_payment = len(payment_
se
t) > min_payment_count\n
\n
column_item_list = [(\'translated_id\', \'ID\')]\n
a = column_item_list.append\n
...
...
@@ -107,6 +113,14 @@ if multiple_payment:\n
a((\'getDestinationPaymentTitle\', \'Bank Account\'))\n
else:\n
a((\'getDestinationPaymentReference\', \'Bank Account\'))\n
if len(resource_set) > 1:\n
a((\'getResourceReference\', \'Currency\'))\n
\n
if len(payment_request_set) > 1:\n
if source:\n
a((\'getSourcePaymentRequestTitle\', \'Payment Request\'))\n
else:\n
a((\'getDestinationPaymentRequestTitle\', \'Payment Request\'))\n
if source:\n
a((\'source_debit\', \'Debit\'))\n
a((\'source_credit\', \'Credit\'))\n
...
...
bt5/erp5_accounting/bt/revision
View file @
98473cae
1519
\ No newline at end of file
1522
\ No newline at end of file
product/ERP5Type/tests/_testSQLBench.py
View file @
98473cae
...
...
@@ -56,6 +56,6 @@ class TestSQLBench(unittest.TestCase):
cwd
=
mariadb_folder
+
'/sql-bench/'
,
stdout
=
subprocess
.
PIPE
,
stderr
=
subprocess
.
PIPE
)
output
,
error
=
process
.
communicate
()
self
.
assertEquals
(
0
,
len
(
error
))
self
.
assertEquals
(
0
,
len
(
error
)
,
error
)
self
.
assertTrue
(
output
.
find
(
"Total time: "
)
>=
0
)
print
output
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