From c87daaec0909f1bda539f93a3be617e4585f8c48 Mon Sep 17 00:00:00 2001 From: Ludwik Trammer Date: Tue, 30 Dec 2014 12:40:07 +0100 Subject: [PATCH 01/19] [FIX] doc: Change one last instance of `date_end` to `date_stop` References to `date_end` were previously corrected to `date_stop`, in revision 98bd6732027e11b8065860b8eb29217302dc8792, but one of them was missed. Closes #4463 --- doc/reference/views.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/reference/views.rst b/doc/reference/views.rst index b1cc0255520..1667b731b08 100644 --- a/doc/reference/views.rst +++ b/doc/reference/views.rst @@ -942,7 +942,7 @@ calendar view are: ``date_stop`` is provided records become movable (via drag and drop) directly in the calendar ``date_delay`` - alternative to ``date_end``, provides the duration of the event instead of + alternative to ``date_stop``, provides the duration of the event instead of its end date .. todo:: what's the unit? Does it allow moving the record? From 9a3b71198918c9438c1daa8b472392b86246ab8c Mon Sep 17 00:00:00 2001 From: Miku Laitinen Date: Sat, 5 Sep 2015 15:03:33 +0300 Subject: [PATCH 02/19] [FIX] payment_transfer: 'Wire Transfer' provider translatable Closes #8398 --- addons/payment_transfer/i18n/payment_transfer.pot | 10 ++++++++-- addons/payment_transfer/models/payment_acquirer.py | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/addons/payment_transfer/i18n/payment_transfer.pot b/addons/payment_transfer/i18n/payment_transfer.pot index 05f400b2ddc..c7576b07d9b 100644 --- a/addons/payment_transfer/i18n/payment_transfer.pot +++ b/addons/payment_transfer/i18n/payment_transfer.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-21 14:08+0000\n" -"PO-Revision-Date: 2015-01-21 14:08+0000\n" +"POT-Creation-Date: 2015-09-05 12:00+0000\n" +"PO-Revision-Date: 2015-09-05 12:00+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -43,3 +43,9 @@ msgstr "" msgid "Payment Transaction" msgstr "" +#. module: payment_transfer +#: code:addons/payment_transfer/models/payment_acquirer.py:19 +#, python-format +msgid "Wire Transfer" +msgstr "" + diff --git a/addons/payment_transfer/models/payment_acquirer.py b/addons/payment_transfer/models/payment_acquirer.py index 18b0bfd5c63..2abdb541f1e 100644 --- a/addons/payment_transfer/models/payment_acquirer.py +++ b/addons/payment_transfer/models/payment_acquirer.py @@ -16,7 +16,7 @@ class TransferPaymentAcquirer(osv.Model): def _get_providers(self, cr, uid, context=None): providers = super(TransferPaymentAcquirer, self)._get_providers(cr, uid, context=context) - providers.append(['transfer', 'Wire Transfer']) + providers.append(['transfer', _('Wire Transfer')]) return providers def transfer_get_form_action_url(self, cr, uid, id, context=None): From 4c901f8ac6438333f994d39dec1558d837a123e4 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Wed, 30 Sep 2015 15:21:32 +0200 Subject: [PATCH 03/19] [FIX] sale: use default_get to define the invoice journal When creating the invoice of a sales order, from the sales order (`Create invoice` button on the sale order), the journal used for the invoice was forced with a specific domain. Besides, the only reason the journal is forced is to check there is a sale journal for the quotation company, and raise a warning if not. This check was added in 1578c2858df1ca398bcdd07cc0c3e6a83ff23b9c. This prevented to use the user defined defaults, (`Set defaults` in the `debug` menu) to set a different default journal per user. Using the `default_get` instead solves this issue, as it uses first the user defined defaults. Besides, if no user defined defaults are set, it then uses the default value set in the field definition, which in this case returns the same journal then the forced domain mentioned above, the domain used being the same. There is therefore no change of behavior, while giving the possibility to use the user defined defaults. Fixes #8786 --- addons/sale/sale.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 09256593b5c..66c53b683e7 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -391,10 +391,8 @@ class sale_order(osv.osv): """ if context is None: context = {} - journal_ids = self.pool.get('account.journal').search(cr, uid, - [('type', '=', 'sale'), ('company_id', '=', order.company_id.id)], - limit=1) - if not journal_ids: + journal_id = self.pool['account.invoice'].default_get(cr, uid, ['journal_id'], context=context)['journal_id'] + if not journal_id: raise osv.except_osv(_('Error!'), _('Please define sales journal for this company: "%s" (id:%d).') % (order.company_id.name, order.company_id.id)) invoice_vals = { @@ -404,7 +402,7 @@ class sale_order(osv.osv): 'reference': order.client_order_ref or order.name, 'account_id': order.partner_invoice_id.property_account_receivable.id, 'partner_id': order.partner_invoice_id.id, - 'journal_id': journal_ids[0], + 'journal_id': journal_id, 'invoice_line': [(6, 0, lines)], 'currency_id': order.pricelist_id.currency_id.id, 'comment': order.note, From e11490c3a11d6ed0df1fab2dfd1e5e263324557c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Tue, 6 Jan 2015 18:50:29 +0100 Subject: [PATCH 04/19] [FIX] account: Analytic account domain in reconcile with writeoff wizard The domain for the analytic account in the `reconcile with writeoff` wizard should be based on the `type` field, which must be `view`, not on the `parent_id` field, as it's done everywhere else (e.g. in the supplier invoice form). `[('parent_id', '!=', False)]` and `[('type', '!=', 'view')]` is almost the same, but the second domain is more appropriate. Closes #4562 --- addons/account/wizard/account_reconcile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/wizard/account_reconcile.py b/addons/account/wizard/account_reconcile.py index f3090208909..ab29458710e 100644 --- a/addons/account/wizard/account_reconcile.py +++ b/addons/account/wizard/account_reconcile.py @@ -108,7 +108,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory): 'writeoff_acc_id': fields.many2one('account.account','Write-Off account', required=True), 'date_p': fields.date('Date'), 'comment': fields.char('Comment', required=True), - 'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', domain=[('parent_id', '!=', False)]), + 'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', domain=[('type', '!=', 'view')]), } _defaults = { 'date_p': lambda *a: time.strftime('%Y-%m-%d'), From e0f4f8a710949a88a4bcbc71cdc45ddd9919e6d9 Mon Sep 17 00:00:00 2001 From: Thorsten Vocks Date: Wed, 30 Sep 2015 18:09:55 +0200 Subject: [PATCH 05/19] [CLA] Big Consulting GmbH Signed through OPW 650573 --- doc/cla/corporate/openbig.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 doc/cla/corporate/openbig.md diff --git a/doc/cla/corporate/openbig.md b/doc/cla/corporate/openbig.md new file mode 100644 index 00000000000..bcfb0667d9f --- /dev/null +++ b/doc/cla/corporate/openbig.md @@ -0,0 +1,15 @@ +Germany, 9-30-2015 + +Big Consulting GmbH agrees to the terms of the Odoo Corporate Contributor License Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this declaration. + +Signed, + +Thorsten Vocks thorsten.vocks@openbig.org https://github.com/tv-openbig + +List of contributors: + +Thorsten Vocks thorsten.vocks@openbig.org https://github.com/tv-openbig +Heike Vocks heike.vocks@openbig.org https://github.com/hv-openbig +Jan Dasenbrock jan.dasenbrock@openbig.org https://github.com/jd-openbig From cf87d9b5a3440351f146505be1dee63d223bd1cc Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Fri, 25 Sep 2015 16:33:43 +0200 Subject: [PATCH 06/19] [FIX] website_sale, website_sale_options: product_variant_ids in website_sale.modal To show the website_sale.modal, the product_variant_ids must be in the DOM because all the prices are computed with the product_variant_ids. From commit 0ff26cf opw:650167 --- addons/website_sale/static/src/js/website_sale.js | 8 ++++---- addons/website_sale/views/templates.xml | 2 +- addons/website_sale_options/static/src/js/website_sale.js | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js index 469be5e7e1f..f7fe7a58364 100644 --- a/addons/website_sale/static/src/js/website_sale.js +++ b/addons/website_sale/static/src/js/website_sale.js @@ -21,9 +21,9 @@ $('.oe_website_sale').each(function () { $(oe_website_sale).on("change", 'input[name="add_qty"]', function (event) { product_ids = []; - var product_dom = $("ul.js_add_cart_variants[data-attribute_value_ids]").first(); + var product_dom = $(".js_add_cart_variants[data-attribute_value_ids]").first(); product_dom.data("attribute_value_ids").forEach(function(entry) { - product_ids.push(entry[0]);}); + product_ids.push(entry);}); var qty = $(event.target).closest('form').find('input[name="add_qty"]').val(); openerp.jsonRpc("/shop/get_unit_price", 'call', {'product_ids': product_ids,'add_qty': parseInt(qty)}) @@ -152,7 +152,7 @@ $('.oe_website_sale').each(function () { }); $(oe_website_sale).on('change', 'input.js_variant_change, select.js_variant_change, ul[data-attribute_value_ids]', function (ev) { - var $ul = $(ev.target).closest('ul.js_add_cart_variants'); + var $ul = $(ev.target).closest('.js_add_cart_variants'); var $parent = $ul.closest('.js_product'); var $product_id = $parent.find('input.product_id').first(); var $price = $parent.find(".oe_price:first .oe_currency_value"); @@ -223,7 +223,7 @@ $('.oe_website_sale').each(function () { $('input.js_product_change', this).first().trigger('change'); }); - $('ul.js_add_cart_variants', oe_website_sale).each(function () { + $('.js_add_cart_variants', oe_website_sale).each(function () { $('input.js_variant_change, select.js_variant_change', this).first().trigger('change'); }); diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml index dba86c39c7e..8d258e3f249 100644 --- a/addons/website_sale/views/templates.xml +++ b/addons/website_sale/views/templates.xml @@ -373,7 +373,7 @@

Product Name