From 6f927c777595950f62911179eed818d6a946e876 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 6 Feb 2014 11:40:46 +0100 Subject: [PATCH] code cleanup following review by sandy carter and leonardo pistone --- account_invoice_reorder_lines/__init__.py | 2 +- .../i18n/account_invoice_reorder_lines.pot | 23 +++++++++++ account_invoice_reorder_lines/i18n/fr.po | 4 +- .../i18n/invoice_sequence.pot | 38 ------------------- account_invoice_reorder_lines/invoice.py | 2 + .../invoice_view.xml | 12 ------ purchase_order_reorder_lines/__openerp__.py | 24 ++++++------ stock_picking_reorder_lines/__openerp__.py | 24 ++++++------ stock_picking_reorder_lines/stock.py | 3 ++ 9 files changed, 53 insertions(+), 79 deletions(-) create mode 100644 account_invoice_reorder_lines/i18n/account_invoice_reorder_lines.pot delete mode 100644 account_invoice_reorder_lines/i18n/invoice_sequence.pot diff --git a/account_invoice_reorder_lines/__init__.py b/account_invoice_reorder_lines/__init__.py index 3d7915121b6..d073defae05 100644 --- a/account_invoice_reorder_lines/__init__.py +++ b/account_invoice_reorder_lines/__init__.py @@ -3,6 +3,7 @@ # # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). +# Copyright (C) 2013-2014 Camptocamp () # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -18,6 +19,5 @@ # along with this program. If not, see . # ############################################################################## -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: from . import invoice diff --git a/account_invoice_reorder_lines/i18n/account_invoice_reorder_lines.pot b/account_invoice_reorder_lines/i18n/account_invoice_reorder_lines.pot new file mode 100644 index 00000000000..17a0130146f --- /dev/null +++ b/account_invoice_reorder_lines/i18n/account_invoice_reorder_lines.pot @@ -0,0 +1,23 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * invoice_sequence +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 7.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-09-30 12:00+0000\n" +"PO-Revision-Date: 2014-02-06 11:39+0100\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_invoice_reorder_lines +#: model:ir.model,name:account_invoice_reorder_lines.model_account_invoice_line +msgid "Invoice Line" +msgstr "" + + diff --git a/account_invoice_reorder_lines/i18n/fr.po b/account_invoice_reorder_lines/i18n/fr.po index f6938dd0fd7..42b9a2715f3 100644 --- a/account_invoice_reorder_lines/i18n/fr.po +++ b/account_invoice_reorder_lines/i18n/fr.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-30 12:00+0000\n" -"PO-Revision-Date: 2013-09-30 12:00+0000\n" +"PO-Revision-Date: 2014-02-06 11:37+0100\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -17,5 +17,5 @@ msgstr "" #. module: account_invoice_reorder_lines #: model:ir.model,name:account_invoice_reorder_lines.model_account_invoice_line msgid "Invoice Line" -msgstr "Ligne de Facturation" +msgstr "Ligne de facturation" diff --git a/account_invoice_reorder_lines/i18n/invoice_sequence.pot b/account_invoice_reorder_lines/i18n/invoice_sequence.pot deleted file mode 100644 index b639b7bb844..00000000000 --- a/account_invoice_reorder_lines/i18n/invoice_sequence.pot +++ /dev/null @@ -1,38 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * invoice_sequence -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 5.0.6\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-11-26 08:01:40+0000\n" -"PO-Revision-Date: 2009-11-26 08:01:40+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: invoice_sequence -#: model:ir.module.module,shortdesc:invoice_sequence.module_meta_information -msgid "Invoice lines with sequence number" -msgstr "" - -#. module: invoice_sequence -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "" - -#. module: invoice_sequence -#: model:ir.module.module,description:invoice_sequence.module_meta_information -msgid "Provide a new field on the invoice line form, allowing to manage the lines order.\n" -" " -msgstr "" - -#. module: invoice_sequence -#: field:account.invoice.line,sequence:0 -msgid "Sequence" -msgstr "" - diff --git a/account_invoice_reorder_lines/invoice.py b/account_invoice_reorder_lines/invoice.py index 35d6808b98a..8c2ad45922e 100644 --- a/account_invoice_reorder_lines/invoice.py +++ b/account_invoice_reorder_lines/invoice.py @@ -3,6 +3,7 @@ # # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). +# Copyright (C) 2013-2014 Camptocamp () # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -20,6 +21,7 @@ ############################################################################## from openerp.osv import orm + class account_invoice_line(orm.Model): _inherit = 'account.invoice.line' _order = 'invoice_id desc, sequence, id' diff --git a/account_invoice_reorder_lines/invoice_view.xml b/account_invoice_reorder_lines/invoice_view.xml index 2ad095c3619..5aae1133540 100644 --- a/account_invoice_reorder_lines/invoice_view.xml +++ b/account_invoice_reorder_lines/invoice_view.xml @@ -2,22 +2,10 @@ - - account.invoice.supplier.form2 account.invoice - diff --git a/purchase_order_reorder_lines/__openerp__.py b/purchase_order_reorder_lines/__openerp__.py index 71869da883b..f379909d7c5 100644 --- a/purchase_order_reorder_lines/__openerp__.py +++ b/purchase_order_reorder_lines/__openerp__.py @@ -19,21 +19,19 @@ # ############################################################################## { - 'name' : 'Purchase order lines with sequence number', - 'version' : '0.1', - 'category' : 'Purchase Management', + 'name': 'Purchase order lines with sequence number', + 'version': '0.1', + 'category': 'Purchase Management', 'description': ''' Provide a new field on the purchase order form, allowing to manage the lines order. ''', - 'author' : 'Camptocamp', - 'website' : 'http://www.camptocamp.com', - 'depends' : ['purchase', 'stock_picking_reorder_lines', 'account_invoice_reorder_lines'], - 'data' : ['purchase_view.xml'], - 'demo' : [], - 'test' : [], + 'author': 'Camptocamp', + 'website': 'http://www.camptocamp.com', + 'depends': ['purchase', 'stock_picking_reorder_lines', 'account_invoice_reorder_lines'], + 'data': ['purchase_view.xml'], + 'demo': [], + 'test': [], 'installable': True, - 'auto_install' : False, - 'application' : False, + 'auto_install': False, + 'application': False, } - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/stock_picking_reorder_lines/__openerp__.py b/stock_picking_reorder_lines/__openerp__.py index 6b35b0c3c41..01aa6629d41 100644 --- a/stock_picking_reorder_lines/__openerp__.py +++ b/stock_picking_reorder_lines/__openerp__.py @@ -19,21 +19,19 @@ # ############################################################################## { - 'name' : 'Stock picking lines with sequence number', - 'version' : '0.1', - 'category' : 'Warehouse Management', + 'name': 'Stock picking lines with sequence number', + 'version': '0.1', + 'category': 'Warehouse Management', 'description': ''' Provide a new field on stock moves, allowing to manage the orders of moves in a picking. ''', - 'author' : 'Camptocamp', - 'website' : 'http://www.camptocamp.com', - 'depends' : ['stock', 'sale', 'sale_stock'], - 'data' : ['stock_view.xml'], - 'demo' : [], - 'test' : [], + 'author': 'Camptocamp', + 'website': 'http://www.camptocamp.com', + 'depends': ['stock', 'sale', 'sale_stock'], + 'data': ['stock_view.xml'], + 'demo': [], + 'test': [], 'installable': True, - 'auto_install' : False, - 'application' : False, + 'auto_install': False, + 'application': False, } - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/stock_picking_reorder_lines/stock.py b/stock_picking_reorder_lines/stock.py index 689f9a0e13b..2e121d154f9 100644 --- a/stock_picking_reorder_lines/stock.py +++ b/stock_picking_reorder_lines/stock.py @@ -21,6 +21,7 @@ from openerp.osv import orm, fields + class stock_move(orm.Model): _inherit = 'stock.move' _columns = { @@ -30,6 +31,7 @@ class stock_move(orm.Model): _defaults = {'sequence': 10, } + class stock_picking(orm.Model): _inherit = 'stock.picking' @@ -40,6 +42,7 @@ def _prepare_invoice_line(self, cr, uid, group, picking, move_line, invoice_id, res['sequence'] = move_line.sequence return res + class sale_order(orm.Model): _inherit = 'sale.order'