Merge lp:~camptocamp/sale-reports/add-domain into lp:~sale-core-editors/sale-reports/7.0

[Nicolas Bessi - Camptocamp]

Add domain on text condition relation

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

LGTM

review: Approve (code review, no test)

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

when you change the data model, please increment the version in __openerp__.py

review: Needs Fixing (code review, no test)

[lp:~camptocamp/sale-reports/add-domain]

12. By Nicolas Bessi - Camptocamp on 2013-02-01

[FIX] version number

Unmerged revisions

=== modified file 'sale_order_webkit/__openerp__.py'
--- sale_order_webkit/__openerp__.py	2013-01-24 10:28:45 +0000
+++ sale_order_webkit/__openerp__.py	2013-02-01 13:51:22 +0000
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {'name': 'Sales Order Report using Webkit Library',
- 'version': '1.0.1',
+ 'version': '1.1.1',
  'category': 'Reports/Webkit',
  'description': """
 Sale order webkit

=== modified file 'sale_order_webkit/sale.py'
--- sale_order_webkit/sale.py	2013-01-24 14:02:07 +0000
+++ sale_order_webkit/sale.py	2013-02-01 13:51:22 +0000
@@ -40,8 +40,10 @@
     _inherit = "sale.order"
     _description = 'Sale Order'
 
-    _columns = {'text_condition1': fields.many2one('sale.condition_text', 'Header'),
-                'text_condition2': fields.many2one('sale.condition_text', 'Footer'),
+    _columns = {'text_condition1': fields.many2one('sale.condition_text', 'Header',
+                                                   domain=[('type', '=', 'header')]),
+                'text_condition2': fields.many2one('sale.condition_text', 'Footer',
+                                                   domain=[('type', '=', 'footer')]),
                 'note1': fields.html('Header'),
                 'note2': fields.html('Footer')}