+
@@ -206,7 +169,8 @@
+
@@ -598,7 +537,8 @@
+
@@ -338,8 +319,10 @@
@@ -376,7 +359,7 @@
+
+
+
+
+
+ ![]()
+
+
+
+
+
+ -
+
members
+ - Not following +
- Following +
messages last month
+
');
+ regex_res = regex_login.exec(string);
+ }
+ return string;
+ },
+
+ thread_get_avatar: function(model, field, id) {
+ return this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
+ },
+
+ do_truncate_string: function(string, max_length) {
+ if (string.length <= (max_length * 1.2)) return false;
+ else return string.slice(0, max_length);
+ },
+
+ do_clean_text: function (string) {
+ var html = $('').text(string.replace(/\s+/g, ' ')).html().replace(new RegExp('<(/)?(b|em)\\s*>', 'gi'), '<$1$2>');
+ return html;
+ },
+
+ /**
+ *
+ * var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
+ * var regex_intlink = new RegExp(/(^|\s)#(\w*[a-zA-Z_]+\w*)\.(\w+[a-zA-Z_]+\w*),(\w+)/g);
+ */
+ do_check_internal_links: function(string) {
+ /* shortcut to user: @login */
+ var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
+ var regex_res = regex_login.exec(string);
+ while (regex_res != null) {
+ var login = regex_res[2];
+ if (! ('res.users' in this.map_hash)) { this.map_hash['res.users']['name'] = []; }
+ this.map_hash['res.users']['login'].push(login);
+ regex_res = regex_login.exec(string);
+ }
+ /* internal links: #res.model,name */
+ var regex_intlink = new RegExp(/(^|\s)#(\w*[a-zA-Z_]+\w*)\.(\w+[a-zA-Z_]+\w*),(\w+)/g);
+ regex_res = regex_intlink.exec(string);
+ while (regex_res != null) {
+ var res_model = regex_res[2] + '.' + regex_res[3];
+ var res_name = regex_res[4];
+ if (! (res_model in this.map_hash)) { this.map_hash[res_model]['name'] = []; }
+ this.map_hash[res_model]['name'].push(res_name);
+ regex_res = regex_intlink.exec(string);
+ }
+ },
+
+ /** checks if tue current user is the message author */
+ _is_author: function (id) {
+ return (this.session.uid == id);
+ },
+
+ });
+
+
+ /* Add ThreadView widget to registry */
+ session.web.form.widgets.add( 'ThreadView', 'openerp.mail.RecordThread');
+// session.web.page.readonly.add( 'ThreadView', 'openerp.mail.RecordThread');
+
+ /* ThreadView widget: thread of comments */
+ mail.RecordThread = session.web.form.AbstractField.extend({
+ // QWeb template to use when rendering the object
+ template: 'RecordThread',
+
+ init: function() {
+ this._super.apply(this, arguments);
+ this.see_subscribers = true;
+ this.thread = null;
+ // datasets
+ this.ds = new session.web.DataSet(this, this.view.model);
+ this.ds_users = new session.web.DataSet(this, 'res.users');
+ },
+
+ start: function() {
+ this._super.apply(this, arguments);
+ var self = this;
+ // bind buttons
+ this.$element.find('button.oe_mail_button_followers').click(function () { self.do_toggle_followers(); }).hide();
+ this.$element.find('button.oe_mail_button_follow').click(function () { self.do_follow(); })
+ .mouseover(function () { $(this).html('Follow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
+ .mouseleave(function () { $(this).html('Not following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
+ this.$element.find('button.oe_mail_button_unfollow').click(function () { self.do_unfollow(); })
+ .mouseover(function () { $(this).html('Unfollow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
+ .mouseleave(function () { $(this).html('Following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
+ this.reinit();
+ },
+
+ destroy: function () {
+ this._super.apply(this, arguments);
+ },
+
+ reinit: function() {
+ this.see_subscribers = true;
+ this.$element.find('button.oe_mail_button_followers').html('Hide followers')
+ this.$element.find('button.oe_mail_button_follow').hide();
+ this.$element.find('button.oe_mail_button_unfollow').hide();
+ },
+
+ set_value: function() {
+ this._super.apply(this, arguments);
+ var self = this;
+ this.reinit();
+ if (! this.view.datarecord.id) { this.$element.find('ul.oe_mail_thread').hide(); return; }
+ // fetch followers
+ var fetch_sub_done = this.fetch_subscribers();
+ // create and render Thread widget
+ this.$element.find('div.oe_mail_recthread_left').empty();
+ if (this.thread) this.thread.destroy();
+ // hack: for groups and users
+ if (this.view.model == 'mail.group') thread_level = 1;
+ if (this.view.model == 'res.users') thread_level = 1;
+ else thread_level = 0;
+ this.thread = new mail.Thread(this, {'res_model': this.view.model, 'res_id': this.view.datarecord.id, 'uid': this.session.uid,
+ 'thread_level': thread_level, 'show_post_comment': true, 'limit': 15});
+ var thread_done = this.thread.appendTo(this.$element.find('div.oe_mail_recthread_left'));
+ return fetch_sub_done && thread_done;
+ },
+
+ fetch_subscribers: function () {
+ return this.ds.call('message_get_subscribers', [[this.view.datarecord.id]]).then(this.proxy('display_subscribers'));
+ },
+
+ display_subscribers: function (records) {
+ var self = this;
+ this.is_subscriber = false;
+ var sub_node = this.$element.find('div.oe_mail_recthread_followers')
+ sub_node.empty();
+ $('').html('Followers (' + records.length + ')').appendTo(sub_node);
+ _(records).each(function (record) {
+ if (record.id == self.session.uid) { self.is_subscriber = true; }
+ var mini_url = self.thread_get_avatar('res.users', 'avatar', record.id);
+ $('').html(render_res).appendTo(self.$element.find('div.oe_mail_wall_threads'));
+ var thread = new mail.Thread(self, {
+ 'res_model': model_name, 'res_id': res_id, 'uid': self.session.uid, 'records': records,
+ 'parent_id': false, 'thread_level': self.params.thread_level, 'show_hide': true}
+ );
+ self.thread_list.push(thread);
+ return thread.appendTo(self.$element.find('div.oe_mail_wall_thread:last'));
+ });
+ // update TODO
+ this.comments_structure['root_ids'] = _.union(this.comments_structure['root_ids'], this.comments_structure['new_root_ids']);
+ this.comments_structure['new_root_ids'] = [];
+ },
+
+ /**
+ * Add records to comments_structure object: see function for details
+ */
+ sort_comments: function(records) {
+ tools_sort_comments(this.comments_structure, records, false);
+ },
+
+ /**
+ * Create a domain to fetch new comments according to
+ * comments already present in sorted_comments
+ * - for each model:
+ * -- should not be child of already displayed ids
+ * @param {Object} sorted_comments (see sort_comments)
+ * @returns {Array} fetch_domain (OpenERP domain style)
+ */
+ get_fetch_domain: function () {
+ var self = this;
+ var model_to_root = {};
+ var fetch_domain = [];
+ _(this.comments_structure['model_to_root_ids']).each(function (sc_model, model_name) {
+ fetch_domain.push('|', ['model', '!=', model_name], '!', ['id', 'child_of', sc_model]);
+ });
+ return fetch_domain;
+ },
+
+ /** Display update: show more button */
+ do_update_show_more: function (new_value) {
+ if (new_value != undefined) this.display_show_more = new_value;
+ if (this.display_show_more) this.$element.find('div.oe_mail_wall_more:last').show();
+ else this.$element.find('div.oe_mail_wall_more:last').hide();
+ },
+
+ /** Action: Shows more discussions */
+ do_more: function () {
+ var domain = this.get_fetch_domain();
+ return this.fetch_comments(this.params.limit, 0, domain);
+ },
+
+ /** Action: Posts a comment */
+ do_comment: function () {
+ var comment_node = this.$element.find('textarea.oe_mail_wall_action_textarea');
+ var body_text = comment_node.val();
+ comment_node.val('');
+ var call_done = this.ds_users.call('message_append_note', [[this.session.uid], 'Tweet', body_text, false, 'comment', 'html']).then(this.proxy('init_and_fetch_comments'));
+ },
+ });
+};
+
+// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
new file mode 100644
index 00000000000..f034b04311d
--- /dev/null
+++ b/addons/mail/static/src/xml/mail.xml
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index af8baa314de..dd07cbce9b2 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -200,13 +200,8 @@ class mail_compose_message(osv.osv_memory):
body = mail.body_html if mail.subtype == 'html' else mail.body_text
- # Reply Email
- if context.get('mail.compose.message.mode') == 'reply' and mail.message_id:
- references = (mail.references or '') + " " + mail.message_id
- headers['In-Reply-To'] = mail.message_id
-
+ # Get model, and check whether it is OpenChatter enabled, aka inherit from mail.thread
if context.get('mail.compose.message.mode') == 'mass_mail':
- # Mass mailing: must render the template patterns
if context.get('active_ids') and context.get('active_model'):
active_ids = context['active_ids']
active_model = context['active_model']
@@ -214,7 +209,22 @@ class mail_compose_message(osv.osv_memory):
active_model = mail.model
active_model_pool = self.pool.get(active_model)
active_ids = active_model_pool.search(cr, uid, ast.literal_eval(mail.filter_id.domain), context=ast.literal_eval(mail.filter_id.context))
+ else:
+ active_model = mail.model
+ active_ids = [int(mail.res_id)]
+ active_model_pool = self.pool.get(active_model)
+ if hasattr(active_model_pool, '_inherit') and 'mail.thread' in active_model_pool._inherit:
+ mail_thread_enabled = True
+ else:
+ mail_thread_enabled = False
+
+ # Reply Email
+ if context.get('mail.compose.message.mode') == 'reply' and mail.message_id:
+ references = (mail.references or '') + " " + mail.message_id
+ headers['In-Reply-To'] = mail.message_id
+ if context.get('mail.compose.message.mode') == 'mass_mail':
+ # Mass mailing: must render the template patterns
for active_id in active_ids:
subject = self.render_template(cr, uid, mail.subject, active_model, active_id)
rendered_body = self.render_template(cr, uid, body, active_model, active_id)
@@ -223,21 +233,33 @@ class mail_compose_message(osv.osv_memory):
email_cc = self.render_template(cr, uid, mail.email_cc, active_model, active_id)
email_bcc = self.render_template(cr, uid, mail.email_bcc, active_model, active_id)
reply_to = self.render_template(cr, uid, mail.reply_to, active_model, active_id)
-
+
# in mass-mailing mode we only schedule the mail for sending, it will be
# processed as soon as the mail scheduler runs.
- mail_message.schedule_with_attach(cr, uid, email_from, to_email(email_to), subject, rendered_body,
- model=mail.model, email_cc=to_email(email_cc), email_bcc=to_email(email_bcc), reply_to=reply_to,
- attachments=attachment, references=references, res_id=active_id,
- subtype=mail.subtype, headers=headers, context=context)
+ if mail_thread_enabled:
+ active_model_pool.message_append(cr, uid, [active_id],
+ subject, body_text=mail.body_text, body_html=mail.body_html, subtype=mail.subtype, state='outgoing',
+ email_to=email_to, email_from=email_from, email_cc=email_cc, email_bcc=email_bcc,
+ reply_to=reply_to, references=references, attachments=attachment, headers=headers, context=context)
+ else:
+ mail_message.schedule_with_attach(cr, uid, email_from, to_email(email_to), subject, rendered_body,
+ model=mail.model, email_cc=to_email(email_cc), email_bcc=to_email(email_bcc), reply_to=reply_to,
+ attachments=attachment, references=references, res_id=active_id,
+ subtype=mail.subtype, headers=headers, context=context)
else:
# normal mode - no mass-mailing
- msg_id = mail_message.schedule_with_attach(cr, uid, mail.email_from, to_email(mail.email_to), mail.subject, body,
- model=mail.model, email_cc=to_email(mail.email_cc), email_bcc=to_email(mail.email_bcc), reply_to=mail.reply_to,
- attachments=attachment, references=references, res_id=int(mail.res_id),
- subtype=mail.subtype, headers=headers, context=context)
+ if mail_thread_enabled:
+ msg_ids = active_model_pool.message_append(cr, uid, active_ids,
+ mail.subject, body_text=mail.body_text, body_html=mail.body_html, subtype=mail.subtype, state='outgoing',
+ email_to=mail.email_to, email_from=mail.email_from, email_cc=mail.email_cc, email_bcc=mail.email_bcc,
+ reply_to=mail.reply_to, references=references, attachments=attachment, headers=headers, context=context)
+ else:
+ msg_ids = [mail_message.schedule_with_attach(cr, uid, mail.email_from, to_email(mail.email_to), mail.subject, body,
+ model=mail.model, email_cc=to_email(mail.email_cc), email_bcc=to_email(mail.email_bcc), reply_to=mail.reply_to,
+ attachments=attachment, references=references, res_id=int(mail.res_id),
+ subtype=mail.subtype, headers=headers, context=context)]
# in normal mode, we send the email immediately, as the user expects us to (delay should be sufficiently small)
- mail_message.send(cr, uid, [msg_id], context=context)
+ mail_message.send(cr, uid, msg_ids, context=context)
return {'type': 'ir.actions.act_window_close'}
diff --git a/addons/marketing/i18n/cs.po b/addons/marketing/i18n/cs.po
new file mode 100644
index 00000000000..85d7867b15c
--- /dev/null
+++ b/addons/marketing/i18n/cs.po
@@ -0,0 +1,28 @@
+# Czech translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-04-06 05:18+0000\n"
+"Last-Translator: Jiří Hajda \n"
+"Language-Team: Czech \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-07 04:55+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
+
+#. module: marketing
+#: model:res.groups,name:marketing.group_marketing_manager
+msgid "Manager"
+msgstr "Vedoucí"
+
+#. module: marketing
+#: model:res.groups,name:marketing.group_marketing_user
+msgid "User"
+msgstr "Uživatel"
diff --git a/addons/marketing/i18n/ja.po b/addons/marketing/i18n/ja.po
new file mode 100644
index 00000000000..d07123329b6
--- /dev/null
+++ b/addons/marketing/i18n/ja.po
@@ -0,0 +1,28 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-04-24 21:01+0000\n"
+"Last-Translator: Tomomi Mengelberg \n"
+"Language-Team: Japanese \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-25 04:46+0000\n"
+"X-Generator: Launchpad (build 15139)\n"
+
+#. module: marketing
+#: model:res.groups,name:marketing.group_marketing_manager
+msgid "Manager"
+msgstr "マネージャー"
+
+#. module: marketing
+#: model:res.groups,name:marketing.group_marketing_user
+msgid "User"
+msgstr "ユーザー"
diff --git a/addons/marketing/security/marketing_security.xml b/addons/marketing/security/marketing_security.xml
index d04473da8bf..2afc0ab3a8b 100644
--- a/addons/marketing/security/marketing_security.xml
+++ b/addons/marketing/security/marketing_security.xml
@@ -10,6 +10,7 @@
Manager
, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-04-24 14:22+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Finnish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-25 04:46+0000\n"
+"X-Generator: Launchpad (build 15139)\n"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Manual Mode"
+msgstr "Manuaalinen tila"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_from_id:0
+msgid "Previous Activity"
+msgstr "Edellinen toiminto"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:818
+#, python-format
+msgid "The current step for this item has no email or report to preview."
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:marketing.campaign.transition:0
+msgid "The To/From Activity of transition must be of the same Campaign "
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Time"
+msgstr "Aika"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "Custom Action"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Group By..."
+msgstr "Ryhmittely..."
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,revenue:0
+msgid ""
+"Set an expected revenue if you consider that every campaign item that has "
+"reached this point has generated a certain revenue. You can get revenue "
+"statistics in the Reporting section"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,trigger:0
+msgid "Trigger"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,count:0
+msgid "# of Actions"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Campaign Editor"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign.workitem:0
+msgid "Today"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: selection:marketing.campaign.segment,state:0
+msgid "Running"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "March"
+msgstr "maaliskuu"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,object_id:0
+msgid "Object"
+msgstr "Kohde"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Sync mode: only records created after last sync"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:email.template,body_text:marketing_campaign.email_template_2
+msgid ""
+"Hello, We are happy to announce that you now become our Silver Partner."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Set to Draft"
+msgstr "Aseta luonnokseksi"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,to_ids:0
+msgid "Next Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronization"
+msgstr "Synkronointi"
+
+#. module: marketing_campaign
+#: sql_constraint:marketing.campaign.transition:0
+msgid "The interval must be positive or zero"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:818
+#, python-format
+msgid "No preview"
+msgstr "Ei esikatselua"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,date_run:0
+msgid "Launch Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,day:0
+msgid "Day"
+msgstr "Päivä"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Outgoing Transitions"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Reset"
+msgstr "Palauta"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,object_id:0
+msgid "Choose the resource on which you want this campaign to be run"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_last_date:0
+msgid "Last Synchronization"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:214
+#, python-format
+msgid "You can not duplicate a campaign, it's not supported yet."
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Year(s)"
+msgstr "Vuosi(a)"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,sync_last_date:0
+msgid ""
+"Date on which this segment was synchronized last time (automatically or "
+"manually)"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,state:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Cancelled"
+msgstr "Peruutettu"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Automatic"
+msgstr "Automaattinen"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,mode:0
+msgid ""
+"Test - It creates and process all the activities directly (without waiting "
+"for the delay on transitions) but does not send emails or produce reports.\n"
+"Test in Realtime - It creates and processes all the activities directly but "
+"does not send emails or produce reports.\n"
+"With Manual Confirmation - the campaigns runs normally, but the user has to "
+"validate all workitem manually.\n"
+"Normal - the campaign runs normally and automatically sends all emails and "
+"reports (be very careful with this mode, you're live!)"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_run:0
+msgid "Initial start date of this segment."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,campaign_id:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign.activity,campaign_id:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,campaign_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,campaign_id:0
+msgid "Campaign"
+msgstr "Kampanja"
+
+#. module: marketing_campaign
+#: model:email.template,subject:marketing_campaign.email_template_3
+msgid "Congratulation! You become our Gold Partner."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,segment_id:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,segment_id:0
+msgid "Segment"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Cost / Revenue"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,type:0
+msgid ""
+"The type of action to execute when an item enters this activity, such as:\n"
+" - Email: send an email using a predefined email template\n"
+" - Report: print an existing Report defined on the resource item and save "
+"it into a specific directory\n"
+" - Custom Action: execute a predefined action, e.g. to modify the fields "
+"of the resource record\n"
+" "
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_next_sync:0
+msgid "Next time the synchronization job is scheduled to run automatically"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Month(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,partner_id:0
+#: model:ir.model,name:marketing_campaign.model_res_partner
+#: field:marketing.campaign.workitem,partner_id:0
+msgid "Partner"
+msgstr "Kumppani"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Transitions"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.filters,name:marketing_campaign.filter0
+msgid "Partners"
+msgstr "Kumppanit"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid "Don't delete workitems"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,state:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,state:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,state:0
+msgid "State"
+msgstr "Tila"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Marketing Reports"
+msgstr "Markkinointiraportit"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+msgid "New"
+msgstr "Uusi"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,type:0
+msgid "Type"
+msgstr "Tyyppi"
+
+#. module: marketing_campaign
+#: field:marketing.campaign,name:0
+#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign.segment,name:0
+#: field:marketing.campaign.transition,name:0
+msgid "Name"
+msgstr "Nimi"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.workitem,res_name:0
+msgid "Resource Name"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_mode:0
+msgid "Synchronization mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Run"
+msgstr "Suorita"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,from_ids:0
+msgid "Previous Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_done:0
+msgid "Date this segment was last closed or cancelled."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Marketing Campaign Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,error_msg:0
+msgid "Error Message"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_form
+#: view:marketing.campaign:0
+msgid "Campaigns"
+msgstr "Kampanjat"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_type:0
+msgid "Interval Unit"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:792
+#, python-format
+msgid "Email Preview"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_id:0
+#: selection:marketing.campaign.activity,type:0
+msgid "Report"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "July"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,variable_cost:0
+msgid ""
+"Set a variable cost if you consider that every campaign item that has "
+"reached this point has entailed a certain cost. You can get cost statistics "
+"in the Reporting section"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Hour(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_segment
+msgid "Campaign Segment"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Cancel"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid ""
+"By activating this option, workitems that aren't executed because the "
+"condition is not met are marked as cancelled instead of being deleted."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Exceptions"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:res.partner,workitem_ids:0
+msgid "Workitems"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,fixed_cost:0
+msgid "Fixed Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:email.template,subject:marketing_campaign.email_template_2
+msgid "Congratulation! You become now our Silver Partner."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Newly Modified"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_nbr:0
+msgid "Interval Value"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,revenue:0
+#: field:marketing.campaign.activity,revenue:0
+msgid "Revenue"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "September"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "December"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,partner_field_id:0
+msgid ""
+"The generated workitems will be linked to the partner related to the record. "
+"If the record is the partner itself leave this field empty. This is useful "
+"for reporting purposes, via the Campaign Analysis or Campaign Follow-up "
+"views."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,month:0
+msgid "Month"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_to_id:0
+msgid "Next Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_followup
+msgid "Campaign Follow-up"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,email_template_id:0
+msgid "The e-mail to send when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Test Mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "Only records modified after last sync (no duplicates)"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_stat
+msgid "Campaign Statistics"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,server_action_id:0
+msgid "The action to perform when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,partner_field_id:0
+msgid "Partner Field"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: model:ir.actions.act_window,name:marketing_campaign.action_campaign_analysis_all
+#: model:ir.model,name:marketing_campaign.model_campaign_analysis
+#: model:ir.ui.menu,name:marketing_campaign.menu_action_campaign_analysis_all
+msgid "Campaign Analysis"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,sync_mode:0
+msgid ""
+"Determines an additional criterion to add to the filter when selecting new "
+"records to inject in the campaign. \"No duplicates\" prevents selecting "
+"records which have already entered the campaign previously.If the campaign "
+"has a \"unique field\" set, \"no duplicates\" will also prevent selecting "
+"records which have the same value for the unique field as other records that "
+"already entered the campaign."
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test in Realtime"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test Directly"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_directory_id:0
+msgid "Directory"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Draft"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Preview"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Related Resource"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "August"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Normal"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,start:0
+msgid "This activity is launched when the campaign starts."
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,signal:0
+msgid ""
+"An activity with a signal can be called programmatically. Be careful, the "
+"workitem is always created when a signal is sent"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "June"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_email_template
+msgid "Email Templates"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Sync mode: all records"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "All records (no duplicates)"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Newly Created"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,date:0
+#: view:marketing.campaign.workitem:0
+msgid "Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "November"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+#: field:marketing.campaign.activity,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,report_id:0
+msgid "The report to generate when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:148
+#, python-format
+msgid ""
+"The campaign cannot be started: it doesn't have any starting activity. "
+"Modify campaign's activities to mark one as the starting point."
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,unique_field_id:0
+msgid "Unique Field"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "October"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,email_template_id:0
+msgid "Email Template"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "January"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,date:0
+msgid "Execution Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_workitem
+msgid "Campaign Workitem"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_activity
+msgid "Campaign Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,report_directory_id:0
+msgid "This folder is used to store the generated reports"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:136
+#: code:addons/marketing_campaign/marketing_campaign.py:148
+#: code:addons/marketing_campaign/marketing_campaign.py:158
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+#: field:marketing.campaign.activity,server_action_id:0
+msgid "Action"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:528
+#, python-format
+msgid "Automatic transition"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,start:0
+msgid "Start"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: view:res.partner:0
+msgid "History"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Process"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:530
+#: selection:marketing.campaign.transition,trigger:0
+#, python-format
+msgid "Cosmetic"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.transition,trigger:0
+msgid "How is the destination workitem triggered"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form
+msgid ""
+"A marketing campaign is an event or activity that will help you manage and "
+"reach your partners with specific messages. A campaign can have many "
+"activities that will be triggered from a specific situation. One action "
+"could be sending an email template that has previously been created in the "
+"system."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Done"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:214
+#, python-format
+msgid "Operation not supported"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:email.template,body_text:marketing_campaign.email_template_3
+msgid "Hello, We are happy to announce that you become our Gold Partner."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Close"
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:marketing.campaign.segment:0
+msgid "Model of filter must be same as resource model of Campaign "
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,condition:0
+msgid ""
+"Python expression to decide whether the activity can be executed, otherwise "
+"it will be deleted or cancelled.The expression may use the following "
+"[browsable] variables:\n"
+" - activity: the campaign activity\n"
+" - workitem: the campaign workitem\n"
+" - resource: the resource object this campaign item represents\n"
+" - transitions: list of campaign transitions outgoing from this activity\n"
+"...- re: Python regular expression module"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronize Manually"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:136
+#, python-format
+msgid "The campaign cannot be started: there are no activities in it."
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
+msgid "Campaign Transition"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "To Do"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Campaign Step"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_segment_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_segment_form
+#: view:marketing.campaign.segment:0
+msgid "Segments"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_segment_opened
+msgid "All Segments"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Incoming Transitions"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "E-mail"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Day(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,activity_ids:0
+#: view:marketing.campaign.activity:0
+msgid "Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "May"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,unique_field_id:0
+msgid ""
+"If set, this field will help segments that work in \"no duplicates\" mode to "
+"avoid selecting similar records twice. Similar records are records that have "
+"the same value for this unique field. For example by choosing the "
+"\"email_from\" field for CRM Leads you would prevent sending the same "
+"campaign to the same email address again. If not set, the \"no duplicates\" "
+"segments will only avoid selecting the same record again if it entered the "
+"campaign previously. Only easily comparable fields like textfields, "
+"integers, selections or single relationships may be used."
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:529
+#, python-format
+msgid "After %(interval_nbr)d %(interval_type)s"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:email.template,subject:marketing_campaign.email_template_1
+msgid "Welcome in OpenERP Partner Channel!"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign
+msgid "Marketing Campaign"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_done:0
+msgid "End Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "February"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,res_id:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign,object_id:0
+#: field:marketing.campaign.segment,object_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,object_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,fixed_cost:0
+msgid ""
+"Fixed cost for running this campaign. You may also specify variable cost and "
+"revenue on each campaign activity. Cost and Revenue statistics are included "
+"in Campaign Reporting."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Sync mode: only records updated after last sync"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,signal:0
+msgid "Signal"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.workitem,date:0
+msgid "If date is not set, this workitem has to be run manually"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "April"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:158
+#, python-format
+msgid "The campaign cannot be marked as done before all segments are closed."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: field:marketing.campaign,mode:0
+msgid "Mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,activity_id:0
+#: view:marketing.campaign.activity:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,activity_id:0
+msgid "Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,ir_filter_id:0
+msgid ""
+"Filter to select the matching resource records that belong to this segment. "
+"New filters can be created and saved using the advanced search on the list "
+"view of the Resource. If no filter is set, all records are selected without "
+"filtering. The synchronization mode may also add a criterion to the filter."
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_workitem
+#: model:ir.ui.menu,name:marketing_campaign.menu_action_marketing_campaign_workitem
+msgid "Campaign Followup"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_next_sync:0
+msgid "Next Synchronization"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,ir_filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "All"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "Only records created after last sync"
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,variable_cost:0
+msgid "Variable Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "With Manual Confirmation"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,total_cost:0
+#: view:marketing.campaign:0
+msgid "Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:email.template,body_text:marketing_campaign.email_template_1
+msgid "Hello, We are very happy to send Welcome message."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,year:0
+msgid "Year"
+msgstr ""
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index c7540935005..d04cde0e428 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -246,7 +246,7 @@
+
+
+
\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-12-23 16:21+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2012-04-16 16:35+0000\n"
+"Last-Translator: Maroje Delibasic \n"
"Language-Team: Serbian latin \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:50+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
#. module: mrp_repair
#: view:mrp.repair:0
@@ -102,7 +102,7 @@ msgstr "Fakturisati"
#. module: mrp_repair
#: report:repair.order:0
msgid "Printing Date"
-msgstr "Datum Štampanja"
+msgstr "Datum štampanja"
#. module: mrp_repair
#: field:mrp.repair.make_invoice,group:0
@@ -171,7 +171,7 @@ msgstr "Napomene"
#: field:mrp.repair.fee,tax_id:0
#: field:mrp.repair.line,tax_id:0
msgid "Taxes"
-msgstr "Takse"
+msgstr "Porezi"
#. module: mrp_repair
#: report:repair.order:0
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index fa0ff192f17..6af1dc702fa 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -70,7 +70,7 @@
+
@@ -118,7 +118,7 @@
-
+
@@ -157,7 +157,7 @@
-
+
editor_demo
sales_demo_us
@@ -73,7 +73,7 @@
sales_demo_us
sales_demo_be
@@ -81,7 +81,7 @@
sales_demo_be
sales_demo_in
@@ -89,7 +89,7 @@
sales_demo_in
odoo_demo
@@ -97,7 +97,7 @@
odoo_demo
diff --git a/addons/multi_company/res_company_view.xml b/addons/multi_company/res_company_view.xml
index b246a1914d7..db0be0d09f4 100644
--- a/addons/multi_company/res_company_view.xml
+++ b/addons/multi_company/res_company_view.xml
@@ -68,7 +68,6 @@
-
+
+
Manager
\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-03 13:07+0000\n"
+"PO-Revision-Date: 2012-04-06 06:51+0000\n"
"Last-Translator: Jiří Hajda \n"
"Language-Team: Czech \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:09+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-07 04:55+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
"X-Poedit-Language: Czech\n"
#. module: portal
@@ -57,6 +57,8 @@ msgid ""
"Portal managers have access to the portal definitions, and can easily "
"configure the users, access rights and menus of portal users."
msgstr ""
+"Vedoucí portálu mají přístup k definici portálu a mohou snadno nastavit "
+"uživatel, přístupová práva a nabídky uživatelů portálu."
#. module: portal
#: help:res.portal,override_menu:0
@@ -99,6 +101,7 @@ msgstr "URL, kde uživatelé portálu se mohou připojit k serveru"
#: model:res.groups,comment:portal.group_portal_officer
msgid "Portal officers can create new portal users with the portal wizard."
msgstr ""
+"Úředníci portálu mohou vytvářet uživatele portálu pomocí průvodce portálu."
#. module: portal
#: help:res.portal.wizard,message:0
@@ -144,7 +147,7 @@ msgstr "Uživatelské jméno"
#. module: portal
#: help:res.portal,group_id:0
msgid "The group corresponding to this portal"
-msgstr ""
+msgstr "Skupina odpovídající tomuto portálu"
#. module: portal
#: model:ir.model,name:portal.model_res_portal_widget
@@ -369,7 +372,7 @@ msgstr ""
#. module: portal
#: model:res.groups,name:portal.group_portal_manager
msgid "Manager"
-msgstr ""
+msgstr "Vedoucí"
#. module: portal
#: help:res.portal.wizard.user,name:0
@@ -413,4 +416,4 @@ msgstr "Průvodce sdílením"
#. module: portal
#: model:res.groups,name:portal.group_portal_officer
msgid "Officer"
-msgstr ""
+msgstr "Úředník"
diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index 6ca833fecd1..8f4ff66aef2 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -39,6 +39,9 @@ class portal(osv.osv):
help='The group corresponding to this portal'),
'url': fields.char('URL', size=64,
help="The url where portal users can connect to the server"),
+ 'home_action_id': fields.many2one('ir.actions.actions',
+ string='Home Action',
+ help="if set, replaces the standard home action (first screen after loggin) for the portal's users"),
'menu_action_id': fields.many2one('ir.actions.act_window', readonly=True,
# ISSUE: 'ondelete' constraints do not seem effective on this field...
string='Menu Action',
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index a6a780fdf16..e427bbd5b1f 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -64,6 +64,7 @@ the portal's users.
+
diff --git a/addons/portal/security/portal_security.xml b/addons/portal/security/portal_security.xml
index 4b73db5cdcc..0c0213ec56a 100644
--- a/addons/portal/security/portal_security.xml
+++ b/addons/portal/security/portal_security.xml
@@ -17,6 +17,7 @@
Portal managers have access to the portal definitions, and can easily configure the users, access rights and menus of portal users.
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 6ce26ecb98c..b3e90ab4e6e 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -57,7 +57,7 @@
@@ -67,8 +67,8 @@
+
-
+
-
+
@@ -288,10 +288,10 @@
diff --git a/addons/product/__init__.py b/addons/product/__init__.py
index 4247b49d41b..3e2fc0c8be4 100644
--- a/addons/product/__init__.py
+++ b/addons/product/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see \n"
+"PO-Revision-Date: 2012-04-24 10:28+0000\n"
+"Last-Translator: Dusan Laznik \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-02-09 06:30+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-25 04:46+0000\n"
+"X-Generator: Launchpad (build 15139)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
@@ -57,6 +57,7 @@ msgid ""
"Otherwise, this includes goods stored in any Stock Location typed as "
"'internal'."
msgstr ""
+"Predvidena količina(izračunana kot:razpoložliva količina+prihodi-odhodi)"
#. module: product
#: model:product.category,name:product.cat1
@@ -82,7 +83,7 @@ msgstr "Dan"
#. module: product
#: view:product.product:0
msgid "UoM"
-msgstr "ME"
+msgstr "EM"
#. module: product
#: model:product.template,name:product.product_product_pc2_product_template
@@ -149,7 +150,7 @@ msgstr "Sklic"
msgid ""
"The minimal quantity to trigger this rule, expressed in the supplier UoM if "
"any or in the default UoM of the product otherrwise."
-msgstr ""
+msgstr "Mininalna količina za aktiviranje tega pravila ni vpisana"
#. module: product
#: model:product.template,name:product.product_product_24_product_template
@@ -168,11 +169,13 @@ msgid ""
"Conversion from Product UoM %s to Default UoM %s is not possible as they "
"both belong to different Category!."
msgstr ""
+"Pretvorba iz EM %s izdelka v privzeto EM %s ni mogoča, saj obe pripadata "
+"različnim kategorijam!."
#. module: product
#: model:product.uom,name:product.product_uom_dozen
msgid "Dozen"
-msgstr ""
+msgstr "Ducat"
#. module: product
#: selection:product.template,cost_method:0
@@ -182,7 +185,7 @@ msgstr "Povprečna cena"
#. module: product
#: help:product.pricelist.item,name:0
msgid "Explicit rule name for this pricelist line."
-msgstr ""
+msgstr "Izrecno pravilo za to linijo cenika."
#. module: product
#: model:product.template,name:product.product_product_cpu1_product_template
@@ -202,7 +205,7 @@ msgstr "Cenik"
#. module: product
#: view:product.template:0
msgid "UOM"
-msgstr "ME"
+msgstr "EM"
#. module: product
#: model:product.uom,name:product.product_uom_unit
@@ -225,6 +228,7 @@ msgid ""
"Determines if the product can be visible in the list of product within a "
"selection from a sale order line."
msgstr ""
+"Določa, če je izdelek lahko viden na seznamu izdelkov v izboru za prodajo."
#. module: product
#: model:product.pricelist.version,name:product.ver0
@@ -254,6 +258,8 @@ msgid ""
"Create a product form for everything you buy or sell. Specify a supplier if "
"the product can be purchased."
msgstr ""
+"Kreirajte obrazec izdelkov prodaje in nabave. Določite dobavitelja, če "
+"izdelek mogoče kupiti,specificiraj dobavitelja."
#. module: product
#: view:product.uom:0
@@ -278,6 +284,9 @@ msgid ""
"supplying. 'Make to Order': When needed, purchase or produce for the "
"procurement request."
msgstr ""
+"\"S skladišča\":Če je potrebno,vzamemo iz zaloge ali počakamo novo dobavo. "
+"\"Naročilo\":Po potrebi se naroči ali proizvede nov proizvod po zahtevku "
+"nabave."
#. module: product
#: model:process.node,note:product.process_node_supplier0
@@ -319,22 +328,22 @@ msgstr "Kategorija"
#: help:product.pricelist.item,min_quantity:0
msgid ""
"The rule only applies if the partner buys/sells more than this quantity."
-msgstr ""
+msgstr "Pravilo velja ,če partner kupuje/prodaja več od te količine."
#. module: product
#: model:product.template,name:product.product_product_woodmm0_product_template
msgid "Wood 2mm"
-msgstr ""
+msgstr "Les 2mm"
#. module: product
#: field:product.price_list,qty1:0
msgid "Quantity-1"
-msgstr ""
+msgstr "Količina-1"
#. module: product
#: help:product.packaging,ul_qty:0
msgid "The number of packages by layer"
-msgstr ""
+msgstr "Število paketov"
#. module: product
#: field:product.packaging,qty:0
@@ -351,7 +360,7 @@ msgstr "Stanje"
#. module: product
#: help:product.template,categ_id:0
msgid "Select category for the current product"
-msgstr ""
+msgstr "Izbira kategorije za trenutni proizvod"
#. module: product
#: field:product.product,outgoing_qty:0
@@ -361,7 +370,7 @@ msgstr "Odhajajoča količina"
#. module: product
#: selection:product.uom,uom_type:0
msgid "Reference UoM for this category"
-msgstr ""
+msgstr "Refrenčna EM za to kategorijo"
#. module: product
#: model:product.price.type,name:product.list_price
@@ -372,7 +381,7 @@ msgstr "Priporočna cena"
#. module: product
#: field:product.price_list,qty5:0
msgid "Quantity-5"
-msgstr ""
+msgstr "Količina-5"
#. module: product
#: model:product.category,name:product.product_category_10
@@ -387,7 +396,7 @@ msgstr "Vodja izdelka"
#. module: product
#: field:product.supplierinfo,product_name:0
msgid "Supplier Product Name"
-msgstr ""
+msgstr "Dobaviteljev naziv proizvoda"
#. module: product
#: model:product.template,name:product.product_product_pc3_product_template
@@ -402,6 +411,9 @@ msgid ""
"information about your products related to procurement logistics, sales "
"price, product category, suppliers and so on."
msgstr ""
+"Proizvode lahko nabavimo/prodamo. To so lahko materijali, skladiščni "
+"artikli, potrošni material ali storitve. Forma artikla vsebuje detaljne "
+"informacije o nabavi, prodajnim cenah, kategorijah, dobaviteljih itd."
#. module: product
#: help:product.product,qty_available:0
@@ -415,12 +427,12 @@ msgid ""
"Location of the Warehouse of this Shop, or any of its children.\n"
"Otherwise, this includes goods stored in any Stock Location typed as "
"'internal'."
-msgstr ""
+msgstr "Trenutna količina izdelka."
#. module: product
#: view:product.pricelist:0
msgid "Products Price Search"
-msgstr ""
+msgstr "Iskanje po cenah proizvodov"
#. module: product
#: view:product.product:0
@@ -464,12 +476,12 @@ msgstr "Višina"
#. module: product
#: help:product.pricelist.version,date_end:0
msgid "Ending date for this pricelist version to be valid."
-msgstr ""
+msgstr "Datum do katerega velja cenik"
#. module: product
#: model:product.category,name:product.cat0
msgid "All products"
-msgstr ""
+msgstr "Vsi proizvodi"
#. module: product
#: model:ir.model,name:product.model_pricelist_partnerinfo
@@ -479,22 +491,22 @@ msgstr "pricelist.partnerinfo"
#. module: product
#: field:product.price_list,qty2:0
msgid "Quantity-2"
-msgstr ""
+msgstr "Količina-2"
#. module: product
#: field:product.price_list,qty3:0
msgid "Quantity-3"
-msgstr ""
+msgstr "Količina-3"
#. module: product
#: view:product.product:0
msgid "Codes"
-msgstr ""
+msgstr "Šifre"
#. module: product
#: field:product.price_list,qty4:0
msgid "Quantity-4"
-msgstr ""
+msgstr "Količina-4"
#. module: product
#: view:res.partner:0
@@ -504,7 +516,7 @@ msgstr "Prodaja in nabava"
#. module: product
#: model:product.uom.categ,name:product.uom_categ_wtime
msgid "Working Time"
-msgstr ""
+msgstr "Delovni čas"
#. module: product
#: model:ir.actions.act_window,help:product.product_pricelist_action2
@@ -516,17 +528,22 @@ msgid ""
"each version has several rules. Example: the customer price of a product "
"category will be based on the supplier price multiplied by 1.80."
msgstr ""
+"Cenik vsebuje pravila po katerih se izračunavajo nabavne in prodajne ciene "
+"za vse partnerje ki so dodeljeni ceniku. Ceniki imajo več verzij (2010, "
+"2011, akcija Februar 2011, itd.)in vsaka verzija ima več pravil. Primer: "
+"prodajna cena določene kategorije proizvoda mora biti enaka nabavni ceni "
+"pomnoženi z 1.80."
#. module: product
#: model:product.template,name:product.product_product_metalcleats0_product_template
msgid "Metal Cleats"
-msgstr ""
+msgstr "Kovinske objemke"
#. module: product
#: code:addons/product/product.py:175
#, python-format
msgid "Cannot change the category of existing UoM '%s'."
-msgstr ""
+msgstr "Ni dovoljeno spremeniti kategorijo obstoječe Em'% s'."
#. module: product
#: model:ir.model,name:product.model_product_uom_categ
@@ -546,7 +563,7 @@ msgstr "Izračun cene"
#. module: product
#: model:res.groups,name:product.group_uos
msgid "Product UoS View"
-msgstr ""
+msgstr "Pregled proizvoda ES(enota prodaje)"
#. module: product
#: field:product.template,purchase_ok:0
@@ -564,6 +581,8 @@ msgid ""
"1 or several supplier(s) can be linked to a product. All information stands "
"in the product form."
msgstr ""
+"Eden ali več dobaviteljev lahko povežemo s proizvodom. Vse informacije se "
+"nahajajo v formi proizvoda."
#. module: product
#: help:product.uom,category_id:0
@@ -571,36 +590,38 @@ msgid ""
"Quantity conversions may happen automatically between Units of Measure in "
"the same category, according to their respective ratios."
msgstr ""
+"Preračun količine se lahko naredi avtomatsko med EM ,ki se nahajajo v isti "
+"kategoriji glede na njihove koeficiente."
#. module: product
#: help:product.packaging,width:0
msgid "The width of the package"
-msgstr ""
+msgstr "Širina paketa"
#. module: product
#: selection:product.category,type:0
msgid "View"
-msgstr ""
+msgstr "Pogled:"
#. module: product
#: model:ir.actions.act_window,name:product.product_template_action_tree
msgid "Product Templates"
-msgstr ""
+msgstr "Podloge proizvoda"
#. module: product
#: field:product.category,parent_left:0
msgid "Left Parent"
-msgstr ""
+msgstr "Levi panel"
#. module: product
#: model:product.template,name:product.product_product_restaurantexpenses0_product_template
msgid "Restaurant Expenses"
-msgstr ""
+msgstr "Stroški restavracije"
#. module: product
#: help:product.packaging,qty:0
msgid "The total number of products you can put by pallet or box."
-msgstr ""
+msgstr "Skupno število izdelkov, po paleti/škatlji."
#. module: product
#: constraint:product.packaging:0
@@ -616,7 +637,7 @@ msgstr "Min. količina"
#. module: product
#: model:ir.model,name:product.model_product_price_type
msgid "Price Type"
-msgstr ""
+msgstr "Vrsta cene"
#. module: product
#: code:addons/product/product.py:363
@@ -659,21 +680,24 @@ msgid ""
"not overlaps with original version. You should change the dates and "
"reactivate the pricelist"
msgstr ""
+"Ko se verzija podvaja je nastavljense status postavi na n\"eaktivni\", tako "
+"da so datumi ne prekrivajo z izvirno različico. Lahko spremenite datume in "
+"reaktivirate cenik."
#. module: product
#: model:product.template,name:product.product_product_kitshelfofcm0_product_template
msgid "KIT Shelf of 100cm"
-msgstr ""
+msgstr "KIT polica 100cm"
#. module: product
#: field:product.supplierinfo,name:0
msgid "Supplier"
-msgstr ""
+msgstr "Dobavitelj"
#. module: product
#: field:product.product,qty_available:0
msgid "Quantity On Hand"
-msgstr ""
+msgstr "Razpoložljiva količina"
#. module: product
#: model:product.template,name:product.product_product_26_product_template
@@ -688,7 +712,7 @@ msgstr "Naziv cene"
#. module: product
#: model:product.template,name:product.product_product_arm_product_template
msgid "Cabinet"
-msgstr ""
+msgstr "Kabinet"
#. module: product
#: help:product.product,incoming_qty:0
@@ -702,12 +726,12 @@ msgid ""
"Location of the Warehouse of this Shop, or any of its children.\n"
"Otherwise, this includes goods arriving to any Stock Location typed as "
"'internal'."
-msgstr ""
+msgstr "Količina proizvodov, ki je bila planirana za dospetje."
#. module: product
#: model:product.template,name:product.product_product_woodentable0_product_template
msgid "Wooden Table"
-msgstr ""
+msgstr "Lesena miza"
#. module: product
#: model:product.template,name:product.product_product_cpu3_product_template
@@ -727,12 +751,12 @@ msgstr "Cenik"
#: view:product.product:0
#: view:product.template:0
msgid "Suppliers"
-msgstr ""
+msgstr "Dobavitelji"
#. module: product
#: view:product.product:0
msgid "To Purchase"
-msgstr ""
+msgstr "Za nabavo"
#. module: product
#: help:product.supplierinfo,min_qty:0
@@ -741,6 +765,8 @@ msgid ""
"Product UoM if not empty, in the default unit of measure of the product "
"otherwise."
msgstr ""
+"Minimalna nabavna količina tega dobavitelja izražena u EM dobavitelja ili u "
+"predefinirani EM proizvoda,če nabavna EM ni vpisana."
#. module: product
#: view:product.pricelist.item:0
@@ -753,6 +779,8 @@ msgid ""
"This price will be considered as a price for the supplier UoM if any or the "
"default Unit of Measure of the product otherwise"
msgstr ""
+"To bo nabavna cena u nabavni EM proizvoda ali v predefinirani EM artikla,če "
+"nabavna EM ni vpisana"
#. module: product
#: model:product.category,name:product.product_category_accessories
@@ -776,6 +804,9 @@ msgid ""
"management. For example, in food industries, you will manage a stock of ham "
"but invoice in Kg. Keep empty to use the default UOM."
msgstr ""
+"Uporabljajo podjetja, ki upravljajo dve merske enoti: izdajanje računov in "
+"vodenje zalog. Na primer, v živilski industriji, boste upravljali zalogo "
+"šunke, računa pa v kg. Pustite prazno, da uporabite privzeto EM."
#. module: product
#: view:product.pricelist.item:0
@@ -819,7 +850,7 @@ msgstr "Sklic kupca"
#. module: product
#: view:product.product:0
msgid "Miscellaneous"
-msgstr ""
+msgstr "Razno"
#. module: product
#: field:product.pricelist.type,key:0
@@ -837,6 +868,8 @@ msgid ""
"Set a product if this rule only apply to one product. Keep empty for all "
"products"
msgstr ""
+"Izberite produkt,če to pravilo velja samo za en produkt. Pustite prazno za "
+"vse ostale."
#. module: product
#: view:product.product:0
@@ -847,12 +880,12 @@ msgstr "Nabava in lokacije"
#. module: product
#: model:product.template,name:product.product_product_kitchendesignproject0_product_template
msgid "Kitchen Design Project"
-msgstr ""
+msgstr "Projekt dizajna kuhinje"
#. module: product
#: model:product.uom,name:product.uom_hour
msgid "Hour"
-msgstr ""
+msgstr "Ura"
#. module: product
#: selection:product.template,state:0
@@ -863,33 +896,33 @@ msgstr "V razvoju"
#: code:addons/product/product.py:363
#, python-format
msgid "UoM categories Mismatch!"
-msgstr ""
+msgstr "EM se ne ujemajo!"
#. module: product
#: model:product.template,name:product.product_product_shelfofcm1_product_template
msgid "Shelf of 200cm"
-msgstr ""
+msgstr "Polica 200cm"
#. module: product
#: view:product.uom:0
msgid "Ratio & Precision"
-msgstr ""
+msgstr "Razmerje & Preciznost"
#. module: product
#: model:product.uom,name:product.product_uom_gram
msgid "g"
-msgstr ""
+msgstr "g"
#. module: product
#: model:product.category,name:product.product_category_11
msgid "IT components kits"
-msgstr ""
+msgstr "IT sestavni sklopi"
#. module: product
#: selection:product.category,type:0
#: selection:product.template,state:0
msgid "Normal"
-msgstr ""
+msgstr "Običajno"
#. module: product
#: model:process.node,name:product.process_node_supplier0
@@ -919,7 +952,7 @@ msgstr "Kategorije izdelkov"
#. module: product
#: view:product.uom:0
msgid " e.g: 1 * (reference unit) = ratio * (this unit)"
-msgstr ""
+msgstr " npr: 1 * (referenčna enota) = razmerje * (trenutna enota)"
#. module: product
#: model:ir.actions.act_window,help:product.product_uom_form_action
@@ -928,6 +961,9 @@ msgid ""
"You can define a conversion rate between several Units of Measure within the "
"same category."
msgstr ""
+"Kreiranje in upravljanje merske enote, ki jih želite uporabljati v vašem "
+"sistemu. Določite lahko menjalno razmerje med več merskimi enotami v isti "
+"kategoriji."
#. module: product
#: field:product.packaging,weight:0
@@ -937,7 +973,7 @@ msgstr "Skupna masa paketa"
#. module: product
#: field:product.template,seller_info_id:0
msgid "unknown"
-msgstr ""
+msgstr "neznano"
#. module: product
#: help:product.packaging,code:0
@@ -950,6 +986,8 @@ msgid ""
"Product's cost for accounting stock valuation. It is the base price for the "
"supplier price."
msgstr ""
+"Sstroški izdelka za obračun vrednotenja zalog . To je osnovna cena za "
+"dobaviteljevo ceno."
#. module: product
#: view:product.price.type:0
@@ -981,7 +1019,7 @@ msgstr "Opis za nabavo"
#. module: product
#: constraint:product.pricelist.version:0
msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
+msgstr "Ne morete imeti 2 različic cenika , ki se prekrivata"
#. module: product
#: help:product.supplierinfo,delay:0
@@ -998,6 +1036,8 @@ msgid ""
"manage new versions of a price list. Some examples of versions: 2010, 2011, "
"Summer Promotion, etc."
msgstr ""
+"Tukaj je lahko več verzij cenika. Tukaj lahko Kreirate in upravljate novo "
+"verzijo cenika. Npr.:2011,2012,Poletna razprodaja..."
#. module: product
#: selection:product.template,type:0
@@ -1017,7 +1057,7 @@ msgstr "Zap."
#. module: product
#: view:product.price_list:0
msgid "Calculate Product Price per unit base on pricelist version."
-msgstr ""
+msgstr "Izračunaj ceno izdelka na osnovi cenika"
#. module: product
#: model:ir.model,name:product.model_product_ul
@@ -1064,21 +1104,24 @@ msgid ""
"be converted to each other. For example, in the unit of measure category "
"\"Time\", you will have the following UoM: Hours, Days."
msgstr ""
+"Kreiraj enoto mere,ki jo želiš uporabiti. Če je v kategoriji več enot,jih "
+"lahko medsebojno pretvarjaš. Npr. v kategoriji \"čas\" imamo lahko "
+"\"minuta,ura,dan..)"
#. module: product
#: selection:product.uom,uom_type:0
msgid "Bigger than the reference UoM"
-msgstr ""
+msgstr "Večja od referenčne Em."
#. module: product
#: field:product.category,parent_right:0
msgid "Right Parent"
-msgstr ""
+msgstr "Desno pravilo"
#. module: product
#: view:product.product:0
msgid "To Sell"
-msgstr ""
+msgstr "Prodati"
#. module: product
#: help:product.product,outgoing_qty:0
@@ -1092,12 +1135,12 @@ msgid ""
"Location of the Warehouse of this Shop, or any of its children.\n"
"Otherwise, this includes goods leaving from any Stock Location typed as "
"'internal'."
-msgstr ""
+msgstr "Količina proizvodov, načrtovana za opustitev."
#. module: product
#: model:product.category,name:product.product_category_services0
msgid "Marketable Services"
-msgstr ""
+msgstr "Storitve trženja"
#. module: product
#: field:product.pricelist.item,price_surcharge:0
@@ -1112,7 +1155,7 @@ msgstr "Matična plošča ASUStek A7N8X"
#. module: product
#: field:product.product,packaging:0
msgid "Logistical Units"
-msgstr ""
+msgstr "Logistične enote"
#. module: product
#: field:product.category,complete_name:0
@@ -1131,7 +1174,7 @@ msgstr "Naziv"
#. module: product
#: model:product.template,name:product.product_product_woodlintelm0_product_template
msgid "Wood Lintel 4m"
-msgstr ""
+msgstr "Lesena preklada 4m"
#. module: product
#: model:ir.actions.act_window,help:product.product_normal_action
@@ -1142,16 +1185,20 @@ msgid ""
"contains detailed information about your products related to procurement "
"logistics, sales price, product category, suppliers and so on."
msgstr ""
+"Potrebno je definirati izdelek.. Izdelki so lahko surovine,, potrošni "
+"material in storitve.Oblika proizvoda vsebuje podrobne informacije o vaših "
+"izdelkih, povezanih z logistiko naročil, prodajne cene, kategorijo izdelkov, "
+"dobaviteljev in tako naprej."
#. module: product
#: model:product.uom,name:product.product_uom_kgm
msgid "kg"
-msgstr ""
+msgstr "kg"
#. module: product
#: model:product.uom,name:product.product_uom_meter
msgid "m"
-msgstr ""
+msgstr "m"
#. module: product
#: selection:product.template,state:0
@@ -1161,7 +1208,7 @@ msgstr "Zastarelo"
#. module: product
#: model:product.uom,name:product.product_uom_km
msgid "km"
-msgstr ""
+msgstr "km"
#. module: product
#: help:product.template,cost_method:0
@@ -1170,6 +1217,9 @@ msgid ""
"at the end of the year), Average Price: the cost price is recomputed at each "
"reception of products."
msgstr ""
+"Standardna (planska) cena: cena je fiksnodoločena ,izračunava se periodično "
+"(običajno na koncu leta), Povprečna cena: cena se izračunava pri vsaki "
+"nabavi proizvoda."
#. module: product
#: help:product.category,sequence:0
@@ -1181,7 +1231,7 @@ msgstr ""
#: field:product.uom,factor:0
#: field:product.uom,factor_inv:0
msgid "Ratio"
-msgstr ""
+msgstr "Razmerje"
#. module: product
#: help:product.template,purchase_ok:0
@@ -1205,22 +1255,22 @@ msgstr "Širina"
#. module: product
#: help:product.price.type,field:0
msgid "Associated field in the product form."
-msgstr ""
+msgstr "Povezano polje s forme proizvoda"
#. module: product
#: view:product.product:0
msgid "Unit of Measure"
-msgstr ""
+msgstr "Enota mere"
#. module: product
#: field:product.template,procure_method:0
msgid "Procurement Method"
-msgstr ""
+msgstr "Metoda Naročnja"
#. module: product
#: report:product.pricelist:0
msgid "Printing Date"
-msgstr ""
+msgstr "Datum izpisa"
#. module: product
#: field:product.template,uos_id:0
@@ -1243,6 +1293,7 @@ msgstr ""
#: help:product.template,seller_id:0
msgid "Main Supplier who has highest priority in Supplier List."
msgstr ""
+"Glavni dobavitelj, ki ima največjo prednost iz seznama dobaviteljev."
#. module: product
#: model:product.category,name:product.product_category_services
@@ -1253,7 +1304,7 @@ msgstr "Storitve"
#. module: product
#: model:ir.actions.act_window,name:product.product_form_config_action
msgid "Create or Import Products"
-msgstr ""
+msgstr "Kreiraj ali uvozi proizvod."
#. module: product
#: field:product.pricelist.item,base_pricelist_id:0
@@ -1274,24 +1325,24 @@ msgstr "Proizvodi"
#. module: product
#: help:product.packaging,rows:0
msgid "The number of layers on a pallet or box"
-msgstr ""
+msgstr "Število slojev na paleti ali škatlji"
#. module: product
#: help:product.pricelist.item,base:0
msgid "The mode for computing the price for this rule."
-msgstr ""
+msgstr "Način izračuna cene za to pravilo."
#. module: product
#: view:product.packaging:0
#: view:product.product:0
msgid "Pallet Dimension"
-msgstr ""
+msgstr "Dimenzija palete"
#. module: product
#: code:addons/product/product.py:668
#, python-format
msgid " (copy)"
-msgstr ""
+msgstr " (kopija)"
#. module: product
#: field:product.template,seller_ids:0
@@ -1305,6 +1356,8 @@ msgid ""
"order and the delivery of the finished products. It's the time you promise "
"to your customers."
msgstr ""
+"To je povprečna zamuda v dneh od potrditve naročila stranke in dobavo "
+"končnih proizvodov."
#. module: product
#: view:product.product:0
@@ -1316,7 +1369,7 @@ msgstr "Druga EM"
#: code:addons/product/product.py:143
#, python-format
msgid "Error !"
-msgstr ""
+msgstr "Napaka !"
#. module: product
#: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -1324,17 +1377,17 @@ msgstr ""
#: model:ir.ui.menu,name:product.next_id_16
#: view:product.uom:0
msgid "Units of Measure"
-msgstr ""
+msgstr "Merske enote"
#. module: product
#: field:product.supplierinfo,min_qty:0
msgid "Minimal Quantity"
-msgstr ""
+msgstr "Minimalna količina"
#. module: product
#: model:product.category,name:product.product_category_pc
msgid "PC"
-msgstr ""
+msgstr "PC"
#. module: product
#: help:product.supplierinfo,product_code:0
@@ -1342,6 +1395,8 @@ msgid ""
"This supplier's product code will be used when printing a request for "
"quotation. Keep empty to use the internal one."
msgstr ""
+"Dobaviteljeva šifra artikla bo uporabljena na izpisu povpraševanja. Pustite "
+" prazno,če želite izpisati internu šifro."
#. module: product
#: selection:product.template,procure_method:0
@@ -1356,7 +1411,7 @@ msgstr "Različica cenika"
#. module: product
#: field:product.product,virtual_available:0
msgid "Quantity Available"
-msgstr ""
+msgstr "količina,ki je na voljo"
#. module: product
#: help:product.pricelist.item,sequence:0
@@ -1384,7 +1439,7 @@ msgstr "Bruto masa v kg."
#. module: product
#: model:product.template,name:product.product_product_sidepanel0_product_template
msgid "Side Panel"
-msgstr ""
+msgstr "Bočni panel"
#. module: product
#: view:product.product:0
@@ -1401,7 +1456,7 @@ msgstr "Teže"
#. module: product
#: field:product.uom,category_id:0
msgid "UoM Category"
-msgstr ""
+msgstr "Kategorija enote mere"
#. module: product
#: field:product.template,loc_rack:0
@@ -1411,7 +1466,7 @@ msgstr "Stojalo"
#. module: product
#: field:product.template,uom_po_id:0
msgid "Purchase Unit of Measure"
-msgstr ""
+msgstr "Nabavna enota mere"
#. module: product
#: field:product.template,supply_method:0
@@ -1425,11 +1480,14 @@ msgid ""
"category to get the list of all products linked to this category or to a "
"child of this category."
msgstr ""
+"Lista vseh proizvodov klasificirana po kategorijah. Lahko izberete "
+"kategorijo,če želite listo vseh proizvodov v izbrani kategoriji ali "
+"podkategoriji."
#. module: product
#: view:product.product:0
msgid "Group by..."
-msgstr ""
+msgstr "Grupiraj po..."
#. module: product
#: model:product.template,name:product.product_product_cpu_gen_product_template
@@ -1455,7 +1513,7 @@ msgid ""
"production order and, if it is a multi-level bill of material, it's only for "
"the level of this product. Different lead times will be summed for all "
"levels and purchase orders."
-msgstr ""
+msgstr "Povprečna zamuda v dnevih za proizvodnjo tega izdelka."
#. module: product
#: model:product.template,name:product.product_product_pc1_product_template
@@ -1468,11 +1526,12 @@ msgid ""
"If the active field is set to False, it will allow you to hide the pricelist "
"without removing it."
msgstr ""
+"Nastavitev cenika na neaktivno,omogoča skrivanje cenika brez brisanja."
#. module: product
#: model:product.uom,name:product.product_uom_cm
msgid "cm"
-msgstr ""
+msgstr "cm"
#. module: product
#: model:ir.model,name:product.model_product_uom
@@ -1493,12 +1552,12 @@ msgstr "Natančnost zaokroževanja"
#. module: product
#: view:product.uom:0
msgid "Unit of Measure Properties"
-msgstr ""
+msgstr "Lastnosti merske enote"
#. module: product
#: model:product.template,name:product.product_product_shelf1_product_template
msgid "Rack 200cm"
-msgstr ""
+msgstr "Polica 200cm"
#. module: product
#: selection:product.template,supply_method:0
@@ -1508,7 +1567,7 @@ msgstr "Nakup"
#. module: product
#: view:product.uom.categ:0
msgid "Units of Measure categories"
-msgstr ""
+msgstr "Kategorije enot mere"
#. module: product
#: help:product.packaging,weight_ul:0
@@ -1518,12 +1577,12 @@ msgstr "Masa prazne LE"
#. module: product
#: model:product.template,name:product.product_product_woodmm10_product_template
msgid "Wood 10mm"
-msgstr ""
+msgstr "Les 10mm"
#. module: product
#: selection:product.uom,uom_type:0
msgid "Smaller than the reference UoM"
-msgstr ""
+msgstr "Manjše,kot referenčna EM"
#. module: product
#: field:product.price.type,active:0
@@ -1542,22 +1601,22 @@ msgstr "Spremenljiva marža"
#. module: product
#: sql_constraint:product.uom:0
msgid "The conversion ratio for a unit of measure cannot be 0!"
-msgstr ""
+msgstr "Koeficient pretvorbe ne sme biti 0!"
#. module: product
#: help:product.packaging,ean:0
msgid "The EAN code of the package unit."
-msgstr ""
+msgstr "EAN koda pakiranja"
#. module: product
#: help:product.supplierinfo,product_uom:0
msgid "This comes from the product form."
-msgstr ""
+msgstr "To pride iz forme proizvoda"
#. module: product
#: field:product.packaging,weight_ul:0
msgid "Empty Package Weight"
-msgstr ""
+msgstr "Težina praznega pakiranja"
#. module: product
#: field:product.price.type,field:0
@@ -1575,22 +1634,24 @@ msgid ""
"How many times this UoM is smaller than the reference UoM in this category:\n"
"1 * (reference unit) = ratio * (this unit)"
msgstr ""
+"Kolikokrat jeta EM manjši od referenčne EM v tej kategoriji:\n"
+"1 * (referenčna enota) = razmerje * (ta enota)"
#. module: product
#: model:ir.actions.act_window,name:product.product_price_type_action
#: model:ir.ui.menu,name:product.menu_product_price_type
msgid "Price Types"
-msgstr ""
+msgstr "Tip cene"
#. module: product
#: help:product.template,uom_id:0
msgid "Default Unit of Measure used for all stock operation."
-msgstr ""
+msgstr "Privzeta EM za vse operacije zalog."
#. module: product
#: model:product.category,name:product.product_category_misc0
msgid "Misc"
-msgstr ""
+msgstr "Razno"
#. module: product
#: model:product.template,name:product.product_product_pc4_product_template
@@ -1616,17 +1677,17 @@ msgstr "Objavljen cenik"
#. module: product
#: model:product.category,name:product.product_category_marketableproduct0
msgid "Marketable Products"
-msgstr ""
+msgstr "Tržni proizvodi"
#. module: product
#: field:product.supplierinfo,product_code:0
msgid "Supplier Product Code"
-msgstr ""
+msgstr "Šifra artikla dobavitelja"
#. module: product
#: view:product.product:0
msgid "Default UOM"
-msgstr ""
+msgstr "Definirana(običajna) EM"
#. module: product
#: selection:product.ul,type:0
@@ -1636,7 +1697,7 @@ msgstr "Paleta"
#. module: product
#: field:product.packaging,ul_qty:0
msgid "Package by layer"
-msgstr ""
+msgstr "Pakiranje po slojih"
#. module: product
#: field:product.template,warranty:0
@@ -1649,6 +1710,8 @@ msgid ""
"Set a category of product if this rule only apply to products of a category "
"and his children. Keep empty for all products"
msgstr ""
+"Nastavi kategorijo izdelka samo,če se to pravilo uporablja za izdelek v "
+"kategoriji in njegovih podkategorijah."
#. module: product
#: model:ir.model,name:product.model_product_product
@@ -1678,6 +1741,8 @@ msgid ""
"Produce will generate production order or tasks, according to the product "
"type. Buy will trigger purchase orders when requested."
msgstr ""
+"Generiran bo proizvodni nalog, glede na vrsto izdelka. Nakup bo sprožil "
+"naročilo."
#. module: product
#: field:product.product,variants:0
@@ -1698,12 +1763,12 @@ msgstr "Faktor preračuna"
#. module: product
#: help:product.supplierinfo,sequence:0
msgid "Assigns the priority to the list of product supplier."
-msgstr ""
+msgstr "Dodeli prednost na seznam dobavitelja izdelkov."
#. module: product
#: field:product.template,uom_id:0
msgid "Default Unit Of Measure"
-msgstr ""
+msgstr "Privzeta EM"
#. module: product
#: model:product.template,name:product.product_product_tow1_product_template
@@ -1718,7 +1783,7 @@ msgstr "Metoda zaokroževanja"
#. module: product
#: model:product.category,name:product.product_category_assembly
msgid "Assembly Service"
-msgstr ""
+msgstr "Storitev montaže"
#. module: product
#: model:ir.actions.report.xml,name:product.report_product_label
@@ -1738,7 +1803,7 @@ msgstr "Storitev"
#. module: product
#: help:product.packaging,height:0
msgid "The height of the package"
-msgstr ""
+msgstr "Višina pakiranja"
#. module: product
#: view:product.pricelist:0
@@ -1760,28 +1825,28 @@ msgstr "Družba"
msgid ""
"Base price for computing the customer price. Sometimes called the catalog "
"price."
-msgstr ""
+msgstr "Osnova za izračun cene kupca.(Kataloška cena)"
#. module: product
#: code:addons/product/pricelist.py:376
#, python-format
msgid "Partner section of the product form"
-msgstr ""
+msgstr "Podatki o partnerju v formi izdelka"
#. module: product
#: help:product.price.type,name:0
msgid "Name of this kind of price."
-msgstr ""
+msgstr "Ime te vrste cene"
#. module: product
#: field:product.supplierinfo,product_uom:0
msgid "Supplier UoM"
-msgstr ""
+msgstr "EM dobavitelja"
#. module: product
#: help:product.pricelist.version,date_start:0
msgid "Starting date for this pricelist version to be valid."
-msgstr ""
+msgstr "Datum od katerega velja ta verzija cenika."
#. module: product
#: help:product.template,uom_po_id:0
@@ -1789,6 +1854,7 @@ msgid ""
"Default Unit of Measure used for purchase orders. It must be in the same "
"category than the default unit of measure."
msgstr ""
+"Privzeta EM za naročilo. Biti mora v isti kategoriji kot privzeta EM."
#. module: product
#: model:product.template,description:product.product_product_cpu1_product_template
@@ -1803,7 +1869,7 @@ msgstr "Dolžina"
#. module: product
#: model:product.uom.categ,name:product.uom_categ_length
msgid "Length / Distance"
-msgstr ""
+msgstr "Dolžina/Razdalja"
#. module: product
#: model:product.template,name:product.product_product_0_product_template
@@ -1819,22 +1885,22 @@ msgstr "Vrsta cenika"
#. module: product
#: model:product.category,name:product.product_category_otherproducts0
msgid "Other Products"
-msgstr ""
+msgstr "Drugi proizvodi"
#. module: product
#: field:product.product,color:0
msgid "Color Index"
-msgstr ""
+msgstr "Barvvni index"
#. module: product
#: view:product.product:0
msgid "Characteristics"
-msgstr ""
+msgstr "Karakteristike"
#. module: product
#: field:product.template,sale_ok:0
msgid "Can be Sold"
-msgstr ""
+msgstr "LAhko se proda"
#. module: product
#: field:product.template,produce_delay:0
@@ -1850,7 +1916,7 @@ msgstr "Cenik dobavitelja"
#: code:addons/product/product.py:175
#, python-format
msgid "Warning"
-msgstr ""
+msgstr "Opozorilo"
#. module: product
#: field:product.pricelist.item,base:0
@@ -1860,12 +1926,12 @@ msgstr "Zaosnovano na"
#. module: product
#: model:product.uom,name:product.product_uom_ton
msgid "t"
-msgstr ""
+msgstr "t"
#. module: product
#: model:product.category,name:product.product_category_rawmaterial0
msgid "Raw Materials"
-msgstr ""
+msgstr "Surovine"
#. module: product
#: help:product.template,product_manager:0
@@ -1875,7 +1941,7 @@ msgstr ""
#. module: product
#: field:product.pricelist,name:0
msgid "Pricelist Name"
-msgstr ""
+msgstr "Naziv cenika"
#. module: product
#: model:ir.model,name:product.model_product_pricelist_version
@@ -1892,7 +1958,7 @@ msgstr "* ( 1 + "
#. module: product
#: help:product.packaging,weight:0
msgid "The weight of a full package, pallet or box."
-msgstr ""
+msgstr "Skupna teža pakiranja palete ali škatlje"
#. module: product
#: model:product.template,name:product.product_product_hdd2_product_template
@@ -1902,12 +1968,12 @@ msgstr "Trdi disk Seagate 7200.8 120GB"
#. module: product
#: model:product.template,name:product.product_product_employee0_product_template
msgid "Employee"
-msgstr ""
+msgstr "Zaposleni"
#. module: product
#: model:product.template,name:product.product_product_shelfofcm0_product_template
msgid "Shelf of 100cm"
-msgstr ""
+msgstr "Polica 100cm"
#. module: product
#: model:ir.model,name:product.model_product_category
@@ -1918,12 +1984,12 @@ msgstr "Kategorija izdelkov"
#. module: product
#: report:product.pricelist:0
msgid "Price List Name"
-msgstr ""
+msgstr "Naziv cenika"
#. module: product
#: field:product.supplierinfo,delay:0
msgid "Delivery Lead Time"
-msgstr ""
+msgstr "Čas dostave"
#. module: product
#: help:product.uom,active:0
@@ -1931,12 +1997,13 @@ msgid ""
"By unchecking the active field you can disable a unit of measure without "
"deleting it."
msgstr ""
+"Z odznačavanjem polja \"aktiven\" lahko deaktivirate EM,ne da bi je brisali."
#. module: product
#: model:ir.actions.act_window,name:product.product_uom_categ_form_action
#: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
msgid "UoM Categories"
-msgstr ""
+msgstr "EM kategorij"
#. module: product
#: field:product.template,seller_delay:0
@@ -1953,12 +2020,12 @@ msgstr "Škatla"
msgid ""
"Create and manage your packaging dimensions and types you want to be "
"maintained in your system."
-msgstr ""
+msgstr "Ustvarite in urejajte dimenzije in vrste embalaže."
#. module: product
#: model:product.template,name:product.product_product_rearpanelarm1_product_template
msgid "Rear Panel SHE200"
-msgstr ""
+msgstr "Zadnaj stranica SHE200"
#. module: product
#: help:product.pricelist.type,key:0
@@ -1970,7 +2037,7 @@ msgstr ""
#. module: product
#: view:product.product:0
msgid "Context..."
-msgstr ""
+msgstr "Kontekst..."
#. module: product
#: model:product.template,name:product.product_product_hdd1_product_template
@@ -1980,12 +2047,12 @@ msgstr "Trdi disk Seagate 7200.8 80GB"
#. module: product
#: help:product.supplierinfo,qty:0
msgid "This is a quantity which is converted into Default Uom."
-msgstr ""
+msgstr "To je količina ,ki je pretvorjena v privzeto EM."
#. module: product
#: field:product.packaging,ul:0
msgid "Type of Package"
-msgstr ""
+msgstr "Tip pakiranja"
#. module: product
#: selection:product.ul,type:0
@@ -2010,17 +2077,17 @@ msgstr "Procesor po želji"
#. module: product
#: model:process.transition,name:product.process_transition_supplierofproduct0
msgid "Supplier of the product"
-msgstr ""
+msgstr "Dobavitelj proizvoda"
#. module: product
#: field:product.product,product_image:0
msgid "Image"
-msgstr ""
+msgstr "Slika"
#. module: product
#: field:product.uom,uom_type:0
msgid "UoM Type"
-msgstr ""
+msgstr "Tip EM"
#. module: product
#: help:product.product,active:0
@@ -2028,13 +2095,15 @@ msgid ""
"If the active field is set to False, it will allow you to hide the product "
"without removing it."
msgstr ""
+"Če je polje nastavljeno neaktivno,je dovoljeno skriti izdelek,ne da bi ga "
+"odstranili"
#. module: product
#: help:product.uom,rounding:0
msgid ""
"The computed quantity will be a multiple of this value. Use 1.0 for a UoM "
"that cannot be further split, such as a piece."
-msgstr ""
+msgstr "Izračunana količina bo večkratnik te vrednosti."
#. module: product
#: view:product.product:0
@@ -2050,7 +2119,7 @@ msgstr "Vrsta"
#. module: product
#: model:product.template,name:product.product_product_rearpanelarm0_product_template
msgid "Rear Panel SHE100"
-msgstr ""
+msgstr "Zadnja stranica SHE100"
#. module: product
#: model:product.template,name:product.product_product_23_product_template
@@ -2060,7 +2129,7 @@ msgstr "Kompleten PC s perifernimi enotami"
#. module: product
#: model:product.template,name:product.product_product_hotelexpenses0_product_template
msgid "Hotel Expenses"
-msgstr ""
+msgstr "Stroški hotela"
#. module: product
#: help:product.uom,factor_inv:0
@@ -2068,11 +2137,13 @@ msgid ""
"How many times this UoM is bigger than the reference UoM in this category:\n"
"1 * (this unit) = ratio * (reference unit)"
msgstr ""
+"Kolikokrat je ta EM večja od privzete Em v tej kategoriji.\n"
+"1*(ta enota)=razmerje*(privzeta enota)"
#. module: product
#: model:product.template,name:product.product_product_shelf0_product_template
msgid "Rack 100cm"
-msgstr ""
+msgstr "Polica 100cm"
#. module: product
#: help:product.packaging,sequence:0
@@ -2091,11 +2162,13 @@ msgid ""
"At least one pricelist has no active version !\n"
"Please create or activate one."
msgstr ""
+"Najmanj en cenik nima aktivne verzije.\n"
+"Aktiviraj ali kreiraj."
#. module: product
#: field:product.pricelist.item,price_max_margin:0
msgid "Max. Price Margin"
-msgstr ""
+msgstr "Max, prodajna marža"
#. module: product
#: help:product.supplierinfo,product_name:0
@@ -2103,6 +2176,8 @@ msgid ""
"This supplier's product name will be used when printing a request for "
"quotation. Keep empty to use the internal one."
msgstr ""
+"Dobaviteljev naziv proizvoda bo izpisan na ponudbi. Pusti prazno,če želiš "
+"interni naziv."
#. module: product
#: selection:product.template,mes_type:0
@@ -2112,7 +2187,7 @@ msgstr "Spremenljivo"
#. module: product
#: field:product.template,rental:0
msgid "Can be Rent"
-msgstr ""
+msgstr "Lahko se najame"
#. module: product
#: model:product.price.type,name:product.standard_price
@@ -2123,7 +2198,7 @@ msgstr "Lastna cena"
#. module: product
#: field:product.pricelist.item,price_min_margin:0
msgid "Min. Price Margin"
-msgstr ""
+msgstr "Min. marža prodajne cijene"
#. module: product
#: field:product.template,weight:0
@@ -2133,7 +2208,7 @@ msgstr "Bruto masa"
#. module: product
#: model:product.template,name:product.product_product_assemblysection0_product_template
msgid "Assembly Section"
-msgstr ""
+msgstr "Montažni(sestavni)del"
#. module: product
#: model:product.category,name:product.product_category_3
@@ -2156,12 +2231,12 @@ msgstr "Zaporedje"
#. module: product
#: model:product.template,name:product.product_assembly_product_template
msgid "Assembly Service Cost"
-msgstr ""
+msgstr "Strošek montaže"
#. module: product
#: view:product.price_list:0
msgid "Close"
-msgstr ""
+msgstr "Zapri"
#. module: product
#: model:ir.model,name:product.model_product_pricelist_item
@@ -2176,7 +2251,7 @@ msgstr "RAM po želji"
#. module: product
#: view:res.partner:0
msgid "Sales Properties"
-msgstr ""
+msgstr "Lastnosti prodaje"
#. module: product
#: view:product.product:0
@@ -2187,12 +2262,12 @@ msgstr "Čakalne dobe"
#. module: product
#: view:product.product:0
msgid "Both stockable and consumable products"
-msgstr ""
+msgstr "Skladiščeni in potrošni proizvodi"
#. module: product
#: model:process.node,note:product.process_node_product0
msgid "Creation of the product"
-msgstr ""
+msgstr "Kreiranje proizvoda"
#. module: product
#: field:pricelist.partnerinfo,name:0
@@ -2238,13 +2313,13 @@ msgstr "Variante izdelka"
#. module: product
#: model:product.category,name:product.product_category_shelves0
msgid "Shelves"
-msgstr ""
+msgstr "Police"
#. module: product
#: code:addons/product/pricelist.py:375
#, python-format
msgid "Other Pricelist"
-msgstr ""
+msgstr "drugi cenik"
#. module: product
#: model:ir.model,name:product.model_product_template
@@ -2263,7 +2338,7 @@ msgstr "Metoda stroškov"
#: view:product.packaging:0
#: view:product.product:0
msgid "Palletization"
-msgstr ""
+msgstr "Nalaganje na palete"
#. module: product
#: help:product.template,volume:0
@@ -2292,7 +2367,7 @@ msgstr "Različice cenikov"
#. module: product
#: model:product.template,name:product.product_product_span100_product_template
msgid "Shelf Panel"
-msgstr ""
+msgstr "Panel-polica"
#. module: product
#: help:product.pricelist.item,price_round:0
@@ -2301,6 +2376,10 @@ msgid ""
"Rounding is applied after the discount and before the surcharge.\n"
"To have prices that end in 9.99, set rounding 10, surcharge -0.01"
msgstr ""
+"Postavvi ceno,ki je včkratnik te vrednosti.\n"
+"Zaokroževanje se izvede po izračunu popusta in pred dodatkom na ceno.\n"
+"Da dobite cene,ki se končajo na 9.99,postavite zaokroževanje na 10,dodatek "
+"pa na 0.01"
#. module: product
#: field:product.template,list_price:0
@@ -2310,12 +2389,12 @@ msgstr "Prodajna cena"
#. module: product
#: constraint:product.category:0
msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "Napaka! Ne morete ustvariti rekurzivne kategorije."
#. module: product
#: field:product.category,type:0
msgid "Category Type"
-msgstr ""
+msgstr "Vrsta kategorije"
#. module: product
#: model:product.category,name:product.cat2
@@ -2328,11 +2407,13 @@ msgid ""
"Coefficient to convert UOM to UOS\n"
" uos = uom * coeff"
msgstr ""
+"Koeficent za pretvorbo EM(enota mere) v ES(enota prodaje)\n"
+"ES=EM*koef"
#. module: product
#: constraint:res.partner:0
msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Napaka! Ne morete ustvariti rekurzivne povezane člane."
#. module: product
#: field:product.pricelist.item,price_discount:0
diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml
index 51d012b8577..4d917230acc 100644
--- a/addons/product/partner_view.xml
+++ b/addons/product/partner_view.xml
@@ -9,7 +9,7 @@
+
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 3b8eeb750cf..bd763daefcb 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -3,8 +3,9 @@
-
+ parent="base.menu_base_config" sequence="0"/>
+
product.pricelist.version.form
@@ -230,8 +231,7 @@
-->
+ parent="product.menu_product_pricelist_main" sequence="2"/>-->
diff --git a/addons/product/product.py b/addons/product/product.py
index 0d5fa31ac11..70f6a0683d6 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -259,7 +259,7 @@ class product_template(osv.osv):
_description = "Product Template"
def _get_main_product_supplier(self, cr, uid, product, context=None):
- """Determines the main (best) product supplier for ``product``,
+ """Determines the main (best) product supplier for ``product``,
returning the corresponding ``supplierinfo`` record, or False
if none were found. The default strategy is to select the
supplier with the highest priority (i.e. smallest sequence).
@@ -503,6 +503,7 @@ class product_product(osv.osv):
_description = "Product"
_table = "product_product"
_inherits = {'product.template': 'product_tmpl_id'}
+ _inherit = ['mail.thread']
_order = 'default_code,name_template'
_columns = {
'qty_available': fields.function(_product_qty_available, type='float', string='Quantity On Hand'),
@@ -526,7 +527,15 @@ class product_product(osv.osv):
'color': fields.integer('Color Index'),
'product_image': fields.binary('Image'),
}
-
+
+ def create(self, cr, uid, vals, context=None):
+ obj_id = super(product_product, self).create(cr, uid, vals, context=context)
+ self.create_send_note(cr, uid, [obj_id], context=context)
+ return obj_id
+
+ def create_send_note(self, cr, uid, ids, context=None):
+ return self.message_append_note(cr, uid, ids, body=_("Product has been created."), context=context)
+
def unlink(self, cr, uid, ids, context=None):
unlink_ids = []
unlink_product_tmpl_ids = []
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index e751edc0ae2..1642d28e35f 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -1,7 +1,7 @@
-
+
product.search.form
@@ -17,16 +17,16 @@
-
+
-
+
@@ -69,64 +69,62 @@
@@ -350,7 +349,6 @@
@@ -440,7 +438,7 @@
Create and manage the units of measure you want to be used in your system. You can define a conversion rate between several Units of Measure within the same category.
-
+
@@ -494,7 +492,7 @@
Create and manage your packaging dimensions and types you want to be maintained in your system.
+ action="product_ul_form_action" groups="product.group_stock_packaging" id="menu_product_ul_form_action" parent="prod_config_main" sequence="3"/>
product.packaging.tree.view
@@ -546,13 +544,13 @@
@@ -646,26 +644,25 @@
-
+
-
+
-
+
-
+
-
- Product UoS View
-
-
Product multi-company
['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]
-
+
Product Variant
+
+ Sales Pricelists
+
+
+
+ Purchase Pricelists
+
+
+
+ Manage Multiple Units of Measure
+
+
+
+ Manage Secondary UoM
+
+
+
+ Manage Product Packaging
+
+
+
+ Manage Properties of Product
+
+
product pricelist company rule
-
-
-
- Create or Import Products
- ir.actions.act_window
- product.product
- form
- tree,form
- Create a product form for everything you buy or sell. Specify a supplier if the product can be purchased.
-
-
-
-
- 20
-
-
-
-
diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
index 91fb931b6fa..adc63de872d 100644
--- a/addons/product/wizard/product_price_view.xml
+++ b/addons/product/wizard/product_price_view.xml
@@ -31,6 +31,7 @@
name="Price List"
res_model="product.price_list"
src_model="product.product"
+ groups="product.group_sale_pricelist"
view_mode="form" target="new" view_type="form" />
diff --git a/addons/project/__init__.py b/addons/project/__init__.py
index 01bef264e02..becd17f0b78 100644
--- a/addons/project/__init__.py
+++ b/addons/project/__init__.py
@@ -24,5 +24,6 @@ import company
import report
import wizard
import res_partner
+import res_config
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 96a7dc4f28f..35b920828b2 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -52,12 +52,12 @@ Dashboard for project members that includes:
"project_data.xml",
"project_view.xml",
"process/task_process.xml",
- "project_installer.xml",
"res_partner_view.xml",
"report/project_report_view.xml",
"board_project_view.xml",
'board_project_manager_view.xml',
- 'report/project_cumulative.xml'
+ 'report/project_cumulative.xml',
+ 'res_config_view.xml',
],
'demo_xml': [
'project_demo.xml',
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index f4a855283ba..8126018d3a5 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -20,7 +20,7 @@
board.board
form
-
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
deleted file mode 100644
index 338040df5e2..00000000000
--- a/addons/project/project_installer.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
- Project Management
- 7
-
-
-
- Create your Firsts Projects
- ir.actions.act_window
- project.project
- form
- tree,form
-
-
-
-
-
-
- Review Task Stages
- ir.actions.act_window
- project.task.type
- form
- tree,form
- {'search_default_common': 1, 'default_project_default': 1}
- []
- The stages can be common to all project or specific to one project. Each task will follow the different stages in order to be closed.
-
-
-
-
-
-
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 95538513f0c..956b159a0bb 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -18,7 +18,20 @@
project.project
form
-
@@ -72,13 +70,13 @@
+
-
+
-
+
@@ -96,6 +94,10 @@
+
tree
child_ids
-
+
form
-
-
+
-
-
+
+
+
@@ -411,7 +414,8 @@
tree
-
+
+
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 87f563f8878..d1306d31b01 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -112,7 +112,7 @@
+
).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see
+
+
+
+ project settings
+ project.config.settings
+ form
+
+
+
+
+
+
+ Configure Project
+ ir.actions.act_window
+ project.config.settings
+ form
+ inline
+
+
+
+
+
+
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index f1e3a6e9b74..a1ead6aa72c 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -11,6 +11,7 @@
Manager
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 5f2267ec4b1..9dfcb8db156 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -82,7 +82,7 @@
board.board
form
-
@@ -149,11 +123,12 @@
project.issue
tree
-
+
+
+
project.issue
tree
-
+
).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see
+
+
+
+ Project Application
+ project.config.settings
+ form
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index e25d5e34e3e..ac2f2990717 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -13,8 +13,7 @@
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 9800c209dd5..7231395a2a9 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -236,7 +236,7 @@
+
-
@@ -313,7 +313,7 @@
-
@@ -353,7 +353,6 @@
parent="base.menu_project_long_term" sequence="2"/>
diff --git a/addons/project_mailgate/i18n/cs.po b/addons/project_mailgate/i18n/cs.po
new file mode 100644
index 00000000000..4f6517861e1
--- /dev/null
+++ b/addons/project_mailgate/i18n/cs.po
@@ -0,0 +1,78 @@
+# Czech translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+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-04-06 06:41+0000\n"
+"Last-Translator: Jiří Hajda \n"
+"Language-Team: Czech \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-07 04:55+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "History Information"
+msgstr "Informace historie"
+
+#. module: project_mailgate
+#: model:ir.model,name:project_mailgate.model_project_task
+msgid "Task"
+msgstr "Úkol"
+
+#. module: project_mailgate
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Chyba ! Nemůžete vytvořit rekurzivní úkoly."
+
+#. module: project_mailgate
+#: field:project.task,message_ids:0
+msgid "Messages"
+msgstr "Zprávy"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:90
+#, python-format
+msgid "Draft"
+msgstr "Koncept"
+
+#. module: project_mailgate
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "Chyba ! Datum ukončení úkolu musí být větší než počáteční datum"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:116
+#, python-format
+msgid "Cancel"
+msgstr "Zrušit"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:110
+#, python-format
+msgid "Done"
+msgstr "Dokončené"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:96
+#, python-format
+msgid "Open"
+msgstr "Otevřené"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:102
+#, python-format
+msgid "Pending"
+msgstr "Čekající"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "History"
+msgstr "Historie"
diff --git a/addons/project_mailgate/project_mailgate_view.xml b/addons/project_mailgate/project_mailgate_view.xml
index 6bf9855f98a..ea9855e9ec1 100644
--- a/addons/project_mailgate/project_mailgate_view.xml
+++ b/addons/project_mailgate/project_mailgate_view.xml
@@ -1,22 +1,22 @@
-
-
-
- task.mailgate.form
- project.task
- form
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+ task.mailgate.form
+ project.task
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml
index 127209c2e35..920f8bf588e 100644
--- a/addons/project_messages/project_messages_view.xml
+++ b/addons/project_messages/project_messages_view.xml
@@ -8,7 +8,7 @@
-
+
\n"
"Language-Team: Czech \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:35+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-07 04:55+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
"X-Poedit-Language: Czech\n"
#. module: project_mrp
#: sql_constraint:sale.order:0
msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Odkaz obědnávky musí být jedinečný na společnost!"
#. module: project_mrp
#: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -35,12 +35,12 @@ msgstr "Úloha zásobování"
#. module: project_mrp
#: model:ir.model,name:project_mrp.model_sale_order
msgid "Sales Order"
-msgstr ""
+msgstr "Prodejní objednávka"
#. module: project_mrp
#: field:procurement.order,sale_line_id:0
msgid "Sale order line"
-msgstr ""
+msgstr "Řádek prodejní objednávky"
#. module: project_mrp
#: model:process.transition,note:project_mrp.process_transition_createtask0
@@ -55,7 +55,7 @@ msgstr "pokud je typ 'služba', pak vytvoří úkol."
#. module: project_mrp
#: constraint:project.task:0
msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
+msgstr "Chyba ! Datum ukončení úkolu musí být větší než počáteční datum"
#. module: project_mrp
#: model:process.node,name:project_mrp.process_node_saleordertask0
@@ -125,7 +125,7 @@ msgstr "V případě, kdy prodáváte služby pomocí prodejního příkazu"
#. module: project_mrp
#: field:project.task,sale_line_id:0
msgid "Sale Order Line"
-msgstr ""
+msgstr "Řádek prodejní objednávky"
#~ msgid "Procurement and Project Management integration"
#~ msgstr "Integrace zásobování a projektového řízení"
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index b5ce4e8190d..32d2113727b 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -12,8 +12,7 @@
-
-
+
product.form.view.inherit
product.product
form
@@ -24,18 +23,17 @@
-
-
+
project.mrp.form.view.inherit
project.task
form
-
+
+
-
+
-
+
diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index fafaf85ac4f..4787aa2603b 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -233,7 +233,8 @@ class project_task(osv.osv):
if context is None:
context = {}
if not context.get('planning', False):
- return super(project_task,self).search(cr, user, args, offset, limit, order, context)
+ return super(project_task,self).search(cr, user, args,
+ offset=offset, limit=limit, order=order, context=context, count=count)
cr.execute(" SELECT t.id, t.name \
from project_task t \
join report_account_analytic_planning_line l on (l.id = t.planning_line_id )\
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index d12b62dbf18..5e42c750634 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -108,11 +108,11 @@
-
+
-
+
\n"
+"PO-Revision-Date: 2012-04-06 04:52+0000\n"
+"Last-Translator: Jiří Hajda \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-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-07 04:55+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
#. module: project_retro_planning
#: model:ir.model,name:project_retro_planning.model_project_project
msgid "Project"
-msgstr ""
+msgstr "Projekt"
#. module: project_retro_planning
#: constraint:project.project:0
msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Chyba! Počáteční datum projektu musí být menší než datum ukončení."
#. module: project_retro_planning
#: constraint:project.project:0
msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Chyba! Nemůžete přiřadit stupňování ke stejnému projektu!"
#~ msgid "Project Retro planning"
#~ msgstr "Projekt retro plánování"
diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml
index 924a1cbf5cc..284208ee21f 100644
--- a/addons/project_scrum/board_project_scrum_view.xml
+++ b/addons/project_scrum/board_project_scrum_view.xml
@@ -75,7 +75,7 @@
board.board
form
-
@@ -90,7 +90,7 @@
+
form
-
+
+
@@ -557,9 +556,9 @@
form
-
+
+
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 0412bdabb38..0c9d6c57f44 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -10,10 +10,10 @@
@@ -93,7 +93,6 @@ the project form.
diff --git a/addons/purchase/__init__.py b/addons/purchase/__init__.py
index 66f92a60831..c9adeac874e 100644
--- a/addons/purchase/__init__.py
+++ b/addons/purchase/__init__.py
@@ -27,6 +27,7 @@ import report
import stock
import company
import edi
+import res_config
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 5b3902cf1cd..c0fb0b8f74d 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -50,7 +50,6 @@ Dashboard for purchase management that includes:
'company_view.xml',
'purchase_data.xml',
'wizard/purchase_order_group_view.xml',
- 'wizard/purchase_installer.xml',
'wizard/purchase_line_invoice_view.xml',
'purchase_report.xml',
'purchase_view.xml',
@@ -60,6 +59,7 @@ Dashboard for purchase management that includes:
'report/purchase_report_view.xml',
'board_purchase_view.xml',
'edi/purchase_order_action_data.xml',
+ 'res_config_view.xml',
],
'test': [
'test/process/cancel_order.yml',
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 4c9e776b96b..ad4c97aad4a 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -88,7 +88,7 @@
board.board
form
-
@@ -222,7 +220,7 @@
+
+
purchase.order
tree
-
+
+
+
-
+
-
+
@@ -378,7 +377,7 @@
+
-
+
-
+
@@ -494,7 +493,6 @@
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index c978712c0a1..b26363a02f2 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -55,7 +55,7 @@
invoice_done
- write({'state':'approved'})
+ invoice_done()
function
@@ -72,7 +72,7 @@
picking_done
- write({'shipped':1,'state':'approved'})
+ picking_done()
function
subflow.delivery_done
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 0ac69172612..399db12fb01 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -81,7 +81,7 @@
+
).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see
+
+
+
+ purchase settings
+ purchase.config.settings
+ form
+
+
+
+
+
+
+ Configure Purchases
+ ir.actions.act_window
+ purchase.config.settings
+ form
+ inline
+
+
+
+
+
+ account settings
+ account.config.settings
+ form
+
+
+
+
+
+
+
+
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index 4a8ac571703..d3033a37a70 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -6,10 +6,18 @@
User
Manager
+
+
+ Analytic Accounting for Purchases
+
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 06d67eed281..f29783c67ae 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -29,7 +29,6 @@
id="act_purchase_order_2_stock_picking"
name="Receptions"
res_model="stock.picking"
- groups="base.group_extended"
src_model="purchase.order"
context="{'default_purchase_id': active_id, 'contact_display': 'partner'}" />
@@ -72,14 +71,14 @@
domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
diff --git a/addons/purchase/test/process/invoice_on_poline.yml b/addons/purchase/test/process/invoice_on_poline.yml
index c2ad07aab95..1072a28f107 100644
--- a/addons/purchase/test/process/invoice_on_poline.yml
+++ b/addons/purchase/test/process/invoice_on_poline.yml
@@ -21,7 +21,6 @@
-
I set the default invoicing control method "Based on Purchase Order Lines".
-
- !python {model: purchase.config.wizard}: |
- new_id = self.create(cr ,uid, {'default_method': 'manual'})
+ !python {model: purchase.config.settings}: |
+ new_id = self.create(cr, uid, {'default_invoice_method': 'manual'})
self.execute(cr, uid, [new_id])
-
diff --git a/addons/purchase/wizard/__init__.py b/addons/purchase/wizard/__init__.py
index dbc3fc5e31b..bfb4810dd5d 100644
--- a/addons/purchase/wizard/__init__.py
+++ b/addons/purchase/wizard/__init__.py
@@ -20,7 +20,6 @@
##############################################################################
import purchase_order_group
-import purchase_installer
import purchase_line_invoice
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/wizard/purchase_installer.py b/addons/purchase/wizard/purchase_installer.py
deleted file mode 100644
index 484cb4a39dc..00000000000
--- a/addons/purchase/wizard/purchase_installer.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see
-
-
-
- Create or Import Suppliers
- ir.actions.act_window
- res.partner
- form
- tree,form
- {'search_default_supplier': 1, 'default_supplier' : True, 'default_customer' : False}
- Create or Import Suppliers and their contacts manually from this form or you can import your existing partners by CSV spreadsheet from "Import Data" wizard
-
-
-
- Purchase Management
- 5
-
-
-
-
-
-
- Invoicing Control on Purchases
- purchase.config.wizard
- form
-
-
-
-
-
- Invoicing Control on Purchases
-
-
- This tool will help you to select the method you want to use to control supplier invoices.
-
-
- 12
-
-
-
-
-
-
-
-
-
-
-
- Set the Default Invoicing Control Method
- purchase.config.wizard
- form
- form
- new
-
-
-
- once
-
-
-
diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml
index 912325e2ca5..4cef53f51b2 100644
--- a/addons/purchase/wizard/purchase_order_group_view.xml
+++ b/addons/purchase/wizard/purchase_order_group_view.xml
@@ -34,7 +34,6 @@ Lines will only be merged if:
target="new"
multi="True"
key2="client_action_multi"
- groups="base.group_extended"
id="action_view_purchase_order_group"/>
diff --git a/addons/purchase_analytic_plans/i18n/cs.po b/addons/purchase_analytic_plans/i18n/cs.po
index 40fabb0ea94..36968f51af3 100644
--- a/addons/purchase_analytic_plans/i18n/cs.po
+++ b/addons/purchase_analytic_plans/i18n/cs.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:37+0000\n"
-"PO-Revision-Date: 2009-11-17 10:15+0000\n"
-"Last-Translator: Kuvaly [LCT] \n"
+"PO-Revision-Date: 2012-04-06 04:51+0000\n"
+"Last-Translator: Jiří Hajda \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-02-09 05:58+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-07 04:55+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
#. module: purchase_analytic_plans
#: field:purchase.order.line,analytics_id:0
@@ -24,17 +24,17 @@ msgstr "Analytická distribuce"
#. module: purchase_analytic_plans
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Odkaz obědnávky musí být jedinečný na společnost!"
#. module: purchase_analytic_plans
#: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
msgid "Purchase Order Line"
-msgstr ""
+msgstr "Řádek nákupní objednávky"
#. module: purchase_analytic_plans
#: model:ir.model,name:purchase_analytic_plans.model_purchase_order
msgid "Purchase Order"
-msgstr ""
+msgstr "Nákupní objednávka"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "Invalidní XML pro zobrazení architektury!"
diff --git a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
index 849c0260470..498ceb2bd0a 100644
--- a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
+++ b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
@@ -9,7 +9,7 @@
-
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.py b/addons/purchase_double_validation/purchase_double_validation_installer.py
index 791d1bf6dce..9bf03474e86 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.py
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.py
@@ -21,35 +21,29 @@
from osv import fields, osv
-class purchase_double_validation_installer(osv.osv_memory):
- _name = 'purchase.double.validation.installer'
- _inherit = 'res.config'
+class purchase_config_settings(osv.osv_memory):
+ _inherit = 'purchase.config.settings'
_columns = {
- 'limit_amount': fields.integer('Maximum Purchase Amount', required=True, help="Maximum amount after which validation of purchase is required."),
+ 'limit_amount': fields.integer('Double Validation Limit',required=True,
+ help="Amount after which validation of purchase is required."),
}
_defaults = {
'limit_amount': 5000,
}
- def execute(self, cr, uid, ids, context=None):
- data = self.read(cr, uid, ids, context=context)
- if not data:
- return {}
- amt = data[0]['limit_amount']
- data_pool = self.pool.get('ir.model.data')
- transition_obj = self.pool.get('workflow.transition')
- waiting = data_pool._get_id(cr, uid, 'purchase', 'trans_confirmed_router')
- waiting_id = data_pool.browse(cr, uid, waiting, context=context).res_id
- confirm = data_pool._get_id(cr, uid, 'purchase_double_validation', 'trans_waiting_confirmed')
- confirm_id = data_pool.browse(cr, uid, confirm, context=context).res_id
- transition_obj.write(cr, uid, waiting_id, {'condition': 'amount_total>=%s' % (amt)})
- transition_obj.write(cr, uid, confirm_id, {'condition': 'amount_total<%s' % (amt)})
- return {}
-
-purchase_double_validation_installer()
-
+ def get_default_limit_amount(self, cr, uid, fields, context=None):
+ ir_model_data = self.pool.get('ir.model.data')
+ transition = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_waiting_confirmed')
+ field, value = transition.condition.split('<', 1)
+ return {'limit_amount': int(value)}
+ def set_limit_amount(self, cr, uid, ids, context=None):
+ ir_model_data = self.pool.get('ir.model.data')
+ config = self.browse(cr, uid, ids[0], context)
+ waiting = ir_model_data.get_object(cr, uid, 'purchase', 'trans_confirmed_router')
+ waiting.write({'condition': 'amount_total >= %s' % config.limit_amount})
+ confirm = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_waiting_confirmed')
+ confirm.write({'condition': 'amount_total < %s' % config.limit_amount})
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index 490581e472b..582312bfd6f 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -1,51 +1,17 @@
-
-
- Configure Limit Amount for Purchase
- purchase.double.validation.installer
+
+ Purchase Application
+ purchase.config.settings
form
-
-
-
-
- Configure Limit Amount for Purchase
-
-
- Define minimum amount after which puchase is needed to be validated.
-
-
- 15
-
-
-
-
+
+
-
- Configure Limit Amount for Purchase
- ir.actions.act_window
- purchase.double.validation.installer
- form
- form
- new
-
-
-
-
- once
-
-
diff --git a/addons/purchase_double_validation/purchase_double_validation_workflow.xml b/addons/purchase_double_validation/purchase_double_validation_workflow.xml
index b4005133b60..61503564246 100644
--- a/addons/purchase_double_validation/purchase_double_validation_workflow.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_workflow.xml
@@ -3,7 +3,7 @@
- amount_untaxed >= 1000
+ amount_untaxed >= 5000
purchase_approve
@@ -11,7 +11,7 @@
amount_untaxed < 1000
+ amount_untaxed < 5000
diff --git a/addons/purchase_double_validation/test/purchase_double_validation_test.yml b/addons/purchase_double_validation/test/purchase_double_validation_test.yml
index 0d37b22abcf..b7172636386 100755
--- a/addons/purchase_double_validation/test/purchase_double_validation_test.yml
+++ b/addons/purchase_double_validation/test/purchase_double_validation_test.yml
@@ -1,10 +1,10 @@
-
I set new limit amount from Configure Limit Amount for Purchase .
-
- !record {model: purchase.double.validation.installer, id: purchase_double_validation_installer_1}:
+ !record {model: purchase.config.settings, id: purchase_double_validation_installer_1}:
limit_amount: 3000
-
- !python {model: purchase.double.validation.installer}: |
+ !python {model: purchase.config.settings}: |
self.execute(cr, uid, [ref("purchase_double_validation_installer_1")])
-
In order to test the flow, I confirmed the purchase order.
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index d6a736eea9c..c03afa7b544 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -10,7 +10,7 @@
-
@@ -54,7 +54,7 @@
@@ -146,7 +146,7 @@
+
Manager
diff --git a/addons/resource/i18n/cs.po b/addons/resource/i18n/cs.po
index 469162aa292..997d85063a0 100644
--- a/addons/resource/i18n/cs.po
+++ b/addons/resource/i18n/cs.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: 2011-09-06 06:16+0000\n"
+"PO-Revision-Date: 2012-04-06 05:18+0000\n"
"Last-Translator: Jiří Hajda \n"
"Language-Team: Czech \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-07 04:55+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
"X-Poedit-Language: Czech\n"
#. module: resource
@@ -94,6 +94,7 @@ msgstr "Zdroje"
#, python-format
msgid "Make sure the Working time has been configured with proper week days!"
msgstr ""
+"Ujistěte se, že pracovní doba byla nastavena se správnými dny v týdnu!"
#. module: resource
#: field:resource.calendar,manager:0
@@ -249,6 +250,8 @@ msgid ""
"Define working hours and time table that could be scheduled to your project "
"members"
msgstr ""
+"Určuje pracovní hodiny a časovou tabulku, která může být naplánována vašim "
+"členům projektu"
#. module: resource
#: help:resource.resource,user_id:0
@@ -263,7 +266,7 @@ msgstr "Určit plánování zdroje"
#. module: resource
#: view:resource.calendar.leaves:0
msgid "Starting Date of Leave"
-msgstr ""
+msgstr "Počáteční datum uvolnění"
#. module: resource
#: field:resource.resource,code:0
@@ -335,7 +338,7 @@ msgstr "(dovolená)"
#: code:addons/resource/resource.py:392
#, python-format
msgid "Configuration Error!"
-msgstr ""
+msgstr "Chyba nastavení!"
#. module: resource
#: selection:resource.resource,resource_type:0
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 8187df71f87..1cd4336ab6c 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -19,7 +19,7 @@
+
@@ -199,7 +199,7 @@
tree,form,calendar
board.board
form
-
+
).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see
+
+
+
+ sale settings
+ sale.config.settings
+ form
+
+
+
+
+
+
+
+
+
+ account settings
+ account.config.settings
+ form
+
+
+
+
+
+
+
+
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index d959fb558d6..5bf624967b9 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -25,7 +25,7 @@ import time
import pooler
from osv import fields, osv
from tools.translate import _
-from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, float_compare
+from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP, float_compare
import decimal_precision as dp
import netsvc
@@ -48,7 +48,9 @@ sale_shop()
class sale_order(osv.osv):
_name = "sale.order"
+ _inherit = ['ir.needaction_mixin', 'mail.thread']
_description = "Sales Order"
+
def copy(self, cr, uid, id, default=None, context=None):
if not default:
@@ -305,7 +307,7 @@ class sale_order(osv.osv):
v['pricelist_id'] = shop.pricelist_id.id
return {'value': v}
- def action_cancel_draft(self, cr, uid, ids, *args):
+ def action_cancel_draft(self, cr, uid, ids, context=None):
if not len(ids):
return False
cr.execute('select id from sale_order_line where order_id IN %s and state=%s', (tuple(ids), 'cancel'))
@@ -317,9 +319,7 @@ class sale_order(osv.osv):
# Deleting the existing instance of workflow for SO
wf_service.trg_delete(uid, 'sale.order', inv_id, cr)
wf_service.trg_create(uid, 'sale.order', inv_id, cr)
- for (id,name) in self.name_get(cr, uid, ids):
- message = _("The sales order '%s' has been set in draft state.") %(name,)
- self.log(cr, uid, id, message)
+ self.action_cancel_draft_send_note(cr, uid, ids, context=context)
return True
def onchange_pricelist_id(self, cr, uid, ids, pricelist_id, order_lines, context={}):
@@ -386,7 +386,10 @@ class sale_order(osv.osv):
vals.update({'invoice_quantity': 'order'})
if vals['order_policy'] == 'picking':
vals.update({'invoice_quantity': 'procurement'})
- return super(sale_order, self).create(cr, uid, vals, context=context)
+ order = super(sale_order, self).create(cr, uid, vals, context=context)
+ if order:
+ self.create_send_note(cr, uid, [order], context=context)
+ return order
def button_dummy(self, cr, uid, ids, context=None):
return True
@@ -549,6 +552,8 @@ class sale_order(osv.osv):
if order.order_policy == 'picking':
picking_obj.write(cr, uid, map(lambda x: x.id, order.picking_ids), {'invoice_state': 'invoiced'})
cr.execute('insert into sale_order_invoice_rel (order_id,invoice_id) values (%s,%s)', (order.id, res))
+ if res:
+ self.invoice_send_note(cr, uid, ids, res, context)
return res
def action_invoice_cancel(self, cr, uid, ids, context=None):
@@ -633,8 +638,7 @@ class sale_order(osv.osv):
wf_service.trg_validate(uid, 'account.invoice', inv, 'invoice_cancel', cr)
sale_order_line_obj.write(cr, uid, [l.id for l in sale.order_line],
{'state': 'cancel'})
- message = _("The sales order '%s' has been cancelled.") % (sale.name,)
- self.log(cr, uid, sale.id, message)
+ self.cancel_send_note(cr, uid, [sale.id], context=None)
self.write(cr, uid, ids, {'state': 'cancel'})
return True
@@ -647,8 +651,7 @@ class sale_order(osv.osv):
else:
self.write(cr, uid, [o.id], {'state': 'progress', 'date_confirm': fields.date.context_today(self, cr, uid, context=context)})
self.pool.get('sale.order.line').button_confirm(cr, uid, [x.id for x in o.order_line])
- message = _("The quotation '%s' has been converted to a sales order.") % (o.name,)
- self.log(cr, uid, o.id, message)
+ self.confirm_send_note(cr, uid, ids, context)
return True
def procurement_lines_get(self, cr, uid, ids, *args):
@@ -833,6 +836,8 @@ class sale_order(osv.osv):
wf_service = netsvc.LocalService("workflow")
if picking_id:
wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
+ self.delivery_send_note(cr, uid, [order.id], picking_id, context)
+
for proc_id in proc_ids:
wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
@@ -871,7 +876,9 @@ class sale_order(osv.osv):
towrite.append(line.id)
if towrite:
self.pool.get('sale.order.line').write(cr, uid, towrite, {'state': 'done'}, context=context)
- self.write(cr, uid, [order.id], val)
+ res = self.write(cr, uid, [order.id], val)
+ if res:
+ self.delivery_end_send_note(cr, uid, [order.id], context=context)
return True
def _log_event(self, cr, uid, ids, factor=0.7, name='Open Order'):
@@ -903,6 +910,55 @@ class sale_order(osv.osv):
if order_line.product_id and order_line.product_id.product_tmpl_id.type in ('product', 'consu'):
return True
return False
+
+ # ------------------------------------------------
+ # OpenChatter methods and notifications
+ # ------------------------------------------------
+
+ def get_needaction_user_ids(self, cr, uid, ids, context=None):
+ result = dict.fromkeys(ids, [])
+ for obj in self.browse(cr, uid, ids, context=context):
+ if (obj.state == 'manual' or obj.state == 'progress'):
+ result[obj.id] = [obj.user_id.id]
+ return result
+
+ def create_send_note(self, cr, uid, ids, context=None):
+ for obj in self.browse(cr, uid, ids, context=context):
+ self.message_subscribe(cr, uid, [obj.id], [obj.user_id.id], context=context)
+ self.message_append_note(cr, uid, [obj.id], body=_("Quotation for %s has been created.") % (obj.partner_id.name), context=context)
+
+ def confirm_send_note(self, cr, uid, ids, context=None):
+ for obj in self.browse(cr, uid, ids, context=context):
+ self.message_append_note(cr, uid, [obj.id], body=_("Quotation for %s converted to Sale Order of %s %s.") % (obj.partner_id.name, obj.amount_total, obj.pricelist_id.currency_id.symbol), context=context)
+
+ def cancel_send_note(self, cr, uid, ids, context=None):
+ for obj in self.browse(cr, uid, ids, context=context):
+ self.message_append_note(cr, uid, [obj.id], body=_("Sale Order for %s cancelled.") % (obj.partner_id.name), context=context)
+
+ def delivery_send_note(self, cr, uid, ids, picking_id, context=None):
+ for order in self.browse(cr, uid, ids, context=context):
+ for picking in (pck for pck in order.picking_ids if pck.id == picking_id):
+ # convert datetime field to a datetime, using server format, then
+ # convert it to the user TZ and re-render it with %Z to add the timezone
+ picking_datetime = fields.DT.datetime.strptime(picking.min_date, DEFAULT_SERVER_DATETIME_FORMAT)
+ picking_date_str = fields.datetime.context_timestamp(cr, uid, picking_datetime, context=context).strftime(DATETIME_FORMATS_MAP['%+'] + " (%Z)")
+ self.message_append_note(cr, uid, [order.id], body=_("Delivery Order %s scheduled for %s.") % (picking.name, picking_date_str), context=context)
+
+ def delivery_end_send_note(self, cr, uid, ids, context=None):
+ self.message_append_note(cr, uid, ids, body=_("Order delivered."), context=context)
+
+ def invoice_paid_send_note(self, cr, uid, ids, context=None):
+ self.message_append_note(cr, uid, ids, body=_("Invoice paid."), context=context)
+
+ def invoice_send_note(self, cr, uid, ids, invoice_id, context=None):
+ for order in self.browse(cr, uid, ids, context=context):
+ for invoice in (inv for inv in order.invoice_ids if inv.id == invoice_id):
+ self.message_append_note(cr, uid, [order.id], body=_("Draft Invoice of %s %s waiting for validation.") % (invoice.amount_total, invoice.currency_id.symbol), context=context)
+
+ def action_cancel_draft_send_note(self, cr, uid, ids, context=None):
+ return self.message_append_note(cr, uid, ids, body='Sale order has been set in draft.', context=context)
+
+
sale_order()
# TODO add a field price_unit_uos
@@ -1323,95 +1379,4 @@ class sale_order_line(osv.osv):
sale_order_line()
-class sale_config_picking_policy(osv.osv_memory):
- _name = 'sale.config.picking_policy'
- _inherit = 'res.config'
-
- _columns = {
- 'name': fields.char('Name', size=64),
- 'sale_orders': fields.boolean('Based on Sales Orders',),
- 'deli_orders': fields.boolean('Based on Delivery Orders'),
- 'task_work': fields.boolean('Based on Tasks\' Work'),
- 'timesheet': fields.boolean('Based on Timesheet'),
- 'order_policy': fields.selection([
- ('manual', 'Invoice Based on Sales Orders'),
- ('picking', 'Invoice Based on Deliveries'),
- ], 'Main Method Based On', required=True, help="You can generate invoices based on sales orders or based on shippings."),
- 'charge_delivery': fields.boolean('Do you charge the delivery?'),
- 'time_unit': fields.many2one('product.uom','Main Working Time Unit')
- }
- _defaults = {
- 'order_policy': 'manual',
- 'time_unit': lambda self, cr, uid, c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Hour'))], context=c) and self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Hour'))], context=c)[0] or False,
- }
-
- def onchange_order(self, cr, uid, ids, sale, deli, context=None):
- res = {}
- if sale:
- res.update({'order_policy': 'manual'})
- elif deli:
- res.update({'order_policy': 'picking'})
- return {'value':res}
-
- def execute(self, cr, uid, ids, context=None):
- ir_values_obj = self.pool.get('ir.values')
- data_obj = self.pool.get('ir.model.data')
- menu_obj = self.pool.get('ir.ui.menu')
- module_obj = self.pool.get('ir.module.module')
- module_upgrade_obj = self.pool.get('base.module.upgrade')
- module_name = []
-
- group_id = data_obj.get_object(cr, uid, 'base', 'group_sale_salesman').id
-
- wizard = self.browse(cr, uid, ids)[0]
-
- if wizard.sale_orders:
- menu_id = data_obj.get_object(cr, uid, 'sale', 'menu_invoicing_sales_order_lines').id
- menu_obj.write(cr, uid, menu_id, {'groups_id':[(4,group_id)]})
-
- if wizard.deli_orders:
- menu_id = data_obj.get_object(cr, uid, 'sale', 'menu_action_picking_list_to_invoice').id
- menu_obj.write(cr, uid, menu_id, {'groups_id':[(4,group_id)]})
-
- if wizard.task_work:
- module_name.append('project_timesheet')
- module_name.append('project_mrp')
- module_name.append('account_analytic_analysis')
-
- if wizard.timesheet:
- module_name.append('account_analytic_analysis')
-
- if wizard.charge_delivery:
- module_name.append('delivery')
-
- if len(module_name):
- module_ids = []
- need_install = False
- module_ids = []
- for module in module_name:
- data_id = module_obj.name_search(cr, uid , module, [], '=')
- module_ids.append(data_id[0][0])
-
- for module in module_obj.browse(cr, uid, module_ids):
- if module.state == 'uninstalled':
- module_obj.state_update(cr, uid, [module.id], 'to install', ['uninstalled'], context)
- need_install = True
- cr.commit()
- if need_install:
- pooler.restart_pool(cr.dbname, update_module=True)[1]
-
- if wizard.time_unit:
- prod_id = data_obj.get_object(cr, uid, 'product', 'product_consultant').id
- product_obj = self.pool.get('product.product')
- product_obj.write(cr, uid, prod_id, {'uom_id':wizard.time_unit.id, 'uom_po_id': wizard.time_unit.id})
-
- ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], wizard.order_policy)
- if wizard.task_work and wizard.time_unit:
- company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
- self.pool.get('res.company').write(cr, uid, [company_id], {
- 'project_time_mode_id': wizard.time_unit.id
- }, context=context)
-
-sale_config_picking_policy()
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index eba94b89ecb..847e2e8f463 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -2,7 +2,7 @@
+ sequence="1" groups="base.group_sale_salesman,base.group_sale_manager"/>
@@ -17,7 +17,7 @@
@@ -77,7 +77,8 @@
tree
2
-
+
+ sale.order
form
-
-
-
-
-
+
+
-
+
-
+
-
-
-
-
+
+
+
@@ -267,7 +276,7 @@
+
-
@@ -497,70 +507,8 @@
src_model="product.product"
groups="base.group_sale_salesman"/>
-
-
-
-
-
-
- Setup Your Invoicing Method
- sale.config.picking_policy
- form
-
-
-
-
-
- Setup your Invoicing Method
-
-
- This tool will help you to install the right module and configure the system according to the method you use to invoice your customers.
-
-
- 12
-
-
-
-
-
-
-
-
-
-
- Setup your Invoicing Method
- ir.actions.act_window
- sale.config.picking_policy
- form
- form
- new
-
-
-
-
- once
-
+
+
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index ae8c8bf62e3..0cb55fb0d30 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -20,7 +20,33 @@
+
+ Enable Invoicing Sale order lines
+
+
+
+ Enable Invoicing Delivery orders
+
+
+
+ Addresses in Sale Orders
+
+
+
+ Discount on lines
+
+
+
+ Analytic Accounting for Sales
+
+
+
diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index 7b9e90f6f0a..578a6fb5802 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -74,7 +74,7 @@
{'default_type': 'out', 'contact_display': 'partner_address', 'search_default_to_invoice': 1, 'search_default_done': 1}
-
+
diff --git a/addons/sale/test/manual_order_policy.yml b/addons/sale/test/manual_order_policy.yml
index d997e792696..bb197763486 100644
--- a/addons/sale/test/manual_order_policy.yml
+++ b/addons/sale/test/manual_order_policy.yml
@@ -82,8 +82,8 @@
-
I set order policy "Deliver & invoice on demand" as default policy.
-
- !record {model: sale.config.picking_policy, id: sale.config.picking_policy_0}:
- order_policy: 'manual'
+ !record {model: sale.config.settings, id: sale_configuration_0}:
+ default_order_policy: 'manual'
-
- !python {model: sale.config.picking_policy}: |
- self.execute(cr, uid, [ref("sale.config.picking_policy_0")])
+ !python {model: sale.config.settings}: |
+ self.execute(cr, uid, [ref("sale_configuration_0")], context=context)
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index b51fd9bcb93..94cae45519d 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -105,7 +105,7 @@ class sale_advance_payment_inv(osv.osv_memory):
for inv in sale.invoice_ids:
ids_inv.append(inv.id)
ids_inv.append(inv_id)
- obj_sale.write(cr, uid, sale.id, {'invoice_ids': [(6, 0, ids_inv)]})
+ obj_sale.write(cr, uid, [sale.id], {'invoice_ids': [(6, 0, ids_inv)]})
list_inv.append(inv_id)
#
# If invoice on picking: add the cost on the SO
diff --git a/addons/sale_analytic_plans/i18n/cs.po b/addons/sale_analytic_plans/i18n/cs.po
index 09bbc0497a5..de13b709c5d 100644
--- a/addons/sale_analytic_plans/i18n/cs.po
+++ b/addons/sale_analytic_plans/i18n/cs.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:37+0000\n"
-"PO-Revision-Date: 2010-08-03 06:36+0000\n"
-"Last-Translator: Konki \n"
+"PO-Revision-Date: 2012-04-06 04:50+0000\n"
+"Last-Translator: Jiří Hajda \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-02-09 06:43+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-07 04:55+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
#. module: sale_analytic_plans
#: field:sale.order.line,analytics_id:0
@@ -24,7 +24,7 @@ msgstr "Analytická distribuce"
#. module: sale_analytic_plans
#: model:ir.model,name:sale_analytic_plans.model_sale_order_line
msgid "Sales Order Line"
-msgstr ""
+msgstr "Řádek prodejní objednávky"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "Neplatný XML pro View Architecture!"
diff --git a/addons/sale_crm/i18n/cs.po b/addons/sale_crm/i18n/cs.po
index a86992afcd4..e799b92548d 100644
--- a/addons/sale_crm/i18n/cs.po
+++ b/addons/sale_crm/i18n/cs.po
@@ -7,31 +7,31 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-07-15 18:59+0000\n"
+"PO-Revision-Date: 2012-04-06 05:16+0000\n"
"Last-Translator: Jiří Hajda \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-02-09 06:14+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-07 04:55+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
"X-Poedit-Language: Czech\n"
#. module: sale_crm
#: field:sale.order,categ_id:0
msgid "Category"
-msgstr ""
+msgstr "Kategorie"
#. module: sale_crm
#: sql_constraint:sale.order:0
msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Odkaz obědnávky musí být jedinečný na společnost!"
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:112
#, python-format
msgid "Converted to Sales Quotation(%s)."
-msgstr ""
+msgstr "Převedeno na prodejní ocenění(%s)."
#. module: sale_crm
#: view:crm.make.sale:0
@@ -63,7 +63,7 @@ msgstr "_Vytvořit"
#. module: sale_crm
#: view:sale.order:0
msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Můj prodejní tým"
#. module: sale_crm
#: help:crm.make.sale,close:0
@@ -76,7 +76,7 @@ msgstr ""
#. module: sale_crm
#: view:board.board:0
msgid "My Opportunities"
-msgstr ""
+msgstr "Moje příležitosti"
#. module: sale_crm
#: view:crm.lead:0
@@ -107,7 +107,7 @@ msgstr "Užavřít příležitost"
#. module: sale_crm
#: view:board.board:0
msgid "My Planned Revenues by Stage"
-msgstr ""
+msgstr "Moje plánované výnosy podle fáze"
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:110
diff --git a/addons/sale_crm/i18n/nb.po b/addons/sale_crm/i18n/nb.po
new file mode 100644
index 00000000000..844a80bbf78
--- /dev/null
+++ b/addons/sale_crm/i18n/nb.po
@@ -0,0 +1,135 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+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-04-02 11:19+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Norwegian Bokmal \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-03 04:53+0000\n"
+"X-Generator: Launchpad (build 15052)\n"
+
+#. module: sale_crm
+#: field:sale.order,categ_id:0
+msgid "Category"
+msgstr "Kategori"
+
+#. module: sale_crm
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:112
+#, python-format
+msgid "Converted to Sales Quotation(%s)."
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Convert to Quotation"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Data Insufficient!"
+msgstr "Utilstrekkelig data!"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Customer has no addresses defined!"
+msgstr "Kunden har ikke definert en adresse!"
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_crm_make_sale
+msgid "Make sales"
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "_Create"
+msgstr "_Opprett"
+
+#. module: sale_crm
+#: view:sale.order:0
+msgid "My Sales Team(s)"
+msgstr "Mine salgsteam"
+
+#. module: sale_crm
+#: help:crm.make.sale,close:0
+msgid ""
+"Check this to close the opportunity after having created the sale order."
+msgstr ""
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "My Opportunities"
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.lead:0
+msgid "Convert to Quote"
+msgstr ""
+
+#. module: sale_crm
+#: field:crm.make.sale,shop_id:0
+msgid "Shop"
+msgstr "Butikk"
+
+#. module: sale_crm
+#: field:crm.make.sale,partner_id:0
+msgid "Customer"
+msgstr "Kunde"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:92
+#, python-format
+msgid "Opportunity: %s"
+msgstr ""
+
+#. module: sale_crm
+#: field:crm.make.sale,close:0
+msgid "Close Opportunity"
+msgstr ""
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "My Planned Revenues by Stage"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:110
+#, python-format
+msgid "Opportunity '%s' is converted to Quotation."
+msgstr ""
+
+#. module: sale_crm
+#: view:sale.order:0
+#: field:sale.order,section_id:0
+msgid "Sales Team"
+msgstr "Salgsteam"
+
+#. module: sale_crm
+#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
+msgid "Make Quotation"
+msgstr "Lag tilbud"
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_sale_order
+msgid "Sales Order"
+msgstr "Salgsordre"
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index a96892b990f..32e23a10666 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -21,8 +21,8 @@
-
@@ -34,10 +34,9 @@
-
+
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index fe79815fbee..3923336eb5b 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -105,9 +105,8 @@ class crm_make_sale(osv.osv_memory):
sale_order = sale_obj.browse(cr, uid, new_id, context=context)
case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
new_ids.append(new_id)
- message = _("Opportunity '%s' is converted to Quotation.") % (case.name)
- self.log(cr, uid, case.id, message)
- case_obj.message_append(cr, uid, [case], _("Converted to Sales Quotation(%s).") % (sale_order.name), context=context)
+ message = _("Opportunity has been converted to the quotation %s.") % (sale_order.name)
+ case.message_append_note(body=message)
if make.close:
case_obj.case_close(cr, uid, data)
diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml
index 78f98d3002f..4c4300b497f 100644
--- a/addons/sale_layout/sale_layout_view.xml
+++ b/addons/sale_layout/sale_layout_view.xml
@@ -12,14 +12,14 @@
1000
form
-
+
-
+
-
+
, 2012.
+#
+msgid ""
+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-04-20 04:29+0000\n"
+"Last-Translator: Tomomi Mengelberg \n"
+"Language-Team: Japanese \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-21 05:01+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
+
+#. module: sale_margin
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "発注参照は、会社ごとにユニークでなければなりません。"
+
+#. module: sale_margin
+#: field:sale.order.line,purchase_price:0
+msgid "Cost Price"
+msgstr "原価"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order
+msgid "Sales Order"
+msgstr "受注"
+
+#. module: sale_margin
+#: help:sale.order,margin:0
+msgid ""
+"It gives profitability by calculating the difference between the Unit Price "
+"and Cost Price."
+msgstr "価格と原価の差額を計算することにより利益性がわかります。"
+
+#. module: sale_margin
+#: field:sale.order,margin:0
+#: field:sale.order.line,margin:0
+msgid "Margin"
+msgstr "粗利益"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "受注明細"
diff --git a/addons/sale_mrp/sale_mrp_view.xml b/addons/sale_mrp/sale_mrp_view.xml
index ced19625784..d4d2c153d76 100644
--- a/addons/sale_mrp/sale_mrp_view.xml
+++ b/addons/sale_mrp/sale_mrp_view.xml
@@ -9,8 +9,8 @@
form
-
diff --git a/addons/sale_order_dates/sale_order_dates_view.xml b/addons/sale_order_dates/sale_order_dates_view.xml
index c6544d5238f..672a1cadd0e 100644
--- a/addons/sale_order_dates/sale_order_dates_view.xml
+++ b/addons/sale_order_dates/sale_order_dates_view.xml
@@ -8,15 +8,16 @@
form
-
-
-
-
+
+
+
+
-
\ No newline at end of file
+
diff --git a/addons/share/security/share_security.xml b/addons/share/security/share_security.xml
index 1e92ac44a53..29971077a2c 100644
--- a/addons/share/security/share_security.xml
+++ b/addons/share/security/share_security.xml
@@ -12,6 +12,7 @@
Members of this groups have access to the sharing wizard, which allows them to invite external users to view or edit some of their documents.
+
+
+
+
+
+
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 09fb43ca361..07004f333a8 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -165,12 +165,17 @@ class share_wizard(osv.osv_memory):
'user_type': fields.selection(lambda s, *a, **k: s._user_type_selection(*a, **k),'Sharing method', required=True,
help="Select the type of user(s) you would like to share data with."),
'new_users': fields.text("Emails"),
+ 'email_1': fields.char('New user email', size=64),
+ 'email_2': fields.char('New user email', size=64),
+ 'email_3': fields.char('New user email', size=64),
+ 'invite': fields.boolean('Invite users to OpenSocial record'),
'access_mode': fields.selection([('readonly','Can view'),('readwrite','Can edit')],'Access Mode', required=True,
help="Access rights to be granted on the shared documents."),
'result_line_ids': fields.one2many('share.wizard.result.line', 'share_wizard_id', 'Summary', readonly=True),
'share_root_url': fields.function(_share_root_url, string='Share Access URL', type='char', size=512, readonly=True,
help='Main access page for users that are granted shared access'),
'name': fields.char('Share Title', size=64, required=True, help="Title for the share (displayed to users as menu and shortcut name)"),
+ 'record_name': fields.char('Record name', size=128, help="Name of the shared record, if sharing a precise record"),
'message': fields.text("Personal Message", help="An optional personal message, to be included in the e-mail notification."),
'embed_code': fields.function(_embed_code, type='text'),
@@ -181,9 +186,10 @@ class share_wizard(osv.osv_memory):
_defaults = {
'view_type': 'page',
'user_type' : 'embedded',
+ 'invite': False,
'domain': lambda self, cr, uid, context, *a: context.get('domain', '[]'),
'action_id': lambda self, cr, uid, context, *a: context.get('action_id'),
- 'access_mode': 'readonly',
+ 'access_mode': 'readwrite',
'embed_option_title': True,
'embed_option_search': True,
}
@@ -192,8 +198,8 @@ class share_wizard(osv.osv_memory):
return bool(self.pool.get('res.users').browse(cr, uid, uid, context=context).user_email)
def go_step_1(self, cr, uid, ids, context=None):
- user_type = self.browse(cr,uid,ids,context)[0].user_type
- if user_type == 'emails' and not self.has_email(cr, uid, context=context):
+ wizard_data = self.browse(cr,uid,ids,context)[0]
+ if wizard_data.user_type == 'emails' and not self.has_email(cr, uid, context=context):
raise osv.except_osv(_('No e-mail address configured'),
_('You must configure your e-mail address in the user preferences before using the Share button.'))
model, res_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'share', 'action_share_wizard_step1')
@@ -223,12 +229,18 @@ class share_wizard(osv.osv_memory):
created_ids = []
existing_ids = []
if wizard_data.user_type == 'emails':
- for new_user in (wizard_data.new_users or '').split('\n'):
+ # get new user list from email data
+ new_users = (wizard_data.new_users or '').split('\n')
+ new_users += [wizard_data.email_1 or '', wizard_data.email_2 or '', wizard_data.email_3 or '']
+ for new_user in new_users:
# Ignore blank lines
new_user = new_user.strip()
if not new_user: continue
# Ignore the user if it already exists.
- existing = user_obj.search(cr, UID_ROOT, [('login', '=', new_user)])
+ if not wizard_data.invite:
+ existing = user_obj.search(cr, UID_ROOT, [('login', '=', new_user)])
+ else:
+ existing = user_obj.search(cr, UID_ROOT, [('user_email', '=', new_user)])
existing_ids.extend(existing)
if existing:
new_line = { 'user_id': existing[0],
@@ -243,6 +255,7 @@ class share_wizard(osv.osv_memory):
'user_email': new_user,
'groups_id': [(6,0,[group_id])],
'share': True,
+ 'message_email_pref': 'all',
'company_id': current_user.company_id.id
}, context)
new_line = { 'user_id': user_id,
@@ -489,6 +502,8 @@ class share_wizard(osv.osv_memory):
# Create required rights if allowed by current user rights and not
# already granted
for dummy, model in fields_relations:
+ # mail.message is transversal: it should not received directly the access rights
+ if model.model in ['mail.message']: continue
values = {
'name': _('Copied access for sharing'),
'group_id': group_id,
@@ -619,6 +634,8 @@ class share_wizard(osv.osv_memory):
domain = safe_eval(wizard_data.domain)
if domain:
for rel_field, model in fields_relations:
+ # mail.message is transversal: it should not received directly the access rights
+ if model.model in ['mail.message']: continue
related_domain = []
if not rel_field: continue
for element in domain:
@@ -643,7 +660,7 @@ class share_wizard(osv.osv_memory):
_('You must be a member of the Share/User group to use the share wizard'),
context=context)
if wizard_data.user_type == 'emails':
- self._assert(wizard_data.new_users,
+ self._assert((wizard_data.new_users or wizard_data.email_1 or wizard_data.email_2 or wizard_data.email_3),
_('Please indicate the emails of the persons to share with, one per line'),
context=context)
@@ -667,21 +684,21 @@ class share_wizard(osv.osv_memory):
if new_ids:
# new users need a new shortcut AND a home action
self._setup_action_and_shortcut(cr, uid, wizard_data, new_ids, make_home=True, context=context)
- return group_id
+ return group_id, new_ids, existing_ids
def go_step_2(self, cr, uid, ids, context=None):
wizard_data = self.browse(cr, uid, ids[0], context=context)
self._check_preconditions(cr, uid, wizard_data, context=context)
# Create shared group and users
- group_id = self._create_share_users_group(cr, uid, wizard_data, context=context)
+ group_id, new_ids, existing_ids = self._create_share_users_group(cr, uid, wizard_data, context=context)
current_user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
model_obj = self.pool.get('ir.model')
model_id = model_obj.search(cr, uid, [('model','=', wizard_data.action_id.res_model)])[0]
model = model_obj.browse(cr, uid, model_id, context=context)
-
+
# ACCESS RIGHTS
# We have several classes of objects that should receive different access rights:
# Let:
@@ -731,68 +748,141 @@ class share_wizard(osv.osv_memory):
# refresh wizard_data
wizard_data = self.browse(cr, uid, ids[0], context=context)
+
+ # EMAILS AND NOTIFICATIONS
+ # A. Not invite: as before
+ # -> send emails to destination users
+ # B. Invite (OpenSocial)
+ # -> subscribe all users (existing and new) to the record
+ # -> send a notification with a summary to the current record
+ # -> send a notification to all users; users allowing to receive
+ # emails in preferences will receive it
+ # new users by default receive all notifications by email
+
+ # A.
+ if not wizard_data.invite:
+ self.send_emails(cr, uid, wizard_data, context=context)
+ # B.
+ else:
+ # Invite (OpenSocial): automatically subscribe users to the record
+ res_id = 0
+ for cond in safe_eval(main_domain):
+ if cond[0] == 'id':
+ res_id = cond[2]
+ # Record id not found: issue
+ if res_id <= 0:
+ raise osv.except_osv(_('Record id not found'), _('The share engine has not been able to fetch a record_id for your invitation.'))
+ self.pool.get(model.model).message_subscribe(cr, uid, [res_id], new_ids + existing_ids, context=context)
+ self.send_invite_email(cr, uid, wizard_data, context=context)
+ self.send_invite_note(cr, uid, model.model, res_id, wizard_data, context=context)
+
+ # CLOSE
+ # A. Not invite: as before
+ # B. Invite: skip summary screen, get back to the record
+
+ # A.
+ if not wizard_data.invite:
+ dummy, step2_form_view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'share', 'share_step2_form')
+ return {
+ 'name': _('Shared access created!'),
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'share.wizard',
+ 'view_id': False,
+ 'res_id': ids[0],
+ 'views': [(step2_form_view_id, 'form'), (False, 'tree'), (False, 'calendar'), (False, 'graph')],
+ 'type': 'ir.actions.act_window',
+ 'target': 'new'
+ }
+ # B.
+ else:
+ return {
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': model.model,
+ 'view_id': False,
+ 'res_id': res_id,
+ 'views': [(False, 'form'), (False, 'tree'), (False, 'calendar'), (False, 'graph')],
+ 'type': 'ir.actions.act_window',
+ }
+
- # send the confirmation emails:
- self.send_emails(cr, uid, wizard_data, context=context)
-
- dummy, step2_form_view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'share', 'share_step2_form')
- return {
- 'name': _('Shared access created!'),
- 'view_type': 'form',
- 'view_mode': 'form',
- 'res_model': 'share.wizard',
- 'view_id': False,
- 'res_id': ids[0],
- 'views': [(step2_form_view_id, 'form'), (False, 'tree'), (False, 'calendar'), (False, 'graph')],
- 'type': 'ir.actions.act_window',
- 'target': 'new'
- }
-
+ def send_invite_note(self, cr, uid, model_name, res_id, wizard_data, context=None):
+ subject = _('Invitation')
+ body = 'has been shared with'
+ tmp_idx = 0
+ for result_line in wizard_data.result_line_ids:
+ body += ' @%s' % (result_line.user_id.login)
+ if tmp_idx < len(wizard_data.result_line_ids)-2:
+ body += ','
+ elif tmp_idx == len(wizard_data.result_line_ids)-2:
+ body += ' and'
+ body += '.'
+ return self.pool.get(model_name).message_append_note(cr, uid, [res_id], _('System Notification'), body, context=context)
+
+ def send_invite_email(self, cr, uid, wizard_data, context=None):
+ message_obj = self.pool.get('mail.message')
+ notification_obj = self.pool.get('mail.notification')
+ user = self.pool.get('res.users').browse(cr, UID_ROOT, uid)
+ if not user.user_email:
+ raise osv.except_osv(_('Email required'), _('The current user must have an email address configured in User Preferences to be able to send outgoing emails.'))
+
+ # TODO: also send an HTML version of this mail
+ for result_line in wizard_data.result_line_ids:
+ email_to = result_line.user_id.user_email
+ if not email_to:
+ continue
+ subject = _('Invitation to collaborate about %s') % (wizard_data.record_name)
+ body = _("Hello,\n\n")
+ body += _("I have shared %s (%s) with you!\n\n") % (wizard_data.record_name, wizard_data.name)
+ if wizard_data.message:
+ body += "%s\n\n" % (wizard_data.message)
+ if result_line.newly_created:
+ body += _("The documents are not attached, you can view them online directly on my OpenERP server at:\n %s\n\n") % (result_line.share_url)
+ body += _("These are your credentials to access this protected area:\n")
+ body += "%s: %s" % (_("Username"), result_line.user_id.login) + "\n"
+ body += "%s: %s" % (_("Password"), result_line.password) + "\n"
+ body += "%s: %s" % (_("Database"), cr.dbname) + "\n"
+ body += _("The documents have been automatically added to your subscriptions.\n\n")
+ body += '%s\n\n' % ((user.signature or ''))
+ body += "--\n"
+ body += _("OpenERP is a powerful and user-friendly suite of Business Applications (CRM, Sales, HR, etc.)\n"
+ "It is open source and can be found on http://www.openerp.com.")
+ msg_id = message_obj.schedule_with_attach(cr, uid, user.user_email, [email_to], subject, body, model='', context=context)
+ notification_obj.create(cr, uid, {'user_id': result_line.user_id.id, 'message_id': msg_id}, context=context)
+
def send_emails(self, cr, uid, wizard_data, context=None):
self._logger.info('Sending share notifications by email...')
mail_message = self.pool.get('mail.message')
user = self.pool.get('res.users').browse(cr, UID_ROOT, uid)
-
+ if not user.user_email:
+ raise osv.except_osv(_('Email required'), _('The current user must have an email address configured in User Preferences to be able to send outgoing emails.'))
+
# TODO: also send an HTML version of this mail
msg_ids = []
for result_line in wizard_data.result_line_ids:
email_to = result_line.user_id.user_email
if not email_to:
continue
- if not user.user_email:
- raise osv.except_osv(_('Email required'), _('The current user must have an email address configured in User Preferences to be able to send outgoing emails.'))
subject = wizard_data.name
- body = _("Hello,")
- body += "\n\n"
- body += _("I've shared %s with you!") % wizard_data.name
- body += "\n\n"
- body += _("The documents are not attached, you can view them online directly on my OpenERP server at:")
- body += "\n " + result_line.share_url
- body += "\n\n"
+ body = _("Hello,\n\n")
+ body += _("I've shared %s with you!\n\n") % wizard_data.name
+ body += _("The documents are not attached, you can view them online directly on my OpenERP server at:\n %s\n\n") % (result_line.share_url)
if wizard_data.message:
- body += wizard_data.message
- body += "\n\n"
+ body += '%s\n\n' % (wizard_data.message)
if result_line.newly_created:
body += _("These are your credentials to access this protected area:\n")
- body += "%s: %s" % (_("Username"), result_line.user_id.login) + "\n"
- body += "%s: %s" % (_("Password"), result_line.password) + "\n"
- body += "%s: %s" % (_("Database"), cr.dbname) + "\n"
+ body += "%s: %s\n" % (_("Username"), result_line.user_id.login)
+ body += "%s: %s\n" % (_("Password"), result_line.password)
+ body += "%s: %s\n" % (_("Database"), cr.dbname)
else:
body += _("The documents have been automatically added to your current OpenERP documents.\n")
body += _("You may use your current login (%s) and password to view them.\n") % result_line.user_id.login
- body += "\n\n"
- body += (user.signature or '')
- body += "\n\n"
+ body += "\n\n%s\n\n" % ( (user.signature or '') )
body += "--\n"
body += _("OpenERP is a powerful and user-friendly suite of Business Applications (CRM, Sales, HR, etc.)\n"
"It is open source and can be found on http://www.openerp.com.")
- msg_ids.append(mail_message.schedule_with_attach(cr, uid,
- user.user_email,
- [email_to],
- subject,
- body,
- model='share.wizard',
- context=context))
+ msg_ids.append(mail_message.schedule_with_attach(cr, uid, user.user_email, [email_to], subject, body, model='share.wizard', context=context))
# force direct delivery, as users expect instant notification
mail_message.send(cr, uid, msg_ids, context=context)
self._logger.info('%d share notification(s) sent.', len(msg_ids))
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 29bd5e59f01..77d9213f315 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -30,16 +30,23 @@
@@ -131,31 +131,31 @@
-
-
+
form
@@ -345,10 +345,10 @@
This is the list of all the production lots (serial numbers) you recorded. When you select a lot, you can get the upstream or downstream traceability of the products contained in lot. By default, the list is filtred on the serial numbers that are available in your warehouse but you can uncheck the 'Available' button to get all the lots you produced, received or delivered to customers.
#
@@ -424,10 +424,10 @@
-
+
{'search_default_in_location':1}
Define your locations to reflect your warehouse structure and organization. OpenERP is able to manage physical locations (warehouses, shelves, bin, etc), partner locations (customers, suppliers) and virtual locations which are the counterpart of the stock operations like the manufacturing orders consumptions, inventories, etc. Every stock operation in OpenERP moves the products from one location to another one. For instance, if you receive products from a supplier, OpenERP will move products from the Supplier location to the Stock location. Each report can be performed on physical, partner or virtual locations.
-
+
stock.location.tree
@@ -650,7 +651,8 @@
Create and manage your warehouses and assign them a location from here
-
+
stock.picking.calendar
@@ -672,12 +674,12 @@
@@ -695,13 +697,13 @@
@@ -710,29 +712,28 @@
@@ -768,19 +769,19 @@
-
-
+
@@ -805,11 +806,11 @@
-
-
+
@@ -831,13 +832,13 @@
@@ -846,7 +847,7 @@
@@ -867,9 +868,9 @@
@@ -901,27 +902,27 @@
@@ -957,19 +958,19 @@
-
-
+
@@ -988,24 +989,25 @@
-
+
-
-
+
+
@@ -1081,12 +1083,12 @@
@@ -1119,27 +1121,26 @@
@@ -1174,19 +1175,19 @@
-
-
+
@@ -1206,20 +1207,21 @@
-
+
-
-
+
+
stock.move.tree
@@ -1360,25 +1362,25 @@
-
-
+
@@ -1485,7 +1487,7 @@
+
-
-
+
@@ -1668,7 +1670,7 @@
+
+
tree_but_open
@@ -1872,8 +1873,8 @@
-
-
+
+
diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py
index 9d3de5692f0..162aea77f86 100644
--- a/addons/stock/wizard/stock_change_product_qty.py
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@ -26,6 +26,7 @@ import tools
class stock_change_product_qty(osv.osv_memory):
_name = "stock.change.product.qty"
+ _inherit = ['mail.thread']
_description = "Change Product Quantity"
_columns = {
'product_id' : fields.many2one('product.product', 'Product'),
@@ -98,9 +99,24 @@ class stock_change_product_qty(osv.osv_memory):
inventry_obj.action_confirm(cr, uid, [inventory_id], context=context)
inventry_obj.action_done(cr, uid, [inventory_id], context=context)
-
+ self.change_product_qty_send_note(cr, uid, [data.id], context)
return {}
+ def change_product_qty_send_note (self, cr, uid, ids, context=None):
+ prod_obj = self.pool.get('product.product')
+ location_obj = self.pool.get('stock.location')
+ prod_temp_obj = self.pool.get('product.template')
+ uom_obj = self.pool.get('product.uom')
+
+ for data in self.browse(cr, uid, ids, context=context):
+ for location in location_obj.browse(cr, uid, [data.location_id.id], context=context):
+ location_name = location.name
+ for prod in prod_obj.browse(cr, uid, [data.product_id.id], context=context):
+ for prod_temp in prod_temp_obj.browse(cr, uid, [prod.product_tmpl_id.id], context=context):
+ for uom in uom_obj.browse(cr, uid, [prod_temp.uom_id.id], context=context):
+ message = _("Quantity has been changed to %s %s for %s location.") % (data.new_quantity,uom.name,location_name)
+ prod_obj.message_append_note(cr, uid, [prod.id], body=message, context=context)
+
stock_change_product_qty()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
index b2b9ab69287..12b20f0d1aa 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -44,7 +44,7 @@
\n"
+"PO-Revision-Date: 2012-04-06 04:48+0000\n"
+"Last-Translator: Jiří Hajda \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-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-07 04:55+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
#. module: stock_invoice_directly
#: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
msgid "Partial Picking Processing Wizard"
-msgstr ""
+msgstr "Průvodce zpracování částečného navádění"
#~ msgid "Invoice Picking Directly"
#~ msgstr "Přímé vybírání faktur"
diff --git a/addons/stock_invoice_directly/i18n/mk.po b/addons/stock_invoice_directly/i18n/mk.po
new file mode 100644
index 00000000000..5d760a40d16
--- /dev/null
+++ b/addons/stock_invoice_directly/i18n/mk.po
@@ -0,0 +1,23 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+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-04-23 11:28+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Macedonian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-24 04:53+0000\n"
+"X-Generator: Launchpad (build 15135)\n"
+
+#. module: stock_invoice_directly
+#: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
+msgid "Partial Picking Processing Wizard"
+msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/ru.po b/addons/stock_invoice_directly/i18n/ru.po
index 7a03c6bc958..3bd0d77507a 100644
--- a/addons/stock_invoice_directly/i18n/ru.po
+++ b/addons/stock_invoice_directly/i18n/ru.po
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-03-20 08:47+0000\n"
-"Last-Translator: Chertykov Denis \n"
+"PO-Revision-Date: 2012-04-18 08:08+0000\n"
+"Last-Translator: Ivan Baz \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-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
#. module: stock_invoice_directly
#: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
msgid "Partial Picking Processing Wizard"
-msgstr ""
+msgstr "Запуск мастера частичного комплектования"
#~ msgid "Invoice Picking Directly"
#~ msgstr "Напрямую выставляемый счет"
diff --git a/addons/stock_location/i18n/mk.po b/addons/stock_location/i18n/mk.po
new file mode 100644
index 00000000000..94998a29229
--- /dev/null
+++ b/addons/stock_location/i18n/mk.po
@@ -0,0 +1,397 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+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-04-23 11:28+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Macedonian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-24 04:53+0000\n"
+"X-Generator: Launchpad (build 15135)\n"
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Sending Goods"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pulled Paths"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Move"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_location_path
+msgid "Pushed Flows"
+msgstr ""
+
+#. module: stock_location
+#: selection:stock.location.path,auto:0
+msgid "Automatic No Step Added"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Parameters"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,location_src_id:0
+#: field:stock.location.path,location_from_id:0
+msgid "Source Location"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,cancel_cascade:0
+msgid "Allow you to cancel moves related to the product pull flow"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_product_pulled_flow
+#: field:product.product,flow_pull_ids:0
+msgid "Pulled Flows"
+msgstr ""
+
+#. module: stock_location
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,location_src_id:0
+msgid "Location used by Destination Location to supply"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Internal"
+msgstr ""
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:98
+#, python-format
+msgid ""
+"Pulled procurement coming from original location %s, pull rule %s, via "
+"original Procurement %s (#%d)"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_location
+msgid "Location"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,invoice_state:0
+#: field:stock.location.path,invoice_state:0
+msgid "Invoice Status"
+msgstr ""
+
+#. module: stock_location
+#: help:stock.location.path,auto:0
+msgid ""
+"This is used to define paths the product has to follow within the location "
+"tree.\n"
+"The 'Automatic Move' value will create a stock move after the current one "
+"that will be validated automatically. With 'Manual Operation', the stock "
+"move has to be validated by a worker. With 'Automatic No Step Added', the "
+"location is replaced in the original move."
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Conditions"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_pack_zone
+msgid "Pack Zone"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_gate_b
+msgid "Gate B"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_gate_a
+msgid "Gate A"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Buy"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pushed flows"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_dispatch_zone
+msgid "Dispatch Zone"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pulled flows"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,company_id:0
+#: field:stock.location.path,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Logistics Flows"
+msgstr ""
+
+#. module: stock_location
+#: help:stock.move,cancel_cascade:0
+msgid "If checked, when this move is cancelled, cancel the linked move too"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Produce"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,procure_method:0
+msgid "Make to Order"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,procure_method:0
+msgid "Make to Stock"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,partner_address_id:0
+msgid "Partner Address"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "To Be Invoiced"
+msgstr ""
+
+#. module: stock_location
+#: help:stock.location.path,delay:0
+msgid "Number of days to do this transition"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,name:0
+msgid "This field will fill the packing Origin and the name of its moves"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,type_proc:0
+msgid "Type of Procurement"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,company_id:0
+msgid "Is used to know to which company belong packings and moves"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,name:0
+msgid "Name"
+msgstr ""
+
+#. module: stock_location
+#: help:product.product,path_ids:0
+msgid ""
+"These rules set the right path of the product in the whole location tree."
+msgstr ""
+
+#. module: stock_location
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: stock_location
+#: selection:stock.location.path,auto:0
+msgid "Manual Operation"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_product_product
+#: field:product.pulled.flow,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,procure_method:0
+msgid "Procure Method"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,picking_type:0
+#: field:stock.location.path,picking_type:0
+msgid "Shipping Type"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,procure_method:0
+msgid ""
+"'Make to Stock': When needed, take from the stock or wait until re-"
+"supplying. 'Make to Order': When needed, purchase or produce for the "
+"procurement request."
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,location_id:0
+msgid "Is the destination location that needs supplying"
+msgstr ""
+
+#. module: stock_location
+#: field:stock.location.path,product_id:0
+msgid "Products"
+msgstr ""
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:118
+#, python-format
+msgid "Pulled from another location via procurement %d"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.stock_location_qualitytest0
+msgid "Quality Control"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "Not Applicable"
+msgstr ""
+
+#. module: stock_location
+#: field:stock.location.path,delay:0
+msgid "Delay (days)"
+msgstr ""
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:67
+#, python-format
+msgid ""
+"Picking for pulled procurement coming from original location %s, pull rule "
+"%s, via original Procurement %s (#%d)"
+msgstr ""
+
+#. module: stock_location
+#: field:product.product,path_ids:0
+msgid "Pushed Flow"
+msgstr ""
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:89
+#, python-format
+msgid ""
+"Move for pulled procurement coming from original location %s, pull rule %s, "
+"via original Procurement %s (#%d)"
+msgstr ""
+
+#. module: stock_location
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,location_id:0
+#: field:stock.location.path,location_dest_id:0
+msgid "Destination Location"
+msgstr ""
+
+#. module: stock_location
+#: field:stock.location.path,auto:0
+#: selection:stock.location.path,auto:0
+msgid "Automatic Move"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Getting Goods"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Action Type"
+msgstr ""
+
+#. module: stock_location
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,picking_type:0
+#: help:stock.location.path,picking_type:0
+msgid ""
+"Depending on the company, choose whatever you want to receive or send "
+"products"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_order
+msgid "Order Processing"
+msgstr ""
+
+#. module: stock_location
+#: field:stock.location.path,name:0
+msgid "Operation"
+msgstr ""
+
+#. module: stock_location
+#: view:stock.location.path:0
+msgid "Location Paths"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,journal_id:0
+#: field:stock.location.path,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,cancel_cascade:0
+#: field:stock.move,cancel_cascade:0
+msgid "Cancel Cascade"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "Invoiced"
+msgstr ""
diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml
index f34d34da4ab..94a9feb9d57 100644
--- a/addons/stock_location/stock_location_view.xml
+++ b/addons/stock_location/stock_location_view.xml
@@ -46,7 +46,7 @@
@@ -86,7 +86,7 @@
\n"
+"PO-Revision-Date: 2012-04-06 05:15+0000\n"
+"Last-Translator: Jiří Hajda \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-02-09 06:44+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-07 04:55+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
#. module: stock_no_autopicking
#: model:ir.model,name:stock_no_autopicking.model_product_product
msgid "Product"
-msgstr ""
+msgstr "Výrobek"
#. module: stock_no_autopicking
#: model:ir.model,name:stock_no_autopicking.model_mrp_production
msgid "Manufacturing Order"
-msgstr ""
+msgstr "Výrobní příkaz"
#. module: stock_no_autopicking
#: field:product.product,auto_pick:0
@@ -34,22 +34,22 @@ msgstr "Auto výběr"
#. module: stock_no_autopicking
#: help:product.product,auto_pick:0
msgid "Auto picking for raw materials of production orders."
-msgstr ""
+msgstr "Automatické navádění pro hrubý materiál výrobních příkazů."
#. module: stock_no_autopicking
#: constraint:product.product:0
msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Chyba: Neplatný kód ean"
#. module: stock_no_autopicking
#: sql_constraint:mrp.production:0
msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Odkaz musí být jedinečný na společnost"
#. module: stock_no_autopicking
#: constraint:mrp.production:0
msgid "Order quantity cannot be negative or zero!"
-msgstr ""
+msgstr "Objednané množství nesmí být záporné nebo nulové!"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "Invalidní XML pro zobrazení architektury!"
diff --git a/addons/stock_no_autopicking/i18n/mk.po b/addons/stock_no_autopicking/i18n/mk.po
new file mode 100644
index 00000000000..0dd57d2be09
--- /dev/null
+++ b/addons/stock_no_autopicking/i18n/mk.po
@@ -0,0 +1,53 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+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-04-23 11:28+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Macedonian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-24 04:53+0000\n"
+"X-Generator: Launchpad (build 15135)\n"
+
+#. module: stock_no_autopicking
+#: model:ir.model,name:stock_no_autopicking.model_product_product
+msgid "Product"
+msgstr ""
+
+#. module: stock_no_autopicking
+#: model:ir.model,name:stock_no_autopicking.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: stock_no_autopicking
+#: field:product.product,auto_pick:0
+msgid "Auto Picking"
+msgstr ""
+
+#. module: stock_no_autopicking
+#: help:product.product,auto_pick:0
+msgid "Auto picking for raw materials of production orders."
+msgstr ""
+
+#. module: stock_no_autopicking
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: stock_no_autopicking
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: stock_no_autopicking
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 3ce0184eb00..b29eb7baace 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -184,7 +184,7 @@
+ parent="base.menu_base_partner" sequence="5"/>
stock.sale.forecast.list.select
diff --git a/addons/subscription/security/subcription_security.xml b/addons/subscription/security/subcription_security.xml
index 7d665c96435..46293a97561 100644
--- a/addons/subscription/security/subcription_security.xml
+++ b/addons/subscription/security/subcription_security.xml
@@ -10,6 +10,7 @@
Manager
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 550240d522e..5235e0410bf 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -18,7 +18,7 @@
@@ -59,7 +59,7 @@
Manager
Survey / User
+
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 4673bcd9846..36a15948b5a 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -36,7 +36,7 @@
-
+
@@ -166,7 +166,7 @@
@@ -232,7 +232,7 @@
, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2012-04-06 04:46+0000\n"
+"Last-Translator: Jiří Hajda \n"
+"Language-Team: Czech \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-07 04:55+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
+
+#. module: wiki_faq
+#: model:ir.module.module,description:wiki_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+" "
+msgstr ""
+"Tento modul poskytuje šablonu wiki FAQ\n"
+" "
+
+#. module: wiki_faq
+#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
+msgid "Document Management - Wiki - FAQ"
+msgstr "Správa dokumentů - Wiki - FAQ"
diff --git a/addons/wiki_quality_manual/i18n/cs.po b/addons/wiki_quality_manual/i18n/cs.po
new file mode 100644
index 00000000000..86cf27747ec
--- /dev/null
+++ b/addons/wiki_quality_manual/i18n/cs.po
@@ -0,0 +1,32 @@
+# Czech translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2012-04-06 04:47+0000\n"
+"Last-Translator: Jiří Hajda \n"
+"Language-Team: Czech \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-07 04:55+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
+msgid ""
+"Quality Manual Template\n"
+" "
+msgstr ""
+"Šablona příručky kvality\n"
+" "
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
+msgid "Document Management - Wiki - Quality Manual"
+msgstr "Správa dokumentů - Wiki - Příručka kvality"
diff --git a/addons/wiki_sale_faq/wiki_sale_faq_data.xml b/addons/wiki_sale_faq/wiki_sale_faq_data.xml
index a349f77404f..d9bd8de43ff 100644
--- a/addons/wiki_sale_faq/wiki_sale_faq_data.xml
+++ b/addons/wiki_sale_faq/wiki_sale_faq_data.xml
@@ -3,7 +3,7 @@
Sales Document
- 0
+
+
+
+
+
+
+ All Feeds
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ History and Comments
+
+
+
+
+
+
+
+
+
+
+
+ Followers
+
+
+ -
+
+ ![User img]()
+
+
+
+
+
+ +
+
+
+
+ ![]()
+
+
+
+
+
@@ -110,8 +112,7 @@
+
+
+
+
+
+
+
+