[MERGE]: Merge with lp:openobject-addons

bzr revid: rpa@tinyerp.com-20100526050851-lodfvwj5ruw6rbs0
bzr revid: rpa@tinyerp.com-20100526122202-vp53qayvu46vvkve
bzr revid: rpa@tinyerp.com-20100527051402-mrkzkwazlhosynk2

diff --cc addons/crm/__openerp__.py
Simple merge

diff --cc addons/crm/crm_lead_view.xml
Simple merge

diff --cc addons/crm/crm_opportunity_view.xml
Simple merge

diff --cc addons/document/__openerp__.py
Simple merge

diff --cc addons/product/product.py
Simple merge

diff --cc addons/product/product_view.xml
Simple merge

diff --cc addons/sale/sale.py
Simple merge

diff --cc addons/sale/sale_view.xml
index 3b6886c,c3a8708..1d49c10
--- 1/addons/sale/sale_view.xml
--- 2/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@@ -381,14 -380,10 +381,15 @@@
                              <field name="delay" groups="base.group_extended"/>
                              <field name="price_subtotal"/>
                              <field name="th_weight"/>
-                             <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
+                             <separator colspan="4" string="Taxes"/>
+                             <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]" nolabel="1"/>
                              <separator colspan="4" string="States"/>
                              <field name="state"/>
 +                            <button colspan="1"
 +                              name="%(action_view_sale_order_line_make_invoice)d"
 +                              string="Make Invoice"
 +                              type="action"
 +                              icon="gtk-print" />
                              <group col="2" colspan="2">
                                  <button name="button_done"
                                      states="confirmed,exception"

diff --cc addons/stock/stock_view.xml
Simple merge