From 2acec2af84b74ff5d6d67488d3fecdf3e11498f9 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Wed, 5 Dec 2012 15:36:35 +0530 Subject: [PATCH 01/25] [IMP] Improved leads can be group by country bzr revid: ggh@tinyerp.com-20121205100635-yoqd44rrucp34913 --- addons/crm/crm_lead_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index c552b1835f2..92feeac845c 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -378,6 +378,7 @@ + From 2e36d1073513f29d9bda30e6655f77bf1dcc101f Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Fri, 7 Dec 2012 17:43:41 +0530 Subject: [PATCH 02/25] [IMP]Improved the code for attachment and more button bzr revid: ggh@tinyerp.com-20121207121341-355dcg79vncs7ny0 --- addons/web/static/src/css/base.css | 5 ++++- addons/web/static/src/css/base.sass | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 0a4e2ad322f..d2f413db494 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -652,7 +652,7 @@ cursor: pointer; } .openerp .oe_dropdown_toggle { - color: #4c4c4c; + color: #2b2b2b; font-weight: normal; } .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened { @@ -1352,6 +1352,9 @@ margin: 0px auto; text-align: center; } +.openerp .oe_view_manager table.oe_view_manager_header .oe_view_manager_sidebar .oe_dropdown_arrow:after { + opacity: 0.9; +} .openerp .oe_view_manager table.oe_view_manager_header td { line-height: 26px; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e1789b0524c..4296e04d745 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -564,7 +564,7 @@ $sheet-padding: 16px position: relative cursor: pointer .oe_dropdown_toggle - color: #4C4C4C + color: #2B2B2B font-weight: normal .oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened display: block @@ -1099,6 +1099,8 @@ $sheet-padding: 16px .oe_view_manager_sidebar margin: 0px auto text-align: center + .oe_dropdown_arrow:after + opacity: 0.9 td line-height: 26px h2 From 9909e8c9b15efed58953dddde58d24360bda1332 Mon Sep 17 00:00:00 2001 From: "Anand Patel (OpenERP)" Date: Thu, 13 Dec 2012 16:36:11 +0530 Subject: [PATCH 03/25] [FIX]fixed the issue of fetch emails creates a message but special characters are not well parsed. here if from field contains the special characters then problem occurs bzr revid: pan@tinyerp.com-20121213110611-nw3mi1389lz78mw2 --- addons/mail/mail_thread.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index e706ad66a33..4a3eba1ff95 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -591,7 +591,7 @@ class mail_thread(osv.AbstractModel): if author_ids: msg_dict['author_id'] = author_ids[0] else: - msg_dict['email_from'] = message.get('from') + msg_dict['email_from'] = decode(message.get('from')) partner_ids = self._message_find_partners(cr, uid, message, ['From', 'To', 'Cc'], context=context) msg_dict['partner_ids'] = [(4, partner_id) for partner_id in partner_ids] From ef72f482fbeaa1998a5d857d1081d21b9e759ddd Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 13 Dec 2012 17:36:57 +0530 Subject: [PATCH 04/25] [IMP]Make validation on payable amount field.In that user can enter only number and a single dot in input box. bzr revid: vme@tinyerp.com-20121213120657-yez2wi7j05lgtziw --- addons/point_of_sale/static/src/js/widgets.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index 135c00f198d..fb8eead4d86 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -308,11 +308,21 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa if (this.amount !== this.payment_line.get_amount()) this.renderElement(); }, + checkAmount:function(e){ + if (e.which !== 0 && e.charCode !== 0) { + if(isNaN(String.fromCharCode(e.charCode))){ + return (String.fromCharCode(e.charCode) === "." && e.currentTarget.value.toString().split(".").length < 2)?true:false; + } + } + return true + }, renderElement: function() { var self = this; this.name = this.payment_line.get_cashregister().get('journal_id')[1]; this._super(); - this.$('input').keyup(_.bind(this.changeAmount, this)); + this.$('input') + .keypress(_.bind(this.checkAmount, this)) + .keyup(_.bind(this.changeAmount, this)); this.$('.delete-payment-line').click(function() { self.trigger('delete_payment_line', self); }); From 72a75850533fb1b8a45130852fef568e2aaff740 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 13 Dec 2012 18:10:38 +0530 Subject: [PATCH 05/25] [IMP]title don't interpret html tag,now showing html tags value to title. bzr revid: vme@tinyerp.com-20121213124038-03gbycz7kjbksza7 --- addons/web/static/src/js/views.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index c949762a5f6..ad61a716512 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -153,7 +153,8 @@ instance.web.ActionManager = instance.web.Widget.extend({ tit = [tit]; } for (var j = 0; j < tit.length; j += 1) { - var label = _.escape(tit[j]); + var remove_html_tag = String(tit[j]).replace(/<\/?[^>]+>/g, ''); + var label = _.escape(remove_html_tag); if (i === this.breadcrumbs.length - 1 && j === tit.length - 1) { titles.push(_.str.sprintf('%s', label)); } else { From 69fd654fce7dfdc6ecc4982b1f4e6c6be13fb428 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Fri, 15 Feb 2013 12:08:25 +0530 Subject: [PATCH 06/25] [IMP]Bounce effect on bigger names(H1) and o2m fields bzr revid: ggh@tinyerp.com-20130215063825-lkq8p74kbt1ynliq --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 4880b3882ff..4362f78d4df 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -203,7 +203,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM this.has_been_loaded.resolve(); // Add bounce effect on button 'Edit' when click on readonly page view. - this.$el.find(".oe_form_group_row,.oe_form_field,label").on('click', function (e) { + this.$el.find(".oe_form_group_row,.oe_form_field,label,.oe_title,.oe_notebook_page").on('click', function (e) { if(self.get("actual_mode") == "view") { var $button = self.options.$buttons.find(".oe_form_button_edit"); $button.openerpBounce(); From 51879ca61673561510866fc4a4352f2b94143fce Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Fri, 15 Feb 2013 13:06:01 +0530 Subject: [PATCH 07/25] [IMP] Improve bounce in H1 and lost content bzr revid: ggh@tinyerp.com-20130215073601-nw5tqcabrlet1qn8 --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 4362f78d4df..0ef448b0d6e 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -203,7 +203,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM this.has_been_loaded.resolve(); // Add bounce effect on button 'Edit' when click on readonly page view. - this.$el.find(".oe_form_group_row,.oe_form_field,label,.oe_title,.oe_notebook_page").on('click', function (e) { + this.$el.find(".oe_form_group_row,.oe_form_field,label,h1,.oe_title,.oe_notebook_page, .oe_list_content").on('click', function (e) { if(self.get("actual_mode") == "view") { var $button = self.options.$buttons.find(".oe_form_button_edit"); $button.openerpBounce(); From dff2dd01963e8a098987fcb2e088415472f29f78 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Thu, 28 Feb 2013 11:19:10 +0530 Subject: [PATCH 08/25] [IMP]Bounce ob image bzr revid: vja@tinyerp.com-20130228054910-3s7mrp39y0kmkfpy --- addons/web/static/src/js/view_form.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 0ef448b0d6e..3464f23549b 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -4985,6 +4985,13 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({ url = this.placeholder; } var $img = $(QWeb.render("FieldBinaryImage-img", { widget: this, url: url })); + $($img).click(function(e) { + if(self.view.get("actual_mode") == "view") { + var $button = $(".oe_form_button_edit"); + $button.openerpBounce(); + e.stopPropagation(); + } + }); this.$el.find('> img').remove(); this.$el.prepend($img); $img.load(function() { From 4d7cfc9ab32f24ef89312667cce8ae61f53d26e3 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Thu, 28 Feb 2013 19:17:40 +0530 Subject: [PATCH 09/25] [IMP]Improve code for bounce on boolean field bzr revid: vja@tinyerp.com-20130228134740-jqv0zqletq6v1792 --- addons/web/static/src/css/base.css | 10 ++++++++++ addons/web/static/src/js/view_form.js | 13 +++++++++++++ 2 files changed, 23 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 6cfee50d6a4..5d5ca46b4ec 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3145,6 +3145,16 @@ div.ui-widget-overlay { .openerp_ie .oe_form_field_boolean input { background: white; } +.openerp .oe_form_field_boolean .boolean{ + position: relative; + top: -14px; + width: 14px; + height: 14px; + z-index:10000; + // IE needs a color in order for the layer to respond to mouse events + backgroundColor: "#fff"; + opacity: 0; +} .openerp_ie .db_option_table .oe_form_field_selection { width: auto; } diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 3464f23549b..87bf7c1c49a 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2659,6 +2659,7 @@ instance.web.form.FieldBoolean = instance.web.form.AbstractField.extend({ }, this)); var check_readonly = function() { self.$checkbox.prop('disabled', self.get("effective_readonly")); + self.click_disabled_boolean(); }; this.on("change:effective_readonly", this, check_readonly); check_readonly.call(this); @@ -2669,7 +2670,19 @@ instance.web.form.FieldBoolean = instance.web.form.AbstractField.extend({ }, focus: function() { this.$checkbox[0].focus(); + }, + click_disabled_boolean: function(){ + var $disabled = $(document).find('input[type=checkbox]:disabled'); + $disabled.each(function (){ + var $parent = $(this).closest("span"); + if($(this).next('div')){ + $(this).next('div').remove(); + } + var $overlay = $("
"); + $parent.append($overlay); + }); } + }); /** From ae6d15de59251618a21d4520e50456fd9777de33 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Fri, 1 Mar 2013 16:24:39 +0530 Subject: [PATCH 10/25] [IMP] Add saas file bzr revid: ggh@tinyerp.com-20130301105439-29y4yrr5yn2xcolt --- addons/web/static/src/css/base.css | 20 ++++++++++---------- addons/web/static/src/css/base.sass | 10 ++++++++++ 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 1c4f2509fa7..33bba914f3f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2374,6 +2374,16 @@ } .openerp .oe_form .oe_form_field_boolean { width: auto; + height: 14px; +} +.openerp .oe_form .oe_form_field_boolean .boolean { + position: relative; + top: -20px; + width: 14px; + height: 14px; + z-index: 10000; + backgroundColor: "#fff"; + opacity: 0; } .openerp .oe_form .oe_datepicker_container { display: none; @@ -3168,16 +3178,6 @@ div.ui-widget-overlay { .openerp_ie .oe_form_field_boolean input { background: white; } -.openerp .oe_form_field_boolean .boolean{ - position: relative; - top: -14px; - width: 14px; - height: 14px; - z-index:10000; - // IE needs a color in order for the layer to respond to mouse events - backgroundColor: "#fff"; - opacity: 0; -} .openerp_ie .db_option_table .oe_form_field_selection { width: auto; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 0a73728678d..db25cff9b3e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1878,6 +1878,16 @@ $sheet-padding: 16px white-space: nowrap .oe_form_field_boolean width: auto + height: 14px + .boolean + position: relative + top: -20px + width: 14px + height: 14px + z-index: 10000 + // IE needs a color in order for the layer to respond to mouse events + backgroundColor: "#fff" + opacity: 0 .oe_datepicker_container display: none .oe_datepicker_root From d63a858dc50ebeb667355bb54228b5504bef1472 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Tue, 2 Apr 2013 11:29:21 +0530 Subject: [PATCH 11/25] [IMP] In kanban for quick create if there is no any value then not displayed in kanban. bzr revid: bth@tinyerp.com-20130402055921-o52gzvmoxqhulrxm --- addons/web_kanban/static/src/js/kanban.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 651fcbc4019..72d493a9b05 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -1038,6 +1038,10 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({ self.quick_add(); } }); + $(".oe_kanban_quick_create").focusout(function () { + var val = self.$el.find('input').val() + if (/^\s*$/.test(val)) { self.$el.remove(); return; } + }); $(".oe_kanban_quick_create_add", this.$el).click(function () { self.quick_add(); self.focus(); @@ -1061,7 +1065,7 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({ quick_add: function () { var self = this; var val = this.$input.val(); - if (/^\s*$/.test(val)) { return; } + if (/^\s*$/.test(val)) { this.$el.remove(); return; } this._dataset.call( 'name_create', [val, new instance.web.CompoundContext( this._dataset.get_context(), this._context)]) From 9e11407553787c0fa921f5793dc600d5eb4be10b Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Tue, 2 Apr 2013 12:51:53 +0530 Subject: [PATCH 12/25] [IMP] On click of + icon close opened card and also open new to add. bzr revid: bth@tinyerp.com-20130402072153-yj42zsfhq1m0ipr6 --- addons/web_kanban/static/src/js/kanban.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 72d493a9b05..b59914d5b1b 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -1038,9 +1038,10 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({ self.quick_add(); } }); - $(".oe_kanban_quick_create").focusout(function () { + $(".oe_kanban_quick_create").focusout(function (e) { var val = self.$el.find('input').val() - if (/^\s*$/.test(val)) { self.$el.remove(); return; } + if (/^\s*$/.test(val)) { self.$el.remove(); } + e.stopImmediatePropagation(); }); $(".oe_kanban_quick_create_add", this.$el).click(function () { self.quick_add(); From 7e05448204ecef5ce4c957d0a842654811e9c429 Mon Sep 17 00:00:00 2001 From: bth-openerp Date: Tue, 2 Apr 2013 14:59:19 +0530 Subject: [PATCH 13/25] [IMP] Improve code to close card on click. bzr revid: bth@tinyerp.com-20130402092919-81223667i399aksj --- addons/web_kanban/static/src/js/kanban.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index b59914d5b1b..07ecd3f5404 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -1040,7 +1040,7 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({ }); $(".oe_kanban_quick_create").focusout(function (e) { var val = self.$el.find('input').val() - if (/^\s*$/.test(val)) { self.$el.remove(); } + if (/^\s*$/.test(val)) { self.trigger('close'); } e.stopImmediatePropagation(); }); $(".oe_kanban_quick_create_add", this.$el).click(function () { From b585ca8f093bbb479d0767eafc3bbb7602a87123 Mon Sep 17 00:00:00 2001 From: Vidhin Mehta Date: Fri, 19 Apr 2013 15:18:42 +0530 Subject: [PATCH 14/25] [REM] bzr revid: vme@tinyerp.com-20130419094842-qyioltxqj90r4b2d --- addons/web/static/src/js/views.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index b4495f84955..1143bdfc2af 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -156,8 +156,7 @@ instance.web.ActionManager = instance.web.Widget.extend({ tit = [tit]; } for (var j = 0; j < tit.length; j += 1) { - var remove_html_tag = String(tit[j]).replace(/<\/?[^>]+>/g, ''); - var label = _.escape(remove_html_tag); + var label = _.escape(tit[j]); if (i === this.breadcrumbs.length - 1 && j === tit.length - 1) { titles.push(_.str.sprintf('%s', label)); } else { From 75d69f5c8d62e3dafd401e19c9cb8334458e20ec Mon Sep 17 00:00:00 2001 From: Vidhin Mehta Date: Fri, 19 Apr 2013 15:19:38 +0530 Subject: [PATCH 15/25] [IMP]remove html tag from body in name_get bzr revid: vme@tinyerp.com-20130419094938-1bmd3vu30cxsdyqd --- addons/mail/mail_message.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index defc12a2f73..750db19d56a 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -121,14 +121,26 @@ class mail_message(osv.Model): def name_get(self, cr, uid, ids, context=None): # name_get may receive int id instead of an id list + from HTMLParser import HTMLParser + class MLStripper(HTMLParser): + def __init__(self): + self.reset() + self.fed = [] + def handle_data(self, d): + self.fed.append(d) + def get_data(self): + return ''.join(self.fed) + def strip_tags(html): + s = MLStripper() + s.feed(html) + return s.get_data() if isinstance(ids, (int, long)): ids = [ids] res = [] for message in self.browse(cr, uid, ids, context=context): - name = '%s: %s' % (message.subject or '', message.body or '') + name = '%s: %s' % (message.subject or '', strip_tags(message.body or '') or '') res.append((message.id, self._shorten_name(name.lstrip(' :')))) return res - _columns = { 'type': fields.selection([ ('email', 'Email'), From 077d83f988ba9524a92eb82ae253ae4466a60e2d Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 25 Apr 2013 14:45:04 +0200 Subject: [PATCH 16/25] [IMP] better indentation bzr revid: mat@openerp.com-20130425124504-1h5yn8t1207gpw7w --- addons/web_kanban/static/src/js/kanban.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 2ddf76c2d62..48f71129c86 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -1061,9 +1061,9 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({ } }); $(".oe_kanban_quick_create").focusout(function (e) { - var val = self.$el.find('input').val() - if (/^\s*$/.test(val)) { self.trigger('close'); } - e.stopImmediatePropagation(); + var val = self.$el.find('input').val(); + if (/^\s*$/.test(val)) { self.trigger('close'); } + e.stopImmediatePropagation(); }); $(".oe_kanban_quick_create_add", this.$el).click(function () { self.quick_add(); From 847c51b1d7b898d8726bd711b431ba55eba935d4 Mon Sep 17 00:00:00 2001 From: "Vishmita Jadeja (openerp)" Date: Wed, 1 May 2013 11:17:15 +0530 Subject: [PATCH 17/25] [IMP]css change bzr revid: vja@tinyerp.com-20130501054715-ssssf5pgj7c7pn1c --- addons/web/static/src/css/base.css | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 1e82daeb4ff..500ae1857bb 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2648,6 +2648,16 @@ div.ui-widget-overlay { width: 80px; } .openerp_ie .oe_form_field_boolean input { background: white; } +.openerp .oe_form_field_boolean .boolean{ + position: relative; + top: -14px; + width: 14px; + height: 14px; + z-index:10000; + // IE needs a color in order for the layer to respond to mouse events + backgroundColor: "#fff"; + opacity: 0; +} .openerp_ie .db_option_table .oe_form_field_selection { width: auto; } .openerp_ie input[type='checkbox'] { From 23687ef653b9d5fb11dcac5cf71dabdf8448e976 Mon Sep 17 00:00:00 2001 From: "Vishmita Jadeja (openerp)" Date: Wed, 1 May 2013 11:26:18 +0530 Subject: [PATCH 18/25] [IMP]Improve code bzr revid: vja@tinyerp.com-20130501055618-06xc6fgj50npvk3u --- addons/web/static/src/js/view_form.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 0373af78358..514d3dad51c 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2757,14 +2757,10 @@ instance.web.form.FieldBoolean = instance.web.form.AbstractField.extend({ return input ? input.focus() : false; }, click_disabled_boolean: function(){ - var $disabled = $(document).find('input[type=checkbox]:disabled'); + var $disabled = this.$el.find('input[type=checkbox]:disabled'); $disabled.each(function (){ - var $parent = $(this).closest("span"); - if($(this).next('div')){ - $(this).next('div').remove(); - } - var $overlay = $("
"); - $parent.append($overlay); + $(this).next('div').remove(); + $(this).closest("span").append($('
')); }); } }); From 330cf7949768f9851fe3956d8d7db5e3260ef631 Mon Sep 17 00:00:00 2001 From: "Vishmita Jadeja (openerp)" Date: Thu, 2 May 2013 12:50:52 +0530 Subject: [PATCH 19/25] [IMP]Minor change bzr revid: vja@tinyerp.com-20130502072052-2jo04lhsz3y3fhxi --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 514d3dad51c..eae34b678b0 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2760,7 +2760,7 @@ instance.web.form.FieldBoolean = instance.web.form.AbstractField.extend({ var $disabled = this.$el.find('input[type=checkbox]:disabled'); $disabled.each(function (){ $(this).next('div').remove(); - $(this).closest("span").append($('
')); + $(this).closest("span").append($('
')); }); } }); From 3c0bc3aad8534bc1f7e681a36639432710a212ce Mon Sep 17 00:00:00 2001 From: "Vishmita Jadeja (openerp)" Date: Thu, 2 May 2013 13:07:06 +0530 Subject: [PATCH 20/25] [IMP]Improve in css bzr revid: vja@tinyerp.com-20130502073706-onxr8vdi3f3vhqvs --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/css/base.sass | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 500ae1857bb..7921b40d7d7 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2648,7 +2648,7 @@ div.ui-widget-overlay { width: 80px; } .openerp_ie .oe_form_field_boolean input { background: white; } -.openerp .oe_form_field_boolean .boolean{ +.openerp .oe_form_readonly .oe_form_field_boolean .boolean{ position: relative; top: -14px; width: 14px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index b4e70e6bdc9..b39fb7748be 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1695,6 +1695,15 @@ $sheet-padding: 16px display: none !important .oe_form .oe_form_field_date width: auto + .oe_form_field_boolean.boolean + position: relative + top: -20px + width: 14px + height: 14px + z-index: 10000 + // IE needs a color in order for the layer to respond to mouse events + backgroundColor: "#fff" + opacity: 0 // Sheet and padding .oe_form_nosheet margin: 16px @@ -1930,16 +1939,6 @@ $sheet-padding: 16px white-space: nowrap .oe_form_field_boolean width: auto - height: 14px - .boolean - position: relative - top: -20px - width: 14px - height: 14px - z-index: 10000 - // IE needs a color in order for the layer to respond to mouse events - backgroundColor: "#fff" - opacity: 0 .oe_datepicker_container display: none .oe_datepicker_root From 2f15045af412e6502e1e65a65a49ac3998d237dd Mon Sep 17 00:00:00 2001 From: Vidhin Mehta Date: Thu, 23 May 2013 11:32:23 +0530 Subject: [PATCH 21/25] [FIX]Fixes on, need fixing issues by MAT. bzr revid: vme@tinyerp.com-20130523060223-hupizjpulghv8gsy --- addons/crm/crm_lead_view.xml | 2 +- addons/mail/mail_message.py | 28 +++--- addons/mail/mail_thread.py | 1 - addons/point_of_sale/static/src/js/widgets.js | 87 ++++++++++--------- 4 files changed, 60 insertions(+), 58 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 02fac2025f5..225b2ffc292 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -105,7 +105,7 @@
-
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index 2e7b08afbc6..c30d00f5af7 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -27,6 +27,7 @@ from openerp import SUPERUSER_ID from openerp.osv import osv, orm, fields from openerp.tools import html_email_clean from openerp.tools.translate import _ +from HTMLParser import HTMLParser _logger = logging.getLogger(__name__) @@ -43,6 +44,19 @@ def decode(text): text = decode_header(text.replace('\r', '')) return ''.join([tools.ustr(x[0], x[1]) for x in text]) +class MLStripper(HTMLParser): + def __init__(self): + self.reset() + self.fed = [] + def handle_data(self, d): + self.fed.append(d) + def get_data(self): + return ''.join(self.fed) + +def strip_tags(html): + s = MLStripper() + s.feed(html) + return s.get_data() class mail_message(osv.Model): """ Messages model: system notification (replacing res.log notifications), @@ -121,19 +135,6 @@ class mail_message(osv.Model): def name_get(self, cr, uid, ids, context=None): # name_get may receive int id instead of an id list - from HTMLParser import HTMLParser - class MLStripper(HTMLParser): - def __init__(self): - self.reset() - self.fed = [] - def handle_data(self, d): - self.fed.append(d) - def get_data(self): - return ''.join(self.fed) - def strip_tags(html): - s = MLStripper() - s.feed(html) - return s.get_data() if isinstance(ids, (int, long)): ids = [ids] res = [] @@ -141,6 +142,7 @@ class mail_message(osv.Model): name = '%s: %s' % (message.subject or '', strip_tags(message.body or '') or '') res.append((message.id, self._shorten_name(name.lstrip(' :')))) return res + _columns = { 'type': fields.selection([ ('email', 'Email'), diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 5c7d659b831..80df8ad6e99 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -926,7 +926,6 @@ class mail_thread(osv.AbstractModel): author_ids = self._message_find_partners(cr, uid, message, ['From'], context=context) if author_ids: msg_dict['author_id'] = author_ids[0] - msg_dict['email_from'] = decode(message.get('from')) partner_ids = self._message_find_partners(cr, uid, message, ['To', 'Cc'], context=context) msg_dict['partner_ids'] = [(4, partner_id) for partner_id in partner_ids] diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index 0e0974ca616..4d948d4aa68 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -1,7 +1,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sale var QWeb = instance.web.qweb; - // The ImageCache is used to hide the latency of the application cache on-disk access in chrome + // The ImageCache is used to hide the latency of the application cache on-disk access in chrome // that causes annoying flickering on product pictures. Why the hell a simple access to // the application cache involves such latency is beyond me, hopefully one day this can be // removed. @@ -88,7 +88,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa }, }); - // The paypad allows to select the payment method (cashRegisters) + // The paypad allows to select the payment method (cashRegisters) // used to pay the order. module.PaypadWidget = module.PosBaseWidget.extend({ template: 'PaypadWidget', @@ -156,7 +156,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.trigger('order_line_refreshed'); }, }); - + module.OrderWidget = module.PosBaseWidget.extend({ template:'OrderWidget', init: function(parent, options) { @@ -168,18 +168,18 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.orderlinewidgets = []; }, set_numpad_state: function(numpadState) { - if (this.numpadState) { - this.numpadState.unbind('set_value', this.set_value); - } - this.numpadState = numpadState; - if (this.numpadState) { - this.numpadState.bind('set_value', this.set_value, this); - this.numpadState.reset(); - } + if (this.numpadState) { + this.numpadState.unbind('set_value', this.set_value); + } + this.numpadState = numpadState; + if (this.numpadState) { + this.numpadState.bind('set_value', this.set_value, this); + this.numpadState.reset(); + } }, set_value: function(val) { - var order = this.pos.get('selectedOrder'); - if (order.get('orderLines').length !== 0) { + var order = this.pos.get('selectedOrder'); + if (order.get('orderLines').length !== 0) { var mode = this.numpadState.get('mode'); if( mode === 'quantity'){ order.getSelectedLine().set_quantity(val); @@ -188,9 +188,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa }else if( mode === 'price'){ order.getSelectedLine().set_unit_price(val); } - } else { - this.pos.get('selectedOrder').destroy(); - } + } else { + this.pos.get('selectedOrder').destroy(); + } }, change_selected_order: function() { this.currentOrderLines.unbind(); @@ -212,7 +212,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this._super(); // freeing subwidgets - + if(this.scrollbar){ this.scrollbar.destroy(); } @@ -235,7 +235,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa model: orderLine, order: this.pos.get('selectedOrder'), }); - line.on('order_line_selected', self, self.update_numpad); + line.on('order_line_selected', self, self.update_numpad); line.on('order_line_refreshed', self, self.update_summary); line.appendTo($content); self.orderlinewidgets.push(line); @@ -245,7 +245,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa var position = this.scrollbar ? this.scrollbar.get_position() : 0; var at_bottom = this.scrollbar ? this.scrollbar.is_at_bottom() : false; - + this.scrollbar = new module.ScrollbarWidget(this,{ target_widget: this, target_selector: '.order-scroller', @@ -289,7 +289,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.model = options.model; this.model.attributes.weight = options.weight; this.next_screen = options.next_screen; //when a product is clicked, this screen is set - this.click_product_action = options.click_product_action; + this.click_product_action = options.click_product_action; }, // returns the url of the product thumbnail renderElement: function() { @@ -319,11 +319,6 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.payment_line.set_amount(amount); } }, - changedAmount: function() { - if (this.amount !== this.payment_line.get_amount()){ - this.renderElement(); - } - }, checkAmount:function(e){ if (e.which !== 0 && e.charCode !== 0) { if(isNaN(String.fromCharCode(e.charCode))){ @@ -332,13 +327,19 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa } return true }, + changedAmount: function() { + if (this.amount !== this.payment_line.get_amount()){ + this.renderElement(); + } + }, renderElement: function() { var self = this; this.name = this.payment_line.get_cashregister().get('journal_id')[1]; this._super(); - this.$('input') - .keypress(_.bind(this.checkAmount, this)) - .keyup(_.bind(this.changeAmount, this)); + this.$('input').keypress(_.bind(this.checkAmount, this)) + .keyup(function(event){ + self.changeAmount(event); + }); this.$('.delete-payment-line').click(function() { self.trigger('delete_payment_line', self); }); @@ -550,7 +551,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa }); this.search_and_categories(); }, - + set_product_type: function(type){ // 'all' | 'weightable' this.product_type = type; this.reset_category(); @@ -618,11 +619,11 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this._super(); // free subwidgets memory from previous renders - + for(var i = 0, len = this.productwidgets.length; i < len; i++){ this.productwidgets[i].destroy(); } - this.productwidgets = []; + this.productwidgets = []; if(this.scrollbar){ this.scrollbar.destroy(); } @@ -765,7 +766,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa }); _.each(this.events, function(name){ self.pos.proxy.add_notification(name,function(){ - self.$('.event.'+name).stop().clearQueue().css({'background-color':'#6CD11D'}); + self.$('.event.'+name).stop().clearQueue().css({'background-color':'#6CD11D'}); self.$('.event.'+name).animate({'background-color':'#1E1E1E'},2000); }); }); @@ -821,7 +822,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa // The PosWidget is the main widget that contains all other widgets in the PointOfSale. // It is mainly composed of : // - a header, containing the list of orders - // - a leftpane, containing the list of bought products (orderlines) + // - a leftpane, containing the list of bought products (orderlines) // - a rightpane, containing the screens (see pos_screens.js) // - an actionbar on the bottom, containing various action buttons // - popups @@ -830,10 +831,10 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa module.PosWidget = module.PosBaseWidget.extend({ template: 'PosWidget', - init: function() { + init: function() { this._super(arguments[0],{}); - instance.web.blockUI(); + instance.web.blockUI(); this.pos = new module.PosModel(this.session); this.pos_widget = this; //So that pos_widget's childs have pos_widget set automatically @@ -845,17 +846,17 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.cashier_controls_visible = true; this.image_cache = new module.ImageCache(); // for faster products image display }, - + start: function() { var self = this; return self.pos.ready.done(function() { self.build_currency_template(); self.renderElement(); - + self.$('.neworder-button').click(function(){ self.pos.add_new_order(); }); - + //when a new order is created, add an order button widget self.pos.get('orders').bind('add', function(new_order){ var new_order_button = new module.OrderButtonWidget(null, { @@ -883,7 +884,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa }else if(!self.pos.get('pos_config')){ self.screen_selector.show_popup('error', 'Sorry, we could not find any PoS Configuration for this session'); } - + instance.web.unblockUI(); self.$('.loader').animate({opacity:0},1500,'swing',function(){self.$('.loader').hide();}); @@ -901,7 +902,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa }, self)); }); }, - + // This method instantiates all the screens, widgets, etc. If you want to add new screens change the // startup screen, etc, override this method. build_widgets: function() { @@ -976,7 +977,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.onscreen_keyboard = new module.OnscreenKeyboardWidget(this, { 'keyboard_model': 'simple' }); - this.onscreen_keyboard.appendTo($(".point-of-sale #content")); + this.onscreen_keyboard.appendTo($(".point-of-sale #content")); this.close_button = new module.HeaderButtonWidget(this,{ label:'Close', @@ -990,7 +991,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa }); this.client_button.appendTo(this.$('#rightheader')); - + // -------- Screen Selector --------- this.screen_selector = new module.ScreenSelector({ @@ -1075,7 +1076,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa } } }, - //shows or hide the controls in the PosWidget that are specific to the cashier ( Orders, close button, etc. ) + //shows or hide the controls in the PosWidget that are specific to the cashier ( Orders, close button, etc. ) set_cashier_controls_visible: function(visible){ if(visible !== this.cashier_controls_visible){ this.cashier_controls_visible = visible; From 82657c43a83e59820a1d7ca7b400efd813d5a495 Mon Sep 17 00:00:00 2001 From: Vidhin Mehta Date: Thu, 23 May 2013 12:36:24 +0530 Subject: [PATCH 22/25] [IMP]Make indentation as it is. bzr revid: vme@tinyerp.com-20130523070624-8q2d2zj2zjnn8l31 --- addons/point_of_sale/static/src/js/widgets.js | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index 4d948d4aa68..1b65110813c 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -168,18 +168,18 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.orderlinewidgets = []; }, set_numpad_state: function(numpadState) { - if (this.numpadState) { - this.numpadState.unbind('set_value', this.set_value); - } - this.numpadState = numpadState; - if (this.numpadState) { - this.numpadState.bind('set_value', this.set_value, this); - this.numpadState.reset(); - } + if (this.numpadState) { + this.numpadState.unbind('set_value', this.set_value); + } + this.numpadState = numpadState; + if (this.numpadState) { + this.numpadState.bind('set_value', this.set_value, this); + this.numpadState.reset(); + } }, set_value: function(val) { - var order = this.pos.get('selectedOrder'); - if (order.get('orderLines').length !== 0) { + var order = this.pos.get('selectedOrder'); + if (order.get('orderLines').length !== 0) { var mode = this.numpadState.get('mode'); if( mode === 'quantity'){ order.getSelectedLine().set_quantity(val); @@ -188,9 +188,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa }else if( mode === 'price'){ order.getSelectedLine().set_unit_price(val); } - } else { - this.pos.get('selectedOrder').destroy(); - } + } else { + this.pos.get('selectedOrder').destroy(); + } }, change_selected_order: function() { this.currentOrderLines.unbind(); @@ -235,7 +235,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa model: orderLine, order: this.pos.get('selectedOrder'), }); - line.on('order_line_selected', self, self.update_numpad); + line.on('order_line_selected', self, self.update_numpad); line.on('order_line_refreshed', self, self.update_summary); line.appendTo($content); self.orderlinewidgets.push(line); @@ -328,8 +328,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa return true }, changedAmount: function() { - if (this.amount !== this.payment_line.get_amount()){ - this.renderElement(); + if (this.amount !== this.payment_line.get_amount()){ + this.renderElement(); } }, renderElement: function() { @@ -337,7 +337,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.name = this.payment_line.get_cashregister().get('journal_id')[1]; this._super(); this.$('input').keypress(_.bind(this.checkAmount, this)) - .keyup(function(event){ + .keyup(function(event){ self.changeAmount(event); }); this.$('.delete-payment-line').click(function() { @@ -1115,3 +1115,4 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa } }); } + From 5fa8cdd3053109269cb4148ab9ca1be984e900d5 Mon Sep 17 00:00:00 2001 From: Vidhin Mehta Date: Thu, 23 May 2013 12:48:14 +0530 Subject: [PATCH 23/25] bzr revid: vme@tinyerp.com-20130523071814-o5suitn0hcy12mie --- addons/point_of_sale/static/src/js/widgets.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index 1b65110813c..a533f0a8ee6 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -319,7 +319,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.payment_line.set_amount(amount); } }, - checkAmount:function(e){ + checkAmount: function(e){ if (e.which !== 0 && e.charCode !== 0) { if(isNaN(String.fromCharCode(e.charCode))){ return (String.fromCharCode(e.charCode) === "." && e.currentTarget.value.toString().split(".").length < 2)?true:false; @@ -1115,4 +1115,3 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa } }); } - From 814a121dabbbe45a1c9ee671222b3a2bf261059a Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Wed, 29 May 2013 05:37:36 +0000 Subject: [PATCH 24/25] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20130528051715-j4ulg9nj7dri99fm bzr revid: launchpad_translations_on_behalf_of_openerp-20130529053736-mcbrxavvttckchd7 --- addons/auth_openid/i18n/ru.po | 20 ++--- addons/auth_signup/i18n/ru.po | 71 +++++++++------- addons/base_setup/i18n/ru.po | 61 +++++++++----- addons/claim_from_delivery/i18n/ru.po | 8 +- addons/crm/i18n/ru.po | 10 +-- addons/mrp/i18n/ru.po | 24 +++--- addons/project/i18n/ru.po | 116 +++++++++++++++----------- 7 files changed, 182 insertions(+), 128 deletions(-) diff --git a/addons/auth_openid/i18n/ru.po b/addons/auth_openid/i18n/ru.po index 6041300fe60..68b36626056 100644 --- a/addons/auth_openid/i18n/ru.po +++ b/addons/auth_openid/i18n/ru.po @@ -8,21 +8,21 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2013-03-23 11:37+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-05-28 06:19+0000\n" +"Last-Translator: Глория Хрусталёва \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-24 04:45+0000\n" -"X-Generator: Launchpad (build 16540)\n" +"X-Launchpad-Export-Date: 2013-05-29 05:37+0000\n" +"X-Generator: Launchpad (build 16640)\n" #. module: auth_openid #. openerp-web #: code:addons/auth_openid/static/src/xml/auth_openid.xml:24 #, python-format msgid "Username" -msgstr "" +msgstr "Имя пользователя" #. module: auth_openid #. openerp-web @@ -30,7 +30,7 @@ msgstr "" #: view:res.users:0 #, python-format msgid "OpenID" -msgstr "" +msgstr "OpenID" #. module: auth_openid #. openerp-web @@ -46,14 +46,14 @@ msgstr "" #: code:addons/auth_openid/static/src/xml/auth_openid.xml:10 #, python-format msgid "Google" -msgstr "" +msgstr "Google" #. module: auth_openid #. openerp-web #: code:addons/auth_openid/static/src/xml/auth_openid.xml:11 #, python-format msgid "Launchpad" -msgstr "" +msgstr "Launchpad" #. module: auth_openid #: help:res.users,openid_email:0 @@ -82,7 +82,7 @@ msgstr "" #: code:addons/auth_openid/static/src/xml/auth_openid.xml:8 #, python-format msgid "Password" -msgstr "" +msgstr "Пароль" #. module: auth_openid #. openerp-web @@ -94,4 +94,4 @@ msgstr "" #. module: auth_openid #: model:ir.model,name:auth_openid.model_res_users msgid "Users" -msgstr "" +msgstr "Пользователи" diff --git a/addons/auth_signup/i18n/ru.po b/addons/auth_signup/i18n/ru.po index bddc6cde1ba..639a1e9bc3c 100644 --- a/addons/auth_signup/i18n/ru.po +++ b/addons/auth_signup/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-12-11 06:59+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-05-27 12:12+0000\n" +"Last-Translator: Глория Хрусталёва \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-16 05:52+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-05-28 05:17+0000\n" +"X-Generator: Launchpad (build 16640)\n" #. module: auth_signup #: field:res.partner,signup_type:0 @@ -25,25 +25,25 @@ msgstr "" #. module: auth_signup #: field:base.config.settings,auth_signup_uninvited:0 msgid "Allow external users to sign up" -msgstr "" +msgstr "Разрешить регистрацию внешним пользователям" #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:16 #, python-format msgid "Confirm Password" -msgstr "" +msgstr "Подтвердите пароль" #. module: auth_signup #: help:base.config.settings,auth_signup_uninvited:0 msgid "If unchecked, only invited users may sign up." msgstr "" -"Если отмечено, только приглашенные пользователи могут зарегистрироваться" +"Если не отмечено, только приглашенные пользователи могут зарегистрироваться" #. module: auth_signup #: model:ir.model,name:auth_signup.model_base_config_settings msgid "base.config.settings" -msgstr "" +msgstr "base.config.settings" #. module: auth_signup #: code:addons/auth_signup/res_users.py:265 @@ -57,17 +57,17 @@ msgstr "Невозможно отправить письмо: у пользов #: code:addons/auth_signup/static/src/xml/auth_signup.xml:28 #, python-format msgid "Reset password" -msgstr "" +msgstr "Сброс пароля" #. module: auth_signup #: field:base.config.settings,auth_signup_template_user_id:0 msgid "Template user for new users created through signup" -msgstr "" +msgstr "Шаблон новых пользователей, созданных в процессе регистрации" #. module: auth_signup #: model:email.template,subject:auth_signup.reset_password_email msgid "Password reset" -msgstr "" +msgstr "Сброс пароля" #. module: auth_signup #. openerp-web @@ -88,12 +88,12 @@ msgstr "" #: code:addons/auth_signup/static/src/xml/auth_signup.xml:26 #, python-format msgid "Sign Up" -msgstr "" +msgstr "Регистрация" #. module: auth_signup #: selection:res.users,state:0 msgid "New" -msgstr "" +msgstr "Новый" #. module: auth_signup #: code:addons/auth_signup/res_users.py:258 @@ -104,7 +104,7 @@ msgstr "" #. module: auth_signup #: field:res.users,state:0 msgid "Status" -msgstr "" +msgstr "Статус" #. module: auth_signup #: model:email.template,body_html:auth_signup.reset_password_email @@ -118,18 +118,27 @@ msgid "" "\n" "

Note: If you do not expect this, you can safely ignore this email.

" msgstr "" +"\n" +"

Был запрошен сброс пароля для аккаунта OpenERP связанного с этим адресом " +"эл.почты

\n" +"\n" +"

Вы можете сменить пароль, проследовав по ссылке.

\n" +"\n" +"

Примечание: если вы не запрашивали сброс пароля, просто проигнорируйте " +"данное письмо

" #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/js/auth_signup.js:111 #, python-format msgid "Please enter a name." -msgstr "" +msgstr "Пожалуйста, введите имя" #. module: auth_signup #: model:ir.model,name:auth_signup.model_res_users msgid "Users" -msgstr "" +msgstr "Пользователи" #. module: auth_signup #: field:res.partner,signup_url:0 @@ -146,7 +155,7 @@ msgstr "Пожалуйста, введите имя пользователя." #. module: auth_signup #: selection:res.users,state:0 msgid "Active" -msgstr "" +msgstr "Активен" #. module: auth_signup #: code:addons/auth_signup/res_users.py:269 @@ -155,39 +164,41 @@ msgid "" "Cannot send email: no outgoing email server configured.\n" "You can configure it under Settings/General Settings." msgstr "" +"Невозможно отправить email: не настроены сервера исходящей почты.\n" +"Вы можете настроить их в меню Настройки/Общие настройки" #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12 #, python-format msgid "Username" -msgstr "" +msgstr "Имя пользователя" #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:8 #, python-format msgid "Name" -msgstr "" +msgstr "Имя" #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/js/auth_signup.js:170 #, python-format msgid "Please enter a username or email address." -msgstr "" +msgstr "Пожалуйста, введите имя пользователя или адрес эл. почты." #. module: auth_signup #: selection:res.users,state:0 msgid "Resetting Password" -msgstr "" +msgstr "Переустановка пароля" #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:13 #, python-format msgid "Username (Email)" -msgstr "" +msgstr "Имя пользователя (Email)" #. module: auth_signup #: field:res.partner,signup_expiration:0 @@ -198,13 +209,15 @@ msgstr "" #: help:base.config.settings,auth_signup_reset_password:0 msgid "This allows users to trigger a password reset from the Login page." msgstr "" +"Это позволяет пользователям запросить сброс пароля со страницы входа в " +"систему." #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:22 #, python-format msgid "Log in" -msgstr "" +msgstr "Вход" #. module: auth_signup #: field:res.partner,signup_valid:0 @@ -222,7 +235,7 @@ msgstr "" #: code:addons/auth_signup/static/src/js/auth_signup.js:170 #, python-format msgid "Login" -msgstr "" +msgstr "Вход" #. module: auth_signup #. openerp-web @@ -236,7 +249,7 @@ msgstr "" #: code:addons/auth_signup/static/src/js/auth_signup.js:120 #, python-format msgid "Passwords do not match; please retype them." -msgstr "" +msgstr "Пароли не совпадают; пожалуйста, введите их заново." #. module: auth_signup #. openerp-web @@ -244,7 +257,7 @@ msgstr "" #: code:addons/auth_signup/static/src/js/auth_signup.js:167 #, python-format msgid "No database selected !" -msgstr "" +msgstr "Не выбрана база данных!" #. module: auth_signup #: view:res.users:0 @@ -254,14 +267,14 @@ msgstr "" #. module: auth_signup #: field:base.config.settings,auth_signup_reset_password:0 msgid "Enable password reset from Login page" -msgstr "" +msgstr "Включить сброс пароля со страницы входа" #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:27 #, python-format msgid "Back to Login" -msgstr "" +msgstr "Вернуться к странице входа" #. module: auth_signup #. openerp-web @@ -273,7 +286,7 @@ msgstr "" #. module: auth_signup #: model:ir.model,name:auth_signup.model_res_partner msgid "Partner" -msgstr "" +msgstr "Партнер" #. module: auth_signup #: field:res.partner,signup_token:0 diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po index bfc0807f019..93f65355baa 100644 --- a/addons/base_setup/i18n/ru.po +++ b/addons/base_setup/i18n/ru.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-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-12-28 10:09+0000\n" -"Last-Translator: Chertykov Denis \n" +"PO-Revision-Date: 2013-05-27 12:19+0000\n" +"Last-Translator: leksei \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: 2013-03-16 05:12+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-05-28 05:17+0000\n" +"X-Generator: Launchpad (build 16640)\n" #. module: base_setup #: view:sale.config.settings:0 @@ -41,6 +41,8 @@ msgstr "base.config.settings" msgid "" "Use external authentication providers, sign in with google, facebook, ..." msgstr "" +"Использовать внешние сервисы аутентификации, например, вход через google, " +"facebook, ..." #. module: base_setup #: view:sale.config.settings:0 @@ -68,7 +70,7 @@ msgstr "Участник" #. module: base_setup #: view:base.config.settings:0 msgid "Portal access" -msgstr "" +msgstr "Доступ к порталу" #. module: base_setup #: view:base.config.settings:0 @@ -192,6 +194,9 @@ msgid "" "When you create a new contact (person or company), you will be able to load " "all the data from LinkedIn (photos, address, etc)." msgstr "" +"Когда вы создаете новый контакт (человека или компанию), у вас есть " +"возможность загрузить из LinkedIn всю информацию о нем (адреса, фотографии и " +"т.д.)" #. module: base_setup #: help:base.config.settings,module_multi_company:0 @@ -200,6 +205,9 @@ msgid "" "companies.\n" " This installs the module multi_company." msgstr "" +"Работать в режиме Мульти-компании, с соответствующими правами доступа между " +"компаниями.\n" +" Будет установлен модуль multi_company." #. module: base_setup #: view:base.config.settings:0 @@ -208,6 +216,9 @@ msgid "" "You can\n" " launch the OpenERP Server with the option" msgstr "" +"Публичный портал доступен только при использовании одной базы данных. Вы " +"можете\n" +" запустить сервер OpenERP с этой опцией" #. module: base_setup #: view:base.config.settings:0 @@ -215,6 +226,8 @@ msgid "" "You will find more options in your company details: address for the header " "and footer, overdue payments texts, etc." msgstr "" +"Больше опций вы можете найти в настройках компании: адреса для " +"верхнего/нижнего колонтитула, тексты для просроченных платежей и т.д." #. module: base_setup #: model:ir.model,name:base_setup.model_sale_config_settings @@ -238,6 +251,14 @@ msgid "" "projects,\n" " etc." msgstr "" +"Когда вы отправляете заказчику документы\n" +" (прайсы, счета), для их получения он " +"сможет\n" +" войти на портал, где так же сможет " +"прочитать\n" +" новости вашей компании, узнать " +"обновления по\n" +" его проектам и т.д." #. module: base_setup #: model:ir.model,name:base_setup.model_base_setup_terminology @@ -252,7 +273,7 @@ msgstr "Клиент" #. module: base_setup #: help:base.config.settings,module_portal_anonymous:0 msgid "Enable the public part of openerp, openerp becomes a public website." -msgstr "" +msgstr "Включая публичную часть, openerp становится общедоступным сайтом." #. module: base_setup #: help:sale.config.settings,module_plugin_thunderbird:0 @@ -274,13 +295,13 @@ msgstr "Контрагент" #. module: base_setup #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form msgid "Use another word to say \"Customer\"" -msgstr "" +msgstr "Использовать другое слово вместо \"Заказчик\"" #. module: base_setup #: model:ir.actions.act_window,name:base_setup.action_sale_config #: view:sale.config.settings:0 msgid "Configure Sales" -msgstr "" +msgstr "Настройки продаж" #. module: base_setup #: help:sale.config.settings,module_plugin_outlook:0 @@ -297,12 +318,12 @@ msgstr "" #. module: base_setup #: view:base.config.settings:0 msgid "Options" -msgstr "" +msgstr "Настройки" #. module: base_setup #: field:base.config.settings,module_portal:0 msgid "Activate the customer portal" -msgstr "" +msgstr "Включить клиентский портал" #. module: base_setup #: view:base.config.settings:0 @@ -315,32 +336,32 @@ msgstr "" #. module: base_setup #: field:base.config.settings,module_share:0 msgid "Allow documents sharing" -msgstr "" +msgstr "Разрешить совместный доступ к документам" #. module: base_setup #: view:base.config.settings:0 msgid "(company news, jobs, contact form, etc.)" -msgstr "" +msgstr "(новости компании, вакансии, форма обратной связи т.д.)" #. module: base_setup #: field:base.config.settings,module_portal_anonymous:0 msgid "Activate the public portal" -msgstr "" +msgstr "Включить публичный портал" #. module: base_setup #: view:base.config.settings:0 msgid "Configure outgoing email servers" -msgstr "" +msgstr "Настроить сервер(а) исходящей почты" #. module: base_setup #: view:sale.config.settings:0 msgid "Social Network Integration" -msgstr "" +msgstr "Интеграция с социальными сетями" #. module: base_setup #: help:base.config.settings,module_portal:0 msgid "Give your customers access to their documents." -msgstr "" +msgstr "Разрешить заказчикам доступ к своим документам" #. module: base_setup #: view:base.config.settings:0 @@ -352,23 +373,23 @@ msgstr "Отмена" #: view:base.config.settings:0 #: view:sale.config.settings:0 msgid "Apply" -msgstr "" +msgstr "Применить" #. module: base_setup #: view:base.setup.terminology:0 msgid "Specify Your Terminology" -msgstr "" +msgstr "Определить терминологию" #. module: base_setup #: view:base.config.settings:0 #: view:sale.config.settings:0 msgid "or" -msgstr "" +msgstr "или" #. module: base_setup #: view:base.config.settings:0 msgid "Configure your company data" -msgstr "" +msgstr "Настроить информацию о компании" #~ msgid "City" #~ msgstr "Город" diff --git a/addons/claim_from_delivery/i18n/ru.po b/addons/claim_from_delivery/i18n/ru.po index 253e824d1e2..8d97086c22a 100644 --- a/addons/claim_from_delivery/i18n/ru.po +++ b/addons/claim_from_delivery/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2010-09-30 06:47+0000\n" +"PO-Revision-Date: 2013-05-27 12:19+0000\n" "Last-Translator: Chertykov Denis \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-16 05:41+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-05-28 05:17+0000\n" +"X-Generator: Launchpad (build 16640)\n" #. module: claim_from_delivery #: view:stock.picking.out:0 @@ -25,7 +25,7 @@ msgstr "" #. module: claim_from_delivery #: model:res.request.link,name:claim_from_delivery.request_link_claim_from_delivery msgid "Delivery Order" -msgstr "" +msgstr "Заказ доставки" #. module: claim_from_delivery #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po index 19ae76e9f46..6403f9e57b6 100644 --- a/addons/crm/i18n/ru.po +++ b/addons/crm/i18n/ru.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-12-21 17:04+0000\n" -"PO-Revision-Date: 2013-03-01 11:27+0000\n" -"Last-Translator: Антон Лаврёнов \n" +"PO-Revision-Date: 2013-05-27 12:19+0000\n" +"Last-Translator: leksei \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: 2013-03-16 05:09+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-05-28 05:17+0000\n" +"X-Generator: Launchpad (build 16640)\n" #. module: crm #: view:crm.lead.report:0 @@ -452,7 +452,7 @@ msgstr "# Предложений" #, python-format msgid "" "Please select more than one element (lead or opportunity) from the list view." -msgstr "" +msgstr "Пожалуйста, выберите хотя бы один элемент из списка ниже." #. module: crm #: view:crm.lead:0 diff --git a/addons/mrp/i18n/ru.po b/addons/mrp/i18n/ru.po index 5f7bf67a0e1..ef4cdb8675b 100644 --- a/addons/mrp/i18n/ru.po +++ b/addons/mrp/i18n/ru.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-12-21 17:04+0000\n" -"PO-Revision-Date: 2012-09-14 07:17+0000\n" -"Last-Translator: Chertykov Denis \n" +"PO-Revision-Date: 2013-05-27 12:24+0000\n" +"Last-Translator: Pavel \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: 2013-03-16 05:01+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-05-28 05:16+0000\n" +"X-Generator: Launchpad (build 16640)\n" #. module: mrp #: help:mrp.config.settings,module_mrp_repair:0 @@ -131,7 +131,7 @@ msgstr "Конечный продукт" #. module: mrp #: view:mrp.production:0 msgid "Manufacturing Orders which are currently in production." -msgstr "" +msgstr "Производственные заказы, которые в настоящее время в изготовлении." #. module: mrp #: help:mrp.bom,message_summary:0 @@ -156,7 +156,7 @@ msgstr "" #. module: mrp #: view:mrp.production:0 msgid "Products to Finish" -msgstr "" +msgstr "Конечная продукция" #. module: mrp #: selection:mrp.bom,method:0 @@ -195,7 +195,7 @@ msgstr "Для приобретенного материала" #. module: mrp #: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action msgid "Order Planning" -msgstr "" +msgstr "Планирование заказов" #. module: mrp #: field:mrp.config.settings,module_mrp_operations:0 @@ -206,7 +206,7 @@ msgstr "" #: code:addons/mrp/mrp.py:633 #, python-format msgid "Cannot cancel manufacturing order!" -msgstr "" +msgstr "Нельзя отменить производственый заказ!" #. module: mrp #: field:mrp.workcenter,costs_cycle_account_id:0 @@ -253,7 +253,7 @@ msgstr "" #: view:mrp.production:0 #: field:mrp.production,move_created_ids2:0 msgid "Produced Products" -msgstr "" +msgstr "Производимая продукция" #. module: mrp #: report:mrp.production.order:0 @@ -268,7 +268,7 @@ msgstr "Основные данные" #. module: mrp #: field:mrp.config.settings,module_mrp_byproduct:0 msgid "Produce several products from one manufacturing order" -msgstr "" +msgstr "Изготовить несколько продуктов по одному производственному заказу" #. module: mrp #: help:mrp.config.settings,group_mrp_properties:0 @@ -329,7 +329,7 @@ msgstr "Производимый продукт" #. module: mrp #: constraint:mrp.bom:0 msgid "Error ! You cannot create recursive BoM." -msgstr "" +msgstr "Ошибка! Вы не можете создавать рекурсивную спецификацию." #. module: mrp #: model:ir.model,name:mrp.model_mrp_routing_workcenter @@ -381,6 +381,8 @@ msgid "" "Fill this product to easily track your production costs in the analytic " "accounting." msgstr "" +"Заполнив этот продукт легко отслеживать ваши производственные издержки в " +"аналитическом учете." #. module: mrp #: field:mrp.workcenter,product_id:0 diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po index 1743d66e55d..b64662f916b 100644 --- a/addons/project/i18n/ru.po +++ b/addons/project/i18n/ru.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-12-21 17:04+0000\n" -"PO-Revision-Date: 2013-03-14 06:44+0000\n" +"PO-Revision-Date: 2013-05-28 06:22+0000\n" "Last-Translator: Chertykov Denis \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: 2013-03-16 04:56+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-05-29 05:37+0000\n" +"X-Generator: Launchpad (build 16640)\n" #. module: project #: view:project.project:0 @@ -27,6 +27,8 @@ msgid "" "If checked, this contract will be available in the project menu and you will " "be able to manage tasks or track issues" msgstr "" +"Если выбрано, этот контракт станет активным в меню проекта, и вы сможете " +"редактировать задачи или отслеживать проблемы" #. module: project #: field:project.project,progress_rate:0 @@ -217,7 +219,7 @@ msgstr "Предложение контакта" #. module: project #: help:project.config.settings,group_time_work_estimation_tasks:0 msgid "Allows you to compute Time Estimation on tasks." -msgstr "" +msgstr "Позволяет вычислить расход времени на задачи." #. module: project #: field:report.project.task.user,user_id:0 @@ -913,6 +915,8 @@ msgid "" "Provides management of issues/bugs in projects.\n" " This installs the module project_issue." msgstr "" +"Обеспечивает управление проблем / ошибок в проектах.\n" +" Устанавливает модуль project_issue." #. module: project #: help:project.task,kanban_state:0 @@ -927,7 +931,7 @@ msgstr "" #. module: project #: view:project.task:0 msgid "10" -msgstr "" +msgstr "10" #. module: project #: help:project.project,analytic_account_id:0 @@ -953,7 +957,7 @@ msgstr "Отменить" #. module: project #: view:project.project:0 msgid "Other Info" -msgstr "" +msgstr "Прочая информация" #. module: project #: view:project.task.delegate:0 @@ -981,6 +985,8 @@ msgid "" "Follow this project to automatically track the events associated to tasks " "and issues of this project." msgstr "" +"Позволяет проекту автоматически отслеживать события, связанные с задачами и " +"проблемами этого проекта." #. module: project #: view:project.task:0 @@ -990,7 +996,7 @@ msgstr "Исполнитель" #. module: project #: model:mail.message.subtype,name:project.mt_task_stage msgid "Stage Changed" -msgstr "" +msgstr "Стадия изменена" #. module: project #: view:project.project:0 @@ -1006,7 +1012,7 @@ msgstr "Важное" #. module: project #: field:project.category,name:0 msgid "Name" -msgstr "" +msgstr "Название" #. module: project #: selection:report.project.task.user,month:0 @@ -1033,7 +1039,7 @@ msgstr "Общие" #: help:project.project,message_ids:0 #: help:project.task,message_ids:0 msgid "Messages and communication history" -msgstr "" +msgstr "Сообщения и история общения" #. module: project #: view:project.project:0 @@ -1041,6 +1047,8 @@ msgid "" "To invoice or setup invoicing and renewal options, go to the related " "contract:" msgstr "" +"Для выставления счета или изменения счета и обновления вариантов, перейти к " +"соответствующему контракту:" #. module: project #: field:project.task.delegate,state:0 @@ -1097,7 +1105,7 @@ msgstr "Порученные задания" #: view:project.task:0 #: field:project.task,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "Непрочитанные" #. module: project #: view:project.task:0 @@ -1139,7 +1147,7 @@ msgstr "Показывать только срочные задания" #. module: project #: model:project.category,name:project.project_category_04 msgid "Usability" -msgstr "" +msgstr "Удобство использования" #. module: project #: view:report.project.task.user:0 @@ -1156,7 +1164,7 @@ msgstr "Выполнил(а)" #: code:addons/project/project.py:181 #, python-format msgid "Invalid Action!" -msgstr "" +msgstr "Неверное действие!" #. module: project #: help:project.task.type,state:0 @@ -1165,6 +1173,9 @@ msgid "" "stage. For example, if a stage is related to the status 'Close', when your " "document reaches this stage, it is automatically closed." msgstr "" +"Статус документа автоматически изменяется по выбранному этапу. Например, " +"если стадия связана со статусом «Закрыть» , когда ваш документ достигает " +"этой стадии, оно автоматически закрывается." #. module: project #: view:project.task:0 @@ -1174,7 +1185,7 @@ msgstr "Доп. информация" #. module: project #: view:project.task:0 msgid "Edit..." -msgstr "" +msgstr "Изменить..." #. module: project #: view:report.project.task.user:0 @@ -1185,7 +1196,7 @@ msgstr "№ задачи" #. module: project #: field:project.project,doc_count:0 msgid "Number of documents attached" -msgstr "" +msgstr "Количество прикрепленных документов" #. module: project #: field:project.task,priority:0 @@ -1205,6 +1216,9 @@ msgid "" "automatically synchronizedwith Tasks (or optionally Issues if the Issue " "Tracker module is installed)." msgstr "" +"Внутренние e-mail, связанный с этим проектом. Входящие письма автоматически " +"синхронизируются с заданиями (или проблемами, если модуль Issue Tracker " +"установлен)." #. module: project #: model:ir.actions.act_window,help:project.open_task_type_form @@ -1237,7 +1251,7 @@ msgstr "%s (копия)" #. module: project #: model:mail.message.subtype,name:project.mt_project_task_stage msgid "Task Stage Changed" -msgstr "" +msgstr "Этап задачи изменен" #. module: project #: view:project.task:0 @@ -1269,12 +1283,12 @@ msgstr "Время отсрочки" #. module: project #: view:project.project:0 msgid "Team" -msgstr "" +msgstr "Группа" #. module: project #: help:project.config.settings,time_unit:0 msgid "This will set the unit of measure used in projects and tasks." -msgstr "" +msgstr "Установить единицу измерения, используемую в проектах и задачах." #. module: project #: selection:project.task,priority:0 @@ -1328,7 +1342,7 @@ msgstr "Заголовок вашего проверочного задания" #. module: project #: field:project.config.settings,time_unit:0 msgid "Working time unit" -msgstr "" +msgstr "Единица рабочего времени" #. module: project #: view:project.project:0 @@ -1344,7 +1358,7 @@ msgstr "Низкий" #. module: project #: selection:project.project,state:0 msgid "Closed" -msgstr "" +msgstr "Закрыто" #. module: project #: view:project.project:0 @@ -1366,7 +1380,7 @@ msgstr "В ожидании" #: view:project.category:0 #: field:project.task,categ_ids:0 msgid "Tags" -msgstr "" +msgstr "Теги" #. module: project #: model:ir.model,name:project.model_project_task_history @@ -1386,7 +1400,7 @@ msgstr "" #. module: project #: help:project.config.settings,group_manage_delegation_task:0 msgid "Allows you to delegate tasks to other users." -msgstr "" +msgstr "Позволяет делегировать задачи другим пользователям." #. module: project #: field:project.project,active:0 @@ -1415,7 +1429,7 @@ msgstr "" #. module: project #: view:project.config.settings:0 msgid "Helpdesk & Support" -msgstr "" +msgstr "Поддержка" #. module: project #: help:report.project.task.user,opening_days:0 @@ -1441,7 +1455,7 @@ msgstr "" #: code:addons/project/project.py:220 #, python-format msgid "Attachments" -msgstr "" +msgstr "Вложения" #. module: project #: view:project.task:0 @@ -1464,6 +1478,8 @@ msgid "" "You cannot delete a project containing tasks. You can either delete all the " "project's tasks and then delete the project or simply deactivate the project." msgstr "" +"Вы не можете удалить проект, содержащий задачи. Вы можете либо удалить все " +"задачи проекта, а затем удалить проект или просто сделать проект неактивным." #. module: project #: model:process.transition.action,name:project.process_transition_action_draftopentask0 @@ -1474,7 +1490,7 @@ msgstr "Открытые" #. module: project #: field:project.project,privacy_visibility:0 msgid "Privacy / Visibility" -msgstr "" +msgstr "Безопасность/Видимость" #. module: project #: view:project.task:0 @@ -1488,7 +1504,7 @@ msgstr "Оставшееся время" #. module: project #: model:mail.message.subtype,description:project.mt_task_stage msgid "Stage changed" -msgstr "" +msgstr "Этап изменен" #. module: project #: constraint:project.task:0 @@ -1521,7 +1537,7 @@ msgstr "Общее время" #. module: project #: model:ir.model,name:project.model_project_config_settings msgid "project.config.settings" -msgstr "" +msgstr "project.config.settings" #. module: project #: model:project.task.type,name:project.project_tt_development @@ -1586,12 +1602,12 @@ msgstr "Назначить на" #. module: project #: model:res.groups,name:project.group_time_work_estimation_tasks msgid "Time Estimation on Tasks" -msgstr "" +msgstr "Оценка времени на задачи" #. module: project #: field:project.task,total_hours:0 msgid "Total" -msgstr "" +msgstr "Всего" #. module: project #: model:process.node,note:project.process_node_taskbydelegate0 @@ -1601,7 +1617,7 @@ msgstr "Поручить ваше задание другому пользова #. module: project #: model:mail.message.subtype,description:project.mt_task_started msgid "Task started" -msgstr "" +msgstr "Задание начато" #. module: project #: help:project.task.reevaluate,remaining_hours:0 @@ -1614,6 +1630,8 @@ msgid "" "This stage is not visible, for example in status bar or kanban view, when " "there are no records in that stage to display." msgstr "" +"Эта стадия не видима, например в статус-баре или виде канбан, когда нет " +"записей на этой стадии для отображения." #. module: project #: view:project.task:0 @@ -1643,7 +1661,7 @@ msgstr "Проекты в ожидании" #. module: project #: view:project.task:0 msgid "Remaining" -msgstr "" +msgstr "Осталось" #. module: project #: field:project.task,progress:0 @@ -1672,17 +1690,17 @@ msgstr "" #. module: project #: field:project.config.settings,module_project_issue:0 msgid "Track issues and bugs" -msgstr "" +msgstr "Отслеживание проблем и ошибок" #. module: project #: field:project.config.settings,module_project_mrp:0 msgid "Generate tasks from sale orders" -msgstr "" +msgstr "Создание задач из заказов" #. module: project #: model:ir.ui.menu,name:project.menu_task_types_view msgid "Task Stages" -msgstr "" +msgstr "Этапы задач" #. module: project #: model:process.node,note:project.process_node_drafttask0 @@ -1693,7 +1711,7 @@ msgstr "Определить требования и установить зап #: field:project.project,message_ids:0 #: field:project.task,message_ids:0 msgid "Messages" -msgstr "" +msgstr "Сообщения" #. module: project #: field:project.project,color:0 @@ -1752,17 +1770,17 @@ msgstr "Дата окончания" #. module: project #: field:project.task.type,state:0 msgid "Related Status" -msgstr "" +msgstr "Связанный статус" #. module: project #: view:project.project:0 msgid "Documents" -msgstr "" +msgstr "Документы" #. module: project #: model:mail.message.subtype,description:project.mt_task_new msgid "Task created" -msgstr "" +msgstr "Задача создана" #. module: project #: view:report.project.task.user:0 @@ -1774,7 +1792,7 @@ msgstr "# дней" #: field:project.project,message_follower_ids:0 #: field:project.task,message_follower_ids:0 msgid "Followers" -msgstr "" +msgstr "Подписчики" #. module: project #: selection:project.project,state:0 @@ -1812,7 +1830,7 @@ msgstr "Проверка задания" #. module: project #: field:project.config.settings,module_project_long_term:0 msgid "Manage resources planning on gantt view" -msgstr "" +msgstr "Управление планированием ресурсов на диаграмме Ганта" #. module: project #: view:project.task:0 @@ -1871,7 +1889,7 @@ msgstr "Проекты" #. module: project #: model:res.groups,name:project.group_tasks_work_on_tasks msgid "Task's Work on Tasks" -msgstr "" +msgstr "Задачи, работающие на задачи" #. module: project #: help:project.task.delegate,name:0 @@ -1914,7 +1932,7 @@ msgstr "Декабрь" #: view:project.task.delegate:0 #: view:project.task.reevaluate:0 msgid "or" -msgstr "" +msgstr "или" #. module: project #: help:project.config.settings,module_project_mrp:0 @@ -1938,7 +1956,7 @@ msgstr "" #. module: project #: model:project.category,name:project.project_category_03 msgid "Experiment" -msgstr "" +msgstr "Эксперимент" #. module: project #: model:process.transition.action,name:project.process_transition_action_opendrafttask0 @@ -1998,7 +2016,7 @@ msgstr "" #: model:ir.actions.act_window,name:project.action_config_settings #: view:project.config.settings:0 msgid "Configure Project" -msgstr "" +msgstr "Настроить проект" #. module: project #: view:project.task.history.cumulative:0 @@ -2030,7 +2048,7 @@ msgstr "Пожалуйста, сначала удалите проект, ссы #: model:mail.message.subtype,name:project.mt_project_task_new #: model:mail.message.subtype,name:project.mt_task_new msgid "Task Created" -msgstr "" +msgstr "Задание создано" #. module: project #: view:report.project.task.user:0 @@ -2048,12 +2066,12 @@ msgstr "Проекты, в которых я менеджер" #: selection:project.task.history,kanban_state:0 #: selection:project.task.history.cumulative,kanban_state:0 msgid "Ready for next stage" -msgstr "" +msgstr "Готово к следующей стадии" #. module: project #: field:project.task.type,case_default:0 msgid "Default for New Projects" -msgstr "" +msgstr "По умолчанию для нового проекта" #. module: project #: view:project.task:0 @@ -2098,7 +2116,7 @@ msgstr "" #. module: project #: model:mail.message.subtype,description:project.mt_task_closed msgid "Task closed" -msgstr "" +msgstr "Задание закрыто" #. module: project #: selection:report.project.task.user,month:0 @@ -2130,13 +2148,13 @@ msgstr "" #. module: project #: selection:project.project,privacy_visibility:0 msgid "Followers Only" -msgstr "" +msgstr "Только для подписчиков" #. module: project #: view:board.board:0 #: field:project.project,task_count:0 msgid "Open Tasks" -msgstr "" +msgstr "Открытые задачи" #. module: project #: field:project.project,priority:0 From 36cd14400a7b12278e9ccfaddaf043b0a9022e21 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 29 May 2013 20:05:27 +0200 Subject: [PATCH 25/25] [IMP] manifest modules bzr revid: fp@openerp.com-20130529180527-x2uxuqdblkkpzeix --- addons/account_voucher/html/index.html | 3 ++- addons/mail/html/index.html | 3 ++- addons/mrp/html/index.html | 3 ++- addons/note/html/index.html | 3 ++- addons/project/html/index.html | 3 ++- addons/sale/html/index.html | 3 ++- addons/stock/html/index.html | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/addons/account_voucher/html/index.html b/addons/account_voucher/html/index.html index 581dbb4fb96..84e90f63679 100644 --- a/addons/account_voucher/html/index.html +++ b/addons/account_voucher/html/index.html @@ -137,4 +137,5 @@ material. Define recurrencies to produce recurring invoice automatically.
-
+
+
diff --git a/addons/mail/html/index.html b/addons/mail/html/index.html index be3a04ab30c..ad7f9daf1a9 100644 --- a/addons/mail/html/index.html +++ b/addons/mail/html/index.html @@ -175,4 +175,5 @@ for your own company. Follow people, share best practices, 'like' top ideas, etc
-
+
+
diff --git a/addons/mrp/html/index.html b/addons/mrp/html/index.html index 3ee973d7874..d3e7a048490 100644 --- a/addons/mrp/html/index.html +++ b/addons/mrp/html/index.html @@ -190,4 +190,5 @@ manufacturing operations.
-
+
+
diff --git a/addons/note/html/index.html b/addons/note/html/index.html index 97736520f2f..4e7db34df58 100644 --- a/addons/note/html/index.html +++ b/addons/note/html/index.html @@ -113,4 +113,5 @@ The real time collaborative writings on notes makes it the perfect tool to colla
-
+
+
diff --git a/addons/project/html/index.html b/addons/project/html/index.html index 072f279447f..c1b6c3b966f 100644 --- a/addons/project/html/index.html +++ b/addons/project/html/index.html @@ -194,4 +194,5 @@ accurate reports on your team's performance.
-
+
+
diff --git a/addons/sale/html/index.html b/addons/sale/html/index.html index e10c3abb9a0..be0d9ac0f94 100644 --- a/addons/sale/html/index.html +++ b/addons/sale/html/index.html @@ -293,4 +293,5 @@ reports that anyone can create and share.
-
+
+
diff --git a/addons/stock/html/index.html b/addons/stock/html/index.html index 476de95bfe5..21d2800e0dc 100644 --- a/addons/stock/html/index.html +++ b/addons/stock/html/index.html @@ -237,4 +237,5 @@ real-time reports that anyone can create and share.
-
+
+