Merge lp:~pedro.baeza/openerp-spain/6.1-fy_close_multi-company_fix into lp:~openerp-spain-team/openerp-spain/6.1

Proposed by Pedro Manuel Baeza on 2014-05-29
Status: Merged
Merged at revision: 397
Proposed branch: lp:~pedro.baeza/openerp-spain/6.1-fy_close_multi-company_fix
Merge into: lp:~openerp-spain-team/openerp-spain/6.1
Diff against target: 29 lines (+14/-0)
2 files modified
l10n_es_fiscal_year_closing/__openerp__.py (+1/-0)
l10n_es_fiscal_year_closing/security/security.xml (+13/-0)
To merge this branch: bzr merge lp:~pedro.baeza/openerp-spain/6.1-fy_close_multi-company_fix
Reviewer Review Type Date Requested Status
Omar (Pexego) test 2014-05-29 Approve on 2014-06-03
Review via email: mp+221385@code.launchpad.net

Description of the change

Regla multi-compañía para los cierres de ejercicios fiscales.

To post a comment you must log in.
Omar (Pexego) (omar7r) :
review: Approve (test)
Pedro Manuel Baeza (pedro.baeza) wrote :

Paso a incluirlo en el repositorio.

Un saludo.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_es_fiscal_year_closing/__openerp__.py'
2--- l10n_es_fiscal_year_closing/__openerp__.py 2013-07-18 16:08:37 +0000
3+++ l10n_es_fiscal_year_closing/__openerp__.py 2014-05-29 13:48:36 +0000
4@@ -67,6 +67,7 @@
5 "update_xml" : [
6 "wizard/wizard_run_view.xml",
7 "security/ir.model.access.csv",
8+ "security/security.xml",
9 "fyc_workflow.xml",
10 "fyc_view.xml",
11 "hide_account_wizards.xml",
12
13=== added file 'l10n_es_fiscal_year_closing/security/security.xml'
14--- l10n_es_fiscal_year_closing/security/security.xml 1970-01-01 00:00:00 +0000
15+++ l10n_es_fiscal_year_closing/security/security.xml 2014-05-29 13:48:36 +0000
16@@ -0,0 +1,13 @@
17+<?xml version="1.0" encoding="utf-8"?>
18+<openerp>
19+<data noupdate="0">
20+
21+ <record id="journal_comp_rule" model="ir.rule">
22+ <field name="name">Fiscal year closing multi-company</field>
23+ <field name="model_id" ref="model_l10n_es_fiscal_year_closing_fyc"/>
24+ <field name="global" eval="True"/>
25+ <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
26+ </record>
27+
28+</data>
29+</openerp>