[IMP] doc/howtos/backend: improve views, fix workflow

diff --git a/doc/howtos/backend/exercise-access-rights b/doc/howtos/backend/exercise-access-rights
index 0196c02..552afd7 100644 (file)
--- a/doc/howtos/backend/exercise-access-rights
+++ b/doc/howtos/backend/exercise-access-rights
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent 303a5f4f011822dcb42b5833d579eabd3f03f4bf
 
-Index: doc-backend/openacademy/__openerp__.py
+Index: addons/openacademy/__openerp__.py
 ===================================================================
---- doc-backend.orig/openacademy/__openerp__.py        2014-08-24 12:26:40.449399183 +0200
-+++ doc-backend/openacademy/__openerp__.py     2014-08-24 12:26:40.445399183 +0200
+--- addons.orig/openacademy/__openerp__.py     2014-08-26 17:26:18.143783102 +0200
++++ addons/openacademy/__openerp__.py  2014-08-26 17:26:18.135783102 +0200
 @@ -25,7 +25,8 @@
  
      # always loaded
@@ -15,10 +15,10 @@ Index: doc-backend/openacademy/__openerp__.py
          'templates.xml',
          'views/openacademy.xml',
          'views/partner.xml',
-Index: doc-backend/openacademy/security/ir.model.access.csv
+Index: addons/openacademy/security/ir.model.access.csv
 ===================================================================
---- doc-backend.orig/openacademy/security/ir.model.access.csv  2014-08-24 12:26:40.449399183 +0200
-+++ doc-backend/openacademy/security/ir.model.access.csv       2014-08-24 12:26:55.985399543 +0200
+--- addons.orig/openacademy/security/ir.model.access.csv       2014-08-26 17:26:18.143783102 +0200
++++ addons/openacademy/security/ir.model.access.csv    2014-08-26 17:26:18.135783102 +0200
 @@ -1,2 +1,5 @@
  id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
 -access_openacademy_openacademy,openacademy.openacademy,model_openacademy_openacademy,,1,0,0,0
@@ -26,10 +26,10 @@ Index: doc-backend/openacademy/security/ir.model.access.csv
 +session_manager,session manager,model_openacademy_session,group_manager,1,1,1,1
 +course_read_all,course all,model_openacademy_course,,1,0,0,0
 +session_read_all,session all,model_openacademy_session,,1,0,0,0
-Index: doc-backend/openacademy/security/security.xml
+Index: addons/openacademy/security/security.xml
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/security/security.xml      2014-08-24 12:26:40.445399183 +0200
++++ addons/openacademy/security/security.xml   2014-08-26 17:26:18.135783102 +0200
 @@ -0,0 +1,7 @@
 +<openerp>
 +    <data>

diff --git a/doc/howtos/backend/exercise-access-rules b/doc/howtos/backend/exercise-access-rules
index 7cc6ae3..4ec91a3 100644 (file)
--- a/doc/howtos/backend/exercise-access-rules
+++ b/doc/howtos/backend/exercise-access-rules
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent 0602022dc2a428f9995c886df33b699b6d3bcb69
 
-Index: doc-backend/openacademy/security/security.xml
+Index: addons/openacademy/security/security.xml
 ===================================================================
---- doc-backend.orig/openacademy/security/security.xml 2014-08-24 12:27:27.569400274 +0200
-+++ doc-backend/openacademy/security/security.xml      2014-08-24 12:28:29.185401700 +0200
+--- addons.orig/openacademy/security/security.xml      2014-08-26 17:26:18.971783090 +0200
++++ addons/openacademy/security/security.xml   2014-08-26 17:26:18.967783090 +0200
 @@ -3,5 +3,19 @@
          <record id="group_manager" model="res.groups">
              <field name="name">OpenAcademy / Manager</field>

diff --git a/doc/howtos/backend/exercise-advanced-treeview b/doc/howtos/backend/exercise-advanced-treeview
index 4a9a1e1..53b82c8 100644 (file)
--- a/doc/howtos/backend/exercise-advanced-treeview
+++ b/doc/howtos/backend/exercise-advanced-treeview
@@ -1,11 +1,11 @@
 # HG changeset patch
 # Parent f8d2422e87b3ff566dc947ad582608db3b15e077
 
-Index: doc-backend/openacademy/views/openacademy.xml
+Index: addons/openacademy/views/openacademy.xml
 ===================================================================
---- doc-backend.orig/openacademy/views/openacademy.xml 2014-08-24 12:13:41.149381146 +0200
-+++ doc-backend/openacademy/views/openacademy.xml      2014-08-24 12:13:41.141381146 +0200
-@@ -111,9 +111,10 @@
+--- addons.orig/openacademy/views/openacademy.xml      2014-08-26 17:26:09.283783234 +0200
++++ addons/openacademy/views/openacademy.xml   2014-08-26 17:26:09.279783234 +0200
+@@ -116,9 +116,10 @@
              <field name="name">session.tree</field>
              <field name="model">openacademy.session</field>
              <field name="arch" type="xml">

diff --git a/doc/howtos/backend/exercise-basic-action b/doc/howtos/backend/exercise-basic-action
index 7f1a8e8..1287315 100644 (file)
--- a/doc/howtos/backend/exercise-basic-action
+++ b/doc/howtos/backend/exercise-basic-action
@@ -1,9 +1,9 @@
 # HG changeset patch
 # Parent 16e4cb131d9f7f3a72a8a1b0bc46c2ce9ac76435
-Index: doc-backend/openacademy/__openerp__.py
+Index: addons/openacademy/__openerp__.py
 ===================================================================
