Permalink
Browse files

[MERGE] forward port branch saas-15 up to 93c2255

  • Loading branch information...
KangOl committed Oct 11, 2018
2 parents 3c4f853 + 93c2255 commit 717f4583949219c346c87c390fbc336b4f31571c
@@ -346,8 +346,8 @@ def write(self, vals):
res = super(MaintenanceRequest, self).write(vals)
if vals.get('owner_user_id') or vals.get('technician_user_id'):
self._add_followers()
if self.stage_id.done and 'stage_id' in vals:
self.write({'close_date': fields.Date.today()})
if 'stage_id' in vals:
self.filtered(lambda m: m.stage_id.done).write({'close_date': fields.Date.today()})
return res
def _add_followers(self):
@@ -95,7 +95,6 @@ td {
}
.btn.btn-primary {
-webkit-user-select: none;
color: @o_mm_def_btn_text;
border: none;
text-decoration: none;
@@ -813,6 +813,7 @@ registry.colorpicker = SnippetOption.extend({
*/
_onColorResetButtonClick: function () {
this.$target.removeClass(this.classes);
self.$target.trigger('content_changed');
this.$el.find('.colorpicker button.selected').removeClass('selected');
},
});
@@ -1143,6 +1143,9 @@ body.editor_enable {
left: 0;
}
}
.btn {
-webkit-user-select: initial;
}
}
#web_editor_inside_iframe {
@@ -457,7 +457,7 @@
<field name="name">Ecuador</field>
<field name="code">ec</field>
<field file="base/static/img/country_flags/ec.png" name="image" type="base64" />
<field name="currency_id" ref="ECS" />
<field name="currency_id" ref="USD" />
<field eval="593" name="phone_code" />
</record>
<record id="ee" model="res.country">
View
@@ -467,6 +467,8 @@ def die(cond, msg):
os.path.abspath(os.path.expanduser(os.path.expandvars(x.strip())))
for x in self.options['addons_path'].split(','))
self.options['data_dir'] = os.path.abspath(os.path.expanduser(os.path.expandvars(self.options['data_dir'].strip())))
self.options['init'] = opt.init and dict.fromkeys(opt.init.split(','), 1) or {}
self.options['demo'] = (dict(self.options['init'])
if not self.options['without_demo'] else {})

0 comments on commit 717f458

Please sign in to comment.