Merge lp:~tenshi20/openobject-addons/openobject-addons-6.1 into lp:openobject-addons/6.1

[LudoRA]

Unmerged revisions

6949. By LudoRA on 2012-10-12

account: viewing account template nocreate field and filter it in search view

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2012-05-28 06:02:51 +0000
+++ account/account_view.xml	2012-10-12 22:27:19 +0000
@@ -2115,6 +2115,7 @@
                             <field name="currency_id"/>
                             <field name="reconcile"/>
                             <field name="chart_template_id"/>
+                            <field name="nocreate"/>
                             <separator string="Default taxes" colspan="4"/>
                             <field name="tax_ids" colspan="4" nolabel="1"/>
                         </page>
@@ -2149,6 +2150,7 @@
                     <group>
                         <filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/>
                          <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
+                         <filter string="Accounts to create" domain="[('nocreate','!=','true')]"/>
                          <separator orientation="vertical"/>
                         <field name="code"/>
                         <field name="name"/>

=== modified file 'crm_partner_assign/__openerp__.py'
--- crm_partner_assign/__openerp__.py	2012-01-31 13:36:57 +0000
+++ crm_partner_assign/__openerp__.py	2012-10-12 22:27:19 +0000
@@ -37,7 +37,7 @@
 You can also use the geolocalization without using the GPS coordinates.
     """,
     'author': 'OpenERP SA',
-    'depends': ['crm'],
+    'depends': ['account', 'crm'],
     'demo_xml': [
         'res_partner_demo.xml',
     ],