---- doc-backend.orig/openacademy/__openerp__.py        2014-08-24 12:02:32.169365663 +0200
-+++ doc-backend/openacademy/__openerp__.py     2014-08-24 12:02:32.165365663 +0200
+--- addons.orig/openacademy/__openerp__.py     2014-08-26 17:25:53.519783468 +0200
++++ addons/openacademy/__openerp__.py  2014-08-26 17:25:53.511783468 +0200
 @@ -27,6 +27,7 @@
      'data': [
          # 'security/ir.model.access.csv',
@@ -12,10 +12,10 @@ Index: doc-backend/openacademy/__openerp__.py
      ],
      # only loaded in demonstration mode
      'demo': [
-Index: doc-backend/openacademy/views/openacademy.xml
+Index: addons/openacademy/views/openacademy.xml
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/views/openacademy.xml      2014-08-24 12:02:32.165365663 +0200
++++ addons/openacademy/views/openacademy.xml   2014-08-26 17:25:53.511783468 +0200
 @@ -0,0 +1,35 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<openerp>

diff --git a/doc/howtos/backend/exercise-calendar b/doc/howtos/backend/exercise-calendar
index 25b6e48..872a557 100644 (file)
--- a/doc/howtos/backend/exercise-calendar
+++ b/doc/howtos/backend/exercise-calendar
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent 85a8d7317b9e13480f39ad739955442d15144451
 
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py     2014-08-25 16:18:57.920058347 +0200
-+++ doc-backend/openacademy/models.py  2014-08-25 16:19:22.872057976 +0200
+--- addons.orig/openacademy/models.py  2014-08-26 17:26:10.179783221 +0200
++++ addons/openacademy/models.py       2014-08-26 17:26:10.171783221 +0200
 @@ -1,5 +1,6 @@
  # -*- coding: utf-8 -*-
  
@@ -48,11 +48,11 @@ Index: doc-backend/openacademy/models.py
      @api.constrains('instructor_id', 'attendee_ids')
      def _check_instructor_not_in_attendees(self):
          if self.instructor_id and self.instructor_id in self.attendee_ids:
-Index: doc-backend/openacademy/views/openacademy.xml
+Index: addons/openacademy/views/openacademy.xml
 ===================================================================
---- doc-backend.orig/openacademy/views/openacademy.xml 2014-08-25 16:18:57.920058347 +0200
-+++ doc-backend/openacademy/views/openacademy.xml      2014-08-25 16:18:57.912058347 +0200
-@@ -120,11 +120,24 @@
+--- addons.orig/openacademy/views/openacademy.xml      2014-08-26 17:26:10.179783221 +0200
++++ addons/openacademy/views/openacademy.xml   2014-08-26 17:26:10.171783221 +0200
+@@ -125,11 +125,24 @@
              </field>
          </record>
  

diff --git a/doc/howtos/backend/exercise-computed b/doc/howtos/backend/exercise-computed
index b27a736..9d98009 100644 (file)
--- a/doc/howtos/backend/exercise-computed
+++ b/doc/howtos/backend/exercise-computed
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent a358be0a577b0569831958a8ec1302825c645dee
 
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py     2014-08-24 12:09:36.289375479 +0200
-+++ doc-backend/openacademy/models.py  2014-08-24 12:09:59.961376027 +0200
+--- addons.orig/openacademy/models.py  2014-08-26 17:26:03.795783315 +0200
++++ addons/openacademy/models.py       2014-08-26 17:26:03.791783315 +0200
 @@ -28,3 +28,13 @@
      course_id = fields.Many2one('openacademy.course',
          ondelete='cascade', string="Course", required=True)
@@ -19,19 +19,19 @@ Index: doc-backend/openacademy/models.py
 +            self.taken_seats = 0.0
 +        else:
 +            self.taken_seats = 100.0 * len(self.attendee_ids) / self.seats
-Index: doc-backend/openacademy/views/openacademy.xml
+Index: addons/openacademy/views/openacademy.xml
 ===================================================================
---- doc-backend.orig/openacademy/views/openacademy.xml 2014-08-24 12:09:36.289375479 +0200
-+++ doc-backend/openacademy/views/openacademy.xml      2014-08-24 12:09:36.285375479 +0200
-@@ -98,6 +98,7 @@
-                         <field name="start_date"/>
-                         <field name="duration"/>
-                         <field name="seats"/>
-+                        <field name="taken_seats" widget="progressbar"/>
-                     </group>
-                     <separator string="Attendees" colspan="4"/>
-                     <field name="attendee_ids" colspan="4" nolabel="1"/>
-@@ -112,6 +113,7 @@
+--- addons.orig/openacademy/views/openacademy.xml      2014-08-26 17:26:03.795783315 +0200
++++ addons/openacademy/views/openacademy.xml   2014-08-26 17:26:03.791783315 +0200
+@@ -100,6 +100,7 @@
+                                 <field name="start_date"/>
+                                 <field name="duration"/>
+                                 <field name="seats"/>
++                                <field name="taken_seats" widget="progressbar"/>
+                             </group>
+                         </group>
+                         <label for="attendee_ids"/>
+@@ -117,6 +118,7 @@
                  <tree string="Session Tree">
                      <field name="name"/>
                      <field name="course_id"/>

diff --git a/doc/howtos/backend/exercise-constraint-python b/doc/howtos/backend/exercise-constraint-python
index a3a18d4..9818fe8 100644 (file)
--- a/doc/howtos/backend/exercise-constraint-python
+++ b/doc/howtos/backend/exercise-constraint-python
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent 7a7d003fe38426a405ce0657a627a139133ec4dd
 
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py     2014-08-24 12:16:56.413385666 +0200
-+++ doc-backend/openacademy/models.py  2014-08-24 12:17:11.137386006 +0200
+--- addons.orig/openacademy/models.py  2014-08-26 17:26:06.591783274 +0200
++++ addons/openacademy/models.py       2014-08-26 17:26:06.587783274 +0200
 @@ -1,6 +1,6 @@
  # -*- coding: utf-8 -*-
  

diff --git a/doc/howtos/backend/exercise-constraint-sql b/doc/howtos/backend/exercise-constraint-sql
index 7a13a10..dad20c5 100644 (file)
--- a/doc/howtos/backend/exercise-constraint-sql
+++ b/doc/howtos/backend/exercise-constraint-sql
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent 121bbfe120be3007f5e04611dbc27038abafcce8
 
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py     2014-08-24 12:17:23.789386299 +0200
-+++ doc-backend/openacademy/models.py  2014-08-24 12:17:23.785386299 +0200
+--- addons.orig/openacademy/models.py  2014-08-26 17:26:07.479783261 +0200
++++ addons/openacademy/models.py       2014-08-26 17:26:07.475783261 +0200
 @@ -14,6 +14,16 @@
          'openacademy.session', 'course_id', string="Session")
  

diff --git a/doc/howtos/backend/exercise-copy-override b/doc/howtos/backend/exercise-copy-override
index e9d3404..c8340f2 100644 (file)
--- a/doc/howtos/backend/exercise-copy-override
+++ b/doc/howtos/backend/exercise-copy-override
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent 7d14b75cdfd4c7a272a13572947de5d47f3e851f
 
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py     2014-08-24 12:17:34.389386545 +0200
-+++ doc-backend/openacademy/models.py  2014-08-24 12:17:34.381386544 +0200
+--- addons.orig/openacademy/models.py  2014-08-26 17:26:08.359783248 +0200
++++ addons/openacademy/models.py       2014-08-26 17:26:08.351783248 +0200
 @@ -14,6 +14,20 @@
          'openacademy.session', 'course_id', string="Session")
  

diff --git a/doc/howtos/backend/exercise-creation b/doc/howtos/backend/exercise-creation
index 0081456..0fdb3e3 100644 (file)
--- a/doc/howtos/backend/exercise-creation
+++ b/doc/howtos/backend/exercise-creation
@@ -1,9 +1,9 @@
 # HG changeset patch
 # Parent 0000000000000000000000000000000000000000
-Index: doc-backend/openacademy/__openerp__.py
+Index: addons/openacademy/__openerp__.py
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/__openerp__.py     2014-08-24 12:25:18.133397278 +0200
++++ addons/openacademy/__openerp__.py  2014-08-26 17:25:49.787783523 +0200
 @@ -0,0 +1,35 @@
 +# -*- coding: utf-8 -*-
 +{
@@ -40,18 +40,18 @@ Index: doc-backend/openacademy/__openerp__.py
 +        'demo.xml',
 +    ],
 +}
-Index: doc-backend/openacademy/__init__.py
+Index: addons/openacademy/__init__.py
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/__init__.py        2014-08-24 12:25:18.133397278 +0200
++++ addons/openacademy/__init__.py     2014-08-26 17:25:49.791783523 +0200
 @@ -0,0 +1,3 @@
 +# -*- coding: utf-8 -*-
 +import controllers
 +import models
-Index: doc-backend/openacademy/controllers.py
+Index: addons/openacademy/controllers.py
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/controllers.py     2014-08-24 12:25:18.133397278 +0200
++++ addons/openacademy/controllers.py  2014-08-26 17:25:49.791783523 +0200
 @@ -0,0 +1,20 @@
 +# -*- coding: utf-8 -*-
 +from openerp import http
@@ -73,10 +73,10 @@ Index: doc-backend/openacademy/controllers.py
 +#         return http.request.render('openacademy.object', {
 +#             'object': obj
 +#         })
-Index: doc-backend/openacademy/demo.xml
+Index: addons/openacademy/demo.xml
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/demo.xml   2014-08-24 12:25:18.133397278 +0200
++++ addons/openacademy/demo.xml        2014-08-26 17:25:49.791783523 +0200
 @@ -0,0 +1,25 @@
 +<openerp>
 +    <data>
@@ -103,10 +103,10 @@ Index: doc-backend/openacademy/demo.xml
 +        <!--  -->
 +    </data>
 +</openerp>
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/models.py  2014-08-24 12:25:18.133397278 +0200
++++ addons/openacademy/models.py       2014-08-26 17:25:49.791783523 +0200
 @@ -0,0 +1,8 @@
 +# -*- coding: utf-8 -*-
 +
@@ -116,17 +116,17 @@ Index: doc-backend/openacademy/models.py
 +#     _name = 'openacademy.openacademy'
 +
 +#     name = fields.Char()
-Index: doc-backend/openacademy/security/ir.model.access.csv
+Index: addons/openacademy/security/ir.model.access.csv
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/security/ir.model.access.csv       2014-08-24 12:25:30.941397574 +0200
++++ addons/openacademy/security/ir.model.access.csv    2014-08-26 17:25:49.791783523 +0200
 @@ -0,0 +1,2 @@
 +id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
 +access_openacademy_openacademy,openacademy.openacademy,model_openacademy_openacademy,,1,0,0,0
-Index: doc-backend/openacademy/templates.xml
+Index: addons/openacademy/templates.xml
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/templates.xml      2014-08-24 12:25:18.137397278 +0200
++++ addons/openacademy/templates.xml   2014-08-26 17:25:49.791783523 +0200
 @@ -0,0 +1,22 @@
 +<openerp>
 +    <data>

