← Back to team overview

openobject-italia-core-devs team mailing list archive

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

 

Davide Corio @ LS has proposed merging lp:~enlightx/openobject-italia/7.0-fix-1271907 into lp:openobject-italia/7.0.

Requested reviews:
  OpenERP Italia core devs (openobject-italia-core-devs)
Related bugs:
  Bug #1271907 in OpenERP Italia: "Impossibile duplicare stock.picking"
  https://bugs.launchpad.net/openobject-italia/+bug/1271907

For more details, see:
https://code.launchpad.net/~enlightx/openobject-italia/7.0-fix-1271907/+merge/202846
-- 
https://code.launchpad.net/~enlightx/openobject-italia/7.0-fix-1271907/+merge/202846
Your team OpenERP Italia core devs is requested to review the proposed merge of lp:~enlightx/openobject-italia/7.0-fix-1271907 into lp:openobject-italia/7.0.
=== 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:29:46 +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], {
@@ -86,7 +86,7 @@
     #-----------------------------------------------------------------------------
     def copy(self, cr, uid, id, default={}, context=None):
         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)
 
 # 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).


Follow ups