Merge lp:~agilebg/openobject-addons/removing_product_supplier_info_from_elico-7.0 into lp:~openerp-community/openobject-addons/elico-7.0

Proposed by Alex Comba - Agile BG
Status: Needs review
Proposed branch: lp:~agilebg/openobject-addons/removing_product_supplier_info_from_elico-7.0
Merge into: lp:~openerp-community/openobject-addons/elico-7.0
Diff against target: 244 lines (+0/-212)
5 files modified
product_supplier_info/__init__.py (+0/-23)
product_supplier_info/__openerp__.py (+0/-47)
product_supplier_info/product.py (+0/-54)
product_supplier_info/product_view.xml (+0/-71)
product_supplier_info/static/description/index.html (+0/-17)
To merge this branch: bzr merge lp:~agilebg/openobject-addons/removing_product_supplier_info_from_elico-7.0
Reviewer Review Type Date Requested Status
LIN Yu Pending
Review via email: mp+216907@code.launchpad.net

Commit message

[REM] product_supplier_info for inclusion in OCA

Description of the change

I removed product_supplier_info for inclusion in OCA using this other branch lp:~agilebg/openerp-product-attributes/adding_product_supplier_info_7 In the latter I extracted the module using https://launchpad.net/bazaar-extractor

To post a comment you must log in.

Unmerged revisions

37. By Alex Comba - Agile BG

