[MERGE]Merge with Parent

bzr revid: pza@tinyerp.com-20140115123052-n9pfmaoh5jzev28d

diff --cc addons/email_template/wizard/mail_compose_message.py
Simple merge

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

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

diff --cc addons/website/views/snippets.xml
Simple merge

diff --cc addons/website_sale/security/website_sale.xml
index b58a2d3,0481c27..5f623a7
--- 1/addons/website_sale/security/website_sale.xml
--- 2/addons/website_sale/security/website_sale.xml
+++ b/addons/website_sale/security/website_sale.xml
@@@ -33,16 -23,5 +23,5 @@@
          <field name="perm_unlink" eval="False"/>
      </record>
  
-     <record id="product_pricelist_public" model="ir.rule">
-         <field name="name">Public product pricelist</field>
-         <field name="model_id" ref="product.model_product_pricelist"/>
-         <field name="domain_force">[('id','=',session.get('ecommerce_pricelist'))]</field>
-         <field name="groups" eval="[(4, ref('base.group_public')), (4, ref('base.group_portal'))]"/>
-         <field name="perm_read" eval="True"/>
-         <field name="perm_write" eval="False"/>
-         <field name="perm_create" eval="False"/>
-         <field name="perm_unlink" eval="False"/>
-     </record>
-     
  </data>
 -</openerp>
 +</openerp>