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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Nicolas Wavrant
erp5
Commits
10725fb7
Commit
10725fb7
authored
Aug 22, 2014
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Accounting: show a project column if more than one project is used in this transaction
parent
f4894df8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getListBoxColumnList.xml
...accounting/AccountingTransaction_getListBoxColumnList.xml
+11
-0
bt5/erp5_accounting/bt/revision
bt5/erp5_accounting/bt/revision
+1
-1
No files found.
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getListBoxColumnList.xml
View file @
10725fb7
...
@@ -61,6 +61,7 @@ The same for apply for most line categories.\n
...
@@ -61,6 +61,7 @@ The same for apply for most line categories.\n
section_set = set((None,))\n
section_set = set((None,))\n
payment_set = set((None,))\n
payment_set = set((None,))\n
payment_request_set = set((None,))\n
payment_request_set = set((None,))\n
project_set = set((None,))\n
resource_set = set((context.getResource(),))\n
resource_set = set((context.getResource(),))\n
movement_type_list = context.getPortalAccountingMovementTypeList()\n
movement_type_list = context.getPortalAccountingMovementTypeList()\n
\n
\n
...
@@ -70,10 +71,12 @@ for line in context.getMovementList(portal_type=movement_type_list):\n
...
@@ -70,10 +71,12 @@ for line in context.getMovementList(portal_type=movement_type_list):\n
section_set.add(line.getDestinationSection())\n
section_set.add(line.getDestinationSection())\n
payment_set.add(line.getSourcePayment())\n
payment_set.add(line.getSourcePayment())\n
payment_request_set.add(line.getSourcePaymentRequest())\n
payment_request_set.add(line.getSourcePaymentRequest())\n
project_set.add(line.getSourceProject())\n
else:\n
else:\n
section_set.add(line.getSourceSection())\n
section_set.add(line.getSourceSection())\n
payment_set.add(line.getDestinationPayment())\n
payment_set.add(line.getDestinationPayment())\n
payment_request_set.add(line.getDestinationPaymentRequest())\n
payment_request_set.add(line.getDestinationPaymentRequest())\n
project_set.add(line.getDestinationProject())\n
\n
\n
if context.getSourcePayment() or context.getDestinationSection():\n
if context.getSourcePayment() or context.getDestinationSection():\n
min_payment_count = 2\n
min_payment_count = 2\n
...
@@ -122,6 +125,13 @@ if len(payment_request_set) > 1:\n
...
@@ -122,6 +125,13 @@ if len(payment_request_set) > 1:\n
a((\'getSourcePaymentRequestTitle\', \'Payment Request\'))\n
a((\'getSourcePaymentRequestTitle\', \'Payment Request\'))\n
else:\n
else:\n
a((\'getDestinationPaymentRequestTitle\', \'Payment Request\'))\n
a((\'getDestinationPaymentRequestTitle\', \'Payment Request\'))\n
\n
if len(project_set) > 2:\n
if source:\n
a((\'getSourceProjectTitle\', \'Project\'))\n
else:\n
a((\'getDestinationProjectTitle\', \'Project\'))\n
\n
if source:\n
if source:\n
a((\'source_debit\', \'Debit\'))\n
a((\'source_debit\', \'Debit\'))\n
a((\'source_credit\', \'Credit\'))\n
a((\'source_credit\', \'Credit\'))\n
...
@@ -129,6 +139,7 @@ else:\n
...
@@ -129,6 +139,7 @@ else:\n
a((\'destination_debit\', \'Debit\'))\n
a((\'destination_debit\', \'Debit\'))\n
a((\'destination_credit\', \'Credit\'))\n
a((\'destination_credit\', \'Credit\'))\n
\n
\n
context.log(project_set, column_item_list)\n
return column_item_list\n
return column_item_list\n
...
...
bt5/erp5_accounting/bt/revision
View file @
10725fb7
1577
1578
\ No newline at end of file
\ 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