[Openerp-dev-gtk] [Merge] lp:~openerp-dev/openobject-addons/trunk-crm_sale_feature-rmu-sale_crm_usablity-rma into lp:~openerp-dev/openobject-addons/trunk-crm_sale_feature-rmu

[Randhir Mayatra (OpenERP)]

Randhir Mayatra (OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-crm_sale_feature-rmu-sale_crm_usablity-rma
 into lp:~openerp-dev/openobject-addons/trunk-crm_sale_feature-rmu.

Requested reviews:
  OpenERP R&D Team (openerp-dev)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-crm_sale_feature-rmu-sale_crm_usablity-rma/+merge/143872

Hello,
I have make changes as per suggestion on pad.

Thank you.
-Randhir
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-crm_sale_feature-rmu-sale_crm_usablity-rma/+merge/143872
Your team OpenERP R&D Team is requested to review the proposed merge of 
lp:~openerp-dev/openobject-addons/trunk-crm_sale_feature-rmu-sale_crm_usablity-rma
 into lp:~openerp-dev/openobject-addons/trunk-crm_sale_feature-rmu.

=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py	2013-01-15 10:03:53 +0000
+++ crm/crm_lead.py	2013-01-18 12:47:24 +0000
@@ -872,7 +872,7 @@
             'res_id': int(opportunity_id),
             'view_id': False,
             'views': [(form_view or False, 'form'),
-                      (tree_view or False, 'tree'),
+                      (tree_view or False, 'tree'),(False, 'kanban'),
                       (False, 'calendar'), (False, 'graph')],
             'type': 'ir.actions.act_window',
         }

=== modified file 'event_sale/event_sale_view.xml'
--- event_sale/event_sale_view.xml	2012-12-08 10:33:38 +0000
+++ event_sale/event_sale_view.xml	2013-01-18 12:47:24 +0000
@@ -6,7 +6,7 @@
              <field name="model">product.product</field>
              <field name="inherit_id" ref="product.product_normal_form_view" />
              <field name="arch" type="xml">
-                <div name="options" position="inside">
+                <div name="options" position="after">
                     <field name="event_ok" on_change="onchange_event_ok(event_ok, context)"/>
                     <label for="event_ok"/>
                 </div>

=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml	2013-01-04 09:39:53 +0000
+++ sale/sale_view.xml	2013-01-18 12:47:24 +0000
@@ -234,8 +234,8 @@
                                         groups="product.group_uom" options='{"no_open": True}'/>
                                     <field name="product_uos_qty" groups="product.group_uos" invisible="1"/>
                                     <field name="product_uos" string="UoS" groups="product.group_uos" invisible="1"/>
+                                    <field name="price_unit"/>
                                     <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
-                                    <field name="price_unit"/>
                                     <field name="discount" groups="sale.group_discount_per_so_line"/>
                                     <field name="price_subtotal"/>
                                 </tree>


_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp