Merge lp:~viktor-nagy/openobject-doc/workflow-service-methods into lp:~openerp-community/openobject-doc/6.0

Proposed by ViktorNagy
Status: Needs review
Proposed branch: lp:~viktor-nagy/openobject-doc/workflow-service-methods
Merge into: lp:~openerp-community/openobject-doc/6.0
Diff against target: 30 lines (+8/-1)
2 files modified
source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_openerp.rst (+2/-1)
source/developer/3_9_Workflow_Business_Process/index.rst (+6/-0)
To merge this branch: bzr merge lp:~viktor-nagy/openobject-doc/workflow-service-methods
Reviewer Review Type Date Requested Status
OpenERP Community (OBSOLETE) Pending
Review via email: mp+68795@code.launchpad.net

Description of the change

Added autodoc for workflow service + small bugfix in rst.
The autodoc needs lp:~toolpart/openobject-server/toolpart to be merged first!

To post a comment you must log in.
Revision history for this message
Numérigraphe (numerigraphe) wrote :

Any reason why this was never merged ?
Would you care to propose it on the v7.0 branch too ?
Lionel

Unmerged revisions

1361. By ViktorNagy

Added autodoc for workflow service following lp:~toolpart/openobject-server/toolpart (proposed for merging)
Fixed a small rst bug in the Guided Tour

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_openerp.rst'
2--- source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_openerp.rst 2011-07-16 13:28:24 +0000
3+++ source/book/1/1_2_Guided_Tour/1_2_Guided_Tour_openerp.rst 2011-07-22 06:56:35 +0000
4@@ -307,7 +307,8 @@
5 OpenERP provides many tools for managing relationships with partners. These are available through
6 the :menuselection:`Sales` menu.
7
8-.. tip:: :guilabel:`CRM & SRM`
9+.. tip::
10+ :guilabel:`CRM & SRM`
11
12 ``CRM`` stands for Customer Relationship Management, a standard term for systems that manage client and
13 customer relations. ``SRM`` stands for Supplier Relationship Management, and is commonly used for
14
15=== modified file 'source/developer/3_9_Workflow_Business_Process/index.rst'
16--- source/developer/3_9_Workflow_Business_Process/index.rst 2011-06-07 11:16:41 +0000
17+++ source/developer/3_9_Workflow_Business_Process/index.rst 2011-07-22 06:56:35 +0000
18@@ -336,6 +336,12 @@
19 * zip==1400
20 * phone==mobile
21
22+Methods
23+=======
24+
25+.. autoclass:: workflow.wkf_service.workflow_service
26+ :members:
27+
28 User Role
29 =========
30 Roles can be attached to transitions. If a role is given for a transition, that transition can only be executed if the user who triggered it possess the necessary role.