Merge lp:~elbati/openobject-italia/7.0_fix_1190189_elbati into lp:~openobject-italia-core-devs/openobject-italia/italian-addons-7.0

[Lorenzo Battistini]

[lp:~elbati/openobject-italia/7.0_fix_1190189_elbati]

222. By Lorenzo Battistini on 2013-06-16

[fix] indentation

[Alex Comba - Agile BG (tafaru)]

review: Approve

=== modified file 'l10n_it_sale/account/invoice_view.xml'
--- l10n_it_sale/account/invoice_view.xml	2013-03-13 08:21:42 +0000
+++ l10n_it_sale/account/invoice_view.xml	2013-06-16 13:02:24 +0000
@@ -5,8 +5,6 @@
 			<field name="name">invoice.form.contractual.conditions</field>
 			<field name="model">account.invoice</field>
 			<field name="inherit_id" ref="account.invoice_form"/>
-			<field name="type">form</field>
-
 			<field name="arch" type="xml">
 				<page string="Payments" position="after">
 					<page string="Shipping">

=== modified file 'l10n_it_sale/partner/partner_view.xml'
--- l10n_it_sale/partner/partner_view.xml	2013-03-13 08:21:42 +0000
+++ l10n_it_sale/partner/partner_view.xml	2013-06-16 13:02:24 +0000
@@ -5,7 +5,6 @@
 			<field name="name">partner.form.shipping.conditions</field>
 			<field name="model">res.partner</field>
 			<field name="inherit_id" ref="base.view_partner_form"/>
-			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<page string="Sales &amp; Purchases" position="inside">
 					<group colspan="2" col="2" groups="base.group_sale_salesman">

=== modified file 'l10n_it_sale/stock/picking.py'
--- l10n_it_sale/stock/picking.py	2013-05-02 06:30:33 +0000
+++ l10n_it_sale/stock/picking.py	2013-06-16 13:02:24 +0000
@@ -31,8 +31,8 @@
     _name = "stock.picking.carriage_condition"
     _description = "Carriage Condition"
     _columns = {
-	'name':fields.char('Carriage Condition', size=64, required=True, readonly=False),
-	'note': fields.text('Note'),
+        'name':fields.char('Carriage Condition', size=64, required=True, readonly=False),
+        'note': fields.text('Note'),
     }
 
 class stock_picking_goods_description(orm.Model):
@@ -43,8 +43,8 @@
     _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,8 +55,8 @@
     _description = 'Reason for transportation'
 
     _columns = {
-	'name':fields.char('Reason For Transportation', size=64, required=True, readonly=False),
-	'note': fields.text('Note'),
+        'name':fields.char('Reason For Transportation', size=64, required=True, readonly=False),
+        'note': fields.text('Note'),
     }
 
 class stock_picking(orm.Model):
@@ -69,17 +69,6 @@
         'ddt_date':  fields.date('DDT date'),
     }
 
-    def create(self, cr, user, vals, context=None):
-        if ('name' not in vals) or (vals.get('name')=='/'):
-	    if 'type' in vals.keys() and vals['type']=='out':
-            	vals['name'] = self.pool.get('ir.sequence').get(cr, user, 'stock.picking.out')
-	    elif 'type' in vals.keys() and vals['type']=='internal':
-            	vals['name'] = self.pool.get('ir.sequence').get(cr, user, 'stock.picking.internal')
-	    else:
-		vals['name'] = self.pool.get('ir.sequence').get(cr, user, 'stock.picking.in')		
-
-        return super(stock_picking, self).create(cr, user, vals, context)
-
     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,

=== modified file 'l10n_it_sale/wizard/assign_ddt.py'
--- l10n_it_sale/wizard/assign_ddt.py	2013-03-14 11:11:29 +0000
+++ l10n_it_sale/wizard/assign_ddt.py	2013-06-16 13:02:24 +0000
@@ -31,7 +31,7 @@
         picking_obj = self.pool.get('stock.picking.out')
         for picking in picking_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             if picking.ddt_number:
-                raise osv.except_osv('Error', _('DTT number already assigned'))
+                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'),
@@ -39,7 +39,3 @@
         return {
             'type': 'ir.actions.act_window_close',
         }
-
-wizard_assign_ddt()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: