Merge lp:~openobject-italia-core-devs/openobject-italia/7.0-l10n_it_sale-pep8 into lp:~openobject-italia-core-devs/openobject-italia/italian-addons-7.0

[Davide Corio]

[Davide Corio (enlightx-deactivatedaccount)]

ho escluso F401, siccome mi era parso di leggere che si preferisce tollerare il controllo piuttosto che riempire il codice di assert

[Davide Corio (enlightx-deactivatedaccount)]

aggiungo che ho dovuto creare qualche variabile in più con nomi abbreviati per rimanere nelle 79 cols

[Lorenzo Battistini (elbati)]

Se preferisci

http://pastie.org/9196360
può diventare ad esempio
http://pastie.org/9196367

E
http://pastie.org/9196370
può diventare
http://pastie.org/9196375

Discorso simile per picking.py

[Leonardo Pistone (lepistone)]

+1 Lorenzo

[Davide Corio (enlightx-deactivatedaccount)]

Non ci avrei mai pensato da solo...

+1

[lp:~openobject-italia-core-devs/openobject-italia/7.0-l10n_it_sale-pep8]

241. By Davide Corio on 2014-05-21

[IMP] code cleanup

242. By Davide Corio on 2014-05-21

[IMP] code cleanup

243. By Davide Corio on 2014-05-21

[IMP] code cleanup

[Lorenzo Battistini (elbati)]

Grazie Davide.

Ah, solo un'altra cosa: riga 157 come mai hai tolto lo spazio?

[lp:~openobject-italia-core-devs/openobject-italia/7.0-l10n_it_sale-pep8]

244. By Davide Corio on 2014-05-22

[FIX] missing space

[Davide Corio (enlightx-deactivatedaccount)]

Umh... non te lo so dire :)

rimesso spazio

[andrea_cg (a-gallina)]

+1

review: Approve

[Andrea Cometa (scigghia)]

+8 :)

review: Approve

[Leonardo Pistone (lepistone)]

l'F401 possiamo ignorarlo solo negli __init__.py. Ci sono altri import inutili che sono davvero inutili.

o in alternativa, non lo ignoriamo del tutto e mettiamo # noqa negli import di __init__.py.

ciao

review: Needs Fixing

[Lorenzo Battistini (elbati)]

This project is now hosted on https://github.com/OCA/l10n-italy. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

Unmerged revisions

244. By Davide Corio on 2014-05-22

[FIX] missing space

243. By Davide Corio on 2014-05-21

[IMP] code cleanup

242. By Davide Corio on 2014-05-21

[IMP] code cleanup

241. By Davide Corio on 2014-05-21

[IMP] code cleanup

240. By Davide Corio on 2014-05-21

[IMP] pep8

=== modified file 'l10n_it_sale/__init__.py'
--- l10n_it_sale/__init__.py	2013-03-13 08:21:42 +0000
+++ l10n_it_sale/__init__.py	2014-05-22 13:05:57 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    Copyright (C) 2010 Associazione OpenERP Italia
 #    (<http://www.openerp-italia.org>).
 #
@@ -21,6 +21,6 @@
 
 import sale
 import stock
-import account 
+import account
 import partner
 import wizard

=== modified file 'l10n_it_sale/__openerp__.py'
--- l10n_it_sale/__openerp__.py	2013-03-14 11:11:29 +0000
+++ l10n_it_sale/__openerp__.py	2014-05-22 13:05:57 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    Copyright (C) 2010 Associazione OpenERP Italia
 #    (<http://www.openerp-italia.org>).
 #
@@ -32,8 +32,8 @@
     'author': 'OpenERP Italian Community',
     'website': 'http://www.openerp-italia.org',
     'license': 'AGPL-3',
-    "depends" : ['stock', 'sale', 'account', 'delivery'],
-    "data" : [
+    "depends": ['stock', 'sale', 'account', 'delivery'],
+    "data": [
         'wizard/assign_ddt.xml',
         'stock/picking_view.xml',
         'stock/carriage_condition_view.xml',
@@ -46,11 +46,8 @@
         'sale/sale_view.xml',
         "security/ir.model.access.csv",
         'partner/partner_view.xml',
-        'account/invoice_view.xml',
-        ],
-    "demo" : [],
+        'account/invoice_view.xml'],
+    "demo": [],
     "active": False,
     "installable": True
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

