banking-addons-team team mailing list archive

[Nicolas Bessi - Camptocamp <nicolas.bessi@xxxxxxxxxxxxxx>]

Nicolas Bessi - Camptocamp has proposed merging lp:~camptocamp/banking-addons/bank-statement-reconcile-70-multi-comp-statement into lp:banking-addons/bank-statement-reconcile-70.

Requested reviews:
  Banking Addons Team (banking-addons-team)

For more details, see:
https://code.launchpad.net/~camptocamp/banking-addons/bank-statement-reconcile-70-multi-comp-statement/+merge/148104

Adds multi-company support on account.statement.profile.
-- 
https://code.launchpad.net/~camptocamp/banking-addons/bank-statement-reconcile-70-multi-comp-statement/+merge/148104
Your team Banking Addons Team is requested to review the proposed merge of lp:~camptocamp/banking-addons/bank-statement-reconcile-70-multi-comp-statement into lp:banking-addons/bank-statement-reconcile-70.

=== modified file 'account_statement_ext/__openerp__.py'
--- account_statement_ext/__openerp__.py	2013-02-04 15:16:28 +0000
+++ account_statement_ext/__openerp__.py	2013-02-13 08:35:25 +0000
@@ -76,13 +76,11 @@
 
  """,
  'website': 'http://www.camptocamp.com',
- 'init_xml': [],
- 'update_xml': [
-     'statement_view.xml',
-     'report/bank_statement_webkit_header.xml',
-     'report.xml',
-     'security/ir.model.access.csv',
- ],
+ 'data': ['statement_view.xml',
+          'report/bank_statement_webkit_header.xml',
+          'report.xml',
+          'security/ir.model.access.csv',
+          'security/ir_rule.xml'],
  'demo_xml': [],
  'test': [],
  'installable': True,

=== added file 'account_statement_ext/security/ir_rule.xml'
--- account_statement_ext/security/ir_rule.xml	1970-01-01 00:00:00 +0000
+++ account_statement_ext/security/ir_rule.xml	2013-02-13 08:35:25 +0000
@@ -0,0 +1,10 @@
+<openerp>
+    <data noupdate="1">
+        <record id="account_bank_statement_profile_rule" model="ir.rule">
+            <field name="name">Bank statement profile multi-company</field>
+            <field name="model_id" ref="model_account_statement_profile"/>
+            <field name="global" eval="True"/>
+            <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
+        </record>
+    </data>
+</openerp> 
\ No newline at end of file

=== modified file 'account_statement_ext/statement.py'
--- account_statement_ext/statement.py	2013-02-07 13:34:05 +0000
+++ account_statement_ext/statement.py	2013-02-13 08:35:25 +0000
@@ -76,6 +76,7 @@
             'Bank Statement Prefix', size=32),
         'bank_statement_ids': fields.one2many(
             'account.bank.statement', 'profile_id', 'Bank Statement Imported'),
+        'company_id': fields.many2one('res.company', 'Company'),
     }
 
     def _check_partner(self, cr, uid, ids, context=None):

=== modified file 'account_statement_ext/statement_view.xml'
--- account_statement_ext/statement_view.xml	2013-01-28 09:48:10 +0000
+++ account_statement_ext/statement_view.xml	2013-02-13 08:35:25 +0000
@@ -11,6 +11,7 @@
                 <separator string="" colspan="4"/>
                 <field name="name" select="1" />
                 <field name="partner_id" select="1"/>
+                <field name="company_id" select="1" groups="base.group_multi_company"/>
                 <field name="journal_id" select="1"/>
                 <field name="commission_account_id" />
                 <field name="commission_analytic_id" />
@@ -31,6 +32,7 @@
             <tree string="Import statement">
                 <field name="name" />
                 <field name="partner_id" />
+                <field name="company_id" groups="base.group_multi_company"/>
                 <field name="journal_id" />
                 <field name="commission_account_id" />
                 <field name="commission_analytic_id" />