Banking Addons

Merge lp:~camptocamp/banking-addons/bank-statement-reconcile-70-multi-comp-statement into lp:banking-addons/bank-statement-reconcile-70

  1. bank-statement-reconcile-70-multi-comp-statement
  2. Merge into bank-statement-reconcile-70
Proposed by Nicolas Bessi - Camptocamp
Status: Merged
Merge reported by: Joël Grand-Guillaume @ camptocamp
Merged at revision: not available
Proposed branch: lp:~camptocamp/banking-addons/bank-statement-reconcile-70-multi-comp-statement
Merge into: lp:banking-addons/bank-statement-reconcile-70
Diff against target: 199 lines (+63/-10)
10 files modified
account_easy_reconcile/__openerp__.py (+3/-3)
account_easy_reconcile/easy_reconcile.py (+7/-0)
account_easy_reconcile/easy_reconcile.xml (+2/-0)
account_easy_reconcile/easy_reconcile_history.py (+7/-0)
account_easy_reconcile/easy_reconcile_history_view.xml (+1/-0)
account_easy_reconcile/security/ir_rule.xml (+25/-0)
account_statement_ext/__openerp__.py (+5/-7)
account_statement_ext/security/ir_rule.xml (+10/-0)
account_statement_ext/statement.py (+1/-0)
account_statement_ext/statement_view.xml (+2/-0)
To merge this branch: bzr merge lp:~camptocamp/banking-addons/bank-statement-reconcile-70-multi-comp-statement
Reviewer Review Type Date Requested Status
Alexandre Fayolle - camptocamp code review, no test Approve
Joël Grand-Guillaume @ camptocamp Approve
Review via email: mp+148104@code.launchpad.net

This proposal has been superseded by a proposal from 2013-02-14.

Description of the change

Adds multi-company support on account.statement.profile.

To post a comment you must log in.
Revision history for this message
Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c) wrote :

LGTM ! Thanks

review: Approve
lp:~camptocamp/banking-addons/bank-statement-reconcile-70-multi-comp-statement updated
84. By Nicolas Bessi - Camptocamp

[ADD] multi-company support on easy-reconcile related models

85. By Nicolas Bessi - Camptocamp

[FIX] version number as data model has changed

Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

LGTM too

