Skip to content

Commit

Permalink
Merge remote-tracking branch 'odoo/8.0' into 8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
OCA-git-bot committed Dec 26, 2016
2 parents 1c2ad1e + 534eab0 commit 41b4b37
Show file tree
Hide file tree
Showing 40 changed files with 162 additions and 111 deletions.
2 changes: 1 addition & 1 deletion addons/account/account.py
Original file line number Diff line number Diff line change
Expand Up @@ -2598,7 +2598,7 @@ def generate_account(self, cr, uid, chart_template_id, tax_template_ref, acc_tem
children_acc_criteria = [('chart_template_id','=', chart_template_id)]
if template.account_root_id.id:
children_acc_criteria = ['|'] + children_acc_criteria + ['&',('parent_id','child_of', [template.account_root_id.id]),('chart_template_id','=', False)]
children_acc_template = self.search(cr, uid, [('nocreate','!=',True)] + children_acc_criteria, order='id')
children_acc_template = self.search(cr, uid, [('nocreate','!=',True)] + children_acc_criteria, order='id', context=context)
for account_template in self.browse(cr, uid, children_acc_template, context=context):
# skip the root of COA if it's not the main one
if (template.account_root_id.id == account_template.id) and template.parent_id:
Expand Down
28 changes: 14 additions & 14 deletions addons/account/i18n/da.po
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: Odoo 8.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-10-15 06:40+0000\n"
"PO-Revision-Date: 2016-05-18 05:49+0000\n"
"PO-Revision-Date: 2016-12-20 11:23+0000\n"
"Last-Translator: Hans Henrik Gabelgaard <hhg@gabelgaard.org>\n"
"Language-Team: Danish (http://www.transifex.com/odoo/odoo-8/language/da/)\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -683,22 +683,22 @@ msgstr "Konto kode og navn"
#. module: account
#: model:ir.model,name:account.model_account_common_account_report
msgid "Account Common Account Report"
msgstr ""
msgstr "Konto almindelig kontorapport"

#. module: account
#: model:ir.model,name:account.model_account_common_journal_report
msgid "Account Common Journal Report"
msgstr ""
msgstr "Konto almindelig journalrapport"

#. module: account
#: model:ir.model,name:account.model_account_common_partner_report
msgid "Account Common Partner Report"
msgstr ""
msgstr "Konto almindelig partner rapport"

#. module: account
#: model:ir.model,name:account.model_account_common_report
msgid "Account Common Report"
msgstr ""
msgstr "Konto almindelig rapport"

#. module: account
#: field:account.analytic.line,currency_id:0
Expand Down Expand Up @@ -745,7 +745,7 @@ msgstr "Konto linie"
#: field:account.fiscal.position,account_ids:0
#: field:account.fiscal.position.template,account_ids:0
msgid "Account Mapping"
msgstr ""
msgstr "Konto kortlægning"

#. module: account
#: field:account.use.model,model:0
Expand Down Expand Up @@ -1108,7 +1108,7 @@ msgstr "Konterings gruppe"
#: view:account.fiscal.position:account.view_account_position_form
#: view:account.fiscal.position.template:account.view_account_position_template_form
msgid "Accounts Mapping"
msgstr ""
msgstr "Regnskabskortlægning"

#. module: account
#: view:account.journal:account.view_account_journal_form
Expand Down Expand Up @@ -6611,7 +6611,7 @@ msgstr "Intet regnskabsår er oprettet for dette firma"
#. module: account
#: field:account.move.line,blocked:0
msgid "No Follow-up"
msgstr ""
msgstr "Ingen opfølgning"

#. module: account
#: code:addons/account/account_invoice.py:799
Expand Down Expand Up @@ -6640,7 +6640,7 @@ msgstr ""
#. module: account
#: selection:account.financial.report,display_detail:0
msgid "No detail"
msgstr ""
msgstr "Ingen detaljer"

#. module: account
#: code:addons/account/wizard/account_invoice_refund.py:154
Expand All @@ -6659,7 +6659,7 @@ msgstr "Ingen periode eller mere end en periode blev fundet for den anførte dat
#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:122
#, python-format
msgid "No result matching '"
msgstr ""
msgstr "Ingen resultater der matcher '"

#. module: account
#: help:account.chart.template,code_digits:0
Expand Down Expand Up @@ -6840,7 +6840,7 @@ msgstr "Kun administratorer kan ændre opsætning"
#: code:addons/account/static/src/js/account_widgets.js:539
#, python-format
msgid "Only use the ctrl-enter shortcut to validate reconciliations."
msgstr ""
msgstr "Brug kun ctrl-enter genvej for at godkende afstemninger."

#. module: account
#: view:account.analytic.account:account.view_account_analytic_account_search
Expand Down Expand Up @@ -6887,7 +6887,7 @@ msgstr "Åben journal"
#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:195
#, python-format
msgid "Open balance"
msgstr ""
msgstr "Åbn balance"

#. module: account
#: view:account.move.bank.reconcile:account.view_account_move_bank_reconcile
Expand Down Expand Up @@ -7225,7 +7225,7 @@ msgstr "Partnere udlignet i dag"
#. module: account
#: selection:account.aged.trial.balance,direction_selection:0
msgid "Past"
msgstr ""
msgstr "Udløbet"

#. module: account
#: field:account.config.settings,module_account_check_writing:0
Expand Down Expand Up @@ -10998,7 +10998,7 @@ msgstr ""
#: code:addons/account/static/src/js/account_widgets.js:533
#, python-format
msgid "Whew, that was fast !"
msgstr ""
msgstr "Hold da op, det var hurtigt !"

#. module: account
#: field:account.central.journal,amount_currency:0
Expand Down
8 changes: 4 additions & 4 deletions addons/account/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
# Jose Manuel <admin@jaboweb.com>, 2015
# Juan Cristobal Lopez Arrieta <juancristobal@gmail.com>, 2015
# Martin Trigaux, 2015-2016
# Pedro M. Baeza <pedro.baeza@gmail.com>, 2015
# Pedro M. Baeza <pedro.baeza@gmail.com>, 2015-2016
# ulises aldana <rauleo88@hotmail.com>, 2015
msgid ""
msgstr ""
"Project-Id-Version: Odoo 8.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-10-15 06:40+0000\n"
"PO-Revision-Date: 2016-11-22 12:14+0000\n"
"Last-Translator: Martin Trigaux\n"
"PO-Revision-Date: 2016-12-18 02:26+0000\n"
"Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>\n"
"Language-Team: Spanish (http://www.transifex.com/odoo/odoo-8/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -8214,7 +8214,7 @@ msgstr "Factura rectificativa basada en este tipo. No puede modificar o cancelar
#. module: account
#: view:account.tax:account.view_tax_form
msgid "Refunds"
msgstr "Devoluciones"
msgstr "Facturas rectificativas"

#. module: account
#: selection:account.account,type:0 selection:account.account.template,type:0
Expand Down
1 change: 1 addition & 0 deletions addons/account/report/report_vat.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ def set_context(self, objects, data, ids, report_type=None):
'based_on': 'invoices',
'company_id': company_id,
'display_detail': False,
'chart_tax_id': self.pool['account.vat.declaration']._get_tax(self.cr, self.uid),
}
}
self.period_ids = []
Expand Down
2 changes: 1 addition & 1 deletion addons/account_voucher/voucher_payment_receipt_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
<field name="type" invisible="True"/>
<group>
<group>
<field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" string="Supplier"/>
<field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" domain="[('supplier','=',True)]" string="Supplier"/>
<field name="currency_id" invisible="1"/>
<field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)" class="oe_inline" widget='monetary' options='{"currency_field": "currency_id"}'/>
<field name="journal_id"
Expand Down
7 changes: 4 additions & 3 deletions addons/auth_signup/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
#
# Translators:
# FIRST AUTHOR <EMAIL@ADDRESS>, 2014
# Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
# Sandra Figueroa <sandrafigvar@gmail.com>, 2016
msgid ""
msgstr ""
"Project-Id-Version: Odoo 8.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-12-16 13:15+0000\n"
"PO-Revision-Date: 2016-06-02 15:11+0000\n"
"Last-Translator: Sandra Figueroa <sandrafigvar@gmail.com>\n"
"PO-Revision-Date: 2016-12-18 02:22+0000\n"
"Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>\n"
"Language-Team: Spanish (http://www.transifex.com/odoo/odoo-8/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -99,7 +100,7 @@ msgstr "Se ha enviado un correo electrónico de invitación conteniendo el sigu
#: code:addons/auth_signup/controllers/main.py:58
#, python-format
msgid "Another user is already registered using this email address."
msgstr "Otro usuario ya se ha registrado usando esta dirección de correo electrónico"
msgstr "Otro usuario ya se ha registrado usando esta dirección de correo electrónico."

