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

[MERGE] forward port of branch 8.0 up to 1c5c255

Browse Source
This commit is contained in:
Christophe Simonis
2015-11-25 18:59:05 +01:00
parent dade7e3c17 1c5c255186
commit a73e29255d
4 changed files with 47 additions and 1590 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/calendar/calendar.py
+2 -2
View File
@@ -798,9 +798,9 @@ class calendar_event(osv.Model):
time = _("AllDay , %s") % (event_date)
elif zduration < 24:
duration = date + timedelta(hours=zduration)
time = ("%s at (%s To %s) (%s)") % (event_date, display_time, duration.strftime(format_time), tz)
time = _("%s at (%s To %s) (%s)") % (event_date, display_time, duration.strftime(format_time), tz)
else:
time = ("%s at %s To\n %s at %s (%s)") % (event_date, display_time, date_deadline.strftime(format_date), date_deadline.strftime(format_time), tz)
time = _("%s at %s To\n %s at %s (%s)") % (event_date, display_time, date_deadline.strftime(format_date), date_deadline.strftime(format_time), tz)
return time
def _compute(self, cr, uid, ids, fields, arg, context=None):
addons/calendar/i18n/base_calendar.pot
-1575
View File
File diff suppressed because it is too large Load Diff
addons/calendar/i18n/calendar.pot
+38 -13
View File
@@ -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:07+0000\n"
"PO-Revision-Date: 2015-01-21 14:07+0000\n"
"POT-Creation-Date: 2015-11-25 13:28+0000\n"
"PO-Revision-Date: 2015-11-25 13:28+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -43,11 +43,11 @@ msgid "\n"
" <table>\n"
" <tr>\n"
" <td>\n"
" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;border-color:#ffffff;background:#8a89ba;padding-top: 4px;\">${object.event_id.get_interval(object.event_id.start, 'dayname')}</div>\n"
" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;border-color:#ffffff;background:#8a89ba;padding-top: 4px;\">${object.event_id.get_interval(object.event_id.start, 'dayname', tz=object.partner_id.tz)}</div>\n"
" <div style=\"font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #E1E2F8;width: 130px;\">\n"
" ${object.event_id.get_interval(object.event_id.start,'day')}\n"
" ${object.event_id.get_interval(object.event_id.start,'day', tz=object.partner_id.tz)}\n"
" </div>\n"
" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#8a89ba'>${object.event_id.get_interval(object.event_id.start, 'month')}</div>\n"
" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#8a89ba'>${object.event_id.get_interval(object.event_id.start, 'month', tz=object.partner_id.tz)}</div>\n"
" <div style=\"border-collapse:separate;color:#8a89ba;text-align:center;width: 128px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid;border-bottom-left-radius:3px;\">${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}</div>\n"
" </td>\n"
" <td>\n"
@@ -161,11 +161,11 @@ msgid "\n"
" <table>\n"
" <tr>\n"
" <td>\n"
" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;border-color:#ffffff;background:#8a89ba;padding-top: 4px;\">${object.event_id.get_interval(object.event_id.start, 'dayname')}</div>\n"
" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;border-color:#ffffff;background:#8a89ba;padding-top: 4px;\">${object.event_id.get_interval(object.event_id.start, 'dayname', tz=object.partner_id.tz)}</div>\n"
" <div style=\"font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #E1E2F8;width: 130px;\">\n"
" ${object.event_id.get_interval(object.event_id.start,'day')}\n"
" ${object.event_id.get_interval(object.event_id.start,'day', tz=object.partner_id.tz)}\n"
" </div>\n"
" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#8a89ba'>${object.event_id.get_interval(object.event_id.start, 'month')}</div>\n"
" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#8a89ba'>${object.event_id.get_interval(object.event_id.start, 'month', tz=object.partner_id.tz)}</div>\n"
" <div style=\"border-collapse:separate;color:#8a89ba;text-align:center;width: 128px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid;border-bottom-left-radius:3px;\">${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}</div>\n"
" </td>\n"
" <td>\n"
@@ -286,11 +286,11 @@ msgid " \n"
" <table>\n"
" <tr> \n"
" <td>\n"
" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;border-color:#ffffff;background:#8a89ba;padding-top: 4px;\">${object.event_id.get_interval(object.event_id.start, 'dayname')}</div>\n"
" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;border-color:#ffffff;background:#8a89ba;padding-top: 4px;\">${object.event_id.get_interval(object.event_id.start, 'dayname', tz=object.partner_id.tz)}</div>\n"
" <div style=\"font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #E1E2F8;width: 130px;\">\n"
" ${object.event_id.get_interval(object.event_id.start,'day')}\n"
" ${object.event_id.get_interval(object.event_id.start,'day', tz=object.partner_id.tz)}\n"
" </div>\n"
" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#8a89ba'>${object.event_id.get_interval(object.event_id.start, 'month')}</div>\n"
" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#8a89ba'>${object.event_id.get_interval(object.event_id.start, 'month', tz=object.partner_id.tz)}</div>\n"
" <div style=\"border-collapse:separate;color:#8a89ba;text-align:center;width: 128px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid;border-bottom-left-radius:3px;\">${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}</div>\n"
" </td>\n"
" <td>\n"
@@ -404,6 +404,19 @@ msgstr ""
msgid "${object.event_id.name} - Reminder"
msgstr ""
#. module: calendar
#: code:addons/calendar/calendar.py:802
#, python-format
msgid "%s at %s To\n"
" %s at %s (%s)"
msgstr ""
#. module: calendar
#: code:addons/calendar/calendar.py:800
#, python-format
msgid "%s at (%s To %s) (%s)"
msgstr ""
#. module: calendar
#: model:ir.actions.act_window,help:calendar.action_calendar_event
msgid "<p class=\"oe_view_nocontent_create\">\n"
@@ -530,6 +543,13 @@ msgstr ""
msgid "Calendar"
msgstr ""
#. module: calendar
#: view:calendar.alarm:calendar.view_calendar_alarm_tree
#: model:ir.actions.act_window,name:calendar.action_calendar_alarm
#: model:ir.ui.menu,name:calendar.menu_calendar_alarm
msgid "Calendar Alarm"
msgstr ""
#. module: calendar
#. openerp-web
#: code:addons/calendar/static/src/xml/base_calendar.xml:42
@@ -653,6 +673,11 @@ msgstr ""
msgid "Duration"
msgstr ""
#. module: calendar
#: field:calendar.alarm,duration_minutes:0
msgid "Duration in minutes"
msgstr ""
#. module: calendar
#: selection:calendar.alarm,type:0
#: field:calendar.attendee,email:0
@@ -660,7 +685,7 @@ msgid "Email"
msgstr ""
#. module: calendar
#: code:addons/calendar/calendar.py:1381
#: code:addons/calendar/calendar.py:1402
#, python-format
msgid "Email addresses not found"
msgstr ""
@@ -823,7 +848,7 @@ msgstr ""
#. module: calendar
#: help:calendar.event,active:0
msgid "If the active field is set to true, it will allow you to hide the event alarm information without removing it."
msgid "If the active field is set to false, it will allow you to hide the event alarm information without removing it."
msgstr ""
#. module: calendar
addons/stock/security/stock_security.xml
+7
View File
@@ -80,6 +80,13 @@
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record model="ir.rule" id="stock_quant_rule">
<field name="name">stock_quant multi-company</field>
<field name="model_id" ref="model_stock_quant"/>
<field name="global" eval="True"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record model="ir.rule" id="stock_inventory_line_comp_rule">
<field name="name">Inventory Line multi-company</field>
<field name="model_id" ref="model_stock_inventory_line"/>