Kirti Savalia(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.0-opw-381973-ksa into
lp:openobject-addons/6.0.
Requested reviews:
nel (nel-tinyerp)
Vinay Rana (openerp) (vra-openerp)
Naresh(OpenERP) (nch-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-381973-ksa/+merge/91065
The user only has the right to see data from his own company for account
dashboard in multicompany setup.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-381973-ksa/+merge/91065
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.0-opw-381973-ksa.
=== modified file 'account/report/account_report.py'
--- account/report/account_report.py 2011-01-14 00:11:01 +0000
+++ account/report/account_report.py 2012-02-01 12:46:19 +0000
@@ -44,6 +44,7 @@
'balance':fields.float('Balance', readonly=True),
'debit':fields.float('Debit', readonly=True),
'credit':fields.float('Credit', readonly=True),
+ 'company_id': fields.many2one('res.company', 'Company', readonly=True),
}
_order = 'name desc'
@@ -56,7 +57,8 @@
sum(l.debit-l.credit) as balance,
sum(l.debit) as debit,
sum(l.credit) as credit,
- a.type
+ a.type,
+ a.company_id
from
account_move_line l
left join
@@ -64,7 +66,7 @@
where
l.state <> 'draft'
group by
- to_char(date,'YYYY:IW'), a.type
+ to_char(date,'YYYY:IW'), a.type, a.company_id
)""")
report_account_receivable()
=== modified file 'account/security/account_security.xml'
--- account/security/account_security.xml 2011-12-01 14:04:13 +0000
+++ account/security/account_security.xml 2012-02-01 12:46:19 +0000
@@ -102,5 +102,19 @@
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
-
+
+ <record model="ir.rule" id="purchase_order_comp_rule1">
+ <field name="name">Purchase Order multi-company2</field>
+ <field name="model_id" ref="model_account_entries_report"/>
+ <field name="global" eval="True"/>
+ <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+ </record>
+
+ <record model="ir.rule" id="purchase_order_comp_rule12">
+ <field name="name">Purchase Order multi-company22</field>
+ <field name="model_id" ref="model_report_account_receivable"/>
+ <field name="global" eval="True"/>
+ <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+ </record>
+
</data></openerp>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
