Merge lp:~camptocamp/account-invoice-report/add-domain into lp:~account-core-editors/account-invoice-report/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)

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

+1

review: Approve (code review, no test)

=== modified file 'invoice_webkit/__openerp__.py'
--- invoice_webkit/__openerp__.py	2013-01-24 15:28:47 +0000
+++ invoice_webkit/__openerp__.py	2013-02-01 13:51:24 +0000
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {   'name': 'Invoice Report using Webkit Library',
-    'version': '1.0',
+    'version': '1.1.0',
     'category': 'Reports/Webkit',
     'description': """
         Replaces the legacy rml Invoice report by a brand new webkit report.

=== modified file 'invoice_webkit/invoice.py'
--- invoice_webkit/invoice.py	2013-01-30 10:46:33 +0000
+++ invoice_webkit/invoice.py	2013-02-01 13:51:24 +0000
@@ -55,8 +55,10 @@
     def set_footer(self, cr, uid, inv_id, commentid):
         return self._set_condition(cr, uid, inv_id, commentid, 'note2')
 
-    _columns = {'text_condition1': fields.many2one('account.condition_text', 'Header condition'),
-                'text_condition2': fields.many2one('account.condition_text', 'Footer condition'),
+    _columns = {'text_condition1': fields.many2one('account.condition_text', 'Header condition',
+                                                   domain=[('type', '=', 'header')]),
+                'text_condition2': fields.many2one('account.condition_text', 'Footer condition',
+                                                   domain=[('type', '=', 'footer')]),
                 'note1': fields.html('Header'),
                 'note2': fields.html('Footer'),}