Amit Patel (OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-addons13-general-apa into 
lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons13-general-apa/+merge/128673
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons13-general-apa/+merge/128673
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-addons13-general-apa.
=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py	2012-10-02 20:40:23 +0000
+++ crm/crm_lead.py	2012-10-09 10:09:33 +0000
@@ -776,7 +776,6 @@
             'default_user_id': uid,
             'default_section_id': opportunity.section_id and opportunity.section_id.id or False,
             'default_email_from': opportunity.email_from,
-            'default_state': 'open',
             'default_name': opportunity.name,
         }
         return res

=== modified file 'sale/sale.py'
--- sale/sale.py	2012-10-08 12:17:45 +0000
+++ sale/sale.py	2012-10-09 10:09:33 +0000
@@ -704,7 +704,7 @@
     _description = 'Sales Order Line'
     _columns = {
         'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'name': fields.text('Product Description', size=256, required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'name': fields.text('Description', size=256, required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sales order lines."),
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
         'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),

_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp

Reply via email to