Merge lp:~enlightx-deactivatedaccount/openobject-italia/7.0-fix-1271907 into lp:~openobject-italia-core-devs/openobject-italia/italian-addons-7.0

[Davide Corio]

[lp:~enlightx-deactivatedaccount/openobject-italia/7.0-fix-1271907]

233. By Davide Corio on 2014-01-23

[FIX] manage empty defaults

234. By Davide Corio on 2014-01-23

[DEL] (probably) not useful statement

235. By Davide Corio on 2014-01-23

[FIX] default=None

[Lorenzo Battistini (elbati)]

review: Approve (code review)

=== modified file 'l10n_it_sale/stock/picking.py'
--- l10n_it_sale/stock/picking.py	2013-06-16 13:00:19 +0000
+++ l10n_it_sale/stock/picking.py	2014-01-23 12:59:18 +0000
@@ -59,7 +59,7 @@
         'note': fields.text('Note'),
     }
 
-class stock_picking(orm.Model):
+class stock_picking_out(orm.Model):
     _inherit = "stock.picking.out"
     _columns =  {
         'carriage_condition_id': fields.many2one('stock.picking.carriage_condition', 'Carriage condition'),
@@ -71,7 +71,7 @@
 
     def action_invoice_create(self, cursor, user, ids, journal_id=False,
             group=False, type='out_invoice', context=None):
-        res = super(stock_picking, self).action_invoice_create(cursor, user, ids, journal_id,
+        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], {
@@ -84,9 +84,11 @@
     #-----------------------------------------------------------------------------
     # EVITARE LA COPIA DI 'NUMERO DDT'
     #-----------------------------------------------------------------------------
-    def copy(self, cr, uid, id, default={}, context=None):
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
         default.update({'ddt_number': ''})
-        return super(stock_picking, self).copy(cr, uid, id, default, 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).