From 1f720317d168fd8fa895b1eb3cfaeb01ce7c6aac Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Thu, 24 Oct 2013 15:36:01 +0200 Subject: [PATCH] [PEP8] --- printer_tray/__openerp__.py | 12 ++++++------ printer_tray/ir_report.py | 8 +++++--- printer_tray/printer.py | 19 +++++++------------ printer_tray/printer_tray.py | 1 + printer_tray/report_xml_action.py | 7 +++---- printer_tray/users.py | 4 +++- 6 files changed, 25 insertions(+), 26 deletions(-) diff --git a/printer_tray/__openerp__.py b/printer_tray/__openerp__.py index 1f180c5..e193ea2 100644 --- a/printer_tray/__openerp__.py +++ b/printer_tray/__openerp__.py @@ -18,8 +18,8 @@ # along with this program. If not, see . # ############################################################################## -{'name' : 'Report to printer - Paper tray selection', - 'version' : '1.0', +{'name': 'Report to printer - Paper tray selection', + 'version': '1.0', 'category': 'Printer', 'description': """ Report to printer - Paper tray selection @@ -38,12 +38,12 @@ Report to printer - Paper tray selection This allows you to dedicate a specific paper source for exemple for prepinted paper such as payment slip. """, - 'author' : 'Camptocamp', + 'author': 'Camptocamp', 'maintainer': 'Camptocamp', 'website': 'http://www.camptocamp.com/', - 'depends' : ['base_report_assembler', - 'base_report_to_printer', - ], + 'depends': ['base_report_assembler', + 'base_report_to_printer', + ], 'data': [ 'users_view.xml', 'ir_report_view.xml', diff --git a/printer_tray/ir_report.py b/printer_tray/ir_report.py index 4429f46..4230d57 100644 --- a/printer_tray/ir_report.py +++ b/printer_tray/ir_report.py @@ -20,12 +20,14 @@ ############################################################################## from openerp.osv import orm, fields + class ReportXML(orm.Model): _inherit = 'ir.actions.report.xml' _columns = { - 'printer_tray_id': fields.many2one('printing.tray', 'Paper Source', + 'printer_tray_id': fields.many2one( + 'printing.tray', 'Paper Source', domain="[('printer_id', '=', printing_printer_id)]"), } @@ -46,7 +48,8 @@ class ReportXML(orm.Model): tray = report.printer_tray_id # Retrieve report-user specific values - act_ids = printing_act_obj.search(cr, uid, + act_ids = printing_act_obj.search( + cr, uid, [('report_id', '=', report.id), ('user_id', '=', uid), ('action', '!=', 'user_default')], context=context) @@ -58,4 +61,3 @@ class ReportXML(orm.Model): if tray: options['InputSlot'] = str(tray.system_name) return options - diff --git a/printer_tray/printer.py b/printer_tray/printer.py index 830c844..edbd472 100644 --- a/printer_tray/printer.py +++ b/printer_tray/printer.py @@ -24,13 +24,14 @@ from cups import PPD from openerp import pooler from openerp.osv import orm, fields + class Printer(orm.Model): _inherit = 'printing.printer' _columns = { - 'tray_ids': fields.one2many('printing.tray', 'printer_id', 'Paper Sources'), - } + 'tray_ids': fields.one2many('printing.tray', 'printer_id', 'Paper Sources'), + } def _update_tray_option(self, db_name, uid, printer, context=None): """ @@ -45,25 +46,22 @@ class Printer(orm.Model): ppd_file_path = connection.getPPD3(printer.system_name) except: return - if not ppd_file_path[2]: return ppd = PPD(ppd_file_path[2]) option = ppd.findOption('InputSlot') if not option: return - try: for tray_opt in option.choices: if tray_opt['choice'] not in [t.system_name for t in printer.tray_ids]: tray_vals = { - 'name': tray_opt['text'], - 'system_name': tray_opt['choice'], - 'printer_id': printer.id, - } + 'name': tray_opt['text'], + 'system_name': tray_opt['choice'], + 'printer_id': printer.id, + } tray_obj.create(cr, uid, tray_vals, context=context) - cr.commit() except: cr.rollback() @@ -72,7 +70,6 @@ class Printer(orm.Model): cr.close() return True - def update_printers_status(self, db_name, uid, context=None): """ Add creation of tray if no tray are defined @@ -95,6 +92,4 @@ class Printer(orm.Model): # XXX we consider config of printer won't change if not printer.tray_ids: self._update_tray_option(db_name, uid, printer, context=context) - return res - diff --git a/printer_tray/printer_tray.py b/printer_tray/printer_tray.py index 15506a0..90a90ab 100644 --- a/printer_tray/printer_tray.py +++ b/printer_tray/printer_tray.py @@ -20,6 +20,7 @@ ############################################################################## from openerp.osv import orm, fields + class PrinterTray(orm.Model): _name = 'printing.tray' diff --git a/printer_tray/report_xml_action.py b/printer_tray/report_xml_action.py index 85f0176..603e21b 100644 --- a/printer_tray/report_xml_action.py +++ b/printer_tray/report_xml_action.py @@ -21,11 +21,13 @@ from openerp.osv import orm, fields + class ReportXMLAction(orm.Model): _inherit = 'printing.report.xml.action' _columns = { - 'printer_tray_id': fields.many2one('printing.tray', 'Paper Source', + 'printer_tray_id': fields.many2one( + 'printing.tray', 'Paper Source', domain="[('printer_id', '=', printer_id)]"), } @@ -34,6 +36,3 @@ class ReportXMLAction(orm.Model): action = self.browse(cr, uid, act_id, context=context) res['tray'] = action.printer_tray_id.system_name return res - - - diff --git a/printer_tray/users.py b/printer_tray/users.py index dc38379..7f46f76 100644 --- a/printer_tray/users.py +++ b/printer_tray/users.py @@ -20,11 +20,13 @@ ############################################################################## from openerp.osv import orm, fields + class ResUsers(orm.Model): _inherit = "res.users" _columns = { - 'printer_tray_id': fields.many2one('printing.tray', 'Default Printer Paper Source', + 'printer_tray_id': fields.many2one( + 'printing.tray', 'Default Printer Paper Source', domain="[('printer_id', '=', printing_printer_id)]"), }