[REM] product_supplier_info for inclusion in OCA using lp:~agilebg/openerp-product-attributes/adding_product_supplier_info_7

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed directory 'product_supplier_info'
2=== removed file 'product_supplier_info/__init__.py'
3--- product_supplier_info/__init__.py 2013-08-16 05:31:33 +0000
4+++ product_supplier_info/__init__.py 1970-01-01 00:00:00 +0000
5@@ -1,23 +0,0 @@
6-# -*- coding: utf-8 -*-
7-##############################################################################
8-#
9-# OpenERP, Open Source Management Solution
10-# Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
11-# Author: Yannick Gouin <yannick.gouin@elico-corp.com>
12-#
13-# This program is free software: you can redistribute it and/or modify
14-# it under the terms of the GNU Affero General Public License as
15-# published by the Free Software Foundation, either version 3 of the
16-# License, or (at your option) any later version.
17-#
18-# This program is distributed in the hope that it will be useful,
19-# but WITHOUT ANY WARRANTY; without even the implied warranty of
20-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21-# GNU Affero General Public License for more details.
22-#
23-# You should have received a copy of the GNU Affero General Public License
24-# along with this program. If not, see <http://www.gnu.org/licenses/>.
25-#
26-##############################################################################
27-import product
28-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
29\ No newline at end of file
30
31=== removed file 'product_supplier_info/__openerp__.py'
32--- product_supplier_info/__openerp__.py 2013-08-16 05:31:33 +0000
33+++ product_supplier_info/__openerp__.py 1970-01-01 00:00:00 +0000
34@@ -1,47 +0,0 @@
35-# -*- coding: utf-8 -*-
36-##############################################################################
37-#
38-# OpenERP, Open Source Management Solution
39-# Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
40-# Author: LIN Yu <lin.yu@elico-corp.com>
41-#
42-# This program is free software: you can redistribute it and/or modify
43-# it under the terms of the GNU Affero General Public License as
44-# published by the Free Software Foundation, either version 3 of the
45-# License, or (at your option) any later version.
46-#
47-# This program is distributed in the hope that it will be useful,
48-# but WITHOUT ANY WARRANTY; without even the implied warranty of
49-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
50-# GNU Affero General Public License for more details.
51-#
52-# You should have received a copy of the GNU Affero General Public License
53-# along with this program. If not, see <http://www.gnu.org/licenses/>.
54-#
55-##############################################################################
56-
57-{
58- 'name': 'Product Supplier Info',
59- 'version': '1.0',
60- 'category': 'purchase',
61- 'sequence': 19,
62- 'summary': 'Product Supplier Info',
63- 'description': """
64-Add a specific View for Supplier
65-==================================================
66- """,
67- 'author': 'Elico Corp',
68- 'website': 'http://www.elico-corp.com',
69- 'images' : [],
70- 'depends': ['product','stock'],#TO REMOVE joomlaconnector for standard
71- 'data': [
72- 'product_view.xml',
73- ],
74- 'test': [],
75- 'demo': [],
76- 'installable': True,
77- 'auto_install': False,
78- 'application': False,
79-}
80-
81-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
82\ No newline at end of file
83
84=== removed file 'product_supplier_info/product.py'
85--- product_supplier_info/product.py 2013-08-16 05:31:33 +0000
86+++ product_supplier_info/product.py 1970-01-01 00:00:00 +0000
87@@ -1,54 +0,0 @@
88-# -*- coding: utf-8 -*-
89-##############################################################################
90-#
91-# OpenERP, Open Source Management Solution
92-# Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
93-# Author: Yannick Gouin <yannick.gouin@elico-corp.com>
94-#
95-# This program is free software: you can redistribute it and/or modify
96-# it under the terms of the GNU Affero General Public License as
97-# published by the Free Software Foundation, either version 3 of the
98-# License, or (at your option) any later version.
99-#
100-# This program is distributed in the hope that it wil l be useful,
101-# but WITHOUT ANY WARRANTY; without even the implied warranty of
102-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
103-# GNU Affero General Public License for more details.
104-#
105-# You should have received a copy of the GNU Affero General Public License
106-# along with this program. If not, see <http://www.gnu.org/licenses/>.
107-#
108-##############################################################################
109-
110-from osv import osv, fields
111-from openerp import tools
112-from tools.translate import _
113-import openerp.addons.decimal_precision as dp
114-
115-class product_supplierinfo(osv.osv):
116- _inherit = 'product.supplierinfo'
117-
118- def _product_available(self, cr, uid, ids, field_names=None, arg=False, context=None):
119- if not field_names:
120- field_names = []
121- if context is None:
122- context = {}
123- res = {}
124- for id in ids:
125- res[id] = {}.fromkeys(field_names, 0.0)
126- supplier_info = self.browse(cr, uid, id)
127- for f in field_names:
128- if f == 'qty_available':
129- res[id][f] = supplier_info.product_id.qty_available
130- if f == 'virtual_available':
131- res[id][f] = supplier_info.product_id.virtual_available
132- return res
133-
134- _columns={
135- 'product_id' : fields.many2one('product.product', 'Product', select=1, ondelete='cascade', required=True),
136- 'qty_available' : fields.function(_product_available,multi='qty_available',type='float',digits_compute=dp.get_precision('Product Unit of Measure'),string="Quantity On Hand"),
137- 'virtual_available' : fields.function(_product_available,multi='qty_available',type='float', digits_compute=dp.get_precision('Product Unit of Measure'),string="Forecasted Quantity"),
138- }
139-product_supplierinfo()
140-
141-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
142
143=== removed file 'product_supplier_info/product_view.xml'
144--- product_supplier_info/product_view.xml 2013-08-16 05:31:33 +0000
145+++ product_supplier_info/product_view.xml 1970-01-01 00:00:00 +0000
146@@ -1,71 +0,0 @@
147-<?xml version="1.0" encoding="UTF-8"?>
148-<openerp>
149- <data>
150-
151- <record id="view_product_supplierinfo_search" model="ir.ui.view">
152- <field name="name">product.supplierinfo.search</field>
153- <field name="model">product.supplierinfo</field>
154- <field name="arch" type="xml">
155- <search string="Product Supplier Info">
156- <field name="name" string="Supplier"/>
157- <field name="product_code" string="Supplier Product Code"/>
158- <field name="product_name" string="Supplier Product Code"/>
159- <field name="product_id" />
160- <group expand='1' string='Group by...' groups="base.group_extended">
161- <filter string='Product Code' name='supplier_code' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'product_code'}" />
162- <filter string='Product' name='product' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'product_id'}" />
163- <filter string='Supplier' name='supplier' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'name'}" />
164- </group>
165- </search>
166- </field>
167- </record>
168-
169- <record id="view_product_supplierinfo_tree1" model="ir.ui.view">
170- <field name="name">product.supplierinfo.tree1</field>
171- <field name="model">product.supplierinfo</field>
172- <field name="arch" type="xml">
173- <tree string="Supplier Information" editable="top">
174- <field name="sequence" widget="handle"/>
175- <field name="product_code" string="Supplier Product Code"/>
176- <field name="product_id" string="Product Name"/>
177- <field name="product_name" string="Supplier Product Name"/>
178- <field name="name"/>
179- <field name="delay"/>
180- <field name="qty_available"/>
181- <field name="virtual_available"/>
182- <field name="min_qty"/>
183- <field name="company_id" groups="base.group_multi_company" widget="selection"/>
184- </tree>
185- </field>
186- </record>
187- <record id="view_product_supplierinfo_from1" model="ir.ui.view">
188- <field name="name">product.supplierinfo.from1</field>
189- <field name="model">product.supplierinfo</field>
190- <field name="inherit_id" ref="product.product_supplierinfo_form_view"/>
191- <field name="arch" type="xml">
192- <xpath expr="//field[@name='sequence']" position="before">
193- <field name="product_id"/>
194- </xpath>
195- </field>
196- </record>
197-
198-
199- <record id="action_product_supplier_info" model="ir.actions.act_window">
200- <field name="name">Product Supplier Info</field>
201- <field name="res_model">product.supplierinfo</field>
202- <field name="type">ir.actions.act_window</field>
203- <field name="view_type">form</field>
204- <field name="view_mode">tree,form</field>
205- <field name="view_id" ref="view_product_supplierinfo_tree1"/>
206- <field name="search_view_id" ref="view_product_supplierinfo_search"/>
207- <field name="context">{'search_default_supplier':1,'group_by':[]}</field>
208- </record>
209-
210- <menuitem
211- id="menu_product_supplier_info"
212- name="Product Suppliers"
213- sequence="15"
214- action="action_product_supplier_info"
215- parent="purchase.menu_procurement_management_product"/>
216- </data>
217-</openerp>
218
219=== removed directory 'product_supplier_info/static'
220=== removed directory 'product_supplier_info/static/description'
221=== removed file 'product_supplier_info/static/description/index.html'
222--- product_supplier_info/static/description/index.html 2013-11-08 04:10:21 +0000
223+++ product_supplier_info/static/description/index.html 1970-01-01 00:00:00 +0000
224@@ -1,17 +0,0 @@
225-<section class="oe_container">
226- <div class="oe_row">
227- <h2 class="oe_slogan">product_supplier_info Module</h2>
228- <h3 class="oe_slogan">Categorise supplier product by Supplier name</h3>
229- <h4 class="oe_slogan"><a href="http://www.elico-corp.com">By Elico Corp</a></h4>
230- <p>This module categorizes each product item by supplier.It allows for users to be able to view a compiled list of products supplied by the supplier. </p>
231-
232- <p>Users can also directly add new products to the supplier's list.</p>
233- <div class="oe_row_img oe_centered oe_mt32">
234- <img class="oe_picture oe_screenshot" src="product_supplier_info.png">
235- </div>
236- </div>
237- <div class="oe_row oe_centeralign oe_more_space">
238- <a href="http://www.elico-corp.com/saas/" class="oe_button oe_big">Start your <span class="oe_emph">free</span> trial</a>
239- </div>
240- <h4 class="oe_slogan">or</h4>
241-</section>
242
243=== removed file 'product_supplier_info/static/description/product_supplier_info.png'
244Binary files product_supplier_info/static/description/product_supplier_info.png 2013-08-23 02:20:13 +0000 and product_supplier_info/static/description/product_supplier_info.png 1970-01-01 00:00:00 +0000 differ

Subscribers

People subscribed via source and target branches

to status/vote changes: