L10N_CH : DTA wizard added
bzr revid: pinky-41dc014b1293b7f02f5dd5b3f2c6a1d7f237aaad
This commit is contained in:
parent
775aff9b46
commit
bc438037fd
|
@ -29,3 +29,4 @@
|
||||||
import bvr
|
import bvr
|
||||||
import dta
|
import dta
|
||||||
import v11
|
import v11
|
||||||
|
import company
|
||||||
|
|
|
@ -8,14 +8,13 @@
|
||||||
"category" : "Localisation/Europe",
|
"category" : "Localisation/Europe",
|
||||||
"website": "http://www.tinyerp.com",
|
"website": "http://www.tinyerp.com",
|
||||||
"depends" : ["base", "account"],
|
"depends" : ["base", "account"],
|
||||||
#"init_xml" : ["zip_code_default.xml"],
|
# "init_xml" : [],
|
||||||
"init_xml" : [],#"zip_code_default.xml"
|
"init_xml" : ["zip_code_default.xml"],
|
||||||
"demo_xml" : ["vaudtax_data_demo.xml"],
|
"demo_xml" : ["vaudtax_data_demo.xml"],
|
||||||
"update_xml" : [
|
"update_xml" : ["dta/dta_view.xml","dta/dta_wizard.xml","v11/v11_wizard.xml",
|
||||||
"vaudtax_data.xml","account_vat.xml","base_config.xml","account_config.xml",
|
"account_vat.xml","base_config.xml","account_config.xml",
|
||||||
"bvr/bvr_report.xml", "bvr/company_view.xml",
|
"company_view.xml"],
|
||||||
"dta/dta_view.xml","v11/v11_view.xml","v11/v11_wizard.xml"
|
|
||||||
],
|
|
||||||
"active": False,
|
"active": False,
|
||||||
"installable": True,
|
"installable": True,
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,42 @@
|
||||||
|
# -*- encoding: utf-8 -*-
|
||||||
|
##############################################################################
|
||||||
|
#
|
||||||
|
# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
|
||||||
|
#
|
||||||
|
# $Id: account.py 1005 2005-07-25 08:41:42Z nicoe $
|
||||||
|
#
|
||||||
|
# WARNING: This program as such is intended to be used by professional
|
||||||
|
# programmers who take the whole responsability of assessing all potential
|
||||||
|
# consequences resulting from its eventual inadequacies and bugs
|
||||||
|
# End users who are looking for a ready-to-use solution with commercial
|
||||||
|
# garantees and support are strongly adviced to contract a Free Software
|
||||||
|
# Service Company
|
||||||
|
#
|
||||||
|
# This program is Free Software; you can redistribute it and/or
|
||||||
|
# modify it under the terms of the GNU General Public License
|
||||||
|
# as published by the Free Software Foundation; either version 2
|
||||||
|
# of the License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program; if not, write to the Free Software
|
||||||
|
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
#
|
||||||
|
##############################################################################
|
||||||
|
|
||||||
|
import netsvc
|
||||||
|
from osv import fields, osv
|
||||||
|
|
||||||
|
class res_company(osv.osv):
|
||||||
|
_inherit = "res.company"
|
||||||
|
_columns = {
|
||||||
|
'bvr_number': fields.char('BVR Number', size=9),
|
||||||
|
'dta_number': fields.char('DTA Number', size=9),
|
||||||
|
|
||||||
|
}
|
||||||
|
res_company()
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
<?xml version="1.0"?>
|
||||||
|
<terp>
|
||||||
|
<data>
|
||||||
|
<record model="ir.ui.view" id="company_form_view">
|
||||||
|
<field name="name">res.company.form.inherit.bvr</field>
|
||||||
|
<field name="model">res.company</field>
|
||||||
|
<field name="type">form</field>
|
||||||
|
<field name="inherit_id" ref="base.view_company_form"/>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<field name="rml_footer2" position="after">
|
||||||
|
<field name="bvr_number"/>
|
||||||
|
<field name="dta_number"/>
|
||||||
|
</field>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
</data>
|
||||||
|
</terp>
|
||||||
|
|
||||||
|
|
|
@ -25,4 +25,6 @@
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
import dta
|
|
||||||
|
import dta_wizard
|
||||||
|
import invoice
|
||||||
|
|
|
@ -2,27 +2,39 @@
|
||||||
<terp>
|
<terp>
|
||||||
<data>
|
<data>
|
||||||
|
|
||||||
<record model="ir.ui.view" id="account_dta_from">
|
<record model="ir.ui.view" id="invoice_tree">
|
||||||
<field name="name">account.dta</field>
|
<field name="name">account.invoice.tree.inherit</field>
|
||||||
<field name="model">account.dta</field>
|
<field name="model">account.invoice</field>
|
||||||
<field name="type">form</field>
|
<field name="inherit_id" ref="account.invoice_tree"/>
|
||||||
|
<field name="type">tree</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<form string="DTA">
|
<field name="state" position="after">
|
||||||
<field name="name" colspan="2"/>
|
<field name="dta_state" select="1"/>
|
||||||
<newline/>
|
</field>
|
||||||
<field name="note" colspan="2"/>
|
|
||||||
</form>
|
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<record model="ir.actions.act_window" id="action_account_dta_form">
|
<record model="ir.ui.view" id="invoice_form">
|
||||||
<field name="name">account.dta</field>
|
<field name="name">account.invoice.form</field>
|
||||||
<field name="res_model">account.dta</field>
|
<field name="model">account.invoice</field>
|
||||||
<field name="view_type">form</field>
|
<field name="type">form</field>
|
||||||
<field name="view_mode">form,tree</field>
|
<field name="inherit_id" ref="account.invoice_form"/>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<field name="journal_id" position="after">
|
||||||
|
<field name="dta_state" select="1"/>
|
||||||
|
</field>
|
||||||
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
<record model="ir.actions.act_window" id="action_invoice_with_dta">
|
||||||
|
<field name="name">account.invoice.dta</field>
|
||||||
|
<field name="type">ir.actions.act_window</field>
|
||||||
|
<field name="res_model">account.invoice</field>
|
||||||
|
<field name="view_type">form</field>
|
||||||
|
<field name="view_mode">tree,form</field>
|
||||||
|
<field name="domain">[('state','!=','paid'),('dta_state','=','2bpaid') ]</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
<menuitem name="Financial Management/Create dta file" id="menu_account_dta_form" action="action_account_dta_form"/>
|
<menuitem name="Financial Management/Invoices/DTA invoices to pay" id="menu_account_dta_form" action="action_invoice_with_dta"/>
|
||||||
</data>
|
</data>
|
||||||
</terp>
|
</terp>
|
||||||
|
|
|
@ -4,6 +4,12 @@
|
||||||
|
|
||||||
<wizard
|
<wizard
|
||||||
string="Create DTA"
|
string="Create DTA"
|
||||||
model="account.dta"
|
model="account.invoice"
|
||||||
name="account.dta.create"
|
name="account.dta_create"
|
||||||
id="wizard_invoice_dta_create"/>
|
id="wizard_account_dta_create"/>
|
||||||
|
|
||||||
|
<!-- <menuitem name="Financial Management/Create DTA" action="wizard_account_dta_create" type="wizard" id="menu_account_dta" sequence="16"/> -->
|
||||||
|
|
||||||
|
|
||||||
|
</data>
|
||||||
|
</terp>
|
||||||
|
|
Loading…
Reference in New Issue