Merge lp:~akretion-team/openerp-connector/fix-job-view into lp:~openerp-connector-core-editors/openerp-connector/7.0

Proposed by David BEAL (ak)
Status: Merged
Approved by: Guewen Baconnier @ Camptocamp
Approved revision: 618
Merged at revision: 625
Proposed branch: lp:~akretion-team/openerp-connector/fix-job-view
Merge into: lp:~openerp-connector-core-editors/openerp-connector/7.0
Diff against target: 105 lines (+73/-1)
4 files modified
connector/queue/model_view.xml (+2/-1)
connector_base_product/__init__.py (+1/-0)
connector_base_product/__openerp__.py (+41/-0)
connector_base_product/product_view.xml (+29/-0)
To merge this branch: bzr merge lp:~akretion-team/openerp-connector/fix-job-view
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp Approve
Review via email: mp+204734@code.launchpad.net

Description of the change

[IMP] job tree view

To post a comment you must log in.
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

You forgot revisions 616 and 617. But nevermind, I will take care when merging.
Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'connector/queue/model_view.xml'
2--- connector/queue/model_view.xml 2013-03-22 15:00:58 +0000
3+++ connector/queue/model_view.xml 2014-02-04 16:44:59 +0000
4@@ -117,12 +117,13 @@
5 <tree string="Jobs" create="false"
6 delete="false"
7 colors="red:state == 'failed';gray:state == 'done'">
8- <field name="uuid"/>
9 <field name="name"/>
10+ <field name="model_name"/>
11 <field name="state"/>
12 <field name="eta"/>
13 <field name="date_created"/>
14 <field name="date_done"/>
15+ <field name="uuid"/>
16 </tree>
17 </field>
18 </record>
19
20=== added directory 'connector_base_product'
21=== added file 'connector_base_product/__init__.py'
22--- connector_base_product/__init__.py 1970-01-01 00:00:00 +0000
23+++ connector_base_product/__init__.py 2014-02-04 16:44:59 +0000
24@@ -0,0 +1,1 @@
25+# -*- coding: utf-8 -*-
26
27=== added file 'connector_base_product/__openerp__.py'
28--- connector_base_product/__openerp__.py 1970-01-01 00:00:00 +0000
29+++ connector_base_product/__openerp__.py 2014-02-04 16:44:59 +0000
30@@ -0,0 +1,41 @@
31+# -*- coding: utf-8 -*-
32+##############################################################################
33+#
34+# Author: David BEAL, Copyright Akretion, 2014
35+#
36+# This program is free software: you can redistribute it and/or modify
37+# it under the terms of the GNU Affero General Public License as
38+# published by the Free Software Foundation, either version 3 of the
39+# License, or (at your option) any later version.
40+#
41+# This program is distributed in the hope that it will be useful,
42+# but WITHOUT ANY WARRANTY; without even the implied warranty of
43+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
44+# GNU Affero General Public License for more details.
45+#
46+# You should have received a copy of the GNU Affero General Public License
47+# along with this program. If not, see <http://www.gnu.org/licenses/>.
48+#
49+##############################################################################
50+
51+{'name': 'Connector Base Product',
52+ 'version': '1.0',
53+ 'author': 'Openerp Connector Core Editors',
54+ 'website': 'http://openerp-connector.com',
55+ 'license': 'AGPL-3',
56+ 'category': 'Connector',
57+ 'description': """
58+Connector Base Product
59+======================
60+
61+Add 'Connector' tab to product view
62+""",
63+ 'depends': [
64+ 'connector',
65+ 'product',
66+ ],
67+ 'data': [
68+ 'product_view.xml'
69+ ],
70+ 'installable': True,
71+}
72
73=== added file 'connector_base_product/product_view.xml'
74--- connector_base_product/product_view.xml 1970-01-01 00:00:00 +0000
75+++ connector_base_product/product_view.xml 2014-02-04 16:44:59 +0000
76@@ -0,0 +1,29 @@
77+<?xml version="1.0" encoding="utf-8"?>
78+
79+<!--
80+ Copyright (C) 2013 Akretion (http://www.akretion.com/)
81+ The licence is in the file __openerp__.py
82+-->
83+
84+<openerp>
85+<data>
86+
87+<!--This is a product inherited form that will be dynamically populated-->
88+<record id="product_normal_form_view" model="ir.ui.view">
89+ <field name="name">product.product.form</field>
90+ <field name="model">product.product</field>
91+ <field name="inherit_id" ref="product.product_normal_form_view" />
92+ <field name="arch" type="xml">
93+ <xpath expr="/form/sheet/notebook" position="inside">
94+ <!-- change the invisible attribute to 0 when used
95+ in submodules -->
96+ <page string="Connectors" name="connector" invisible="1">
97+ </page>
98+ </xpath>
99+ </field>
100+</record>
101+
102+
103+
104+</data>
105+</openerp>