review: Approve (code review, no test)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account_easy_reconcile/__openerp__.py'
--- account_easy_reconcile/__openerp__.py 2013-02-06 09:33:47 +0000
+++ account_easy_reconcile/__openerp__.py 2013-02-14 08:07:22 +0000
@@ -21,9 +21,8 @@
2121
22{22{
23 "name": "Easy Reconcile",23 "name": "Easy Reconcile",
24 "version": "1.2",24 "version": "1.3.0",
25 "depends": ["account",25 "depends": ["account"],
26 ],
27 "author": "Akretion,Camptocamp",26 "author": "Akretion,Camptocamp",
28 "description": """27 "description": """
29Easy Reconcile28Easy Reconcile
@@ -58,6 +57,7 @@
58 "demo_xml": [],57 "demo_xml": [],
59 "data": ["easy_reconcile.xml",58 "data": ["easy_reconcile.xml",
60 "easy_reconcile_history_view.xml",59 "easy_reconcile_history_view.xml",
60 "security/ir_rule.xml",
61 "security/ir.model.access.csv"],61 "security/ir.model.access.csv"],
62 'license': 'AGPL-3',62 'license': 'AGPL-3',
63 "auto_install": False,63 "auto_install": False,
6464
=== modified file 'account_easy_reconcile/easy_reconcile.py'
--- account_easy_reconcile/easy_reconcile.py 2013-01-04 08:39:10 +0000
+++ account_easy_reconcile/easy_reconcile.py 2013-02-14 08:07:22 +0000
@@ -96,6 +96,12 @@
96 string='Task',96 string='Task',
97 required=True,97 required=True,
98 ondelete='cascade'),98 ondelete='cascade'),
99 'company_id': fields.related('task_id','company_id',
100 relation='res.company',
101 type='many2one',
102 string='Company',
103 store=True,
104 readonly=True),
99 }105 }
100106
101 _defaults = {107 _defaults = {
@@ -182,6 +188,7 @@
182 type='many2one',188 type='many2one',
183 relation='easy.reconcile.history',189 relation='easy.reconcile.history',
184 readonly=True),190 readonly=True),
191 'company_id': fields.many2one('res.company', 'Company'),
185 }192 }
186193
187 def _prepare_run_transient(self, cr, uid, rec_method, context=None):194 def _prepare_run_transient(self, cr, uid, rec_method, context=None):
188195
=== modified file 'account_easy_reconcile/easy_reconcile.xml'
--- account_easy_reconcile/easy_reconcile.xml 2013-01-04 08:24:03 +0000
+++ account_easy_reconcile/easy_reconcile.xml 2013-02-14 08:07:22 +0000
@@ -27,6 +27,7 @@
27 <group>27 <group>
28 <field name="name" select="1"/>28 <field name="name" select="1"/>
29 <field name="account"/>29 <field name="account"/>
30 <field name="company_id" groups="base.group_multi_company"/>
30 </group>31 </group>
31 <group>32 <group>
32 <field name="unreconciled_count"/>33 <field name="unreconciled_count"/>
@@ -76,6 +77,7 @@
76 <tree string="Automatic Easy Reconcile">77 <tree string="Automatic Easy Reconcile">
77 <field name="name"/>78 <field name="name"/>
78 <field name="account"/>79 <field name="account"/>
80 <field name="company_id" groups="base.group_multi_company"/>
79 <field name="unreconciled_count"/>81 <field name="unreconciled_count"/>
80 <field name="reconciled_partial_count"/>82 <field name="reconciled_partial_count"/>
81 <button icon="gtk-ok" name="run_reconcile" colspan="4"83 <button icon="gtk-ok" name="run_reconcile" colspan="4"
8284
=== modified file 'account_easy_reconcile/easy_reconcile_history.py'
--- account_easy_reconcile/easy_reconcile_history.py 2012-12-20 10:15:12 +0000
+++ account_easy_reconcile/easy_reconcile_history.py 2013-02-14 08:07:22 +0000
@@ -81,6 +81,13 @@
81 relation='account.move.line',81 relation='account.move.line',
82 readonly=True,82 readonly=True,
83 multi='lines'),83 multi='lines'),
84 'company_id': fields.related('easy_reconcile_id','company_id',
85 relation='res.company',
86 type='many2one',
87 string='Company',
88 store=True,
89 readonly=True),
90
84 }91 }
8592
86 def _open_move_lines(self, cr, uid, history_id, rec_type='full', context=None):93 def _open_move_lines(self, cr, uid, history_id, rec_type='full', context=None):
8794
=== modified file 'account_easy_reconcile/easy_reconcile_history_view.xml'
--- account_easy_reconcile/easy_reconcile_history_view.xml 2013-01-04 08:17:29 +0000
+++ account_easy_reconcile/easy_reconcile_history_view.xml 2013-02-14 08:07:22 +0000
@@ -48,6 +48,7 @@
48 <group>48 <group>
49 <field name="easy_reconcile_id"/>49 <field name="easy_reconcile_id"/>
50 <field name="date"/>50 <field name="date"/>
51 <field name="company_id" groups="base.group_multi_company"/>
51 </group>52 </group>
52 <group col="2">53 <group col="2">
53 <separator colspan="2" string="Reconciliations"/>54 <separator colspan="2" string="Reconciliations"/>
5455
=== added file 'account_easy_reconcile/security/ir_rule.xml'
--- account_easy_reconcile/security/ir_rule.xml 1970-01-01 00:00:00 +0000
+++ account_easy_reconcile/security/ir_rule.xml 2013-02-14 08:07:22 +0000
@@ -0,0 +1,25 @@
1<?xml version="1.0" encoding="utf-8"?>
2<openerp>
3 <data noupdate="1">
4 <record id="easy_reconcile_rule" model="ir.rule">
5 <field name="name">Easy reconcile multi-company</field>
6 <field name="model_id" ref="model_account_easy_reconcile"/>
7 <field name="global" eval="True"/>
8 <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
9 </record>
10
11 <record id="easy_reconcile_history_rule" model="ir.rule">
12 <field name="name">Easy reconcile history multi-company</field>
13 <field name="model_id" ref="model_easy_reconcile_history"/>
14 <field name="global" eval="True"/>
15 <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
16 </record>
17
18 <record id="easy_reconcile_method_rule" model="ir.rule">
19 <field name="name">Easy reconcile method multi-company</field>
20 <field name="model_id" ref="model_account_easy_reconcile_method"/>
21 <field name="global" eval="True"/>
22 <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
23 </record>
24 </data>
25</openerp>
026
=== 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-14 08:07:22 +0000
@@ -76,13 +76,11 @@
7676
77 """,77 """,
78 'website': 'http://www.camptocamp.com',78 'website': 'http://www.camptocamp.com',
79 'init_xml': [],79 'data': ['statement_view.xml',
80 'update_xml': [80 'report/bank_statement_webkit_header.xml',
81 'statement_view.xml',81 'report.xml',
82 'report/bank_statement_webkit_header.xml',82 'security/ir.model.access.csv',
83 'report.xml',83 'security/ir_rule.xml'],
84 'security/ir.model.access.csv',
85 ],
86 'demo_xml': [],84 'demo_xml': [],
87 'test': [],85 'test': [],
88 'installable': True,86 'installable': True,
8987
=== 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-14 08:07:22 +0000
@@ -0,0 +1,10 @@
1<openerp>
2 <data noupdate="1">
3 <record id="account_bank_statement_profile_rule" model="ir.rule">
4 <field name="name">Bank statement profile multi-company</field>
5 <field name="model_id" ref="model_account_statement_profile"/>
6 <field name="global" eval="True"/>
7 <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
8 </record>
9 </data>
10</openerp>
0\ No newline at end of file11\ No newline at end of file
112
=== 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-14 08:07:22 +0000
@@ -76,6 +76,7 @@
76 'Bank Statement Prefix', size=32),76 'Bank Statement Prefix', size=32),
77 'bank_statement_ids': fields.one2many(77 'bank_statement_ids': fields.one2many(
78 'account.bank.statement', 'profile_id', 'Bank Statement Imported'),78 'account.bank.statement', 'profile_id', 'Bank Statement Imported'),
79 'company_id': fields.many2one('res.company', 'Company'),
79 }80 }
8081
81 def _check_partner(self, cr, uid, ids, context=None):82 def _check_partner(self, cr, uid, ids, context=None):
8283
=== 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-14 08:07:22 +0000
@@ -11,6 +11,7 @@
11 <separator string="" colspan="4"/>11 <separator string="" colspan="4"/>
12 <field name="name" select="1" />12 <field name="name" select="1" />
13 <field name="partner_id" select="1"/>13 <field name="partner_id" select="1"/>
14 <field name="company_id" select="1" groups="base.group_multi_company"/>
14 <field name="journal_id" select="1"/>15 <field name="journal_id" select="1"/>
15 <field name="commission_account_id" />16 <field name="commission_account_id" />
16 <field name="commission_analytic_id" />17 <field name="commission_analytic_id" />
@@ -31,6 +32,7 @@
31 <tree string="Import statement">32 <tree string="Import statement">
32 <field name="name" />33 <field name="name" />
33 <field name="partner_id" />34 <field name="partner_id" />
35 <field name="company_id" groups="base.group_multi_company"/>
34 <field name="journal_id" />36 <field name="journal_id" />
35 <field name="commission_account_id" />37 <field name="commission_account_id" />
36 <field name="commission_analytic_id" />38 <field name="commission_analytic_id" />

Subscribers

People subscribed via source and target branches