Review: Needs Fixing code review Un par de cosillas a corregir.
Un saludo. Diff comments: > === modified file 'nayar_sale_order_line_actions/__init__.py' > --- nayar_sale_order_line_actions/__init__.py 2014-06-11 10:23:47 +0000 > +++ nayar_sale_order_line_actions/__init__.py 2014-06-30 14:12:08 +0000 > @@ -19,7 +19,5 @@ > # > > ############################################################################## > > -import sale > -import wizard > - > -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: > +from . import models > +from . import wizard > > === modified file 'nayar_sale_order_line_actions/__openerp__.py' > --- nayar_sale_order_line_actions/__openerp__.py 2014-06-11 10:23:47 > +0000 > +++ nayar_sale_order_line_actions/__openerp__.py 2014-06-30 14:12:08 > +0000 > @@ -24,14 +24,18 @@ > "version": "1.0", > "author": "Nayar Systems", > "category": "Enterprise Specific Modules", > - "description": "Acciones para realizar sobre multiples líneas de pedido > al mismo tiempo", > - "depends": ["sale", "dos_contracts"], > - "init_xml": [], > - "demo_xml": [], > - "update_xml": ["sale_view.xml", > - "wizard/multiple_line_modify.xml"], > + "description": """ > + Acciones para realizar sobre multiples líneas de pedido al mismo tiempo > + """, > + "depends": [ > + "sale", > + "dos_contracts", > + ], > + "data": [ > + "views/sale_view.xml", > + "wizard/multiple_line_modify.xml", > + ], > "website": 'http://www.72horas.net/', > "active": False, > "installable": True > } > -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: > > === added directory 'nayar_sale_order_line_actions/models' > === added file 'nayar_sale_order_line_actions/models/__init__.py' > --- nayar_sale_order_line_actions/models/__init__.py 1970-01-01 00:00:00 > +0000 > +++ nayar_sale_order_line_actions/models/__init__.py 2014-06-30 14:12:08 > +0000 > @@ -0,0 +1,22 @@ > +# -*- coding: utf-8 -*- > +############################################################################## > +# > +# OpenERP, Open Source Management Solution > +# Copyright (C) 2013 Nayar Systems (<http://www.72horas.net/>) > +# > +# 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 sale > > === renamed file 'nayar_sale_order_line_actions/sale.py' => > 'nayar_sale_order_line_actions/models/sale.py' > --- nayar_sale_order_line_actions/sale.py 2014-06-11 10:23:47 +0000 > +++ nayar_sale_order_line_actions/models/sale.py 2014-06-30 14:12:08 > +0000 > @@ -19,14 +19,15 @@ > # > > ############################################################################## > > -from osv import osv, fields > - > - > -class sale_order_line(osv.osv): > +from openerp.osv import orm, fields > + > + > +class sale_order_line(orm.Model): > _inherit = "sale.order.line" > > _columns = { > - 'order_elevator_id': fields.related('order_id', > 'elevator_partner_id', type='many2one', relation='res.partner', store=False, > string='Elevator'), > - } > - > -sale_order_line() > + 'order_elevator_id': fields.related('order_id', > 'elevator_partner_id', > + type='many2one', > + relation='res.partner', > + store=False, string='Elevator'), > + } > > === added directory 'nayar_sale_order_line_actions/views' > === renamed file 'nayar_sale_order_line_actions/sale_view.xml' => > 'nayar_sale_order_line_actions/views/sale_view.xml' > --- nayar_sale_order_line_actions/sale_view.xml 2014-06-11 10:23:47 > +0000 > +++ nayar_sale_order_line_actions/views/sale_view.xml 2014-06-30 14:12:08 > +0000 > @@ -1,38 +1,37 @@ > <?xml version="1.0"?> > <openerp> > - <data> > - <record id="view_action_sales_order_line_filter" model="ir.ui.view"> > - <field name="name">Sale Order Lines Filter</field> > - <field name="inherit_id" ref="sale.view_sales_order_line_filter" /> > - <field name="model">sale.order.line</field> > - <field name="type">search</field> > - <field name="arch" type="xml"> > - <field name="order_partner_id" position="after"> > - <field name="order_elevator_id" /> > - </field> > - </field> > - </record> > - > - <record id="view_action_sales_order_line_tree" model="ir.ui.view"> > - <field name="name">Sale Order Lines Tree</field> > - <field name="inherit_id" ref="sale.view_order_line_tree"/> > - <field name="model">sale.order.line</field> > - <field name="type">tree</field> > - <field name="arch" type="xml"> > - <field name="product_id" position="after"> > - <field name="prodlot_id"/> > - </field> > - </field> > - </record> > - > - <record id="action_sale_order_line" model="ir.actions.act_window"> > - <field name="name">Sale Order Lines</field> > - <field name="type">ir.actions.act_window</field> > - <field name="res_model">sale.order.line</field> > - <field name="view_type">form</field> > - <field name="view_mode">tree,form</field> > - </record> > - > - <menuitem action="action_sale_order_line" id="menu_sale_order_line" > parent="base.menu_sales" sequence="4" /> > - </data> > + <data> > + <record id="view_action_sales_order_line_filter" model="ir.ui.view"> > + <field name="name">Sale Order Lines Filter</field> > + <field name="inherit_id" ref="sale.view_sales_order_line_filter" > /> > + <field name="model">sale.order.line</field> > + <field name="arch" type="xml"> > + <field name="order_partner_id" position="after"> > + <field name="order_elevator_id" /> > + </field> > + </field> > + </record> > + > + <record id="view_action_sales_order_line_tree" model="ir.ui.view"> > + <field name="name">Sale Order Lines Tree</field> > + <field name="inherit_id" ref="sale.view_order_line_tree" /> > + <field name="model">sale.order.line</field> > + <field name="arch" type="xml"> > + <field name="product_id" position="after"> > + <field name="prodlot_id" /> > + </field> > + </field> > + </record> > + > + <record id="action_sale_order_line" model="ir.actions.act_window"> > + <field name="name">Sale Order Lines</field> > + <field name="type">ir.actions.act_window</field> > + <field name="res_model">sale.order.line</field> > + <field name="view_type">form</field> > + <field name="view_mode">tree,form</field> > + </record> > + > + <menuitem action="action_sale_order_line" id="menu_sale_order_line" > + parent="base.menu_sales" sequence="4" /> > + </data> > </openerp> > > === modified file 'nayar_sale_order_line_actions/wizard/__init__.py' > --- nayar_sale_order_line_actions/wizard/__init__.py 2014-06-11 10:23:47 > +0000 > +++ nayar_sale_order_line_actions/wizard/__init__.py 2014-06-30 14:12:08 > +0000 > @@ -19,6 +19,4 @@ > # > > ############################################################################## > > -import multiple_line_modify > - > -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: > +from . import multiple_line_modify > > === modified file > 'nayar_sale_order_line_actions/wizard/multiple_line_modify.py' > --- nayar_sale_order_line_actions/wizard/multiple_line_modify.py > 2014-06-11 10:23:47 +0000 > +++ nayar_sale_order_line_actions/wizard/multiple_line_modify.py > 2014-06-30 14:12:08 +0000 > @@ -19,11 +19,11 @@ > # > > ############################################################################## > > -from osv import osv, fields > -from tools.translate import _ > - > - > -class multiple_line_modify_wizard(osv.osv_memory): > +from openerp.osv import orm, fields > +from openerp.tools.translate import _ > + > + > +class MultipleLineModifyWizard(orm.TransientModel): > _name = 'sale.order.line.multiple.modify.wizard' > _description = 'Modify Sale Order Lines' > > @@ -33,12 +33,11 @@ > 'discount': fields.char('Discount (%)', size=30), > 'state': fields.selection((('none', 'none'), ('done', 'done'))), > 'output': fields.text('Output', readonly=True), > - } > + } > > _defaults = { > - 'state': lambda *a: 'none', > - } > - > + 'state': 'none', > + } > > def modify_lines(self, cr, uid, ids, context): > line_obj = self.pool.get('sale.order.line') > @@ -47,12 +46,15 @@ > line_ids = context['active_ids'] > lines = line_obj.browse(cr, uid, line_ids) > if len(set([l.order_id.id for l in lines])) > 1: > - raise osv.except_osv(_('Error !'), _('Sale lines must belong to > the same order.')) > + raise orm.except_orm( > + _('Error !'), > + _('Sale lines must belong to the same order.')) > > modif = {} > if data['price_unit']: > try: > - modif['price_unit'] = float(data['price_unit'].replace(",", > ".")) > + modif['price_unit'] = float(data['price_unit'].replace(",", > + ".")) > except: > pass > if data['discount']: > @@ -70,14 +72,11 @@ > else: > output = _('No sale order lines have been updated') > > - self.write(cr, uid, ids, {'output': output, 'state': 'done'}, > context=context) > + self.write(cr, uid, ids, {'output': output, 'state': 'done'}, > + context=context) > return {'res_model': 'sale.order.line.multiple.modify.wizard', > 'type': 'ir.actions.act_window', > 'view_type': 'form', > 'viwe_mode': 'form', > 'target': 'new', > 'res_id': ids and ids[0] or False} > - > - > - > -multiple_line_modify_wizard() > > === modified file > 'nayar_sale_order_line_actions/wizard/multiple_line_modify.xml' > --- nayar_sale_order_line_actions/wizard/multiple_line_modify.xml > 2014-06-11 10:23:47 +0000 > +++ nayar_sale_order_line_actions/wizard/multiple_line_modify.xml > 2014-06-30 14:12:08 +0000 > @@ -1,55 +1,61 @@ > <?xml version="1.0"?> > <openerp> > - <data> > - <record id="view_sale_order_line_multiple_modify_wizard" > model="ir.ui.view"> > - <field name="name">Modify Lines</field> > - <field name="model">sale.order.line.multiple.modify.wizard</field> > - <field name="type">form</field> > - <field name="arch" type="xml"> > - <form string="Modify lines"> > - <group colspan="4" col="4" states="none"> > - <separator colspan="4" string="Remember that sale lines must belong > to the same order." /> > - <field name="product_id" /> > - <newline/> > - <field name="price_unit" /> > - <newline/> > - <field name="discount" /> > - <separator string="" colspan="6"/> > - </group> > - <group colspan="4" col="4" states="done"> > - <field name="output" nolabel="1" colspan="4" /> > - </group> > - <group colspan="4" col="4" states="none"> > - <button special="cancel" string="Cancel" icon="gtk-cancel" /> > - <button name="modify_lines" string="Modify Lines" type="object" > icon="terp-gtk-go-back-rtl" /> > - </group> > - <group colspan="4" col="4" states="done"> > - <button special="cancel" string="Cancel" icon="gtk-cancel" /> > - </group> > - <field invisible="1" name="state" /> > - </form> > - </field> > - </record> > - > - <record id="action_sale_order_line_multiple_modify_wizard" > model="ir.actions.act_window"> > - <field name="name">Modify Lines</field> > - <field name="type">ir.actions.act_window</field> > - <field name="res_model">sale.order.line.multiple.modify.wizard</field> > - <field name="view_type">form</field> > - <field name="view_mode">form</field> > - <field name="view_id" > ref="view_sale_order_line_multiple_modify_wizard"/> > - <field name="target">new</field> > - <field name="multi">True</field> > - </record> > - > - <record model="ir.values" id="sale_order_line_multiple_modify_wizard"> > - <field name="model_id" ref="sale.model_sale_order_line" /> > - <field name="object" eval="1" /> > - <field name="name">Modify Lines</field> > - <field name="key2">client_action_multi</field> > - <field name="value" eval="'ir.actions.act_window,' + > str(ref('action_sale_order_line_multiple_modify_wizard'))" /> > - <field name="key">action</field> > - <field name="model">sale.order.line</field> > - </record> > - </data> > + <data> > + <record id="view_sale_order_line_multiple_modify_wizard" > model="ir.ui.view"> > + <field name="name">Modify Lines</field> > + <field > name="model">sale.order.line.multiple.modify.wizard</field> > + <field name="type">form</field> Quitar type. > + <field name="arch" type="xml"> > + <form string="Modify lines"> > + <group colspan="4" col="4" states="none"> > + <separator colspan="4" > + string="Remember that sale lines must belong to > the same order." /> > + <field name="product_id" /> > + <newline /> > + <field name="price_unit" /> > + <newline /> > + <field name="discount" /> > + <separator string="" colspan="6" /> > + </group> > + <group colspan="4" col="4" states="done"> > + <field name="output" nolabel="1" colspan="4" /> > + </group> > + <group colspan="4" col="4" states="none"> Poner en el footer. Para ello, hay que declarar <form version="7.0"> > + <button special="cancel" string="Cancel" > + icon="gtk-cancel" /> > + <button name="modify_lines" string="Modify Lines" > + type="object" icon="terp-gtk-go-back-rtl" /> > + </group> > + <group colspan="4" col="4" states="done"> > + <button special="cancel" string="Cancel" Poner class="oe_link" y sin icono > + icon="gtk-cancel" /> > + </group> > + <field invisible="1" name="state" /> > + </form> > + </field> > + </record> > + > + <record id="action_sale_order_line_multiple_modify_wizard" > model="ir.actions.act_window"> > + <field name="name">Modify Lines</field> > + <field name="type">ir.actions.act_window</field> > + <field > name="res_model">sale.order.line.multiple.modify.wizard</field> > + <field name="view_type">form</field> > + <field name="view_mode">form</field> > + <field name="view_id" > + ref="view_sale_order_line_multiple_modify_wizard" /> > + <field name="target">new</field> > + <field name="multi">True</field> > + </record> > + > + <record model="ir.values" > id="sale_order_line_multiple_modify_wizard"> > + <field name="model_id" ref="sale.model_sale_order_line" /> > + <field name="object" eval="1" /> > + <field name="name">Modify Lines</field> > + <field name="key2">client_action_multi</field> > + <field name="value" > + eval="'ir.actions.act_window,' + > str(ref('action_sale_order_line_multiple_modify_wizard'))" /> > + <field name="key">action</field> > + <field name="model">sale.order.line</field> > + </record> > + </data> > </openerp> > -- https://code.launchpad.net/~oihanecruce/avanzosc/nayar_sale_order_line_actions/+merge/225012 Your team Avanzosc_security is subscribed to branch lp:~avanzosc-security-team/avanzosc/72horas. -- Mailing list: https://launchpad.net/~avanzosc Post to : [email protected] Unsubscribe : https://launchpad.net/~avanzosc More help : https://help.launchpad.net/ListHelp
