From 3305e100f0ac0e3b50a2a1f320c0b46d07587c6e Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Tue, 26 Jun 2012 15:57:19 +0530 Subject: [PATCH 01/42] [IMP]Lunch: Improve lunch form view bzr revid: dbr@tinyerp.com-20120626102719-6so8gmu8p2woj8cn --- addons/lunch/lunch_view.xml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml index 1777fd85da6..53152292f68 100644 --- a/addons/lunch/lunch_view.xml +++ b/addons/lunch/lunch_view.xml @@ -30,14 +30,18 @@ - - - - - - - - + + + + + + + + + + + + From f12a3b62aff4b0f1414b77b38b132383499ce665 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Tue, 26 Jun 2012 18:31:11 +0530 Subject: [PATCH 02/42] [IMP] survey: Improve view for title bzr revid: dbr@tinyerp.com-20120626130111-jxhbxan5l3k5tp5q --- addons/survey/survey_view.xml | 49 +++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index c50613f466b..59422e1f51b 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -26,18 +26,36 @@ - - - - - From a11440cd40b22d64f0c0eacd69abf8cf043ec587 Mon Sep 17 00:00:00 2001 From: "Pinakin Nayi (OpenERP)" Date: Thu, 5 Jul 2012 18:13:05 +0530 Subject: [PATCH 16/42] [IMP]survey-kanban-view bzr revid: pna@tinyerp.com-20120705124305-am3bqq8v0yrqrc12 --- addons/survey/static/src/css/survey.css | 27 ++----------- addons/survey/survey.py | 1 + addons/survey/survey_view.xml | 53 ++++++++++++++----------- 3 files changed, 34 insertions(+), 47 deletions(-) diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css index 0102dc1ade6..6964e4c2f3e 100644 --- a/addons/survey/static/src/css/survey.css +++ b/addons/survey/static/src/css/survey.css @@ -1,20 +1,3 @@ -.oe_module_survey{ - font-size: 12px; - border-style:dotted; - border-radius: 15px; - text-align: left; - height:145px; - width:220px; -} - -.oe_survey_title{ - font-size: 15px; - height: auto; - font-size: 16px; - font-weight:bold; - width: 205px; -} - .oe_survey_responsible{ height: auto; width: 200px; @@ -26,12 +9,10 @@ width: 200px; font-size: 14px; } - -.oe_survey_fill{ - align:right; - padding: 1px 165px; -} - .oe_survey_rate{ font-size: 14px; } +.oe_kanban_survey { + width: 300px; +} + diff --git a/addons/survey/survey.py b/addons/survey/survey.py index 40f13b226f8..1c1c8b6df91 100644 --- a/addons/survey/survey.py +++ b/addons/survey/survey.py @@ -68,6 +68,7 @@ class survey(osv.osv): 'users': fields.many2many('res.users', 'survey_users_rel', 'sid', 'uid', 'Users'), 'send_response': fields.boolean('Email Notification on Answer'), 'type': fields.many2one('survey.type', 'Type'), + 'color': fields.integer('Color Index'), 'invited_user_ids': fields.many2many('res.users', 'survey_invited_user_rel', 'sid', 'uid', 'Invited User'), } _defaults = { diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index dedb044eee9..bdba67738d0 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -313,32 +313,37 @@ + -
- -

-
- By: -

-
- Open From: - - - , - - -

-
- Rate: -
- -
-
- -
+
+
+ i +
+
+

+
+ By: +

+
+ Open From: + + + , + + +

+
+ Rate: + Fill +
+
+
From a47b42cd69dec5ef4fde79ba94cb21f86691f870 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Thu, 5 Jul 2012 18:32:58 +0530 Subject: [PATCH 17/42] [IMP] remove extra class bzr revid: dbr@tinyerp.com-20120705130258-0fmma20qwhv2vssg --- addons/survey/survey_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index c1e0355073c..a8a8c59f24b 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -316,7 +316,7 @@ -
+
i
    From 58549bc503cd715589c4da32e9c4dbde4e419b6a Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Thu, 5 Jul 2012 18:46:54 +0530 Subject: [PATCH 18/42] [IMP]String imp bzr revid: dbr@tinyerp.com-20120705131654-fy1c092kne3bwftj --- addons/survey/survey_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index a8a8c59f24b..8aeec213648 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -331,8 +331,8 @@ By:

- Open From: + Opened at , From ee0ff9ce960d85e5dc9d76ef5c36413533f84f79 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Mon, 9 Jul 2012 11:09:33 +0530 Subject: [PATCH 19/42] [IMP]idea: Improve m2m field syntax bzr revid: dbr@tinyerp.com-20120709053933-3mqv2hvwsl8fyy7g --- addons/idea/idea.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/idea/idea.py b/addons/idea/idea.py index cc2c11bdd8a..396040c8828 100644 --- a/addons/idea/idea.py +++ b/addons/idea/idea.py @@ -49,7 +49,7 @@ class idea_idea(osv.osv): 'create_uid': fields.many2one('res.users', 'Creator', required=True, readonly=True), 'name': fields.char('Idea Summary', size=64, required=True, readonly=True, oldname='title', states={'draft':[('readonly',False)]}), 'description': fields.text('Description', help='Content of the idea', readonly=True, states={'draft':[('readonly',False)]}), - 'category_ids': fields.many2many('idea.category', 'Tags', readonly=True, states={'draft':[('readonly',False)]}), + 'category_ids': fields.many2many('idea.category', 'idea_category_ids','idea_category_name_id','name','Tags',readonly=True, states={'draft':[('readonly',False)]}), 'state': fields.selection([('draft', 'New'), ('open', 'Accepted'), ('cancel', 'Refused'), From 19614e357739cb4344ec863abe6f2eb115e9f777 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Mon, 9 Jul 2012 12:30:40 +0530 Subject: [PATCH 20/42] [IMP]idea: set string bzr revid: dbr@tinyerp.com-20120709070040-r23926rx311uod68 --- addons/idea/idea.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/idea/idea.py b/addons/idea/idea.py index 396040c8828..3be4dd2e28d 100644 --- a/addons/idea/idea.py +++ b/addons/idea/idea.py @@ -49,7 +49,7 @@ class idea_idea(osv.osv): 'create_uid': fields.many2one('res.users', 'Creator', required=True, readonly=True), 'name': fields.char('Idea Summary', size=64, required=True, readonly=True, oldname='title', states={'draft':[('readonly',False)]}), 'description': fields.text('Description', help='Content of the idea', readonly=True, states={'draft':[('readonly',False)]}), - 'category_ids': fields.many2many('idea.category', 'idea_category_ids','idea_category_name_id','name','Tags',readonly=True, states={'draft':[('readonly',False)]}), + 'category_ids': fields.many2many('idea.category', string='Tags', readonly=True, states={'draft':[('readonly',False)]}), 'state': fields.selection([('draft', 'New'), ('open', 'Accepted'), ('cancel', 'Refused'), From bfbaeece0111828a97ba41fedc7eb97eb0bd2fac Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Mon, 9 Jul 2012 13:22:45 +0200 Subject: [PATCH 21/42] Fixed kanban header flickering and padding bzr revid: mit@openerp.com-20120709112245-9p9piq9ewxlfgb2f --- addons/web_kanban/static/src/css/kanban.css | 3 ++- addons/web_kanban/static/src/css/kanban.sass | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 5d0ac9ea8f3..39f22d8e542 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -49,6 +49,7 @@ .openerp .oe_kanban_view .oe_kanban_group_title { font-size: 16px; font-weight: bold; + min-height: 30px; color: #333333; text-shadow: 0 1px 0 white; } @@ -58,7 +59,7 @@ } .openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_group_header { vertical-align: top; - padding: 6px 7px 0 6px; + padding: 4px; } .openerp .oe_kanban_view .oe_kanban_column.oe_kanban_grouped, .openerp .oe_kanban_view .oe_kanban_group_header { background: #f0eeee; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index 872d694c4db..4823a5928e4 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -63,6 +63,7 @@ .oe_kanban_group_title font-size: 16px font-weight: bold + min-height: 30px color: #333333 text-shadow: 0 1px 0 white > span @@ -71,7 +72,7 @@ .oe_kanban_column, .oe_kanban_group_header vertical-align: top - padding: 6px 7px 0 6px + padding: 4px .oe_kanban_column.oe_kanban_grouped, .oe_kanban_group_header background: #f0eeee From d6100f371f185189ae452d6cb785a1f1a989415b Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Mon, 9 Jul 2012 17:02:57 +0200 Subject: [PATCH 22/42] Changed popup overlay and added style for label in kanban vignette bzr revid: mit@openerp.com-20120709150257-t50t470tyxmomrt4 --- addons/web/static/src/css/base.css | 6 ++++++ addons/web/static/src/css/base.sass | 3 +++ addons/web_kanban/static/src/css/kanban.css | 14 ++++++++++++-- addons/web_kanban/static/src/css/kanban.sass | 15 +++++++++++---- 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 7bc210298db..a9c9508c4e5 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2348,3 +2348,9 @@ .kitten-mode-activated > * { opacity: 0.7; } + +div.ui-widget-overlay { + background: black; + filter: alpha(opacity=30); + opacity: 0.3; +} diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index d5d271fe07d..ba858ca8877 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1850,5 +1850,8 @@ $colour4: #8a89ba opacity: 0.70 // }}} +div.ui-widget-overlay + background: black + @include opacity(0.3) // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers > "%:p:r.css" // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 39f22d8e542..1128d2cdaff 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -29,7 +29,7 @@ color: gold; } .openerp .oe_kanban_view .oe_kanban_content div:first-child { - margin-right: 12px; + margin-right: 16px; } .openerp .oe_kanban_view .oe_kanban_button_new { color: white; @@ -59,7 +59,7 @@ } .openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_group_header { vertical-align: top; - padding: 4px; + padding: 6px 6px 6px 5px; } .openerp .oe_kanban_view .oe_kanban_column.oe_kanban_grouped, .openerp .oe_kanban_view .oe_kanban_group_header { background: #f0eeee; @@ -375,6 +375,16 @@ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } +.openerp .oe_kanban_view .oe_kanban_footer_left > span { + margin-top: 4px; + display: inline-block; + background: #e6e6e6; + border: 1px solid #b9b9b9; + padding: 1px 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; +} .openerp .oe_kanban_view .oe_kanban_status { display: inline-block; height: 12px; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index 4823a5928e4..facdc32e326 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -44,7 +44,7 @@ .oe_star_on color: gold div:first-child - margin-right: 12px + margin-right: 16px .oe_kanban_button_new color: white background: #DC5F59 @@ -72,7 +72,7 @@ .oe_kanban_column, .oe_kanban_group_header vertical-align: top - padding: 4px + padding: 6px 6px 6px 5px .oe_kanban_column.oe_kanban_grouped, .oe_kanban_group_header background: #f0eeee @@ -318,8 +318,15 @@ .oe_kanban_avatar @include radius(3px) @include box-shadow(0 1px 2px rgba(0,0,0,0.2)) - //.oe_kanban_footer_left - // float: left + .oe_kanban_footer_left + > span + margin-top: 4px + display: inline-block + background: #E6E6E6 + border: 1px solid #B9B9B9 + padding: 1px 2px + @include radius(3px) + .oe_kanban_status display: inline-block height: 12px From 3c67b48a2ae96df1d0474da292b5272e13fb4090 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Mon, 9 Jul 2012 19:08:07 +0200 Subject: [PATCH 23/42] Improvements to dropdown menu, form view buttons and kanban vignette bzr revid: mit@openerp.com-20120709170807-f9x3v147bqamg7wd --- addons/web/static/src/css/base.css | 12 ++++++++---- addons/web/static/src/css/base.sass | 11 +++++++---- addons/web_kanban/static/src/css/kanban.css | 10 +++++++++- addons/web_kanban/static/src/css/kanban.sass | 7 ++++++- 4 files changed, 30 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index a9c9508c4e5..a9e2ebaf6d0 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -386,8 +386,11 @@ visibility: hidden; } .openerp .oe_button_box { - width: 200px; - text-align: center; + width: 38%; + text-align: right; +} +.openerp .oe_button_box button { + margin: 4px; } .openerp .oe_avatar { margin: 0 16px 0 0; @@ -536,7 +539,7 @@ cursor: pointer; } .openerp .oe_dropdown_toggle { - color: #888888; + color: #404040; font-weight: normal; } .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened { @@ -545,7 +548,8 @@ .openerp .oe_dropdown_menu { display: none; position: absolute; - top: 32px; + top: 26px; + left: 0; z-index: 1; border: 1px solid #afafb6; background: white; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index ba858ca8877..8d13bf8b046 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -329,8 +329,10 @@ $colour4: #8a89ba clear: both visibility: hidden .oe_button_box - width: 200px - text-align: center + width: 38% + text-align: right + button + margin: 4px .oe_avatar margin: 0 16px 0 0 img @@ -431,14 +433,15 @@ $colour4: #8a89ba position: relative cursor: pointer .oe_dropdown_toggle - color: #888 + color: #404040 font-weight: normal .oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened display: block .oe_dropdown_menu display: none position: absolute - top: 32px + top: 26px + left: 0 z-index: 1 border: 1px solid #afafb6 background: white diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 1128d2cdaff..dc44c142683 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -375,8 +375,11 @@ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } +.openerp .oe_kanban_view .oe_kanban_footer_left { + margin-top: 2px; +} .openerp .oe_kanban_view .oe_kanban_footer_left > span { - margin-top: 4px; + margin-top: 2px; display: inline-block; background: #e6e6e6; border: 1px solid #b9b9b9; @@ -385,6 +388,11 @@ -webkit-border-radius: 3px; border-radius: 3px; } +.openerp .oe_kanban_view .oe_kanban_bottom_right { + float: right; + position: relative; + top: 1px; +} .openerp .oe_kanban_view .oe_kanban_status { display: inline-block; height: 12px; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index facdc32e326..d2aa0615f67 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -319,13 +319,18 @@ @include radius(3px) @include box-shadow(0 1px 2px rgba(0,0,0,0.2)) .oe_kanban_footer_left + margin-top: 2px > span - margin-top: 4px + margin-top: 2px display: inline-block background: #E6E6E6 border: 1px solid #B9B9B9 padding: 1px 2px @include radius(3px) + .oe_kanban_bottom_right + float: right + position: relative + top: 1px .oe_kanban_status display: inline-block From a33b11a25a7deca87959b15dd40c600591794f94 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Mon, 9 Jul 2012 19:24:53 +0200 Subject: [PATCH 24/42] Added icons to kanban label for followers and messages bzr revid: mit@openerp.com-20120709172453-tsvtcz007rzitvy1 --- addons/crm/crm_lead_view.xml | 2 +- addons/mail/mail_thread.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 85f9a4aab5d..888764309ec 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -316,7 +316,7 @@ :
-
+
7 7
-
-
+
+
@@ -42,11 +42,6 @@ form
-
-
@@ -57,6 +52,11 @@
+
+
@@ -76,9 +76,6 @@ form
-
-
+
+
diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml index 497467025b5..3e0699ec3d8 100644 --- a/addons/stock/wizard/stock_partial_move_view.xml +++ b/addons/stock/wizard/stock_partial_move_view.xml @@ -21,13 +21,13 @@ form
-
+ + +
- - + diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml index c8da4459efa..fdbcabb9ed7 100644 --- a/addons/stock/wizard/stock_partial_picking_view.xml +++ b/addons/stock/wizard/stock_partial_picking_view.xml @@ -16,11 +16,6 @@ form
-
-
@@ -36,6 +31,11 @@ +
+
diff --git a/addons/stock/wizard/stock_return_picking_view.xml b/addons/stock/wizard/stock_return_picking_view.xml index 06e318c295e..5cdad44f681 100644 --- a/addons/stock/wizard/stock_return_picking_view.xml +++ b/addons/stock/wizard/stock_return_picking_view.xml @@ -59,16 +59,16 @@ form
-
-
diff --git a/addons/stock/wizard/stock_splitinto_view.xml b/addons/stock/wizard/stock_splitinto_view.xml index 573014b7cac..52b182a3f27 100644 --- a/addons/stock/wizard/stock_splitinto_view.xml +++ b/addons/stock/wizard/stock_splitinto_view.xml @@ -7,15 +7,15 @@ form
-
-
+
+
diff --git a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml index db78799f000..e65f378a638 100644 --- a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml +++ b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml @@ -9,7 +9,11 @@ form
-
+ + + + +
- - - - +
diff --git a/addons/stock_planning/wizard/stock_planning_createlines_view.xml b/addons/stock_planning/wizard/stock_planning_createlines_view.xml index e51ab4a3ba0..458994621c1 100644 --- a/addons/stock_planning/wizard/stock_planning_createlines_view.xml +++ b/addons/stock_planning/wizard/stock_planning_createlines_view.xml @@ -8,11 +8,6 @@ form
-
-
@@ -20,6 +15,11 @@ +
+
diff --git a/addons/stock_planning/wizard/stock_planning_forecast_view.xml b/addons/stock_planning/wizard/stock_planning_forecast_view.xml index 3c31404a070..0f3018350c0 100644 --- a/addons/stock_planning/wizard/stock_planning_forecast_view.xml +++ b/addons/stock_planning/wizard/stock_planning_forecast_view.xml @@ -9,11 +9,6 @@ form
-
-
@@ -21,6 +16,11 @@ +
+
diff --git a/addons/wiki/wizard/wiki_create_menu_view.xml b/addons/wiki/wizard/wiki_create_menu_view.xml index 45c4ba6a487..213ca9dd2e2 100644 --- a/addons/wiki/wizard/wiki_create_menu_view.xml +++ b/addons/wiki/wizard/wiki_create_menu_view.xml @@ -10,15 +10,15 @@ form
-
-
+
+
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml index c818721c09c..90139c3afac 100644 --- a/addons/wiki/wizard/wiki_make_index_view.xml +++ b/addons/wiki/wizard/wiki_make_index_view.xml @@ -10,13 +10,13 @@ form
-
+ +
- -
diff --git a/addons/wiki/wizard/wiki_show_diff_view.xml b/addons/wiki/wizard/wiki_show_diff_view.xml index c5b3583b1e5..4729586c858 100644 --- a/addons/wiki/wizard/wiki_show_diff_view.xml +++ b/addons/wiki/wizard/wiki_show_diff_view.xml @@ -10,11 +10,11 @@ form
-
-
+
+
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml index 9be2d4d22aa..49f333e453f 100644 --- a/addons/wiki/wizard/wiki_wiki_page_open_view.xml +++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml @@ -10,12 +10,12 @@ form
-
+
-
From baa0accf764046085238a9e63a5718626eb8b566 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Wed, 11 Jul 2012 05:14:46 +0000 Subject: [PATCH 41/42] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20120711051446-bcpkjpszuy1qdug2 --- openerp/addons/base/i18n/tlh.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po index 047047b7e5b..78f0877d2a2 100644 --- a/openerp/addons/base/i18n/tlh.po +++ b/openerp/addons/base/i18n/tlh.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:44+0000\n" -"PO-Revision-Date: 2009-11-30 07:48+0000\n" -"Last-Translator: <>\n" +"PO-Revision-Date: 2012-07-10 17:36+0000\n" +"Last-Translator: Felix Malmenbeck \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-05 04:46+0000\n" -"X-Generator: Launchpad (build 15544)\n" +"X-Launchpad-Export-Date: 2012-07-11 05:14+0000\n" +"X-Generator: Launchpad (build 15593)\n" #. module: base #: model:res.country,name:base.sh @@ -24,7 +24,7 @@ msgstr "" #. module: base #: view:ir.actions.report.xml:0 msgid "Other Configuration" -msgstr "" +msgstr "latlh Qur" #. module: base #: selection:ir.property,type:0 From 6cbb04758af8d1e7056df3eadbf1b490b958b0b5 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Wed, 11 Jul 2012 05:15:15 +0000 Subject: [PATCH 42/42] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20120711051515-k67xt5ps6oe853qg --- addons/account/i18n/zh_CN.po | 14 +-- addons/account_asset/i18n/mn.po | 4 +- addons/project/i18n/ja.po | 4 +- addons/project_timesheet/i18n/mn.po | 148 +++++++++++++++------------- 4 files changed, 90 insertions(+), 80 deletions(-) diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index 09b4a8b9ac4..37fe86db46b 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2012-06-20 16:17+0000\n" -"Last-Translator: Jeff Wang \n" +"PO-Revision-Date: 2012-07-11 03:05+0000\n" +"Last-Translator: Wei \"oldrev\" Li \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n" -"X-Generator: Launchpad (build 15461)\n" +"X-Launchpad-Export-Date: 2012-07-11 05:15+0000\n" +"X-Generator: Launchpad (build 15593)\n" #. module: account #: view:account.invoice.report:0 @@ -4963,7 +4963,7 @@ msgstr "资产负债表" #: view:account.general.journal:0 #: model:ir.ui.menu,name:account.menu_account_general_journal msgid "General Journals" -msgstr "一般账簿" +msgstr "总账账簿" #. module: account #: field:account.journal,allow_date:0 @@ -5702,7 +5702,7 @@ msgstr "发票税科目" #: model:ir.actions.act_window,name:account.action_account_general_journal #: model:ir.model,name:account.model_account_general_journal msgid "Account General Journal" -msgstr "一般账簿" +msgstr "科目总账账簿" #. module: account #: field:account.payment.term.line,days:0 @@ -10184,7 +10184,7 @@ msgstr "周期次数" #: report:account.general.journal:0 #: model:ir.actions.report.xml,name:account.account_general_journal msgid "General Journal" -msgstr "一般账簿" +msgstr "总账账簿" #. module: account #: view:account.invoice:0 diff --git a/addons/account_asset/i18n/mn.po b/addons/account_asset/i18n/mn.po index 8275f14ed6e..060fd9f598d 100644 --- a/addons/account_asset/i18n/mn.po +++ b/addons/account_asset/i18n/mn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-10 05:34+0000\n" -"X-Generator: Launchpad (build 15558)\n" +"X-Launchpad-Export-Date: 2012-07-11 05:15+0000\n" +"X-Generator: Launchpad (build 15593)\n" #. module: account_asset #: view:account.asset.asset:0 diff --git a/addons/project/i18n/ja.po b/addons/project/i18n/ja.po index 68f60160a76..8e9ece1452f 100644 --- a/addons/project/i18n/ja.po +++ b/addons/project/i18n/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-10 05:33+0000\n" -"X-Generator: Launchpad (build 15558)\n" +"X-Launchpad-Export-Date: 2012-07-11 05:14+0000\n" +"X-Generator: Launchpad (build 15593)\n" #. module: project #: view:report.project.task.user:0 diff --git a/addons/project_timesheet/i18n/mn.po b/addons/project_timesheet/i18n/mn.po index e3056d29d96..0dbf42990af 100644 --- a/addons/project_timesheet/i18n/mn.po +++ b/addons/project_timesheet/i18n/mn.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 00:37+0000\n" -"PO-Revision-Date: 2012-06-24 16:46+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-07-11 03:11+0000\n" +"Last-Translator: gobi \n" "Language-Team: Mongolian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-06-25 05:15+0000\n" -"X-Generator: Launchpad (build 15482)\n" +"X-Launchpad-Export-Date: 2012-07-11 05:15+0000\n" +"X-Generator: Launchpad (build 15593)\n" #. module: project_timesheet #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task @@ -45,12 +45,12 @@ msgid "" "Fill in the timesheet tab of the employee form." msgstr "" "Холбогдох ажилтанд журнал тодорхойлогдоогүй байна.\n" -"Ажилтны формын цагийн хуваарь хавтасыг бөглө." +"Ажилтны формын цагийн хуудас хавтасыг бөглө." #. module: project_timesheet #: model:process.node,name:project_timesheet.process_node_timesheettask0 msgid "Timesheet task" -msgstr "Цагийн хуваарийн даалгавар" +msgstr "Цагийн хуудсын даалгавар" #. module: project_timesheet #: view:report.timesheet.task.user:0 @@ -90,31 +90,33 @@ msgid "" "You cannot delete a partner which is assigned to project, we suggest you to " "uncheck the active box!" msgstr "" +"Та төсөлд оноогдсон харилцагчийг устгах боломжгүй, тиймээс идэвхтэй " +"тэмдэглэгээг арилгахыг зөвлөе!" #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Group By..." -msgstr "" +msgstr "Бүлэглэх..." #. module: project_timesheet #: model:process.node,note:project_timesheet.process_node_triggerinvoice0 msgid "Trigger invoices from sale order lines" -msgstr "" +msgstr "Борлуулалтын захиалгын мөрөөс нэхэмжлэх үүсгэх" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 msgid "October" -msgstr "" +msgstr "10-р сар" #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Timesheet/Task hours Report Per Month" -msgstr "" +msgstr "Цагийн хуудас/Даалгавар цагийн тайлан сарын хэмжээнд" #. module: project_timesheet #: view:project.project:0 msgid "Billable" -msgstr "" +msgstr "Нэхэмжлэх боломжтой" #. module: project_timesheet #: model:ir.actions.act_window,help:project_timesheet.action_account_analytic_overdue @@ -122,225 +124,227 @@ msgid "" "You will find here the contracts related to your customer projects in order " "to track the invoicing progress." msgstr "" +"Энд захиалагчийн төсөлтэй холбогдсон гэрээнүүдийг харах болно. Энэ нь " +"нэхэмжлэх явцыг зөвх хянахад туслана." #. module: project_timesheet #: view:account.analytic.line:0 msgid "Analytic account/project" -msgstr "" +msgstr "Шинжилгээний данс/төсөл" #. module: project_timesheet #: field:report.timesheet.task.user,task_hrs:0 msgid "Task Hours" -msgstr "" +msgstr "Даалгаврын цагууд" #. module: project_timesheet #: view:report.timesheet.task.user:0 #: field:report.timesheet.task.user,year:0 msgid "Year" -msgstr "" +msgstr "Он" #. module: project_timesheet #: constraint:project.project:0 msgid "Error! project start-date must be lower then project end-date." -msgstr "" +msgstr "Алдаа! төслийн эхлэх огноо дуусах огноогоос бага байх ёстой." #. module: project_timesheet #: model:ir.actions.act_window,name:project_timesheet.action_account_analytic_overdue msgid "Customer Projects" -msgstr "" +msgstr "Захиалагчийн төслууд" #. module: project_timesheet #: model:ir.model,name:project_timesheet.model_account_analytic_line msgid "Analytic Line" -msgstr "" +msgstr "Шинжилгээний мөр" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 msgid "August" -msgstr "" +msgstr "8-р сар" #. module: project_timesheet #: model:process.transition,name:project_timesheet.process_transition_taskinvoice0 msgid "Task invoice" -msgstr "" +msgstr "Даалгаврын нэхэмжлэл" #. module: project_timesheet #: model:process.node,name:project_timesheet.process_node_taskwork0 msgid "Task Work" -msgstr "" +msgstr "Даалгаврын ажил" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 msgid "May" -msgstr "" +msgstr "5-р сар" #. module: project_timesheet #: constraint:project.task:0 msgid "Error ! You cannot create recursive tasks." -msgstr "" +msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй!" #. module: project_timesheet #: model:ir.ui.menu,name:project_timesheet.menu_project_working_hours msgid "Timesheet Lines" -msgstr "" +msgstr "Цагийн хуудсын мөрүүд" #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:231 #, python-format msgid "Invalid action !" -msgstr "" +msgstr "Алдаатай үйлдэл !" #. module: project_timesheet #: view:project.project:0 msgid "Billable Project" -msgstr "" +msgstr "Нэхэмжлэх боломжтой Төсөл" #. module: project_timesheet #: model:ir.ui.menu,name:project_timesheet.menu_invoicing_contracts msgid "Contracts to Renew" -msgstr "" +msgstr "Шинэчлэх Гэрээнүүд" #. module: project_timesheet #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in msgid "Sign in / Sign out by project" -msgstr "" +msgstr "Орох/Гарах үйлдлийг төслөөр харах" #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Group by month of date" -msgstr "" +msgstr "Огнооны сараар бүлэглэх" #. module: project_timesheet #: model:ir.model,name:project_timesheet.model_project_task msgid "Task" -msgstr "" +msgstr "Даалгавар" #. module: project_timesheet #: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line msgid "Invoice Tasks Work" -msgstr "" +msgstr "Даалгаврын Ажлыг Нэхэмжлэх" #. module: project_timesheet #: view:report.timesheet.task.user:0 #: field:report.timesheet.task.user,user_id:0 msgid "User" -msgstr "" +msgstr "Хэрэглэгч" #. module: project_timesheet #: constraint:project.project:0 msgid "Error! You cannot assign escalation to the same project!" -msgstr "" +msgstr "Алдаа! Ижил төсөлд томруулалтыг олгох боломжгүй." #. module: project_timesheet #: field:report.timesheet.task.user,name:0 msgid "Date" -msgstr "" +msgstr "Огноо" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 msgid "July" -msgstr "" +msgstr "7-р сар" #. module: project_timesheet #: model:process.node,note:project_timesheet.process_node_timesheettask0 msgid "Complete Your Timesheet." -msgstr "" +msgstr "Цагийн Хуудсаа Гүйцээ" #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Task Hours in current year" -msgstr "" +msgstr "Энэ жилийн даалгаврын цаг" #. module: project_timesheet #: view:project.project:0 msgid "Customer" -msgstr "" +msgstr "Захиалагч" #. module: project_timesheet #: model:process.node,note:project_timesheet.process_node_taskwork0 msgid "Work on task" -msgstr "" +msgstr "Даалгавар дахь ажил" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 msgid "February" -msgstr "" +msgstr "2-р сар" #. module: project_timesheet #: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task msgid "Bill Tasks Works" -msgstr "" +msgstr "Даалгаврын ажлуудын тооцоо" #. module: project_timesheet #: field:report.timesheet.task.user,timesheet_hrs:0 msgid "Timesheet Hours" -msgstr "" +msgstr "Цагийн хуудас дахь цагууд" #. module: project_timesheet #: model:process.transition,name:project_timesheet.process_transition_taskencoding0 msgid "Task encoding" -msgstr "" +msgstr "Даалгаврыг шивнэ үү" #. module: project_timesheet #: model:process.transition,note:project_timesheet.process_transition_filltimesheet0 msgid "Task summary is comes into the timesheet line" -msgstr "" +msgstr "Даалгаврын товчоо нь цагийн хуудсын мөр рүү очдог." #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 msgid "January" -msgstr "" +msgstr "1-р сар" #. module: project_timesheet #: model:process.node,name:project_timesheet.process_node_triggerinvoice0 msgid "Trigger Invoice" -msgstr "" +msgstr "Нэхэмжлэлийг Үүсгэх" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 msgid "November" -msgstr "" +msgstr "11-р сар" #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Task hours of last month" -msgstr "" +msgstr "Өнгөрсөн сарын ажлын цагууд" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 msgid "March" -msgstr "" +msgstr "3-р сар" #. module: project_timesheet #: model:ir.model,name:project_timesheet.model_project_project msgid "Project" -msgstr "" +msgstr "Төсөл" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 msgid "April" -msgstr "" +msgstr "4-р сар" #. module: project_timesheet #: view:project.project:0 msgid "Invoicing Data" -msgstr "" +msgstr "Нэхэмжлэх өгөгдөл" #. module: project_timesheet #: model:process.transition,note:project_timesheet.process_transition_taskencoding0 msgid "Encode how much time u spent on your task" -msgstr "" +msgstr "Өөрийн даалгавар дээр хичнээн цаг зарцуулснаа оруулна уу" #. module: project_timesheet #: model:ir.model,name:project_timesheet.model_res_partner msgid "Partner" -msgstr "" +msgstr "Харилцагч" #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:247 #, python-format msgid "Invalid Analytic Account !" -msgstr "" +msgstr "Буруу Шинжилгээний Данс !" #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:59 @@ -349,6 +353,8 @@ msgid "" "No product defined on the related employee.\n" "Fill in the timesheet tab of the employee form." msgstr "" +"Холбогдох ажилтан дээр бараа тодорхойлогдоогүй байна.\n" +"Ажилтны формын цагийн хуудас хавтас дээр бөглөнө үү." #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:54 @@ -357,17 +363,17 @@ msgstr "" #: code:addons/project_timesheet/project_timesheet.py:69 #, python-format msgid "Bad Configuration !" -msgstr "" +msgstr "Буруу Тохиргоо !" #. module: project_timesheet #: model:ir.ui.menu,name:project_timesheet.menu_project_billing msgid "Invoicing" -msgstr "" +msgstr "Нэхэмжлэл" #. module: project_timesheet #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." -msgstr "" +msgstr "Алдаа ! Рекурсив холбогдсон гишүүдийг үүсгэх боломжгүй." #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:247 @@ -375,57 +381,58 @@ msgstr "" msgid "" "You cannot select a Analytic Account which is in Close or Cancelled state" msgstr "" +"Хаагдсан эсвэл Цуцлагдсан төлөвтэй Шинжилгээний Дансыг сонгох боломжгүй" #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid " Month-1 " -msgstr "" +msgstr " Сар-1 " #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 msgid "September" -msgstr "" +msgstr "9-р сар" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 msgid "December" -msgstr "" +msgstr "12-р сар" #. module: project_timesheet #: model:process.transition,note:project_timesheet.process_transition_taskinvoice0 msgid "After task is completed, Create its invoice." -msgstr "" +msgstr "Даалгавар дуусмагц харгалзах нэхэмжлэл үүсгэнэ." #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 msgid "June" -msgstr "" +msgstr "6-р сар" #. module: project_timesheet #: model:ir.model,name:project_timesheet.model_report_timesheet_task_user msgid "report.timesheet.task.user" -msgstr "" +msgstr "report.timesheet.task.user" #. module: project_timesheet #: view:report.timesheet.task.user:0 #: field:report.timesheet.task.user,month:0 msgid "Month" -msgstr "" +msgstr "Сар" #. module: project_timesheet #: model:ir.ui.menu,name:project_timesheet.menu_act_project_management_timesheet_sheet_form msgid "My Timesheet" -msgstr "" +msgstr "Өөрийн цагийн хуудас" #. module: project_timesheet #: constraint:account.analytic.line:0 msgid "You can not create analytic line on view account." -msgstr "" +msgstr "Харагдац төрлийн данс дээр шинжилгээний мөрийг үүсгэх боломжгүй." #. module: project_timesheet #: view:project.project:0 msgid "Invoice Task Work" -msgstr "" +msgstr "Даалгаврын Ажлыг Нэхэмжлэх" #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:70 @@ -435,15 +442,18 @@ msgid "" "employee.\n" "Fill in the timesheet tab of the employee form." msgstr "" +"Холбогдох ажилтан дээр бараа болон барааны ангилалын үзүүлэлтийн данс " +"тодорхойлогдоогүй байна.\n" +"Ажилтны формын цагийн хуудас хавтсыг бөглөнө үү." #. module: project_timesheet #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user #: view:report.timesheet.task.user:0 msgid "Task Hours Per Month" -msgstr "" +msgstr "Даалгаврын цагууд сарын хэмжээнд" #. module: project_timesheet #: model:process.transition,name:project_timesheet.process_transition_filltimesheet0 msgid "Fill Timesheet" -msgstr "" +msgstr "Цагийн хуудсыг бөглөх"