mirror of
https://github.com/OCA/account-reconcile.git
synced 2025-01-20 12:27:39 +02:00
[FIX] open label tree view not in a popup, remove useless partner_view.xml file
This commit is contained in:
committed by
Sebastien Beau
parent
2e23747c73
commit
f4ca082bcc
@@ -31,7 +31,6 @@
|
|||||||
'depends': ['account_statement_base_completion'],
|
'depends': ['account_statement_base_completion'],
|
||||||
'init_xml': [],
|
'init_xml': [],
|
||||||
'update_xml': [
|
'update_xml': [
|
||||||
'partner_view.xml',
|
|
||||||
'statement_view.xml',
|
'statement_view.xml',
|
||||||
'security/ir.model.access.csv',
|
'security/ir.model.access.csv',
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -1,39 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!--
|
|
||||||
account_statement_completion_label for OpenERP
|
|
||||||
Copyright (C) 2013 Akretion (http://www.akretion.com). All Rights Reserved
|
|
||||||
@author Benoît GUILLOT <benoit.guillot@akretion.com>
|
|
||||||
The licence is in the file __openerp__.py
|
|
||||||
-->
|
|
||||||
|
|
||||||
<openerp>
|
|
||||||
<data>
|
|
||||||
|
|
||||||
<!-- INHERITED VIEW FOR THE OBJECT : res_partner -->
|
|
||||||
|
|
||||||
<!-- <record id="res_partner_view_form" model="ir.ui.view">
|
|
||||||
<field name="name">account_statement_completion_label.res_partner.view_form</field>
|
|
||||||
<field name="model">res.partner</field>
|
|
||||||
<field name="inherit_id" ref="module_name_to_inherit.view_id" />
|
|
||||||
<field name="arch" type="xml">
|
|
||||||
<field name="field_reference" position="after">
|
|
||||||
</field>
|
|
||||||
</field>
|
|
||||||
</record>
|
|
||||||
|
|
||||||
<record id="res_partner_view_tree" model="ir.ui.view">
|
|
||||||
<field name="name">account_statement_completion_label.res_partner.view_tree</field>
|
|
||||||
<field name="model">res.partner</field>
|
|
||||||
<field name="inherit_id" ref="module_name_to_inherit.view_id" />
|
|
||||||
<field name="arch" type="xml">
|
|
||||||
<field name="field_reference" position="after">
|
|
||||||
</field>
|
|
||||||
</field>
|
|
||||||
</record>
|
|
||||||
|
|
||||||
|
|
||||||
-->
|
|
||||||
|
|
||||||
|
|
||||||
</data>
|
|
||||||
</openerp>
|
|
||||||
@@ -43,26 +43,15 @@ class AccountBankSatement(orm.Model):
|
|||||||
"""
|
"""
|
||||||
_inherit = "account.bank.statement"
|
_inherit = "account.bank.statement"
|
||||||
|
|
||||||
def add_completion_label(self, cr, uid, ids, context=None):
|
def open_completion_label(self, cr, uid, ids, context=None):
|
||||||
model_data_obj = self.pool.get('ir.model.data')
|
|
||||||
model_data_id = model_data_obj.search(cr, uid,
|
|
||||||
[('model', '=', 'ir.ui.view'),
|
|
||||||
('name', '=', 'statement_label_wizard_view_form')
|
|
||||||
], context=context)
|
|
||||||
if model_data_id:
|
|
||||||
res_id = model_data_obj.read(cr, uid,
|
|
||||||
model_data_id,
|
|
||||||
['res_id'],
|
|
||||||
context=context)[0]['res_id']
|
|
||||||
return {
|
return {
|
||||||
'name': 'Statement Label',
|
'name': 'Statement Label',
|
||||||
'view_type': 'form',
|
'view_type': 'form',
|
||||||
'view_mode': 'form',
|
'view_mode': 'tree,form',
|
||||||
'view_id': [res_id],
|
|
||||||
'res_model': 'account.statement.label',
|
'res_model': 'account.statement.label',
|
||||||
'type': 'ir.actions.act_window',
|
'type': 'ir.actions.act_window',
|
||||||
'nodestroy': True,
|
'nodestroy': True,
|
||||||
'target': 'new',
|
'target': False,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<data>
|
<data>
|
||||||
<xpath expr="/form/sheet/div[@name='import_buttons']" position="after">
|
<xpath expr="/form/sheet/div[@name='import_buttons']" position="after">
|
||||||
<button name="add_completion_label" string="Add Completion Label"
|
<button name="open_completion_label" string="Open Completion Labels"
|
||||||
states='draft,open' type="object" colspan="1"/>
|
states='draft,open' type="object" colspan="1"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
</data>
|
</data>
|
||||||
@@ -37,29 +37,6 @@
|
|||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<record model="ir.ui.view" id="statement_label_wizard_view_form">
|
|
||||||
<field name="name">account.statement.label.view.wizard</field>
|
|
||||||
<field name="model">account.statement.label</field>
|
|
||||||
<field eval="50" name="priority"/>
|
|
||||||
<field name="arch" type="xml">
|
|
||||||
<form string="Product" version="7.0">
|
|
||||||
<group name="label">
|
|
||||||
<field name="label"/>
|
|
||||||
<field name="partner_id"/>
|
|
||||||
<field name="account_id"/>
|
|
||||||
<field name="profile_id"/>
|
|
||||||
</group>
|
|
||||||
<footer>
|
|
||||||
<button name="save_and_close_label"
|
|
||||||
string="Save and Close"
|
|
||||||
type="object" class="oe_highlight"/>
|
|
||||||
or
|
|
||||||
<button special="cancel" string="Cancel" class="oe_link"/>
|
|
||||||
</footer>
|
|
||||||
</form>
|
|
||||||
</field>
|
|
||||||
</record>
|
|
||||||
|
|
||||||
<record id="statement_label_view_tree" model="ir.ui.view">
|
<record id="statement_label_view_tree" model="ir.ui.view">
|
||||||
<field name="name">account.statement.label.view</field>
|
<field name="name">account.statement.label.view</field>
|
||||||
<field name="model">account.statement.label</field>
|
<field name="model">account.statement.label</field>
|
||||||
@@ -73,11 +50,25 @@
|
|||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
<record id="statement_label_view_search" model="ir.ui.view">
|
||||||
|
<field name="name">account.statement.label.search</field>
|
||||||
|
<field name="model">account.statement.label</field>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<search string="Search Statement Label" >
|
||||||
|
<field name="label"/>
|
||||||
|
<field name="partner_id"/>
|
||||||
|
<field name="account_id"/>
|
||||||
|
<field name="profile_id"/>
|
||||||
|
</search>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
<record id="action_statement_label_tree" model="ir.actions.act_window">
|
<record id="action_statement_label_tree" model="ir.actions.act_window">
|
||||||
<field name="name">Account Statement Label</field>
|
<field name="name">Account Statement Label</field>
|
||||||
<field name="res_model">account.statement.label</field>
|
<field name="res_model">account.statement.label</field>
|
||||||
<field name="view_type">form</field>
|
<field name="view_type">form</field>
|
||||||
<field name="view_mode">tree,form</field>
|
<field name="view_mode">tree,form</field>
|
||||||
|
<field name="search_view_id" ref="statement_label_view_search"/>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<menuitem string="Statement Label" action="action_statement_label_tree"
|
<menuitem string="Statement Label" action="action_statement_label_tree"
|
||||||
|
|||||||
Reference in New Issue
Block a user