[MERGE] forward port of branch saas-3 up to ada9724

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

diff --cc addons/base_gengo/res_company.py
index 1b083ec,448df8d..35178e3
--- 1/addons/base_gengo/res_company.py
--- 2/addons/base_gengo/res_company.py
+++ b/addons/base_gengo/res_company.py
@@@ -26,11 -26,10 +26,11 @@@ class res_company(osv.Model)
      _name = "res.company"
      _inherit = "res.company"
      _columns = {
-            "gengo_private_key": fields.text("Gengo Private Key"),
-            "gengo_public_key": fields.text("Gengo Public Key"),
-            "gengo_comment": fields.text("Comments", help="This comment will be automatically be enclosed in each an every request sent to Gengo"),
-            "gengo_auto_approve": fields.boolean("Auto Approve Translation ?", help="Jobs are Automatically Approved by Gengo."),
+            "gengo_private_key": fields.text("Gengo Private Key", groups="base.group_system"),
+            "gengo_public_key": fields.text("Gengo Public Key", groups="base.group_user"),
+            "gengo_comment": fields.text("Comments", help="This comment will be automatically be enclosed in each an every request sent to Gengo", groups="base.group_user"),
+            "gengo_auto_approve": fields.boolean("Auto Approve Translation ?", help="Jobs are Automatically Approved by Gengo.", groups="base.group_user"),
 +           "gengo_sandbox": fields.boolean("Sandbox Mode", help="Check this box if you're using the sandbox mode of Gengo, mainly used for testing purpose."),
      }
  
      _defaults = {

diff --cc addons/board/static/src/js/dashboard.js
Simple merge

diff --cc addons/email_template/wizard/mail_compose_message.py
index 7d148c8,a41f690..538a484
--- 1/addons/email_template/wizard/mail_compose_message.py
--- 2/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@@ -57,7 -56,13 +57,7 @@@ class mail_compose_message(osv.Transien
          return res
  
      _columns = {
-         'template_id': fields.many2one('email.template', 'Use template', select=True),
+         'template_id': fields.many2one('email.template', 'Use template', select=True, groups="base.group_user"),
 -        'partner_to': fields.char('To (Partner IDs)',
 -            help="Comma-separated list of recipient partners ids (placeholders may be used here)"),
 -        'email_to': fields.char('To (Emails)',
 -            help="Comma-separated recipient addresses (placeholders may be used here)",),
 -        'email_cc': fields.char('Cc (Emails)',
 -            help="Carbon copy recipients (placeholders may be used here)"),
      }
  
      def send_mail(self, cr, uid, ids, context=None):

diff --cc addons/email_template/wizard/mail_compose_message_view.xml
index 2f755a6,987ec44..99c775a
--- 1/addons/email_template/wizard/mail_compose_message_view.xml
--- 2/addons/email_template/wizard/mail_compose_message_view.xml
+++ b/addons/email_template/wizard/mail_compose_message_view.xml
@@@ -6,7 -6,24 +6,8 @@@
              <field name="name">mail.compose.message.form</field>
              <field name="model">mail.compose.message</field>
              <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
+             <field name="groups_id" eval="[(4,ref('base.group_user'))]"/>
              <field name="arch" type="xml">
 -                <xpath expr="//field[@name='subject']" position="after">
 -                    <label string="Template Recipients" for="partner_to"
 -                            groups="base.group_no_one"
 -                            attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
 -                    <div groups="base.group_no_one" name="template_recipients"
 -                            attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}">
 -                        <group class="oe_grey">
 -                            <!-- <label string="Partners" for="partner_to"/> -->
 -                            <field name="partner_to" readonly="1"/>
 -                            <!-- <label string="Email To" for="email_to"/> -->
 -                            <field name="email_to" readonly="1"/>
 -                            <!-- <label string="Email CC" for="email_cc"/> -->
 -                            <field name="email_cc" readonly="1"/>
 -                        </group>
 -                    </div>
 -                </xpath>
                  <xpath expr="//footer" position="inside">
                      <group class="oe_right oe_form" col="1">
                          <div>Use template

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

diff --cc addons/mail/mail_alias.py
Simple merge

diff --cc addons/point_of_sale/point_of_sale.py
index 7ba4bb9,1e19821..267f79e
--- 1/addons/point_of_sale/point_of_sale.py
--- 2/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@@ -814,9 -788,20 +814,9 @@@ class pos_order(osv.osv)
              'amount': data['amount'],
              'date': data.get('payment_date', time.strftime('%Y-%m-%d')),
              'name': order.name + ': ' + (data.get('payment_name', '') or ''),
-             'partner_id': order.partner_id and order.partner_id.id or None,
+             'partner_id': order.partner_id and self.pool.get("res.partner")._find_accounting_partner(order.partner_id).id or False,
          }
  
 -        account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
 -        args['account_id'] = (order.partner_id and order.partner_id.property_account_receivable \
 -                             and order.partner_id.property_account_receivable.id) or (account_def and account_def.id) or False
 -
 -        if not args['account_id']:
 -            if not args['partner_id']:
 -                msg = _('There is no receivable account defined to make payment.')
 -            else:
 -                msg = _('There is no receivable account defined to make payment for the partner: "%s" (id:%d).') % (order.partner_id.name, order.partner_id.id,)
 -            raise osv.except_osv(_('Configuration Error!'), msg)
 -
          context.pop('pos_session_id', False)
  
          journal_id = data.get('journal', False)

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

diff --cc addons/web/static/src/js/chrome.js
Simple merge

diff --cc openerp/addons/base/security/ir.model.access.csv
Simple merge

diff --cc openerp/report/report_sxw.py
Simple merge