[MERGE] with trunk

bzr revid: fka@tinyerp.com-20130617055011-jmp9p71kaqnaigsw

diff --cc addons/crm_claim/crm_claim_view.xml
Simple merge

diff --cc addons/point_of_sale/point_of_sale_view.xml
index 5b23e94,dbd5e73..4bd1a6a
--- 1/addons/point_of_sale/point_of_sale_view.xml
--- 2/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@@ -84,8 -84,8 +84,8 @@@
                          <page string="Extra Info">
                              <group string="General Information">
                                  <field name="company_id" groups="base.group_multi_company"/>
-                                 <field name="shop_id" widget="selection"/>
+                                 <field name="warehouse_id" widget="selection" groups="stock.group_locations"/>
 -                                <field name="user_id"/>
 +                                <field name="user_id" context="{'default_groups_ref': ['point_of_sale.group_pos_user']}"/>
                                  <field name="pricelist_id" groups="product.group_sale_pricelist" domain="[('type','=','sale')]"/>
                                  <field name="picking_id" readonly="1"/>
                                  <field name="pos_reference"/>

diff --cc addons/project/project_view.xml
Simple merge

diff --cc addons/project_issue/project_issue_view.xml
Simple merge

diff --cc addons/sale/sale_view.xml
Simple merge