=== modified file 'l10n_it_sale/account/__init__.py'
--- l10n_it_sale/account/__init__.py	2013-03-13 08:21:42 +0000
+++ l10n_it_sale/account/__init__.py	2014-05-22 13:05:57 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    Copyright (C) 2010 Associazione OpenERP Italia
 #    (<http://www.openerp-italia.org>).
 #
@@ -19,5 +19,4 @@
 #
 ##############################################################################
 
-import invoice 
-
+import invoice

=== modified file 'l10n_it_sale/account/invoice.py'
--- l10n_it_sale/account/invoice.py	2013-03-14 11:11:29 +0000
+++ l10n_it_sale/account/invoice.py	2014-05-22 13:05:57 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    Copyright (C) 2010 Associazione OpenERP Italia
 #    (<http://www.openerp-italia.org>).
 #
@@ -20,32 +20,40 @@
 ##############################################################################
 
 import netsvc
-import pooler, tools
-
+import pooler
+import tools
 from openerp.osv import orm, fields
-from tools.translate import _
+
 
 class account_invoice(orm.Model):
-    
+
     _inherit = 'account.invoice'
-        
+
     _columns = {
-#        'order_id':fields.many2one('sale.order','Sale Order'),
-        'carriage_condition_id': fields.many2one('stock.picking.carriage_condition', 'Carriage condition'),
-        'goods_description_id': fields.many2one('stock.picking.goods_description', 'Description of goods'),
-        'transportation_reason_id': fields.many2one('stock.picking.transportation_reason', 'Reason for transportation'),
+        'carriage_condition_id': fields.many2one(
+            'stock.picking.carriage_condition', 'Carriage condition'),
+        'goods_description_id': fields.many2one(
+            'stock.picking.goods_description', 'Description of goods'),
+        'transportation_reason_id': fields.many2one(
+            'stock.picking.transportation_reason',
+            'Reason for transportation'),
         }
 
