Merge lp:~vauxoo/addons-vauxoo/7.0-purchase_requisition_supplier_list-rev-1487-kty into lp:~vauxoo/addons-vauxoo/addons-vauxoo-cicsa

Proposed by Katherine Zaoral (Vauxoo)
Status: Merged
Merged at revision: 1061
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0-purchase_requisition_supplier_list-rev-1487-kty
Merge into: lp:~vauxoo/addons-vauxoo/addons-vauxoo-cicsa
Diff against target: 337 lines (+279/-0)
7 files modified
purchase_requisition_supplier_list/__init__.py (+28/-0)
purchase_requisition_supplier_list/__openerp__.py (+54/-0)
purchase_requisition_supplier_list/i18n/purchase_requisition_supplier_list.pot (+42/-0)
purchase_requisition_supplier_list/model/__init__.py (+27/-0)
purchase_requisition_supplier_list/model/purchase_requisition.py (+69/-0)
purchase_requisition_supplier_list/view/purchase_requisition_view.xml (+33/-0)
purchase_requisition_supplier_list/wizard/__init__.py (+26/-0)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0-purchase_requisition_supplier_list-rev-1487-kty
Reviewer Review Type Date Requested Status
Katherine Zaoral (Vauxoo) Approve
Review via email: mp+224146@code.launchpad.net

Description of the change

[MERGE] add a generic module named purchase_requisition_supplier_list (separate and bug fixed from the cicsa trunk repo).

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

waiting for runbot

1050. By Katherine Zaoral (Vauxoo)

[MERGE] addons-vauxoo-cicsa revno 1060 for missing
purchase_requisition_currency module.

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

this mp need the https://code.launchpad.net/~cicsa/cicsa/7.0-purchase_requisition_supplier_list-rev-1487-kty/+merge/224144 to be run correctly.
The runbot is red for this.
So I will merge this mp
to can make the runbot with both mps

review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches

to all changes: