Merge remote-tracking branch 'odoo/11.0' into 11.0

Author: OCA-git-bot

addons/account/static/src/js/reconciliation/reconciliation_model.js

@@ -614,7 +614,7 @@ var StatementModel = BasicModel.extend({
             handles = [handle];
         } else {
             _.each(this.lines, function (line, handle) {
-                if (!line.reconciled && !line.balance.amount && line.reconciliation_proposition.length) {
+                if (!line.reconciled && line.balance && !line.balance.amount && line.reconciliation_proposition.length) {
                     handles.push(handle);
                 }
             });

addons/account_payment/models/payment.py

@@ -175,3 +175,10 @@ def _check_or_create_invoice_tx(self, invoice, acquirer, payment_token=None, tx_
         })
 
         return tx
+
+    def _post_process_after_done(self, **kwargs):
+        # set invoice id in payment transaction when payment being done from sale order
+        res = super(PaymentTransaction, self)._post_process_after_done()
+        if kwargs.get('invoice_id'):
+            self.account_invoice_id = kwargs['invoice_id']
+        return res

addons/account_voucher/models/account_voucher.py

@@ -146,6 +146,7 @@ def onchange_date(self):
 
     @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 \
@@ -155,6 +156,12 @@ def onchange_partner_id(self):
                 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):

addons/barcodes/static/src/js/barcode_events.js

@@ -28,6 +28,12 @@ var BarcodeEvents = core.Class.extend(mixins.PropertiesMixin, {
     // Keys from a barcode scanner are usually processed as quick as possible,
     // but some scanners can use an intercharacter delay (we support <= 50 ms)
     max_time_between_keys_in_ms: session.max_time_between_keys_in_ms || 55,
+    // To be able to receive the barcode value, an input must be focused.
+    // On mobile devices, this causes the virtual keyboard to open.
+    // Unfortunately it is not possible to avoid this behavior...
+    // To avoid keyboard flickering at each detection of a barcode value,
+    // we want to keep it open for a while (800 ms).
+    inputTimeOut: 800,
 
     init: function() {
         mixins.PropertiesMixin.init.call(this);
@@ -38,6 +44,30 @@ var BarcodeEvents = core.Class.extend(mixins.PropertiesMixin, {
         // Bind event handler once the DOM is loaded
         // TODO: find a way to be active only when there are listeners on the bus
         $(_.bind(this.start, this, false));
+
+        // Mobile device detection
+        var isMobile = navigator.userAgent.match(/Android/i) ||
+                       navigator.userAgent.match(/webOS/i) ||
+                       navigator.userAgent.match(/iPhone/i) ||
+                       navigator.userAgent.match(/iPad/i) ||
+                       navigator.userAgent.match(/iPod/i) ||
+                       navigator.userAgent.match(/BlackBerry/i) ||
+                       navigator.userAgent.match(/Windows Phone/i);
+        this.isChromeMobile = isMobile && window.chrome;
+
+        // Creates an input who will receive the barcode scanner value.
+        if (this.isChromeMobile) {
+            this.$barcodeInput = $('<input/>', {
+                name: 'barcode',
+                type: 'text',
+                css: {
+                    'position': 'absolute',
+                    'opacity': 0,
+                },
+            });
+        }
+
+        this.__removeBarcodeField = _.debounce(this._removeBarcodeField, this.inputTimeOut);
     },
 
     handle_buffered_keys: function() {
@@ -109,7 +139,7 @@ var BarcodeEvents = core.Class.extend(mixins.PropertiesMixin, {
             e.key === "ArrowUp" || e.key === "ArrowDown" ||
             e.key === "Escape" || e.key === "Tab" ||
             e.key === "Backspace" || e.key === "Delete" ||
-            /F\d\d?/.test(e.key)) {
+            e.key === "Unidentified" || /F\d\d?/.test(e.key)) {
             return true;
         } else {
             return false;
@@ -167,8 +197,84 @@ var BarcodeEvents = core.Class.extend(mixins.PropertiesMixin, {
         }
     },
 
+    /**
+     * Try to detect the barcode value by listening all keydown events:
+     * Checks if a dom element who may contains text value has the focus.
+     * If not, it's probably because these events are triggered by a barcode scanner.
+     * To be able to handle this value, a focused input will be created.
+     *
+     * This function also has the responsibility to detect the end of the barcode value.
+     * (1) In most of cases, an optional key (tab or enter) is sent to mark the end of the value.
+     * So, we direclty handle the value.
+     * (2) If no end key is configured, we have to calculate the delay between each keydowns.
+     * 'max_time_between_keys_in_ms' depends of the device and may be configured.
+     * Exceeded this timeout, we consider that the barcode value is entirely sent.
+     *
+     * @private
+     * @param  {jQuery.Event} e keydown event
+     */
+    _listenBarcodeScanner: function (e) {
+        if (!$('input:text:focus, textarea:focus, [contenteditable]:focus').length) {
+            $('body').append(this.$barcodeInput);
+            this.$barcodeInput.focus();
+        }
+        if (this.$barcodeInput.is(":focus")) {
+            // Handle buffered keys immediately if the keypress marks the end
+            // of a barcode or after x milliseconds without a new keypress.
+            clearTimeout(this.timeout);
+            // On chrome mobile, e.which only works for some special characters like ENTER or TAB.
+            if (String.fromCharCode(e.which).match(this.suffix)) {
+                this._handleBarcodeValue(e);
+            } else {
+                this.timeout = setTimeout(this._handleBarcodeValue.bind(this, e),
+                    this.max_time_between_keys_in_ms);
+            }
+            // if the barcode input doesn't receive keydown for a while, remove it.
+            this.__removeBarcodeField();
+        }
+    },
+
+    /**
+     * Retrieves the barcode value from the temporary input element.
+     * This checks this value and trigger it on the bus.
+     *
+     * @private
+     * @param  {jQuery.Event} keydown event
+     */
+    _handleBarcodeValue: function (e) {
+        var barcodeValue = this.$barcodeInput.val();
+        if (barcodeValue.match(this.regexp)) {
+            core.bus.trigger('barcode_scanned', barcodeValue, $(e.target).parent()[0]);
+            this.$barcodeInput.val('');
+        }
+    },
+
+    /**
+     * Remove the temporary input created to store the barcode value.
+     * If nothing happens, this input will be removed, so the focus will be lost
+     * and the virtual keyboard on mobile devices will be closed.
+     *
+     * @private
+     */
+    _removeBarcodeField: function () {
+        if (this.$barcodeInput) {
+            // Reset the value and remove from the DOM.
+            this.$barcodeInput.val('').remove();
+        }
+    },
+
     start: function(prevent_key_repeat){
-        $('body').bind("keypress", this.__handler);
+        // Chrome Mobile isn't triggering keypress event.
+        // This is marked as Legacy in the DOM-Level-3 Standard.
+        // See: https://www.w3.org/TR/uievents/#legacy-keyboardevent-event-types
+        // This fix is only applied for Google Chrome Mobile but it should work for
+        // all other cases.
+        // In master, we could remove the behavior with keypress and only use keydown.
+        if (this.isChromeMobile) {
+            $('body').on("keydown", this._listenBarcodeScanner.bind(this));
+        } else {
+            $('body').bind("keypress", this.__handler);
+        }
         if (prevent_key_repeat === true) {
             $('body').bind("keydown", this.__keydown_handler);
             $('body').bind('keyup', this.__keyup_handler);

addons/l10n_ch/static/src/less/report_isr.less

@@ -19,12 +19,18 @@ body.l10n_ch_isr {
             }
         }
     }
-}
 
-/* content outside isr needs margins to not overlap header */
-body.l10n_ch_isr #content_outside_isr {
-    padding: 15px;
-    padding-top: 150px;
+    /* content outside isr needs margins to not overlap header */
+    #content_outside_isr {
+        padding: 15px;
+        padding-top: 150px;
+    }
+
+    /* ISR is intended for pre-printed paper, we don't want stylistic background */
+    .o_report_layout_background {
+        background: none;
+        min-height: 0;
+    }
 }
 
 body.l10n_ch_isr #isr {

addons/mail/i18n/zh_CN.po

@@ -1,18 +1,18 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * mail
-#
+# 
 # Translators:
 # Jeffery CHEN Fan <[email protected]>, 2017
 # Martin Trigaux, 2017
 # Talway <[email protected]>, 2017
 # niulin lnc. <[email protected]>, 2017
-# liAnGjiA <[email protected]>, 2017
 # xiaobin wu <[email protected]>, 2017
 # 卓忆科技 <[email protected]>, 2017
 # Gary Wei <[email protected]>, 2017
 # also <[email protected]>, 2017
 # Joray <[email protected]>, 2017
+# liAnGjiA <[email protected]>, 2017
 # Michael Chong <[email protected]>, 2017
 # liulixia <[email protected]>, 2017
 # 厦门-许舟 <[email protected]>, 2017
@@ -43,10 +43,10 @@ msgstr ""
 "PO-Revision-Date: 2017-11-30 13:11+0000\n"
 "Last-Translator: e2f <[email protected]>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mail
@@ -245,10 +245,6 @@ msgid ""
 "object.parent_id.subject) or (object.parent_id and "
 "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
 msgstr ""
-"${object.subject 或 (object.record_name 和 'Re: %s' % object.record_name) 或 "
-"(object.parent_id and object.parent_id.subject 和 'Re: %s' % "
-"object.parent_id.subject) 或 (object.parent_id 和 object.parent_id.record_name"
-" 和 'Re: %s' % object.parent_id.record_name)}"
 
 #. module: mail
 #. openerp-web

addons/payment/models/payment_acquirer.py

@@ -684,6 +684,10 @@ def form_feedback(self, data, acquirer_name):
 
         return True
 
+    @api.multi
+    def _post_process_after_done(self, **kwargs):
+        return True
+
     # --------------------------------------------------
     # SERVER2SERVER RELATED METHODS
     # --------------------------------------------------

addons/sale/models/sale.py

@@ -580,20 +580,16 @@ def _get_tax_amount_by_group(self):
         self.ensure_one()
         res = {}
         for line in self.order_line:
-            base_tax = 0
+            price_reduce = line.price_unit * (1.0 - line.discount / 100.0)
+            taxes = line.tax_id.compute_all(price_reduce, quantity=line.product_uom_qty, product=line.product_id, partner=self.partner_shipping_id)['taxes']
             for tax in line.tax_id:
                 group = tax.tax_group_id
                 res.setdefault(group, {'amount': 0.0, 'base': 0.0})
                 # FORWARD-PORT UP TO SAAS-17
-                price_reduce = line.price_unit * (1.0 - line.discount / 100.0)
-                taxes = tax.compute_all(price_reduce + base_tax, quantity=line.product_uom_qty,
-                                         product=line.product_id, partner=self.partner_shipping_id)['taxes']
                 for t in taxes:
-                    res[group]['amount'] += t['amount']
-                    res[group]['base'] += t['base']
-                if tax.include_base_amount:
-                    base_tax += tax.compute_all(price_reduce + base_tax, quantity=1, product=line.product_id,
-                                                partner=self.partner_shipping_id)['taxes'][0]['amount']
+                    if t['id'] == tax.id:
+                        res[group]['amount'] += t['amount']
+                        res[group]['base'] += t['base']
         res = sorted(res.items(), key=lambda l: l[0].sequence)
         res = [(l[0].name, l[1]['amount'], l[1]['base'], len(res)) for l in res]
         return res

addons/sale/views/res_config_settings_views.xml

@@ -169,9 +169,6 @@
                                         <field name="portal_confirmation_options" class="o_light_label" widget="radio"
                                             attrs="{'required': [('portal_confirmation', '=', True)]}"/>
                                     </div>
-                                <div attrs="{'invisible': [('portal_confirmation_options', '!=', 'pay')]}">
-                                    <button name='%(payment.action_payment_acquirer)d' icon="fa-arrow-right" type="action" string="Payment Acquirers" class="btn-link"/>
-                                </div>
                                 </div>
                             </div>
                         </div>

addons/sale_payment/__manifest__.py

@@ -20,6 +20,7 @@
         'views/crm_team_views.xml',
         'views/sale_order_views.xml',
         'views/sale_portal_templates.xml',
+        'views/settings.xml',
     ],
     'installable': True,
     'auto_install': False,