avanzosc team mailing list archive
-
avanzosc team
-
Mailing list archive
-
Message #00604
[Merge] lp:~mikelarregi/avanzosc/nayar_sale_order_ref_label into lp:~avanzosc-security-team/avanzosc/72horas
mikel arregi has proposed merging lp:~mikelarregi/avanzosc/nayar_sale_order_ref_label into lp:~avanzosc-security-team/avanzosc/72horas.
Requested reviews:
Avanzosc_security (avanzosc-security-team)
For more details, see:
https://code.launchpad.net/~mikelarregi/avanzosc/nayar_sale_order_ref_label/+merge/225631
nayar_sale_order_ref_label
--
https://code.launchpad.net/~mikelarregi/avanzosc/nayar_sale_order_ref_label/+merge/225631
Your team Avanzosc_security is requested to review the proposed merge of lp:~mikelarregi/avanzosc/nayar_sale_order_ref_label into lp:~avanzosc-security-team/avanzosc/72horas.
=== modified file 'nayar_sale_order_ref_label/__init__.py'
--- nayar_sale_order_ref_label/__init__.py 2014-06-11 10:23:47 +0000
+++ nayar_sale_order_ref_label/__init__.py 2014-07-04 10:46:43 +0000
@@ -19,7 +19,7 @@
#
##############################################################################
-import sale
-import report
+from . import models
+from . import report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'nayar_sale_order_ref_label/__openerp__.py'
--- nayar_sale_order_ref_label/__openerp__.py 2014-06-11 10:23:47 +0000
+++ nayar_sale_order_ref_label/__openerp__.py 2014-07-04 10:46:43 +0000
@@ -20,16 +20,14 @@
##############################################################################
{
- "name" : "Etiquetas con Referencias",
- "version" : "1.0",
- "author" : "Nayar Systems",
- "category" : "Enterprise Specific Modules",
- "website" : "www.72horas.net",
- "description": "Impresion de etiquetas con la referencia del pedido y/o de las lineas.",
- "depends" : ["base", "dos_contracts"],
- "init_xml" : [],
- "update_xml" : ['sale_view.xml'],
- "active": False,
+ "name": "Etiquetas con Referencias",
+ "version": "1.0",
+ "author": "Nayar Systems",
+ "category": "Enterprise Specific Modules",
+ "website": "www.72horas.net",
+ "description": """Impresion de etiquetas con la referencia"""
+ """ del pedido y/o de las lineas.""",
+ "depends": ["base", "dos_contracts"],
+ "data": ['views/sale_view.xml'],
"installable": True
}
-
=== added directory 'nayar_sale_order_ref_label/models'
=== added file 'nayar_sale_order_ref_label/models/__init__.py'
--- nayar_sale_order_ref_label/models/__init__.py 1970-01-01 00:00:00 +0000
+++ nayar_sale_order_ref_label/models/__init__.py 2014-07-04 10:46:43 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2012-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_ref_label/sale.py' => 'nayar_sale_order_ref_label/models/sale.py'
--- nayar_sale_order_ref_label/sale.py 2014-06-11 10:23:47 +0000
+++ nayar_sale_order_ref_label/models/sale.py 2014-07-04 10:46:43 +0000
@@ -19,57 +19,63 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import orm
from tools.translate import _
-import netsvc
+from openerp import netsvc
import base64
-class sale_order(osv.osv):
+class SaleOrder(orm.Model):
_name = "sale.order"
_inherit = "sale.order"
def write(self, cr, uid, ids, vals, context=None):
- res = super(sale_order, self).write(cr, uid, ids, vals, context=context)
- lines_obj = self.pool.get('sale.order.line')
+ res = super(SaleOrder, self).write(cr, uid, ids, vals, context=context)
+ lines_obj = self.pool['sale.order.line']
for id in ids:
- client_order_ref = self.browse(cr, uid, id).client_order_ref
+ client_order_ref = self.browse(cr, uid, id,
+ context=context).client_order_ref
if client_order_ref:
- line_ids = lines_obj.search(cr, uid, [('order_id', '=', id), ('client_order_ref', '=', False)])
- lines_obj.write(cr, uid, line_ids, {'client_order_ref': client_order_ref})
+ line_ids = lines_obj.search(
+ cr, uid, [('order_id', '=', id), ('client_order_ref', '=',
+ False)])
+ lines_obj.write(
+ cr, uid, line_ids, {'client_order_ref': client_order_ref},
+ context=context)
return res
-sale_order()
-
-
-class sale_order_line(osv.osv):
+
+class SaleOrderLine(orm.Model):
_name = 'sale.order.line'
_inherit = 'sale.order.line'
-
+
def print_ref_label(self, cr, uid, ids, context=None):
- report_obj = self.pool.get('ir.actions.report.xml')
- printer_obj = self.pool.get('printing.printer')
-
+ report_obj = self.pool['ir.actions.report.xml']
+ printer_obj = self.pool['printing.printer']
# Obtenemos la impresora Brother-QL-1060N-62x29
- default_printer = printer_obj.search(cr, uid, [('system_name', '=', 'Brother-QL-1060N-62x29')])
-
+ default_printer = (
+ printer_obj.search(cr, uid, [('system_name', '=',
+ 'Brother-QL-1060N-62x29')]))
if default_printer:
default_printer = default_printer[0]
- printer = printer_obj.browse(cr, uid, default_printer, context).system_name
+ printer = printer_obj.browse(cr, uid, default_printer,
+ context).system_name
else:
- raise osv.except_osv(_('Error !'),_('Not found any default printer. Please set the default printer.'))
-
+ raise orm.except_orm(_('Error !'),
+ _('Not found any default printer. '
+ 'Please set the default printer.'))
# Creamos informe
- service = netsvc.LocalService('report.sale.order.ref.label.report');
- c = context.copy();
- c.update({'client_order_ref': self.browse(cr, uid, ids[0]).client_order_ref})
- result, format = service.create(cr, uid, [self.browse(cr, uid, ids[0]).order_id.id], {}, context=c)
-
+ service = netsvc.LocalService('report.sale.order.ref.label.report')
+ c = context.copy()
+ c.update(
+ {'client_order_ref':
+ self.browse(
+ cr, uid, ids[0], context=context).client_order_ref})
+ result, format = service.create(
+ cr, uid, [self.browse(cr, uid, ids[0]).order_id.id], {}, context=c)
# Imprimimos informe
- report_obj.print_direct(cr, uid, base64.encodestring(result), format, printer)
-
+ report_obj.print_direct(cr, uid, base64.encodestring(result), format,
+ printer)
return True
-
-sale_order_line()
=== modified file 'nayar_sale_order_ref_label/report/sale_order_ref_label.py'
--- nayar_sale_order_ref_label/report/sale_order_ref_label.py 2014-06-11 10:23:47 +0000
+++ nayar_sale_order_ref_label/report/sale_order_ref_label.py 2014-07-04 10:46:43 +0000
@@ -19,23 +19,24 @@
#
##############################################################################
-from report import report_sxw
-from osv import osv
-from tools.translate import _
-import pooler
-
-class sale_order_ref_label_report(report_sxw.rml_parse):
- def __init__(self, cr, uid, name, context):
- super(sale_order_ref_label_report, self).__init__(cr, uid, name, context=context)
- self.localcontext.update({
- 'get_client_order_ref': self.get_client_order_ref,
- })
- self.context = context
-
-
- def get_client_order_ref (self, order):
- return self.context.get('client_order_ref', order.client_order_ref)
-
-
-report_sxw.report_sxw('report.sale.order.ref.label.report', 'sale.order', 'addons/dos_contracts/report/sale_order_ref_label.rml', parser=sale_order_ref_label_report)
+from openerp.report import report_sxw
+from openerp.osv import osv
+from openerp.tools.translate import _
+
+
+class SaleOrderRefLabelReport(report_sxw.rml_parse):
+ def __init__(self, cr, uid, name, context=None):
+ super(SaleOrderRefLabelReport, self).__init__(cr, uid, name,
+ context=context)
+ self.localcontext.update({
+ 'get_client_order_ref': self.get_client_order_ref,
+ })
+ self.context = context
+
+ def get_client_order_ref(self, order):
+ return self.context.get('client_order_ref', order.client_order_ref)
+
+report_sxw.report_sxw('report.sale.order.ref.label.report', 'sale.order',
+ 'addons/dos_contracts/report/sale_order_ref_label.rml',
+ parser=SaleOrderRefLabelReport)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added directory 'nayar_sale_order_ref_label/views'
=== renamed file 'nayar_sale_order_ref_label/sale_view.xml' => 'nayar_sale_order_ref_label/views/sale_view.xml'
--- nayar_sale_order_ref_label/sale_view.xml 2014-06-11 10:23:47 +0000
+++ nayar_sale_order_ref_label/views/sale_view.xml 2014-07-04 10:46:43 +0000
@@ -6,7 +6,6 @@
<field name="name">sale.order.cabins.form.inherit</field>
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale_layout.view_order_form_inherit_1"/>
- <field name="type">form</field>
<field name="priority">1</field>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='abstract_line_ids']/tree/field[@name='sequence']" position="after">
Follow ups
