odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] Merged with web/trunk. 

bzr revid: tde@openerp.com-20120713080041-54367204xp0ypozb
bzr revid: tde@openerp.com-20120713142609-5dmznm8j8pdnr177
bzr revid: tde@openerp.com-20120716083004-h8gibdwvpyvzm74m
bzr revid: tde@openerp.com-20120717075907-omr38xg4lw68j4g1
bzr revid: tde@openerp.com-20120718110900-4r1sjlpksebly5q4
bzr revid: tde@openerp.com-20120719083341-qwmi9ogr0pdsrcfg
This commit is contained in:
Thibault Delavallée 2012-07-19 10:33:41 +02:00
parent c183ec5e03 6dc3b76255
commit 2a268329c5
34 changed files with 1248 additions and 1047 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/web/__openerp__.py
View File

@ -1,10 +1,10 @@
{ {
"name" : "web", "name" : "Web",
"category": "Hidden", "category": "Hidden",
"description": "description":
""" """
OpenERP Web core module. OpenERP Web core module.
This module provides the core of the OpenERP web client. This module provides the core of the OpenERP Web Client.
""", """,
"depends" : [], "depends" : [],
'auto_install': True, 'auto_install': True,

16
addons/web/common/http.py
View File

@ -417,6 +417,18 @@ class ControllerType(type):
class Controller(object): class Controller(object):
__metaclass__ = ControllerType __metaclass__ = ControllerType
class DisableCacheMiddleware(object):
def __init__(self, app):
self.app = app
def __call__(self, environ, start_response):
def start_wrapped(status, headers):
debug = environ.get('HTTP_REFERER', '').find('debug') != -1
filtered_headers = [(k,v) for k,v in headers if not (k=='Last-Modified' or (debug and k=='Cache-Control'))]
if debug:
filtered_headers.append(('Cache-Control', 'no-cache'))
start_response(status, filtered_headers)
return self.app(environ, start_wrapped)
class Root(object): class Root(object):
"""Root WSGI application for the OpenERP Web Client. """Root WSGI application for the OpenERP Web Client.
@ -452,8 +464,8 @@ class Root(object):
static_dirs = self._load_addons(openerp_addons_namespace) static_dirs = self._load_addons(openerp_addons_namespace)
if options.serve_static: if options.serve_static:
self.dispatch = werkzeug.wsgi.SharedDataMiddleware( app = werkzeug.wsgi.SharedDataMiddleware( self.dispatch, static_dirs)
self.dispatch, static_dirs, cache=False) self.dispatch = DisableCacheMiddleware(app)
if options.session_storage: if options.session_storage:
if not os.path.exists(options.session_storage): if not os.path.exists(options.session_storage):

18
addons/web/controllers/main.py
View File

@ -258,8 +258,7 @@ class WebClient(openerpweb.Controller):
file_map = dict(files) file_map = dict(files)
rx_import = re.compile(r"""@import\s+('|")(?!'|"|/|https?://)""", re.U) rx_import = re.compile(r"""@import\s+('|")(?!'|"|/|https?://)""", re.U)
rx_url = re.compile(r"""url\s*\(\s*('|"|)(?!'|"|/|https?://)""", re.U) rx_url = re.compile(r"""url\s*\(\s*('|"|)(?!'|"|/|https?://|data:)""", re.U)
def reader(f): def reader(f):
"""read the a css file and absolutify all relative uris""" """read the a css file and absolutify all relative uris"""
@ -1494,10 +1493,6 @@ class Binary(openerpweb.Controller):
class Action(openerpweb.Controller): class Action(openerpweb.Controller):
_cp_path = "/web/action" _cp_path = "/web/action"
action_mapping = {
"ir.actions.act_url": "ir.actions.url",
}
# For most actions, the type attribute and the model name are the same, but # For most actions, the type attribute and the model name are the same, but
# there are exceptions. This dict is used to remap action type attributes # there are exceptions. This dict is used to remap action type attributes
@ -1511,6 +1506,17 @@ class Action(openerpweb.Controller):
Actions = req.session.model('ir.actions.actions') Actions = req.session.model('ir.actions.actions')
value = False value = False
context = req.session.eval_context(req.context) context = req.session.eval_context(req.context)
try:
action_id = int(action_id)
except ValueError:
try:
module, xmlid = action_id.split('.', 1)
model, action_id = req.session.model('ir.model.data').get_object_reference(module, xmlid)
assert model.startswith('ir.actions.')
except Exception:
action_id = 0 # force failed read
base_action = Actions.read([action_id], ['type'], context) base_action = Actions.read([action_id], ['type'], context)
if base_action: if base_action:
ctx = {} ctx = {}

834
addons/web/i18n/ja.po
View File

File diff suppressed because it is too large Load Diff

235
addons/web/static/src/css/base.css
View File

@ -1,4 +1,4 @@
@charset "utf-8"; @charset "UTF-8";
@font-face { @font-face {
font-family: "mnmliconsRegular"; font-family: "mnmliconsRegular";
src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@ -34,7 +34,7 @@
background: white; background: white;
/* http://www.quirksmode.org/dom/inputfile.html /* http://www.quirksmode.org/dom/inputfile.html
* http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
*/ */ */
} }
.openerp a { .openerp a {
text-decoration: none; text-decoration: none;
@ -188,13 +188,7 @@
} }
.openerp.ui-dialog { .openerp.ui-dialog {
display: none; display: none;
position: fixed;
padding: 6px; padding: 6px;
top: 50%;
left: 50%;
z-index: 1050;
width: 560px;
margin: -150px 0 0 -280px;
background-color: rgba(60, 60, 60, 0.7); background-color: rgba(60, 60, 60, 0.7);
border: 1px solid; border: 1px solid;
border-color: #888888 #555555 #444444; border-color: #888888 #555555 #444444;
@ -208,6 +202,9 @@
-moz-background-clip: padding-box; -moz-background-clip: padding-box;
background-clip: padding-box; background-clip: padding-box;
} }
.openerp.ui-dialog .ui-dialog-content {
padding: 0px;
}
.openerp.ui-dialog .ui-dialog-titlebar, .openerp.ui-dialog .ui-dialog-content, .openerp.ui-dialog .ui-dialog-buttonpane { .openerp.ui-dialog .ui-dialog-titlebar, .openerp.ui-dialog .ui-dialog-content, .openerp.ui-dialog .ui-dialog-buttonpane {
padding: 16px; padding: 16px;
} }
@ -237,14 +234,16 @@
.openerp.ui-dialog .ui-dialog-buttonpane { .openerp.ui-dialog .ui-dialog-buttonpane {
border-top: 1px solid #e0e0e0; border-top: 1px solid #e0e0e0;
background: #f5f7f9; background: #f5f7f9;
padding: 8px;
margin: 0; margin: 0;
-moz-border-radius: 0 0 2px 2px; -moz-border-radius: 0 0 2px 2px;
-webkit-border-radius: 0 0 2px 2px; -webkit-border-radius: 0 0 2px 2px;
border-radius: 0 0 2px 2px; border-radius: 0 0 2px 2px;
} }
.openerp.ui-dialog .ui-dialog-buttonpane button { .openerp.ui-dialog .ui-dialog-buttonpane button {
margin-left: 8px; margin: 0;
}
.openerp.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
float: left;
} }
.openerp.ui-dialog .ui-dialog-titlebar-close { .openerp.ui-dialog .ui-dialog-titlebar-close {
padding: 0; padding: 0;
@ -268,6 +267,9 @@
color: black; color: black;
text-decoration: none; text-decoration: none;
} }
.openerp.ui-dialog.oe_act_window .ui-dialog-content {
padding: 0px;
}
.openerp .modal-backdrop { .openerp .modal-backdrop {
position: fixed; position: fixed;
top: 0; top: 0;
@ -308,6 +310,7 @@
} }
.openerp .oe_fade { .openerp .oe_fade {
color: #888888; color: #888888;
font-weight: normal;
} }
.openerp .oe_bold { .openerp .oe_bold {
font-weight: bold; font-weight: bold;
@ -376,7 +379,8 @@
background: #ed6f6a; background: #ed6f6a;
} }
.openerp .oe_title { .openerp .oe_title {
width: 60%; width: 50%;
float: left;
} }
.openerp .oe_title:after { .openerp .oe_title:after {
content: "."; content: ".";
@ -386,17 +390,18 @@
visibility: hidden; visibility: hidden;
} }
.openerp .oe_button_box { .openerp .oe_button_box {
width: 38%; width: 270px;
text-align: right; text-align: right;
} }
.openerp .oe_button_box button { .openerp .oe_button_box button {
margin: 4px; margin: 4px;
} }
.openerp .oe_avatar { .openerp .oe_avatar {
margin: 0 16px 0 0; margin: 0 6px 15px 0;
} }
.openerp .oe_avatar img { .openerp .oe_avatar > img {
height: 50px; height: 90px;
max-width: 100px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
@ -405,6 +410,9 @@
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
border: none; border: none;
} }
.openerp .oe_avatar + div {
margin-left: 5px;
}
.openerp .oe_button.oe_link { .openerp .oe_button.oe_link {
border: none; border: none;
padding: 0; padding: 0;
@ -450,6 +458,29 @@
.openerp .oe_webclient .oe_star_on { .openerp .oe_webclient .oe_star_on {
color: gold; color: gold;
} }
.openerp .oe_tag {
border-radius: 2px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
border: 1px solid #9daccc;
background: #e2e6f0;
color: black !important;
padding: 0px 3px 0px 3px;
margin: 0 2px 2px 0;
height: 16px;
}
.openerp .oe_tags .text-wrap {
width: 100% !important;
}
.openerp .oe_tags .text-wrap textarea {
width: 100% !important;
}
.openerp .oe_tags .text-core .text-wrap .text-dropdown .text-list .text-suggestion em {
font-style: italic;
text-decoration: none;
}
.openerp.oe_tooltip { .openerp.oe_tooltip {
font-size: 12px; font-size: 12px;
} }
@ -1136,63 +1167,63 @@
.openerp .oe_view_manager .oe_view_manager_view_kanban { .openerp .oe_view_manager .oe_view_manager_view_kanban {
height: inherit; height: inherit;
} }
.openerp .oe_view_manager .oe_view_manager_header { .openerp .oe_view_manager table.oe_view_manager_header {
width: 100%; width: 100%;
table-layout: fixed;
} }
.openerp .oe_view_manager .oe_view_manager_header .oe_header_row { .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row {
clear: both; clear: both;
text-shadow: 0 1px 1px white; text-shadow: 0 1px 1px white;
} }
.openerp .oe_view_manager .oe_view_manager_header .oe_header_row:last-child td { .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row:last-child td {
padding-top: 0; padding-top: 0;
} }
.openerp .oe_view_manager .oe_view_manager_header .oe_view_manager_sidebar { .openerp .oe_view_manager table.oe_view_manager_header .oe_view_manager_sidebar {
margin: 0px auto; margin: 0px auto;
width: 400px;
text-align: center; text-align: center;
} }
.openerp .oe_view_manager .oe_view_manager_header td { .openerp .oe_view_manager table.oe_view_manager_header td {
line-height: 26px; line-height: 26px;
} }
.openerp .oe_view_manager .oe_view_manager_header h2 { .openerp .oe_view_manager table.oe_view_manager_header h2 {
font-size: 18px; font-size: 18px;
margin: 0; margin: 0;
float: left; float: left;
} }
.openerp .oe_view_manager .oe_view_manager_header h2 a { .openerp .oe_view_manager table.oe_view_manager_header h2 a {
color: #8a89ba; color: #8a89ba;
} }
.openerp .oe_view_manager .oe_view_manager_header .oe_button_group { .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group {
display: inline-block; display: inline-block;
border: 1px solid #ababab; border: 1px solid #ababab;
-moz-border-radius: 5px; -moz-border-radius: 5px;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
border-radius: 5px; border-radius: 5px;
} }
.openerp .oe_view_manager .oe_view_manager_header .oe_button_group li { .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group li {
float: left; float: left;
border-right: 1px solid #ababab; border-right: 1px solid #ababab;
} }
.openerp .oe_view_manager .oe_view_manager_header .oe_button_group li:last-child { .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group li:last-child {
border: none; border: none;
} }
.openerp .oe_view_manager .oe_view_manager_header .oe_button_group a { .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group a {
color: #4c4c4c; color: #4c4c4c;
} }
.openerp .oe_view_manager .oe_view_manager_header .oe_button_group a:hover { .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group a:hover {
text-decoration: none; text-decoration: none;
} }
.openerp .oe_view_manager .oe_view_manager_header .oe_button_group .active { .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group .active {
background: #999999; background: #999999;
-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
} }
.openerp .oe_view_manager .oe_view_manager_header .oe_button_group .active a { .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group .active a {
color: white; color: white;
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
} }
.openerp .oe_view_manager .oe_view_manager_header .oe_view_manager_buttons { .openerp .oe_view_manager table.oe_view_manager_header .oe_view_manager_buttons {
white-space: nowrap; white-space: nowrap;
} }
.openerp .oe_view_manager .oe_view_manager_pager { .openerp .oe_view_manager .oe_view_manager_pager {
@ -1319,7 +1350,7 @@
float: right; float: right;
padding: 1px 0; padding: 1px 0;
line-height: 18px; line-height: 18px;
width: 480px; width: 400px;
border: 1px solid #ababab; border: 1px solid #ababab;
background: white; background: white;
-moz-border-radius: 13px; -moz-border-radius: 13px;
@ -1741,12 +1772,12 @@
width: auto; width: auto;
} }
.openerp .oe_form_nosheet { .openerp .oe_form_nosheet {
margin-left: 10px; margin: 20px;
margin-right: 10px;
} }
.openerp .oe_form_nosheet > header { .openerp .oe_form_nosheet > header {
margin-left: -10px; margin-top: -20px;
margin-right: -10px; margin-left: -20px;
margin-right: -20px;
} }
.openerp .oe_form header { .openerp .oe_form header {
position: relative; position: relative;
@ -1765,7 +1796,7 @@
display: inline-block; display: inline-block;
float: right; float: right;
} }
.openerp .oe_form footer { .openerp .oe_form div.oe_chatter {
min-width: 650px; min-width: 650px;
max-width: 860px; max-width: 860px;
margin: 0 auto; margin: 0 auto;
@ -1817,17 +1848,21 @@
.openerp .oe_form .oe_subtotal_footer td.oe_form_group_cell_label { .openerp .oe_form .oe_subtotal_footer td.oe_form_group_cell_label {
border-right: none; border-right: none;
} }
.openerp .oe_form .oe_subtotal_footer .oe_form_field {
width: auto !important;
}
.openerp .oe_form .oe_subtotal_footer .oe_subtotal_footer_separator { .openerp .oe_form .oe_subtotal_footer .oe_subtotal_footer_separator {
width: 108px;
border-top: 1px solid #cacaca; border-top: 1px solid #cacaca;
font-sie: 120%;
font-weight: bold; font-weight: bold;
font-size: 18px;
}
.openerp .oe_form .oe_subtotal_footer label:after {
content: ":";
} }
.openerp .oe_form .oe_subtotal_footer label.oe_subtotal_footer_separator { .openerp .oe_form .oe_subtotal_footer label.oe_subtotal_footer_separator {
font-weight: bold !important; font-weight: bold !important;
padding: 2px 8px 2px 0px !important; padding: 2px 11px 2px 0px !important;
}
.openerp .oe_form .oe_subtotal_footer label.oe_form_label_help {
font-weight: normal;
} }
.openerp .oe_application .oe_form_sheetbg { .openerp .oe_application .oe_form_sheetbg {
background: url(/web/static/src/img/form_sheetbg.png); background: url(/web/static/src/img/form_sheetbg.png);
@ -1854,6 +1889,9 @@
.openerp .oe_application .oe_form_sheet .oe_notebook_page { .openerp .oe_application .oe_form_sheet .oe_notebook_page {
padding: 0 16px; padding: 0 16px;
} }
.openerp .oe_form .oe_form_button {
margin: 2px;
}
.openerp .oe_form td.oe_form_group_cell_label { .openerp .oe_form td.oe_form_group_cell_label {
border-right: 1px solid #dddddd; border-right: 1px solid #dddddd;
padding: 2px 0px 2px 0px; padding: 2px 0px 2px 0px;
@ -1861,17 +1899,17 @@
.openerp .oe_form td.oe_form_group_cell_label label { .openerp .oe_form td.oe_form_group_cell_label label {
line-height: 18px; line-height: 18px;
display: block; display: block;
min-width: 110px; min-width: 120px;
} }
.openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
padding-left: 6px; padding-left: 6px;
} }
.openerp .oe_form .oe_form_group { .openerp .oe_form .oe_form_group {
width: 100%; width: 100%;
margin: 4px 0 4px 0; margin: 6px 0 6px 0;
} }
.openerp .oe_form .oe_form_group .oe_group_right > tbody > tr > td:first-child { .openerp .oe_form .oe_form_group .oe_form_group_cell.oe_group_right {
padding-left: 18px; padding-left: 20px;
} }
.openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
font-weight: bold; font-weight: bold;
@ -1941,15 +1979,6 @@
.openerp .oe_form .oe_form_field_text.oe_inline, .openerp .oe_form .oe_form_field_text.oe_inline > textarea { .openerp .oe_form .oe_form_field_text.oe_inline, .openerp .oe_form .oe_form_field_text.oe_inline > textarea {
width: 500px; width: 500px;
} }
.openerp .oe_form .oe_form_field_float input {
width: 100px;
}
.openerp .oe_form h1 .oe_form_field_float input {
width: 140px;
}
.openerp .oe_form h2 .oe_form_field_float input {
width: 120px;
}
.openerp .oe_form h1, .openerp .oe_form h2, .openerp .oe_form h3, .openerp .oe_form h4, .openerp .oe_form h5, .openerp .oe_form h6 { .openerp .oe_form h1, .openerp .oe_form h2, .openerp .oe_form h3, .openerp .oe_form h4, .openerp .oe_form h5, .openerp .oe_form h6 {
margin: 0 0 4px 0; margin: 0 0 4px 0;
} }
@ -1966,18 +1995,6 @@
.openerp .oe_form .oe_form_field input { .openerp .oe_form .oe_form_field input {
margin: 0px; margin: 0px;
} }
.openerp .oe_form .oe_form_field_integer {
width: 180px;
}
.openerp .oe_form .oe_form_field_float {
width: 180px;
}
.openerp .oe_form .oe_form_field_date {
width: 7.5em;
}
.openerp .oe_form .oe_form_field_datetime {
width: 11em;
}
.openerp .oe_form input[type="text"], .openerp .oe_form input[type="password"], .openerp .oe_form input[type="file"], .openerp .oe_form select { .openerp .oe_form input[type="text"], .openerp .oe_form input[type="password"], .openerp .oe_form input[type="file"], .openerp .oe_form select {
height: 22px; height: 22px;
padding-top: 2px; padding-top: 2px;
@ -2017,32 +2034,6 @@
padding-top: 4px; padding-top: 4px;
width: auto; width: auto;
} }
.openerp .oe_form .oe_form_field_many2manytags .text-wrap {
width: 100% !important;
}
.openerp .oe_form .oe_form_field_many2manytags .text-wrap textarea {
width: 100% !important;
}
.openerp .oe_form .oe_form_field_many2manytags .oe_form_field_many2manytags_box {
border-radius: 2px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
position: relative;
float: left;
border: 1px solid #9daccc;
background: #e2e6f0;
color: black;
padding: 0px 3px 0px 3px;
margin: 0 2px 2px 0;
height: 16px;
font: 11px "lucida grande", tahoma, verdana, arial, sans-serif;
}
.openerp .oe_form .oe_form_field_many2manytags .text-core .text-wrap .text-dropdown .text-list .text-suggestion em {
font-style: italic;
text-decoration: none;
}
.openerp .oe_form .oe_datepicker_container { .openerp .oe_form .oe_datepicker_container {
display: none; display: none;
} }
@ -2072,15 +2063,6 @@
.openerp .oe_form .oe_form_field_with_button.oe_no_button > .oe_button { .openerp .oe_form .oe_form_field_with_button.oe_no_button > .oe_button {
display: none; display: none;
} }
.openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) input {
border-right: none;
-webkit-border-top-right-radius: 0px;
-webkit-border-bottom-right-radius: 0px;
-moz-border-radius-topright: 0px;
-moz-border-radius-bottomright: 0px;
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
}
.openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) > .oe_button { .openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) > .oe_button {
float: right; float: right;
-moz-border-radius: 0; -moz-border-radius: 0;
@ -2096,6 +2078,18 @@
position: relative; position: relative;
overflow: hidden; overflow: hidden;
} }
.openerp .oe_form_editable .oe_form .oe_form_field_integer {
width: 7em !important;
}
.openerp .oe_form_editable .oe_form .oe_form_field_float {
width: 8em !important;
}
.openerp .oe_form_editable .oe_form .oe_form_field_date {
width: 7.5em !important;
}
.openerp .oe_form_editable .oe_form .oe_form_field_datetime {
width: 11.5em !important;
}
.openerp .oe_hidden_input_file { .openerp .oe_hidden_input_file {
overflow: hidden; overflow: hidden;
position: relative; position: relative;
@ -2125,6 +2119,7 @@
} }
.openerp .oe_form .oe_form_field_image .oe_form_field_image_controls { .openerp .oe_form .oe_form_field_image .oe_form_field_image_controls {
position: absolute; position: absolute;
white-space: nowrap;
top: 1px; top: 1px;
padding: 3px 0 0 0; padding: 3px 0 0 0;
margin: 0 1px; margin: 0 1px;
@ -2146,33 +2141,42 @@
} }
.openerp .oe_form_field_many2one span.oe_m2o_drop_down_button { .openerp .oe_form_field_many2one span.oe_m2o_drop_down_button {
position: absolute; position: absolute;
top: 1px; top: 2px;
right: 0px; right: 0px;
} }
.openerp .oe_form_field_many2one .oe_m2o_cm_button {
line-height: 14px;
}
.openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
display: none; display: none;
} }
.openerp .oe_form_field_one2many .oe_list .oe_list_edit_row_save { .openerp .oe_form_field_one2many .oe_list_content > thead, .openerp .oe_form_field_many2many .oe_list_content > thead {
border-bottom: 1px;
}
.openerp .oe_form_field_one2many .oe_list_content > tbody tr:nth-child(odd), .openerp .oe_form_field_many2many .oe_list_content > tbody tr:nth-child(odd) {
background: transparent;
}
.openerp .oe_form_field_one2many .oe_list .oe_list_edit_row_save, .openerp .oe_form_field_many2many .oe_list .oe_list_edit_row_save {
background: url(/web/static/src/img/iconset-b-remove.png) 50% 50% no-repeat; background: url(/web/static/src/img/iconset-b-remove.png) 50% 50% no-repeat;
} }
.openerp .oe_form_field_one2many .oe_list .oe_list_edit_row_save:before { .openerp .oe_form_field_one2many .oe_list .oe_list_edit_row_save:before, .openerp .oe_form_field_many2many .oe_list .oe_list_edit_row_save:before {
visibility: hidden; visibility: hidden;
} }
.openerp .oe_form_field_one2many > .oe_view_manager .oe_header_row_top { .openerp .oe_form_field_one2many > .oe_view_manager .oe_header_row_top, .openerp .oe_form_field_many2many > .oe_view_manager .oe_header_row_top {
display: none; display: none;
} }
.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td { .openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td, .openerp .oe_form_field_many2many > .oe_view_manager .oe_view_manager_header2 td {
padding: 0px 8px; padding: 0px 8px;
line-height: 16px; line-height: 16px;
} }
.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td .oe_i { .openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td .oe_i, .openerp .oe_form_field_many2many > .oe_view_manager .oe_view_manager_header2 td .oe_i {
font-size: 13px; font-size: 13px;
} }
.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td .oe_pager_group { .openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td .oe_pager_group, .openerp .oe_form_field_many2many > .oe_view_manager .oe_view_manager_header2 td .oe_pager_group {
height: auto; height: auto;
line-height: 16px; line-height: 16px;
} }
.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td .oe_pager_group li { .openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td .oe_pager_group li, .openerp .oe_form_field_many2many > .oe_view_manager .oe_view_manager_header2 td .oe_pager_group li {
height: auto; height: auto;
line-height: 16px; line-height: 16px;
} }
@ -2185,6 +2189,10 @@
.openerp .oe_list_content td:first-child:after, .openerp .oe_list_content th:first-child:after { .openerp .oe_list_content td:first-child:after, .openerp .oe_list_content th:first-child:after {
border-width: 0; border-width: 0;
} }
.openerp .oe_list_content td.oe_number {
text-align: right !important;
max-width: 100px;
}
.openerp .oe_list_content > thead { .openerp .oe_list_content > thead {
border-bottom: 2px solid #cacaca; border-bottom: 2px solid #cacaca;
background: #eeeeee; background: #eeeeee;
@ -2233,8 +2241,8 @@
.openerp .oe_list_content > tbody > tr > td.oe_list_field_cell { .openerp .oe_list_content > tbody > tr > td.oe_list_field_cell {
padding: 3px 6px; padding: 3px 6px;
} }
.openerp .oe_list_content > tbody > tr > td, .openerp .oe_list_content > tbody > tr > th { .openerp .oe_list_content > tbody > tr > td.oe_list_field_cell progress {
line-height: 18px; width: 100%;
} }
.openerp .oe_list_content > tbody > tr > td > button, .openerp .oe_list_content > tbody > tr > th > button { .openerp .oe_list_content > tbody > tr > td > button, .openerp .oe_list_content > tbody > tr > th > button {
border: none; border: none;
@ -2250,9 +2258,6 @@
.openerp .oe_list_content > tbody > tr > td.oe_list_checkbox:first-child:after, .openerp .oe_list_content > tbody > tr th.oe_list_checkbox:first-child:after { .openerp .oe_list_content > tbody > tr > td.oe_list_checkbox:first-child:after, .openerp .oe_list_content > tbody > tr th.oe_list_checkbox:first-child:after {
border-width: 0; border-width: 0;
} }
.openerp .oe_list_content > tbody > tr > td.oe_number {
text-align: right !important;
}
.openerp .oe_list_content > tbody > tr:nth-child(odd) { .openerp .oe_list_content > tbody > tr:nth-child(odd) {
background-color: #f0f0fa; background-color: #f0f0fa;
background-color: #f0f0fa; background-color: #f0f0fa;

185
addons/web/static/src/css/base.sass
View File

@ -205,13 +205,7 @@ $sheet-max-width: 860px
// Modal box // Modal box
&.ui-dialog &.ui-dialog
display: none display: none
position: fixed
padding: 6px padding: 6px
top: 50%
left: 50%
z-index: 1050
width: 560px
margin: -150px 0 0 -280px
//overflow: hidden //overflow: hidden
background-color: rgba(60,60,60,0.7) background-color: rgba(60,60,60,0.7)
border: 1px solid border: 1px solid
@ -220,6 +214,8 @@ $sheet-max-width: 860px
@include radius(8px) @include radius(8px)
@include box-shadow(0 1px 12px rgba(0, 0, 0, 0.6)) @include box-shadow(0 1px 12px rgba(0, 0, 0, 0.6))
@include background-clip() @include background-clip()
.ui-dialog-content
padding: 0px
.ui-dialog-titlebar, .ui-dialog-content, .ui-dialog-buttonpane .ui-dialog-titlebar, .ui-dialog-content, .ui-dialog-buttonpane
padding: 16px padding: 16px
.ui-dialog-titlebar .ui-dialog-titlebar
@ -236,11 +232,12 @@ $sheet-max-width: 860px
.ui-dialog-buttonpane .ui-dialog-buttonpane
border-top: 1px solid #e0e0e0 border-top: 1px solid #e0e0e0
background: #f5f7f9 background: #f5f7f9
padding: 8px
margin: 0 margin: 0
@include radius(0 0 2px 2px) @include radius(0 0 2px 2px)
button button
margin-left: 8px margin: 0
.ui-dialog-buttonset
float: left
.ui-dialog-titlebar-close .ui-dialog-titlebar-close
padding: 0 padding: 0
.ui-icon-closethick .ui-icon-closethick
@ -260,6 +257,10 @@ $sheet-max-width: 860px
color: black color: black
text-decoration: none text-decoration: none
&.ui-dialog.oe_act_window
.ui-dialog-content
padding: 0px
.modal-backdrop .modal-backdrop
position: fixed position: fixed
top: 0 top: 0
@ -294,6 +295,7 @@ $sheet-max-width: 860px
cursor: wait cursor: wait
.oe_fade .oe_fade
color: #888 color: #888
font-weight: normal
.oe_bold .oe_bold
font-weight: bold font-weight: bold
.oe_inline .oe_inline
@ -322,7 +324,8 @@ $sheet-max-width: 860px
&:hover &:hover
background: #ED6F6A background: #ED6F6A
.oe_title .oe_title
width: 60% width: 50%
float: left
.oe_title:after .oe_title:after
content: "." content: "."
display: block display: block
@ -330,17 +333,20 @@ $sheet-max-width: 860px
clear: both clear: both
visibility: hidden visibility: hidden
.oe_button_box .oe_button_box
width: 38% width: 270px
text-align: right text-align: right
button button
margin: 4px margin: 4px
.oe_avatar .oe_avatar
margin: 0 16px 0 0 margin: 0 6px 15px 0
img > img
height: 50px height: 90px
max-width: 100px
@include radius(3px) @include radius(3px)
@include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3)) @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3))
border: none border: none
.oe_avatar + div
margin-left: 5px
.oe_button.oe_link .oe_button.oe_link
@include reset() @include reset()
img img
@ -362,8 +368,26 @@ $sheet-max-width: 860px
text-decoration: none text-decoration: none
.oe_star_on .oe_star_on
color: gold color: gold
// }}}
//.oe_edit_only  // Tags (for many2many tags, among others) {{{
.oe_tag
border-radius: 2px
@include box-sizing(border)
border: 1px solid #9DACCC
background: #E2E6F0
color: black !important
padding: 0px 3px 0px 3px
margin: 0 2px 2px 0
height: 16px
// font: 11px "lucida grande", tahoma, verdana, arial, sans-serif
.oe_tags
.text-wrap
width: 100% !important
textarea
width: 100% !important
.text-core .text-wrap .text-dropdown .text-list .text-suggestion em
font-style: italic
text-decoration: none
// }}} // }}}
// Tooltips {{{ // Tooltips {{{
&.oe_tooltip &.oe_tooltip
@ -823,7 +847,7 @@ $sheet-max-width: 860px
text-shadow: 0 1px 1px rgba(0,0,0,0.2) text-shadow: 0 1px 1px rgba(0,0,0,0.2)
@include radius(4px) @include radius(4px)
@include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.2)) @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.2))
.oe_menu_counter .oe_menu_counter
float: right float: right
background: #8a89ba background: #8a89ba
color: #eee color: #eee
@ -846,7 +870,7 @@ $sheet-max-width: 860px
color: $colour4 color: $colour4
text-shadow: 0 1px 1px white text-shadow: 0 1px 1px white
@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.2)) @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.2))
.oe_menu_counter .oe_menu_counter
background: #eee background: #eee
color: #8a89ba color: #8a89ba
.oe_menu_toggler:before .oe_menu_toggler:before
@ -888,8 +912,9 @@ $sheet-max-width: 860px
.oe_view_manager_view_kanban .oe_view_manager_view_kanban
height: inherit height: inherit
.oe_view_manager_header table.oe_view_manager_header
width: 100% width: 100%
table-layout: fixed
.oe_header_row .oe_header_row
//min-height: 26px //min-height: 26px
//line-height: 26px //line-height: 26px
@ -900,7 +925,6 @@ $sheet-max-width: 860px
padding-top: 0 padding-top: 0
.oe_view_manager_sidebar .oe_view_manager_sidebar
margin: 0px auto margin: 0px auto
width: 400px
text-align: center text-align: center
td td
line-height: 26px line-height: 26px
@ -1033,7 +1057,7 @@ $sheet-max-width: 860px
float: right float: right
padding: 1px 0 padding: 1px 0
line-height: 18px line-height: 18px
width: 480px width: 400px
border: 1px solid #ababab border: 1px solid #ababab
background: white background: white
@include radius(13px) @include radius(13px)
@ -1312,7 +1336,7 @@ $sheet-max-width: 860px
margin: 0 0 0 4px margin: 0 0 0 4px
padding: 0 padding: 0
// }}} // }}}
// Views Common {{{ // Views Common {{{
.oe_view_nocontent .oe_view_nocontent
@ -1356,25 +1380,25 @@ $sheet-max-width: 860px
display: none !important display: none !important
.oe_form .oe_form_field_date .oe_form .oe_form_field_date
width: auto width: auto
.oe_form_nosheet .oe_form_nosheet
margin-left: 10px margin: 20px
margin-right: 10px
.oe_form_nosheet > header .oe_form_nosheet > header
margin-left: -10px margin-top: -20px
margin-right: -10px margin-left: -20px
margin-right: -20px
// }}} // }}}
// FormView.custom tags and classes {{{ // FormView.custom tags and classes {{{
.oe_form .oe_form
header header
position: relative position: relative
border-bottom: 1px solid #cacaca border-bottom: 1px solid #cacaca
@include vertical-gradient(#fcfcfc, #dedede) @include vertical-gradient(#fcfcfc, #dedede)
padding: 0 8px padding: 0 8px
line-height: 30px line-height: 30px
ul ul
display: inline-block display: inline-block
float: right float: right
footer div.oe_chatter
min-width: 650px min-width: 650px
max-width: $sheet-max-width max-width: $sheet-max-width
margin: 0 auto margin: 0 auto
@ -1387,12 +1411,12 @@ $sheet-max-width: 860px
vertical-align: top vertical-align: top
margin-left: 8px margin-left: 8px
li li
border-right: none border-right: none
padding: 0 padding: 0
margin: 0 margin: 0
float: left float: left
vertical-align: top vertical-align: top
height: 30px height: 30px
padding: 0 0 0 12px padding: 0 0 0 12px
&:first-child &:first-child
border-left: 1px solid #cacaca border-left: 1px solid #cacaca
@ -1414,21 +1438,24 @@ $sheet-max-width: 860px
padding: 0 !important padding: 0 !important
td.oe_form_group_cell_label td.oe_form_group_cell_label
border-right: none border-right: none
.oe_form_field
width: auto !important
.oe_subtotal_footer_separator .oe_subtotal_footer_separator
width: 108px
border-top: 1px solid #cacaca border-top: 1px solid #cacaca
font-sie: 120%
font-weight: bold font-weight: bold
font-size: 18px
label:after
content: ":"
label.oe_subtotal_footer_separator label.oe_subtotal_footer_separator
font-weight: bold !important font-weight: bold !important
padding: 2px 8px 2px 0px !important padding: 2px 11px 2px 0px !important
label.oe_form_label_help
font-weight: normal
// no sheet in popups // no sheet in popups
.oe_application .oe_application
.oe_form_sheetbg .oe_form_sheetbg
background: url(/web/static/src/img/form_sheetbg.png) background: url(/web/static/src/img/form_sheetbg.png)
padding: 8px 0 padding: 8px 0
border-bottom: 1px solid #ddd border-bottom: 1px solid #ddd
.oe_form_sheet_width .oe_form_sheet_width
min-width: 650px min-width: 650px
max-width: $sheet-max-width max-width: $sheet-max-width
@ -1446,21 +1473,22 @@ $sheet-max-width: 860px
// }}} // }}}
// FormView.group {{{ // FormView.group {{{
.oe_form .oe_form
.oe_form_button
margin: 2px
td.oe_form_group_cell_label td.oe_form_group_cell_label
border-right: 1px solid #ddd border-right: 1px solid #ddd
padding: 2px 0px 2px 0px padding: 2px 0px 2px 0px
label label
line-height: 18px line-height: 18px
display: block display: block
min-width: 110px min-width: 120px
td.oe_form_group_cell + .oe_form_group_cell td.oe_form_group_cell + .oe_form_group_cell
padding-left: 6px padding-left: 6px
.oe_form_group .oe_form_group
width: 100% width: 100%
margin: 4px 0 4px 0 margin: 6px 0 6px 0
.oe_group_right .oe_form_group_cell.oe_group_right
> tbody > tr > td:first-child padding-left: 20px
padding-left: 18px
// }}} // }}}
// FormView.label {{{ // FormView.label {{{
.oe_form .oe_form
@ -1521,12 +1549,6 @@ $sheet-max-width: 860px
width: 100% width: 100%
.oe_form_field_text.oe_inline, .oe_form_field_text.oe_inline > textarea .oe_form_field_text.oe_inline, .oe_form_field_text.oe_inline > textarea
width: 500px width: 500px
.oe_form_field_float input
width: 100px
h1 .oe_form_field_float input
width: 140px
h2 .oe_form_field_float input
width: 120px
h1, h2, h3, h4, h5, h6 h1, h2, h3, h4, h5, h6
margin: 0 0 4px 0 margin: 0 0 4px 0
input input
@ -1539,14 +1561,6 @@ $sheet-max-width: 860px
line-height: 18px line-height: 18px
input input
margin: 0px margin: 0px
.oe_form_field_integer
width: 180px
.oe_form_field_float
width: 180px
.oe_form_field_date
width: 7.5em
.oe_form_field_datetime
width: 11em
input[type="text"], input[type="password"], input[type="file"], select input[type="text"], input[type="password"], input[type="file"], select
height: 22px height: 22px
padding-top: 2px padding-top: 2px
@ -1572,26 +1586,6 @@ $sheet-max-width: 860px
.oe_form_field_boolean .oe_form_field_boolean
padding-top: 4px padding-top: 4px
width: auto width: auto
.oe_form_field_many2manytags
.text-wrap
width: 100% !important
textarea
width: 100% !important
.oe_form_field_many2manytags_box
border-radius: 2px
@include box-sizing(border)
position: relative
float: left
border: 1px solid #9DACCC
background: #E2E6F0
color: black
padding: 0px 3px 0px 3px
margin: 0 2px 2px 0
height: 16px
font: 11px "lucida grande", tahoma, verdana, arial, sans-serif
.text-core .text-wrap .text-dropdown .text-list .text-suggestion em
font-style: italic
text-decoration: none
.oe_datepicker_container .oe_datepicker_container
display: none display: none
.oe_datepicker_root .oe_datepicker_root
@ -1617,14 +1611,6 @@ $sheet-max-width: 860px
.oe_form_field_with_button.oe_no_button > .oe_button .oe_form_field_with_button.oe_no_button > .oe_button
display: none display: none
.oe_form_field_with_button:not(.oe_no_button) .oe_form_field_with_button:not(.oe_no_button)
input
border-right: none
-webkit-border-top-right-radius: 0px
-webkit-border-bottom-right-radius: 0px
-moz-border-radius-topright: 0px
-moz-border-radius-bottomright: 0px
border-top-right-radius: 0px
border-bottom-right-radius: 0px
> .oe_button > .oe_button
float: right float: right
@include radius(0) @include radius(0)
@ -1636,6 +1622,16 @@ $sheet-max-width: 860px
> div > div
position: relative position: relative
overflow: hidden overflow: hidden
.oe_form_editable
.oe_form
.oe_form_field_integer
width: 7em !important
.oe_form_field_float
width: 8em !important
.oe_form_field_date
width: 7.5em !important
.oe_form_field_datetime
width: 11.5em !important
// }}} // }}}
// FormView.fields_binary {{{ // FormView.fields_binary {{{
/* http://www.quirksmode.org/dom/inputfile.html /* http://www.quirksmode.org/dom/inputfile.html
@ -1669,6 +1665,7 @@ $sheet-max-width: 860px
vertical-align: top vertical-align: top
.oe_form_field_image_controls .oe_form_field_image_controls
position: absolute position: absolute
white-space: nowrap
top: 1px top: 1px
padding: 3px 0 0 0 padding: 3px 0 0 0
margin: 0 1px margin: 0 1px
@ -1687,15 +1684,23 @@ $sheet-max-width: 860px
position: relative position: relative
span.oe_m2o_drop_down_button span.oe_m2o_drop_down_button
position: absolute position: absolute
top: 1px top: 2px
right: 0px right: 0px
.oe_m2o_cm_button
line-height: 14px
// }}} // }}}
// FormView.one2many {{{ // FormView.one2many {{{
.oe_form .oe_form_field_one2many > .oe_view_manager .oe_form .oe_form_field_one2many > .oe_view_manager
.oe_list_pager_single_page .oe_list_pager_single_page
display: none display: none
.oe_form_field_one2many .oe_form_field_one2many,.oe_form_field_many2many
// TODO: oe_form_field_one2many_list? // TODO: oe_form_field_one2many_list?
.oe_list_content
> thead
border-bottom: 1px
> tbody
tr:nth-child(odd)
background: transparent
.oe_list .oe_list_edit_row_save .oe_list .oe_list_edit_row_save
background: url(/web/static/src/img/iconset-b-remove.png) 50% 50% no-repeat background: url(/web/static/src/img/iconset-b-remove.png) 50% 50% no-repeat
&:before &:before
@ -1728,6 +1733,9 @@ $sheet-max-width: 860px
td:first-child, th:first-child td:first-child, th:first-child
&:after &:after
border-width: 0 border-width: 0
td.oe_number
text-align: right !important
max-width: 100px
> thead > thead
border-bottom: 2px solid #cacaca border-bottom: 2px solid #cacaca
background: #eee background: #eee
@ -1763,8 +1771,9 @@ $sheet-max-width: 860px
border-top: 1px solid #ddd border-top: 1px solid #ddd
> td.oe_list_field_cell > td.oe_list_field_cell
padding: 3px 6px padding: 3px 6px
progress
width: 100%
> td, > th > td, > th
line-height: 18px
> button > button
border: none border: none
background: transparent background: transparent
@ -1774,8 +1783,6 @@ $sheet-max-width: 860px
width: 17px width: 17px
&:after &:after
border-width: 0 border-width: 0
> td.oe_number
text-align: right !important
> tr:nth-child(odd) > tr:nth-child(odd)
background-color: #f0f0fa background-color: #f0f0fa
@include vertical-gradient(#f0f0fa, #eeeef6) @include vertical-gradient(#f0f0fa, #eeeef6)

64
addons/web/static/src/js/chrome.js
View File

@ -63,7 +63,7 @@ instance.web.Dialog = instance.web.Widget.extend({
this.dialog_options = { this.dialog_options = {
modal: true, modal: true,
destroy_on_close: true, destroy_on_close: true,
width: $(window).width() * (($(window).width() > 1024) ? 0.5 : 0.75), width: 900,
min_width: 0, min_width: 0,
max_width: '95%', max_width: '95%',
height: 'auto', height: 'auto',
@ -145,9 +145,9 @@ instance.web.Dialog = instance.web.Widget.extend({
_.each(this.getChildren(), function(el) { _.each(this.getChildren(), function(el) {
el.destroy(); el.destroy();
}); });
if (! this.isDestroyed()) { if (! this.isDestroyed()) {
this.$element.dialog('destroy'); this.$element.dialog('destroy');
} }
this._super(); this._super();
} }
}); });
@ -212,11 +212,11 @@ instance.web.CrashManager = instance.web.CallbackEnabled.extend({
dialog.$element.html(QWeb.render('CrashManager.error', {session: instance.connection, error: error})); dialog.$element.html(QWeb.render('CrashManager.error', {session: instance.connection, error: error}));
}, },
on_javascript_exception: function(exception) { on_javascript_exception: function(exception) {
this.on_traceback({ this.on_traceback({
type: _t("Client Error"), type: _t("Client Error"),
message: exception, message: exception,
data: {debug: ""} data: {debug: ""}
}); });
}, },
}); });
@ -482,24 +482,26 @@ instance.web.Login = instance.web.Widget.extend({
} }
} }
}, },
open_db_manager: function(){
var self = this;
self.$element.find('.oe_login_bottom').hide();
self.$element.find('.oe_login_pane').hide();
self.databasemanager = new instance.web.DatabaseManager(self);
self.databasemanager.appendTo(self.$element);
self.databasemanager.do_exit.add_last(function() {
self.databasemanager.destroy();
self.$element.find('.oe_login_bottom').show();
self.$element.find('.oe_login_pane').show();
self.load_db_list(true).then(self.on_db_list_loaded);
});
},
start: function() { start: function() {
var self = this; var self = this;
self.$element.find("form").submit(self.on_submit); self.$element.find("form").submit(self.on_submit);
self.$element.find('.oe_login_manage_db').click(function() { self.$element.find('.oe_login_manage_db').click(function() {
self.$element.find('.oe_login_bottom').hide(); self.open_db_manager();
self.$element.find('.oe_login_pane').hide();
self.databasemanager = new instance.web.DatabaseManager(self);
self.databasemanager.appendTo(self.$element);
self.databasemanager.do_exit.add_last(function() {
self.databasemanager.destroy();
self.$element.find('.oe_login_bottom').show();
self.$element.find('.oe_login_pane').show();
self.load_db_list(true).then(self.proxy('_db_list_loaded'));
});
}); });
return self.load_db_list().then(self.proxy('_db_list_loaded')); return self.load_db_list().then(self.on_db_list_loaded);
}, },
load_db_list: function (force) { load_db_list: function (force) {
var d = $.when(), self = this; var d = $.when(), self = this;
@ -514,11 +516,14 @@ instance.web.Login = instance.web.Widget.extend({
} }
return d; return d;
}, },
_db_list_loaded: function () { on_db_list_loaded: function () {
var list = this._db_list, var self = this;
dbdiv = this.$element.find('div.oe_login_dbpane'); var list = this._db_list;
var dbdiv = this.$element.find('div.oe_login_dbpane');
this.$element.find("[name=db]").replaceWith(instance.web.qweb.render('Login.dblist', { db_list: list, selected_db: this.selected_db})); this.$element.find("[name=db]").replaceWith(instance.web.qweb.render('Login.dblist', { db_list: list, selected_db: this.selected_db}));
if(list && list.length === 1) { if(list.length === 0) {
self.open_db_manager();
} else if(list && list.length === 1) {
dbdiv.hide(); dbdiv.hide();
} else { } else {
dbdiv.show(); dbdiv.show();
@ -667,7 +672,7 @@ instance.web.Menu = instance.web.Widget.extend({
* @param {Number} id the action_id to match * @param {Number} id the action_id to match
*/ */
open_action: function (id) { open_action: function (id) {
var $menu = this.$element.add(this.$secondary_menus).find('a[data-action-id=' + id + ']'); var $menu = this.$element.add(this.$secondary_menus).find('a[data-action-id="' + id + '"]');
var menu_id = $menu.data('menu'); var menu_id = $menu.data('menu');
if (menu_id) { if (menu_id) {
this.open_menu(menu_id); this.open_menu(menu_id);
@ -822,8 +827,8 @@ instance.web.UserMenu = instance.web.Widget.extend({
{text: _t("Change password"), click: function(){ self.change_password(); }}, {text: _t("Change password"), click: function(){ self.change_password(); }},
{text: _t("Cancel"), click: function(){ $(this).dialog('destroy'); }}, {text: _t("Cancel"), click: function(){ $(this).dialog('destroy'); }},
{text: _t("Save"), click: function(){ {text: _t("Save"), click: function(){
var inner_viewmanager = action_manager.inner_viewmanager; var inner_widget = action_manager.inner_widget;
inner_viewmanager.views[inner_viewmanager.active_view].controller.do_save() inner_widget.views[inner_widget.active_view].controller.do_save()
.then(function() { .then(function() {
self.dialog.destroy(); self.dialog.destroy();
// needs to refresh interface in case language changed // needs to refresh interface in case language changed
@ -1037,6 +1042,7 @@ instance.web.WebClient = instance.web.Widget.extend({
if (options.needaction) { if (options.needaction) {
action.context.search_default_needaction_pending = true; action.context.search_default_needaction_pending = true;
} }
self.action_manager.clear_breadcrumbs();
self.action_manager.do_action(action); self.action_manager.do_action(action);
}); });
}, },

6
addons/web/static/src/js/coresetup.js
View File

@ -404,10 +404,11 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
} }
}); });
/** /**
* Event Bus used to bind events scoped in the current instance * Event Bus used to bind events scoped in the current instance
*/ */
instance.web.bus = new (instance.web.Class.extend(instance.web.EventDispatcherMixin, { instance.web.Bus = instance.web.Class.extend(instance.web.EventDispatcherMixin, {
init: function() { init: function() {
instance.web.EventDispatcherMixin.init.call(this, parent); instance.web.EventDispatcherMixin.init.call(this, parent);
var self = this; var self = this;
@ -425,7 +426,8 @@ instance.web.bus = new (instance.web.Class.extend(instance.web.EventDispatcherMi
}); });
}); });
} }
}))(); })
instance.web.bus = new instance.web.Bus();
/** OpenERP Translations */ /** OpenERP Translations */
instance.web.TranslationDataBase = instance.web.Class.extend(/** @lends instance.web.TranslationDataBase# */{ instance.web.TranslationDataBase = instance.web.Class.extend(/** @lends instance.web.TranslationDataBase# */{

10
addons/web/static/src/js/view_editor.js
View File

@ -53,7 +53,7 @@ instance.web.ViewEditor = instance.web.OldWidget.extend({
this.main_view_id = this.parent.fields_view.view_id; this.main_view_id = this.parent.fields_view.view_id;
this.action_manager = new instance.web.ActionManager(this); this.action_manager = new instance.web.ActionManager(this);
$.when(this.action_manager.do_action(action)).then(function() { $.when(this.action_manager.do_action(action)).then(function() {
var viewmanager = self.action_manager.inner_viewmanager, var viewmanager = self.action_manager.inner_widget,
controller = viewmanager.views[viewmanager.active_view].controller; controller = viewmanager.views[viewmanager.active_view].controller;
self.action_manager.appendTo(self.view_edit_dialog.$element); self.action_manager.appendTo(self.view_edit_dialog.$element);
self.action_manager.renderElement(self.view_edit_dialog); self.action_manager.renderElement(self.view_edit_dialog);
@ -88,7 +88,7 @@ instance.web.ViewEditor = instance.web.OldWidget.extend({
} else { } else {
$.when(self.do_save_view(view_values)).then(function() { $.when(self.do_save_view(view_values)).then(function() {
self.create_view_dialog.close(); self.create_view_dialog.close();
var controller = self.action_manager.inner_viewmanager.views[self.action_manager.inner_viewmanager.active_view].controller; var controller = self.action_manager.inner_widget.views[self.action_manager.inner_widget.active_view].controller;
controller.reload_content(); controller.reload_content();
}); });
} }
@ -167,7 +167,7 @@ instance.web.ViewEditor = instance.web.OldWidget.extend({
do_delete_view: function() { do_delete_view: function() {
var self = this; var self = this;
if (confirm(_t("Do you really want to remove this view?"))) { if (confirm(_t("Do you really want to remove this view?"))) {
var controller = this.action_manager.inner_viewmanager.views[this.action_manager.inner_viewmanager.active_view].controller; var controller = this.action_manager.inner_widget.views[this.action_manager.inner_widget.active_view].controller;
this.dataset.unlink([this.main_view_id]).then(function() { this.dataset.unlink([this.main_view_id]).then(function() {
controller.reload_content(); controller.reload_content();
self.main_view_id = self.parent.fields_view.view_id; self.main_view_id = self.parent.fields_view.view_id;
@ -397,7 +397,7 @@ instance.web.ViewEditor = instance.web.OldWidget.extend({
action_manager.do_action(action); action_manager.do_action(action);
}}, }},
{text: _t("Close"), click: function(){ {text: _t("Close"), click: function(){
self.action_manager.inner_viewmanager.views[self.action_manager.inner_viewmanager.active_view].controller.reload_content(); self.action_manager.inner_widget.views[self.action_manager.inner_widget.active_view].controller.reload_content();
self.edit_xml_dialog.close(); self.edit_xml_dialog.close();
}} }}
] ]
@ -998,7 +998,7 @@ instance.web.ViewEditor = instance.web.OldWidget.extend({
}; };
var action_manager = new instance.web.ActionManager(self); var action_manager = new instance.web.ActionManager(self);
$.when(action_manager.do_action(action)).then(function() { $.when(action_manager.do_action(action)).then(function() {
var controller = action_manager.dialog_viewmanager.views['form'].controller; var controller = action_manager.dialog_widget.views['form'].controller;
controller.on_button_cancel.add_last(function(){ controller.on_button_cancel.add_last(function(){
action_manager.destroy() action_manager.destroy()
}); });

150
addons/web/static/src/js/view_form.js
View File

@ -9,7 +9,7 @@ instance.web.form = {};
/** /**
* Interface implemented by the form view or any other object * Interface implemented by the form view or any other object
* able to provide the features necessary for the fields to work. * able to provide the features necessary for the fields to work.
* *
* Properties: * Properties:
* - display_invalid_fields : if true, all fields where is_valid() return true should * - display_invalid_fields : if true, all fields where is_valid() return true should
* be displayed as invalid. * be displayed as invalid.
@ -287,10 +287,12 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
on_record_loaded: function(record) { on_record_loaded: function(record) {
var self = this, set_values = []; var self = this, set_values = [];
if (!record) { if (!record) {
this.set({ 'title' : undefined });
this.do_warn("Form", "The record could not be found in the database.", true); this.do_warn("Form", "The record could not be found in the database.", true);
return $.Deferred().reject(); return $.Deferred().reject();
} }
this.datarecord = record; this.datarecord = record;
this.set({ 'title' : record.id ? record.name : "New record" });
if (this.qweb) { if (this.qweb) {
this.kill_current_form(); this.kill_current_form();
@ -524,7 +526,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
this.on_form_changed(); this.on_form_changed();
} }
if (!_.isEmpty(result.warning)) { if (!_.isEmpty(result.warning)) {
instance.web.dialog($(QWeb.render("CrashManager.warning", result.warning)), { instance.web.dialog($(QWeb.render("CrashManager.warning", result.warning)), {
title:result.warning.title, title:result.warning.title,
modal: true, modal: true,
buttons: [ buttons: [
@ -800,13 +802,13 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
}); });
}, },
get_fields_values: function(blacklist) { get_fields_values: function(blacklist) {
blacklist = blacklist || []; blacklist = blacklist || [];
var values = {}; var values = {};
var ids = this.get_selected_ids(); var ids = this.get_selected_ids();
values["id"] = ids.length > 0 ? ids[0] : false; values["id"] = ids.length > 0 ? ids[0] : false;
_.each(this.fields, function(value_, key) { _.each(this.fields, function(value_, key) {
if (_.include(blacklist, key)) if (_.include(blacklist, key))
return; return;
var val = value_.get_value(); var val = value_.get_value();
values[key] = val; values[key] = val;
}); });
@ -863,6 +865,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
return option[0] === value; return option[0] === value;
})[1]; })[1];
break; break;
case 'many2one':
displayed = field.get_displayed();
break;
} }
return { return {
@ -953,7 +958,7 @@ instance.web.form.FormRenderingEngineInterface = instance.web.Class.extend({
/** /**
* Default rendering engine for the form view. * Default rendering engine for the form view.
* *
* It is necessary to set the view using set_view() before usage. * It is necessary to set the view using set_view() before usage.
*/ */
instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInterface.extend({ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInterface.extend({
@ -1184,8 +1189,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
row_cols = cols; row_cols = cols;
} else if (tagName==='group') { } else if (tagName==='group') {
// When <group> <group/><group/> </group>, we need a spacing between the two groups // When <group> <group/><group/> </group>, we need a spacing between the two groups
$child.addClass('oe_group_right') $td.addClass('oe_group_right')
} }
row_cols -= colspan; row_cols -= colspan;
@ -1211,12 +1215,6 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
$child = $td.children(':first'); $child = $td.children(':first');
switch ($child[0].tagName.toLowerCase()) { switch ($child[0].tagName.toLowerCase()) {
case 'separator': case 'separator':
if ($child.attr('orientation') === 'vertical') {
$td.addClass('oe_vertical_separator').attr('width', '1');
$td.empty();
row_cols-= $td.attr('colspan') || 1;
total--;
}
break; break;
case 'label': case 'label':
if ($child.attr('for')) { if ($child.attr('for')) {
@ -1276,7 +1274,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
page_attrs.__page = $new_page; page_attrs.__page = $new_page;
page_attrs.__ic = ic; page_attrs.__ic = ic;
pages.push(page_attrs); pages.push(page_attrs);
$new_page.children().each(function() { $new_page.children().each(function() {
self.process($(this)); self.process($(this));
}); });
@ -1302,7 +1300,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
} }
}); });
}); });
this.handle_common_properties($new_notebook, $notebook); this.handle_common_properties($new_notebook, $notebook);
return $new_notebook; return $new_notebook;
}, },
@ -1585,7 +1583,7 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
parent: {} parent: {}
}); });
if (a_dataset.parent_view) { if (a_dataset.parent_view) {
fields_values.parent = a_dataset.parent_view.get_fields_values([a_dataset.child_name]); fields_values.parent = a_dataset.parent_view.get_fields_values([a_dataset.child_name]);
} }
return fields_values; return fields_values;
}, },
@ -1603,7 +1601,7 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
if (! v_context) { if (! v_context) {
v_context = (this.field || {}).context || {}; v_context = (this.field || {}).context || {};
} }
if (v_context.__ref || true) { //TODO: remove true if (v_context.__ref || true) { //TODO: remove true
var fields_values = this._build_eval_context(blacklist); var fields_values = this._build_eval_context(blacklist);
v_context = new instance.web.CompoundContext(v_context).set_eval_context(fields_values); v_context = new instance.web.CompoundContext(v_context).set_eval_context(fields_values);
@ -1711,14 +1709,14 @@ instance.web.form.WidgetButton = instance.web.form.FormWidget.extend({
/** /**
* Interface to be implemented by fields. * Interface to be implemented by fields.
* *
* Properties: * Properties:
* - readonly: boolean. If set to true the field should appear in readonly mode. * - readonly: boolean. If set to true the field should appear in readonly mode.
* - force_readonly: boolean, When it is true, the field should always appear * - force_readonly: boolean, When it is true, the field should always appear
* in read only mode, no matter what the value of the "readonly" property can be. * in read only mode, no matter what the value of the "readonly" property can be.
* Events: * Events:
* - changed_value: triggered to inform the view to check on_changes * - changed_value: triggered to inform the view to check on_changes
* *
*/ */
instance.web.form.FieldInterface = { instance.web.form.FieldInterface = {
/** /**
@ -1729,14 +1727,14 @@ instance.web.form.FieldInterface = {
init: function(field_manager, node) {}, init: function(field_manager, node) {},
/** /**
* Called by the form view to indicate the value of the field. * Called by the form view to indicate the value of the field.
* *
* set_value() may return an object that can be passed to $.when() that represents the moment when * set_value() may return an object that can be passed to $.when() that represents the moment when
* the field has finished all operations necessary before the user can effectively use the widget. * the field has finished all operations necessary before the user can effectively use the widget.
* *
* Multiple calls to set_value() can occur at any time and must be handled correctly by the implementation, * Multiple calls to set_value() can occur at any time and must be handled correctly by the implementation,
* regardless of any asynchronous operation currently running and the status of any promise that a * regardless of any asynchronous operation currently running and the status of any promise that a
* previous call to set_value() could have returned. * previous call to set_value() could have returned.
* *
* set_value() must be able, at any moment, to handle the syntax returned by the "read" method of the * set_value() must be able, at any moment, to handle the syntax returned by the "read" method of the
* osv class in the OpenERP server as well as the syntax used by the set_value() (see below). It must * osv class in the OpenERP server as well as the syntax used by the set_value() (see below). It must
* also be able to handle any other format commonly used in the _defaults key on the models in the addons * also be able to handle any other format commonly used in the _defaults key on the models in the addons
@ -1746,16 +1744,16 @@ instance.web.form.FieldInterface = {
set_value: function(value_) {}, set_value: function(value_) {},
/** /**
* Get the current value of the widget. * Get the current value of the widget.
* *
* Must always return a syntaxically correct value to be passed to the "write" method of the osv class in * Must always return a syntaxically correct value to be passed to the "write" method of the osv class in
* the OpenERP server, although it is not assumed to respect the constraints applied to the field. * the OpenERP server, although it is not assumed to respect the constraints applied to the field.
* For example if the field is marqued as "required", a call to get_value() can return false. * For example if the field is marqued as "required", a call to get_value() can return false.
* *
* get_value() can also be called *before* a call to set_value() and, in that case, is supposed to * get_value() can also be called *before* a call to set_value() and, in that case, is supposed to
* return a defaut value according to the type of field. * return a defaut value according to the type of field.
* *
* This method is always assumed to perform synchronously, it can not return a promise. * This method is always assumed to perform synchronously, it can not return a promise.
* *
* If there was no user interaction to modify the value of the field, it is always assumed that * If there was no user interaction to modify the value of the field, it is always assumed that
* get_value() return the same semantic value than the one passed in the last call to set_value(), * get_value() return the same semantic value than the one passed in the last call to set_value(),
* altough the syntax can be different. This can be the case for type of fields that have a different * altough the syntax can be different. This can be the case for type of fields that have a different
@ -1785,14 +1783,14 @@ instance.web.form.FieldInterface = {
/** /**
* Abstract class for classes implementing FieldInterface. * Abstract class for classes implementing FieldInterface.
* *
* Properties: * Properties:
* - effective_readonly: when it is true, the widget is displayed as readonly. Vary depending * - effective_readonly: when it is true, the widget is displayed as readonly. Vary depending
* the values of the "readonly" property and the "force_readonly" property on the field manager. * the values of the "readonly" property and the "force_readonly" property on the field manager.
* - value: useful property to hold the value of the field. By default, set_value() and get_value() * - value: useful property to hold the value of the field. By default, set_value() and get_value()
* set and retrieve the value property. Changing the value property also triggers automatically * set and retrieve the value property. Changing the value property also triggers automatically
* a 'changed_value' event that inform the view to trigger on_changes. * a 'changed_value' event that inform the view to trigger on_changes.
* *
*/ */
instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.web.form.FieldInterface, { instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.web.form.FieldInterface, {
/** /**
@ -1811,7 +1809,7 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
this.string = this.node.attrs.string || this.field.string || this.name; this.string = this.node.attrs.string || this.field.string || this.name;
this.set({'value': false}); this.set({'value': false});
this.set({required: this.modifiers['required'] === true}); this.set({required: this.modifiers['required'] === true});
// some events to make the property "effective_readonly" sync automatically with "readonly" and // some events to make the property "effective_readonly" sync automatically with "readonly" and
// "force_readonly" // "force_readonly"
this.set({"readonly": this.modifiers['readonly'] === true}); this.set({"readonly": this.modifiers['readonly'] === true});
@ -1821,7 +1819,7 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
this.on("change:readonly", this, test_effective_readonly); this.on("change:readonly", this, test_effective_readonly);
this.on("change:force_readonly", this, test_effective_readonly); this.on("change:force_readonly", this, test_effective_readonly);
_.bind(test_effective_readonly, this)(); _.bind(test_effective_readonly, this)();
this.on("change:value", this, function() { this.on("change:value", this, function() {
if (! this._inhibit_on_change) if (! this._inhibit_on_change)
this.trigger('changed_value'); this.trigger('changed_value');
@ -2003,7 +2001,7 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(instance.we
}); });
instance.web.form.FieldID = instance.web.form.FieldChar.extend({ instance.web.form.FieldID = instance.web.form.FieldChar.extend({
}); });
instance.web.form.FieldEmail = instance.web.form.FieldChar.extend({ instance.web.form.FieldEmail = instance.web.form.FieldChar.extend({
@ -2454,7 +2452,7 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(instan
} else { } else {
var self = this; var self = this;
var option = _(this.values) var option = _(this.values)
.detect(function (record) { return record[0] === self.get('value'); }); .detect(function (record) { return record[0] === self.get('value'); });
this.$element.text(option ? option[1] : this.values[0][1]); this.$element.text(option ? option[1] : this.values[0][1]);
} }
}, },
@ -2633,7 +2631,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
render_editable: function() { render_editable: function() {
var self = this; var self = this;
this.$input = this.$element.find("input"); this.$input = this.$element.find("input");
self.$input.tipsy({ self.$input.tipsy({
title: function() { title: function() {
return "No element was selected, you should create or select one from the dropdown list."; return "No element was selected, you should create or select one from the dropdown list.";
@ -2641,10 +2639,10 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
trigger:'manual', trigger:'manual',
fade: true, fade: true,
}); });
this.$drop_down = this.$element.find(".oe_m2o_drop_down_button"); this.$drop_down = this.$element.find(".oe_m2o_drop_down_button");
this.$follow_button = $(".oe_m2o_cm_button", this.$element); this.$follow_button = $(".oe_m2o_cm_button", this.$element);
this.$follow_button.click(function() { this.$follow_button.click(function() {
if (!self.get('value')) { if (!self.get('value')) {
self.focus(); self.focus();
@ -2802,10 +2800,20 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
this.$input.val(str.split("\n")[0]); this.$input.val(str.split("\n")[0]);
this.current_display = this.$input.val(); this.current_display = this.$input.val();
} else { } else {
str = _.escape(str).split("\n").join("<br />"); var lines = _.escape(str).split("\n");
var link = "";
var follow = "";
if (! this.get_definition_options().highlight_first_line) {
link = lines.join("<br />");
} else {
link = lines[0];
follow = _.rest(lines).join("<br />");
if (follow)
link += "<br />";
}
this.$element.find('a') this.$element.find('a')
.unbind('click') .unbind('click')
.html(str) .html(link)
.click(function () { .click(function () {
self.do_action({ self.do_action({
type: 'ir.actions.act_window', type: 'ir.actions.act_window',
@ -2817,6 +2825,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
}); });
return false; return false;
}); });
$(".oe_form_m2o_follow").html(follow);
} }
}, },
set_value: function(value_) { set_value: function(value_) {
@ -2833,6 +2842,9 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
this._super(value_); this._super(value_);
this.inhibit_on_change = false; this.inhibit_on_change = false;
}, },
get_displayed: function() {
return this.display_value["" + this.get("value")];
},
add_id: function(id) { add_id: function(id) {
this.display_value = {}; this.display_value = {};
this.set({value: id}); this.set({value: id});
@ -2938,7 +2950,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
}, },
load_views: function() { load_views: function() {
var self = this; var self = this;
var modes = this.node.attrs.mode; var modes = this.node.attrs.mode;
modes = !!modes ? modes.split(",") : ["tree"]; modes = !!modes ? modes.split(",") : ["tree"];
var views = []; var views = [];
@ -3140,30 +3152,30 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
save_any_view: function() { save_any_view: function() {
if (this.doing_on_change) if (this.doing_on_change)
return false; return false;
return this.session.synchronized_mode(_.bind(function() { return this.session.synchronized_mode(_.bind(function() {
if (this.viewmanager && this.viewmanager.views && this.viewmanager.active_view && if (this.viewmanager && this.viewmanager.views && this.viewmanager.active_view &&
this.viewmanager.views[this.viewmanager.active_view] && this.viewmanager.views[this.viewmanager.active_view] &&
this.viewmanager.views[this.viewmanager.active_view].controller) { this.viewmanager.views[this.viewmanager.active_view].controller) {
var view = this.viewmanager.views[this.viewmanager.active_view].controller; var view = this.viewmanager.views[this.viewmanager.active_view].controller;
if (this.viewmanager.active_view === "form") { if (this.viewmanager.active_view === "form") {
if (!view.is_initialized.isResolved()) { if (!view.is_initialized.isResolved()) {
return false; return false;
} }
var res = $.when(view.do_save()); var res = $.when(view.do_save());
if (!res.isResolved() && !res.isRejected()) { if (!res.isResolved() && !res.isRejected()) {
console.warn("Asynchronous get_value() is not supported in form view."); console.warn("Asynchronous get_value() is not supported in form view.");
} }
return res; return res;
} else if (this.viewmanager.active_view === "list") { } else if (this.viewmanager.active_view === "list") {
var res = $.when(view.ensure_saved()); var res = $.when(view.ensure_saved());
if (!res.isResolved() && !res.isRejected()) { if (!res.isResolved() && !res.isRejected()) {
console.warn("Asynchronous get_value() is not supported in list view."); console.warn("Asynchronous get_value() is not supported in list view.");
} }
return res; return res;
} }
} }
return false; return false;
}, this)); }, this));
}, },
is_syntax_valid: function() { is_syntax_valid: function() {
if (!this.viewmanager.views[this.viewmanager.active_view]) if (!this.viewmanager.views[this.viewmanager.active_view])
@ -3520,7 +3532,7 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in
$("textarea", self.$element).css("padding-left", "3px"); $("textarea", self.$element).css("padding-left", "3px");
self.tags.addTags(_.map(data, function(el) {return {name: el[1], id:el[0]};})); self.tags.addTags(_.map(data, function(el) {return {name: el[1], id:el[0]};}));
} else { } else {
self.$element.html(QWeb.render("FieldMany2ManyTags.box", {elements: data})); self.$element.html(QWeb.render("FieldMany2ManyTag", {elements: data}));
} }
}; };
if (! self.get('values') || self.get('values').length > 0) { if (! self.get('values') || self.get('values').length > 0) {
@ -3692,7 +3704,7 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
this.dataset.on_unlink.add_last(function(ids) { this.dataset.on_unlink.add_last(function(ids) {
self.dataset_changed(); self.dataset_changed();
}); });
this.is_setted.then(function() { this.is_setted.then(function() {
self.load_view(); self.load_view();
}); });
@ -3808,7 +3820,7 @@ instance.web.form.Many2ManyKanbanView = instance.web_kanban.KanbanView.extend({
}); });
instance.web.form.Many2ManyQuickCreate = instance.web.Widget.extend({ instance.web.form.Many2ManyQuickCreate = instance.web.Widget.extend({
template: 'Many2ManyKanban.quick_create', template: 'Many2ManyKanban.quick_create',
/** /**
* close_btn: If true, the widget will display a "Close" button able to trigger * close_btn: If true, the widget will display a "Close" button able to trigger
* a "close" event. * a "close" event.
@ -3924,8 +3936,8 @@ instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({
var self = this; var self = this;
this.renderElement(); this.renderElement();
new instance.web.Dialog(this, { new instance.web.Dialog(this, {
width: '90%',
min_width: '800px', min_width: '800px',
dialogClass: 'oe_act_window',
close: function() { close: function() {
self.check_exit(true); self.check_exit(true);
}, },
@ -4501,7 +4513,7 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
this.selection = []; this.selection = [];
// get fold information from widget // get fold information from widget
var fold = ((this.node.attrs || {}).statusbar_fold || true); var fold = ((this.node.attrs || {}).statusbar_fold || true);
// build final domain: if fold option required, add the // build final domain: if fold option required, add the
if (fold == true) { if (fold == true) {
var domain = new instance.web.CompoundDomain(['|'], ['&'], self.build_domain(), [['fold', '=', false]], [['id', '=', self.selected_value]]); var domain = new instance.web.CompoundDomain(['|'], ['&'], self.build_domain(), [['fold', '=', false]], [['id', '=', self.selected_value]]);
} else { } else {
@ -4533,7 +4545,7 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
var shown = _.map(((this.node.attrs || {}).statusbar_visible || "").split(","), var shown = _.map(((this.node.attrs || {}).statusbar_visible || "").split(","),
function(x) { return _.str.trim(x); }); function(x) { return _.str.trim(x); });
shown = _.select(shown, function(x) { return x.length > 0; }); shown = _.select(shown, function(x) { return x.length > 0; });
if (shown.length == 0) { if (shown.length == 0) {
this.to_show = this.selection; this.to_show = this.selection;
} else { } else {

2
addons/web/static/src/js/view_list.js
View File

@ -1045,7 +1045,7 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
render_cell: function () { render_cell: function () {
return self.render_cell.apply(self, arguments); } return self.render_cell.apply(self, arguments); }
}, this))); }, this)));
this.pad_table_to(5); this.pad_table_to(4);
}, },
pad_table_to: function (count) { pad_table_to: function (count) {
if (this.records.length >= count || if (this.records.length >= count ||

313
addons/web/static/src/js/views.js
View File

@ -10,28 +10,111 @@ instance.web.ActionManager = instance.web.Widget.extend({
init: function(parent) { init: function(parent) {
this._super(parent); this._super(parent);
this.inner_action = null; this.inner_action = null;
this.inner_viewmanager = null; this.inner_widget = null;
this.dialog = null; this.dialog = null;
this.dialog_viewmanager = null; this.dialog_widget = null;
this.client_widget = null; this.breadcrumbs = [];
},
start: function() {
this._super.apply(this, arguments);
this.$element.on('click', '.oe_breadcrumb_item', this.on_breadcrumb_clicked);
}, },
dialog_stop: function () { dialog_stop: function () {
if (this.dialog) { if (this.dialog) {
this.dialog_viewmanager.destroy(); this.dialog_widget.destroy();
this.dialog_viewmanager = null; this.dialog_widget = null;
this.dialog.destroy(); this.dialog.destroy();
this.dialog = null; this.dialog = null;
} }
}, },
content_stop: function () { /**
if (this.inner_viewmanager) { * Add a new item to the breadcrumb
this.inner_viewmanager.destroy(); *
this.inner_viewmanager = null; * If the title of an item is an array, the multiple title mode is in use.
* (eg: a widget with multiple views might need to display a title for each view)
* In multiple title mode, the show() callback can check the index it receives
* in order to detect which of its titles has been clicked on by the user.
*
* @param {Object} item breadcrumb item
* @param {Object} item.widget widget containing the view(s) to be added to the breadcrumb added
* @param {Function} [item.show] triggered whenever the widget should be shown back
* @param {Function} [item.hide] triggered whenever the widget should be shown hidden
* @param {Function} [item.destroy] triggered whenever the widget should be destroyed
* @param {String|Array} [item.title] title(s) of the view(s) to be displayed in the breadcrumb
* @param {Function} [item.get_title] should return the title(s) of the view(s) to be displayed in the breadcrumb
*/
push_breadcrumb: function(item) {
var last = this.breadcrumbs.slice(-1)[0];
if (last) {
last.hide();
} }
if (this.client_widget) { var item = _.extend({
this.client_widget.destroy(); show: function(index) {
this.client_widget = null; this.widget.$element.show();
},
hide: function() {
this.widget.$element.hide();
},
destroy: function() {
this.widget.destroy();
},
get_title: function() {
return this.title || this.widget.get('title');
}
}, item);
item.id = _.uniqueId('breadcrumb_');
this.breadcrumbs.push(item);
},
on_breadcrumb_clicked: function(ev) {
var $e = $(ev.target);
var id = $e.data('id');
var item;
for (var i = this.breadcrumbs.length - 1; i >= 0; i--) {
var it = this.breadcrumbs[i];
if (it.id == id) {
item = it;
break;
}
this.remove_breadcrumb(i);
} }
var index = $e.parent().find('.oe_breadcrumb_item[data-id=' + $e.data('id') + ']').index($e);
item.show(index, $e);
this.inner_widget = item.widget;
},
clear_breadcrumbs: function() {
while (this.breadcrumbs.length) {
this.remove_breadcrumb(0);
}
},
remove_breadcrumb: function(index) {
var item = this.breadcrumbs.splice(index, 1)[0];
if (item) {
var dups = _.filter(this.breadcrumbs, function(it) {
return item.widget === it.widget;
});
if (!dups.length) {
item.destroy();
}
}
},
get_title: function() {
var titles = [];
for (var i = 0; i < this.breadcrumbs.length; i += 1) {
var item = this.breadcrumbs[i];
var tit = item.get_title();
if (!_.isArray(tit)) {
tit = [tit];
}
for (var j = 0; j < tit.length; j += 1) {
var label = _.escape(tit[j]);
if (i === this.breadcrumbs.length - 1 && j === tit.length - 1) {
titles.push(label);
} else {
titles.push(_.str.sprintf('<a href="#" class="oe_breadcrumb_item" data-id="%s">%s</a>', item.id, label));
}
}
}
return titles.join(' <span class="oe_fade">/</span> ');
}, },
do_push_state: function(state) { do_push_state: function(state) {
if (this.getParent() && this.getParent().do_push_state) { if (this.getParent() && this.getParent().do_push_state) {
@ -49,7 +132,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
var self = this, var self = this,
action_loaded; action_loaded;
if (state.action_id) { if (state.action_id) {
var run_action = (!this.inner_viewmanager) || this.inner_viewmanager.action.id !== state.action_id; var run_action = (!this.inner_widget || !this.inner_widget.action) || this.inner_widget.action.id !== state.action_id;
if (run_action) { if (run_action) {
this.null_action(); this.null_action();
action_loaded = this.do_action(state.action_id); action_loaded = this.do_action(state.action_id);
@ -89,13 +172,13 @@ instance.web.ActionManager = instance.web.Widget.extend({
} }
$.when(action_loaded || null).then(function() { $.when(action_loaded || null).then(function() {
if (self.inner_viewmanager) { if (self.inner_widget && self.inner_widget.do_load_state) {
self.inner_viewmanager.do_load_state(state, warm); self.inner_widget.do_load_state(state, warm);
} }
}); });
}, },
do_action: function(action, on_close) { do_action: function(action, on_close) {
if (_.isNumber(action)) { if (_.isNumber(action) || _.isString(action)) {
var self = this; var self = this;
return self.rpc("/web/action/load", { action_id: action }, function(result) { return self.rpc("/web/action/load", { action_id: action }, function(result) {
self.do_action(result.result, on_close); self.do_action(result.result, on_close);
@ -124,7 +207,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
}, },
null_action: function() { null_action: function() {
this.dialog_stop(); this.dialog_stop();
this.content_stop(); this.clear_breadcrumbs();
}, },
ir_actions_act_window: function (action, on_close) { ir_actions_act_window: function (action, on_close) {
var self = this; var self = this;
@ -137,29 +220,31 @@ instance.web.ActionManager = instance.web.Widget.extend({
} }
if (action.target === 'new') { if (action.target === 'new') {
if (this.dialog === null) { if (this.dialog === null) {
this.dialog = new instance.web.Dialog(this, { width: '80%' }); // These buttons will be overwrited by <footer> if any
this.dialog = new instance.web.Dialog(this, {
buttons: { "Close": function() { $(this).dialog("close"); }},
dialogClass: 'oe_act_window'
});
if(on_close) if(on_close)
this.dialog.on_close.add(on_close); this.dialog.on_close.add(on_close);
} else { } else {
this.dialog_viewmanager.destroy(); this.dialog_widget.destroy();
} }
this.dialog.dialog_title = action.name; this.dialog.dialog_title = action.name;
this.dialog_viewmanager = new instance.web.ViewManagerAction(this.dialog, action); this.dialog_widget = new instance.web.ViewManagerAction(this, action);
this.dialog_viewmanager.appendTo(this.dialog.$element); this.dialog_widget.appendTo(this.dialog.$element);
this.dialog_viewmanager.$element.addClass("oe_view_manager_" + (action.target || 'current'));
this.dialog.open(); this.dialog.open();
} else { } else {
this.dialog_stop(); this.dialog_stop();
this.content_stop();
if(action.menu_id) { if(action.menu_id) {
return this.getParent().do_action(action, function () { return this.getParent().do_action(action, function () {
instance.webclient.menu.open_menu(action.menu_id); instance.webclient.menu.open_menu(action.menu_id);
}); });
} }
this.inner_action = action; this.inner_action = action;
this.inner_viewmanager = new instance.web.ViewManagerAction(this, action); var inner_widget = this.inner_widget = new instance.web.ViewManagerAction(this, action);
this.inner_viewmanager.appendTo(this.$element); inner_widget.add_breadcrumb();
this.inner_viewmanager.$element.addClass("oe_view_manager_" + (action.target || 'current')); this.inner_widget.appendTo(this.$element);
} }
}, },
ir_actions_act_window_close: function (action, on_closed) { ir_actions_act_window_close: function (action, on_closed) {
@ -178,10 +263,14 @@ instance.web.ActionManager = instance.web.Widget.extend({
}); });
}, },
ir_actions_client: function (action) { ir_actions_client: function (action) {
this.content_stop();
this.dialog_stop(); this.dialog_stop();
var ClientWidget = instance.web.client_actions.get_object(action.tag); var ClientWidget = instance.web.client_actions.get_object(action.tag);
(this.client_widget = new ClientWidget(this, action.params)).appendTo(this.$element); this.inner_widget = new ClientWidget(this, action.params);
this.push_breadcrumb({
widget: this.inner_widget,
title: action.name
});
this.inner_widget.appendTo(this.$element);
}, },
ir_actions_report_xml: function(action, on_closed) { ir_actions_report_xml: function(action, on_closed) {
var self = this; var self = this;
@ -290,35 +379,7 @@ instance.web.ViewManager = instance.web.Widget.extend({
this.active_view = view_type; this.active_view = view_type;
if (!view.controller) { if (!view.controller) {
// Lazy loading of views view_promise = this.do_create_view(view_type);
var controllerclass = this.registry.get_object(view_type);
var options = _.clone(view.options);
if (view_type === "form" && this.action) {
switch (this.action.target) {
case 'new':
case 'inline':
options.initial_mode = 'edit';
break;
}
}
var controller = new controllerclass(this, this.dataset, view.view_id, options);
if (view.embedded_view) {
controller.set_embedded_view(view.embedded_view);
}
controller.do_switch_view.add_last(_.bind(this.switch_view, this));
controller.do_prev_view.add_last(this.on_prev_view);
var container = this.$element.find(".oe_view_manager_view_" + view_type);
view_promise = controller.appendTo(container);
this.views[view_type].controller = controller;
this.views[view_type].deferred.resolve(view_type);
$.when(view_promise).then(function() {
self.on_controller_inited(view_type, controller);
if (self.searchview
&& self.flags.auto_search
&& view.controller.searchable !== false) {
self.searchview.ready.then(self.searchview.do_search);
}
});
} else if (this.searchview } else if (this.searchview
&& self.flags.auto_search && self.flags.auto_search
&& view.controller.searchable !== false) { && view.controller.searchable !== false) {
@ -347,14 +408,90 @@ instance.web.ViewManager = instance.web.Widget.extend({
container.hide(); container.hide();
controller.do_hide(); controller.do_hide();
} }
// put the <footer> in the dialog's buttonpane
if (self.$element.parent('.ui-dialog-content') && self.$element.find('footer')) {
self.$element.parent('.ui-dialog-content').parent().find('div.ui-dialog-buttonset').hide()
self.$element.find('footer').appendTo(
self.$element.parent('.ui-dialog-content').parent().find('div.ui-dialog-buttonpane')
);
}
} }
}); });
self.$element.find('.oe_view_title_text:first').text(
self.display_title());
}); });
return view_promise; return view_promise;
}, },
do_create_view: function(view_type) {
// Lazy loading of views
var self = this;
var view = this.views[view_type];
var controllerclass = this.registry.get_object(view_type);
var options = _.clone(view.options);
if (view_type === "form" && this.action) {
switch (this.action.target) {
case 'new':
case 'inline':
options.initial_mode = 'edit';
break;
}
}
var controller = new controllerclass(this, this.dataset, view.view_id, options);
controller.on("change:title", this, function() {
if (self.active_view === view_type) {
self.set_title(controller.get('title'));
}
});
if (view.embedded_view) {
controller.set_embedded_view(view.embedded_view);
}
controller.do_switch_view.add_last(_.bind(this.switch_view, this));
controller.do_prev_view.add_last(this.on_prev_view);
var container = this.$element.find(".oe_view_manager_view_" + view_type);
var view_promise = controller.appendTo(container);
this.views[view_type].controller = controller;
this.views[view_type].deferred.resolve(view_type);
return $.when(view_promise).then(function() {
self.on_controller_inited(view_type, controller);
if (self.searchview
&& self.flags.auto_search
&& view.controller.searchable !== false) {
self.searchview.ready.then(self.searchview.do_search);
}
});
},
set_title: function(title) {
this.$element.find('.oe_view_title_text:first').text(title);
},
add_breadcrumb: function() {
var self = this;
var views = [this.active_view || this.views_src[0].view_type];
this.on_mode_switch.add(function(mode) {
var last = views.slice(-1)[0];
if (mode !== last) {
if (mode !== 'form') {
views.length = 0;
}
views.push(mode);
}
});
this.getParent().push_breadcrumb({
widget: this,
show: function(index, $e) {
var view_to_select = views[index];
self.$element.show();
if (self.active_view !== view_to_select) {
self.on_mode_switch(view_to_select);
}
},
get_title: function() {
return _.map(views, function(v) {
return self.views[v].controller.get('title');
});
}
});
},
/** /**
* Method used internally when a view asks to switch view. This method is meant * Method used internally when a view asks to switch view. This method is meant
* to be extended by child classes to change the default behavior, which simply * to be extended by child classes to change the default behavior, which simply
@ -447,14 +584,6 @@ instance.web.ViewManager = instance.web.Widget.extend({
*/ */
on_action_executed: function () { on_action_executed: function () {
}, },
display_title: function () {
var view = this.views[this.active_view];
if (view) {
// ick
return view.controller.fields_view.arch.attrs.string;
}
return '';
}
}); });
instance.web.ViewManagerAction = instance.web.ViewManager.extend({ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
@ -499,7 +628,7 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
if (this.session.hidden_menutips) { if (this.session.hidden_menutips) {
return; return;
} }
this.session.hidden_menutips = {} this.session.hidden_menutips = {};
}, },
/** /**
* Initializes the ViewManagerAction: sets up the searchview (if the * Initializes the ViewManagerAction: sets up the searchview (if the
@ -527,32 +656,7 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
var manager_ready = $.when(searchview_loaded, main_view_loaded); var manager_ready = $.when(searchview_loaded, main_view_loaded);
this.$element.find('.oe_debug_view').change(this.on_debug_changed); this.$element.find('.oe_debug_view').change(this.on_debug_changed);
this.$element.addClass("oe_view_manager_" + (this.action.target || 'current'));
if (this.action.help && !this.flags.low_profile) {
var Users = new instance.web.DataSet(self, 'res.users'),
$tips = this.$element.find('.oe_view_manager_menu_tips');
$tips.delegate('blockquote button', 'click', function() {
var $this = $(this);
//noinspection FallthroughInSwitchStatementJS
switch ($this.attr('name')) {
case 'disable':
Users.write(self.session.uid, {menu_tips:false});
case 'hide':
$this.closest('blockquote').hide();
self.session.hidden_menutips[self.action.id] = true;
}
});
if (!(self.action.id in self.session.hidden_menutips)) {
Users.read_ids([this.session.uid], ['menu_tips']).then(function(users) {
var user = users[0];
if (!(user && user.id === self.session.uid)) {
return;
}
$tips.find('blockquote').toggle(user.menu_tips);
});
}
}
return manager_ready; return manager_ready;
}, },
on_debug_changed: function (evt) { on_debug_changed: function (evt) {
@ -675,12 +779,18 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
view: controller, view: controller,
view_manager: self view_manager: self
})); }));
if (!self.action.name && fvg) { self.set_title();
self.$element.find('.oe_view_title_text').text(fvg.arch.attrs.string || fvg.name);
}
}); });
}, },
do_create_view: function(view_type) {
var r = this._super.apply(this, arguments);
var view = this.views[view_type].controller;
view.set({ 'title': this.action.name });
return r;
},
set_title: function(title) {
this.$element.find('.oe_breadcrumb_title:first').html(this.getParent().get_title());
},
do_push_state: function(state) { do_push_state: function(state) {
if (this.getParent() && this.getParent().do_push_state) { if (this.getParent() && this.getParent().do_push_state) {
state["view_type"] = this.active_view; state["view_type"] = this.active_view;
@ -702,9 +812,6 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
self.views[self.active_view].controller.do_load_state(state, warm); self.views[self.active_view].controller.do_load_state(state, warm);
}); });
}, },
display_title: function () {
return this.action.name;
}
}); });
instance.web.Sidebar = instance.web.Widget.extend({ instance.web.Sidebar = instance.web.Widget.extend({
@ -1130,7 +1237,7 @@ instance.web.View = instance.web.Widget.extend({
args.push(context); args.push(context);
return dataset.call_button(action_data.name, args, handler); return dataset.call_button(action_data.name, args, handler);
} else if (action_data.type=="action") { } else if (action_data.type=="action") {
return this.rpc('/web/action/load', { action_id: parseInt(action_data.name, 10), context: context, do_not_eval: true}, handler); return this.rpc('/web/action/load', { action_id: action_data.name, context: context, do_not_eval: true}, handler);
} else { } else {
return dataset.exec_workflow(record_id, action_data.name, handler); return dataset.exec_workflow(record_id, action_data.name, handler);
} }

34
addons/web/static/src/xml/base.xml
View File

@ -399,16 +399,17 @@
<t t-name="ViewManager"> <t t-name="ViewManager">
<div class="oe_view_manager"> <div class="oe_view_manager">
<table class="oe_view_manager_header"> <table class="oe_view_manager_header">
<col width="33%"/> <col width="20%"/>
<col width="33%"/> <col width="25%"/>
<col width="34%"/> <col width="20%"/>
<col width="35%"/>
<tr class="oe_header_row oe_header_row_top"> <tr class="oe_header_row oe_header_row_top">
<td colspan="2"> <td colspan="2">
<h2 class="oe_view_title" t-if="widget.flags.display_title !== false"> <h2 class="oe_view_title" t-if="widget.flags.display_title !== false">
<span class="oe_view_title_text"><t t-esc="widget.display_title()"/></span> <span class="oe_view_title_text oe_breadcrumb_title"/>
</h2> </h2>
</td> </td>
<td> <td colspan="2">
<div class="oe_view_manager_view_search" t-opentag="true"/> <div class="oe_view_manager_view_search" t-opentag="true"/>
</td> </td>
</tr> </tr>
@ -416,7 +417,7 @@
<td> <td>
<div class="oe_view_manager_buttons"/> <div class="oe_view_manager_buttons"/>
</td> </td>
<td> <td colspan="2">
<div class="oe_view_manager_sidebar"/> <div class="oe_view_manager_sidebar"/>
</td> </td>
<td> <td>
@ -771,7 +772,7 @@
<table border="0" cellpadding="0" cellspacing="0" t-attf-class="oe_form_group #{classnames}"/> <table border="0" cellpadding="0" cellspacing="0" t-attf-class="oe_form_group #{classnames}"/>
</t> </t>
<t t-name="FormRenderingNotebook"> <t t-name="FormRenderingNotebook">
<div> <div class="oe_clear">
<ul t-attf-class="oe_notebook #{classnames}"> <ul t-attf-class="oe_notebook #{classnames}">
<li t-foreach="pages" t-as="page" t-att-modifiers="page.modifiers"> <li t-foreach="pages" t-as="page" t-att-modifiers="page.modifiers">
<a t-attf-href="##{page.id}"> <a t-attf-href="##{page.id}">
@ -786,7 +787,7 @@
</div> </div>
</t> </t>
<t t-name="FormRenderingSeparator"> <t t-name="FormRenderingSeparator">
<div t-attf-class="oe_horizontal_separator #{classnames}"> <div t-attf-class="oe_horizontal_separator oe_clear #{classnames}">
<t t-esc="string"/> <t t-esc="string"/>
</div> </div>
</t> </t>
@ -942,11 +943,12 @@
</t> </t>
<t t-name="FieldMany2One"> <t t-name="FieldMany2One">
<span class="oe_form_field oe_form_field_many2one oe_form_field_with_button" t-att-style="widget.node.attrs.style"> <span class="oe_form_field oe_form_field_many2one oe_form_field_with_button" t-att-style="widget.node.attrs.style">
<a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri"/> <t t-if="widget.get('effective_readonly')">
<a href="#" class="oe_form_uri"/>
<span class="oe_form_m2o_follow"/>
</t>
<t t-if="!widget.get('effective_readonly')"> <t t-if="!widget.get('effective_readonly')">
<button class="oe_button oe_m2o_cm_button" title="Open Resource"> <a href="#" class="oe_m2o_cm_button oe_e oe_right">/</a>
<img t-att-src='_s + "/web/static/src/img/icons/terp-folder-yellow.png"'/>
</button>
<div> <div>
<input type="text" <input type="text"
t-att-id="widget.id_for_label" t-att-id="widget.id_for_label"
@ -961,18 +963,20 @@
</t> </t>
</span> </span>
</t> </t>
<!-- Collection of m2m tags -->
<t t-name="FieldMany2ManyTags"> <t t-name="FieldMany2ManyTags">
<div class="oe_form_field oe_form_field_many2manytags" t-att-style="widget.node.attrs.style"> <div class="oe_form_field oe_tags" t-att-style="widget.node.attrs.style">
<t t-if="! widget.get('effective_readonly')"> <t t-if="! widget.get('effective_readonly')">
<textarea rows="1" style="width: 100%" <textarea rows="1" style="width: 100%"
t-att-placeholder="widget.node.attrs.placeholder"></textarea> t-att-placeholder="widget.node.attrs.placeholder"></textarea>
</t> </t>
</div> </div>
</t> </t>
<t t-name="FieldMany2ManyTags.box"> <!-- Individual m2m tag element -->
<t t-name="FieldMany2ManyTag">
<t t-set="i" t-value="0"/> <t t-set="i" t-value="0"/>
<t t-foreach="elements" t-as="el"> <t t-foreach="elements" t-as="el">
<span class="oe_form_field_many2manytags_box" t-att-data-index="i"> <span class="oe_tag" t-att-data-index="i">
<t t-esc="el[1]"/> <t t-esc="el[1]"/>
</span> </span>
<t t-set="i" t-value="i + 1"/> <t t-set="i" t-value="i + 1"/>

4
addons/web_calendar/__openerp__.py
View File

@ -1,9 +1,9 @@
{ {
"name": "web calendar", "name": "Web Calendar",
"category": "Hidden", "category": "Hidden",
"description": "description":
""" """
OpenERP Web calendar view. OpenERP Web Calendar view.
""", """,
"version": "2.0", "version": "2.0",
"depends": ['web'], "depends": ['web'],

138
addons/web_calendar/i18n/ja.po
View File

@ -8,135 +8,135 @@ msgstr ""
"Project-Id-Version: openerp-web\n" "Project-Id-Version: openerp-web\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-07-02 09:06+0200\n" "POT-Creation-Date: 2012-07-02 09:06+0200\n"
"PO-Revision-Date: 2012-02-22 02:18+0000\n" "PO-Revision-Date: 2012-07-19 01:27+0000\n"
"Last-Translator: Masaki Yamaya <Unknown>\n" "Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n" "Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-07-03 05:55+0000\n" "X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
"X-Generator: Launchpad (build 15531)\n" "X-Generator: Launchpad (build 15637)\n"
#. openerp-web #. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:12 #: addons/web_calendar/static/src/js/calendar.js:11
msgid "Calendar" msgid "Calendar"
msgstr "カレンダー" msgstr "カレンダー"
#. openerp-web #. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:73 #: addons/web_calendar/static/src/js/calendar.js:70
msgid "Filter" msgid "Filter"
msgstr "" msgstr "フィルタ"
#. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:139
msgid "Today"
msgstr ""
#. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:140
msgid "Day"
msgstr ""
#. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:141
msgid "Week"
msgstr ""
#. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:142
msgid "Month"
msgstr ""
#. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:143
msgid "New event"
msgstr ""
#. openerp-web #. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:144 #: addons/web_calendar/static/src/js/calendar.js:144
msgid "Save" msgid "Today"
msgstr "" msgstr "本日"
#. openerp-web #. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:145 #: addons/web_calendar/static/src/js/calendar.js:145
msgid "Cancel" msgid "Day"
msgstr "" msgstr "日"
#. openerp-web #. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:146 #: addons/web_calendar/static/src/js/calendar.js:146
msgid "Details" msgid "Week"
msgstr "" msgstr "週"
#. openerp-web #. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:147 #: addons/web_calendar/static/src/js/calendar.js:147
msgid "Edit" msgid "Month"
msgstr "" msgstr "月"
#. openerp-web #. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:148 #: addons/web_calendar/static/src/js/calendar.js:148
msgid "Delete" msgid "New event"
msgstr "" msgstr "新規イベント"
#. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:149
msgid "Save"
msgstr "保存"
#. openerp-web #. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:150 #: addons/web_calendar/static/src/js/calendar.js:150
msgid "Event will be deleted permanently, are you sure?" msgid "Cancel"
msgstr "" msgstr "キャンセル"
#. openerp-web #. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:151 #: addons/web_calendar/static/src/js/calendar.js:151
#: addons/web_calendar/static/src/js/calendar.js:164 msgid "Details"
msgid "Description" msgstr "詳細"
msgstr ""
#. openerp-web #. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:152 #: addons/web_calendar/static/src/js/calendar.js:152
msgid "Time period" msgid "Edit"
msgstr "" msgstr "編集"
#. openerp-web #. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:153 #: addons/web_calendar/static/src/js/calendar.js:153
msgid "Full day" msgid "Delete"
msgstr "" msgstr "削除"
#. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:155
msgid "Event will be deleted permanently, are you sure?"
msgstr "イベントは完全に削除されます。よろしいですか？"
#. openerp-web #. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:156 #: addons/web_calendar/static/src/js/calendar.js:156
msgid "Do you want to edit the whole set of repeated events?" #: addons/web_calendar/static/src/js/calendar.js:169
msgstr "" msgid "Description"
msgstr "詳細"
#. openerp-web #. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:157 #: addons/web_calendar/static/src/js/calendar.js:157
msgid "Repeat event" msgid "Time period"
msgstr "" msgstr "期間"
#. openerp-web #. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:158 #: addons/web_calendar/static/src/js/calendar.js:158
msgid "Disabled" msgid "Full day"
msgstr "" msgstr "終日"
#. openerp-web #. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:159 #: addons/web_calendar/static/src/js/calendar.js:161
msgid "Enabled" msgid "Do you want to edit the whole set of repeated events?"
msgstr "" msgstr "繰り返しイベントのセット全体を編集しますか？"
#. openerp-web #. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:162 #: addons/web_calendar/static/src/js/calendar.js:162
#: addons/web_calendar/static/src/js/calendar.js:170 msgid "Repeat event"
msgid "Agenda" msgstr "繰り返しイベント"
msgstr ""
#. openerp-web #. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:163 #: addons/web_calendar/static/src/js/calendar.js:163
msgid "Date" msgid "Disabled"
msgstr "" msgstr "無効"
#. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:164
msgid "Enabled"
msgstr "有効"
#. openerp-web #. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:167 #: addons/web_calendar/static/src/js/calendar.js:167
msgid "Year" #: addons/web_calendar/static/src/js/calendar.js:175
msgstr "" msgid "Agenda"
msgstr "議事"
#. openerp-web #. openerp-web
#: addons/web_calendar/static/src/xml/web_calendar.xml:8 #: addons/web_calendar/static/src/js/calendar.js:168
#: addons/web_calendar/static/src/xml/web_calendar.xml:9 msgid "Date"
msgstr "日付"
#. openerp-web
#: addons/web_calendar/static/src/js/calendar.js:172
msgid "Year"
msgstr "年"
#. openerp-web
#: addons/web_calendar/static/src/xml/web_calendar.xml:5
#: addons/web_calendar/static/src/xml/web_calendar.xml:6
msgid "&nbsp;" msgid "&nbsp;"
msgstr "&nbsp;" msgstr "&nbsp;"

4
addons/web_dashboard/__openerp__.py
View File

@ -1,9 +1,9 @@
{ {
"name": "web Dashboard", "name": "Web Dashboard",
"category": "Hidden", "category": "Hidden",
"description": "description":
""" """
OpenERP Web dashboard view. OpenERP Web Dashboard view.
""", """,
"version": "2.0", "version": "2.0",
"depends": ['web'], "depends": ['web'],

24
addons/web_dashboard/i18n/ja.po
View File

@ -8,29 +8,29 @@ msgstr ""
"Project-Id-Version: openerp-web\n" "Project-Id-Version: openerp-web\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-07-02 09:06+0200\n" "POT-Creation-Date: 2012-07-02 09:06+0200\n"
"PO-Revision-Date: 2012-03-26 22:14+0000\n" "PO-Revision-Date: 2012-07-19 01:29+0000\n"
"Last-Translator: Masaki Yamaya <Unknown>\n" "Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n" "Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-07-03 05:55+0000\n" "X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
"X-Generator: Launchpad (build 15531)\n" "X-Generator: Launchpad (build 15637)\n"
#. openerp-web #. openerp-web
#: addons/web_dashboard/static/src/js/dashboard.js:61 #: addons/web_dashboard/static/src/js/dashboard.js:60
msgid "Edit Layout" msgid "Edit Layout"
msgstr "レイアウトを編集" msgstr "レイアウトの編集"
#. openerp-web #. openerp-web
#: addons/web_dashboard/static/src/js/dashboard.js:107 #: addons/web_dashboard/static/src/js/dashboard.js:106
msgid "Are you sure you want to remove this item ?" msgid "Are you sure you want to remove this item ?"
msgstr "この項目を取り除きますか？" msgstr "この項目を削除しますか？"
#. openerp-web #. openerp-web
#: addons/web_dashboard/static/src/xml/web_dashboard.xml:4 #: addons/web_dashboard/static/src/xml/web_dashboard.xml:4
msgid "Reset Layout.." msgid "Reset Layout.."
msgstr "レイアウトをリセット" msgstr "レイアウトのリセット"
#. openerp-web #. openerp-web
#: addons/web_dashboard/static/src/xml/web_dashboard.xml:6 #: addons/web_dashboard/static/src/xml/web_dashboard.xml:6
@ -40,12 +40,12 @@ msgstr "リセット"
#. openerp-web #. openerp-web
#: addons/web_dashboard/static/src/xml/web_dashboard.xml:8 #: addons/web_dashboard/static/src/xml/web_dashboard.xml:8
msgid "Change Layout.." msgid "Change Layout.."
msgstr "レイアウトを変更…" msgstr "レイアウトの変更…"
#. openerp-web #. openerp-web
#: addons/web_dashboard/static/src/xml/web_dashboard.xml:10 #: addons/web_dashboard/static/src/xml/web_dashboard.xml:10
msgid "Change Layout" msgid "Change Layout"
msgstr "レイアウトを変更" msgstr "レイアウトの変更"
#. openerp-web #. openerp-web
#: addons/web_dashboard/static/src/xml/web_dashboard.xml:27 #: addons/web_dashboard/static/src/xml/web_dashboard.xml:27
@ -60,7 +60,7 @@ msgstr "作成"
#. openerp-web #. openerp-web
#: addons/web_dashboard/static/src/xml/web_dashboard.xml:39 #: addons/web_dashboard/static/src/xml/web_dashboard.xml:39
msgid "Choose dashboard layout" msgid "Choose dashboard layout"
msgstr "ダッシュボードのレイアウトを選択" msgstr "ダッシュボードレイアウトの選択"
#, python-format #, python-format
#~ msgid "Execute task \"%s\"" #~ msgid "Execute task \"%s\""

17
addons/web_dashboard/static/src/js/dashboard.js
View File

@ -37,11 +37,12 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
delete(action.attrs.width); delete(action.attrs.width);
delete(action.attrs.height); delete(action.attrs.height);
delete(action.attrs.colspan); delete(action.attrs.colspan);
self.rpc('/web/action/load', { var action_id = _.str.toNumber(action.attrs.name);
action_id: parseInt(action.attrs.name, 10) if (!_.isNaN(action_id)) {
}, function(result) { self.rpc('/web/action/load', {action_id: action_id}, function(result) {
self.on_load_action(result, column_index + '_' + action_index, action.attrs); self.on_load_action(result, column_index + '_' + action_index, action.attrs);
}); });
}
}); });
}); });
}, },
@ -209,8 +210,8 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
} }
}); });
} }
if (am.inner_viewmanager) { if (am.inner_widget) {
am.inner_viewmanager.on_mode_switch.add(function(mode) { am.inner_widget.on_mode_switch.add(function(mode) {
var new_views = []; var new_views = [];
_.each(action_orig.views, function(view) { _.each(action_orig.views, function(view) {
new_views[view[1] === mode ? 'unshift' : 'push'](view); new_views[view[1] === mode ? 'unshift' : 'push'](view);
@ -219,7 +220,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
new_views.unshift([false, mode]); new_views.unshift([false, mode]);
} }
action_orig.views = new_views; action_orig.views = new_views;
action_orig.res_id = am.inner_viewmanager.dataset.ids[am.inner_viewmanager.dataset.index]; action_orig.res_id = am.inner_widget.dataset.ids[am.inner_widget.dataset.index];
self.do_action(action_orig); self.do_action(action_orig);
}); });
} }

2
addons/web_dashboard/static/src/xml/web_dashboard.xml
View File

@ -48,7 +48,7 @@
</div> </div>
</t> </t>
<t t-name="DashBoard.xml"> <t t-name="DashBoard.xml">
<form t-att-string="form_title"> <form t-att-string="form_title" version="7.0">
<board t-att-style="style"> <board t-att-style="style">
<column t-foreach="columns" t-as="column"> <column t-foreach="columns" t-as="column">
<action t-foreach="column" t-as="action" t-att="action"/> <action t-foreach="column" t-as="action" t-att="action"/>

2
addons/web_diagram/__openerp__.py
View File

@ -1,7 +1,7 @@
{ {
"name" : "OpenERP Web Diagram", "name" : "OpenERP Web Diagram",
"category" : "Hidden", "category" : "Hidden",
"description":'Openerp web Diagram view', "description":'Openerp Web Diagram view',
"version" : "2.0", "version" : "2.0",
"depends" : ["web"], "depends" : ["web"],
"js": [ "js": [

25
addons/web_diagram/i18n/ja.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openerp-web\n" "Project-Id-Version: openerp-web\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-07-02 09:06+0200\n" "POT-Creation-Date: 2012-07-02 09:06+0200\n"
"PO-Revision-Date: 2012-03-26 22:02+0000\n" "PO-Revision-Date: 2012-07-19 01:37+0000\n"
"Last-Translator: Masaki Yamaya <Unknown>\n" "Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n" "Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-07-03 05:55+0000\n" "X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
"X-Generator: Launchpad (build 15531)\n" "X-Generator: Launchpad (build 15637)\n"
#. openerp-web #. openerp-web
#: addons/web_diagram/static/src/js/diagram.js:11 #: addons/web_diagram/static/src/js/diagram.js:11
@ -25,7 +25,7 @@ msgstr "ダイアグラム"
#. openerp-web #. openerp-web
#: addons/web_diagram/static/src/js/diagram.js:165 #: addons/web_diagram/static/src/js/diagram.js:165
msgid "Are you sure?" msgid "Are you sure?"
msgstr "" msgstr "本当によろしいですか？"
#. openerp-web #. openerp-web
#: addons/web_diagram/static/src/js/diagram.js:195 #: addons/web_diagram/static/src/js/diagram.js:195
@ -35,6 +35,10 @@ msgid ""
"\n" "\n"
"Are you sure ?" "Are you sure ?"
msgstr "" msgstr ""
"このノードの削除は元に戻すことができません。\n"
"また、接続している全ての取引を削除します。\n"
"\n"
"本当によろしいですか？"
#. openerp-web #. openerp-web
#: addons/web_diagram/static/src/js/diagram.js:213 #: addons/web_diagram/static/src/js/diagram.js:213
@ -43,18 +47,21 @@ msgid ""
"\n" "\n"
"Are you sure ?" "Are you sure ?"
msgstr "" msgstr ""
"この取引の削除は元に戻すことができません。\n"
"\n"
"本当によろしいですか？"
#. openerp-web #. openerp-web
#: addons/web_diagram/static/src/js/diagram.js:224 #: addons/web_diagram/static/src/js/diagram.js:224
#: addons/web_diagram/static/src/js/diagram.js:257 #: addons/web_diagram/static/src/js/diagram.js:257
msgid "Activity" msgid "Activity"
msgstr "アクティビティ" msgstr "活動"
#. openerp-web #. openerp-web
#: addons/web_diagram/static/src/js/diagram.js:232 #: addons/web_diagram/static/src/js/diagram.js:232
#: addons/web_diagram/static/src/js/diagram.js:296 #: addons/web_diagram/static/src/js/diagram.js:296
msgid "Open: " msgid "Open: "
msgstr "開く: " msgstr "開く： "
#. openerp-web #. openerp-web
#: addons/web_diagram/static/src/js/diagram.js:262 #: addons/web_diagram/static/src/js/diagram.js:262
@ -66,9 +73,9 @@ msgstr "作成："
#: addons/web_diagram/static/src/js/diagram.js:289 #: addons/web_diagram/static/src/js/diagram.js:289
#: addons/web_diagram/static/src/js/diagram.js:308 #: addons/web_diagram/static/src/js/diagram.js:308
msgid "Transition" msgid "Transition"
msgstr "変遷" msgstr "遷移"
#. openerp-web #. openerp-web
#: addons/web_diagram/static/src/xml/base_diagram.xml:6 #: addons/web_diagram/static/src/xml/base_diagram.xml:6
msgid "New Node" msgid "New Node"
msgstr "新しいノード" msgstr "新規ノード"

4
addons/web_gantt/__openerp__.py
View File

@ -1,9 +1,9 @@
{ {
"name": "web Gantt", "name": "Web Gantt",
"category": "Hidden", "category": "Hidden",
"description": "description":
""" """
OpenERP Web gantt chart view. OpenERP Web Gantt chart view.
""", """,
"version": "2.0", "version": "2.0",
"depends": ['web'], "depends": ['web'],

10
addons/web_gantt/i18n/ja.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openerp-web\n" "Project-Id-Version: openerp-web\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-07-02 09:06+0200\n" "POT-Creation-Date: 2012-07-02 09:06+0200\n"
"PO-Revision-Date: 2012-03-26 21:57+0000\n" "PO-Revision-Date: 2012-07-19 01:37+0000\n"
"Last-Translator: Masaki Yamaya <Unknown>\n" "Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n" "Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-07-03 05:55+0000\n" "X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
"X-Generator: Launchpad (build 15531)\n" "X-Generator: Launchpad (build 15637)\n"
#. openerp-web #. openerp-web
#: addons/web_gantt/static/src/js/gantt.js:11 #: addons/web_gantt/static/src/js/gantt.js:11
@ -25,4 +25,4 @@ msgstr "ガント"
#. openerp-web #. openerp-web
#: addons/web_gantt/static/src/xml/web_gantt.xml:10 #: addons/web_gantt/static/src/xml/web_gantt.xml:10
msgid "Create" msgid "Create"
msgstr "作成する" msgstr "作成"

2
addons/web_graph/__openerp__.py
View File

@ -5,7 +5,7 @@
* Parse a <graph> view but allows changing dynamically the presentation * Parse a <graph> view but allows changing dynamically the presentation
* Graph Types: pie, lines, areas, bars, radar * Graph Types: pie, lines, areas, bars, radar
* Stacked / Not Stacked for areas and bars * Stacked/Not Stacked for areas and bars
* Legends: top, inside (top/left), hidden * Legends: top, inside (top/left), hidden
* Features: download as PNG or CSV, browse data grid, switch orientation * Features: download as PNG or CSV, browse data grid, switch orientation
* Unlimited "Group By" levels (not stacked), two cross level analysis (stacked) * Unlimited "Group By" levels (not stacked), two cross level analysis (stacked)

40
addons/web_graph/i18n/ja.po
View File

@ -8,91 +8,91 @@ msgstr ""
"Project-Id-Version: openerp-web\n" "Project-Id-Version: openerp-web\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-07-02 09:06+0200\n" "POT-Creation-Date: 2012-07-02 09:06+0200\n"
"PO-Revision-Date: 2012-02-22 02:21+0000\n" "PO-Revision-Date: 2012-07-19 03:25+0000\n"
"Last-Translator: Masaki Yamaya <Unknown>\n" "Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n" "Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-07-03 05:55+0000\n" "X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
"X-Generator: Launchpad (build 15531)\n" "X-Generator: Launchpad (build 15637)\n"
#. openerp-web #. openerp-web
#: addons/web_graph/static/src/js/graph.js:22 #: addons/web_graph/static/src/js/graph.js:19
msgid "Graph" msgid "Graph"
msgstr "グラフ" msgstr "グラフ"
#. openerp-web #. openerp-web
#: addons/web_graph/static/src/xml/web_graph.xml:5 #: addons/web_graph/static/src/xml/web_graph.xml:5
msgid "Graph Options" msgid "Graph Options"
msgstr "" msgstr "グラフオプション"
#. openerp-web #. openerp-web
#: addons/web_graph/static/src/xml/web_graph.xml:7 #: addons/web_graph/static/src/xml/web_graph.xml:7
msgid "Graph Mode" msgid "Graph Mode"
msgstr "" msgstr "グラフモード"
#. openerp-web #. openerp-web
#: addons/web_graph/static/src/xml/web_graph.xml:11 #: addons/web_graph/static/src/xml/web_graph.xml:11
msgid "Pie" msgid "Pie"
msgstr "" msgstr "パイ"
#. openerp-web #. openerp-web
#: addons/web_graph/static/src/xml/web_graph.xml:12 #: addons/web_graph/static/src/xml/web_graph.xml:12
msgid "Bars" msgid "Bars"
msgstr "" msgstr "バー"
#. openerp-web #. openerp-web
#: addons/web_graph/static/src/xml/web_graph.xml:14 #: addons/web_graph/static/src/xml/web_graph.xml:14
msgid "Lines" msgid "Lines"
msgstr "" msgstr "ライン"
#. openerp-web #. openerp-web
#: addons/web_graph/static/src/xml/web_graph.xml:15 #: addons/web_graph/static/src/xml/web_graph.xml:15
msgid "Areas" msgid "Areas"
msgstr "" msgstr "エリア"
#. openerp-web #. openerp-web
#: addons/web_graph/static/src/xml/web_graph.xml:18 #: addons/web_graph/static/src/xml/web_graph.xml:18
msgid "Radar" msgid "Radar"
msgstr "" msgstr "レーダー"
#. openerp-web #. openerp-web
#: addons/web_graph/static/src/xml/web_graph.xml:20 #: addons/web_graph/static/src/xml/web_graph.xml:20
msgid "Legend" msgid "Legend"
msgstr "" msgstr "凡例"
#. openerp-web #. openerp-web
#: addons/web_graph/static/src/xml/web_graph.xml:24 #: addons/web_graph/static/src/xml/web_graph.xml:24
msgid "Hidden" msgid "Hidden"
msgstr "" msgstr "非表示"
#. openerp-web #. openerp-web
#: addons/web_graph/static/src/xml/web_graph.xml:25 #: addons/web_graph/static/src/xml/web_graph.xml:25
msgid "Inside" msgid "Inside"
msgstr "" msgstr "内側"
#. openerp-web #. openerp-web
#: addons/web_graph/static/src/xml/web_graph.xml:26 #: addons/web_graph/static/src/xml/web_graph.xml:26
msgid "Top" msgid "Top"
msgstr "" msgstr "上"
#. openerp-web #. openerp-web
#: addons/web_graph/static/src/xml/web_graph.xml:28 #: addons/web_graph/static/src/xml/web_graph.xml:28
msgid "Actions" msgid "Actions"
msgstr "" msgstr "アクション"
#. openerp-web #. openerp-web
#: addons/web_graph/static/src/xml/web_graph.xml:32 #: addons/web_graph/static/src/xml/web_graph.xml:32
msgid "Switch Axis" msgid "Switch Axis"
msgstr "" msgstr "Axisに切替"
#. openerp-web #. openerp-web
#: addons/web_graph/static/src/xml/web_graph.xml:33 #: addons/web_graph/static/src/xml/web_graph.xml:33
msgid "Show Data" msgid "Show Data"
msgstr "" msgstr "データの表示"
#. openerp-web #. openerp-web
#: addons/web_graph/static/src/xml/web_graph.xml:34 #: addons/web_graph/static/src/xml/web_graph.xml:34
msgid "Download as PNG" msgid "Download as PNG"
msgstr "" msgstr "PNGとしてダウンロード"

28
addons/web_kanban/i18n/ja.po
View File

@ -8,59 +8,59 @@ msgstr ""
"Project-Id-Version: openerp-web\n" "Project-Id-Version: openerp-web\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-07-02 09:06+0200\n" "POT-Creation-Date: 2012-07-02 09:06+0200\n"
"PO-Revision-Date: 2012-03-06 06:35+0000\n" "PO-Revision-Date: 2012-07-19 03:34+0000\n"
"Last-Translator: Masaki Yamaya <Unknown>\n" "Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n" "Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-07-03 05:55+0000\n" "X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
"X-Generator: Launchpad (build 15531)\n" "X-Generator: Launchpad (build 15637)\n"
#. openerp-web #. openerp-web
#: addons/web_kanban/static/src/js/kanban.js:10 #: addons/web_kanban/static/src/js/kanban.js:10
msgid "Kanban" msgid "Kanban"
msgstr "看板" msgstr "かんばん"
#. openerp-web #. openerp-web
#: addons/web_kanban/static/src/js/kanban.js:372 #: addons/web_kanban/static/src/js/kanban.js:293
msgid "Undefined" msgid "Undefined"
msgstr "未定義" msgstr "未定義"
#. openerp-web #. openerp-web
#: addons/web_kanban/static/src/js/kanban.js:684 #: addons/web_kanban/static/src/js/kanban.js:468
msgid "Are you sure you want to delete this record ?" msgid "Are you sure you want to delete this record ?"
msgstr "このレコードを削除しますか？" msgstr "このレコードを削除しますか？"
#. openerp-web #. openerp-web
#: addons/web_kanban/static/src/js/kanban.js:839 #: addons/web_kanban/static/src/js/kanban.js:839
msgid "Create: " msgid "Create: "
msgstr "" msgstr "作成： "
#. openerp-web #. openerp-web
#: addons/web_kanban/static/src/xml/web_kanban.xml:53 #: addons/web_kanban/static/src/xml/web_kanban.xml:41
msgid "Show more... (" msgid "Show more... ("
msgstr "もっと表示する…（" msgstr "さらに表示…（"
#. openerp-web #. openerp-web
#: addons/web_kanban/static/src/xml/web_kanban.xml:53 #: addons/web_kanban/static/src/xml/web_kanban.xml:41
msgid "remaining)" msgid "remaining)"
msgstr "残り）" msgstr "残り）"
#. openerp-web #. openerp-web
#: addons/web_kanban/static/src/xml/web_kanban.xml:71 #: addons/web_kanban/static/src/xml/web_kanban.xml:71
msgid "Add" msgid "Add"
msgstr "" msgstr "追加"
#. openerp-web #. openerp-web
#: addons/web_kanban/static/src/xml/web_kanban.xml:71 #: addons/web_kanban/static/src/xml/web_kanban.xml:71
msgid "or" msgid "or"
msgstr "" msgstr "または"
#. openerp-web #. openerp-web
#: addons/web_kanban/static/src/xml/web_kanban.xml:72 #: addons/web_kanban/static/src/xml/web_kanban.xml:72
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr "キャンセル"
#~ msgid "</tr><tr>" #~ msgid "</tr><tr>"
#~ msgstr "</tr><tr>" #~ msgstr "</tr><tr>"

32
addons/web_kanban/static/src/css/kanban.css
View File

@ -1,5 +1,5 @@
@charset "utf-8";
.openerp .oe_kanban_view { .openerp .oe_kanban_view {
background: url(/web/static/src/img/form_sheetbg.png);
height: inherit; height: inherit;
} }
.openerp .oe_kanban_view .ui-sortable-placeholder { .openerp .oe_kanban_view .ui-sortable-placeholder {
@ -38,7 +38,6 @@
} }
.openerp .oe_kanban_view .oe_kanban_groups { .openerp .oe_kanban_view .oe_kanban_groups {
height: inherit; height: inherit;
width: 100%;
} }
.openerp .oe_kanban_view .oe_kanban_header:hover .oe_dropdown_kanban { .openerp .oe_kanban_view .oe_kanban_header:hover .oe_dropdown_kanban {
display: inline-block; display: inline-block;
@ -62,12 +61,15 @@
vertical-align: top; vertical-align: top;
padding: 6px 6px 6px 5px; padding: 6px 6px 6px 5px;
} }
.openerp .oe_kanban_view .oe_kanban_column.oe_kanban_grouped, .openerp .oe_kanban_view .oe_kanban_group_header { .openerp .oe_kanban_view .oe_kanban_group_header.oe_kanban_no_group {
background: #f0eeee; padding: 0px;
} }
.openerp .oe_kanban_view .oe_kanban_column.oe_kanban_grouped, .openerp .oe_kanban_view .oe_kanban_group_header { .openerp .oe_kanban_view .oe_kanban_column.oe_kanban_grouped, .openerp .oe_kanban_view .oe_kanban_group_header {
background: #f0eeee;
border-left: 1px solid #f0f8f8; border-left: 1px solid #f0f8f8;
border-right: 1px solid #b9b9b9; border-right: 1px solid #b9b9b9;
min-width: 170px;
max-width: 250px;
} }
.openerp .oe_kanban_view .oe_form .oe_kanban_column { .openerp .oe_kanban_view .oe_form .oe_kanban_column {
padding: 0px; padding: 0px;
@ -79,9 +81,6 @@
.openerp .oe_kanban_view .oe_kanban_aggregates { .openerp .oe_kanban_view .oe_kanban_aggregates {
padding: 0; padding: 0;
} }
.openerp .oe_kanban_view .oe_kanban_group_header {
position: relative;
}
.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_title, .openerp .oe_kanban_view .oe_kanban_group_folded.oe_kanban_column > *, .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_aggregates, .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_add { .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_title, .openerp .oe_kanban_view .oe_kanban_group_folded.oe_kanban_column > *, .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_aggregates, .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_add {
display: none; display: none;
} }
@ -165,7 +164,6 @@
font-size: 13px; font-size: 13px;
padding: 0 5px; padding: 0 5px;
color: #4c4c4c; color: #4c4c4c;
min-height: 120px;
} }
.openerp .oe_kanban_view .oe_kanban_details h4 { .openerp .oe_kanban_view .oe_kanban_details h4 {
margin: 0 0 4px 0; margin: 0 0 4px 0;
@ -175,7 +173,6 @@
display: block; display: block;
min-height: 50px; min-height: 50px;
margin: 0; margin: 0;
display: block;
-moz-border-radius: 4px; -moz-border-radius: 4px;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
@ -241,6 +238,9 @@
.openerp .oe_kanban_view .oe_kanban_grouped .oe_kanban_show_more .oe_button { .openerp .oe_kanban_view .oe_kanban_grouped .oe_kanban_show_more .oe_button {
width: 100%; width: 100%;
} }
.openerp .oe_kanban_view .oe_kanban_ungrouped {
background: white;
}
.openerp .oe_kanban_view .oe_kanban_ungrouped .oe_kanban_record { .openerp .oe_kanban_view .oe_kanban_ungrouped .oe_kanban_record {
float: left; float: left;
padding: 2px; padding: 2px;
@ -401,17 +401,23 @@
position: relative; position: relative;
top: 2px; top: 2px;
} }
.openerp .oe_kanban_view .oe_kanban_project_times li {
float: left;
}
.openerp .oe_kanban_view .oe_kanban_status { .openerp .oe_kanban_view .oe_kanban_status {
position: relative;
top: 4px;
display: inline-block; display: inline-block;
height: 12px; height: 12px;
width: 12px; width: 12px;
margin: 4px auto;
-moz-border-radius: 6px; -moz-border-radius: 6px;
-webkit-border-radius: 6px; -webkit-border-radius: 6px;
border-radius: 6px; border-radius: 6px;
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6); background-position: center center;
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6); background-image: -webkit-radial-gradient(circle, #eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6); background-image: -moz-radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
background-image: -ms-radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
background-image: radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%);
} }
.openerp .oe_kanban_view .oe_kanban_status_green { .openerp .oe_kanban_view .oe_kanban_status_green {
background: green; background: green;

35
addons/web_kanban/static/src/css/kanban.sass
View File

@ -21,6 +21,8 @@
.openerp .oe_kanban_view .openerp .oe_kanban_view
// KanbanView {{{ // KanbanView {{{
//background: url(data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAKElEQVQIHWP8DwTv379nAAFBQUEGhnfv3oHEwADEZgJLIRGMIClkLQCr3x2Htp/lLwAAAABJRU5ErkJggg==)
background: url(/web/static/src/img/form_sheetbg.png)
height: inherit height: inherit
.ui-sortable-placeholder .ui-sortable-placeholder
border: 1px dotted black border: 1px dotted black
@ -52,7 +54,6 @@
// KanbanGroups {{{ // KanbanGroups {{{
.oe_kanban_groups .oe_kanban_groups
height: inherit height: inherit
width: 100%
.oe_kanban_header .oe_kanban_header
&:hover &:hover
.oe_dropdown_kanban .oe_dropdown_kanban
@ -73,13 +74,15 @@
.oe_kanban_column, .oe_kanban_group_header .oe_kanban_column, .oe_kanban_group_header
vertical-align: top vertical-align: top
padding: 6px 6px 6px 5px padding: 6px 6px 6px 5px
.oe_kanban_group_header.oe_kanban_no_group
padding: 0px
.oe_kanban_column.oe_kanban_grouped, .oe_kanban_group_header .oe_kanban_column.oe_kanban_grouped, .oe_kanban_group_header
background: #f0eeee background: #f0eeee
.oe_kanban_column.oe_kanban_grouped, .oe_kanban_group_header
border-left: 1px solid #f0f8f8 border-left: 1px solid #f0f8f8
border-right: 1px solid #b9b9b9 border-right: 1px solid #b9b9b9
min-width: 170px
max-width: 250px
.oe_form .oe_form
.oe_kanban_column .oe_kanban_column
@ -90,8 +93,6 @@
height: 100% height: 100%
.oe_kanban_aggregates .oe_kanban_aggregates
padding: 0 padding: 0
.oe_kanban_group_header
position: relative
.oe_kanban_group_folded .oe_kanban_group_folded
.oe_kanban_group_title, &.oe_kanban_column > *, .oe_kanban_aggregates, .oe_kanban_add .oe_kanban_group_title, &.oe_kanban_column > *, .oe_kanban_aggregates, .oe_kanban_add
display: none display: none
@ -164,7 +165,6 @@
font-size: 13px font-size: 13px
padding: 0 5px padding: 0 5px
color: #4c4c4c color: #4c4c4c
min-height: 120px
h4 h4
margin: 0 0 4px 0 margin: 0 0 4px 0
.oe_kanban_record .oe_kanban_record
@ -172,7 +172,6 @@
display: block display: block
min-height: 50px min-height: 50px
margin: 0 margin: 0
display: block
@include radius(4px) @include radius(4px)
&:last-child &:last-child
margin-bottom: 0 margin-bottom: 0
@ -216,12 +215,14 @@
text-align: center text-align: center
.oe_kanban_grouped .oe_kanban_show_more .oe_button .oe_kanban_grouped .oe_kanban_show_more .oe_button
width: 100% width: 100%
.oe_kanban_ungrouped .oe_kanban_record .oe_kanban_ungrouped
float: left background: white
padding: 2px .oe_kanban_record
box-sizing: border-box float: left
-moz-box-sizing: border-box padding: 2px
-webkit-box-sizing: border-box box-sizing: border-box
-moz-box-sizing: border-box
-webkit-box-sizing: border-box
.oe_kanban_action_button .oe_kanban_action_button
height: 22px height: 22px
margin: 0 margin: 0
@ -335,14 +336,18 @@
float: right float: right
position: relative position: relative
top: 2px top: 2px
.oe_kanban_project_times li
float: left
.oe_kanban_status .oe_kanban_status
position: relative
top: 4px
display: inline-block display: inline-block
height: 12px height: 12px
width: 12px width: 12px
margin: 4px auto
@include radius(6px) @include radius(6px)
@include box-shadow(0 1px 3px rgba(0,0,0,0.6)) @include radial-gradient((#eee 0%, #ccc 40%, #bbb 100%))
.oe_kanban_status_green .oe_kanban_status_green
background: green background: green
@include radial-gradient((#55dd55 0%, #44aa44 40%, #339933 100%)) @include radial-gradient((#55dd55 0%, #44aa44 40%, #339933 100%))

9
addons/web_kanban/static/src/js/kanban.js
View File

@ -286,13 +286,20 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
}, },
compute_groups_width: function() { compute_groups_width: function() {
var unfolded = 0; var unfolded = 0;
var self = this;
_.each(this.groups, function(group) { _.each(this.groups, function(group) {
unfolded += group.state.folded ? 0 : 1; unfolded += group.state.folded ? 0 : 1;
group.$element.css('width', ''); group.$element.css('width', '');
}); });
_.each(this.groups, function(group) { _.each(this.groups, function(group) {
if (!group.state.folded) { if (!group.state.folded) {
group.$element.css('width', Math.round(100/unfolded) + '%'); if (182*unfolded>=self.$element.width()) {
group.$element.css('width', "170px");
} else if (262*unfolded>self.$element.width()) {
group.$element.css('width', Math.round(100/unfolded) + '%');
} else {
group.$element.css('width', "250px");
}
} }
}); });
}, },

4
addons/web_mobile/__openerp__.py
View File

@ -1,9 +1,9 @@
{ {
"name" : "OpenERP Web mobile", "name" : "OpenERP Web Mobile",
"category": "Hidden", "category": "Hidden",
"description": "description":
""" """
OpenERP Web mobile. OpenERP Web Mobile.
""", """,
"version" : "2.0", "version" : "2.0",
"depends" : [], "depends" : [],

14
addons/web_mobile/i18n/ja.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openerp-web\n" "Project-Id-Version: openerp-web\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-07-02 09:06+0200\n" "POT-Creation-Date: 2012-07-02 09:06+0200\n"
"PO-Revision-Date: 2012-03-31 18:42+0000\n" "PO-Revision-Date: 2012-07-19 04:00+0000\n"
"Last-Translator: Masaki Yamaya <Unknown>\n" "Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n" "Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-07-03 05:55+0000\n" "X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
"X-Generator: Launchpad (build 15531)\n" "X-Generator: Launchpad (build 15637)\n"
#. openerp-web #. openerp-web
#: addons/web_mobile/static/src/xml/web_mobile.xml:17 #: addons/web_mobile/static/src/xml/web_mobile.xml:17
@ -25,7 +25,7 @@ msgstr "OpenERP"
#. openerp-web #. openerp-web
#: addons/web_mobile/static/src/xml/web_mobile.xml:22 #: addons/web_mobile/static/src/xml/web_mobile.xml:22
msgid "Database:" msgid "Database:"
msgstr "データベース:" msgstr "データベース："
#. openerp-web #. openerp-web
#: addons/web_mobile/static/src/xml/web_mobile.xml:30 #: addons/web_mobile/static/src/xml/web_mobile.xml:30
@ -65,7 +65,7 @@ msgstr "お気に入り"
#. openerp-web #. openerp-web
#: addons/web_mobile/static/src/xml/web_mobile.xml:58 #: addons/web_mobile/static/src/xml/web_mobile.xml:58
msgid "Preference" msgid "Preference"
msgstr "優先" msgstr "プリファレンス"
#. openerp-web #. openerp-web
#: addons/web_mobile/static/src/xml/web_mobile.xml:123 #: addons/web_mobile/static/src/xml/web_mobile.xml:123
@ -75,7 +75,7 @@ msgstr "ログアウト"
#. openerp-web #. openerp-web
#: addons/web_mobile/static/src/xml/web_mobile.xml:132 #: addons/web_mobile/static/src/xml/web_mobile.xml:132
msgid "There are no records to show." msgid "There are no records to show."
msgstr "表示するレコードはありません" msgstr "表示するレコードはありません。"
#. openerp-web #. openerp-web
#: addons/web_mobile/static/src/xml/web_mobile.xml:183 #: addons/web_mobile/static/src/xml/web_mobile.xml:183

24
addons/web_process/i18n/ja.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openerp-web\n" "Project-Id-Version: openerp-web\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-07-02 09:06+0200\n" "POT-Creation-Date: 2012-07-02 09:06+0200\n"
"PO-Revision-Date: 2012-03-26 22:04+0000\n" "PO-Revision-Date: 2012-07-19 04:29+0000\n"
"Last-Translator: Masaki Yamaya <Unknown>\n" "Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n" "Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-07-03 05:55+0000\n" "X-Launchpad-Export-Date: 2012-07-19 04:53+0000\n"
"X-Generator: Launchpad (build 15531)\n" "X-Generator: Launchpad (build 15637)\n"
#. openerp-web #. openerp-web
#: addons/web_process/static/src/js/process.js:261 #: addons/web_process/static/src/js/process.js:261
@ -30,7 +30,7 @@ msgstr "保存"
#. openerp-web #. openerp-web
#: addons/web_process/static/src/xml/web_process.xml:6 #: addons/web_process/static/src/xml/web_process.xml:6
msgid "Process View" msgid "Process View"
msgstr "プロセス一覧" msgstr "プロセスビュー"
#. openerp-web #. openerp-web
#: addons/web_process/static/src/xml/web_process.xml:19 #: addons/web_process/static/src/xml/web_process.xml:19
@ -40,7 +40,7 @@ msgstr "ドキュメンテーション"
#. openerp-web #. openerp-web
#: addons/web_process/static/src/xml/web_process.xml:19 #: addons/web_process/static/src/xml/web_process.xml:19
msgid "Read Documentation Online" msgid "Read Documentation Online"
msgstr "オンラインのドキュメンテーションを読んでください。" msgstr "オンラインのドキュメントを読んで下さい"
#. openerp-web #. openerp-web
#: addons/web_process/static/src/xml/web_process.xml:25 #: addons/web_process/static/src/xml/web_process.xml:25
@ -55,12 +55,12 @@ msgstr "コミュニティの議論"
#. openerp-web #. openerp-web
#: addons/web_process/static/src/xml/web_process.xml:31 #: addons/web_process/static/src/xml/web_process.xml:31
msgid "Books" msgid "Books"
msgstr "帳簿" msgstr "本"
#. openerp-web #. openerp-web
#: addons/web_process/static/src/xml/web_process.xml:31 #: addons/web_process/static/src/xml/web_process.xml:31
msgid "Get the books" msgid "Get the books"
msgstr "帳簿を取る" msgstr "本を手に入れる"
#. openerp-web #. openerp-web
#: addons/web_process/static/src/xml/web_process.xml:37 #: addons/web_process/static/src/xml/web_process.xml:37
@ -85,7 +85,7 @@ msgstr "注記"
#. openerp-web #. openerp-web
#: addons/web_process/static/src/xml/web_process.xml:59 #: addons/web_process/static/src/xml/web_process.xml:59
msgid "Last modified by:" msgid "Last modified by:"
msgstr "最後に変更：" msgstr "最終更新者："
#. openerp-web #. openerp-web
#: addons/web_process/static/src/xml/web_process.xml:59 #: addons/web_process/static/src/xml/web_process.xml:59
@ -105,14 +105,14 @@ msgstr "関係："
#. openerp-web #. openerp-web
#: addons/web_process/static/src/xml/web_process.xml:88 #: addons/web_process/static/src/xml/web_process.xml:88
msgid "Select Process" msgid "Select Process"
msgstr "プロセスを選んでください" msgstr "プロセスの選択"
#. openerp-web #. openerp-web
#: addons/web_process/static/src/xml/web_process.xml:98 #: addons/web_process/static/src/xml/web_process.xml:98
msgid "Select" msgid "Select"
msgstr "選択する" msgstr "選択"
#. openerp-web #. openerp-web
#: addons/web_process/static/src/xml/web_process.xml:109 #: addons/web_process/static/src/xml/web_process.xml:109
msgid "Edit Process" msgid "Edit Process"
msgstr "プロセスを編集" msgstr "プロセスの編集"

2
addons/web_process/static/src/js/process.js
View File

@ -260,7 +260,7 @@ openerp.web_process = function (instance) {
buttons : [ buttons : [
{text: _t("Cancel"), click: function() { $(this).dialog('destroy'); }}, {text: _t("Cancel"), click: function() { $(this).dialog('destroy'); }},
{text: _t("Save"), click: function() { {text: _t("Save"), click: function() {
var form_view = action_manager.inner_viewmanager.views.form.controller; var form_view = action_manager.inner_widget.views.form.controller;
form_view.do_save(function() { form_view.do_save(function() {
self.initialize_process_view(); self.initialize_process_view();

4
addons/web_rpc/__openerp__.py
View File

@ -1,7 +1,7 @@
{ {
"name" : "OpenERP Web web", "name" : "OpenERP Web Web",
"category" : "Hidden", "category" : "Hidden",
"description":'Openerp web web', "description":'Openerp Web Web',
"version" : "2.0", "version" : "2.0",
"depends" : [], "depends" : [],
"installable" : False, "installable" : False,