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
Douglas
erp5
Commits
e6e9ca56
Commit
e6e9ca56
authored
10 years ago
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FEC: prevent parralel computation of the report
parent
e65b757e
master
cedriclen-eos
environment_demo_notebook
environment_object
erp5_free_subscription
feature/print_redirection
feature/testnode-frontend
hotfix/import_exception
hotfix/matplotlib-figure-persist
hotfix/test-suite-parameters-line-length
import_exception_fix
improve_error_define_undefine
jupyter_error_handling
new_order_prediction_tutorial
order_prediction_pandas_numpy
order_prediction_tutorial_bt5
pivottablejs
print_redirection
shop-box
shop-box-for-merge
shop-box-rebased
strict_catalog
testnode_software_link
timezones
tristan
vivekpab_erp5webrenderjs_layoutconfig
vivekpab_jabberclient
vivekpab_renderjs_interfaces
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
5 deletions
+14
-5
bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransactionModule_viewFrenchAccountingTransactionFile.xml
...TransactionModule_viewFrenchAccountingTransactionFile.xml
+12
-1
bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransactionModule_viewFrenchAccountingTransactionFileActive.xml
...ctionModule_viewFrenchAccountingTransactionFileActive.xml
+1
-3
bt5/erp5_accounting_l10n_fr/bt/revision
bt5/erp5_accounting_l10n_fr/bt/revision
+1
-1
No files found.
bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransactionModule_viewFrenchAccountingTransactionFile.xml
View file @
e6e9ca56
...
...
@@ -59,12 +59,23 @@ if person_value is None:\n
return context.Base_redirect(\'view\', keep_items=dict(\n
portal_status_message=translateString("No person found for your user")))\n
\n
tag = \'AccountingTransactionModule_viewFrenchAccountingTransactionFile\'\n
aggregate_tag = \'%s:aggregate\'\n
\n
if portal.portal_activities.countMessageWithTag(tag) or \\\n
portal.portal_activities.countMessageWithTag(aggregate_tag):\n
return context.Base_redirect(form_id, keep_items=dict(\n
portal_status_message=translateString("Report already in progress.")))\n
\n
\n
context.activate().AccountingTransactionModule_viewFrenchAccountingTransactionFileActive(\n
section_category,\n
section_category_strict,\n
at_date,\n
simulation_state,\n
user_name=person_value.getReference())\n
user_name=person_value.getReference(),\n
tag=tag,\n
after_tag=aggregate_tag)\n
\n
return context.Base_redirect(form_id, keep_items=dict(\n
portal_status_message=translateString("Report Started")))\n
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransactionModule_viewFrenchAccountingTransactionFileActive.xml
View file @
e6e9ca56
...
...
@@ -63,8 +63,6 @@ from_date = portal.Base_getAccountingPeriodStartDateForSectionCategory(\n
# XXX we need proxy role for that\n
active_process = portal.portal_activities.newActiveProcess()\n
\n
tag = "%s-%s" % (script.getId(), random.randint(0, 1000))\n
aggregate_tag = "%s:aggregate" % tag\n
priority = 4\n
\n
for portal_type in portal.getPortalAccountingTransactionTypeList():\n
...
...
@@ -90,7 +88,7 @@ context.activate(after_tag=(tag, aggregate_tag)).AccountingTransactionModule_agg
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
section_category, section_category_strict, at_date, simulation_state, user_name, **kw
</string>
</value>
<value>
<string>
section_category, section_category_strict, at_date, simulation_state, user_name,
tag, aggregate_tag,
**kw
</string>
</value>
</item>
<item>
<key>
<string>
_proxy_roles
</string>
</key>
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_accounting_l10n_fr/bt/revision
View file @
e6e9ca56
30
\ No newline at end of file
31
\ No newline at end of file
This diff is collapsed.
Click to expand it.
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