pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch 10.0 up to f1ee633f26

Browse Source
This commit is contained in:
Christophe Simonis
2018-07-25 15:29:29 +02:00
parent 9ee882564f f1ee633f26
commit ea53be492e
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/views/web_planner_data.xml
+1 -1
View File
@@ -394,7 +394,7 @@
<t t-call="web_planner.page"> <t t-call="web_planner.page">
<t t-set="page_title">Extra Features</t> <t t-set="page_title">Extra Features</t>
<p class="text-muted"> <p class="text-muted">
Odoo Accounting has many free extra-features: Odoo Accounting has many extra-features:
</p> </p>
<div class="row o_planner_row_apps"> <div class="row o_planner_row_apps">
<div class="text-center col-md-4"> <div class="text-center col-md-4">
addons/barcodes/static/src/js/inherited_form_widget_button.js
+1 -1
View File
@@ -16,7 +16,7 @@ var ButtonBarcodeHandlerMixin = _.extend({}, BarcodeHandlerMixin, {
this.on_barcode_scanned = function(barcode) { this.on_barcode_scanned = function(barcode) {
var match = barcode.match(/O-BTN\.(.+)/); var match = barcode.match(/O-BTN\.(.+)/);
if (match && match[1] === self.node.attrs.barcode_trigger && if (match && match[1] === self.node.attrs.barcode_trigger &&
(self.$el.is(':visible') || self.$el.parent('.dropdown-menu').length)) { (self.$el.is(':visible') || self.$el.parents('.dropdown-menu').length)) {
self.on_click(); self.on_click();
} }
}; };
addons/report/static/src/css/reset.min.css
Vendored
+1
View File
@@ -48,6 +48,7 @@ ol {
ul { ul {
list-style: disc; list-style: disc;
padding-left: 40px;
} }
ul ul { ul ul {
addons/website_hr_recruitment/controllers/main.py
+2 -1
View File
@@ -69,7 +69,8 @@ class WebsiteHrRecruitment(http.Controller):
@http.route('/jobs/add', type='http', auth="user", website=True) @http.route('/jobs/add', type='http', auth="user", website=True)
def jobs_add(self, **kwargs): def jobs_add(self, **kwargs):
job = request.env['hr.job'].create({ # avoid branding of website_description by setting rendering_bundle in context
job = request.env['hr.job'].with_context(rendering_bundle=True).create({
'name': _('Job Title'), 'name': _('Job Title'),
}) })
return request.redirect("/jobs/detail/%s?enable_editor=1" % slug(job)) return request.redirect("/jobs/detail/%s?enable_editor=1" % slug(job))