#. module: auth_signup
#: code:addons/auth_signup/controllers/main.py:130
Expand Down
12 changes: 6 additions & 6 deletions addons/calendar/calendar.py
Original file line number Diff line number Diff line change
Expand Up @@ -720,15 +720,15 @@ def todate(date):
return [d.astimezone(pytz.UTC) for d in rset1]

def _get_recurrency_end_date(self, cr, uid, id, context=None):
data = self.read(cr, uid, id, ['final_date', 'recurrency', 'rrule_type', 'count', 'end_type', 'stop'], context=context)
data = self.read(cr, uid, id, ['final_date', 'recurrency', 'rrule_type', 'count', 'end_type', 'stop', 'interval'], context=context)

if not data.get('recurrency'):
return False

end_type = data.get('end_type')
final_date = data.get('final_date')
if end_type == 'count' and all(data.get(key) for key in ['count', 'rrule_type', 'stop']):
count = data['count'] + 1
if end_type == 'count' and all(data.get(key) for key in ['count', 'rrule_type', 'stop', 'interval']):
count = (data['count'] + 1) * data['interval']
delay, mult = {
'daily': ('days', 1),
'weekly': ('days', 7),
Expand Down Expand Up @@ -1016,12 +1016,12 @@ def onchange_allday(self, cr, uid, ids, start=False, end=False, starttime=False,
startdatetime = startdatetime or start
if startdatetime:
start = datetime.strptime(startdatetime, DEFAULT_SERVER_DATETIME_FORMAT)
value['start_date'] = datetime.strftime(start, DEFAULT_SERVER_DATE_FORMAT)
value['start_date'] = fields.date.context_today(self, cr, uid, context=context, timestamp=start)

enddatetime = enddatetime or end
if enddatetime:
end = datetime.strptime(enddatetime, DEFAULT_SERVER_DATETIME_FORMAT)
value['stop_date'] = datetime.strftime(end, DEFAULT_SERVER_DATE_FORMAT)
value['stop_date'] = fields.date.context_today(self, cr, uid, context=context, timestamp=end)
else: # from date to datetime
user = self.pool['res.users'].browse(cr, uid, uid, context)
tz = pytz.timezone(user.tz) if user.tz else pytz.utc
Expand Down Expand Up @@ -1349,7 +1349,7 @@ def _parse_rrule(self, rule, data, date_start):
data['rrule_type'] = 'monthly'

if r._bymonthday:
data['day'] = r._bymonthday[0]
data['day'] = list(r._bymonthday)[0]
data['month_by'] = 'date'
data['rrule_type'] = 'monthly'

Expand Down
3 changes: 2 additions & 1 deletion addons/event_sale/event_sale.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,8 @@ def _get_price_reduce(self, cr, uid, ids, field_name, arg, context=None):
_columns = {
'name': fields.char('Name', required=True, translate=True),
'event_id': fields.many2one('event.event', "Event", required=True, ondelete='cascade'),
'product_id': fields.many2one('product.product', 'Product', required=True, domain=[("event_ok", "=", True)]),
'product_id': fields.many2one('product.product', 'Product', required=True,
domain=["|", ("event_type_id", "!=", False), ("event_ok", "=", True)]),
'registration_ids': fields.one2many('event.registration', 'event_ticket_id', 'Registrations'),
'deadline': fields.date("Sales End"),
'is_expired': fields.function(_is_expired, type='boolean', string='Is Expired'),
Expand Down
4 changes: 2 additions & 2 deletions addons/fleet/i18n/ja.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: Odoo 8.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-01-21 14:09+0000\n"
"PO-Revision-Date: 2016-12-08 03:55+0000\n"
"PO-Revision-Date: 2016-12-22 01:55+0000\n"
"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
"Language-Team: Japanese (http://www.transifex.com/odoo/odoo-8/language/ja/)\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -1236,7 +1236,7 @@ msgstr ""
#. module: fleet
#: model:fleet.service.type,name:fleet.type_service_31
msgid "Oil Change"
msgstr ""
msgstr "オイル交換"

#. module: fleet
#: model:fleet.service.type,name:fleet.type_service_32
Expand Down
13 changes: 7 additions & 6 deletions addons/gamification/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
# Translators:
# Carles Antoli <carlesantoli@hotmail.com>, 2016
# FIRST AUTHOR <EMAIL@ADDRESS>, 2014
# Oihane Crucelaegui <oihanecruce@gmail.com>, 2016
# oihane <oihanecruce@gmail.com>, 2016
# Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
msgid ""
msgstr ""
"Project-Id-Version: Odoo 8.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-05-25 12:58+0000\n"
"PO-Revision-Date: 2016-07-30 06:30+0000\n"
"Last-Translator: Oihane Crucelaegui <oihanecruce@gmail.com>\n"
"PO-Revision-Date: 2016-12-18 02:25+0000\n"
"Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>\n"
"Language-Team: Spanish (http://www.transifex.com/odoo/odoo-8/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -603,7 +604,7 @@ msgstr "Modo de visualización"
#: field:gamification.goal.definition,display_name:0
#: field:gamification.goal.wizard,display_name:0
msgid "Display Name"
msgstr "Nombre a mostrar"
msgstr "Nombre mostrado"

#. module: gamification
#: field:gamification.goal.definition,display_mode:0
Expand Down Expand Up @@ -1669,7 +1670,7 @@ msgid ""
"The model configuration for the definition %s seems incorrect, please check it.\n"
"\n"
"%s not found"
msgstr "La configuración del modelo para la definición %s parece incorrecta, por favor compruebe que.\n\n%s no se encuentra"
msgstr "La configuración del modelo para la definición %s parece incorrecta, por favor compruébela.\n\n% no encontrado"

#. module: gamification
#: code:addons/gamification/models/goal.py:158
Expand All @@ -1678,7 +1679,7 @@ msgid ""
"The model configuration for the definition %s seems incorrect, please check it.\n"
"\n"
"%s not stored"
msgstr "La configuración del modelo para la definición %s parece incorrecta, compruebe que.\n\n%s no esta guardada"
msgstr "La configuración del modelo para la definición %s parece incorrecta. Por favor revísela.\n\n%s es un campo no almacenado"

#. module: gamification
#: help:gamification.goal.definition,model_id:0
Expand Down
4 changes: 2 additions & 2 deletions addons/google_calendar/google_calendar.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ def generate_data(self, cr, uid, event, isCreating=False, context=None):
if not context:
context = {}
if event.allday:
start_date = fields.datetime.context_timestamp(cr, uid, datetime.strptime(event.start, tools.DEFAULT_SERVER_DATETIME_FORMAT), context=context).isoformat('T').split('T')[0]
final_date = fields.datetime.context_timestamp(cr, uid, datetime.strptime(event.stop, tools.DEFAULT_SERVER_DATETIME_FORMAT) + timedelta(days=1), context=context).isoformat('T').split('T')[0]
start_date = event.start_date
final_date = (datetime.strptime(event.stop_date, tools.DEFAULT_SERVER_DATE_FORMAT) + timedelta(days=1)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
type = 'date'
vstype = 'dateTime'
else:
Expand Down
4 changes: 3 additions & 1 deletion addons/hr_holidays/hr_holidays.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
from openerp.exceptions import Warning
from openerp import tools
from openerp.osv import fields, osv
from openerp.tools import float_compare
from openerp.tools.translate import _


Expand Down Expand Up @@ -460,7 +461,8 @@ def check_holidays(self, cr, uid, ids, context=None):
if record.holiday_type != 'employee' or record.type != 'remove' or not record.employee_id or record.holiday_status_id.limit:
continue
leave_days = self.pool.get('hr.holidays.status').get_days(cr, uid, [record.holiday_status_id.id], record.employee_id.id, context=context)[record.holiday_status_id.id]
if leave_days['remaining_leaves'] < 0 or leave_days['virtual_remaining_leaves'] < 0:
if float_compare(leave_days['remaining_leaves'], 0, precision_digits=2) == -1 or \
float_compare(leave_days['virtual_remaining_leaves'], 0, precision_digits=2) == -1:
# Raising a warning gives a more user-friendly feedback than the default constraint error
raise Warning(_('The number of remaining leaves is not sufficient for this leave type.\n'
'Please verify also the leaves waiting for validation.'))
Expand Down
7 changes: 4 additions & 3 deletions addons/mass_mailing/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
# Alejandro Santana <alejandrosantana@anubia.es>, 2015
# FIRST AUTHOR <EMAIL@ADDRESS>, 2014
# Jairo Llopis <yajo.sk8@gmail.com>, 2016
# Oihane Crucelaegui <oihanecruce@gmail.com>, 2015
# oihane <oihanecruce@gmail.com>, 2015
# Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
msgid ""
msgstr ""
"Project-Id-Version: Odoo 8.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-01-21 14:08+0000\n"
"PO-Revision-Date: 2016-09-02 10:25+0000\n"
"PO-Revision-Date: 2016-12-18 02:23+0000\n"
"Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>\n"
"Language-Team: Spanish (http://www.transifex.com/odoo/odoo-8/language/es/)\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -1103,4 +1104,4 @@ msgstr "su correo electrónico..."
#: code:addons/mass_mailing/models/mail_mail.py:72
#, python-format
msgid "Click to unsubscribe"
msgstr "Click para anular subscripción"
msgstr "Pulse para anular subscripción"
2 changes: 1 addition & 1 deletion addons/mrp/stock.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ def action_scrap(self, cr, uid, ids, product_qty, location_id, restrict_lot_id=F
production_obj.signal_workflow(cr, uid, [prod_id], 'button_produce')
if move.production_id.id:
self.write(cr, uid, new_moves, {'production_id': move.production_id.id}, context=context)
res.append(new_moves)
res.extend(new_moves)
return res

def write(self, cr, uid, ids, vals, context=None):
Expand Down
4 changes: 2 additions & 2 deletions addons/mrp_repair/i18n/el.po
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Odoo 8.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-01-21 14:08+0000\n"
"PO-Revision-Date: 2016-12-07 14:31+0000\n"
"PO-Revision-Date: 2016-12-21 11:20+0000\n"
"Last-Translator: Kostas Goutoudis <goutoudis@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/odoo/odoo-8/language/el/)\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -79,7 +79,7 @@ msgstr "Πρόσθεση"
#. module: mrp_repair
#: view:mrp.repair:mrp_repair.view_repair_order_form
msgid "Add internal notes..."
msgstr ""
msgstr "Προσθήκη εσωτερικών σημειώσεων..."

#. module: mrp_repair
#: view:mrp.repair:mrp_repair.view_repair_order_form
Expand Down
Loading

0 comments on commit 41b4b37

Please sign in to comment.