odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

KERNEL, MULTI_COMPANY_*, STOCK, BASE: extend search child_of 

bzr revid: ced-fdd97e1d35b01a502a10c3d8600a38226df569eb
This commit is contained in:
ced 2007-06-07 08:43:46 +00:00
parent 1edadd4f76
commit 6a67746357
4 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
addons/multi_company_account/multi_company_account_data.xml
View File

@ -19,7 +19,7 @@
</record>
<record model="ir.rule" id="journal_comp_rule">
<field name="field_id" search="[('model','=','account.journal'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="rule_group" ref="journal_comp_rule_group"/>
</record>
@ -31,10 +31,16 @@
</record>
<record model="ir.rule" id="analytic_journal_comp_rule">
<field name="field_id" search="[('model','=','account.analytic.journal'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="rule_group" ref="analytic_journal_comp_rule_group"/>
</record>
<record model="ir.rule" id="analytic_journal_comp_rule_false">
<field name="field_id" search="[('model','=','account.analytic.journal'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operand">False</field>
<field name="rule_group" ref="analytic_journal_comp_rule_group"/>
</record>
<record model="ir.rule.group" id="budget_post_comp_rule_group">
<field name="name">Budget post multi-company</field>
@ -43,10 +49,16 @@
</record>
<record model="ir.rule" id="budget_post_comp_rule">
<field name="field_id" search="[('model','=','account.budget.post'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="rule_group" ref="budget_post_comp_rule_group"/>
</record>
<record model="ir.rule" id="budget_post_comp_rule_false">
<field name="field_id" search="[('model','=','account.budget.post'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operand">False</field>
<field name="rule_group" ref="budget_post_comp_rule_group"/>
</record>
<record model="ir.rule.group" id="period_comp_rule_group">
<field name="name">Period multi-company</field>
@ -55,7 +67,7 @@
</record>
<record model="ir.rule" id="period_comp_rule">
<field name="field_id" search="[('model','=','account.period'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="rule_group" ref="period_comp_rule_group"/>
</record>
@ -68,7 +80,7 @@
</record>
<record model="ir.rule" id="fiscal_year_comp_rule">
<field name="field_id" search="[('model','=','account.fiscalyear'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="rule_group" ref="fiscal_year_comp_rule_group"/>
</record>
@ -80,7 +92,7 @@
</record>
<record model="ir.rule" id="account_comp_rule">
<field name="field_id" search="[('model','=','account.account'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="rule_group" ref="account_comp_rule_group"/>
</record>
@ -92,7 +104,7 @@
</record>
<record model="ir.rule" id="tax_comp_rule">
<field name="field_id" search="[('model','=','account.tax'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="rule_group" ref="tax_comp_rule_group"/>
</record>
@ -103,8 +115,8 @@
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="tax_code_comp_rule">
<field name="field_id" search="[('model','=','acount.tax.code'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="field_id" search="[('model','=','account.tax.code'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="rule_group" ref="tax_code_comp_rule_group"/>
</record>
@ -116,7 +128,7 @@
</record>
<record model="ir.rule" id="invoice_comp_rule">
<field name="field_id" search="[('model','=','account.invoice'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="rule_group" ref="invoice_comp_rule_group"/>
</record>

2
addons/multi_company_hr_timesheet_sheet/multi_company_hr_timesheet_sheet_data.xml
View File

@ -9,7 +9,7 @@
</record>
<record model="ir.rule" id="timesheet_comp_rule">
<field name="field_id" search="[('model','=','hr_timesheet_sheet.sheet'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="rule_group" ref="timesheet_comp_rule_group"/>
</record>

4
addons/multi_company_project/multi_company_project_data.xml
View File

@ -9,7 +9,7 @@
</record>
<record model="ir.rule" id="project_comp_rule">
<field name="field_id" search="[('model','=','project.project'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="rule_group" ref="project_comp_rule_group"/>
</record>
@ -21,7 +21,7 @@
</record>
<record model="ir.rule" id="task_comp_rule">
<field name="field_id" search="[('model','=','project.task'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">=</field>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="rule_group" ref="task_comp_rule_group"/>
</record>

1
addons/stock/stock.py
View File

@ -71,6 +71,7 @@ stock_lot()
class stock_location(osv.osv):
_name = "stock.location"
_description = "Location"
_parent_name = "location_id"
_columns = {
'name': fields.char('Location Name', size=64, required=True),
'active': fields.boolean('Active'),