[MERGE] forward port branch saas-14 up to cdb0c08cb9

addons/account/models/company.py

@@ -115,7 +115,11 @@ Best Regards,'''))
         last_month = self.fiscalyear_last_month
         last_day = self.fiscalyear_last_day
         if (date.month < last_month or (date.month == last_month and date.day <= last_day)):
-            date = date.replace(month=last_month, day=last_day)
+            # FORWARD-PORT UP TO v11
+            if last_month == 2 and last_day == 29 and date.year % 4 != 0:
+                date = date.replace(month=last_month, day=28)
+            else:
+                date = date.replace(month=last_month, day=last_day)
         else:
             if last_month == 2 and last_day == 29 and (date.year + 1) % 4 != 0:
                 date = date.replace(month=last_month, day=28, year=date.year + 1)

addons/hr_holidays/views/hr_holidays_views.xml

@@ -224,7 +224,7 @@
             <field name="name">hr.holidays.tree</field>
             <field name="model">hr.holidays</field>
             <field name="arch" type="xml">
-                <tree decoration-danger="state == 'refuse'" decoration-info="state == ' draft'" string="Leave Requests"
+                <tree decoration-danger="state == 'refuse'" decoration-info="state == 'draft'" string="Leave Requests"
                        decoration-bf="message_needaction == True">
                     <field name="employee_id"/>
                     <field name="holiday_type" string="Mode" groups="base.group_no_one"/>

addons/purchase/models/purchase.py

@@ -299,6 +299,7 @@ class PurchaseOrder(models.Model):
             'default_use_template': bool(template_id),
             'default_template_id': template_id,
             'default_composition_mode': 'comment',
+            'purchase_mark_rfq_sent': True,
             'custom_layout': "purchase.mail_template_data_notification_email_purchase_order"
         })
         return {
@@ -1182,7 +1183,7 @@ class MailComposeMessage(models.TransientModel):
 
     @api.multi
     def mail_purchase_order_on_send(self):
-        if not self.filtered('subtype_id.internal'):
+        if self._context.get('purchase_mark_rfq_sent'):
             order = self.env['purchase.order'].browse(self._context['default_res_id'])
             if order.state == 'draft':
                 order.state = 'sent'