[MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8781 rev-id: dle@openerp...

bzr revid: dle@openerp.com-20130923171310-mav1riq3d2rebmv2

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

diff --cc addons/account/account_invoice_view.xml
Simple merge

diff --cc addons/mrp/__openerp__.py
index 5f5ded3,2e8aedf..99afd01
--- 1/addons/mrp/__openerp__.py
--- 2/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@@ -77,7 -77,7 +77,8 @@@ Dashboard / Reports for MRP will includ
      #TODO: This yml tests are needed to be completely reviewed again because the product wood panel is removed in product demo as it does not suit for new demo context of computer and consultant company
      # so the ymls are too complex to change at this stage
      'test': [
+          'test/bom_with_service_type_product.yml',
 +         'test/mrp_users.yml',
           'test/order_demo.yml',
           'test/order_process.yml',
           'test/cancel_order.yml',

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

diff --cc addons/mrp_operations/mrp_operations_view.xml
Simple merge

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

diff --cc addons/project/project_view.xml
index 6c00902,f10277a..4d025d1
--- 1/addons/project/project_view.xml
--- 2/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@@ -127,8 -126,8 +127,8 @@@
                      </group>
                      <notebook>
                          <page string="Team" name="team">
 -                            <field colspan="4" name="members" widget="many2many_kanban">
 +                            <field colspan="4" name="members" widget="many2many_kanban" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'group_project_user']}">
-                                 <kanban quick_create="false" create="true">
+                                 <kanban quick_create="false" create="true" delete="true">
                                      <field name="name"/>
                                      <templates>
                                          <t t-name="kanban-box">

diff --cc addons/project_mrp/process/project_mrp_process.xml
index db733d2,5991571..b147740
--- 1/addons/project_mrp/process/project_mrp_process.xml
--- 2/addons/project_mrp/process/project_mrp_process.xml
+++ b/addons/project_mrp/process/project_mrp_process.xml
@@@ -50,8 -67,8 +67,8 @@@
              <field eval="[(6,0,[])]" name="transition_ids"/>
              <field eval="&quot;&quot;&quot;Procurement Task&quot;&quot;&quot;" name="name"/>
              <field eval="&quot;&quot;&quot;if product type is 'service' then it creates the task.&quot;&quot;&quot;" name="note"/>
 -            <field model="process.node" name="target_node_id" ref="process_node_procuretasktask0"/>
 -            <field model="process.node" name="source_node_id" ref="sale_stock.process_node_saleprocurement0"/>
 +            <field name="target_node_id" ref="process_node_procuretasktask0"/>
-             <field name="source_node_id" ref="mrp.process_node_productionorder0"/>
++            <field name="source_node_id" ref="sale_stock.process_node_saleprocurement0"/>
          </record>
  
          <record id="process_transition_createtask0" model="process.transition">

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

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

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

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

diff --cc addons/stock/stock_view.xml
index 6bfc4c6,236c869..c48a7cf
--- 1/addons/stock/stock_view.xml
--- 2/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@@ -759,10 -759,10 +759,10 @@@
                  <header>
                      <button name="draft_force_assign" states="draft" string="Confirm" type="object" class="oe_highlight" groups="base.group_user"/>
                      <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object" class="oe_highlight" groups="base.group_user"/>
-                     <!-- <button name="action_assign" states="confirmed" string="Check Availability" type="object"/> -->
+                     <button name="action_assign" states="confirmed" string="Check Availability" type="object" class="oe_highlight"/>
                      <button name="force_assign" states="confirmed" string="Force Availability" type="object" class="oe_highlight" groups="base.group_user"/>
                      <button name="action_process" states="assigned" string="Confirm &amp; Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight"/>
 -                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice/Refund"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" class="oe_highlight" groups="base.group_user"/>
 +                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice/Refund"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}" context="{'group_field_invisible': True}" type="action" class="oe_highlight" groups="base.group_user"/>
                      <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" groups="base.group_user"/>
                      <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel Transfer" groups="base.group_user"/>
                      <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>