-    def onchange_partner_id(self, cr, uid, ids, type, partner_id,
-            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
-        result = super(account_invoice, self).onchange_partner_id(cr, uid, ids, type, partner_id,
-            date_invoice, payment_term, partner_bank_id, company_id)
+    def onchange_partner_id(
+            self, cr, uid, ids, type, partner_id, date_invoice=False,
+            payment_term=False, partner_bank_id=False, company_id=False):
+        result = super(account_invoice, self).onchange_partner_id(
+            cr, uid, ids, type, partner_id, date_invoice, payment_term,
+            partner_bank_id, company_id)
         if partner_id:
             partner = self.pool.get('res.partner').browse(cr, uid, partner_id)
-            result['value']['carriage_condition_id'] = partner.carriage_condition_id.id
-            result['value']['goods_description_id'] = partner.goods_description_id.id
-            result['value']['transportation_reason_id'] = partner.transportation_reason_id.id
+            result['value'][
+                'carriage_condition_id'
+                ] = partner.carriage_condition_id.id
+            result['value'][
+                'goods_description_id'
+                ] = partner.goods_description_id.id
+            result['value'][
+                'transportation_reason_id'
+                ] = partner.transportation_reason_id.id
         return result
-    
-account_invoice()
-

=== modified file 'l10n_it_sale/partner/__init__.py'
--- l10n_it_sale/partner/__init__.py	2013-03-13 08:21:42 +0000
+++ l10n_it_sale/partner/__init__.py	2014-05-22 13:05:57 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    Copyright (C) 2010 Associazione OpenERP Italia
 #    (<http://www.openerp-italia.org>).
 #

=== modified file 'l10n_it_sale/partner/partner.py'
--- l10n_it_sale/partner/partner.py	2013-03-14 11:11:29 +0000
+++ l10n_it_sale/partner/partner.py	2014-05-22 13:05:57 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    Copyright (C) 2010 Associazione OpenERP Italia
 #    (<http://www.openerp-italia.org>).
 #
@@ -21,11 +21,14 @@
 
 from openerp.osv import orm, fields
 
+
 class res_partner(orm.Model):
     _inherit = "res.partner"
-    _columns =  {
-        'carriage_condition_id': fields.many2one('stock.picking.carriage_condition', 'Carriage condition'),
-        'goods_description_id': fields.many2one('stock.picking.goods_description', 'Description of goods'),
-        'transportation_reason_id': fields.many2one('stock.picking.transportation_reason', 'Reason for transportation'),
-    }
-res_partner()
+    _columns = {
+        'carriage_condition_id': fields.many2one(
+            'stock.picking.carriage_condition', 'Carriage condition'),
+        'goods_description_id': fields.many2one(
+            'stock.picking.goods_description', 'Description of goods'),
+        'transportation_reason_id': fields.many2one(
+            'stock.picking.transportation_reason',
+            'Reason for transportation')}

=== modified file 'l10n_it_sale/sale/__init__.py'
--- l10n_it_sale/sale/__init__.py	2013-03-13 08:21:42 +0000
+++ l10n_it_sale/sale/__init__.py	2014-05-22 13:05:57 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    Copyright (C) 2010 Associazione OpenERP Italia
 #    (<http://www.openerp-italia.org>).
 #
@@ -20,4 +20,3 @@
 ##############################################################################
 
 import sale
-

=== modified file 'l10n_it_sale/sale/sale.py'
--- l10n_it_sale/sale/sale.py	2013-03-14 11:11:29 +0000
+++ l10n_it_sale/sale/sale.py	2014-05-22 13:05:57 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    Copyright (C) 2010 Associazione OpenERP Italia
 #    (<http://www.openerp-italia.org>).
 #
@@ -19,41 +19,47 @@
 #
 ##############################################################################
 
-import time
 from openerp.osv import orm, fields
 
+
 class sale_order(orm.Model):
     _inherit = "sale.order"
-    _columns =  {
+    _columns = {
         'validity': fields.date('Validity'),
     }
 
     def _make_invoice(self, cr, uid, order, lines, context={}):
-        inv_id = super(sale_order, self)._make_invoice(cr, uid, order, lines, context)
-        partner = self.pool.get('res.partner').browse(cr , uid, order.partner_id.id)
-        self.pool.get('account.invoice').write(cr, uid, inv_id, {
-#            'order_id': order.id,
-            'carriage_condition_id': partner.carriage_condition_id.id,
-            'goods_description_id': partner.goods_description_id.id,
-            'transportation_reason_id': partner.transportation_reason_id.id,
-            })
+        inv_id = super(sale_order, self)._make_invoice(
+            cr, uid, order, lines, context)
+        partner = self.pool.get('res.partner').browse(
+            cr, uid, order.partner_id.id)
+        self.pool.get('account.invoice').write(
+            cr, uid, inv_id, {
+                'carriage_condition_id':
+                partner.carriage_condition_id.id,
+                'goods_description_id':
+                partner.goods_description_id.id,
+                'transportation_reason_id':
+                partner.transportation_reason_id.id,
+                })
         return inv_id
 
     def action_ship_create(self, cr, uid, ids, *args):
         super(sale_order, self).action_ship_create(cr, uid, ids, *args)
         for order in self.browse(cr, uid, ids, context={}):
-            partner = self.pool.get('res.partner').browse(cr , uid, order.partner_id.id)
+            partner = self.pool.get('res.partner').browse(
+                cr, uid, order.partner_id.id)
             picking_obj = self.pool.get('stock.picking')
-            picking_ids = picking_obj.search(cr, uid, [('sale_id', '=', order.id)])
+            picking_ids = picking_obj.search(
+                cr, uid, [('sale_id', '=', order.id)])
             for picking_id in picking_ids:
-                picking_obj.write(cr, uid, picking_id, {
-#                    'order_id': order.id,
-                    'carriage_condition_id': partner.carriage_condition_id.id,
-                    'goods_description_id': partner.goods_description_id.id,
-                    'transportation_reason_id': partner.transportation_reason_id.id,
+                picking_obj.write(
+                    cr, uid, picking_id, {
+                        'carriage_condition_id':
+                        partner.carriage_condition_id.id,
+                        'goods_description_id':
+                        partner.goods_description_id.id,
+                        'transportation_reason_id':
+                        partner.transportation_reason_id.id,
                     })
         return True
-  
-sale_order()
-
-

=== modified file 'l10n_it_sale/stock/__init__.py'
--- l10n_it_sale/stock/__init__.py	2013-03-13 08:21:42 +0000
+++ l10n_it_sale/stock/__init__.py	2014-05-22 13:05:57 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    Copyright (C) 2010 Associazione OpenERP Italia
 #    (<http://www.openerp-italia.org>).
 #
@@ -20,5 +20,3 @@
 ##############################################################################
 
 import picking
-
-

=== modified file 'l10n_it_sale/stock/picking.py'
--- l10n_it_sale/stock/picking.py	2014-01-23 12:58:16 +0000
+++ l10n_it_sale/stock/picking.py	2014-05-22 13:05:57 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    Copyright (C) 2010-2012 Associazione OpenERP Italia
 #    (<http://www.openerp-italia.org>).
 #
@@ -20,10 +20,12 @@
 ##############################################################################
 
 import netsvc
-import pooler, tools
+import pooler
+import tools
 
 from openerp.osv import orm, fields
 
+
 class stock_picking_carriage_condition(orm.Model):
     """
     Carriage condition
@@ -31,10 +33,12 @@
     _name = "stock.picking.carriage_condition"
     _description = "Carriage Condition"
     _columns = {
-        'name':fields.char('Carriage Condition', size=64, required=True, readonly=False),
+        'name': fields.char(
+            'Carriage Condition', size=64, required=True, readonly=False),
         'note': fields.text('Note'),
     }
 
+
 class stock_picking_goods_description(orm.Model):
     """
     Description of Goods
@@ -43,9 +47,10 @@
     _description = "Description of Goods"
 
     _columns = {
-        'name':fields.char('Description of Goods', size=64, required=True, readonly=False),
-        'note': fields.text('Note'),
-    }
+        'name': fields.char(
+            'Description of Goods', size=64, required=True, readonly=False),
+        'note': fields.text('Note')}
+
 
 class stock_picking_reason(orm.Model):
     """
@@ -55,51 +60,71 @@
     _description = 'Reason for transportation'
 
     _columns = {
-        'name':fields.char('Reason For Transportation', size=64, required=True, readonly=False),
+        'name': fields.char(
+            'Reason For Transportation', size=64, required=True,
+            readonly=False),
         'note': fields.text('Note'),
     }
 
+
 class stock_picking_out(orm.Model):
     _inherit = "stock.picking.out"
-    _columns =  {
-        'carriage_condition_id': fields.many2one('stock.picking.carriage_condition', 'Carriage condition'),
-        'goods_description_id': fields.many2one('stock.picking.goods_description', 'Description of goods'),
-        'transportation_reason_id': fields.many2one('stock.picking.transportation_reason', 'Reason for transportation'),
-        'ddt_number':  fields.char('DDT', size=64),
-        'ddt_date':  fields.date('DDT date'),
+    _columns = {
+        'carriage_condition_id': fields.many2one(
+            'stock.picking.carriage_condition', 'Carriage condition'),
+        'goods_description_id': fields.many2one(
+            'stock.picking.goods_description', 'Description of goods'),
+        'transportation_reason_id': fields.many2one(
+            'stock.picking.transportation_reason',
+            'Reason for transportation'),
+        'ddt_number': fields.char('DDT', size=64),
+        'ddt_date': fields.date('DDT date'),
     }
 
-    def action_invoice_create(self, cursor, user, ids, journal_id=False,
-            group=False, type='out_invoice', context=None):
-        res = super(stock_picking_out, self).action_invoice_create(cursor, user, ids, journal_id,
-            group, type, context)
+    def action_invoice_create(
+            self, cursor, user, ids, journal_id=False, group=False,
+            type='out_invoice', context=None):
+        res = super(stock_picking_out, self).action_invoice_create(
+            cursor, user, ids, journal_id, group, type, context)
         for picking in self.browse(cursor, user, ids, context=context):
-            self.pool.get('account.invoice').write(cursor, user, res[picking.id], {
-                'carriage_condition_id': picking.carriage_condition_id.id,
-                'goods_description_id': picking.goods_description_id.id,
-                'transportation_reason_id': picking.transportation_reason_id.id,
+            self.pool.get('account.invoice').write(
+                cursor, user, res[picking.id], {
+                    'carriage_condition_id':
+                    picking.carriage_condition_id.id,
+                    'goods_description_id':
+                    picking.goods_description_id.id,
+                    'transportation_reason_id':
+                    picking.transportation_reason_id.id,
                 })
         return res
 
-    #-----------------------------------------------------------------------------
+    # -------------------------------------------------------------------------
     # EVITARE LA COPIA DI 'NUMERO DDT'
-    #-----------------------------------------------------------------------------
+    # -------------------------------------------------------------------------
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
         default.update({'ddt_number': ''})
-        return super(stock_picking_out, self).copy(cr, uid, id, default, context=context)
+        return super(stock_picking_out, self).copy(
+            cr, uid, id, default, context=context)
 
-# Redefinition of the new fields in order to update the model stock.picking in the orm
-# FIXME: this is a temporary workaround because of a framework bug (ref: lp996816).
+# Redefinition of the new fields in order to update the model stock.picking in
+# the orm
+# FIXME: this is a temporary workaround because of a framework bug: lp996816
 # It should be removed as soon as
 # the bug is fixed
+
+
 class stock_picking(orm.Model):
     _inherit = 'stock.picking'
-    _columns =  {
-        'carriage_condition_id': fields.many2one('stock.picking.carriage_condition', 'Carriage condition'),
-        'goods_description_id': fields.many2one('stock.picking.goods_description', 'Description of goods'),
-        'transportation_reason_id': fields.many2one('stock.picking.transportation_reason', 'Reason for transportation'),
-        'ddt_number':  fields.char('DDT', size=64),
-        'ddt_date':  fields.date('DDT date'),
+    _columns = {
+        'carriage_condition_id': fields.many2one(
+            'stock.picking.carriage_condition', 'Carriage condition'),
+        'goods_description_id': fields.many2one(
+            'stock.picking.goods_description', 'Description of goods'),
+        'transportation_reason_id': fields.many2one(
+            'stock.picking.transportation_reason',
+            'Reason for transportation'),
+        'ddt_number': fields.char('DDT', size=64),
+        'ddt_date': fields.date('DDT date'),
     }

=== modified file 'l10n_it_sale/wizard/__init__.py'
--- l10n_it_sale/wizard/__init__.py	2013-03-13 08:21:42 +0000
+++ l10n_it_sale/wizard/__init__.py	2014-05-22 13:05:57 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    Copyright (C) 2010 Associazione OpenERP Italia
 #    (<http://www.openerp-italia.org>).
 #

=== modified file 'l10n_it_sale/wizard/assign_ddt.py'
--- l10n_it_sale/wizard/assign_ddt.py	2013-06-16 12:53:29 +0000
+++ l10n_it_sale/wizard/assign_ddt.py	2014-05-22 13:05:57 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    Copyright (C) 2010 Associazione OpenERP Italia
 #    (<http://www.openerp-italia.org>).
 #
@@ -19,23 +19,25 @@
 #
 ##############################################################################
 
-from openerp.osv import orm, fields
+from openerp.osv import orm
 from tools.translate import _
 import time
 
+
 class wizard_assign_ddt(orm.TransientModel):
 
     _name = "wizard.assign.ddt"
 
     def assign_ddt(self, cr, uid, ids, context=None):
         picking_obj = self.pool.get('stock.picking.out')
-        for picking in picking_obj.browse(cr, uid, context.get('active_ids', []), context=context):
+        for picking in picking_obj.browse(
+                cr, uid, context.get('active_ids', []), context=context):
             if picking.ddt_number:
                 raise orm.except_orm('Error', _('DTT number already assigned'))
             picking.write({
-                'ddt_number': self.pool.get('ir.sequence').get(cr, uid, 'stock.ddt'),
-                'ddt_date': time.strftime('%Y-%m-%d'),
-                })
+                'ddt_number': self.pool.get('ir.sequence').get(
+                    cr, uid, 'stock.ddt'),
+                'ddt_date': time.strftime('%Y-%m-%d')})
         return {
             'type': 'ir.actions.act_window_close',
         }