-
+
Update exchange rates automatically
@@ -190,7 +190,7 @@
-
+
Use follow-up levels and schedule actions
@@ -256,7 +256,7 @@
-
+
diff --git a/addons/pos_restaurant/static/src/xml/printbill.xml b/addons/pos_restaurant/static/src/xml/printbill.xml
index 2771409e5e1..0c3f5ae7530 100644
--- a/addons/pos_restaurant/static/src/xml/printbill.xml
+++ b/addons/pos_restaurant/static/src/xml/printbill.xml
@@ -54,7 +54,7 @@
-
- WH
diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py
index 3dbea80703b..1bf167d5731 100644
--- a/addons/stock/models/stock_move.py
+++ b/addons/stock/models/stock_move.py
@@ -1068,18 +1068,8 @@ class StockMove(models.Model):
return moves_todo
if picking:
- moves_to_backorder = picking.move_lines.filtered(lambda x: x.state not in ('done', 'cancel'))
- if moves_to_backorder:
- backorder_picking = picking.copy({
- 'name': '/',
- 'move_lines': [],
- 'move_line_ids': [],
- 'backorder_id': picking.id
- })
- picking.message_post(body=_('The backorder %s has been created.') % (backorder_picking.id, backorder_picking.name))
- moves_to_backorder.write({'picking_id': backorder_picking.id})
- moves_to_backorder.mapped('move_line_ids').write({'picking_id': backorder_picking.id})
- moves_to_backorder._action_assign()
+ picking._create_backorder()
+
return moves_todo
def unlink(self):
diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index 1147c9e6a96..f09d9ca1160 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -378,9 +378,9 @@ class Picking(models.Model):
@api.depends('move_lines.date_expected')
def _compute_scheduled_date(self):
if self.move_type == 'direct':
- self.scheduled_date = min(self.move_lines.mapped('date_expected') or [False])
+ self.scheduled_date = min(self.move_lines.mapped('date_expected') or [fields.Datetime.now()])
else:
- self.scheduled_date = max(self.move_lines.mapped('date_expected') or [False])
+ self.scheduled_date = max(self.move_lines.mapped('date_expected') or [fields.Datetime.now()])
@api.one
def _set_scheduled_date(self):
@@ -813,31 +813,25 @@ class Picking(models.Model):
@api.multi
def _create_backorder(self, backorder_moves=[]):
- """ Move all non-done lines into a new backorder picking. If the key 'do_only_split' is given in the context, then move all lines not in context.get('split', []) instead of all non-done lines.
+ """ Move all non-done lines into a new backorder picking.
"""
- # TDE note: o2o conversion, todo multi
backorders = self.env['stock.picking']
for picking in self:
- backorder_moves = backorder_moves or picking.move_lines
- if self._context.get('do_only_split'):
- not_done_bo_moves = backorder_moves.filtered(lambda move: move.id not in self._context.get('split', []))
- else:
- not_done_bo_moves = backorder_moves.filtered(lambda move: move.state not in ('done', 'cancel'))
- if not not_done_bo_moves:
- continue
- backorder_picking = picking.copy({
- 'name': '/',
- 'move_lines': [],
- 'move_line_ids': [],
- 'backorder_id': picking.id
- })
- picking.message_post(body=_("Back order %s created.") % (backorder_picking.name))
- not_done_bo_moves.write({'picking_id': backorder_picking.id})
- if not picking.date_done:
- picking.write({'date_done': time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)})
- backorder_picking.action_confirm()
- backorder_picking.action_assign()
- backorders |= backorder_picking
+ moves_to_backorder = picking.move_lines.filtered(lambda x: x.state not in ('done', 'cancel'))
+ if moves_to_backorder:
+ backorder_picking = picking.copy({
+ 'name': '/',
+ 'move_lines': [],
+ 'move_line_ids': [],
+ 'backorder_id': picking.id
+ })
+ picking.message_post(
+ body=_('The backorder %s has been created.') % (
+ backorder_picking.id, backorder_picking.name))
+ moves_to_backorder.write({'picking_id': backorder_picking.id})
+ moves_to_backorder.mapped('move_line_ids').write({'picking_id': backorder_picking.id})
+ backorder_picking.action_assign()
+ backorders |= backorder_picking
return backorders
def _log_activity_get_documents(self, orig_obj_changes, stream_field, stream, sorted_method=False, groupby_method=False):
diff --git a/addons/stock/models/stock_warehouse.py b/addons/stock/models/stock_warehouse.py
index 73368db6ad4..5711400941e 100644
--- a/addons/stock/models/stock_warehouse.py
+++ b/addons/stock/models/stock_warehouse.py
@@ -21,7 +21,7 @@ class Warehouse(models.Model):
# namedtuple used in helper methods generating values for routes
Routing = namedtuple('Routing', ['from_loc', 'dest_loc', 'picking_type'])
- name = fields.Char('Warehouse Name', index=True, required=True)
+ name = fields.Char('Warehouse Name', index=True, required=True, default=lambda self: self.env['res.company']._company_default_get('stock.inventory').name)
active = fields.Boolean('Active', default=True)
company_id = fields.Many2one(
'res.company', 'Company', default=lambda self: self.env['res.company']._company_default_get('stock.inventory'),
@@ -684,11 +684,11 @@ class Warehouse(models.Model):
def _get_sequence_values(self):
return {
- 'in_type_id': {'name': self.name + _('Sequence in'), 'prefix': self.code + '/IN/', 'padding': 5},
- 'out_type_id': {'name': self.name + _('Sequence out'), 'prefix': self.code + '/OUT/', 'padding': 5},
- 'pack_type_id': {'name': self.name + _('Sequence packing'), 'prefix': self.code + '/PACK/', 'padding': 5},
- 'pick_type_id': {'name': self.name + _('Sequence picking'), 'prefix': self.code + '/PICK/', 'padding': 5},
- 'int_type_id': {'name': self.name + _('Sequence internal'), 'prefix': self.code + '/INT/', 'padding': 5},
+ 'in_type_id': {'name': self.name + ' ' + _('Sequence in'), 'prefix': self.code + '/IN/', 'padding': 5},
+ 'out_type_id': {'name': self.name + ' ' + _('Sequence out'), 'prefix': self.code + '/OUT/', 'padding': 5},
+ 'pack_type_id': {'name': self.name + ' ' + _('Sequence packing'), 'prefix': self.code + '/PACK/', 'padding': 5},
+ 'pick_type_id': {'name': self.name + ' ' + _('Sequence picking'), 'prefix': self.code + '/PICK/', 'padding': 5},
+ 'int_type_id': {'name': self.name + ' ' + _('Sequence internal'), 'prefix': self.code + '/INT/', 'padding': 5},
}
def _format_rulename(self, from_loc, dest_loc, suffix):
diff --git a/addons/stock/report/report_deliveryslip.xml b/addons/stock/report/report_deliveryslip.xml
index 60627d9f596..a4020c61b99 100644
--- a/addons/stock/report/report_deliveryslip.xml
+++ b/addons/stock/report/report_deliveryslip.xml
@@ -53,20 +53,19 @@
Product
- Ordered Quantity
+ Quantity
-
+
-
Pay your bills in one-click using Euro SEPA service
diff --git a/addons/account_voucher/models/account_voucher.py b/addons/account_voucher/models/account_voucher.py
index c652267ad5d..ddc2d48ce76 100644
--- a/addons/account_voucher/models/account_voucher.py
+++ b/addons/account_voucher/models/account_voucher.py
@@ -154,6 +154,7 @@ class AccountVoucher(models.Model):
@api.onchange('partner_id', 'pay_now')
def onchange_partner_id(self):
+ pay_journal_domain = [('type', 'in', ['cash', 'bank'])]
if self.pay_now != 'pay_now':
if self.partner_id:
self.account_id = self.partner_id.property_account_receivable_id \
@@ -163,6 +164,12 @@ class AccountVoucher(models.Model):
domain = [('deprecated', '=', False), ('internal_type', '=', account_type)]
self.account_id = self.env['account.account'].search(domain, limit=1)
+ else:
+ if self.voucher_type == 'purchase':
+ pay_journal_domain.append(('outbound_payment_method_ids', '!=', False))
+ else:
+ pay_journal_domain.append(('inbound_payment_method_ids', '!=', False))
+ return {'domain': {'payment_journal_id': pay_journal_domain}}
@api.multi
def proforma_voucher(self):
diff --git a/addons/auth_crypt/models/res_users.py b/addons/auth_crypt/models/res_users.py
index ad66d0c7025..ff7e983bc64 100644
--- a/addons/auth_crypt/models/res_users.py
+++ b/addons/auth_crypt/models/res_users.py
@@ -96,3 +96,6 @@ class ResUsers(models.Model):
internally
"""
return default_crypt_context
+
+ def _get_session_token_fields(self):
+ return super(ResUsers, self)._get_session_token_fields() | {'password_crypt'}
diff --git a/addons/auth_oauth/models/res_users.py b/addons/auth_oauth/models/res_users.py
index fa052e41a1b..3657885c3ac 100644
--- a/addons/auth_oauth/models/res_users.py
+++ b/addons/auth_oauth/models/res_users.py
@@ -117,3 +117,6 @@ class ResUsers(models.Model):
res = self.sudo().search([('id', '=', self.env.uid), ('oauth_access_token', '=', password)])
if not res:
raise
+
+ def _get_session_token_fields(self):
+ return super(ResUsers, self)._get_session_token_fields() | {'oauth_access_token'}
diff --git a/addons/base_address_city/models/res_partner.py b/addons/base_address_city/models/res_partner.py
index dff5de888c7..c35430d1f92 100644
--- a/addons/base_address_city/models/res_partner.py
+++ b/addons/base_address_city/models/res_partner.py
@@ -4,6 +4,8 @@
from lxml import etree
from odoo import api, models, fields
+from odoo.tools.translate import _
+
class Partner(models.Model):
_inherit = 'res.partner'
@@ -24,14 +26,15 @@ class Partner(models.Model):
doc = etree.fromstring(arch)
if doc.xpath("//field[@name='city_id']"):
return arch
+ label = _('City')
for city_node in doc.xpath("//field[@name='city']"):
replacement_xml = """
crm.opportunity.report
[('probability', '=', 100)]
{'group_by': ['date_closed:month'],'col_group_by': ['create_date:month'], 'measures': ['__count']}
+ {'group_by': ['date_closed:month'],'col_group_by': ['create_date:month'], 'measures': ['__count__']}
Won by Channel
crm.opportunity.report
[('probability', '=', 100)]
{'group_by': ['team_id'], 'col_group_by': ['date_last_stage_update:month'], 'measures': ['expected revenue']}
+ {'group_by': ['team_id'], 'col_group_by': ['date_last_stage_update:month'], 'measures': ['expected_revenue']}
Won by Country
@@ -75,7 +75,7 @@
Expected Revenue by Channel
crm.opportunity.report
{'group_by': ['create_date:month', 'team_id'], 'measures': ['expected_revenue', '__count']}
+ {'group_by': ['create_date:month', 'team_id'], 'measures': ['expected_revenue', '__count__']}
diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index 2710b693ccd..258e6ca8af8 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -251,8 +251,6 @@
diff --git a/addons/payment_adyen/models/payment.py b/addons/payment_adyen/models/payment.py
index dbc24ced0c0..3b15e51d44f 100644
--- a/addons/payment_adyen/models/payment.py
+++ b/addons/payment_adyen/models/payment.py
@@ -78,7 +78,7 @@ class AcquirerAdyen(models.Model):
]
hmac_key = binascii.a2b_hex(self.adyen_skin_hmac_key.encode('ascii'))
- raw_values = {k: values.get(k.encode('ascii'), '') for k in keys if k in values}
+ raw_values = {k: values.get(k, '') for k in keys if k in values}
raw_values_ordered = OrderedDict(sorted(raw_values.items(), key=lambda t: t[0]))
return signParams(raw_values_ordered)
@@ -151,8 +151,8 @@ class AcquirerAdyen(models.Model):
'sessionValidity': tmp_date,
'resURL': urls.url_join(base_url, AdyenController._return_url),
'merchantReturnData': json.dumps({'return_url': '%s' % values.pop('return_url')}) if values.get('return_url') else False,
- 'merchantSig': self._adyen_generate_merchant_sig('in', values),
})
+ values['merchantSig'] = self._adyen_generate_merchant_sig('in', values)
return values
diff --git a/addons/payment_authorize/models/payment.py b/addons/payment_authorize/models/payment.py
index c354f2e6aa9..b10f2824733 100644
--- a/addons/payment_authorize/models/payment.py
+++ b/addons/payment_authorize/models/payment.py
@@ -127,8 +127,18 @@ class PaymentAcquirerAuthorize(models.Model):
for field_name in mandatory_fields:
if not data.get(field_name):
error[field_name] = 'missing'
- if data['cc_expiry'] and datetime.now().strftime('%y%m') > datetime.strptime(data['cc_expiry'], '%m / %y').strftime('%y%m'):
- return False
+ if data['cc_expiry']:
+ # FIX we split the date into their components and check if there is two components containing only digits
+ # this fixes multiples crashes, if there was no space between the '/' and the components the code was crashing
+ # the code was also crashing if the customer was proving non digits to the date.
+ cc_expiry = [i.strip() for i in data['cc_expiry'].split('/')]
+ if len(cc_expiry) != 2 or any(not i.isdigit() for i in cc_expiry):
+ return False
+ try:
+ if datetime.now().strftime('%y%m') > datetime.strptime('/'.join(cc_expiry), '%m/%y').strftime('%y%m'):
+ return False
+ except ValueError:
+ return False
return False if error else True
@api.multi
diff --git a/addons/payment_authorize/tests/test_authorize.py b/addons/payment_authorize/tests/test_authorize.py
index f903f05b759..242fb20d265 100644
--- a/addons/payment_authorize/tests/test_authorize.py
+++ b/addons/payment_authorize/tests/test_authorize.py
@@ -63,6 +63,7 @@ class AuthorizeForm(AuthorizeCommon):
'x_invoice_num': 'SO004',
'x_first_name': 'Norbert',
'x_last_name': 'Buyer',
+ 'x_company': 'Big Company',
'x_address': 'Huge Street 2/543',
'x_city': 'Sin City',
'x_zip': '1000',
diff --git a/addons/payment_authorize/views/payment_authorize_templates.xml b/addons/payment_authorize/views/payment_authorize_templates.xml
index dcc88b9df37..8002b5aae57 100644
--- a/addons/payment_authorize/views/payment_authorize_templates.xml
+++ b/addons/payment_authorize/views/payment_authorize_templates.xml
@@ -23,6 +23,7 @@
+
diff --git a/addons/payment_ogone/models/payment.py b/addons/payment_ogone/models/payment.py
index 09df4b52bc4..8771addc151 100644
--- a/addons/payment_ogone/models/payment.py
+++ b/addons/payment_ogone/models/payment.py
@@ -214,8 +214,8 @@ class PaymentTxOgone(models.Model):
_inherit = 'payment.transaction'
# ogone status
_ogone_valid_tx_status = [5, 9, 8]
- _ogone_wait_tx_status = [41, 50, 51, 52, 55, 56, 91, 92, 99, 81, 82]
- _ogone_pending_tx_status = [46] # 3DS HTML response
+ _ogone_wait_tx_status = [41, 50, 51, 52, 55, 56, 91, 92, 99]
+ _ogone_pending_tx_status = [46, 81, 82] # 46 = 3DS HTML response
_ogone_cancel_tx_status = [1]
# --------------------------------------------------
@@ -283,7 +283,7 @@ class PaymentTxOgone(models.Model):
return invalid_parameters
def _ogone_form_validate(self, data):
- if self.state in ['done', 'refunded']:
+ if self.state in ['done', 'refunding', 'refunded']:
_logger.info('Ogone: trying to validate an already validated tx (ref %s)', self.reference)
return True
@@ -466,6 +466,9 @@ class PaymentTxOgone(models.Model):
if self.payment_token_id:
self.payment_token_id.verified = True
self.execute_callback()
+ # if this transaction is a validation one, then we refund the money we just withdrawn
+ if self.type == 'validation':
+ self.s2s_do_refund()
return True
elif status in self._ogone_cancel_tx_status:
self.write({
@@ -474,11 +477,13 @@ class PaymentTxOgone(models.Model):
})
elif status in self._ogone_pending_tx_status:
new_state = 'refunding' if self.state == 'refunding' else 'pending'
- self.write({
+ vals = {
'state': new_state,
'acquirer_reference': tree.get('PAYID'),
- 'html_3ds': ustr(base64.b64decode(tree.HTML_ANSWER.text)),
- })
+ }
+ if status == 46: # HTML 3DS
+ vals['html_3ds'] = ustr(base64.b64decode(tree.HTML_ANSWER.text))
+ self.write(vals)
elif status in self._ogone_wait_tx_status and tries > 0:
time.sleep(0.5)
self.write({'acquirer_reference': tree.get('PAYID')})
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 4b24fdf00e6..f59d6f81264 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -194,7 +194,7 @@ exports.PosModel = Backbone.Model.extend({
},
},{
model: 'res.country',
- fields: ['name'],
+ fields: ['name', 'vat_label'],
loaded: function(self,countries){
self.countries = countries;
self.company.country = null;
@@ -2119,6 +2119,7 @@ exports.Order = Backbone.Model.extend({
company_registry: company.company_registry,
contact_address: company.partner_id[1],
vat: company.vat,
+ vat_label: company.country.vat_label,
name: company.name,
phone: company.phone,
logo: this.pos.company_logo_base64,
@@ -2263,7 +2264,9 @@ exports.Order = Backbone.Model.extend({
}
})
- unit_price = line.compute_all(mapped_included_taxes, unit_price, 1, this.pos.currency.rounding, true).total_excluded;
+ if (mapped_included_taxes.length > 0) {
+ unit_price = line.compute_all(mapped_included_taxes, unit_price, 1, this.pos.currency.rounding, true).total_excluded;
+ }
line.set_unit_price(unit_price);
}
diff --git a/addons/portal/controllers/mail.py b/addons/portal/controllers/mail.py
index b8ff6f8f2fd..9fb2c6b94ac 100644
--- a/addons/portal/controllers/mail.py
+++ b/addons/portal/controllers/mail.py
@@ -6,7 +6,7 @@ from werkzeug.exceptions import NotFound, Forbidden
from odoo import http
from odoo.http import request
from odoo.osv import expression
-from odoo.tools import consteq
+from odoo.tools import consteq, plaintext2html
def _has_token_access(res_model, res_id, token=''):
@@ -59,6 +59,8 @@ class PortalChatter(http.Controller):
def portal_chatter_post(self, res_model, res_id, message, **kw):
url = request.httprequest.referrer
if message:
+ # message is received in plaintext and saved in html
+ message = plaintext2html(message)
_message_post_helper(res_model, int(res_id), message, **kw)
url = url + "#discussion"
return request.redirect(url)
diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml
index 1d5d3a79f3f..d93ca1f6d27 100644
--- a/addons/portal/views/portal_templates.xml
+++ b/addons/portal/views/portal_templates.xml
@@ -352,7 +352,7 @@
the message will be posted with the identity of the partner_id of the object
-->
-
- X
-
diff --git a/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_data.xml b/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_data.xml
index 0f6bb86479f..6920f154d9d 100644
--- a/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_data.xml
+++ b/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_data.xml
@@ -160,7 +160,7 @@ elif salary <= 2510.47:
165
python
result = (((employee.marital in ['divorced', 'single', 'widower']) or (employee.marital=='married' and employee.spouse_fiscal_status=='without income')) and (employee.resident_bool!=True))
+ result = (((employee.marital in ['divorced', 'single', 'widower']) or (employee.marital in ['married', 'cohabitant'] and employee.spouse_fiscal_status=='without income')) and (employee.resident_bool!=True))
code
wage = categories.BASIC
@@ -184,7 +184,7 @@ else:
165
python
result = (((employee.marital=='married' and employee.spouse_fiscal_status=='with income')) and (employee.resident_bool!=True))
+ result = (((employee.marital in ['married', 'cohabitant'] and employee.spouse_fiscal_status=='with income')) and (employee.resident_bool!=True))
code
wage = categories.BASIC
@@ -208,7 +208,7 @@ else:
120
python
result = (((employee.marital in ['divorced', 'single', 'widower']) or (employee.marital=='married' and employee.spouse_fiscal_status=='with income')) and (employee.resident_bool!=True))
+ result = (((employee.marital in ['divorced', 'single', 'widower']) or (employee.marital in ['married', 'cohabitant'] and employee.spouse_fiscal_status=='with income')) and (employee.resident_bool!=True))
120
python
result = ((employee.marital=='married' and employee.spouse_fiscal_status=='without income') and (employee.resident_bool!=True))
+ result = ((employee.marital in ['married', 'cohabitant'] and employee.spouse_fiscal_status=='without income') and (employee.resident_bool!=True))
Red.Spouse.Net
148
python
- result = (employee.marital == 'married' and employee.spouse_fiscal_status=='with income' and employee.spouse_net_revenue <= 225.0) and (categories.PP + categories.PPRed + categories.FamRed + categories.ChA < 0.0)
+ result = (employee.marital in ['married', 'cohabitant'] and employee.spouse_fiscal_status=='with income' and employee.spouse_net_revenue <= 225.0) and (categories.PP + categories.PPRed + categories.FamRed + categories.ChA < 0.0)
code
result = min(110.50, - (categories.PP + categories.PPRed + categories.FamRed + categories.ChA))
@@ -372,7 +372,7 @@ elif salary <= 2461.27:
Red.Spouse.Oth.Net
149
python
- result = (employee.marital == 'married' and employee.spouse_fiscal_status=='with income' and not employee.spouse_net_revenue and employee.spouse_other_net_revenue <= 450.0) and (categories.PP + categories.PPRed + categories.FamRed + categories.ChA < 0.0)
+ result = (employee.marital in ['married', 'cohabitant'] and employee.spouse_fiscal_status=='with income' and not employee.spouse_net_revenue and employee.spouse_other_net_revenue <= 450.0) and (categories.PP + categories.PPRed + categories.FamRed + categories.ChA < 0.0)
code
result = min(220.0, - (categories.PP + categories.PPRed + categories.FamRed + categories.ChA))
diff --git a/addons/l10n_be_hr_payroll/views/l10n_be_hr_payroll_view.xml b/addons/l10n_be_hr_payroll/views/l10n_be_hr_payroll_view.xml
index 37fa58ae2b7..4111ab06878 100644
--- a/addons/l10n_be_hr_payroll/views/l10n_be_hr_payroll_view.xml
+++ b/addons/l10n_be_hr_payroll/views/l10n_be_hr_payroll_view.xml
@@ -61,8 +61,8 @@
-
\ No newline at end of file
+
diff --git a/addons/l10n_fr_fec/wizard/account_fr_fec.py b/addons/l10n_fr_fec/wizard/account_fr_fec.py
index ac778e6be8f..bd8e4cc44c0 100644
--- a/addons/l10n_fr_fec/wizard/account_fr_fec.py
+++ b/addons/l10n_fr_fec/wizard/account_fr_fec.py
@@ -220,7 +220,7 @@ class AccountFrFec(models.TransientModel):
replace(MIN(aa.name), '|', '/') AS CompteLib,
CASE WHEN rp.ref IS null OR rp.ref = ''
THEN COALESCE('ID ' || rp.id, '')
- ELSE rp.ref
+ ELSE replace(rp.ref, '|', '/')
END
AS CompAuxNum,
COALESCE(replace(rp.name, '|', '/'), '') AS CompAuxLib,
@@ -278,7 +278,7 @@ class AccountFrFec(models.TransientModel):
replace(replace(aa.name, '|', '/'), '\t', '') AS CompteLib,
CASE WHEN rp.ref IS null OR rp.ref = ''
THEN COALESCE('ID ' || rp.id, '')
- ELSE rp.ref
+ ELSE replace(rp.ref, '|', '/')
END
AS CompAuxNum,
COALESCE(replace(replace(rp.name, '|', '/'), '\t', ''), '') AS CompAuxLib,
diff --git a/addons/l10n_multilang/models/l10n_multilang.py b/addons/l10n_multilang/models/l10n_multilang.py
index bee06394b7d..0c096c4cdf3 100644
--- a/addons/l10n_multilang/models/l10n_multilang.py
+++ b/addons/l10n_multilang/models/l10n_multilang.py
@@ -37,11 +37,11 @@ class AccountChartTemplate(models.Model):
'type': 'model',
'res_id': out_ids[counter].id,
'lang': lang,
- 'src': element.name,
+ 'src': element[in_field],
'value': value[element.id],
})
else:
- _logger.info('Language: %s. Translation from template: there is no translation available for %s!' % (lang, element.name))
+ _logger.info('Language: %s. Translation from template: there is no translation available for %s!' % (lang, element[in_field]))
counter += 1
return True
diff --git a/addons/mail/static/src/js/thread.js b/addons/mail/static/src/js/thread.js
index 2a421f6fdcd..97b6bf4906f 100644
--- a/addons/mail/static/src/js/thread.js
+++ b/addons/mail/static/src/js/thread.js
@@ -353,7 +353,7 @@ var Thread = Widget.extend({
} else {
this.trigger('redirect', options.model, options.id);
}
- }, 200, true),
+ }, 500, true),
//--------------------------------------------------------------------------
// Handlers
diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml
index 26c093c3e84..eef37598164 100644
--- a/addons/mail/static/src/xml/thread.xml
+++ b/addons/mail/static/src/xml/thread.xml
@@ -179,7 +179,7 @@
-
- on
(from #
+
+
+
+
+
-
-
diff --git a/addons/l10n_be_hr_payroll_fleet/models/hr_contract.py b/addons/l10n_be_hr_payroll_fleet/models/hr_contract.py
index f774eaa0436..a6a3c10ac13 100644
--- a/addons/l10n_be_hr_payroll_fleet/models/hr_contract.py
+++ b/addons/l10n_be_hr_payroll_fleet/models/hr_contract.py
@@ -21,7 +21,7 @@ class HrContract(models.Model):
@api.depends('car_id', 'new_car', 'new_car_model_id')
def _compute_car_atn_and_costs(self):
for contract in self:
- if contract.car_id:
+ if not contract.new_car and contract.car_id:
contract.car_atn = contract.car_id.atn
contract.company_car_total_depreciated_cost = contract.car_id.total_depreciated_cost
elif contract.new_car and contract.new_car_model_id:
diff --git a/addons/l10n_be_hr_payroll_fleet/views/hr_contract_views.xml b/addons/l10n_be_hr_payroll_fleet/views/hr_contract_views.xml
index c6a7ad33abd..184772fc1e5 100644
--- a/addons/l10n_be_hr_payroll_fleet/views/hr_contract_views.xml
+++ b/addons/l10n_be_hr_payroll_fleet/views/hr_contract_views.xml
@@ -7,8 +7,8 @@
+
+
+
+
-
- +
+
-
@@ -103,7 +102,7 @@
and location of the bank.-->
diff --git a/addons/l10n_ch/static/src/less/report_isr.less b/addons/l10n_ch/static/src/less/report_isr.less
index be366e54ddd..913404727d2 100644
--- a/addons/l10n_ch/static/src/less/report_isr.less
+++ b/addons/l10n_ch/static/src/less/report_isr.less
@@ -38,6 +38,7 @@ body.l10n_ch_isr #isr {
overflow: hidden;
font-family: "Work Sans", Verdana, Geneva, sans-serif;
+ line-height: 1;
font-size: 13px;
p, address {
@@ -58,25 +59,26 @@ body.l10n_ch_isr #isr {
#voucher > * {
position: absolute;
/* default left margin for fields content */
- left: 1/10in;
+ left: 3/20in;
&#voucher-for-contact {
- top: 3/10in;
+ top: 0.25in;
}
&#voucher-for-bank {
- top: 3/20in;
+ top: 0.18in;
}
&#voucher-for-bank + #voucher-for-contact {
- top: 4/6in;
+ top: 0.68in;
}
&#voucher-bank {
- top: 9/6in;
+ top: 1.51in;
left: 11/10in;
}
+ /* TODO: remove in master */
&#voucher-currency {
top: 9/6 + 3/20in;
@@ -86,24 +88,22 @@ body.l10n_ch_isr #isr {
&#voucher-amount_units {
width: 15/10in;
- top: 11/6in;
+ top: 1.84in;
text-align: right;
- line-height: 1/6in;
- font-weight: 14px;
+ font-size: 14px;
}
&#voucher-amount_cents {
width: 4/10in;
- top: 11/6in;
- left: 19/10in;
+ top: 1.84in;
+ left: 20/10in;
- line-height: 1/6in;
- font-weight: 14px;
+ font-size: 14px;
}
&#voucher-by {
- top: 26/12in;
+ top: 2.18in;
}
}
@@ -121,25 +121,26 @@ body.l10n_ch_isr #isr {
#slip > * {
position: absolute;
/* default left margin for fields content */
- left: 1/10in;
+ left: 3/20in;
&#slip-for-contact {
- top: 3/10in;
+ top: 0.25in;
}
&#slip-for-bank {
- top: 3/20in;
+ top: 0.18in;
}
&#slip-for-bank + #slip-for-contact {
- top: 4/6in;
+ top: 0.68in;
}
&#slip-bank {
- top: 9/6in;
+ top: 1.51in;
left: 11/10in;
}
+ /* TODO: remove in master */
&#slip-currency {
top: 9/6 + 3/20in;
@@ -149,34 +150,52 @@ body.l10n_ch_isr #isr {
&#slip-amount_units {
width: 15/10in;
- top: 11/6in;
+ top: 1.84in;
text-align: right;
- line-height: 1/6in;
- font-weight: 14px;
+ font-size: 14px;
}
&#slip-amount_cents {
width: 4/10in;
- top: 11/6in;
- left: 19/10in;
+ top: 1.84in;
+ left: 20/10in;
- line-height: 1/6in;
- font-weight: 14px;
+ font-size: 14px;
}
&#slip-reference {
- width: 3 + 3/10in;
- top: 7/6in;
- left: 2 + 5/10in;
+ width: 3.3in;
+ top: 1.17in;
+ left: 2.5in;
text-align: center;
}
&#slip-by {
- top: 11/6in;
- left: 2 + 5/10in;
+ top: 1.85in;
+ left: 2.55in;
}
+ &#slip-optical-line {
+ right: 3/10in;
+ bottom: 4/6in;
+
+ /* Positioning is set for OCRB of Tsukurimashou Font Family */
+ font-family: OCRB, Courier, monospace;
+ font-size: 10pt;
+ line-height: 0.1in;
+
+ > div {
+ position: relative;
+
+ > div {
+ position: absolute;
+ bottom: 0;
+ }
+ }
+ }
+
+ /* TODO: remove in master */
&#slip-optical {
right: 3/10in;
bottom: 4/6in;
diff --git a/addons/l10n_ch/views/res_config_settings_views.xml b/addons/l10n_ch/views/res_config_settings_views.xml
index 02847355c7a..2fa7a54386c 100644
--- a/addons/l10n_ch/views/res_config_settings_views.xml
+++ b/addons/l10n_ch/views/res_config_settings_views.xml
@@ -17,10 +17,39 @@
Print the coordinates of your bank under the 'Payment for' title of the ISR.
Your address will be moved to the 'in favour of' section.
-
- +
+
-
@@ -141,9 +139,11 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Offset to move the the scan line in mm
+
+
+
+
+
+
+
+
+ Tel:
| Lot/Serial Number | -Ordered Quantity | -- Delivered Quantity - | +Quantity | @@ -112,13 +108,6 @@- - - | -
- |
@@ -129,7 +118,7 @@
This shipment is a backorder of
diff --git a/addons/stock/views/stock_move_views.xml b/addons/stock/views/stock_move_views.xml
index 1a012255ae1..cd945d3bfe0 100644
--- a/addons/stock/views/stock_move_views.xml
+++ b/addons/stock/views/stock_move_views.xml
@@ -73,7 +73,6 @@
'); diff --git a/addons/web/static/src/js/views/view_dialogs.js b/addons/web/static/src/js/views/view_dialogs.js index 1b74068d44d..d4ae709008c 100644 --- a/addons/web/static/src/js/views/view_dialogs.js +++ b/addons/web/static/src/js/views/view_dialogs.js @@ -252,6 +252,7 @@ var SelectCreateDialog = ViewDialog.extend({ } }, selection_changed: function (event) { + event.stopPropagation(); this.$footer.find(".o_select_button").prop('disabled', !event.data.selection.length); }, search: function (event) { diff --git a/addons/web/static/src/less/kanban_view.less b/addons/web/static/src/less/kanban_view.less index f53a5d185c3..34999256fa5 100644 --- a/addons/web/static/src/less/kanban_view.less +++ b/addons/web/static/src/less/kanban_view.less @@ -230,7 +230,7 @@ height: 20px; } .oe_kanban_bottom_left { - .o-flex(1, 0, auto); + .o-flex(1, 1, auto); > * { margin-right: 6px; @@ -243,7 +243,7 @@ } } .oe_kanban_bottom_right{ - .o-flex(0, 0, auto); + .o-flex(0, 1, auto); .oe_kanban_avatar { width: 20px; diff --git a/addons/web/static/src/less/kanban_view_mobile.less b/addons/web/static/src/less/kanban_view_mobile.less index 72ba087e0c2..d09b6968925 100644 --- a/addons/web/static/src/less/kanban_view_mobile.less +++ b/addons/web/static/src/less/kanban_view_mobile.less @@ -29,7 +29,8 @@ } } - &.o_kanban_small_column .o_kanban_group:not(.o_column_folded) { + // [class] to get same specificity as elsewhere (kanban_view.less) + &[class] .o_kanban_group:not(.o_column_folded) { .o-position-absolute(@top: @o-kanban-mobile-tabs-height, @left: 0, @bottom: 0); overflow-x: scroll; width: 100%; diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index fd263a07eb6..3ef2a213398 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -209,7 +209,7 @@
- |
|---|