diff --git a/doc/howtos/backend/exercise-dashboard b/doc/howtos/backend/exercise-dashboard
index 4ffc826..7c76e69 100644 (file)
--- a/doc/howtos/backend/exercise-dashboard
+++ b/doc/howtos/backend/exercise-dashboard
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent 643813940cbea07bec792f9e1c60022a9292fa90
 
-Index: doc-backend/openacademy/__openerp__.py
+Index: addons/openacademy/__openerp__.py
 ===================================================================
---- doc-backend.orig/openacademy/__openerp__.py        2014-08-24 12:31:00.385405199 +0200
-+++ doc-backend/openacademy/__openerp__.py     2014-08-24 12:31:45.373406240 +0200
+--- addons.orig/openacademy/__openerp__.py     2014-08-26 17:26:21.535783052 +0200
++++ addons/openacademy/__openerp__.py  2014-08-26 17:26:21.531783052 +0200
 @@ -21,7 +21,7 @@
      'version': '0.1',
  
@@ -22,11 +22,11 @@ Index: doc-backend/openacademy/__openerp__.py
          'reports.xml',
      ],
      # only loaded in demonstration mode
-Index: doc-backend/openacademy/views/session_board.xml
+Index: addons/openacademy/views/session_board.xml
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/views/session_board.xml    2014-08-24 12:33:16.077408340 +0200
-@@ -0,0 +1,65 @@
++++ addons/openacademy/views/session_board.xml 2014-08-26 17:26:21.531783052 +0200
+@@ -0,0 +1,63 @@
 +<?xml version="1.0"?>
 +<openerp>
 +    <data>
@@ -59,18 +59,16 @@ Index: doc-backend/openacademy/views/session_board.xml
 +                            <action
 +                                string="Attendees by course"
 +                                name="%(act_session_graph)d"
-+                                colspan="4"
 +                                height="150"
 +                                width="510"/>
 +                            <action
 +                                string="Sessions"
-+                                name="%(act_session_calendar)d"
-+                                colspan="4"/>
++                                name="%(act_session_calendar)d"/>
 +                        </column>
 +                        <column>
 +                            <action
 +                                string="Courses"
-+                                name="%(act_course_list)d" colspan="4"/>
++                                name="%(act_course_list)d"/>
 +                        </column>
 +                    </board>
 +                </form>

diff --git a/doc/howtos/backend/exercise-defaults b/doc/howtos/backend/exercise-defaults
index 97265dc..41c29a5 100644 (file)
--- a/doc/howtos/backend/exercise-defaults
+++ b/doc/howtos/backend/exercise-defaults
@@ -1,7 +1,7 @@
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py     2014-08-24 12:10:34.701376831 +0200
-+++ doc-backend/openacademy/models.py  2014-08-24 12:10:34.693376831 +0200
+--- addons.orig/openacademy/models.py  2014-08-26 17:26:04.727783302 +0200
++++ addons/openacademy/models.py       2014-08-26 17:26:04.719783302 +0200
 @@ -18,9 +18,10 @@
      _name = 'openacademy.session'
  
