avanzosc team mailing list archive
-
avanzosc team
-
Mailing list archive
-
Message #00493
[Merge] lp:~oihanecruce/avanzosc/dos_stock_warehouse_additional_info into lp:~avanzosc-security-team/avanzosc/72horas
Oihane (Avanzosc) has proposed merging lp:~oihanecruce/avanzosc/dos_stock_warehouse_additional_info into lp:~avanzosc-security-team/avanzosc/72horas.
Requested reviews:
Pedro Manuel Baeza (pedro.baeza)
For more details, see:
https://code.launchpad.net/~oihanecruce/avanzosc/dos_stock_warehouse_additional_info/+merge/224087
--
https://code.launchpad.net/~oihanecruce/avanzosc/dos_stock_warehouse_additional_info/+merge/224087
Your team Avanzosc_security is subscribed to branch lp:~avanzosc-security-team/avanzosc/72horas.
=== modified file 'dos_stock_warehouse_additional_info/__init__.py'
--- dos_stock_warehouse_additional_info/__init__.py 2014-06-11 10:23:47 +0000
+++ dos_stock_warehouse_additional_info/__init__.py 2014-06-23 09:54:07 +0000
@@ -20,6 +20,4 @@
##############################################################################
-import stock_warehouse
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+from . import models
=== modified file 'dos_stock_warehouse_additional_info/__openerp__.py'
--- dos_stock_warehouse_additional_info/__openerp__.py 2014-06-11 10:23:47 +0000
+++ dos_stock_warehouse_additional_info/__openerp__.py 2014-06-23 09:54:07 +0000
@@ -21,17 +21,14 @@
{
- "name" : "DOS Stock Warehouse Additional Info",
- "version" : "1.0",
- "author" : "DOS",
- "category" : "Stock",
- "website" : "www.dos-sl.es",
+ "name": "DOS Stock Warehouse Additional Info",
+ "version": "1.0",
+ "author": "DOS",
+ "category": "Stock",
+ "website": "www.dos-sl.es",
"description": "This module adds extra information to stock warehouse",
- "depends" : ['stock'],
- "init_xml" : [],
- "update_xml" : ['stock_warehouse_view.xml'],
+ "depends": ['stock'],
+ "data": ['views/stock_warehouse_view.xml'],
"active": False,
"installable": True
}
-
-
=== added directory 'dos_stock_warehouse_additional_info/models'
=== added file 'dos_stock_warehouse_additional_info/models/__init__.py'
--- dos_stock_warehouse_additional_info/models/__init__.py 1970-01-01 00:00:00 +0000
+++ dos_stock_warehouse_additional_info/models/__init__.py 2014-06-23 09:54:07 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 DOS (<http://www.dos-sl.es>).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+from . import stock_warehouse
=== renamed file 'dos_stock_warehouse_additional_info/stock_warehouse.py' => 'dos_stock_warehouse_additional_info/models/stock_warehouse.py'
--- dos_stock_warehouse_additional_info/stock_warehouse.py 2014-06-11 10:23:47 +0000
+++ dos_stock_warehouse_additional_info/models/stock_warehouse.py 2014-06-23 09:54:07 +0000
@@ -19,19 +19,22 @@
#
##############################################################################
-from osv import osv, fields
-import re
-from tools.translate import _
-
-class stock_warehouse(osv.osv):
-
- _name = 'stock.warehouse'
- _inherit = 'stock.warehouse'
-
- _columns = {
- 'lot_customer_out_id': fields.many2one('stock.location', 'Location Customer Output', required=True, domain=[('usage','=','customer')]),
- 'lot_rented_id': fields.many2one('stock.location', 'Location Rented', required=True, domain=[('usage','=','customer')]),
- 'lot_broken_id': fields.many2one('stock.location', 'Location Breaks', required=True),
- }
-
-stock_warehouse()
\ No newline at end of file
+from openerp.osv import orm, fields
+
+
+class StockWarehouse(orm.Model):
+ _inherit = 'stock.warehouse'
+
+ _columns = {
+ 'lot_customer_out_id': fields.many2one('stock.location',
+ 'Location Customer Output',
+ required=True,
+ domain=[('usage', '=',
+ 'customer')]),
+ 'lot_rented_id': fields.many2one('stock.location',
+ 'Location Rented',
+ required=True,
+ domain=[('usage', '=', 'customer')]),
+ 'lot_broken_id': fields.many2one('stock.location',
+ 'Location Breaks', required=True),
+ }
=== added directory 'dos_stock_warehouse_additional_info/views'
=== renamed file 'dos_stock_warehouse_additional_info/stock_warehouse_view.xml' => 'dos_stock_warehouse_additional_info/views/stock_warehouse_view.xml'
--- dos_stock_warehouse_additional_info/stock_warehouse_view.xml 2014-06-11 10:23:47 +0000
+++ dos_stock_warehouse_additional_info/views/stock_warehouse_view.xml 2014-06-23 09:54:07 +0000
@@ -1,36 +1,34 @@
<?xml version="1.0"?>
<openerp>
- <data>
-
- <!-- Sotck Warehouse Inherit Tree View -->
+ <data>
+
+ <!-- Sotck Warehouse Inherit Tree View -->
<record id="view_warehouse_additional_info_tree" model="ir.ui.view">
<field name="name">stock.warehouse.additional.info.tree</field>
<field name="model">stock.warehouse</field>
- <field name="inherit_id" ref="stock.view_warehouse_tree"/>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <field name="lot_stock_id" position="after">
- <field name="lot_customer_out_id" />
- <field name="lot_rented_id" />
- <field name="lot_broken_id" />
- </field>
- </field>
- </record>
-
- <!-- Sotck Warehouse Inherit Form View -->
- <record id="view_warehouse_additional_info_form" model="ir.ui.view">
- <field name="name">stock.warehouse.additional.info.form</field>
- <field name="model">stock.warehouse</field>
- <field name="inherit_id" ref="stock.view_warehouse"/>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <field name="lot_stock_id" position="after">
- <field name="lot_customer_out_id" />
- <field name="lot_rented_id" />
- <field name="lot_broken_id" />
- </field>
- </field>
- </record>
-
- </data>
+ <field name="inherit_id" ref="stock.view_warehouse_tree" />
+ <field name="arch" type="xml">
+ <field name="lot_stock_id" position="after">
+ <field name="lot_customer_out_id" />
+ <field name="lot_rented_id" />
+ <field name="lot_broken_id" />
+ </field>
+ </field>
+ </record>
+
+ <!-- Sotck Warehouse Inherit Form View -->
+ <record id="view_warehouse_additional_info_form" model="ir.ui.view">
+ <field name="name">stock.warehouse.additional.info.form</field>
+ <field name="model">stock.warehouse</field>
+ <field name="inherit_id" ref="stock.view_warehouse" />
+ <field name="arch" type="xml">
+ <field name="lot_stock_id" position="after">
+ <field name="lot_customer_out_id" />
+ <field name="lot_rented_id" />
+ <field name="lot_broken_id" />
+ </field>
+ </field>
+ </record>
+
+ </data>
</openerp>
Follow ups
