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
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 Approve
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.
Revision history for this message
Omar (Pexego) (omar7r) :
review: Approve (test)
Revision history for this message
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
=== modified file 'l10n_es_fiscal_year_closing/__openerp__.py'
--- l10n_es_fiscal_year_closing/__openerp__.py 2013-07-18 16:08:37 +0000
+++ l10n_es_fiscal_year_closing/__openerp__.py 2014-05-29 13:48:36 +0000
@@ -67,6 +67,7 @@
67 "update_xml" : [67 "update_xml" : [
68 "wizard/wizard_run_view.xml",68 "wizard/wizard_run_view.xml",
69 "security/ir.model.access.csv",69 "security/ir.model.access.csv",
70 "security/security.xml",
70 "fyc_workflow.xml",71 "fyc_workflow.xml",
71 "fyc_view.xml",72 "fyc_view.xml",
72 "hide_account_wizards.xml",73 "hide_account_wizards.xml",
7374
=== added file 'l10n_es_fiscal_year_closing/security/security.xml'
--- l10n_es_fiscal_year_closing/security/security.xml 1970-01-01 00:00:00 +0000
+++ l10n_es_fiscal_year_closing/security/security.xml 2014-05-29 13:48:36 +0000
@@ -0,0 +1,13 @@
1<?xml version="1.0" encoding="utf-8"?>
2<openerp>
3<data noupdate="0">
4
5 <record id="journal_comp_rule" model="ir.rule">
6 <field name="name">Fiscal year closing multi-company</field>
7 <field name="model_id" ref="model_l10n_es_fiscal_year_closing_fyc"/>
8 <field name="global" eval="True"/>
9 <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
10 </record>
11
12</data>
13</openerp>