@@ -14,15 +14,15 @@ Index: doc-backend/openacademy/models.py
  
      instructor_id = fields.Many2one('res.partner', string="Instructor",
          domain=['|', ('instructor', '=', True),
-Index: doc-backend/openacademy/views/openacademy.xml
+Index: addons/openacademy/views/openacademy.xml
 ===================================================================
---- doc-backend.orig/openacademy/views/openacademy.xml 2014-08-24 12:10:34.701376831 +0200
-+++ doc-backend/openacademy/views/openacademy.xml      2014-08-24 12:10:34.693376831 +0200
-@@ -92,6 +92,7 @@
-                         <field name="course_id"/>
-                         <field name="name"/>
-                         <field name="instructor_id"/>
-+                        <field name="active"/>
-                     </group>
-                     <group colspan="2" col="2">
-                         <separator string="Schedule" colspan="2"/>
+--- addons.orig/openacademy/views/openacademy.xml      2014-08-26 17:26:04.727783302 +0200
++++ addons/openacademy/views/openacademy.xml   2014-08-26 17:26:04.719783302 +0200
+@@ -95,6 +95,7 @@
+                                 <field name="course_id"/>
+                                 <field name="name"/>
+                                 <field name="instructor_id"/>
++                                <field name="active"/>
+                             </group>
+                             <group string="Schedule">
+                                 <field name="start_date"/>

diff --git a/doc/howtos/backend/exercise-demo b/doc/howtos/backend/exercise-demo
index 8041797..96d591a 100644 (file)
--- a/doc/howtos/backend/exercise-demo
+++ b/doc/howtos/backend/exercise-demo
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent 84e2b0b43fc61fd0bcbb44c1929755d44ee58ae5
 
-Index: doc-backend/openacademy/demo.xml
+Index: addons/openacademy/demo.xml
 ===================================================================
---- doc-backend.orig/openacademy/demo.xml      2014-08-24 11:58:31.673360097 +0200
-+++ doc-backend/openacademy/demo.xml   2014-08-24 11:58:49.353360506 +0200
+--- addons.orig/openacademy/demo.xml   2014-08-26 17:25:52.683783480 +0200
++++ addons/openacademy/demo.xml        2014-08-26 17:25:52.679783480 +0200
 @@ -1,25 +1,19 @@
  <openerp>
      <data>

diff --git a/doc/howtos/backend/exercise-domain-advanced b/doc/howtos/backend/exercise-domain-advanced
index 8deb8f7..4b27ad8 100644 (file)
--- a/doc/howtos/backend/exercise-domain-advanced
+++ b/doc/howtos/backend/exercise-domain-advanced
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent 69d1f2d359eb8ef304a9d99f17790c78b35eda1a
 
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py     2014-08-24 12:08:53.465374488 +0200
-+++ doc-backend/openacademy/models.py  2014-08-24 12:08:53.461374488 +0200
+--- addons.orig/openacademy/models.py  2014-08-26 17:26:02.903783329 +0200
++++ addons/openacademy/models.py       2014-08-26 17:26:02.895783329 +0200
 @@ -23,7 +23,8 @@
      seats = fields.Integer(string="Number of seats")
  
@@ -15,11 +15,11 @@ Index: doc-backend/openacademy/models.py
      course_id = fields.Many2one('openacademy.course',
          ondelete='cascade', string="Course", required=True)
      attendee_ids = fields.Many2many('res.partner', string="Attendees")
-Index: doc-backend/openacademy/views/partner.xml
+Index: addons/openacademy/views/partner.xml
 ===================================================================
---- doc-backend.orig/openacademy/views/partner.xml     2014-08-24 12:08:53.465374488 +0200
-+++ doc-backend/openacademy/views/partner.xml  2014-08-24 12:08:53.461374488 +0200
-@@ -24,5 +24,21 @@
+--- addons.orig/openacademy/views/partner.xml  2014-08-26 17:26:02.903783329 +0200
++++ addons/openacademy/views/partner.xml       2014-08-26 17:26:02.895783329 +0200
+@@ -28,5 +28,21 @@
          <menuitem id="contact_menu" name="Contacts"
                    parent="configuration_menu"
                    action="contact_list_action"/>

diff --git a/doc/howtos/backend/exercise-domain-basic b/doc/howtos/backend/exercise-domain-basic
index 8ad86b2..635b6fe 100644 (file)
--- a/doc/howtos/backend/exercise-domain-basic
+++ b/doc/howtos/backend/exercise-domain-basic
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent 142c5065ff1b7266d944d4ef5239e814ae22f0df
 
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py     2014-08-24 12:08:29.373373930 +0200
-+++ doc-backend/openacademy/models.py  2014-08-24 12:08:29.369373930 +0200
+--- addons.orig/openacademy/models.py  2014-08-26 17:26:02.067783341 +0200
++++ addons/openacademy/models.py       2014-08-26 17:26:02.059783341 +0200
 @@ -22,7 +22,8 @@
      duration = fields.Float(digits=(6, 2), help="Duration in days")
      seats = fields.Integer(string="Number of seats")

diff --git a/doc/howtos/backend/exercise-formview b/doc/howtos/backend/exercise-formview
index 750eca1..ad0dd4e 100644 (file)
--- a/doc/howtos/backend/exercise-formview
+++ b/doc/howtos/backend/exercise-formview
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent 4a0db1d29257764f4df5cb1ee0be7e59e8c8d0d8
 
-Index: doc-backend/openacademy/views/openacademy.xml
+Index: addons/openacademy/views/openacademy.xml
 ===================================================================
---- doc-backend.orig/openacademy/views/openacademy.xml 2014-08-24 12:02:49.677366068 +0200
-+++ doc-backend/openacademy/views/openacademy.xml      2014-08-24 12:02:49.669366068 +0200
+--- addons.orig/openacademy/views/openacademy.xml      2014-08-26 17:25:54.291783456 +0200
++++ addons/openacademy/views/openacademy.xml   2014-08-26 17:25:54.283783457 +0200
 @@ -1,6 +1,21 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <openerp>

diff --git a/doc/howtos/backend/exercise-formview-notebooks b/doc/howtos/backend/exercise-formview-notebooks
index 5492b15..d0ef27f 100644 (file)
--- a/doc/howtos/backend/exercise-formview-notebooks
+++ b/doc/howtos/backend/exercise-formview-notebooks
@@ -1,23 +1,24 @@
 # HG changeset patch
 # Parent 5508a5440faa7b607d057c4e4ae70af6b6f7cac9
 
-Index: doc-backend/openacademy/views/openacademy.xml
+Index: addons/openacademy/views/openacademy.xml
 ===================================================================
---- doc-backend.orig/openacademy/views/openacademy.xml 2014-08-24 12:03:02.649366368 +0200
-+++ doc-backend/openacademy/views/openacademy.xml      2014-08-24 12:03:02.645366368 +0200
-@@ -9,7 +9,14 @@
+--- addons.orig/openacademy/views/openacademy.xml      2014-08-26 17:25:55.023783446 +0200
++++ addons/openacademy/views/openacademy.xml   2014-08-26 17:25:55.015783446 +0200
+@@ -9,8 +9,15 @@
                      <sheet>
                          <group>
                              <field name="name"/>
 -                            <field name="description"/>
-+                            <notebook colspan="4">
-+                                <page string="Description">
-+                                    <field name="description"/>
-+                                </page>
-+                                <page string="About">
-+                                    This is an example of notebooks
-+                                </page>
-+                            </notebook>
                          </group>
++                        <notebook>
++                            <page string="Description">
++                                <field name="description"/>
++                            </page>
++                            <page string="About">
++                                This is an example of notebooks
++                            </page>
++                        </notebook>
                      </sheet>
                  </form>
+             </field>

diff --git a/doc/howtos/backend/exercise-gantt b/doc/howtos/backend/exercise-gantt
index a590ee9..a4475d9 100644 (file)
--- a/doc/howtos/backend/exercise-gantt
+++ b/doc/howtos/backend/exercise-gantt
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent dba00a105dd2a82490394b8dec5fea5f1d8847e1
 
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py     2014-08-24 12:18:54.645388402 +0200
-+++ doc-backend/openacademy/models.py  2014-08-24 12:18:54.641388402 +0200
+--- addons.orig/openacademy/models.py  2014-08-26 17:26:12.059783193 +0200
++++ addons/openacademy/models.py       2014-08-26 17:26:12.051783193 +0200
 @@ -59,6 +59,9 @@
      end_date = fields.Date(string="End Date", store=True,
          compute='_get_end_date', inverse='_set_end_date')
@@ -31,11 +31,11 @@ Index: doc-backend/openacademy/models.py
      @api.constrains('instructor_id', 'attendee_ids')
      def _check_instructor_not_in_attendees(self):
          if self.instructor_id and self.instructor_id in self.attendee_ids:
-Index: doc-backend/openacademy/views/openacademy.xml
+Index: addons/openacademy/views/openacademy.xml
 ===================================================================
---- doc-backend.orig/openacademy/views/openacademy.xml 2014-08-24 12:18:54.645388402 +0200
-+++ doc-backend/openacademy/views/openacademy.xml      2014-08-24 12:18:54.641388402 +0200
-@@ -137,11 +137,24 @@
+--- addons.orig/openacademy/views/openacademy.xml      2014-08-26 17:26:12.059783193 +0200
++++ addons/openacademy/views/openacademy.xml   2014-08-26 17:26:12.055783193 +0200
+@@ -142,11 +142,24 @@
              </field>
          </record>
  

diff --git a/doc/howtos/backend/exercise-graph b/doc/howtos/backend/exercise-graph
index fc79788..c7f03d2 100644 (file)
--- a/doc/howtos/backend/exercise-graph
+++ b/doc/howtos/backend/exercise-graph
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent a6fe4d3923db1f8f5dff2c39a711a814b0a0f549
 
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py     2014-08-24 12:19:27.701389167 +0200
-+++ doc-backend/openacademy/models.py  2014-08-24 12:19:27.697389167 +0200
+--- addons.orig/openacademy/models.py  2014-08-26 17:26:13.007783179 +0200
++++ addons/openacademy/models.py       2014-08-26 17:26:12.999783179 +0200
 @@ -62,6 +62,9 @@
      hours = fields.Float(string="Duration in hours",
                           compute='_get_hours', inverse='_set_hours')
@@ -27,11 +27,11 @@ Index: doc-backend/openacademy/models.py
      @api.constrains('instructor_id', 'attendee_ids')
      def _check_instructor_not_in_attendees(self):
          if self.instructor_id and self.instructor_id in self.attendee_ids:
-Index: doc-backend/openacademy/views/openacademy.xml
+Index: addons/openacademy/views/openacademy.xml
 ===================================================================
---- doc-backend.orig/openacademy/views/openacademy.xml 2014-08-24 12:19:27.701389167 +0200
-+++ doc-backend/openacademy/views/openacademy.xml      2014-08-24 12:19:27.697389167 +0200
-@@ -150,11 +150,22 @@
+--- addons.orig/openacademy/views/openacademy.xml      2014-08-26 17:26:13.007783179 +0200
++++ addons/openacademy/views/openacademy.xml   2014-08-26 17:26:12.999783179 +0200
+@@ -155,11 +155,22 @@
              </field>
          </record>
  

diff --git a/doc/howtos/backend/exercise-kanban b/doc/howtos/backend/exercise-kanban
index 9fb2495..24dbec8 100644 (file)
--- a/doc/howtos/backend/exercise-kanban
+++ b/doc/howtos/backend/exercise-kanban
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent 8d66f7620781558d4520f97e4cebc14ed180683e
 
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py     2014-08-24 12:20:07.801390095 +0200
-+++ doc-backend/openacademy/models.py  2014-08-24 12:20:07.793390095 +0200
+--- addons.orig/openacademy/models.py  2014-08-26 17:26:13.919783165 +0200
++++ addons/openacademy/models.py       2014-08-26 17:26:13.915783165 +0200
 @@ -47,6 +47,7 @@
      duration = fields.Float(digits=(6, 2), help="Duration in days")
      seats = fields.Integer(string="Number of seats")
@@ -13,11 +13,11 @@ Index: doc-backend/openacademy/models.py
  
      instructor_id = fields.Many2one('res.partner', string="Instructor",
          domain=['|', ('instructor', '=', True),
-Index: doc-backend/openacademy/views/openacademy.xml
+Index: addons/openacademy/views/openacademy.xml
 ===================================================================
---- doc-backend.orig/openacademy/views/openacademy.xml 2014-08-24 12:20:07.801390095 +0200
-+++ doc-backend/openacademy/views/openacademy.xml      2014-08-24 12:20:07.793390095 +0200
-@@ -161,11 +161,57 @@
+--- addons.orig/openacademy/views/openacademy.xml      2014-08-26 17:26:13.919783165 +0200
++++ addons/openacademy/views/openacademy.xml   2014-08-26 17:26:13.915783165 +0200
+@@ -166,11 +166,57 @@
              </field>
          </record>
  

diff --git a/doc/howtos/backend/exercise-many2many b/doc/howtos/backend/exercise-many2many
index 41d0303..e8242a4 100644 (file)
--- a/doc/howtos/backend/exercise-many2many
+++ b/doc/howtos/backend/exercise-many2many
@@ -1,7 +1,7 @@
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py     2014-08-24 12:06:18.941370912 +0200
-+++ doc-backend/openacademy/models.py  2014-08-24 12:06:28.885371142 +0200
+--- addons.orig/openacademy/models.py  2014-08-26 17:25:59.483783379 +0200
++++ addons/openacademy/models.py       2014-08-26 17:25:59.479783379 +0200
 @@ -25,3 +25,4 @@
      instructor_id = fields.Many2one('res.partner', string="Instructor")
      course_id = fields.Many2one('openacademy.course',

diff --git a/doc/howtos/backend/exercise-many2one b/doc/howtos/backend/exercise-many2one
index 29385da..1029ffc 100644 (file)
--- a/doc/howtos/backend/exercise-many2one
+++ b/doc/howtos/backend/exercise-many2one
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent a6e217b1fbbc64111581c269629b1c25c23abb99
 
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py     2014-08-24 12:04:40.829368641 +0200
-+++ doc-backend/openacademy/models.py  2014-08-24 12:04:57.509369027 +0200
+--- addons.orig/openacademy/models.py  2014-08-26 17:25:57.515783409 +0200
++++ addons/openacademy/models.py       2014-08-26 17:25:57.511783409 +0200
 @@ -8,6 +8,9 @@
      name = fields.Char(string="Title", required=True)
      description = fields.Text()
@@ -23,11 +23,11 @@ Index: doc-backend/openacademy/models.py
 +    instructor_id = fields.Many2one('res.partner', string="Instructor")
 +    course_id = fields.Many2one('openacademy.course',
 +        ondelete='cascade', string="Course", required=True)
-Index: doc-backend/openacademy/views/openacademy.xml
+Index: addons/openacademy/views/openacademy.xml
 ===================================================================
---- doc-backend.orig/openacademy/views/openacademy.xml 2014-08-24 12:04:40.829368641 +0200
-+++ doc-backend/openacademy/views/openacademy.xml      2014-08-24 12:04:40.825368641 +0200
-@@ -63,5 +63,16 @@
+--- addons.orig/openacademy/views/openacademy.xml      2014-08-26 17:25:57.515783409 +0200
++++ addons/openacademy/views/openacademy.xml   2014-08-26 17:25:57.511783409 +0200
+@@ -64,5 +64,16 @@
          <!-- Full id location:
               action="openacademy.course_list_action"
               It is not required when it is the same module -->

diff --git a/doc/howtos/backend/exercise-model b/doc/howtos/backend/exercise-model
index 89d263d..57be0ed 100644 (file)
--- a/doc/howtos/backend/exercise-model
+++ b/doc/howtos/backend/exercise-model
@@ -1,9 +1,9 @@
 # HG changeset patch
 # Parent e3bb12713a6d38c28f50d46e8c1bab74ac40c1be
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py     2014-08-24 11:54:02.949353877 +0200
-+++ doc-backend/openacademy/models.py  2014-08-24 11:54:26.153354414 +0200
+--- addons.orig/openacademy/models.py  2014-08-26 17:25:51.643783496 +0200
++++ addons/openacademy/models.py       2014-08-26 17:25:51.639783496 +0200
 @@ -2,7 +2,8 @@
  
  from openerp import models, fields, api

diff --git a/doc/howtos/backend/exercise-model-inheritance b/doc/howtos/backend/exercise-model-inheritance
index 7b6e73c..ddc84ea 100644 (file)
--- a/doc/howtos/backend/exercise-model-inheritance
+++ b/doc/howtos/backend/exercise-model-inheritance
@@ -1,19 +1,19 @@
 # HG changeset patch
 # Parent d903c828fb10f2b38e5f43e9ceaeae0a9db7f858
 
-Index: doc-backend/openacademy/__init__.py
+Index: addons/openacademy/__init__.py
 ===================================================================
---- doc-backend.orig/openacademy/__init__.py   2014-08-24 12:07:13.669372178 +0200
-+++ doc-backend/openacademy/__init__.py        2014-08-24 12:07:30.697372572 +0200
+--- addons.orig/openacademy/__init__.py        2014-08-26 17:26:01.227783353 +0200
++++ addons/openacademy/__init__.py     2014-08-26 17:26:01.219783354 +0200
 @@ -1,3 +1,4 @@
  # -*- coding: utf-8 -*-
  import controllers
  import models
 +import partner
-Index: doc-backend/openacademy/__openerp__.py
+Index: addons/openacademy/__openerp__.py
 ===================================================================
---- doc-backend.orig/openacademy/__openerp__.py        2014-08-24 12:07:13.669372178 +0200
-+++ doc-backend/openacademy/__openerp__.py     2014-08-24 12:07:13.661372178 +0200
+--- addons.orig/openacademy/__openerp__.py     2014-08-26 17:26:01.227783353 +0200
++++ addons/openacademy/__openerp__.py  2014-08-26 17:26:01.223783354 +0200
 @@ -28,6 +28,7 @@
          # 'security/ir.model.access.csv',
          'templates.xml',
@@ -22,11 +22,11 @@ Index: doc-backend/openacademy/__openerp__.py
      ],
      # only loaded in demonstration mode
      'demo': [
-Index: doc-backend/openacademy/partner.py
+Index: addons/openacademy/partner.py
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/partner.py 2014-08-24 12:07:13.661372178 +0200
-@@ -0,0 +1,11 @@
++++ addons/openacademy/partner.py      2014-08-26 17:26:01.223783354 +0200
+@@ -0,0 +1,12 @@
 +# -*- coding: utf-8 -*-
 +from openerp import fields, models
 +
@@ -37,12 +37,13 @@ Index: doc-backend/openacademy/partner.py
 +    # instructors
 +    instructor = fields.Boolean("Instructor", default=False)
 +
-+    session_ids = fields.Many2many('openacademy.session', string="Attended Sessions")
-Index: doc-backend/openacademy/views/partner.xml
++    session_ids = fields.Many2many('openacademy.session',
++        string="Attended Sessions", readonly=True)
+Index: addons/openacademy/views/partner.xml
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/views/partner.xml  2014-08-24 12:07:13.661372178 +0200
-@@ -0,0 +1,28 @@
++++ addons/openacademy/views/partner.xml       2014-08-26 17:26:01.223783354 +0200
+@@ -0,0 +1,32 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 + <openerp>
 +    <data>
@@ -52,10 +53,14 @@ Index: doc-backend/openacademy/views/partner.xml
 +            <field name="model">res.partner</field>
 +            <field name="inherit_id" ref="base.view_partner_form"/>
 +            <field name="arch" type="xml">
-+                <field name="is_company" position="before">
-+                    <field name="instructor"/>
-+                    <label for="instructor" string="Is an Instructor?"/>
-+                </field>
++                <notebook position="inside">
++                    <page string="Sessions">
++                        <group>
++                            <field name="instructor"/>
++                            <field name="session_ids"/>
++                        </group>
++                    </page>
++                </notebook>
 +            </field>
 +        </record>
 +

diff --git a/doc/howtos/backend/exercise-o2m-views b/doc/howtos/backend/exercise-o2m-views
index ff8a8ff..9ba227d 100644 (file)
--- a/doc/howtos/backend/exercise-o2m-views
+++ b/doc/howtos/backend/exercise-o2m-views
@@ -1,35 +1,36 @@
 # HG changeset patch
 # Parent 1299668a15a9359d4ef77d8f5231816c7de476fa
 
-Index: doc-backend/openacademy/views/openacademy.xml
+Index: addons/openacademy/views/openacademy.xml
 ===================================================================
---- doc-backend.orig/openacademy/views/openacademy.xml 2014-08-24 12:07:04.877371975 +0200
-+++ doc-backend/openacademy/views/openacademy.xml      2014-08-24 12:07:04.869371975 +0200
-@@ -19,12 +19,18 @@
+--- addons.orig/openacademy/views/openacademy.xml      2014-08-26 17:26:00.403783366 +0200
++++ addons/openacademy/views/openacademy.xml   2014-08-26 17:26:00.399783366 +0200
+@@ -9,13 +9,19 @@
                      <sheet>
                          <group>
                              <field name="name"/>
 +                            <field name="responsible_id"/>
-                             <notebook colspan="4">
-                                 <page string="Description">
-                                     <field name="description"/>
-                                 </page>
--                                <page string="About">
--                                    This is an example of notebooks
-+                                <page string="Sessions">
-+                                    <field name="session_ids">
-+                                        <tree string="Registered sessions">
-+                                            <field name="name"/>
-+                                            <field name="instructor_id"/>
-+                                        </tree>
-+                                    </field>
-                                 </page>
-                             </notebook>
                          </group>
-@@ -32,6 +38,17 @@
-                 </form>
+                         <notebook>
+                             <page string="Description">
+                                 <field name="description"/>
+                             </page>
+-                            <page string="About">
+-                                This is an example of notebooks
++                            <page string="Sessions">
++                                <field name="session_ids">
++                                    <tree string="Registered sessions">
++                                        <field name="name"/>
++                                        <field name="instructor_id"/>
++                                    </tree>
++                                </field>
+                             </page>
+                         </notebook>
+                     </sheet>
+@@ -34,6 +40,18 @@
              </field>
          </record>
+ 
 +        <!-- override the automatically generated list view for courses -->
 +        <record model="ir.ui.view" id="course_tree_view">
 +            <field name="name">course.tree</field>
@@ -41,37 +42,41 @@ Index: doc-backend/openacademy/views/openacademy.xml
 +                </tree>
 +            </field>
 +        </record>
- 
++
          <!-- window action -->
          <!--
-@@ -64,6 +81,41 @@
+             The following tag is an action definition for a "window action",
+@@ -65,6 +83,44 @@
               action="openacademy.course_list_action"
               It is not required when it is the same module -->
  
-+        <!-- session’s form view -->
++        <!-- session's form view -->
 +        <record model="ir.ui.view" id="session_form_view">
 +            <field name="name">session.form</field>
 +            <field name="model">openacademy.session</field>
 +            <field name="arch" type="xml">
 +                <form string="Session Form">
-+                    <group colspan="2" col="2">
-+                        <separator string="General" colspan="2"/>
-+                        <field name="course_id"/>
-+                        <field name="name"/>
-+                        <field name="instructor_id"/>
-+                    </group>
-+                    <group colspan="2" col="2">
-+                        <separator string="Schedule" colspan="2"/>
-+                        <field name="start_date"/>
-+                        <field name="duration"/>
-+                        <field name="seats"/>
-+                    </group>
-+                    <separator string="Attendees" colspan="4"/>
-+                    <field name="attendee_ids" colspan="4" nolabel="1"/>
++                    <sheet>
++                        <group>
++                            <group string="General">
++                                <field name="course_id"/>
++                                <field name="name"/>
++                                <field name="instructor_id"/>
++                            </group>
++                            <group string="Schedule">
++                                <field name="start_date"/>
++                                <field name="duration"/>
++                                <field name="seats"/>
++                            </group>
++                        </group>
++                        <label for="attendee_ids"/>
++                        <field name="attendee_ids"/>
++                    </sheet>
 +                </form>
 +            </field>
 +        </record>
-+        <!-- session’s tree/list view -->
++
++        <!-- session's tree/list view -->
 +        <record model="ir.ui.view" id="session_tree_view">
 +            <field name="name">session.tree</field>
 +            <field name="model">openacademy.session</field>

diff --git a/doc/howtos/backend/exercise-onchange b/doc/howtos/backend/exercise-onchange
index d9d7439..498379b 100644 (file)
--- a/doc/howtos/backend/exercise-onchange
+++ b/doc/howtos/backend/exercise-onchange
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent 8d5573b704b2867788dd6895503f1871c2976a29
 
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py     2014-08-24 12:12:01.933378850 +0200
-+++ doc-backend/openacademy/models.py  2014-08-24 12:12:15.065379154 +0200
+--- addons.orig/openacademy/models.py  2014-08-26 17:26:05.687783287 +0200
++++ addons/openacademy/models.py       2014-08-26 17:26:05.679783287 +0200
 @@ -39,3 +39,20 @@
              self.taken_seats = 0.0
          else:

diff --git a/doc/howtos/backend/exercise-one2many b/doc/howtos/backend/exercise-one2many
index 831dc6b..6d5f18e 100644 (file)
--- a/doc/howtos/backend/exercise-one2many
+++ b/doc/howtos/backend/exercise-one2many
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent cb05882d4fe73e97b9d34a69190ced14d1a50c24
 
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py     2014-08-24 12:05:31.001369802 +0200
-+++ doc-backend/openacademy/models.py  2014-08-24 12:05:30.997369802 +0200
+--- addons.orig/openacademy/models.py  2014-08-26 17:25:58.455783395 +0200
++++ addons/openacademy/models.py       2014-08-26 17:25:58.447783395 +0200
 @@ -10,6 +10,8 @@
  
      responsible_id = fields.Many2one('res.users',

diff --git a/doc/howtos/backend/exercise-report b/doc/howtos/backend/exercise-report
index 15618e0..9419b88 100644 (file)
--- a/doc/howtos/backend/exercise-report
+++ b/doc/howtos/backend/exercise-report
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent c140f0a861a08881d8737bca0ffb83904a2059a3
 
-Index: doc-backend/openacademy/__openerp__.py
+Index: addons/openacademy/__openerp__.py
 ===================================================================
---- doc-backend.orig/openacademy/__openerp__.py        2014-08-24 12:28:46.485402100 +0200
-+++ doc-backend/openacademy/__openerp__.py     2014-08-24 12:28:46.477402100 +0200
+--- addons.orig/openacademy/__openerp__.py     2014-08-26 17:26:20.735783064 +0200
++++ addons/openacademy/__openerp__.py  2014-08-26 17:26:20.727783064 +0200
 @@ -31,6 +31,7 @@
          'views/openacademy.xml',
          'views/partner.xml',
@@ -13,10 +13,10 @@ Index: doc-backend/openacademy/__openerp__.py
      ],
      # only loaded in demonstration mode
      'demo': [
-Index: doc-backend/openacademy/reports.xml
+Index: addons/openacademy/reports.xml
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/reports.xml        2014-08-24 12:30:37.161404662 +0200
++++ addons/openacademy/reports.xml     2014-08-26 17:26:20.727783064 +0200
 @@ -0,0 +1,30 @@
 +<openerp>
 +<data>

diff --git a/doc/howtos/backend/exercise-searchview b/doc/howtos/backend/exercise-searchview
index 8878c56..e638d63 100644 (file)
--- a/doc/howtos/backend/exercise-searchview
+++ b/doc/howtos/backend/exercise-searchview
@@ -1,51 +1,27 @@
 # HG changeset patch
 # Parent 93a45ab8dd0a76c131cb5eeca6e44b71dca9f100
 
-diff --git a/openacademy/views/openacademy.xml b/openacademy/views/openacademy.xml
---- a/openacademy/views/openacademy.xml
-+++ b/openacademy/views/openacademy.xml
-@@ -1,16 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <openerp>
-     <data>
--        <record model="ir.ui.view" id="course_search_view">
--            <field name="name">course.search</field>
--            <field name="model">openacademy.course</field>
--            <field name="arch" type="xml">
--                <search>
--                    <field name="name"/>
--                    <field name="description"/>
--                </search>
--            </field>
--        </record>
-         <record model="ir.ui.view" id="course_form_view">
-             <field name="name">course.form</field>
+Index: addons/openacademy/views/openacademy.xml
+===================================================================
+--- addons.orig/openacademy/views/openacademy.xml      2014-08-26 17:26:11.107783207 +0200
++++ addons/openacademy/views/openacademy.xml   2014-08-26 17:26:11.099783207 +0200
+@@ -33,7 +33,10 @@
+             <field name="name">course.search</field>
              <field name="model">openacademy.course</field>
-@@ -49,6 +39,19 @@
-                 </tree>
-             </field>
-         </record>
-+        <record model="ir.ui.view" id="course_search_view">
-+            <field name="name">course.search</field>
-+            <field name="model">openacademy.course</field>
-+            <field name="arch" type="xml">
+             <field name="arch" type="xml">
+-                <search>
 +                <search string="Session Search">
-+                    <filter string="My Courses" icon="terp-partner"
-+                            name="my_courses" domain="[('responsible_id', '=', uid)]"
++                    <filter string="My Courses" name="my_courses"
++                            domain="[('responsible_id', '=', uid)]"
 +                            help="My own sessions"/>
-+                    <field name="name"/>
-+                    <field name="description"/>
-+                </search>
-+            </field>
-+        </record>
- 
-         <!-- window action -->
-         <!--
-@@ -60,6 +63,7 @@
+                     <field name="name"/>
+                     <field name="description"/>
+                 </search>
+@@ -62,6 +65,7 @@
              <field name="res_model">openacademy.course</field>
              <field name="view_type">form</field>
              <field name="view_mode">tree,form</field>
-+            <field name="search_view_id" ref="course_search_view"/>
++            <field name="context" eval="{'search_default_my_courses': 1}"/>
              <field name="help" type="html">
                  <p class="oe_view_nocontent_create">Create the first course
                  </p>

diff --git a/doc/howtos/backend/exercise-searchview-basic b/doc/howtos/backend/exercise-searchview-basic
index b9abab8..a048133 100644 (file)
--- a/doc/howtos/backend/exercise-searchview-basic
+++ b/doc/howtos/backend/exercise-searchview-basic
@@ -1,13 +1,13 @@
 # HG changeset patch
 # Parent b9bfc8929e0ffc3eb153641e14952fe5d99eb908
-Index: doc-backend/openacademy/views/openacademy.xml
+Index: addons/openacademy/views/openacademy.xml
 ===================================================================
---- doc-backend.orig/openacademy/views/openacademy.xml 2014-08-24 12:03:05.745366440 +0200
-+++ doc-backend/openacademy/views/openacademy.xml      2014-08-24 12:03:05.741366440 +0200
-@@ -1,6 +1,16 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <openerp>
-     <data>
+--- addons.orig/openacademy/views/openacademy.xml      2014-08-26 17:25:55.807783434 +0200
++++ addons/openacademy/views/openacademy.xml   2014-08-26 17:25:55.799783434 +0200
+@@ -23,6 +23,17 @@
+             </field>
+         </record>
+ 
 +        <record model="ir.ui.view" id="course_search_view">
 +            <field name="name">course.search</field>
 +            <field name="model">openacademy.course</field>
@@ -18,6 +18,7 @@ Index: doc-backend/openacademy/views/openacademy.xml
 +                </search>
 +            </field>
 +        </record>
-         <record model="ir.ui.view" id="course_form_view">
-             <field name="name">course.form</field>
-             <field name="model">openacademy.course</field>
++
+         <!-- window action -->
+         <!--
+             The following tag is an action definition for a "window action",

diff --git a/doc/howtos/backend/exercise-session b/doc/howtos/backend/exercise-session
index 856a71c..ec3c845 100644 (file)
--- a/doc/howtos/backend/exercise-session
+++ b/doc/howtos/backend/exercise-session
@@ -1,9 +1,9 @@
 # HG changeset patch
 # Parent 22f8d180a7f9ad209d7e98cf7d1bd0fee1f05350
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py     2014-08-24 12:03:20.161366774 +0200
-+++ doc-backend/openacademy/models.py  2014-08-24 12:03:35.149367121 +0200
+--- addons.orig/openacademy/models.py  2014-08-26 17:25:56.603783422 +0200
++++ addons/openacademy/models.py       2014-08-26 17:25:56.595783422 +0200
 @@ -7,3 +7,12 @@
  
      name = fields.Char(string="Title", required=True)

diff --git a/doc/howtos/backend/exercise-state-basic b/doc/howtos/backend/exercise-state-basic
index 19b68c2..f2a91d1 100644 (file)
--- a/doc/howtos/backend/exercise-state-basic
+++ b/doc/howtos/backend/exercise-state-basic
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent 8c721171aa16a41e94059f53d6780c67b5ef2dfc
 
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py     2014-08-24 12:20:31.953390654 +0200
-+++ doc-backend/openacademy/models.py  2014-08-24 12:20:31.949390654 +0200
+--- addons.orig/openacademy/models.py  2014-08-26 17:26:14.907783150 +0200
++++ addons/openacademy/models.py       2014-08-26 17:26:14.899783151 +0200
 @@ -66,6 +66,24 @@
      attendees_count = fields.Integer(
          string="Attendees count", compute='_get_attendees_count', store=True)
@@ -30,30 +30,14 @@ Index: doc-backend/openacademy/models.py
      @api.one
      @api.depends('seats', 'attendee_ids')
      def _taken_seats(self):
-Index: doc-backend/openacademy/views/openacademy.xml
+Index: addons/openacademy/views/openacademy.xml
 ===================================================================
---- doc-backend.orig/openacademy/views/openacademy.xml 2014-08-24 12:20:31.953390654 +0200
-+++ doc-backend/openacademy/views/openacademy.xml      2014-08-24 12:20:31.949390654 +0200
-@@ -91,22 +91,37 @@
+--- addons.orig/openacademy/views/openacademy.xml      2014-08-26 17:26:14.907783150 +0200
++++ addons/openacademy/views/openacademy.xml   2014-08-26 17:26:14.899783151 +0200
+@@ -93,6 +93,19 @@
              <field name="model">openacademy.session</field>
              <field name="arch" type="xml">
                  <form string="Session Form">
--                    <group colspan="2" col="2">
--                        <separator string="General" colspan="2"/>
--                        <field name="course_id"/>
--                        <field name="name"/>
--                        <field name="instructor_id"/>
--                        <field name="active"/>
--                    </group>
--                    <group colspan="2" col="2">
--                        <separator string="Schedule" colspan="2"/>
--                        <field name="start_date"/>
--                        <field name="duration"/>
--                        <field name="seats"/>
--                        <field name="taken_seats" widget="progressbar"/>
--                    </group>
--                    <separator string="Attendees" colspan="4"/>
--                    <field name="attendee_ids" colspan="4" nolabel="1"/>
 +                    <header>
 +                        <button name="action_draft" type="object"
 +                                string="Reset to draft"
@@ -67,24 +51,6 @@ Index: doc-backend/openacademy/views/openacademy.xml
 +                        <field name="state" widget="statusbar"/>
 +                    </header>
 +
-+                    <sheet>
-+                        <group colspan="2" col="2">
-+                            <separator string="General" colspan="2"/>
-+                            <field name="course_id"/>
-+                            <field name="name"/>
-+                            <field name="instructor_id"/>
-+                            <field name="active"/>
-+                        </group>
-+                        <group colspan="2" col="2">
-+                            <separator string="Schedule" colspan="2"/>
-+                            <field name="start_date"/>
-+                            <field name="duration"/>
-+                            <field name="seats"/>
-+                            <field name="taken_seats" widget="progressbar"/>
-+                        </group>
-+                        <separator string="Attendees" colspan="4"/>
-+                        <field name="attendee_ids" colspan="4" nolabel="1"/>
-+                    </sheet>
-                 </form>
-             </field>
-         </record>
+                     <sheet>
+                         <group>
+                             <group string="General">

diff --git a/doc/howtos/backend/exercise-state-workflow b/doc/howtos/backend/exercise-state-workflow
index 53693d3..ee6b318 100644 (file)
--- a/doc/howtos/backend/exercise-state-workflow
+++ b/doc/howtos/backend/exercise-state-workflow
@@ -1,10 +1,10 @@
 # HG changeset patch
 # Parent c72382bf0c5794135fa318f6ba59899b2277d8c5
 
-Index: doc-backend/openacademy/__openerp__.py
+Index: addons/openacademy/__openerp__.py
 ===================================================================
---- doc-backend.orig/openacademy/__openerp__.py        2014-08-24 12:34:54.425410616 +0200
-+++ doc-backend/openacademy/__openerp__.py     2014-08-24 12:34:54.417410616 +0200
+--- addons.orig/openacademy/__openerp__.py     2014-08-26 17:26:15.771783138 +0200
++++ addons/openacademy/__openerp__.py  2014-08-26 17:26:15.763783138 +0200
 @@ -29,6 +29,7 @@
          'templates.xml',
          'views/openacademy.xml',
@@ -13,10 +13,10 @@ Index: doc-backend/openacademy/__openerp__.py
      ],
      # only loaded in demonstration mode
      'demo': [
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py     2014-08-24 12:34:54.425410616 +0200
-+++ doc-backend/openacademy/models.py  2014-08-24 12:34:54.417410616 +0200
+--- addons.orig/openacademy/models.py  2014-08-26 17:26:15.771783138 +0200
++++ addons/openacademy/models.py       2014-08-26 17:26:15.763783138 +0200
 @@ -70,7 +70,7 @@
           ('draft', "Draft"),
           ('confirmed', "Confirmed"),
@@ -26,11 +26,11 @@ Index: doc-backend/openacademy/models.py
  
      @api.one
      def action_draft(self):
-Index: doc-backend/openacademy/views/openacademy.xml
+Index: addons/openacademy/views/openacademy.xml
 ===================================================================
---- doc-backend.orig/openacademy/views/openacademy.xml 2014-08-24 12:34:54.425410616 +0200
-+++ doc-backend/openacademy/views/openacademy.xml      2014-08-24 12:34:54.417410616 +0200
-@@ -92,13 +92,13 @@
+--- addons.orig/openacademy/views/openacademy.xml      2014-08-26 17:26:15.771783138 +0200
++++ addons/openacademy/views/openacademy.xml   2014-08-26 17:26:15.763783138 +0200
+@@ -94,13 +94,13 @@
              <field name="arch" type="xml">
                  <form string="Session Form">
                      <header>
@@ -47,11 +47,11 @@ Index: doc-backend/openacademy/views/openacademy.xml
                                  string="Mark as done" states="confirmed"
                                  class="oe_highlight"/>
                          <field name="state" widget="statusbar"/>
-Index: doc-backend/openacademy/views/session_workflow.xml
+Index: addons/openacademy/views/session_workflow.xml
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ doc-backend/openacademy/views/session_workflow.xml 2014-08-24 12:35:14.105411072 +0200
-@@ -0,0 +1,51 @@
++++ addons/openacademy/views/session_workflow.xml      2014-08-26 17:26:15.763783138 +0200
+@@ -0,0 +1,50 @@
 +<openerp>
 +    <data>
 +        <record model="workflow" id="wkf_session">
@@ -76,7 +76,6 @@ Index: doc-backend/openacademy/views/session_workflow.xml
 +        <record model="workflow.activity" id="done">
 +            <field name="name">Done</field>
 +            <field name="wkf_id" ref="wkf_session"/>
-+            <field name="flow_stop" eval="True"/>
 +            <field name="kind">function</field>
 +            <field name="action">action_done()</field>
 +        </record>

diff --git a/doc/howtos/backend/exercise-state-workflow-actions b/doc/howtos/backend/exercise-state-workflow-actions
index 83e9c04..826ec5c 100644 (file)
--- a/doc/howtos/backend/exercise-state-workflow-actions
+++ b/doc/howtos/backend/exercise-state-workflow-actions
@@ -1,34 +1,11 @@
 # HG changeset patch
 # Parent 0764cf061d021a0a5b2811f5ec5d835f799630fc
 
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/views/session_workflow.xml
 ===================================================================
---- doc-backend.orig/openacademy/models.py     2014-08-24 12:37:16.637413907 +0200
-+++ doc-backend/openacademy/models.py  2014-08-24 12:37:16.625413907 +0200
-@@ -73,18 +73,6 @@
-     ])
- 
-     @api.one
--    def action_draft(self):
--        self.state = 'draft'
--
--    @api.one
--    def action_confirm(self):
--        self.state = 'confirmed'
--
--    @api.one
--    def action_done(self):
--        self.state = 'done'
--
--    @api.one
-     @api.depends('seats', 'attendee_ids')
-     def _taken_seats(self):
-         if not self.seats:
-Index: doc-backend/openacademy/views/session_workflow.xml
-===================================================================
---- doc-backend.orig/openacademy/views/session_workflow.xml    2014-08-24 12:37:16.637413907 +0200
-+++ doc-backend/openacademy/views/session_workflow.xml 2014-08-24 12:41:01.153419104 +0200
-@@ -6,25 +6,57 @@
+--- addons.orig/openacademy/views/session_workflow.xml 2014-08-26 17:26:17.339783114 +0200
++++ addons/openacademy/views/session_workflow.xml      2014-08-26 17:26:17.331783114 +0200
+@@ -6,24 +6,53 @@
              <field name="on_create">True</field>
          </record>
  
@@ -36,9 +13,8 @@ Index: doc-backend/openacademy/views/session_workflow.xml
 +            <field name="name">Set session to Draft</field>
 +            <field name="model_id" ref="model_openacademy_session"/>
 +            <field name="code">
-+                self.write(cr, uid, context['active_ids'], {
-+                    'state': 'draft'
-+                }, context=context)
++recs = self.browse(cr, uid, context['active_ids'], context=context)
++recs.action_draft()
 +            </field>
 +        </record>
          <record model="workflow.activity" id="draft">
@@ -56,9 +32,8 @@ Index: doc-backend/openacademy/views/session_workflow.xml
 +            <field name="name">Set session to Confirmed</field>
 +            <field name="model_id" ref="model_openacademy_session"/>
 +            <field name="code">
-+                self.write(cr, uid, context['active_ids'], {
-+                    'state': 'confirmed'
-+                }, context=context)
++recs = self.browse(cr, uid, context['active_ids'], context=context)
++recs.action_confirm()
 +            </field>
          </record>
          <record model="workflow.activity" id="confirmed">
@@ -75,15 +50,13 @@ Index: doc-backend/openacademy/views/session_workflow.xml
 +            <field name="name">Set session to Done</field>
 +            <field name="model_id" ref="model_openacademy_session"/>
 +            <field name="code">
-+                self.write(cr, uid, context['active_ids'], {
-+                    'state': 'done'
-+                }, context=context)
++recs = self.browse(cr, uid, context['active_ids'], context=context)
++recs.action_done()
 +            </field>
          </record>
          <record model="workflow.activity" id="done">
              <field name="name">Done</field>
              <field name="wkf_id" ref="wkf_session"/>
-             <field name="flow_stop" eval="True"/>
 -            <field name="kind">function</field>
 -            <field name="action">action_done()</field>
 +            <field name="kind">dummy</field>

diff --git a/doc/howtos/backend/exercise-state-workflow-automatic b/doc/howtos/backend/exercise-state-workflow-automatic
index 378a901..112d0a3 100644 (file)
--- a/doc/howtos/backend/exercise-state-workflow-automatic
+++ b/doc/howtos/backend/exercise-state-workflow-automatic
@@ -3,9 +3,9 @@
 
 Index: addons/openacademy/views/session_workflow.xml
 ===================================================================
---- addons.orig/openacademy/views/session_workflow.xml 2014-08-25 16:30:49.708047780 +0200
-+++ addons/openacademy/views/session_workflow.xml      2014-08-25 16:31:19.032047345 +0200
-@@ -47,5 +47,11 @@
+--- addons.orig/openacademy/views/session_workflow.xml 2014-08-26 17:26:16.583783126 +0200
++++ addons/openacademy/views/session_workflow.xml      2014-08-26 17:26:16.579783126 +0200
+@@ -46,5 +46,11 @@
              <field name="act_to" ref="done"/>
              <field name="signal">done</field>
          </record>

diff --git a/doc/howtos/backend/exercise-translations b/doc/howtos/backend/exercise-translations
index 2fc98d0..aa62a5d 100644 (file)
--- a/doc/howtos/backend/exercise-translations
+++ b/doc/howtos/backend/exercise-translations
@@ -1,7 +1,7 @@
-Index: doc-backend/openacademy/models.py
+Index: addons/openacademy/models.py
 ===================================================================
---- doc-backend.orig/openacademy/models.py     2014-08-25 14:43:52.288143046 +0200
-+++ doc-backend/openacademy/models.py  2014-08-25 14:49:46.148137793 +0200
+--- addons.orig/openacademy/models.py  2014-08-26 17:26:19.919783076 +0200
++++ addons/openacademy/models.py       2014-08-26 17:26:19.915783076 +0200
 @@ -1,7 +1,7 @@
  # -*- coding: utf-8 -*-
  
@@ -11,7 +11,7 @@ Index: doc-backend/openacademy/models.py
  
  class Course(models.Model):
      _name = 'openacademy.course'
-@@ -85,15 +85,15 @@
+@@ -97,15 +97,15 @@
          if self.seats < 0:
              return {
                  'warning': {
@@ -31,7 +31,7 @@ Index: doc-backend/openacademy/models.py
                  },
              }
  
-@@ -135,4 +135,4 @@
+@@ -147,4 +147,4 @@
      @api.constrains('instructor_id', 'attendee_ids')
      def _check_instructor_not_in_attendees(self):
          if self.instructor_id and self.instructor_id in self.attendee_ids: