Merge lp:~vauxoo/addons-vauxoo/7.0-purchase_requisition_type-dev-1540-kty into lp:addons-vauxoo/7.0

Proposed by Katherine Zaoral (Vauxoo)
Status: Merged
Merged at revision: 1029
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0-purchase_requisition_type-dev-1540-kty
Merge into: lp:addons-vauxoo/7.0
Diff against target: 332 lines (+286/-0)
7 files modified
purchase_requisition_type/__init__.py (+27/-0)
purchase_requisition_type/__openerp__.py (+53/-0)
purchase_requisition_type/i18n/purchase_requisition_type.pot (+53/-0)
purchase_requisition_type/model/__init__.py (+26/-0)
purchase_requisition_type/model/purchase_requisition.py (+44/-0)
purchase_requisition_type/view/purchase_requisition_view.xml (+58/-0)
purchase_requisition_type/wizard/__init__.py (+25/-0)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0-purchase_requisition_type-dev-1540-kty
Reviewer Review Type Date Requested Status
Katherine Zaoral (Vauxoo) Approve
Review via email: mp+222264@code.launchpad.net

Description of the change

[MERGE] add new module purchase_requisition_type.

To post a comment you must log in.
Revision history for this message
Katherine Zaoral (Vauxoo) (kathy-zaoral) wrote :

waiting for runbot

Revision history for this message
Katherine Zaoral (Vauxoo) (kathy-zaoral) wrote :

runbot is green.
This branch is ready to be merge.
Regards.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'purchase_requisition_type'
2=== added file 'purchase_requisition_type/__init__.py'
3--- purchase_requisition_type/__init__.py 1970-01-01 00:00:00 +0000
4+++ purchase_requisition_type/__init__.py 2014-06-05 21:33:34 +0000
5@@ -0,0 +1,27 @@
6+#!/usr/bin/python
7+# -*- encoding: utf-8 -*-
8+###############################################################################
9+# Module Writen to OpenERP, Open Source Management Solution
10+# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
11+# All Rights Reserved
12+############# Credits #########################################################
13+# Coded by: Katherine Zaoral <kathy@vauxoo.com>
14+# Planified by: Humberto Arocha <hbto@vauxoo.com>
15+# Audited by: Humberto Arocha <hbto@vauxoo.com>
16+###############################################################################
17+# This program is free software: you can redistribute it and/or modify
18+# it under the terms of the GNU Affero General Public License as published
19+# by the Free Software Foundation, either version 3 of the License, or
20+# (at your option) any later version.
21+#
22+# This program is distributed in the hope that it will be useful,
23+# but WITHOUT ANY WARRANTY; without even the implied warranty of
24+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25+# GNU Affero General Public License for more details.
26+#
27+# You should have received a copy of the GNU Affero General Public License
28+# along with this program. If not, see <http://www.gnu.org/licenses/>.
29+###############################################################################
30+
31+import model
32+import wizard
33
34=== added file 'purchase_requisition_type/__openerp__.py'
35--- purchase_requisition_type/__openerp__.py 1970-01-01 00:00:00 +0000
36+++ purchase_requisition_type/__openerp__.py 2014-06-05 21:33:34 +0000
37@@ -0,0 +1,53 @@
38+#!/usr/bin/python
39+# -*- encoding: utf-8 -*-
40+###############################################################################
41+# Module Writen to OpenERP, Open Source Management Solution
42+# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
43+# All Rights Reserved
44+############# Credits #########################################################
45+# Coded by: Katherine Zaoral <kathy@vauxoo.com>
46+# Planified by: Humberto Arocha <hbto@vauxoo.com>
47+# Audited by: Humberto Arocha <hbto@vauxoo.com>
48+###############################################################################
49+# This program is free software: you can redistribute it and/or modify
50+# it under the terms of the GNU Affero General Public License as published
51+# by the Free Software Foundation, either version 3 of the License, or
52+# (at your option) any later version.
53+#
54+# This program is distributed in the hope that it will be useful,
55+# but WITHOUT ANY WARRANTY; without even the implied warranty of
56+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
57+# GNU Affero General Public License for more details.
58+#
59+# You should have received a copy of the GNU Affero General Public License
60+# along with this program. If not, see <http://www.gnu.org/licenses/>.
61+###############################################################################
62+
63+{
64+ 'name': 'Purchase Requisition Type',
65+ 'version': '1.0',
66+ 'author': 'Vauxoo',
67+ 'website': 'http://www.vauxoo.com/',
68+ 'category': 'purchase',
69+ 'description': '''
70+Purchase Requisition Type
71+=========================
72+
73+Add a new field name type that can discriminate a matarials and service
74+purchase requisition. Also add to the purchase requisition search view the
75+filters need to visually make the discrimination.
76+''',
77+ 'depends': [
78+ 'purchase_requisition',
79+ ],
80+ 'data': [
81+ 'view/purchase_requisition_view.xml',
82+ ],
83+ 'demo': [],
84+ 'test': [],
85+ 'qweb': [],
86+ 'js': [],
87+ 'css': [],
88+ 'active': False,
89+ 'installable': True,
90+}
91
92=== added directory 'purchase_requisition_type/i18n'
93=== added file 'purchase_requisition_type/i18n/purchase_requisition_type.pot'
94--- purchase_requisition_type/i18n/purchase_requisition_type.pot 1970-01-01 00:00:00 +0000
95+++ purchase_requisition_type/i18n/purchase_requisition_type.pot 2014-06-05 21:33:34 +0000
96@@ -0,0 +1,53 @@
97+# Translation of OpenERP Server.
98+# This file contains the translation of the following modules:
99+# * purchase_requisition_type
100+#
101+msgid ""
102+msgstr ""
103+"Project-Id-Version: OpenERP Server 7.0\n"
104+"Report-Msgid-Bugs-To: \n"
105+"POT-Creation-Date: 2014-06-05 20:57+0000\n"
106+"PO-Revision-Date: 2014-06-05 20:57+0000\n"
107+"Last-Translator: <>\n"
108+"Language-Team: \n"
109+"MIME-Version: 1.0\n"
110+"Content-Type: text/plain; charset=UTF-8\n"
111+"Content-Transfer-Encoding: \n"
112+"Plural-Forms: \n"
113+
114+#. module: purchase_requisition_type
115+#: view:purchase.requisition:0
116+msgid "Service Requisition"
117+msgstr ""
118+
119+#. module: purchase_requisition_type
120+#: selection:purchase.requisition,type:0
121+msgid "Service"
122+msgstr ""
123+
124+#. module: purchase_requisition_type
125+#: help:purchase.requisition,type:0
126+msgid "Indicate the type of the purchase requisition: materials or service"
127+msgstr ""
128+
129+#. module: purchase_requisition_type
130+#: selection:purchase.requisition,type:0
131+msgid "Materials"
132+msgstr ""
133+
134+#. module: purchase_requisition_type
135+#: view:purchase.requisition:0
136+msgid "Materials Requisition"
137+msgstr ""
138+
139+#. module: purchase_requisition_type
140+#: view:purchase.requisition:0
141+#: field:purchase.requisition,type:0
142+msgid "Type"
143+msgstr ""
144+
145+#. module: purchase_requisition_type
146+#: model:ir.model,name:purchase_requisition_type.model_purchase_requisition
147+msgid "Purchase Requisition"
148+msgstr ""
149+
150
151=== added directory 'purchase_requisition_type/model'
152=== added file 'purchase_requisition_type/model/__init__.py'
153--- purchase_requisition_type/model/__init__.py 1970-01-01 00:00:00 +0000
154+++ purchase_requisition_type/model/__init__.py 2014-06-05 21:33:34 +0000
155@@ -0,0 +1,26 @@
156+#!/usr/bin/python
157+# -*- encoding: utf-8 -*-
158+###############################################################################
159+# Module Writen to OpenERP, Open Source Management Solution
160+# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
161+# All Rights Reserved
162+############# Credits #########################################################
163+# Coded by: Katherine Zaoral <kathy@vauxoo.com>
164+# Planified by: Humberto Arocha <hbto@vauxoo.com>
165+# Audited by: Humberto Arocha <hbto@vauxoo.com>
166+###############################################################################
167+# This program is free software: you can redistribute it and/or modify
168+# it under the terms of the GNU Affero General Public License as published
169+# by the Free Software Foundation, either version 3 of the License, or
170+# (at your option) any later version.
171+#
172+# This program is distributed in the hope that it will be useful,
173+# but WITHOUT ANY WARRANTY; without even the implied warranty of
174+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
175+# GNU Affero General Public License for more details.
176+#
177+# You should have received a copy of the GNU Affero General Public License
178+# along with this program. If not, see <http://www.gnu.org/licenses/>.
179+###############################################################################
180+
181+import purchase_requisition
182
183=== added file 'purchase_requisition_type/model/purchase_requisition.py'
184--- purchase_requisition_type/model/purchase_requisition.py 1970-01-01 00:00:00 +0000
185+++ purchase_requisition_type/model/purchase_requisition.py 2014-06-05 21:33:34 +0000
186@@ -0,0 +1,44 @@
187+#!/usr/bin/python
188+# -*- encoding: utf-8 -*-
189+###############################################################################
190+# Module Writen to OpenERP, Open Source Management Solution
191+# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
192+# All Rights Reserved
193+############# Credits #########################################################
194+# Coded by: Katherine Zaoral <kathy@vauxoo.com>
195+# Planified by: Humberto Arocha <hbto@vauxoo.com>
196+# Audited by: Humberto Arocha <hbto@vauxoo.com>
197+###############################################################################
198+# This program is free software: you can redistribute it and/or modify
199+# it under the terms of the GNU Affero General Public License as published
200+# by the Free Software Foundation, either version 3 of the License, or
201+# (at your option) any later version.
202+#
203+# This program is distributed in the hope that it will be useful,
204+# but WITHOUT ANY WARRANTY; without even the implied warranty of
205+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
206+# GNU Affero General Public License for more details.
207+#
208+# You should have received a copy of the GNU Affero General Public License
209+# along with this program. If not, see <http://www.gnu.org/licenses/>.
210+###############################################################################
211+
212+from openerp.osv import fields, osv, orm
213+from openerp.tools.translate import _
214+from openerp import tools
215+
216+purchase_requisition_type = [
217+ ('materials', 'Materials'),
218+ ('service', 'Service'),
219+]
220+
221+class purchase_requisition(osv.Model):
222+
223+ _inherit = 'purchase.requisition'
224+ _columns = {
225+ 'type': fields.selection(
226+ purchase_requisition_type,
227+ 'Type',
228+ help=('Indicate the type of the purchase requisition: materials or'
229+ ' service')),
230+ }
231
232=== added directory 'purchase_requisition_type/static'
233=== added directory 'purchase_requisition_type/static/description'
234=== added file 'purchase_requisition_type/static/description/index.html'
235=== added directory 'purchase_requisition_type/static/src'
236=== added directory 'purchase_requisition_type/static/src/img'
237=== added file 'purchase_requisition_type/static/src/img/icon.png'
238Binary files purchase_requisition_type/static/src/img/icon.png 1970-01-01 00:00:00 +0000 and purchase_requisition_type/static/src/img/icon.png 2014-06-05 21:33:34 +0000 differ
239=== added directory 'purchase_requisition_type/view'
240=== added file 'purchase_requisition_type/view/purchase_requisition_view.xml'
241--- purchase_requisition_type/view/purchase_requisition_view.xml 1970-01-01 00:00:00 +0000
242+++ purchase_requisition_type/view/purchase_requisition_view.xml 2014-06-05 21:33:34 +0000
243@@ -0,0 +1,58 @@
244+<?xml version="1.0" encoding="utf-8"?>
245+<openerp>
246+ <data>
247+
248+ <record model="ir.ui.view" id="purchase_requisition_type_form_view">
249+ <field name="name">purchase.requisition.type.form</field>
250+ <field name="model">purchase.requisition</field>
251+ <field name="inherit_id" ref="purchase_requisition.view_purchase_requisition_form"/>
252+ <field name="arch" type="xml">
253+
254+ <xpath expr="//field[@name='exclusive']" position="after">
255+ <field name="type"/>
256+ </xpath>
257+
258+ </field>
259+ </record>
260+
261+ <record model="ir.ui.view" id="purchase_requisition_type_tree_view">
262+ <field name="name">purchase.requisition.type.tree</field>
263+ <field name="model">purchase.requisition</field>
264+ <field name="inherit_id" ref="purchase_requisition.view_purchase_requisition_tree"/>
265+ <field name="arch" type="xml">
266+
267+ <xpath expr="//field[@name='name']" position="after">
268+ <field name="type"/>
269+ </xpath>
270+
271+ </field>
272+ </record>
273+
274+ <record model="ir.ui.view" id="purchase_requisition_type_search_view">
275+ <field name="name">purchase.requisition.type.search</field>
276+ <field name="model">purchase.requisition</field>
277+ <field name="inherit_id" ref="purchase_requisition.view_purchase_requisition_filter"/>
278+ <field name="arch" type="xml">
279+
280+ <xpath expr="//field[@name='exclusive']" position="after">
281+ <field name="type"/>
282+ </xpath>
283+
284+ <xpath expr="//filter[@string='Purchase Done']" position="after">
285+ <separator/>
286+ <filter icon="terp-dialog-close" string="Materials Requisition" domain="[('type','=','materials')]"/>
287+ <filter icon="terp-dialog-close" string="Service Requisition" domain="[('type','=','service')]"/>
288+ </xpath>
289+
290+ <xpath expr="//group" position="inside">
291+ <filter string="Type" domain="[]" context="{'group_by':'type'}"/>
292+ </xpath>
293+
294+ </field>
295+ </record>
296+
297+ </data>
298+</openerp>
299+
300+
301+
302
303=== added directory 'purchase_requisition_type/wizard'
304=== added file 'purchase_requisition_type/wizard/__init__.py'
305--- purchase_requisition_type/wizard/__init__.py 1970-01-01 00:00:00 +0000
306+++ purchase_requisition_type/wizard/__init__.py 2014-06-05 21:33:34 +0000
307@@ -0,0 +1,25 @@
308+#!/usr/bin/python
309+# -*- encoding: utf-8 -*-
310+###############################################################################
311+# Module Writen to OpenERP, Open Source Management Solution
312+# Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
313+# All Rights Reserved
314+############# Credits #########################################################
315+# Coded by: Katherine Zaoral <kathy@vauxoo.com>
316+# Planified by: Humberto Arocha <hbto@vauxoo.com>
317+# Audited by: Humberto Arocha <hbto@vauxoo.com>
318+###############################################################################
319+# This program is free software: you can redistribute it and/or modify
320+# it under the terms of the GNU Affero General Public License as published
321+# by the Free Software Foundation, either version 3 of the License, or
322+# (at your option) any later version.
323+#
324+# This program is distributed in the hope that it will be useful,
325+# but WITHOUT ANY WARRANTY; without even the implied warranty of
326+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
327+# GNU Affero General Public License for more details.
328+#
329+# You should have received a copy of the GNU Affero General Public License
330+# along with this program. If not, see <http://www.gnu.org/licenses/>.
331+###############################################################################
332+