-
-
-
+
+
+
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index b111cf2b771..f9388706e97 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -514,8 +514,7 @@ class account_move_line(osv.osv):
'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'),
'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation'),('currency','Currency Adjustment')], 'Centralisation', size=8),
'balance': fields.function(_balance, fnct_search=_balance_search, string='Balance'),
- 'state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'Status', readonly=True,
- help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'),
+ 'state': fields.selection([('draft','Unbalanced'), ('valid','Balanced')], 'Status', readonly=True),
'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or a tax code account."),
'tax_amount': fields.float('Tax/Base Amount', digits_compute=dp.get_precision('Account'), select=True, help="If the Tax account is a tax code account, this field will contain the taxed amount.If the tax account is base tax code, "\
"this field will contain the basic amount(without tax)."),
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1c40bebba52..1b614a1ee85 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -633,13 +633,10 @@
[[ line['blocked'] and 'X' or '' ]]
@@ -241,7 +236,7 @@
[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['credit'] or 0) or (y['account_id']['type'] == 'payable' and y['debit'] * -1 or 0)), getLines(o), 0))) ]]
- [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]
+ [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]]
+ [[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]
@@ -293,7 +294,7 @@
[[ formatLang(p.amount) ]]
- [[ formatLang(p.total) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]
+ [[ formatLang(p.total, currency_obj = o.company_id and o.company_id.currency_id)]]
- [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]
+ [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]]
+ [[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]
@@ -334,7 +335,7 @@
[[ '..'*h['level'] ]][[ h['rule_category'] ]][[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]]
- [[ formatLang(h['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] [[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]
+ [[ formatLang(h['total'], currency_obj = o.company_id and o.company_id.currency_id)]] [[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]
@@ -391,7 +392,7 @@
[[ formatLang(r['amount']) ]]
- [[ formatLang(r['total']) ]] [[ o.company_id and o.company_id.currency_id.symbol or '']][[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]]
+ [[ formatLang(r['total'], currency_obj = o.company_id and o.company_id.currency_id)]][[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]]
-
+
You
-
- and
- people
+
+ and
+ people
-
+
agree
-
+ Agree
- Unagree
+ Undo
+
+
+
+ *
+
+
+
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index a6df1f0fe8c..87b49579100 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -7,22 +7,20 @@
-->
-
+
FollowUnfollowFollowing
-
-
-
+
+
+
-
-
-
-
-
+
+
+
Invite
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 1fc44ed81af..2eff59fe0ed 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -135,7 +135,9 @@ class test_mail(TestMailMockups):
self.res_users = self.registry('res.users')
self.res_partner = self.registry('res.partner')
- self.user_demo = self.registry('ir.model.data').get_object_reference(self.cr, self.uid, 'base', 'user_demo')[1]
+ # Test users
+ self.user_demo_id = self.registry('ir.model.data').get_object_reference(self.cr, self.uid, 'base', 'user_demo')[1]
+ self.user_admin = self.res_users.browse(self.cr, self.uid, self.uid)
# Mock send_get_mail_body to test its functionality without other addons override
self._send_get_mail_body = self.registry('mail.mail').send_get_mail_body
@@ -148,6 +150,7 @@ class test_mail(TestMailMockups):
# create a 'pigs' group that will be used through the various tests
self.group_pigs_id = self.mail_group.create(self.cr, self.uid,
{'name': 'Pigs', 'description': 'Fans of Pigs, unite !'})
+ self.group_pigs = self.mail_group.browse(self.cr, self.uid, self.group_pigs_id)
def tearDown(self):
# Remove mocks
@@ -155,6 +158,7 @@ class test_mail(TestMailMockups):
super(test_mail, self).tearDown()
def test_00_message_process(self):
+ """ Testing incoming emails processing. """
cr, uid = self.cr, self.uid
# Incoming mail creates a new mail_group "frogs"
self.assertEqual(self.mail_group.search(cr, uid, [('name', '=', 'frogs')]), [])
@@ -193,18 +197,15 @@ class test_mail(TestMailMockups):
self.assertEqual(new_mail.body, '\n
\nPlease call me as soon as possible this afternoon!\n\n--\nSylvie\n
\n',
'plaintext mail incorrectly parsed')
- def test_10_many2many_reference_field(self):
+ def test_10_followers_function_field(self):
""" Tests designed for the many2many function field 'follower_ids'.
We will test to perform writes using the many2many commands 0, 3, 4,
5 and 6. """
- cr, uid = self.cr, self.uid
- user_admin = self.res_users.browse(cr, uid, uid)
- group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+ cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
- # Create partner Bert Poilu
+ # Data: create partner Bert Poilu
partner_bert_id = self.res_partner.create(cr, uid, {'name': 'Bert Poilu'})
-
- # Create 'disturbing' values in mail.followers: same res_id, other res_model; same res_model, other res_id
+ # Data: create 'disturbing' values in mail.followers: same res_id, other res_model; same res_model, other res_id
group_dummy_id = self.mail_group.create(cr, uid,
{'name': 'Dummy group'})
self.mail_followers.create(cr, uid,
@@ -257,9 +258,7 @@ class test_mail(TestMailMockups):
def test_11_message_followers_and_subtypes(self):
""" Tests designed for the subscriber API as well as message subtypes """
- cr, uid = self.cr, self.uid
- user_admin = self.res_users.browse(cr, uid, uid)
- group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+ cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
# Data: user Raoul
user_raoul_id = self.res_users.create(cr, uid, {'name': 'Raoul Grosbedon', 'login': 'raoul'})
user_raoul = self.res_users.browse(cr, uid, user_raoul_id)
@@ -281,7 +280,6 @@ class test_mail(TestMailMockups):
group_pigs.refresh()
# Test: 2 followers (Admin and Raoul)
follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
- self.assertEqual(len(follower_ids), 2, 'There should be 2 Pigs fans')
self.assertEqual(set(follower_ids), set([user_raoul.partner_id.id, user_admin.partner_id.id]), 'Admin and Raoul should be the only 2 Pigs fans')
# Test: Raoul follows default subtypes
fol_ids = self.mail_followers.search(cr, uid, [('res_model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id), ('partner_id', '=', user_raoul.partner_id.id)])
@@ -307,19 +305,16 @@ class test_mail(TestMailMockups):
# CASE2: test mail_thread fields
# ----------------------------------------
- group_pigs.refresh()
- self.assertEqual(set(group_pigs.message_subtype_data.keys()), set(['comment', 'mt_mg_def', 'mt_all_def', 'mt_mg_nodef', 'mt_all_nodef']), 'mail.group available subtypes incorrect')
- self.assertFalse(group_pigs.message_subtype_data['comment']['followed'], 'Admin should not follow comments in pigs')
- self.assertTrue(group_pigs.message_subtype_data['mt_mg_nodef']['followed'], 'Admin should follow mt_mg_nodef in pigs')
- self.assertTrue(group_pigs.message_subtype_data['mt_all_nodef']['followed'], 'Admin should follow mt_all_nodef in pigs')
+ subtype_data = group_pigs._get_subscription_data(None, None)[group_pigs.id]['message_subtype_data']
+ self.assertEqual(set(subtype_data.keys()), set(['comment', 'mt_mg_def', 'mt_all_def', 'mt_mg_nodef', 'mt_all_nodef']), 'mail.group available subtypes incorrect')
+ self.assertFalse(subtype_data['comment']['followed'], 'Admin should not follow comments in pigs')
+ self.assertTrue(subtype_data['mt_mg_nodef']['followed'], 'Admin should follow mt_mg_nodef in pigs')
+ self.assertTrue(subtype_data['mt_all_nodef']['followed'], 'Admin should follow mt_all_nodef in pigs')
def test_20_message_post(self):
""" Tests designed for message_post. """
- cr, uid = self.cr, self.uid
+ cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
self.res_users.write(cr, uid, [uid], {'signature': 'Admin', 'email': 'a@a'})
- user_admin = self.res_users.browse(cr, uid, uid)
- group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
-
# 1 - Bert Tartopoils, with email, should receive emails for comments and emails
p_b_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'})
# 2 - Carine Poilvache, with email, should never receive emails
@@ -345,11 +340,12 @@ class test_mail(TestMailMockups):
# CASE1: post comment, body and subject specified
# ----------------------------------------
+ # 1. Post a new comment on Pigs
self._init_mock_build_email()
msg_id = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body1, subject=_subject, type='comment', subtype='mt_comment')
message = self.mail_message.browse(cr, uid, msg_id)
sent_emails = self._build_email_kwargs_list
- # Test: notifications have been deleted
+ # Test: mail.mail notifications have been deleted
self.assertFalse(self.mail_mail.search(cr, uid, [('mail_message_id', '=', msg_id)]), 'mail.mail notifications should have been auto-deleted!')
# Test: mail_message: subject is _subject, body is _body1 (no formatting done)
self.assertEqual(message.subject, _subject, 'mail.message subject incorrect')
@@ -377,19 +373,18 @@ class test_mail(TestMailMockups):
# CASE2: post an email with attachments, parent_id, partner_ids
# ----------------------------------------
- # TESTS: automatic subject, signature in body_html, attachments propagation
+ # 1. Post a new email comment on Pigs
self._init_mock_build_email()
msg_id2 = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body2, type='email', subtype='mt_comment',
partner_ids=[(6, 0, [p_d_id])], parent_id=msg_id, attachments=_attachments)
message = self.mail_message.browse(cr, uid, msg_id2)
sent_emails = self._build_email_kwargs_list
self.assertFalse(self.mail_mail.search(cr, uid, [('mail_message_id', '=', msg_id2)]), 'mail.mail notifications should have been auto-deleted!')
-
# Test: mail_message: subject is False, body is _body2 (no formatting done), parent_id is msg_id
self.assertEqual(message.subject, False, 'mail.message subject incorrect')
self.assertEqual(message.body, html_sanitize(_body2), 'mail.message body incorrect')
self.assertEqual(message.parent_id.id, msg_id, 'mail.message parent_id incorrect')
- # Test: sent_email: email send by server: correct subject, body, body_alternative
+ # Test: sent_email: email send by server: correct automatic subject, body, body_alternative
self.assertEqual(len(sent_emails), 2, 'sent_email number of sent emails incorrect')
for sent_email in sent_emails:
self.assertEqual(sent_email['subject'], _mail_subject, 'sent_email subject incorrect')
@@ -413,13 +408,11 @@ class test_mail(TestMailMockups):
self.assertIn((attach.name, attach.datas.decode('base64')), _attachments,
'mail.message attachment name / data incorrect')
- def test_21_message_compose_wizard(self):
+ def test_25_message_compose_wizard(self):
""" Tests designed for the mail.compose.message wizard. """
- cr, uid = self.cr, self.uid
+ cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
mail_compose = self.registry('mail.compose.message')
self.res_users.write(cr, uid, [uid], {'signature': 'Admin', 'email': 'a@a'})
- user_admin = self.res_users.browse(cr, uid, uid)
- group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
group_bird_id = self.mail_group.create(cr, uid, {'name': 'Bird', 'description': 'Bird resistance'})
group_bird = self.mail_group.browse(cr, uid, group_bird_id)
@@ -434,7 +427,6 @@ class test_mail(TestMailMockups):
]
_attachments_test = [('first.txt', 'My first attachment'), ('second.txt', 'My second attachment')]
- # Create partners
# 1 - Bert Tartopoils, with email, should receive emails for comments and emails
p_b_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'})
# 2 - Carine Poilvache, with email, should never receive emails
@@ -470,7 +462,6 @@ class test_mail(TestMailMockups):
msg_pids = [partner.id for partner in message.partner_ids]
test_pids = [p_b_id, p_c_id, p_d_id]
notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', message.id)])
-
self.assertEqual(len(notif_ids), 3, 'mail.message: too much notifications created')
self.assertEqual(set(msg_pids), set(test_pids), 'mail.message partner_ids incorrect')
@@ -505,7 +496,7 @@ class test_mail(TestMailMockups):
# 1. mass_mail on pigs and bird
compose_id = mail_compose.create(cr, uid,
- {'subject': _subject, 'body': '${object.description}', 'content_type': 'html'},
+ {'subject': _subject, 'body': '${object.description}', 'content_subtype': 'html'},
{'default_composition_mode': 'mass_mail', 'default_model': 'mail.group', 'default_res_id': False,
'active_ids': [self.group_pigs_id, group_bird_id]})
compose = mail_compose.browse(cr, uid, compose_id)
@@ -529,117 +520,19 @@ class test_mail(TestMailMockups):
self.assertEqual(message2.subject, _subject, 'mail.message subject incorrect')
self.assertEqual(message2.body, group_bird.description, 'mail.message body incorrect')
- # FP Note: to be reviewed to be more generic, not depending on the algorythm of
- # message_read
- #def test_30_message_read(self):
- # """ Tests designed for message_read. """
- # # TDE NOTE: this test is not finished, as the message_read method is not fully specified.
- # # It will be updated as soon as we have fixed specs !
- # cr, uid = self.cr, self.uid
- # group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
-
- # def _compare_structures(struct1, struct2, n=0):
- # # print '%scompare structure' % ('\t' * n)
- # # self.assertEqual(len(struct1), len(struct2), 'message_read structure number of childs incorrect')
-
- # for x in range(len(struct1)):
- # if struct1[x].get('type') == 'expandable':
- # continue
- # # print '%s' % ('\t' * n), struct1[x]['id'], struct1[x]['child_nbr'], struct2[x]['id'], struct2[x].get('child_nbr', 'XX'), struct1[x].get('subject') or ''
- # self.assertEqual(struct1[x]['id'], struct2[x]['id'], 'message_read failure %s' % struct1[x].get('subject'))
- # _compare_structures(struct1[x]['child_ids'], struct2[x]['child_ids'], n + 1)
- # # print '%send compare' % ('\t' * n)
-
- # # ----------------------------------------
- # # CASE1: Flattening test
- # # ----------------------------------------
-
- # # Create dummy message structure
- # import copy
- # tree = [{'id': 2, 'child_nbr': 1, 'child_ids': [
- # {'id': 6, 'child_nbr': 1, 'child_ids': [
- # {'id': 8, 'child_nbr': 0, 'child_ids': []},
- # ]},
- # ]},
- # {'id': 1, 'child_nbr': 3, 'child_ids':[
- # {'id': 7, 'child_nbr': 1, 'child_ids': [
- # {'id': 9, 'child_nbr': 0, 'child_ids': []},
- # ]},
- # {'id': 4, 'child_nbr': 2, 'child_ids': [
- # {'id': 10, 'child_nbr': 0, 'child_ids': []},
- # {'id': 5, 'child_nbr': 0, 'child_ids': []},
- # ]},
- # {'id': 3, 'child_nbr': 0, 'child_ids': []},
- # ]},
- # ]
- # # Test: completely flat
- # new_tree = self.mail_message.message_read_tree_flatten(cr, uid, None, copy.deepcopy(tree), [('type', 'in', 'borderlands')], 0, limit=15, add_expandable=False)
- # _compare_structures(new_tree, new_tree)
- # self.assertEqual(len(new_tree), 10, 'message_read_tree_flatten wrong in flat')
- # # Test: 1 thread level
- # tree_test = [{'id': 2, 'child_ids': [
- # {'id': 8, 'child_ids': []}, {'id': 6, 'child_ids': []},
- # ]},
- # {'id': 1, 'child_ids': [
- # {'id': 10, 'child_ids': []}, {'id': 9, 'child_ids': []},
- # {'id': 7, 'child_ids': []}, {'id': 5, 'child_ids': []},
- # {'id': 4, 'child_ids': []}, {'id': 3, 'child_ids': []},
- # ]},
- # ]
- # new_tree = self.mail_message.message_read_tree_flatten(cr, uid, None, copy.deepcopy(tree), [('type', 'in', 'borderlands')], 1, limit=15, add_expandable=False)
- # _compare_structures(new_tree, tree_test)
- # # Test: 2 thread levels
- # new_tree = self.mail_message.message_read_tree_flatten(cr, uid, None, copy.deepcopy(tree), [('type', 'in', 'borderlands')], 2, limit=15, add_expandable=False)
- # _compare_structures(new_tree, tree)
-
- # # ----------------------------------------
- # # CASE2: message_read test
- # # ----------------------------------------
-
- # # 1. Add a few messages to pigs group
- # msgid1 = group_pigs.message_post(body='1', subject='1', parent_id=False)
- # msgid2 = group_pigs.message_post(body='2', subject='1-1', parent_id=msgid1)
- # msgid3 = group_pigs.message_post(body='3', subject='1-2', parent_id=msgid1)
- # msgid4 = group_pigs.message_post(body='4', subject='2', parent_id=False)
- # msgid5 = group_pigs.message_post(body='5', subject='1-1-1', parent_id=msgid2)
- # msgid6 = group_pigs.message_post(body='6', subject='2-1', parent_id=msgid4)
-
- # # Test: read all messages flat
- # tree_test = [{'id': msgid6, 'child_ids': []}, {'id': msgid5, 'child_ids': []},
- # {'id': msgid4, 'child_ids': []}, {'id': msgid3, 'child_ids': []},
- # {'id': msgid2, 'child_ids': []}, {'id': msgid1, 'child_ids': []}]
- # tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], level=0, limit=15)
- # _compare_structures(tree, tree_test)
- # # Test: read with 1 level of thread
- # tree_test = [{'id': msgid4, 'child_ids': [{'id': msgid6, 'child_ids': []}, ]},
- # {'id': msgid1, 'child_ids': [
- # {'id': msgid5, 'child_ids': []}, {'id': msgid3, 'child_ids': []},
- # {'id': msgid2, 'child_ids': []},
- # ]},
- # ]
- # tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], level=1, limit=15)
- # _compare_structures(tree, tree_test)
- # # Test: read with 2 levels of thread
- # tree_test = [{'id': msgid4, 'child_ids': [{'id': msgid6, 'child_ids': []}, ]},
- # {'id': msgid1, 'child_ids': [
- # {'id': msgid3, 'child_ids': []},
- # {'id': msgid2, 'child_ids': [{'id': msgid5, 'child_ids': []}, ]},
- # ]},
- # ]
- # tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], level=2, limit=15)
- # _compare_structures(tree, tree_test)
-
- # # 2. Test expandables
- # # TDE FIXME: add those tests when expandables are specified and implemented
+ def test_30_message_read(self):
+ """ Tests for message_read and expandables. """
+ self.assertTrue(1 == 1, 'Test not implemented, do not replace by return True')
def test_40_needaction(self):
""" Tests for mail.message needaction. """
- cr, uid = self.cr, self.uid
- group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
- group_pigs_demo = self.mail_group.browse(cr, self.user_demo, self.group_pigs_id)
- user_admin = self.res_users.browse(cr, uid, uid)
+ cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
+ user_demo = self.res_users.browse(cr, uid, self.user_demo_id)
+ group_pigs_demo = self.mail_group.browse(cr, self.user_demo_id, self.group_pigs_id)
+ na_admin_base = self.mail_message._needaction_count(cr, uid, domain=[])
+ na_demo_base = self.mail_message._needaction_count(cr, user_demo.id, domain=[])
- # Demo values: check unread notification = needaction on mail.message
+ # Test: number of unread notification = needaction on mail.message
notif_ids = self.mail_notification.search(cr, uid, [
('partner_id', '=', user_admin.partner_id.id),
('read', '=', False)
@@ -647,36 +540,32 @@ class test_mail(TestMailMockups):
na_count = self.mail_message._needaction_count(cr, uid, domain=[])
self.assertEqual(len(notif_ids), na_count, 'unread notifications count does not match needaction count')
- na_count1 = self.mail_message._needaction_count(cr, uid, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)])
- # Post 2 message on group_pigs as admin, 3 messages as demo user
+ # Do: post 2 message on group_pigs as admin, 3 messages as demo user
for dummy in range(2):
group_pigs.message_post(body='My Body', subtype='mt_comment')
for dummy in range(3):
group_pigs_demo.message_post(body='My Demo Body', subtype='mt_comment')
- # Check there are 4 new needaction on mail.message
+ # Test: admin has 3 new notifications (from demo), and 3 new needaction
notif_ids = self.mail_notification.search(cr, uid, [
('partner_id', '=', user_admin.partner_id.id),
('read', '=', False)
])
- na_count = self.mail_message._needaction_count(cr, uid, domain=[])
- self.assertEqual(len(notif_ids), na_count, 'unread notifications count does not match needaction count')
-
- # Check there are 4 needaction on mail.message with particular domain
- na_count = self.mail_message._needaction_count(cr, uid, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)])
+ self.assertEqual(len(notif_ids), na_admin_base + 3, 'Admin should have 3 new unread notifications')
+ na_admin = self.mail_message._needaction_count(cr, uid, domain=[])
+ na_admin_group = self.mail_message._needaction_count(cr, uid, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)])
+ self.assertEqual(na_admin, na_admin_base + 3, 'Admin should have 3 new needaction')
+ self.assertEqual(na_admin_group, 3, 'Admin should have 3 needaction related to Pigs')
+ # Test: demo has 0 new notifications (not a follower, not receiving its own messages), and 0 new needaction
notif_ids = self.mail_notification.search(cr, uid, [
- ('partner_id', '=', user_admin.partner_id.id),
- ('read', '=', False),
- ('message_id.model','=','mail.group'),
- ('message_id.res_id','=',self.group_pigs_id)
+ ('partner_id', '=', user_demo.partner_id.id),
+ ('read', '=', False)
])
- self.assertEqual(len(notif_ids), na_count, 'posted message count does not match needaction count')
-
- na_count3 = self.mail_message._needaction_count(cr, self.user_demo, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)])
- self.assertEqual(na_count3-na_count1, 0, 'demo has 0 message: not a follower and do not follow his own messages')
-
- na_count2 = self.mail_message._needaction_count(cr, uid, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)])
- self.assertEqual(na_count2-na_count1, 3, 'admin has 3 messages: 0 from itself as they are marked as read, 3 from demo')
+ self.assertEqual(len(notif_ids), na_demo_base + 0, 'Demo should have 0 new unread notifications')
+ na_demo = self.mail_message._needaction_count(cr, user_demo.id, domain=[])
+ na_demo_group = self.mail_message._needaction_count(cr, user_demo.id, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)])
+ self.assertEqual(na_demo, na_demo_base + 0, 'Demo should have 0 new needaction')
+ self.assertEqual(na_demo_group, 0, 'Demo should have 0 needaction related to Pigs')
def test_50_thread_parent_resolution(self):
"""Verify parent/child relationships are correctly established when processing incoming mails"""
@@ -692,11 +581,19 @@ class test_mail(TestMailMockups):
reply_msg = MAIL_TEMPLATE.format(to='Pretty Pigs , other@gmail.com', subject='Re: 1',
extra='In-Reply-To: %s' % msg1.message_id)
self.mail_group.message_process(cr, uid, None, reply_msg)
+ # TDE note: temp various asserts because of the random bug about msg1.child_ids
+ msg_ids = self.mail_message.search(cr, uid, [('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], limit=1)
+ new_msg = self.mail_message.browse(cr, uid, msg_ids[0])
+ self.assertEqual(new_msg.parent_id, msg1, 'Newly processed mail_message (%d) should have msg1 as parent' % (new_msg.id))
# 2. References header
reply_msg2 = MAIL_TEMPLATE.format(to='Pretty Pigs , other@gmail.com', subject='Re: Re: 1',
extra='References: <2233@a.com>\r\n\t<3edss_dsa@b.com> %s' % msg1.message_id)
self.mail_group.message_process(cr, uid, None, reply_msg2)
+ # TDE note: temp various asserts because of the random bug about msg1.child_ids
+ msg_ids = self.mail_message.search(cr, uid, [('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], limit=1)
+ new_msg = self.mail_message.browse(cr, uid, msg_ids[0])
+ self.assertEqual(new_msg.parent_id, msg1, 'Newly processed mail_message should have msg1 as parent')
# 3. Subject contains [] + model passed to message+process -> only attached to group, not to mail
reply_msg3 = MAIL_TEMPLATE.format(to='Pretty Pigs , other@gmail.com',
@@ -706,9 +603,15 @@ class test_mail(TestMailMockups):
group_pigs.refresh()
msg1.refresh()
self.assertEqual(5, len(group_pigs.message_ids), 'group should contain 5 messages')
+ # TDE note: python test + debug because of the random error we see with the next assert
+ if len(msg1.child_ids) != 2:
+ msg_ids = self.mail_message.search(cr, uid, [('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], limit=10)
+ for new_msg in self.mail_message.browse(cr, uid, msg_ids):
+ print new_msg.subject, '(id', new_msg.id, ')', 'parent_id:', new_msg.parent_id
+ print '\tchild_ids', [child.id for child in new_msg.child_ids]
self.assertEqual(2, len(msg1.child_ids), 'msg1 should have 2 children now')
- def test_60_vote(self):
+ def test_60_message_vote(self):
""" Test designed for the vote/unvote feature. """
cr, uid = self.cr, self.uid
user_admin = self.res_users.browse(cr, uid, uid)
@@ -728,7 +631,7 @@ class test_mail(TestMailMockups):
# Test: msg1 has Admin as voter
self.assertEqual(set(msg1.vote_user_ids), set([user_admin]), 'after voting, Admin is not the voter')
# Do: Bert vote for msg1
- self.mail_message.vote_toggle(cr, uid, [msg1.id], [user_bert_id])
+ self.mail_message.vote_toggle(cr, user_bert_id, [msg1.id])
msg1.refresh()
# Test: msg1 has Admin and Bert as voters
self.assertEqual(set(msg1.vote_user_ids), set([user_admin, user_bert]), 'after voting, Admin and Bert are not the voters')
@@ -737,3 +640,7 @@ class test_mail(TestMailMockups):
msg1.refresh()
# Test: msg1 has Bert as voter
self.assertEqual(set(msg1.vote_user_ids), set([user_bert]), 'after unvoting for Admin, Bert is not the voter')
+
+ def test_70_message_favorite(self):
+ """ Tests for favorites. """
+ self.assertTrue(1 == 1, 'Test not implemented, do not replace by return True')
diff --git a/addons/mail/tests/test_mail_access_rights.py b/addons/mail/tests/test_mail_access_rights.py
index 4d40c66fc81..544191205b8 100644
--- a/addons/mail/tests/test_mail_access_rights.py
+++ b/addons/mail/tests/test_mail_access_rights.py
@@ -102,53 +102,69 @@ class test_mail_access_rights(test_mail.TestMailMockups):
""" Test mail_message search override about access rights. """
self.assertTrue(1 == 1, 'Test not implemented, do not replace by return True')
- # def test_10_mail_flow_access_rights(self):
- # """ Test a Chatter-looks alike flow. """
- # cr, uid = self.cr, self.uid
- # partner_bert_id, partner_raoul_id = self.partner_bert_id, self.partner_raoul_id
- # user_bert_id, user_raoul_id = self.user_bert_id, self.user_raoul_id
+ def test_10_mail_flow_access_rights(self):
+ """ Test a Chatter-looks alike flow. """
+ cr, uid = self.cr, self.uid
+ mail_compose = self.registry('mail.compose.message')
+ partner_bert_id, partner_raoul_id = self.partner_bert_id, self.partner_raoul_id
+ user_bert_id, user_raoul_id = self.user_bert_id, self.user_raoul_id
- # # Prepare groups: Pigs (employee), Jobs (public)
- # self.mail_group.message_post(cr, uid, self.group_pigs_id, body='Message')
- # self.group_jobs_id = self.mail_group.create(cr, uid, {'name': 'Jobs', 'public': 'public'})
+ # Prepare groups: Pigs (employee), Jobs (public)
+ self.mail_group.message_post(cr, uid, self.group_pigs_id, body='Message')
+ self.group_jobs_id = self.mail_group.create(cr, uid, {'name': 'Jobs', 'public': 'public'})
- # # ----------------------------------------
- # # CASE1: Bert, without groups
- # # ----------------------------------------
- # # Do: Bert creates a group, should crash because perm_create only for employees
- # self.assertRaises(except_orm,
- # self.mail_group.create,
- # cr, user_bert_id, {'name': 'Bert\'s Group'})
- # # Do: Bert reads Jobs basic fields, ok because public = read access on the group
- # self.mail_group.read(cr, user_bert_id, self.group_jobs_id, ['name', 'description'])
- # # Do: Bert browse Pigs, ok (no direct browse of partners)
- # self.mail_group.browse(cr, user_bert_id, self.group_jobs_id)
- # # Do: Bert reads Jobs messages, ok because read access on the group => read access on its messages
- # jobs_message_ids = self.mail_group.read(cr, user_bert_id, self.group_jobs_id, ['message_ids'])['message_ids']
- # self.mail_message.read(cr, user_bert_id, jobs_message_ids)
- # # Do: Bert reads Jobs followers, ko because partner are accessible to employees or partner manager
- # jobs_followers_ids = self.mail_group.read(cr, user_bert_id, self.group_jobs_id, ['message_follower_ids'])['message_follower_ids']
- # self.assertRaises(except_orm,
- # self.res_partner.read,
- # cr, user_bert_id, jobs_followers_ids)
- # # Do: Bert comments Jobs, ko because no write access on the group and not in the followers
- # self.assertRaises(except_orm,
- # self.mail_group.message_post,
- # cr, user_bert_id, self.group_jobs_id, body='I love Pigs')
- # # Do: add Bert to jobs followers
- # self.mail_group.message_subscribe(cr, uid, [self.group_jobs_id], [partner_bert_id])
- # # Do: Bert comments Jobs, ok because he is now in the followers
- # self.mail_group.message_post(cr, user_bert_id, self.group_jobs_id, body='I love Pigs')
+ # ----------------------------------------
+ # CASE1: Bert, without groups
+ # ----------------------------------------
+ # Do: Bert creates a group, should crash because perm_create only for employees
+ self.assertRaises(except_orm,
+ self.mail_group.create,
+ cr, user_bert_id, {'name': 'Bert\'s Group'})
- # # Do: Bert reads Pigs, should crash because mail.group security=groups only for employee group
- # self.assertRaises(except_orm,
- # self.mail_group.read,
- # cr, user_bert_id, self.group_pigs_id)
+ # Do: Bert reads Jobs basic fields, ok because public = read access on the group
+ self.mail_group.read(cr, user_bert_id, self.group_jobs_id, ['name', 'description'])
+ # Do: Bert browse Pigs, ok (no direct browse of partners)
+ self.mail_group.browse(cr, user_bert_id, self.group_jobs_id)
+ # Do: Bert reads Jobs messages, ok because read access on the group => read access on its messages
+ jobs_message_ids = self.mail_group.read(cr, user_bert_id, self.group_jobs_id, ['message_ids'])['message_ids']
+ self.mail_message.read(cr, user_bert_id, jobs_message_ids)
+ # Do: Bert reads Jobs followers, ko because partner are accessible to employees or partner manager
+ jobs_followers_ids = self.mail_group.read(cr, user_bert_id, self.group_jobs_id, ['message_follower_ids'])['message_follower_ids']
+ self.assertRaises(except_orm,
+ self.res_partner.read,
+ cr, user_bert_id, jobs_followers_ids)
+ # Do: Bert comments Jobs, ko because no write access on the group and not in the followers
+ self.assertRaises(except_orm,
+ self.mail_group.message_post,
+ cr, user_bert_id, self.group_jobs_id, body='I love Pigs')
+ # Do: add Bert to jobs followers
+ self.mail_group.message_subscribe(cr, uid, [self.group_jobs_id], [partner_bert_id])
+ # Do: Bert comments Jobs, ok because he is now in the followers
+ self.mail_group.message_post(cr, user_bert_id, self.group_jobs_id, body='I love Pigs')
- # # ----------------------------------------
- # # CASE1: Raoul, employee
- # # ----------------------------------------
- # # Do: Bert read Pigs, ok because public
- # self.mail_group.read(cr, user_raoul_id, self.group_pigs_id)
- # # Do: Bert read Jobs, ok because group_public_id = employee
- # self.mail_group.read(cr, user_raoul_id, self.group_jobs_id)
+ # Do: Bert reads Pigs, should crash because mail.group security=groups only for employee group
+ self.assertRaises(except_orm,
+ self.mail_group.read,
+ cr, user_bert_id, self.group_pigs_id)
+
+ # Do: Bert create a mail.compose.message record, because he uses the wizard
+ compose_id = mail_compose.create(cr, user_bert_id,
+ {'subject': 'Subject', 'body_text': 'Body text', 'partner_ids': []},
+ # {'subject': 'Subject', 'body_text': 'Body text', 'partner_ids': [(4, p_c_id), (4, p_d_id)]},
+ {'default_composition_mode': 'comment', 'default_model': 'mail.group', 'default_res_id': self.group_jobs_id})
+ mail_compose.send_mail(cr, user_bert_id, [compose_id])
+
+ self.user_demo_id = self.registry('ir.model.data').get_object_reference(self.cr, self.uid, 'base', 'user_demo')[1]
+ compose_id = mail_compose.create(cr, self.user_demo_id,
+ {'subject': 'Subject', 'body_text': 'Body text', 'partner_ids': []},
+ # {'subject': 'Subject', 'body_text': 'Body text', 'partner_ids': [(4, p_c_id), (4, p_d_id)]},
+ {'default_composition_mode': 'comment', 'default_model': 'mail.group', 'default_res_id': self.group_jobs_id})
+ mail_compose.send_mail(cr, self.user_demo_id, [compose_id])
+
+ # ----------------------------------------
+ # CASE2: Raoul, employee
+ # ----------------------------------------
+ # Do: Bert read Pigs, ok because public
+ self.mail_group.read(cr, user_raoul_id, self.group_pigs_id)
+ # Do: Bert read Jobs, ok because group_public_id = employee
+ self.mail_group.read(cr, user_raoul_id, self.group_jobs_id)
diff --git a/addons/mail/update.py b/addons/mail/update.py
index 0e10ee0a7f1..9e35391bf52 100644
--- a/addons/mail/update.py
+++ b/addons/mail/update.py
@@ -41,6 +41,8 @@ def get_sys_logs(cr, uid):
nbr_share_users = pool.get("res.users").search(cr, uid, [("share", "=", True)], count=True)
nbr_active_share_users = pool.get("res.users").search(cr, uid, [("share", "=", True), ("date", ">=", limit_date_str)], count=True)
user = pool.get("res.users").browse(cr, uid, uid)
+
+ web_base_url = safe_eval(self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', 'False'))
msg = {
"dbuuid": dbuuid,
"nbr_users": nbr_users,
@@ -51,6 +53,7 @@ def get_sys_logs(cr, uid):
"db_create_date": db_create_date,
"version": release.version,
"language": user.lang,
+ "web_base_url": web_base_url,
}
msg.update(pool.get("res.company").read(cr,uid,[1],["name","email","phone"])[0])
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index fbadf76f2fb..b68aae14521 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -81,7 +81,7 @@ class mail_compose_message(osv.TransientModel):
elif composition_mode == 'comment' and model and res_id:
vals = self.get_record_data(cr, uid, model, res_id, context=context)
elif composition_mode == 'mass_mail' and model and active_ids:
- vals = {'model': model, 'res_id': res_id, 'content_subtype': 'html'}
+ vals = {'model': model, 'res_id': res_id, 'content_subtype': 'html'}
else:
vals = {'model': model, 'res_id': res_id}
if composition_mode:
@@ -219,29 +219,19 @@ class mail_compose_message(osv.TransientModel):
email(s), rendering any template patterns on the fly if needed. """
if context is None:
context = {}
- print '**', context
active_ids = context.get('active_ids')
for wizard in self.browse(cr, uid, ids, context=context):
mass_mail_mode = wizard.composition_mode == 'mass_mail'
active_model_pool = self.pool.get(wizard.model if wizard.model else 'mail.thread')
- if wizard.content_subtype == 'html':
- if not wizard.body:
- return False
- body = wizard.body
- else: # wizard.content_subtype == 'plain':
- if not wizard.body_text:
- return False
- body = '
%s
' % tools.ustr(wizard.body_text or '')
-
# wizard works in batch mode: [res_id] or active_ids
res_ids = active_ids if mass_mail_mode and wizard.model and active_ids else [wizard.res_id]
for res_id in res_ids:
# default values, according to the wizard options
post_values = {
'subject': wizard.subject if wizard.content_subtype == 'html' else False,
- 'body': body,
+ 'body': wizard.body if wizard.content_subtype == 'html' else '
%s
' % tools.ustr(wizard.body_text),
'parent_id': wizard.parent_id and wizard.parent_id.id,
'partner_ids': [(4, partner.id) for partner in wizard.partner_ids],
'attachments': [(attach.datas_fname or attach.name, base64.b64decode(attach.datas)) for attach in wizard.attachment_ids],
@@ -255,13 +245,13 @@ class mail_compose_message(osv.TransientModel):
post_values['attachments'] += new_attachments
post_values.update(email_dict)
# post the message
- id=active_model_pool.message_post(cr, uid, [res_id], type='comment', subtype='mt_comment', context=context, **post_values)
+ active_model_pool.message_post(cr, uid, [res_id], type='comment', subtype='mt_comment', context=context, **post_values)
# post process: update attachments, because id is not necessarily known when adding attachments in Chatter
# self.pool.get('ir.attachment').write(cr, uid, [attach.id for attach in wizard.attachment_ids], {
# 'res_id': wizard.id, 'res_model': wizard.model or False}, context=context)
-
- return {'type': 'ir.actions.act_window_close', 'res_model':'mail.compose.message', 'id': id}
+
+ return {'type': 'ir.actions.act_window_close'}
def render_message(self, cr, uid, wizard, res_id, context=None):
""" Generate an email from the template for given (wizard.model, res_id)
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 0f384dc5a0d..255954e31c1 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -6,23 +6,23 @@
mail.compose.message
When you sell this product, OpenERP will trigger a manufacturing
order using the bill of materials assigned to this product.
The delivery order will be ready once the production is done.
- [[ formatLang(pos_payment_user_total(data['form'])) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]
+ [[ formatLang(pos_payment_user_total(data['form'], currency_obj = company.currency_id)) or removeParentNode('blockTable')]]
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index 55873887210..d7b8b08ad29 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -72,8 +72,7 @@
[[ repeatIn(objects,'o') ]][[o.user_id.company_id.name]]
- [[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]
- [[ address and address.country_id.name ]]
+ [[ address and display_address(address)]]Tel : [[ address and address.phone ]]User : [[ o.user_id.name ]]Shop : [[ o.shop_id.name ]]
@@ -109,7 +108,7 @@
[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.f' % line.qty ]]
- [[o.state=='cancel' and o.statement_ids and '-' or '']][[ '%.2f' % net(line.id) ]] [[company.currency_id.symbol]] [[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ '%.2f' % line.discount ]]%) [[company.currency_id.symbol]]
+ [[o.state=='cancel' and o.statement_ids and '-' or '']][[ formatLang(net(line.id), currency_obj=company.currency_id) ]] [[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ formatLang(line.discount, currency_obj=company.currency_id) ]])
@@ -119,7 +118,7 @@
Taxes :
- [[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_tax]] [[company.currency_id.symbol]]
+ [[o.state=='cancel' and o.statement_ids and '-' or '']][[formatLang(o.amount_tax, currency_obj=company.currency_id)]]
@@ -129,7 +128,7 @@
Total :
- [[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_total]] [[company.currency_id.symbol]]
+ [[o.state=='cancel' and o.statement_ids and '-' or '']][[formatLang(o.amount_total, currency_obj=company.currency_id)]]
@@ -158,7 +157,7 @@
- [[ '%.2f' %(d['amt'] or 0) ]] [[company.currency_id.symbol]]
+ [[ formatLang(d['amt'] or 0, currency_obj=company.currency_id) ]]
diff --git a/addons/process/i18n/ar.po b/addons/process/i18n/ar.po
index 1f8a418420e..a8f48c94109 100644
--- a/addons/process/i18n/ar.po
+++ b/addons/process/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/bg.po b/addons/process/i18n/bg.po
index b4b61b81513..e20211f0c64 100644
--- a/addons/process/i18n/bg.po
+++ b/addons/process/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/bs.po b/addons/process/i18n/bs.po
index 79d02bcd13a..28f9577a793 100644
--- a/addons/process/i18n/bs.po
+++ b/addons/process/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/ca.po b/addons/process/i18n/ca.po
index e489bdeb340..7634a13dc74 100644
--- a/addons/process/i18n/ca.po
+++ b/addons/process/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/cs.po b/addons/process/i18n/cs.po
index e18003598ba..f78e823f9a5 100644
--- a/addons/process/i18n/cs.po
+++ b/addons/process/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
"X-Poedit-Language: Czech\n"
#. module: process
diff --git a/addons/process/i18n/da.po b/addons/process/i18n/da.po
index 445c28cef8a..610c4cad307 100644
--- a/addons/process/i18n/da.po
+++ b/addons/process/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/de.po b/addons/process/i18n/de.po
index e4d8ab46e0a..82042e6f1b2 100644
--- a/addons/process/i18n/de.po
+++ b/addons/process/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/el.po b/addons/process/i18n/el.po
index dbb11c959a5..21f76b53a2e 100644
--- a/addons/process/i18n/el.po
+++ b/addons/process/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
"X-Poedit-Country: GREECE\n"
"X-Poedit-Language: Greek\n"
"X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/process/i18n/es.po b/addons/process/i18n/es.po
index 0e650a8d320..0541a4bc7bc 100644
--- a/addons/process/i18n/es.po
+++ b/addons/process/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/es_AR.po b/addons/process/i18n/es_AR.po
index b7e548dea15..271782fc0fc 100644
--- a/addons/process/i18n/es_AR.po
+++ b/addons/process/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/es_CL.po b/addons/process/i18n/es_CL.po
index 4ce8d0c8ec6..f1d044c8c33 100644
--- a/addons/process/i18n/es_CL.po
+++ b/addons/process/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/es_CR.po b/addons/process/i18n/es_CR.po
index e84b52af219..59bc64a6a75 100644
--- a/addons/process/i18n/es_CR.po
+++ b/addons/process/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
"Language: \n"
#. module: process
diff --git a/addons/process/i18n/et.po b/addons/process/i18n/et.po
index a007f19e9a1..d2a7a8b24d6 100644
--- a/addons/process/i18n/et.po
+++ b/addons/process/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/fi.po b/addons/process/i18n/fi.po
index 4e5966a4ca3..42d3f5e4034 100644
--- a/addons/process/i18n/fi.po
+++ b/addons/process/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/fr.po b/addons/process/i18n/fr.po
index d79fa3c1c1e..8f0fe8b50b9 100644
--- a/addons/process/i18n/fr.po
+++ b/addons/process/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/gl.po b/addons/process/i18n/gl.po
index 48c75307d90..943d2b8841b 100644
--- a/addons/process/i18n/gl.po
+++ b/addons/process/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/hi.po b/addons/process/i18n/hi.po
index bd42d103519..ba3b7540959 100644
--- a/addons/process/i18n/hi.po
+++ b/addons/process/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/hr.po b/addons/process/i18n/hr.po
index 5581507896f..9180f99da71 100644
--- a/addons/process/i18n/hr.po
+++ b/addons/process/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
"Language: hr\n"
#. module: process
diff --git a/addons/process/i18n/hu.po b/addons/process/i18n/hu.po
index 5ac5b8a5401..f502b662fd8 100644
--- a/addons/process/i18n/hu.po
+++ b/addons/process/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/id.po b/addons/process/i18n/id.po
index f16c9616f18..465a712d107 100644
--- a/addons/process/i18n/id.po
+++ b/addons/process/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/it.po b/addons/process/i18n/it.po
index 9235db05af0..258c15851ef 100644
--- a/addons/process/i18n/it.po
+++ b/addons/process/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/ja.po b/addons/process/i18n/ja.po
index 24adcdc7825..1f4eb51c816 100644
--- a/addons/process/i18n/ja.po
+++ b/addons/process/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/ko.po b/addons/process/i18n/ko.po
index 2ede3cc39dc..ffce4e36d29 100644
--- a/addons/process/i18n/ko.po
+++ b/addons/process/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/lt.po b/addons/process/i18n/lt.po
index 49cf211691e..07ff95f47c5 100644
--- a/addons/process/i18n/lt.po
+++ b/addons/process/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/mn.po b/addons/process/i18n/mn.po
index 344b8aaa667..8cd6ddc1fd8 100644
--- a/addons/process/i18n/mn.po
+++ b/addons/process/i18n/mn.po
@@ -20,8 +20,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/nl.po b/addons/process/i18n/nl.po
index 51ddebd5d17..e9ec02b94e8 100644
--- a/addons/process/i18n/nl.po
+++ b/addons/process/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
@@ -127,7 +127,7 @@ msgstr "Bron knooppunt"
#: view:process.transition:0
#: field:process.transition,transition_ids:0
msgid "Workflow Transitions"
-msgstr "Werkschema transities"
+msgstr "Workflow transities"
#. module: process
#: field:process.transition.action,action:0
diff --git a/addons/process/i18n/nl_BE.po b/addons/process/i18n/nl_BE.po
index c73996c9b6d..b4d2e4635d9 100644
--- a/addons/process/i18n/nl_BE.po
+++ b/addons/process/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/pl.po b/addons/process/i18n/pl.po
index 88700b7d88a..cf128f9ae87 100644
--- a/addons/process/i18n/pl.po
+++ b/addons/process/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/pt.po b/addons/process/i18n/pt.po
index 723c4b5e3fe..21c2439ff91 100644
--- a/addons/process/i18n/pt.po
+++ b/addons/process/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/pt_BR.po b/addons/process/i18n/pt_BR.po
index 2541f6cf928..e04c7d4fc9f 100644
--- a/addons/process/i18n/pt_BR.po
+++ b/addons/process/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/ro.po b/addons/process/i18n/ro.po
index 2f9a0f1b5c5..91ad10f09e9 100644
--- a/addons/process/i18n/ro.po
+++ b/addons/process/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/ru.po b/addons/process/i18n/ru.po
index 3aed803c6df..ac595d6f2b6 100644
--- a/addons/process/i18n/ru.po
+++ b/addons/process/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sk.po b/addons/process/i18n/sk.po
index d8ecdac5172..9f519a69f79 100644
--- a/addons/process/i18n/sk.po
+++ b/addons/process/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sl.po b/addons/process/i18n/sl.po
index 35cf18b30f6..023d367172c 100644
--- a/addons/process/i18n/sl.po
+++ b/addons/process/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sq.po b/addons/process/i18n/sq.po
index b73768d1916..7e1697b4b13 100644
--- a/addons/process/i18n/sq.po
+++ b/addons/process/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sr.po b/addons/process/i18n/sr.po
index d46e50844f2..bfee496f702 100644
--- a/addons/process/i18n/sr.po
+++ b/addons/process/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sr@latin.po b/addons/process/i18n/sr@latin.po
index 0ad6f4d252d..bab68119214 100644
--- a/addons/process/i18n/sr@latin.po
+++ b/addons/process/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sv.po b/addons/process/i18n/sv.po
index b1bf7a9d00e..e2456f2b1a0 100644
--- a/addons/process/i18n/sv.po
+++ b/addons/process/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/tlh.po b/addons/process/i18n/tlh.po
index e63a1c1a5e7..3a750be9b05 100644
--- a/addons/process/i18n/tlh.po
+++ b/addons/process/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/tr.po b/addons/process/i18n/tr.po
index a7e5bb3ac6e..1a177017dfa 100644
--- a/addons/process/i18n/tr.po
+++ b/addons/process/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/uk.po b/addons/process/i18n/uk.po
index d33d881d50d..69bcea525f4 100644
--- a/addons/process/i18n/uk.po
+++ b/addons/process/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/vi.po b/addons/process/i18n/vi.po
index e3c3bff2a60..f56106c1f33 100644
--- a/addons/process/i18n/vi.po
+++ b/addons/process/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/zh_CN.po b/addons/process/i18n/zh_CN.po
index fca3f4035ac..9e3e28b8312 100644
--- a/addons/process/i18n/zh_CN.po
+++ b/addons/process/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/zh_TW.po b/addons/process/i18n/zh_TW.po
index 7d875e7a464..c07c7e60539 100644
--- a/addons/process/i18n/zh_TW.po
+++ b/addons/process/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: process
#: model:ir.model,name:process.model_process_node
diff --git a/addons/process/static/src/css/process.css b/addons/process/static/src/css/process.css
index 7442db9bc4a..5f438622653 100644
--- a/addons/process/static/src/css/process.css
+++ b/addons/process/static/src/css/process.css
@@ -44,7 +44,7 @@ a.cta-a strong {
background-color:#FFF;
}
.process_canvas svg{
- height:500px;!important;
+ height:500px;
padding:15px;
}
.oe_process {
diff --git a/addons/process/static/src/js/process.js b/addons/process/static/src/js/process.js
index c593c1569fc..c214dbb0fdf 100644
--- a/addons/process/static/src/js/process.js
+++ b/addons/process/static/src/js/process.js
@@ -216,13 +216,12 @@ instance.web.ViewManager.include({
var dataset = new instance.web.DataSet(this, 'ir.values', this.session.user_context);
var action_manager = new instance.web.ActionManager(self);
dataset.call('get',
- ['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context],
- function(res) {
+ ['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context]).then(function(res) {
var action = res[0][res[0].length - 1];
self.rpc("/web/action/load", {
action_id: action.id,
context: dataset.context
- }, function(result) {
+ }).then(function(result) {
action_manager.replace(self.$el);
action_manager.do_action(result.result);
})
@@ -239,7 +238,7 @@ instance.web.ViewManager.include({
title: _t('Process')
});
var form_controller = pop.view_form;
- pop.on('on_write_complete', self, self.initialize_process_view);
+ pop.on('write_completed', self, self.initialize_process_view);
}
});
};
diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py
index a1aed1dfba8..48569fa76c4 100644
--- a/addons/procurement/__openerp__.py
+++ b/addons/procurement/__openerp__.py
@@ -57,7 +57,7 @@ depending on the product's configuration.
'company_view.xml',
'board_mrp_procurement_view.xml',
],
- 'demo': ['stock_orderpoint.xml'],
+ 'demo': ['stock_orderpoint.xml','procurement_demo.xml'],
'test': ['test/procurement.yml'],
'installable': True,
'auto_install': True,
diff --git a/addons/procurement/i18n/ar.po b/addons/procurement/i18n/ar.po
index 47a63b81e44..e678db7ef54 100644
--- a/addons/procurement/i18n/ar.po
+++ b/addons/procurement/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/bg.po b/addons/procurement/i18n/bg.po
index 336df797694..9a80364b1c4 100644
--- a/addons/procurement/i18n/bg.po
+++ b/addons/procurement/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/ca.po b/addons/procurement/i18n/ca.po
index d0ff42d4780..016f37d2e04 100644
--- a/addons/procurement/i18n/ca.po
+++ b/addons/procurement/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/cs.po b/addons/procurement/i18n/cs.po
index 2aaf7ce8541..e5b95f86290 100644
--- a/addons/procurement/i18n/cs.po
+++ b/addons/procurement/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
"X-Poedit-Language: Czech\n"
#. module: procurement
diff --git a/addons/procurement/i18n/da.po b/addons/procurement/i18n/da.po
index fda84d7a815..0b0c5435389 100644
--- a/addons/procurement/i18n/da.po
+++ b/addons/procurement/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/de.po b/addons/procurement/i18n/de.po
index 6101927356b..cc42669e030 100644
--- a/addons/procurement/i18n/de.po
+++ b/addons/procurement/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/es.po b/addons/procurement/i18n/es.po
index e3b64863731..13c9bb9de49 100644
--- a/addons/procurement/i18n/es.po
+++ b/addons/procurement/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/es_CL.po b/addons/procurement/i18n/es_CL.po
index 54027f29730..8b99bd2c890 100644
--- a/addons/procurement/i18n/es_CL.po
+++ b/addons/procurement/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/es_CR.po b/addons/procurement/i18n/es_CR.po
index caa48b0af2a..f8dae5970ae 100644
--- a/addons/procurement/i18n/es_CR.po
+++ b/addons/procurement/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
"Language: es\n"
#. module: procurement
diff --git a/addons/procurement/i18n/es_EC.po b/addons/procurement/i18n/es_EC.po
index 795fcc5cbb6..ef563558ec6 100644
--- a/addons/procurement/i18n/es_EC.po
+++ b/addons/procurement/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/fi.po b/addons/procurement/i18n/fi.po
index 42bb7a778ac..a0f0f7fe10d 100644
--- a/addons/procurement/i18n/fi.po
+++ b/addons/procurement/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/fr.po b/addons/procurement/i18n/fr.po
index 62a5c8cddc3..ae784d8b489 100644
--- a/addons/procurement/i18n/fr.po
+++ b/addons/procurement/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/gl.po b/addons/procurement/i18n/gl.po
index b4c28afba8d..308db840cb8 100644
--- a/addons/procurement/i18n/gl.po
+++ b/addons/procurement/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/hr.po b/addons/procurement/i18n/hr.po
index 583e153870f..327134bb42c 100644
--- a/addons/procurement/i18n/hr.po
+++ b/addons/procurement/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/hu.po b/addons/procurement/i18n/hu.po
index e4b867e591f..260642649f5 100644
--- a/addons/procurement/i18n/hu.po
+++ b/addons/procurement/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/id.po b/addons/procurement/i18n/id.po
index e3d3e3744ff..d2a83919d2c 100644
--- a/addons/procurement/i18n/id.po
+++ b/addons/procurement/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/it.po b/addons/procurement/i18n/it.po
index d7ebef7b535..5fc4a2c1343 100644
--- a/addons/procurement/i18n/it.po
+++ b/addons/procurement/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/ja.po b/addons/procurement/i18n/ja.po
index ebbd5a9f094..7727cca2ca6 100644
--- a/addons/procurement/i18n/ja.po
+++ b/addons/procurement/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/mn.po b/addons/procurement/i18n/mn.po
index d7f531baf1b..6869e69fa20 100644
--- a/addons/procurement/i18n/mn.po
+++ b/addons/procurement/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/nb.po b/addons/procurement/i18n/nb.po
index 47a83619454..25dfad5a03a 100644
--- a/addons/procurement/i18n/nb.po
+++ b/addons/procurement/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/nl.po b/addons/procurement/i18n/nl.po
index e133736214d..c3789bebe66 100644
--- a/addons/procurement/i18n/nl.po
+++ b/addons/procurement/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
"PO-Revision-Date: 2012-02-19 13:37+0000\n"
-"Last-Translator: Erwin \n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) \n"
"Language-Team: Dutch \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
@@ -430,7 +430,7 @@ msgstr "Automatische verwervingen"
#. module: procurement
#: field:stock.warehouse.orderpoint,product_max_qty:0
msgid "Max Quantity"
-msgstr "Max hoeveelheid"
+msgstr "Max. hoeveelheid"
#. module: procurement
#: model:ir.model,name:procurement.model_procurement_order
diff --git a/addons/procurement/i18n/pl.po b/addons/procurement/i18n/pl.po
index f30c55e7d53..90ff78b5575 100644
--- a/addons/procurement/i18n/pl.po
+++ b/addons/procurement/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/pt.po b/addons/procurement/i18n/pt.po
index 20d2410cbb2..8dcd90201d8 100644
--- a/addons/procurement/i18n/pt.po
+++ b/addons/procurement/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/pt_BR.po b/addons/procurement/i18n/pt_BR.po
index abafbcf4955..30dea752268 100644
--- a/addons/procurement/i18n/pt_BR.po
+++ b/addons/procurement/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
@@ -41,8 +41,8 @@ msgid ""
msgstr ""
"Inicia uma ordem de compra automática para todos os produtos que tem estoque "
"virtual menor que 0 (zero). Provavelmente você não deve usar essa opção, "
-"sugerimos usar uma configuração MTO (make-to-order; produzir contra pedido) "
-"em todos os produtos."
+"sugerimos usar uma configuração MTO (make-to-order; adquirir sempre) em "
+"todos os produtos."
#. module: procurement
#: view:stock.warehouse.orderpoint:0
@@ -63,7 +63,7 @@ msgstr "Nenhum fornecedor definido para este produto!"
#. module: procurement
#: field:make.procurement,uom_id:0
msgid "Unit of Measure"
-msgstr "Unidade de Medida"
+msgstr "Unidade de Medida - UdM"
#. module: procurement
#: field:procurement.order,procure_method:0
@@ -84,7 +84,7 @@ msgstr "Somente calcula \"regras de estoque mínimo\""
#. module: procurement
#: view:procurement.order:0
msgid "Temporary Procurement Exceptions"
-msgstr "Exceções Temporárias de Procurações"
+msgstr "Exceções Temporárias de Aquisições"
#. module: procurement
#: field:procurement.order,company_id:0
@@ -106,7 +106,7 @@ msgstr "Motivo"
#. module: procurement
#: view:procurement.order.compute:0
msgid "Compute Procurements"
-msgstr "Calcular Compras"
+msgstr "Calcular Aquisições"
#. module: procurement
#: field:procurement.order,message:0
@@ -151,18 +151,18 @@ msgid ""
" It is in 'Waiting'. state when the procurement is waiting for another one "
"to finish."
msgstr ""
-"Quando uma aquisição é criada seu status será 'Provisório'.\n"
-" Se a aquisição for confirmada, o status será 'Confirmado'. \n"
-"Após a confirmação o status será 'Processando'.\n"
-" Se algum problema ocorrer no pedido, entao o status será 'Excessão'.\n"
-" Se o problema for removido o status se torna 'Pronto'.\n"
-" O status será 'Aguardando' quando a aquisição estiver esperando outra "
+"Quando uma aquisição é criada sua situação será 'Provisório'.\n"
+" Se a aquisição for confirmada, a situação será 'Confirmado'. \n"
+"Após a confirmação a situação será 'Processando'.\n"
+" Se algum problema ocorrer no pedido, então a situação será 'Excessão'.\n"
+" Se o problema for removido a situação se torna 'Pronto'.\n"
+" A situação será 'Aguardando' quando a aquisição estiver esperando outra "
"finalizar."
#. module: procurement
#: view:procurement.order:0
msgid "Permanent Procurement Exceptions"
-msgstr "Exceções Permanentes de Procurações"
+msgstr "Excessões Permanentes de Aquisições"
#. module: procurement
#: view:stock.warehouse.orderpoint:0
@@ -214,6 +214,15 @@ msgid ""
"\n"
" Exceptions:\n"
msgstr ""
+"Aqui está o relatório de programação aquisições.\n"
+"\n"
+" Data Inicial: %s \n"
+" Data Final: %s \n"
+" Total de aquisições processadas: %d \n"
+" Aquisições com excessões: %d \n"
+" Aquisições ignoradas (agendada fora do período programado) %d \n"
+"\n"
+" Excessões:\n"
#. module: procurement
#: selection:procurement.order,state:0
@@ -232,6 +241,9 @@ msgid ""
"procurement to bring the virtual stock to the Quantity specified as Max "
"Quantity."
msgstr ""
+"Quando o estoque virtual fica abaixo da quantidade mínima, O OpenERP gera "
+"uma aquisição para trazer o estoque virtual para a quantidade especificada "
+"como Quantidade máx."
#. module: procurement
#: view:procurement.order.compute:0
@@ -261,13 +273,13 @@ msgstr "Pedidos de Aquisição para Processar"
#. module: procurement
#: constraint:res.company:0
msgid "Error! You can not create recursive companies."
-msgstr "Erro! Você não pode criar empresas recursivas"
+msgstr "Erro! Você não pode criar empresas recursivas."
#. module: procurement
#: code:addons/procurement/procurement.py:386
#, python-format
msgid "Procurement '%s' is in exception: "
-msgstr ""
+msgstr "Aquisição '%s' possui uma excessão: "
#. module: procurement
#: field:procurement.order,priority:0
@@ -278,14 +290,14 @@ msgstr "Prioridade"
#: view:procurement.order:0
#: field:procurement.order,state:0
msgid "State"
-msgstr "Estado"
+msgstr "Situação"
#. module: procurement
#: field:procurement.order,location_id:0
#: view:stock.warehouse.orderpoint:0
#: field:stock.warehouse.orderpoint,location_id:0
msgid "Location"
-msgstr "Local"
+msgstr "Localização"
#. module: procurement
#: model:ir.model,name:procurement.model_stock_picking
@@ -308,7 +320,7 @@ msgstr "Melhor preço (não disponível ainda!)"
#: code:addons/procurement/schedulers.py:111
#, python-format
msgid "PROC %d: from stock - %3.2f %-5s - %s"
-msgstr ""
+msgstr "Aquisição %d: a partir do estoque - %3.2f %-5s - %s"
#. module: procurement
#: view:procurement.order:0
@@ -323,7 +335,7 @@ msgstr "Processar Aquisição"
#. module: procurement
#: field:stock.move,procurements:0
msgid "Procurements"
-msgstr "Compras"
+msgstr "Aquisições"
#. module: procurement
#: field:res.company,schedule_range:0
@@ -373,7 +385,7 @@ msgstr "Estoque insuficiente e sem mínimo definido para ponto de pedido."
#: code:addons/procurement/procurement.py:137
#, python-format
msgid "Invalid action !"
-msgstr "Ação invalida !"
+msgstr "Ação inválida!"
#. module: procurement
#: view:procurement.order:0
@@ -398,6 +410,7 @@ msgid ""
"Please check the quantity in procurement order(s), it should not be 0 or "
"less!"
msgstr ""
+"Verifique a quantidade na Ordem de Aquisição, não deve ser 0 ou menos!"
#. module: procurement
#: help:procurement.order,procure_method:0
@@ -468,6 +481,9 @@ msgid ""
"OpenERP generates a procurement to bring the virtual stock to the Max "
"Quantity."
msgstr ""
+"Quando o estoque virtual de ficar abaixo da Quantidade Mínima especificada "
+"para este campo, O OpenERP gera uma aquisição para trazer o estoque virtual "
+"para a Quantidade Máxima."
#. module: procurement
#: model:process.process,name:procurement.process_process_serviceproductprocess0
@@ -484,7 +500,7 @@ msgstr "Pedidos de Aquisição Relacionados"
msgid ""
"Wizard checks all the stock minimum rules and generate procurement order."
msgstr ""
-"O Wizard confere todas as regras de estoque mínimo e gera o Pedido de "
+"O assistente confere todas as regras de estoque mínimo e gera o Pedido de "
"Aquisição."
#. module: procurement
@@ -539,12 +555,12 @@ msgid ""
"background, you may have to wait for a few minutes until it has finished "
"computing."
msgstr ""
-"Este wizard permite que você processe todas as aquisições, produções e/ou "
-"pedidos de compra pendentes de processamento com base nas suas "
+"Este assistente permite que você processe todas as aquisições, produções "
+"e/ou pedidos de compra pendentes de processamento com base nas suas "
"configurações. Por padrão, o agendamento é executado toda noite pelo "
"OpenERP. Você pode usar este menu para forçar a execução agora. Repare que "
-"isto será executado em background, você deverá aguardar alguns minutos até o "
-"término do processamento."
+"isto será executado em segundo plano, você deverá aguardar alguns minutos "
+"até o término do processamento."
#. module: procurement
#: view:procurement.order:0
@@ -565,7 +581,7 @@ msgstr "Este assistente agendará aquisições."
#. module: procurement
#: view:procurement.order:0
msgid "Status"
-msgstr "Status"
+msgstr "Situação"
#. module: procurement
#: selection:procurement.order,priority:0
@@ -581,7 +597,7 @@ msgstr "Você tentou atribuir um lote que não é do mesmo produto"
#: code:addons/procurement/procurement.py:383
#, python-format
msgid "Not enough stock."
-msgstr ""
+msgstr "Estoque insuficiente."
#. module: procurement
#: field:stock.warehouse.orderpoint,active:0
@@ -591,7 +607,7 @@ msgstr "Ativo"
#. module: procurement
#: model:process.node,name:procurement.process_node_procureproducts0
msgid "Procure Products"
-msgstr "Adquirir Proodutos"
+msgstr "Adquirir Produtos"
#. module: procurement
#: field:procurement.order,date_planned:0
@@ -607,7 +623,7 @@ msgstr "Exceção"
#: code:addons/procurement/procurement.py:381
#, python-format
msgid "No minimum orderpoint rule defined."
-msgstr ""
+msgstr "Sem regra de ordem de aquisição mínima definida."
#. module: procurement
#: code:addons/procurement/schedulers.py:151
@@ -623,12 +639,12 @@ msgstr "Ponto de Pedido (PP) Automático"
#. module: procurement
#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
msgid "Minimum Inventory Rule"
-msgstr "Regra de Inventório Mínimo"
+msgstr "Regra de Estoque Mínimo"
#. module: procurement
#: help:stock.warehouse.orderpoint,qty_multiple:0
msgid "The procurement quantity will be rounded up to this multiple."
-msgstr ""
+msgstr "A quantidade de aquisição será arredondada para este múltiplo."
#. module: procurement
#: model:ir.model,name:procurement.model_res_company
@@ -638,7 +654,7 @@ msgstr "Empresas"
#. module: procurement
#: view:procurement.order:0
msgid "Extra Information"
-msgstr "Informação Extra"
+msgstr "Informações Adicionais"
#. module: procurement
#: help:procurement.order,name:0
@@ -668,12 +684,12 @@ msgstr "Pedir o Máximo"
#. module: procurement
#: sql_constraint:stock.picking:0
msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "A referência deve ser única por empresa!"
#. module: procurement
#: field:procurement.order,date_close:0
msgid "Date Closed"
-msgstr "Data Fechada"
+msgstr "Data de Fechamento"
#. module: procurement
#: field:mrp.property,composition:0
@@ -752,7 +768,7 @@ msgstr "Não urgente"
#: code:addons/procurement/procurement.py:297
#, python-format
msgid "No default supplier defined for this product"
-msgstr ""
+msgstr "Nenhum fornecedor padrão definido para este produto"
#. module: procurement
#: view:procurement.order:0
@@ -873,7 +889,7 @@ msgstr ""
"automaticamente irá criar pedidos de fabricação ou cotações de compra de "
"acordo com o nível de estoque. Uma vez que o estoque virtual de um produto "
"(= estoque disponível menos todos os pedidos confirmados e reservas) estiver "
-"abaixo da quantidade mínima, o OpenERP gera uma requisição de aquisição para "
+"abaixo da quantidade mínima, o OpenERP gera uma ordem de aquisição para "
"elevar o estoque até a quantidade máxima."
#. module: procurement
@@ -892,8 +908,8 @@ msgid ""
"This wizard will plan the procurement for this product. This procurement may "
"generate task, production orders or purchase orders."
msgstr ""
-"Este wizard irá planejar a aquisição deste produto. A aquisição poderá gerar "
-"tarefas, pedidos de produção ou pedidos de compra."
+"Este assistente irá planejar a aquisição deste produto. A aquisição poderá "
+"gerar tarefas, pedidos de produção ou pedidos de compra."
#. module: procurement
#: view:res.company:0
@@ -905,11 +921,12 @@ msgstr "Agendador de MRP & Logística"
#, python-format
msgid "Cannot delete Procurement Order(s) which are in %s state!"
msgstr ""
+"Não é possível excluir Ordem de Aquisição em que a situação seja %s !"
#. module: procurement
#: sql_constraint:res.company:0
msgid "The company name must be unique !"
-msgstr ""
+msgstr "O nome da empresa deve ser exclusivo!"
#. module: procurement
#: field:mrp.property,name:0
@@ -925,7 +942,7 @@ msgstr "máx"
#. module: procurement
#: field:procurement.order,product_uos:0
msgid "Product UoS"
-msgstr "Unid. de Venda do Produto"
+msgstr "UdV do Produto"
#. module: procurement
#: code:addons/procurement/procurement.py:356
@@ -1005,12 +1022,12 @@ msgstr "Detalhes da Aquisição"
#. module: procurement
#: view:procurement.order:0
msgid "Procurement started late"
-msgstr ""
+msgstr "Aquisição começou tarde"
#. module: procurement
#: constraint:product.product:0
msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Erro: Código EAN inválido"
#. module: procurement
#: code:addons/procurement/schedulers.py:152
@@ -1022,7 +1039,7 @@ msgstr "AGENDAMENTO"
#: code:addons/procurement/schedulers.py:88
#, python-format
msgid "PROC %d: on order - %3.2f %-5s - %s"
-msgstr ""
+msgstr "Aquisição %d: no pedido - %3.2f %-5s - %s"
#~ msgid ""
#~ "\n"
diff --git a/addons/procurement/i18n/ro.po b/addons/procurement/i18n/ro.po
index 9b8da9e1491..1c04a250fbf 100644
--- a/addons/procurement/i18n/ro.po
+++ b/addons/procurement/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/ru.po b/addons/procurement/i18n/ru.po
index 4beb8951849..b4541872669 100644
--- a/addons/procurement/i18n/ru.po
+++ b/addons/procurement/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
-"X-Generator: Launchpad (build 15887)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
@@ -30,7 +30,7 @@ msgstr "Планировщики"
#. module: procurement
#: model:ir.model,name:procurement.model_make_procurement
msgid "Make Procurements"
-msgstr "Сделать закупки"
+msgstr "Сделать снабжения"
#. module: procurement
#: help:procurement.order.compute.all,automatic:0
@@ -39,6 +39,9 @@ msgid ""
"under 0. You should probably not use this option, we suggest using a MTO "
"configuration on products."
msgstr ""
+"Запускает автоматическое снабжение для всех ТМЦ, которые имеют виртуальный "
+"запас меньше 0. Возможно вы не должны использовать этот параметр, мы "
+"предлагаем использование настройки MTO по продуктам."
#. module: procurement
#: view:stock.warehouse.orderpoint:0
@@ -80,7 +83,7 @@ msgstr "Правила вычисления минимального запас
#. module: procurement
#: view:procurement.order:0
msgid "Temporary Procurement Exceptions"
-msgstr ""
+msgstr "Временные исключения снабжения"
#. module: procurement
#: field:procurement.order,company_id:0
@@ -91,7 +94,7 @@ msgstr "Компания"
#. module: procurement
#: field:procurement.order,product_uos_qty:0
msgid "UoS Quantity"
-msgstr "Кол-во во второй ед. изм."
+msgstr "Количество в е.п."
#. module: procurement
#: view:procurement.order:0
@@ -117,7 +120,7 @@ msgstr "Не используется в расчётах, только для
#. module: procurement
#: field:stock.warehouse.orderpoint,procurement_id:0
msgid "Latest procurement"
-msgstr "Последняя закупка"
+msgstr "Последнее снабжение"
#. module: procurement
#: view:procurement.order:0
@@ -159,7 +162,7 @@ msgstr ""
#. module: procurement
#: view:procurement.order:0
msgid "Permanent Procurement Exceptions"
-msgstr ""
+msgstr "Постоянные проблемы снабжения"
#. module: procurement
#: view:stock.warehouse.orderpoint:0
@@ -211,6 +214,16 @@ msgid ""
"\n"
" Exceptions:\n"
msgstr ""
+"Это отчёт планирования снабжения.\n"
+"\n"
+" Время начала: %s \n"
+" Время окончания: %s\n"
+" Всего обработанных снабжений: %d\n"
+" Снабжения с проблемами: %d\n"
+" Пропущенные снабжения (плановая дата вне диапазона планировщика) %d "
+"\n"
+"\n"
+" Проблемы:\n"
#. module: procurement
#: selection:procurement.order,state:0
@@ -229,6 +242,9 @@ msgid ""
"procurement to bring the virtual stock to the Quantity specified as Max "
"Quantity."
msgstr ""
+"Когда виртуальный остаток становится ниже мин. количества, OpenERP создаёт "
+"снабжение для возвращения виртуального остатка к количеству определённому "
+"как макс. количество."
#. module: procurement
#: view:procurement.order.compute:0
@@ -247,13 +263,13 @@ msgid ""
"Reference of the document that created this Procurement.\n"
"This is automatically completed by OpenERP."
msgstr ""
-"Ссылка на документ, создавший этот запрос на снабжение.\n"
+"Ссылка на документ, создавший этот запрос снабжения.\n"
"Выполнено OpenERP автоматически."
#. module: procurement
#: view:stock.warehouse.orderpoint:0
msgid "Procurement Orders to Process"
-msgstr "Заказы на снабжение для обработки"
+msgstr "Заказы снабжения для обработки"
#. module: procurement
#: constraint:res.company:0
@@ -305,12 +321,12 @@ msgstr "Лучшая цена (не активна!)"
#: code:addons/procurement/schedulers.py:111
#, python-format
msgid "PROC %d: from stock - %3.2f %-5s - %s"
-msgstr ""
+msgstr "СНАБ %d: из запаса - %3.2f %-5s - %s"
#. module: procurement
#: view:procurement.order:0
msgid "Product & Location"
-msgstr "Продукция и местоположения"
+msgstr "Товар и место хранения"
#. module: procurement
#: model:ir.model,name:procurement.model_procurement_order_compute
@@ -337,6 +353,12 @@ msgid ""
"operations to fullfil the need: purchase order proposition, manufacturing "
"order, etc."
msgstr ""
+"Заказ снабжения используется для записи потребности конкретного продукта в "
+"конкретном месте хранения. Заказ снабжения создаётся обычно автоматически из "
+"заказов продаж, правила выхода логистики или правил минимума запаса. Когда "
+"заказ снабжения подтверждён, он автоматически создаёт необходимые операции "
+"для удовлетворения потребности: предложение заказа закупки, заказ "
+"изготовления и т.п."
#. module: procurement
#: field:make.procurement,date_planned:0
@@ -390,7 +412,7 @@ msgid ""
"Please check the quantity in procurement order(s), it should not be 0 or "
"less!"
msgstr ""
-"Пожалуйста, проверьте количество в заказе на снабжение, оно не должно быть "
+"Пожалуйста, проверьте количество в заказе снабжения, оно не должно быть "
"нулевым или отрицательным!"
#. module: procurement
@@ -399,7 +421,7 @@ msgid ""
"If you encode manually a Procurement, you probably want to use a make to "
"order method."
msgstr ""
-"Если вы составляете запрос на снабжение вручную, вероятно вы хотите "
+"Если вы составляете запрос снабжения вручную, вероятно вы хотите "
"использовать изготовление на заказ."
#. module: procurement
@@ -422,7 +444,7 @@ msgstr "Снабжение"
#. module: procurement
#: model:ir.actions.act_window,name:procurement.procurement_action
msgid "Procurement Orders"
-msgstr "Заказы на снабжение"
+msgstr "Заказы снабжения"
#. module: procurement
#: view:procurement.order:0
@@ -437,7 +459,7 @@ msgstr "Исключения"
#. module: procurement
#: model:process.node,note:procurement.process_node_serviceonorder0
msgid "Assignment from Production or Purchase Order."
-msgstr "Выделение из заказа на производство или на закупку."
+msgstr "Назначение из заказа производства или закупки."
#. module: procurement
#: model:ir.model,name:procurement.model_mrp_property
@@ -448,7 +470,7 @@ msgstr "Параметр"
#: model:ir.actions.act_window,name:procurement.act_make_procurement
#: view:make.procurement:0
msgid "Procurement Request"
-msgstr "Заявка на снабжение"
+msgstr "Заявка снабжения"
#. module: procurement
#: view:procurement.orderpoint.compute:0
@@ -462,6 +484,9 @@ msgid ""
"OpenERP generates a procurement to bring the virtual stock to the Max "
"Quantity."
msgstr ""
+"Когда виртуальный заказ становится меньше мин. количества заданного для "
+"этого поля, OpenERP создаёт заказ снабжения для возвращения виртуального "
+"запаса к макс. количеству."
#. module: procurement
#: model:process.process,name:procurement.process_process_serviceproductprocess0
@@ -471,14 +496,14 @@ msgstr "Сервис"
#. module: procurement
#: field:stock.warehouse.orderpoint,procurement_draft_ids:0
msgid "Related Procurement Orders"
-msgstr "Связанные заказы на снабжение"
+msgstr "Связанные заказы снабжения"
#. module: procurement
#: view:procurement.orderpoint.compute:0
msgid ""
"Wizard checks all the stock minimum rules and generate procurement order."
msgstr ""
-"Мастер проверит все правила минимальных запасов и создаст заказ на снабжение."
+"Мастер проверит все правила минимальных запасов и создаст заказ снабжения."
#. module: procurement
#: field:stock.warehouse.orderpoint,product_min_qty:0
@@ -498,7 +523,7 @@ msgstr "плюс"
#. module: procurement
#: constraint:stock.move:0
msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "Нельзя переместить ТМЦ в/из место хранения типа вид."
#. module: procurement
#: help:stock.warehouse.orderpoint,active:0
@@ -529,8 +554,8 @@ msgid ""
"background, you may have to wait for a few minutes until it has finished "
"computing."
msgstr ""
-"Этот мастер позволяет вам обработать все заказы на снабжение, производство "
-"и/или закупку, которые будут обработаны в соответствии с их настройками. По "
+"Этот мастер позволяет вам обработать все заказы снабжения, производства "
+"и/или закупки, которые будут обработаны в соответствии с их настройками. По "
"умолчанию, планировщик запускается каждую ночь. Вы можете использовать это "
"меню для его принудительного запуска. Помните, что он работает в фоновом "
"режиме, вы должны подождать несколько минут до окончания обработки."
@@ -632,7 +657,7 @@ msgstr "Доп. информация"
#. module: procurement
#: help:procurement.order,name:0
msgid "Procurement name."
-msgstr "Название закупки."
+msgstr "Название снабжения."
#. module: procurement
#: constraint:stock.move:0
@@ -690,7 +715,7 @@ msgstr "Прочее"
#. module: procurement
#: view:stock.warehouse.orderpoint:0
msgid "Locations"
-msgstr "Местоположения"
+msgstr "Места хранения"
#. module: procurement
#: selection:procurement.order,procure_method:0
@@ -781,7 +806,7 @@ msgstr "Правила минимальных запасов"
#. module: procurement
#: field:procurement.order,close_move:0
msgid "Close Move at end"
-msgstr ""
+msgstr "Закрыть перемещение в конце"
#. module: procurement
#: field:stock.warehouse.orderpoint,qty_multiple:0
@@ -859,7 +884,7 @@ msgid ""
"quantity."
msgstr ""
"Вы можете определить правило минимальных запасов так, что OpenERP будет "
-"автоматически создавать черновики заказов на производство или закупку в "
+"автоматически создавать черновики заказов производства или закупки в "
"соответствии с количеством запасов. Если минимальное количество ТМЦ (= "
"остаток на складе минус все подтвержденные заказы и зарезервированное) "
"меньше минимального количества, OpenERP будет генерировать запрос на "
@@ -882,7 +907,7 @@ msgid ""
"generate task, production orders or purchase orders."
msgstr ""
"Этот мастер будет планировать снабжение этой продукцией. Процесс снабжения "
-"может генерировать задачи, заказы на производство, заказы на закупку."
+"может генерировать задачи, заказы производства, заказы закупки."
#. module: procurement
#: view:res.company:0
@@ -893,7 +918,7 @@ msgstr "ПМР и Логистическое планирование"
#: code:addons/procurement/procurement.py:138
#, python-format
msgid "Cannot delete Procurement Order(s) which are in %s state!"
-msgstr ""
+msgstr "Нельзя удалить заказ(ы) снабжения в состоянии %s!"
#. module: procurement
#: sql_constraint:res.company:0
@@ -914,7 +939,7 @@ msgstr "макс."
#. module: procurement
#: field:procurement.order,product_uos:0
msgid "Product UoS"
-msgstr "Вторая ед. изм."
+msgstr "Ед.продажи товара"
#. module: procurement
#: code:addons/procurement/procurement.py:356
@@ -943,21 +968,20 @@ msgid ""
"others require manual intervention (those are identified by a specific error "
"message)."
msgstr ""
-"Заказы на снабжение представляют собой необходимость определенного "
-"количества ТМЦ, в данный момент времени, в данном месте. Заказ на продажу "
-"это типичный источник для заказа на снабжение (но это различные документы). "
-"В зависимости от требуемых условий снабжения и свойств ТМЦ алгоритм "
-"снабжения будет резервировать ТМЦ на складе, заказывать ТМЦ у поставщика, "
-"передавать заказ на производство и т.д. Исключительная ситуация при "
-"снабжении случается когда системе не удается найти способ выполнить "
-"снабжение. Некоторые исключительные ситуации могут разрешиться сами собой "
-"автоматически, другие требуют вмешательства (определяется по конкретному "
-"сообщению об ошибке)."
+"Заказы снабжения представляют собой необходимость определенного количества "
+"ТМЦ, в данный момент времени, в данном месте. Заказ продаж это типичный "
+"источник для заказа снабжения (но это различные документы). В зависимости от "
+"требуемых условий снабжения и свойств ТМЦ алгоритм снабжения будет "
+"резервировать ТМЦ на складе, заказывать ТМЦ у поставщика, передавать заказ "
+"на производство и т.д. Исключительная ситуация при снабжении случается когда "
+"системе не удается найти способ выполнить снабжение. Некоторые "
+"исключительные ситуации могут разрешиться сами собой автоматически, другие "
+"требуют вмешательства (определяется по конкретному сообщению об ошибке)."
#. module: procurement
#: field:procurement.order,product_uom:0
msgid "Product UoM"
-msgstr "Ед. изм. продукции"
+msgstr "Ед. изм. ТМЦ"
#. module: procurement
#: view:procurement.order:0
@@ -977,7 +1001,7 @@ msgstr ""
#. module: procurement
#: selection:procurement.order,priority:0
msgid "Very Urgent"
-msgstr "Весьма срочно"
+msgstr "Очень срочно"
#. module: procurement
#: field:procurement.orderpoint.compute,automatic:0
@@ -992,7 +1016,7 @@ msgstr "Детали снабжения"
#. module: procurement
#: view:procurement.order:0
msgid "Procurement started late"
-msgstr ""
+msgstr "Дата начала снабжения"
#. module: procurement
#: constraint:product.product:0
@@ -1009,7 +1033,7 @@ msgstr "ПЛАНИРОВЩИК"
#: code:addons/procurement/schedulers.py:88
#, python-format
msgid "PROC %d: on order - %3.2f %-5s - %s"
-msgstr ""
+msgstr "СНАБ %d: по заказу - %3.2f %-5s - %s"
#, python-format
#~ msgid ""
diff --git a/addons/procurement/i18n/sr.po b/addons/procurement/i18n/sr.po
index 000eaadd575..e61533318d2 100644
--- a/addons/procurement/i18n/sr.po
+++ b/addons/procurement/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/sr@latin.po b/addons/procurement/i18n/sr@latin.po
index 3a561f60a3b..be67c2ddf0a 100644
--- a/addons/procurement/i18n/sr@latin.po
+++ b/addons/procurement/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/sv.po b/addons/procurement/i18n/sv.po
index 4f66666d0d8..665c1150ab7 100644
--- a/addons/procurement/i18n/sv.po
+++ b/addons/procurement/i18n/sv.po
@@ -14,18 +14,18 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
msgid "Ask New Products"
-msgstr "Be om nya produkter"
+msgstr "Begär nya produkter"
#. module: procurement
#: model:ir.ui.menu,name:procurement.menu_stock_sched
msgid "Schedulers"
-msgstr "Schedulers"
+msgstr "Schemaläggare"
#. module: procurement
#: model:ir.model,name:procurement.model_make_procurement
@@ -74,7 +74,7 @@ msgstr "Anskaffningsmetod"
#: code:addons/procurement/procurement.py:307
#, python-format
msgid "No address defined for the supplier"
-msgstr ""
+msgstr "Ingen adress definierad för leverantören"
#. module: procurement
#: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -84,7 +84,7 @@ msgstr "Beräkna endast minsta lagersaldoregel"
#. module: procurement
#: view:procurement.order:0
msgid "Temporary Procurement Exceptions"
-msgstr ""
+msgstr "Tillfälligt anskaffningsfel"
#. module: procurement
#: field:procurement.order,company_id:0
@@ -95,7 +95,7 @@ msgstr "Bolag"
#. module: procurement
#: field:procurement.order,product_uos_qty:0
msgid "UoS Quantity"
-msgstr ""
+msgstr "Måttenhet Kvantitet"
#. module: procurement
#: view:procurement.order:0
@@ -116,7 +116,7 @@ msgstr "Senaste fel"
#. module: procurement
#: help:mrp.property,composition:0
msgid "Not used in computations, for information purpose only."
-msgstr ""
+msgstr "Används inte i beräkningar, endast avsedd som information."
#. module: procurement
#: field:stock.warehouse.orderpoint,procurement_id:0
@@ -136,7 +136,7 @@ msgstr "beställt"
#. module: procurement
#: help:procurement.order,message:0
msgid "Exception occurred while computing procurement orders."
-msgstr ""
+msgstr "Ett Undantag inträffade vid beräkning av anskaffningsorder."
#. module: procurement
#: help:procurement.order,state:0
@@ -150,11 +150,17 @@ msgid ""
" It is in 'Waiting'. state when the procurement is waiting for another one "
"to finish."
msgstr ""
+"När en upphandling skapas sätts den först till 'Utkast'.\n"
+"Om upphandlingen bekräftas, sätts statusen till 'Bekräftad'.\n"
+"Efter att den bekräftats blir den satt till satt till 'Pågående'.\n"
+"Om något behöver åtgärdas i ordern ändras statusen till 'Undantag'.\n"
+"När åtgärden är utförd blir statusen 'Klar'.\n"
+"Statusen är 'Väntar' när upphandlingen väntar på åtgärd."
#. module: procurement
#: view:procurement.order:0
msgid "Permanent Procurement Exceptions"
-msgstr ""
+msgstr "Permanenta upphandlingsfel"
#. module: procurement
#: view:stock.warehouse.orderpoint:0
@@ -164,7 +170,7 @@ msgstr "Sökning på regler för minimilager"
#. module: procurement
#: view:procurement.order.compute.all:0
msgid "Scheduler Parameters"
-msgstr ""
+msgstr "Parametrar Schemaläggare"
#. module: procurement
#: model:ir.model,name:procurement.model_stock_move
@@ -174,22 +180,22 @@ msgstr "Lagertransaktion"
#. module: procurement
#: model:ir.model,name:procurement.model_procurement_order_compute_all
msgid "Compute all schedulers"
-msgstr ""
+msgstr "Beräkna alla schemaläggare"
#. module: procurement
#: view:procurement.order:0
msgid "Planification"
-msgstr ""
+msgstr "Planering"
#. module: procurement
#: selection:procurement.order,state:0
msgid "Ready"
-msgstr "Klar"
+msgstr "Färdig"
#. module: procurement
#: field:procurement.order.compute.all,automatic:0
msgid "Automatic orderpoint"
-msgstr ""
+msgstr "Automatisk orderpunkt"
#. module: procurement
#: code:addons/procurement/schedulers.py:123
@@ -206,6 +212,16 @@ msgid ""
"\n"
" Exceptions:\n"
msgstr ""
+"Detta är rapporten för upphandlingensschemaläggning \n"
+"\n"
+" starttid:. %s \n"
+" Sluttid: %s \n"
+" Totalt bearbetade upphandlingar: %d \n"
+" Upphandlingar med åtgärder: %d \n"
+" Överhoppade upphandling (planerade datumet utanför schemaläggaren intervall "
+") %d \n"
+"\n"
+" Undantag:\n"
#. module: procurement
#: selection:procurement.order,state:0
@@ -224,6 +240,9 @@ msgid ""
"procurement to bring the virtual stock to the Quantity specified as Max "
"Quantity."
msgstr ""
+"När det virtuella lagret går under Min.Antal genererar OpenERP själv en "
+"upphandling för att få det virtuella lager till den kvantitet som anges som "
+"max antal."
#. module: procurement
#: view:procurement.order.compute:0
@@ -242,11 +261,13 @@ msgid ""
"Reference of the document that created this Procurement.\n"
"This is automatically completed by OpenERP."
msgstr ""
+"Hänvisning till dokument som skapade denna upphandling. \n"
+" Detta sköts automatiskt av OpenERP."
#. module: procurement
#: view:stock.warehouse.orderpoint:0
msgid "Procurement Orders to Process"
-msgstr ""
+msgstr "Upphandlingsorder att bearbeta"
#. module: procurement
#: constraint:res.company:0
@@ -257,7 +278,7 @@ msgstr "Fel! Du kan inte skapa rekursiva bolagsstrukturer."
#: code:addons/procurement/procurement.py:386
#, python-format
msgid "Procurement '%s' is in exception: "
-msgstr ""
+msgstr "Upphandling '%s' behöver åtgärdas: "
#. module: procurement
#: field:procurement.order,priority:0
@@ -292,13 +313,13 @@ msgstr "Lager"
#. module: procurement
#: selection:stock.warehouse.orderpoint,logic:0
msgid "Best price (not yet active!)"
-msgstr ""
+msgstr "Bästa pris (ännu ej aktiv!)"
#. module: procurement
#: code:addons/procurement/schedulers.py:111
#, python-format
msgid "PROC %d: from stock - %3.2f %-5s - %s"
-msgstr ""
+msgstr "PROC %d: från lager - %3.2f%-5s -%s"
#. module: procurement
#: view:procurement.order:0
@@ -308,17 +329,17 @@ msgstr "Produkt och lagerplats"
#. module: procurement
#: model:ir.model,name:procurement.model_procurement_order_compute
msgid "Compute Procurement"
-msgstr ""
+msgstr "Beräkna Anskaffning"
#. module: procurement
#: field:stock.move,procurements:0
msgid "Procurements"
-msgstr "Anskaffning"
+msgstr "Anskaffningar"
#. module: procurement
#: field:res.company,schedule_range:0
msgid "Scheduler Range Days"
-msgstr ""
+msgstr "Schemaläggare antal dagar"
#. module: procurement
#: model:ir.actions.act_window,help:procurement.procurement_action
@@ -330,6 +351,12 @@ msgid ""
"operations to fullfil the need: purchase order proposition, manufacturing "
"order, etc."
msgstr ""
+"En anskaffningsorder används för att registrera ett behov av en specifik "
+"produkt på en viss plats. En anskaffningsbeställning är vanligtvis skapat "
+"automatiskt från en försäljningsorder, en Dra logistik regel eller "
+"minimiregler för lager. När anskaffningsbeställningen bekräftas skapas "
+"automatiskt de nödvändiga åtgärder för att tillfredsställa behovet: förslag "
+"till inköpsorder, tillverkningsorder, etc."
#. module: procurement
#: field:make.procurement,date_planned:0
@@ -351,7 +378,7 @@ msgstr "Antal"
#: code:addons/procurement/procurement.py:379
#, python-format
msgid "Not enough stock and no minimum orderpoint rule defined."
-msgstr ""
+msgstr "Ej tillräckligt lager och regel för minsta lager saknas."
#. module: procurement
#: code:addons/procurement/procurement.py:137
@@ -368,7 +395,7 @@ msgstr "Referenser"
#: view:product.product:0
#: field:product.product,orderpoint_ids:0
msgid "Minimum Stock Rule"
-msgstr ""
+msgstr "Regel för Minsta Lager"
#. module: procurement
#: view:res.company:0
@@ -382,6 +409,7 @@ msgid ""
"Please check the quantity in procurement order(s), it should not be 0 or "
"less!"
msgstr ""
+"Kontrollera mängden i anskaffningsordern. Det bör inte vara 0 eller mindre!"
#. module: procurement
#: help:procurement.order,procure_method:0
@@ -389,6 +417,8 @@ msgid ""
"If you encode manually a Procurement, you probably want to use a make to "
"order method."
msgstr ""
+"Om du manuellt gör en upphandling, vill du förmodligen använda metoden "
+"tillverka på order."
#. module: procurement
#: model:ir.ui.menu,name:procurement.menu_stock_procurement
@@ -398,7 +428,7 @@ msgstr "Automatiska anskaffningar"
#. module: procurement
#: field:stock.warehouse.orderpoint,product_max_qty:0
msgid "Max Quantity"
-msgstr ""
+msgstr "Max antal"
#. module: procurement
#: model:ir.model,name:procurement.model_procurement_order
@@ -415,33 +445,33 @@ msgstr "Anskaffningsorders"
#. module: procurement
#: view:procurement.order:0
msgid "To Fix"
-msgstr ""
+msgstr "Att fixa"
#. module: procurement
#: view:procurement.order:0
msgid "Exceptions"
-msgstr ""
+msgstr "Undantag"
#. module: procurement
#: model:process.node,note:procurement.process_node_serviceonorder0
msgid "Assignment from Production or Purchase Order."
-msgstr ""
+msgstr "Uppdrag från produktion eller inköpsorder."
#. module: procurement
#: model:ir.model,name:procurement.model_mrp_property
msgid "Property"
-msgstr ""
+msgstr "Fastighet"
#. module: procurement
#: model:ir.actions.act_window,name:procurement.act_make_procurement
#: view:make.procurement:0
msgid "Procurement Request"
-msgstr ""
+msgstr "Inköpsförfrågan"
#. module: procurement
#: view:procurement.orderpoint.compute:0
msgid "Compute Stock"
-msgstr ""
+msgstr "Beräkna Lager"
#. module: procurement
#: help:stock.warehouse.orderpoint,product_min_qty:0
@@ -450,6 +480,9 @@ msgid ""
"OpenERP generates a procurement to bring the virtual stock to the Max "
"Quantity."
msgstr ""
+"När den virtuella beståndet går under Min. mängd som anges i det här fältet "
+"genererar OpenERP automatiskt en anskaffning för att få den virtuella lagret "
+"till Max. antal."
#. module: procurement
#: model:process.process,name:procurement.process_process_serviceproductprocess0
@@ -459,13 +492,15 @@ msgstr "Tjänst"
#. module: procurement
#: field:stock.warehouse.orderpoint,procurement_draft_ids:0
msgid "Related Procurement Orders"
-msgstr ""
+msgstr "Relaterade anskaffningsordrar"
#. module: procurement
#: view:procurement.orderpoint.compute:0
msgid ""
"Wizard checks all the stock minimum rules and generate procurement order."
msgstr ""
+"Guiden kontrollerar alla regler för minsta lager och genererar "
+"anskaffningsordrarna."
#. module: procurement
#: field:stock.warehouse.orderpoint,product_min_qty:0
@@ -480,12 +515,12 @@ msgstr "Brådskande"
#. module: procurement
#: selection:mrp.property,composition:0
msgid "plus"
-msgstr ""
+msgstr "plus"
#. module: procurement
#: constraint:stock.move:0
msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "Du kan inte flytta produkter från eller till en plats av typen vyn."
#. module: procurement
#: help:stock.warehouse.orderpoint,active:0
@@ -493,6 +528,8 @@ msgid ""
"If the active field is set to False, it will allow you to hide the "
"orderpoint without removing it."
msgstr ""
+"Om det aktiva fältet är satt till Falskt, kommer du att kunna dölja "
+"orderpunkt utan att ta bort det."
#. module: procurement
#: help:procurement.orderpoint.compute,automatic:0
@@ -515,17 +552,23 @@ msgid ""
"background, you may have to wait for a few minutes until it has finished "
"computing."
msgstr ""
+"Den här guiden ger dig möjlighet att köra alla inköp, produktion och / eller "
+"köp order som ska behandlas utifrån deras konfiguration. Som standard "
+"startas schemaläggaren automatiskt varje natt av OpenERP. Du kan använda "
+"denna meny för att tvinga den att köras nu. Observera att den körs i "
+"bakgrunden. Du kan behöva vänta några minuter tills den är klar med "
+"beräkningarna."
#. module: procurement
#: view:procurement.order:0
#: field:procurement.order,note:0
msgid "Note"
-msgstr ""
+msgstr "Anteckning"
#. module: procurement
#: selection:procurement.order,state:0
msgid "Draft"
-msgstr ""
+msgstr "Utkast"
#. module: procurement
#: view:procurement.order.compute:0
@@ -535,7 +578,7 @@ msgstr "Den här guiden kommer planlägga anskaffningar."
#. module: procurement
#: view:procurement.order:0
msgid "Status"
-msgstr ""
+msgstr "Status"
#. module: procurement
#: selection:procurement.order,priority:0
@@ -551,7 +594,7 @@ msgstr "Du försöker tilldela ett parti som inte är från samma produkt."
#: code:addons/procurement/procurement.py:383
#, python-format
msgid "Not enough stock."
-msgstr ""
+msgstr "Inte tillräckligt lager."
#. module: procurement
#: field:stock.warehouse.orderpoint,active:0
@@ -566,7 +609,7 @@ msgstr "Produktanskaffning"
#. module: procurement
#: field:procurement.order,date_planned:0
msgid "Scheduled date"
-msgstr ""
+msgstr "Planerat datum"
#. module: procurement
#: selection:procurement.order,state:0
@@ -577,28 +620,29 @@ msgstr "Undantag"
#: code:addons/procurement/procurement.py:381
#, python-format
msgid "No minimum orderpoint rule defined."
-msgstr ""
+msgstr "Ingen regel för minsta orderpunkt har definieras."
#. module: procurement
#: code:addons/procurement/schedulers.py:151
#, python-format
msgid "Automatic OP: %s"
-msgstr ""
+msgstr "Automatisk OP: %s"
#. module: procurement
#: model:ir.model,name:procurement.model_procurement_orderpoint_compute
msgid "Automatic Order Point"
-msgstr ""
+msgstr "Automatisk orderpunkt"
#. module: procurement
#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
msgid "Minimum Inventory Rule"
-msgstr ""
+msgstr "Minsta lager regel"
#. module: procurement
#: help:stock.warehouse.orderpoint,qty_multiple:0
msgid "The procurement quantity will be rounded up to this multiple."
msgstr ""
+"Upphandlingens kvantitet kommer att avrundas uppåt till denna multipel."
#. module: procurement
#: model:ir.model,name:procurement.model_res_company
@@ -613,7 +657,7 @@ msgstr "Extra Information"
#. module: procurement
#: help:procurement.order,name:0
msgid "Procurement name."
-msgstr ""
+msgstr "Upphandling namn."
#. module: procurement
#: constraint:stock.move:0
@@ -628,70 +672,70 @@ msgstr "Anskaffningsorsak"
#. module: procurement
#: sql_constraint:stock.warehouse.orderpoint:0
msgid "Qty Multiple must be greater than zero."
-msgstr ""
+msgstr "Antal multipel måste vara större än noll."
#. module: procurement
#: selection:stock.warehouse.orderpoint,logic:0
msgid "Order to Max"
-msgstr ""
+msgstr "Order till Max"
#. module: procurement
#: sql_constraint:stock.picking:0
msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Referens måste vara unikt per företag!"
#. module: procurement
#: field:procurement.order,date_close:0
msgid "Date Closed"
-msgstr ""
+msgstr "Datum stängd"
#. module: procurement
#: field:mrp.property,composition:0
msgid "Properties composition"
-msgstr ""
+msgstr "Egenskaper sammansättning"
#. module: procurement
#: code:addons/procurement/procurement.py:327
#, python-format
msgid "Data Insufficient !"
-msgstr ""
+msgstr "Otillräckliga data!"
#. module: procurement
#: model:ir.model,name:procurement.model_mrp_property_group
#: field:mrp.property,group_id:0
#: field:mrp.property.group,name:0
msgid "Property Group"
-msgstr ""
+msgstr "Enhetsgrupp"
#. module: procurement
#: view:stock.warehouse.orderpoint:0
msgid "Misc"
-msgstr ""
+msgstr "Övrigt"
#. module: procurement
#: view:stock.warehouse.orderpoint:0
msgid "Locations"
-msgstr ""
+msgstr "Platser"
#. module: procurement
#: selection:procurement.order,procure_method:0
msgid "from stock"
-msgstr ""
+msgstr "från lager"
#. module: procurement
#: view:stock.warehouse.orderpoint:0
msgid "General Information"
-msgstr ""
+msgstr "Allmän information"
#. module: procurement
#: view:procurement.order:0
msgid "Run Procurement"
-msgstr ""
+msgstr "Kör upphandling"
#. module: procurement
#: selection:procurement.order,state:0
msgid "Done"
-msgstr ""
+msgstr "Avslutad"
#. module: procurement
#: view:make.procurement:0
@@ -701,33 +745,33 @@ msgstr ""
#: view:procurement.order.compute.all:0
#: view:procurement.orderpoint.compute:0
msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
#. module: procurement
#: field:stock.warehouse.orderpoint,logic:0
msgid "Reordering Mode"
-msgstr ""
+msgstr "Repitorderläge"
#. module: procurement
#: field:procurement.order,origin:0
msgid "Source Document"
-msgstr ""
+msgstr "Källdokument"
#. module: procurement
#: selection:procurement.order,priority:0
msgid "Not urgent"
-msgstr ""
+msgstr "Inte brådskande"
#. module: procurement
#: code:addons/procurement/procurement.py:297
#, python-format
msgid "No default supplier defined for this product"
-msgstr ""
+msgstr "Ingen standard leverantör definierad för denna produkt"
#. module: procurement
#: view:procurement.order:0
msgid "Late"
-msgstr ""
+msgstr "Sen"
#. module: procurement
#: view:board.board:0
@@ -737,7 +781,7 @@ msgstr "Anskaffningar i undantag"
#. module: procurement
#: view:procurement.order:0
msgid "Details"
-msgstr ""
+msgstr "Detaljer"
#. module: procurement
#: model:ir.actions.act_window,name:procurement.procurement_action5
@@ -746,7 +790,7 @@ msgstr ""
#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
#: view:procurement.order:0
msgid "Procurement Exceptions"
-msgstr ""
+msgstr "Anskaffningsundantag"
#. module: procurement
#: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
@@ -757,22 +801,22 @@ msgstr ""
#: view:product.product:0
#: view:stock.warehouse.orderpoint:0
msgid "Minimum Stock Rules"
-msgstr ""
+msgstr "Regler för Minsta Lager"
#. module: procurement
#: field:procurement.order,close_move:0
msgid "Close Move at end"
-msgstr ""
+msgstr "Stäng Flytta till slutet"
#. module: procurement
#: field:stock.warehouse.orderpoint,qty_multiple:0
msgid "Qty Multiple"
-msgstr ""
+msgstr "Antal Flera"
#. module: procurement
#: view:procurement.order:0
msgid "Scheduled Date"
-msgstr ""
+msgstr "Planerat datum"
#. module: procurement
#: model:ir.model,name:procurement.model_product_product
@@ -786,28 +830,28 @@ msgstr "Produkt"
#. module: procurement
#: view:procurement.order:0
msgid "Temporary"
-msgstr ""
+msgstr "Tillfällig"
#. module: procurement
#: field:mrp.property,description:0
#: field:mrp.property.group,description:0
msgid "Description"
-msgstr ""
+msgstr "Beskrivning"
#. module: procurement
#: selection:mrp.property,composition:0
msgid "min"
-msgstr ""
+msgstr "min"
#. module: procurement
#: view:stock.warehouse.orderpoint:0
msgid "Quantity Rules"
-msgstr ""
+msgstr "Antal Regler"
#. module: procurement
#: selection:procurement.order,state:0
msgid "Running"
-msgstr ""
+msgstr "Pågående"
#. module: procurement
#: field:stock.warehouse.orderpoint,product_uom:0
@@ -817,17 +861,17 @@ msgstr "Produktenhet"
#. module: procurement
#: model:process.node,name:procurement.process_node_serviceonorder0
msgid "Make to Order"
-msgstr ""
+msgstr "Tillverka på order"
#. module: procurement
#: view:procurement.order:0
msgid "UOM"
-msgstr ""
+msgstr "Måttenhet"
#. module: procurement
#: selection:procurement.order,state:0
msgid "Waiting"
-msgstr ""
+msgstr "Väntar"
#. module: procurement
#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
@@ -849,12 +893,12 @@ msgstr ""
#. module: procurement
#: field:procurement.order,move_id:0
msgid "Reservation"
-msgstr ""
+msgstr "Reservation"
#. module: procurement
#: model:process.node,note:procurement.process_node_procureproducts0
msgid "The way to procurement depends on the product type."
-msgstr ""
+msgstr "Vägen till anskaffning beror på produkttyp."
#. module: procurement
#: view:make.procurement:0
@@ -862,33 +906,35 @@ msgid ""
"This wizard will plan the procurement for this product. This procurement may "
"generate task, production orders or purchase orders."
msgstr ""
+"Den här guiden kommer att planera upphandlingen för denna produkt. Denna "
+"upphandling kan generera uppgifter, produktionsorder eller anskaffningsorder."
#. module: procurement
#: view:res.company:0
msgid "MRP & Logistics Scheduler"
-msgstr ""
+msgstr "MRP & Logistik Schemaläggare"
#. module: procurement
#: code:addons/procurement/procurement.py:138
#, python-format
msgid "Cannot delete Procurement Order(s) which are in %s state!"
-msgstr ""
+msgstr "Kan inte ta bort anskaffningsorder som är i status %s !"
#. module: procurement
#: sql_constraint:res.company:0
msgid "The company name must be unique !"
-msgstr ""
+msgstr "Företagsnamnet måste vara unikt!"
#. module: procurement
#: field:mrp.property,name:0
#: field:stock.warehouse.orderpoint,name:0
msgid "Name"
-msgstr ""
+msgstr "Namn"
#. module: procurement
#: selection:mrp.property,composition:0
msgid "max"
-msgstr ""
+msgstr "max"
#. module: procurement
#: field:procurement.order,product_uos:0
@@ -899,14 +945,14 @@ msgstr "Produkt försäljningsenhet"
#: code:addons/procurement/procurement.py:356
#, python-format
msgid "from stock: products assigned."
-msgstr ""
+msgstr "från lager: Produkter tilldelade."
#. module: procurement
#: model:ir.actions.act_window,name:procurement.action_compute_schedulers
#: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
#: view:procurement.order.compute.all:0
msgid "Compute Schedulers"
-msgstr ""
+msgstr "Beräkna schemaläggare"
#. module: procurement
#: model:ir.actions.act_window,help:procurement.procurement_exceptions
@@ -941,7 +987,7 @@ msgstr "Produktenhet"
#. module: procurement
#: view:procurement.order:0
msgid "Search Procurement"
-msgstr ""
+msgstr "Sök anskaffning"
#. module: procurement
#: help:res.company,schedule_range:0
@@ -950,40 +996,43 @@ msgid ""
"procurements. All procurements that are not between today and today+range "
"are skipped for future computation."
msgstr ""
+"Detta är tidsramen analyserad av schemaläggaren vid beräkning av "
+"upphandlingarna. Alla upphandlingar som inte ligger mellan idag och "
+"today+range utesluts för att istället kunna göra framtida beräkning."
#. module: procurement
#: selection:procurement.order,priority:0
msgid "Very Urgent"
-msgstr ""
+msgstr "Mycket brådskande"
#. module: procurement
#: field:procurement.orderpoint.compute,automatic:0
msgid "Automatic Orderpoint"
-msgstr ""
+msgstr "Automatisk Orderpunkt"
#. module: procurement
#: view:procurement.order:0
msgid "Procurement Details"
-msgstr ""
+msgstr "Upphandling Detaljer"
#. module: procurement
#: view:procurement.order:0
msgid "Procurement started late"
-msgstr ""
+msgstr "Upphandling startade sent"
#. module: procurement
#: constraint:product.product:0
msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Fel: felaktig EAN kod"
#. module: procurement
#: code:addons/procurement/schedulers.py:152
#, python-format
msgid "SCHEDULER"
-msgstr ""
+msgstr "SCHEMALÄGGARE"
#. module: procurement
#: code:addons/procurement/schedulers.py:88
#, python-format
msgid "PROC %d: on order - %3.2f %-5s - %s"
-msgstr ""
+msgstr "PROC %d : på beställning -% 3.2f%-5s -% s"
diff --git a/addons/procurement/i18n/tr.po b/addons/procurement/i18n/tr.po
index 598c518cd88..1de0d0bc679 100644
--- a/addons/procurement/i18n/tr.po
+++ b/addons/procurement/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
@@ -83,7 +83,7 @@ msgstr "Sadece Minimum Stok Kuralını Hesapla"
#. module: procurement
#: view:procurement.order:0
msgid "Temporary Procurement Exceptions"
-msgstr ""
+msgstr "Geçici Satınalma İstisnaları"
#. module: procurement
#: field:procurement.order,company_id:0
@@ -159,7 +159,7 @@ msgstr ""
#. module: procurement
#: view:procurement.order:0
msgid "Permanent Procurement Exceptions"
-msgstr ""
+msgstr "Kalıcı Satınalma İstisnaları"
#. module: procurement
#: view:stock.warehouse.orderpoint:0
@@ -211,6 +211,16 @@ msgid ""
"\n"
" Exceptions:\n"
msgstr ""
+"Bu satınalma planlama raporudur.\n"
+"\n"
+" Başlama Tarihi: %s \n"
+" Bitiş Tarihi: %s \n"
+" Toplam İşlenen Satınalmalar: %d \n"
+" Satınalma İstisnaları: %d \n"
+" Atlanan Satınalmalar (planlama alanı dışındaki planlanan tarih ) %d "
+"\n"
+"\n"
+" İstisnalar:\n"
#. module: procurement
#: selection:procurement.order,state:0
@@ -229,6 +239,8 @@ msgid ""
"procurement to bring the virtual stock to the Quantity specified as Max "
"Quantity."
msgstr ""
+"Sanal stok Enaz Miktarın altına düştüğünde, OpenERP sanal stoğu Ençok Miktar "
+"olarak belirlenen Stoğa getirmek için bir satınalma oluşturur."
#. module: procurement
#: view:procurement.order.compute:0
@@ -303,7 +315,7 @@ msgstr "En İyi Fiyat(Henüz aktif değil)"
#: code:addons/procurement/schedulers.py:111
#, python-format
msgid "PROC %d: from stock - %3.2f %-5s - %s"
-msgstr ""
+msgstr "SATIN %d: stoktan - %3.2f %-5s - %s"
#. module: procurement
#: view:procurement.order:0
@@ -379,7 +391,7 @@ msgstr "Referanslar"
#: view:product.product:0
#: field:product.product,orderpoint_ids:0
msgid "Minimum Stock Rule"
-msgstr ""
+msgstr "Enaz Stok Kuralı"
#. module: procurement
#: view:res.company:0
@@ -393,6 +405,8 @@ msgid ""
"Please check the quantity in procurement order(s), it should not be 0 or "
"less!"
msgstr ""
+"Lütfen Satınalma Sipariş(ler)indeki miktarı kontrol edin, 0 ya da daha az "
+"olmamalı!"
#. module: procurement
#: help:procurement.order,procure_method:0
@@ -463,6 +477,8 @@ msgid ""
"OpenERP generates a procurement to bring the virtual stock to the Max "
"Quantity."
msgstr ""
+"Sanal stok bu alan için belirlenen Enaz Miktarın altına düşerse, OpenERP "
+"sanal stoğu Ençok Miktara getirmek için bir satınalma oluşturur."
#. module: procurement
#: model:process.process,name:procurement.process_process_serviceproductprocess0
@@ -500,7 +516,7 @@ msgstr "artı"
#. module: procurement
#: constraint:stock.move:0
msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "Görünüm tipindeki bir konuma ürün giriş çıkışı yapamazsınız."
#. module: procurement
#: help:stock.warehouse.orderpoint,active:0
@@ -621,7 +637,7 @@ msgstr "Minimum Envanter Kuralı"
#. module: procurement
#: help:stock.warehouse.orderpoint,qty_multiple:0
msgid "The procurement quantity will be rounded up to this multiple."
-msgstr ""
+msgstr "Satınalma miktarı bu katsayıya yuvarlanır."
#. module: procurement
#: model:ir.model,name:procurement.model_res_company
@@ -661,7 +677,7 @@ msgstr "Maks.'a Sipariş"
#. module: procurement
#: sql_constraint:stock.picking:0
msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Referans her şirket için benzersiz olmalı!"
#. module: procurement
#: field:procurement.order,date_close:0
@@ -897,12 +913,12 @@ msgstr "MRP ve Lojistik Zamanlayıcı"
#: code:addons/procurement/procurement.py:138
#, python-format
msgid "Cannot delete Procurement Order(s) which are in %s state!"
-msgstr ""
+msgstr "%s Durumundaki Satınalma Sipariş(ler)i silimemiyor!"
#. module: procurement
#: sql_constraint:res.company:0
msgid "The company name must be unique !"
-msgstr ""
+msgstr "Firma adı benzersiz olmalı !"
#. module: procurement
#: field:mrp.property,name:0
@@ -997,12 +1013,12 @@ msgstr "Satınalma Detayları"
#. module: procurement
#: view:procurement.order:0
msgid "Procurement started late"
-msgstr ""
+msgstr "Satınalma geç başladı"
#. module: procurement
#: constraint:product.product:0
msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Hata: Geçersiz ean kodu"
#. module: procurement
#: code:addons/procurement/schedulers.py:152
@@ -1014,7 +1030,7 @@ msgstr "ZAMANLAYICI"
#: code:addons/procurement/schedulers.py:88
#, python-format
msgid "PROC %d: on order - %3.2f %-5s - %s"
-msgstr ""
+msgstr "SATIN %d: siparişte - %3.2f %-5s - %s"
#~ msgid ""
#~ "When the virtual stock goes belong the Min Quantity, OpenERP generates a "
diff --git a/addons/procurement/i18n/vi.po b/addons/procurement/i18n/vi.po
index 2940cd75cef..891b220c6ba 100644
--- a/addons/procurement/i18n/vi.po
+++ b/addons/procurement/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/i18n/zh_CN.po b/addons/procurement/i18n/zh_CN.po
index 06a82ce39bb..a59c1d8a8d4 100644
--- a/addons/procurement/i18n/zh_CN.po
+++ b/addons/procurement/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:36+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:32+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: procurement
#: view:make.procurement:0
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 5d81bcbb9ba..b21cef30773 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -102,7 +102,6 @@ class procurement_order(osv.osv):
'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]},
readonly=True, required=True, help="If you encode manually a Procurement, you probably want to use" \
" a make to order method."),
-
'note': fields.text('Note'),
'message': fields.char('Latest error', size=124, help="Exception occurred while computing procurement orders."),
'state': fields.selection([
@@ -362,11 +361,10 @@ class procurement_order(osv.osv):
""" Changes procurement state to Running and writes message.
@return: True
"""
- message = _('From stock: products assigned.')
+ message = _('Products reserved from stock.')
self.write(cr, uid, ids, {'state': 'running',
'message': message}, context=context)
self.message_post(cr, uid, ids, body=message, context=context)
- self.running_send_note(cr, uid, ids, context=context)
return True
def _check_make_to_stock_service(self, cr, uid, procurement, context=None):
@@ -390,8 +388,6 @@ class procurement_order(osv.osv):
order_point_id = self.pool.get('stock.warehouse.orderpoint').search(cr, uid, [('product_id', '=', procurement.product_id.id)], context=context)
if not order_point_id and not ok:
message = _("Not enough stock and no minimum orderpoint rule defined.")
- elif not order_point_id:
- message = _("No minimum orderpoint rule defined.")
elif not ok:
message = _("Not enough stock.")
@@ -407,7 +403,6 @@ class procurement_order(osv.osv):
"""
for procurement in self.browse(cr, uid, ids, context=context):
self.write(cr, uid, [procurement.id], {'state': 'running'})
- self.running_send_note(cr, uid, ids, context=None)
return True
def action_produce_assign_product(self, cr, uid, ids, context=None):
@@ -469,7 +464,6 @@ class procurement_order(osv.osv):
@return: True
"""
res = self.write(cr, uid, ids, {'state': 'ready'})
- self.ready_send_note(cr, uid, ids, context=None)
return res
def action_done(self, cr, uid, ids):
@@ -503,12 +497,6 @@ class procurement_order(osv.osv):
def confirm_send_note(self, cr, uid, ids, context=None):
self.message_post(cr, uid, ids, body=_("Procurement confirmed."), context=context)
- def running_send_note(self, cr, uid, ids, context=None):
- self.message_post(cr, uid, ids, body=_("Procurement set to running."), context=context)
-
- def ready_send_note(self, cr, uid, ids, context=None):
- self.message_post(cr, uid, ids, body=_("Procurement set to ready."), context=context)
-
def cancel_send_note(self, cr, uid, ids, context=None):
self.message_post(cr, uid, ids, body=_("Procurement cancelled."), context=context)
@@ -641,7 +629,18 @@ class stock_warehouse_orderpoint(osv.osv):
})
return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context=context)
-stock_warehouse_orderpoint()
+class product_template(osv.osv):
+ _inherit="product.template"
+
+ _columns = {
+ 'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock, a service is a non-material product provided by a company or an individual."),
+ 'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'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."),
+ 'supply_method': fields.selection([('produce','Manufacture'),('buy','Buy')], 'Supply Method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."),
+ }
+ _defaults = {
+ 'procure_method': 'make_to_stock',
+ 'supply_method': 'buy',
+ }
class product_product(osv.osv):
_inherit="product.product"
@@ -649,6 +648,6 @@ class product_product(osv.osv):
'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rules'),
}
-product_product()
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/procurement/procurement_demo.xml b/addons/procurement/procurement_demo.xml
new file mode 100644
index 00000000000..608eb56f3ba
--- /dev/null
+++ b/addons/procurement/procurement_demo.xml
@@ -0,0 +1,204 @@
+
+
+
+
+
+ make_to_order
+ produce
+
+
+
+ make_to_order
+ produce
+
+
+
+ product
+ make_to_order
+ produce
+
+
+
+ product
+ make_to_order
+ produce
+
+
+
+ product
+ make_to_order
+ produce
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+ make_to_order
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+ make_to_order
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+ make_to_order
+ produce
+
+
+
+ product
+
+
+
+ product
+ make_to_order
+ produce
+
+
+
+ product
+ make_to_order
+ produce
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+ make_to_order
+ produce
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+ make_to_order
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+ make_to_order
+
+
+
+ product
+
+
+
+ product
+
+
+
+ make_to_order
+ produce
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index bf73b383216..973a09477fc 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -294,6 +294,29 @@
stock.warehouse.orderpoint
+
+ product.template.procurement
+ product.template
+
+
+
+
+
+
+
+
+
+
+ product.search.procurment.form
+ product.product
+
+
+
+
+
+
+
+
product.product.procurementproduct.product
@@ -303,6 +326,33 @@
+
+
+
+
+
+
+
+ When you sell this service, nothing special will be triggered
+ to deliver the customer, as you set the procurement method as
+ 'Make to Stock'.
+
+
+ When you sell this product, OpenERP will use the available
+ inventory for the delivery order.
+
+ If there are not enough quantities available, the delivery order
+ will wait for new products. To fulfill the inventory, you should
+ create others rules like orderpoints.
+
+
+ When you sell this product, a delivery order will be created.
+ OpenERP will consider that the required quantities are always
+ available as it's a consumable (as a result of this, the quantity
+ on hand may become negative).
+
+
+
diff --git a/addons/product/i18n/ar.po b/addons/product/i18n/ar.po
index bef58060a90..f4c32cbd232 100644
--- a/addons/product/i18n/ar.po
+++ b/addons/product/i18n/ar.po
@@ -13,13 +13,13 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
msgid "DDR 512MB PC400"
-msgstr ""
+msgstr "رام دي دي ار 512 ميقا بايت PC400"
#. module: product
#: field:product.packaging,rows:0
@@ -41,6 +41,8 @@ msgid ""
"Set a template if this rule only apply to a template of product. Keep empty "
"for all products"
msgstr ""
+"تعيين قالب إذا كانت هذه القاعدة لا تنطبق إلا على قالب من المنتج. تبقى فارغة "
+"لجميع المنتجات"
#. module: product
#: help:product.product,virtual_available:0
@@ -96,7 +98,7 @@ msgstr "الوارد"
msgid ""
"This pricelist will be used, instead of the default one, for sales to the "
"current partner"
-msgstr ""
+msgstr "قائمة الأسعار سوف تستخدم، بدلاً عن الافتراضية، للبيع للشريك الحالي"
#. module: product
#: field:product.template,seller_qty:0
@@ -178,12 +180,12 @@ msgstr "متوسط السعر"
#. module: product
#: help:product.pricelist.item,name:0
msgid "Explicit rule name for this pricelist line."
-msgstr ""
+msgstr "توضيح اسم القاعدة لخط قائمة الأسعار."
#. module: product
#: model:product.template,name:product.product_product_cpu1_product_template
msgid "Processor AMD Athlon XP 1800+"
-msgstr ""
+msgstr "معالج AMD Athlon XP 1800+"
#. module: product
#: model:product.template,name:product.product_product_20_product_template
@@ -221,11 +223,13 @@ msgid ""
"Determines if the product can be visible in the list of product within a "
"selection from a sale order line."
msgstr ""
+"يحدد إذا كان المنتج يمكن أن تكون واضحة في قائمة المنتجات ضمن مجموعة مختارة "
+"من بيع خط النظام."
#. module: product
#: model:product.pricelist.version,name:product.ver0
msgid "Default Public Pricelist Version"
-msgstr ""
+msgstr "النسخة الافتراضية العامة للائحة الأسعار"
#. module: product
#: selection:product.template,cost_method:0
@@ -250,11 +254,13 @@ msgid ""
"Create a product form for everything you buy or sell. Specify a supplier if "
"the product can be purchased."
msgstr ""
+"إنشاء نموذج المنتج للحصول على كل الشراء أو البيع. حددالمورد إذا كان من "
+"الممكن شراء المنتج."
#. module: product
#: view:product.uom:0
msgid " e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr ""
+msgstr " على سبيل المثال: 1 * (هذه الوحدة) = النسبة * (الوحدة المرجعية)"
#. module: product
#: code:addons/product/product.py:418
@@ -278,17 +284,17 @@ msgstr ""
#. module: product
#: model:process.node,note:product.process_node_supplier0
msgid "Supplier name, price, product code, ..."
-msgstr ""
+msgstr "ااسم المورد، السعر، كود المنتج"
#. module: product
#: model:product.template,name:product.product_product_hdd3_product_template
msgid "HDD Seagate 7200.8 160GB"
-msgstr ""
+msgstr "هاردسك سيقيت 7200.8 160GB"
#. module: product
#: field:product.product,ean13:0
msgid "EAN13"
-msgstr ""
+msgstr "EAN13"
#. module: product
#: field:product.template,seller_id:0
@@ -316,26 +322,27 @@ msgstr "فئة"
msgid ""
"The rule only applies if the partner buys/sells more than this quantity."
msgstr ""
+"والقاعدة لا تنطبق إلا إذا كان الشريك يشتري / يبيع أكثر من هذه الكمية."
#. module: product
#: model:product.template,name:product.product_product_woodmm0_product_template
msgid "Wood 2mm"
-msgstr ""
+msgstr "خشب 2ملم"
#. module: product
#: field:product.price_list,qty1:0
msgid "Quantity-1"
-msgstr ""
+msgstr "الكمية-1"
#. module: product
#: help:product.packaging,ul_qty:0
msgid "The number of packages by layer"
-msgstr ""
+msgstr "وعدد الرزم من قبل الطبقة"
#. module: product
#: field:product.packaging,qty:0
msgid "Quantity by Package"
-msgstr ""
+msgstr "الكمية لكل طبقة"
#. module: product
#: view:product.product:0
@@ -347,7 +354,7 @@ msgstr "الحالة"
#. module: product
#: help:product.template,categ_id:0
msgid "Select category for the current product"
-msgstr ""
+msgstr "اختار تصنيف المنتج الحالي"
#. module: product
#: field:product.product,outgoing_qty:0
@@ -357,7 +364,7 @@ msgstr "الصادر"
#. module: product
#: selection:product.uom,uom_type:0
msgid "Reference UoM for this category"
-msgstr ""
+msgstr "المرجع وحدة القياس(UoM) لهذا الصنف"
#. module: product
#: model:product.price.type,name:product.list_price
@@ -368,27 +375,27 @@ msgstr "السعر العام"
#. module: product
#: field:product.price_list,qty5:0
msgid "Quantity-5"
-msgstr ""
+msgstr "الكمية - 5"
#. module: product
#: model:product.category,name:product.product_category_10
msgid "IT components"
-msgstr ""
+msgstr "مكونات تقنية معلومات"
#. module: product
#: field:product.template,product_manager:0
msgid "Product Manager"
-msgstr ""
+msgstr "مدير الإنتاج"
#. module: product
#: field:product.supplierinfo,product_name:0
msgid "Supplier Product Name"
-msgstr ""
+msgstr "اسم مورد المنتج"
#. module: product
#: model:product.template,name:product.product_product_pc3_product_template
msgid "Medium PC"
-msgstr ""
+msgstr "حاسوب متوسط"
#. module: product
#: model:ir.actions.act_window,help:product.product_normal_action_puchased
@@ -398,6 +405,9 @@ msgid ""
"information about your products related to procurement logistics, sales "
"price, product category, suppliers and so on."
msgstr ""
+"يمكن شراء المنتجات و / أو بيعها. يمكن أن تكون مواد الخام ،منتجات مخزنة، مواد "
+"الاستهلاكية، خدمات. شكل المنتج يحتوي على معلومات مفصلة عن المنتجات والخدمات "
+"اللوجستية المتعلقة بالمشتريات، سعر البيع، وتصنيف المنتج والموردين وهلم جرا."
#. module: product
#: help:product.product,qty_available:0
@@ -412,39 +422,47 @@ msgid ""
"Otherwise, this includes goods stored in any Stock Location typed as "
"'internal'."
msgstr ""
+"كمية المنتجات الحالية.\n"
+" في سياق مع موقع واحد للسهم، وهذا يشمل البضائع المخزنة في هذا الموقع، أو أي "
+"من أبنائه.\n"
+" في سياق واحد مع مستودع، وهذا يشمل السلع المخزنة في الموقع من أسهم هذه "
+"المستودعات، أو أي من أبنائه.\n"
+" في سياق واحد مع متجر، وهذا يشمل السلع المخزنة في الموقع الأسهم من مستودع "
+"هذا المحل، أو أي من أبنائه.\n"
+" خلاف ذلك، وهذا يشمل السلع المخزنة في أي مكان الأسهم كتبته باسم 'الداخلية'."
#. module: product
#: view:product.pricelist:0
msgid "Products Price Search"
-msgstr ""
+msgstr "بحث عن سعر المنتجات"
#. module: product
#: view:product.product:0
#: view:product.template:0
#: field:product.template,description_sale:0
msgid "Sale Description"
-msgstr ""
+msgstr "وصف البيع"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Storage Localisation"
-msgstr ""
+msgstr "محلية المخزون"
#. module: product
#: help:product.packaging,length:0
msgid "The length of the package"
-msgstr ""
+msgstr "طول الحزمة"
#. module: product
#: help:product.template,weight_net:0
msgid "The net weight in Kg."
-msgstr ""
+msgstr "الوزن الصافي بالكيلو جرام"
#. module: product
#: help:product.template,state:0
msgid "Tells the user if he can use the product or not."
-msgstr ""
+msgstr "اخبر المستخدم إذا كان يمكن أن ييستخدم المنتج أو لا"
#. module: product
#: field:pricelist.partnerinfo,min_quantity:0
@@ -460,12 +478,12 @@ msgstr "الإرتفاع"
#. module: product
#: help:product.pricelist.version,date_end:0
msgid "Ending date for this pricelist version to be valid."
-msgstr ""
+msgstr "إنهاء تاريخ اصدارة لائحة الأسعار لتكون صالحة."
#. module: product
#: model:product.category,name:product.product_category_0
msgid "All products"
-msgstr ""
+msgstr "كل المنتجات"
#. module: product
#: model:ir.model,name:product.model_pricelist_partnerinfo
@@ -475,22 +493,22 @@ msgstr "pricelist.partnerinfo"
#. module: product
#: field:product.price_list,qty2:0
msgid "Quantity-2"
-msgstr ""
+msgstr "الكمية-2"
#. module: product
#: field:product.price_list,qty3:0
msgid "Quantity-3"
-msgstr ""
+msgstr "الكمية-3"
#. module: product
#: view:product.product:0
msgid "Codes"
-msgstr ""
+msgstr "الرموز"
#. module: product
#: field:product.price_list,qty4:0
msgid "Quantity-4"
-msgstr ""
+msgstr "الكمية-4"
#. module: product
#: view:res.partner:0
@@ -512,17 +530,21 @@ 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 ""
+"قائمة أسعار يحتوي على القواعد التي يتعين تقييمها من أجل حساب سعر الشراء أو "
+"البيع لجميع الشركاء الذين تم تعيينهم للائحة الاسعار. قوائم الأسعار لديها عدة "
+"إصدارات (2010، 2011، تعزيز فبراير 2010، الخ) وكل إصداره لديهاعدة قواعد. على "
+"سبيل المثال: سعر العميل لفئة المنتج على أساس سعر المورد مضروب في 180"
#. module: product
#: model:product.template,name:product.product_product_metalcleats0_product_template
msgid "Metal Cleats"
-msgstr ""
+msgstr "المرابط المعدنية"
#. module: product
#: code:addons/product/product.py:175
#, python-format
msgid "Cannot change the category of existing UoM '%s'."
-msgstr ""
+msgstr "لا يمكن تغير فئة وحدة قياس موجودة '%s'"
#. module: product
#: model:ir.model,name:product.model_product_uom_categ
@@ -542,17 +564,17 @@ msgstr ""
#. module: product
#: model:res.groups,name:product.group_uos
msgid "Product UoS View"
-msgstr ""
+msgstr "عرض وحدة قياس المنتج"
#. module: product
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
-msgstr ""
+msgstr "يمكن أن تشترى"
#. module: product
#: model:product.template,name:product.product_product_cpu2_product_template
msgid "High speed processor config"
-msgstr ""
+msgstr "إعداد معالج ذو سرعة عالية"
#. module: product
#: model:process.transition,note:product.process_transition_supplierofproduct0
@@ -560,6 +582,7 @@ msgid ""
"1 or several supplier(s) can be linked to a product. All information stands "
"in the product form."
msgstr ""
+"1 أو عدد من الموردين يمكن ربطهم بالمنتج. كل المعلومات تقف في شكل المنتج"
#. module: product
#: help:product.uom,category_id:0
@@ -567,11 +590,13 @@ msgid ""
"Quantity conversions may happen automatically between Units of Measure in "
"the same category, according to their respective ratios."
msgstr ""
+"كمية التحويلات قد تحدث تلقائيا بين وحدات القياس في نفس الفئة، وفقا لنسب كل "
+"منهما."
#. module: product
#: help:product.packaging,width:0
msgid "The width of the package"
-msgstr ""
+msgstr "عرض الحزمة"
#. module: product
#: selection:product.category,type:0
@@ -581,7 +606,7 @@ msgstr "عرض"
#. module: product
#: model:ir.actions.act_window,name:product.product_template_action_tree
msgid "Product Templates"
-msgstr ""
+msgstr "قوالب المنتج"
#. module: product
#: field:product.category,parent_left:0
@@ -591,12 +616,12 @@ msgstr ""
#. module: product
#: model:product.template,name:product.product_product_restaurantexpenses0_product_template
msgid "Restaurant Expenses"
-msgstr ""
+msgstr "مصروفات المطعم"
#. module: product
#: help:product.packaging,qty:0
msgid "The total number of products you can put by pallet or box."
-msgstr ""
+msgstr "إجمالي عدد المنتجات التي يمكن طرحها بالبليت أو المربع."
#. module: product
#: constraint:product.packaging:0
@@ -607,7 +632,7 @@ msgstr ""
#. module: product
#: field:product.pricelist.item,min_quantity:0
msgid "Min. Quantity"
-msgstr ""
+msgstr "أقل. كمية"
#. module: product
#: model:ir.model,name:product.model_product_price_type
@@ -641,7 +666,7 @@ msgstr ""
#. module: product
#: model:product.template,name:product.product_product_fan2_product_template
msgid "Silent fan"
-msgstr ""
+msgstr "مروحة صامتة"
#. module: product
#: help:product.supplierinfo,name:0
@@ -655,11 +680,13 @@ msgid ""
"not overlaps with original version. You should change the dates and "
"reactivate the pricelist"
msgstr ""
+"عندما تتكرر النسخة يتم تعيينها إلى غير نشطة، بحيث لا تتداخل التواريخ مع النص "
+"الأصلي. يجب عليك تغيير التواريخ وتنشيط ائحة الأسعار"
#. module: product
#: model:product.template,name:product.product_product_kitshelfofcm0_product_template
msgid "KIT Shelf of 100cm"
-msgstr ""
+msgstr "طقم رف 100 سم"
#. module: product
#: field:product.supplierinfo,name:0
@@ -669,22 +696,22 @@ msgstr "مورِّد"
#. module: product
#: field:product.product,qty_available:0
msgid "Quantity On Hand"
-msgstr ""
+msgstr "الكمية في متناول اليد"
#. module: product
#: model:product.template,name:product.product_product_26_product_template
msgid "Kit Keyboard + Mouse"
-msgstr ""
+msgstr "طقم لوحة مفاتيح + ماوس"
#. module: product
#: field:product.price.type,name:0
msgid "Price Name"
-msgstr ""
+msgstr "اسم السعر"
#. module: product
#: model:product.template,name:product.product_product_arm_product_template
msgid "Cabinet"
-msgstr ""
+msgstr "خزانة"
#. module: product
#: help:product.product,incoming_qty:0
@@ -699,16 +726,24 @@ msgid ""
"Otherwise, this includes goods arriving to any Stock Location typed as "
"'internal'."
msgstr ""
+"كمية المنتجات التي خطط لوصولها\n"
+" في سياق مع موقع واحد للتخزين، وهذا يشمل البضائع المخزنة في هذا الموقع، أو "
+"أي من أبنائه.\n"
+" في سياق واحد مع مستودع، وهذا يشمل السلع المخزنة في الموقع من أسهم هذه "
+"المستودعات، أو أي من أبنائه.\n"
+" في سياق واحد مع متجر، وهذا يشمل السلع المخزنة في الموقع الأسهم من مستودع "
+"هذا المحل، أو أي من أبنائه.\n"
+" خلاف ذلك، وهذا يشمل السلع المخزنة في أي موقع مخزن على ان تصنف 'داخلياً'"
#. module: product
#: model:product.template,name:product.product_product_woodentable0_product_template
msgid "Wooden Table"
-msgstr ""
+msgstr "طاولة خشبية"
#. module: product
#: model:product.template,name:product.product_product_cpu3_product_template
msgid "Processor AMD Athlon XP 2200+"
-msgstr ""
+msgstr "معالج AMD Athlon XP 2200+"
#. module: product
#: model:ir.actions.act_window,name:product.action_product_price_list
@@ -717,7 +752,7 @@ msgstr ""
#: report:product.pricelist:0
#: field:product.pricelist.version,pricelist_id:0
msgid "Price List"
-msgstr ""
+msgstr "قائمة أسعار"
#. module: product
#: view:product.product:0
@@ -728,7 +763,7 @@ msgstr "المورّدون"
#. module: product
#: view:product.product:0
msgid "To Purchase"
-msgstr ""
+msgstr "لشراء"
#. module: product
#: help:product.supplierinfo,min_qty:0
@@ -737,6 +772,8 @@ msgid ""
"Product UoM if not empty, in the default unit of measure of the product "
"otherwise."
msgstr ""
+"أقل كمية لشراء من هذا المورد، التي أعرب عنها في وحدة قياس منتج المورد إن لم "
+"يكن فارغا، في وحدة القياس الافتراضية للمنتج خلاف ذلك."
#. module: product
#: view:product.pricelist.item:0
@@ -749,6 +786,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 ""
+"السعر سوف يعتبر كسعر وحدة القياس من المورد إذا كان أي من أو الوحدة "
+"الافتراضية للقياس المنتج طريقة أخرى"
#. module: product
#: model:product.category,name:product.product_category_5
@@ -772,11 +811,14 @@ 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 ""
+"المستخدمة من قبل الشركات التي تدير وحدتين للقياس: الفواتير وإدارة المخزون. "
+"على سبيل المثال، في الصناعات الغذائية، وسوف تقوم بإدارة مخزون من لحم الخنزير "
+"ولكن الفاتورة في كجم. تبقي فارغة لاستخدام وحدة القياس الافتراضية."
#. module: product
#: view:product.pricelist.item:0
msgid "Min. Margin"
-msgstr ""
+msgstr "الحد الأدنى"
#. module: product
#: field:product.category,child_id:0
@@ -833,17 +875,19 @@ msgid ""
"Set a product if this rule only apply to one product. Keep empty for all "
"products"
msgstr ""
+"تعيين المنتج إذا كانت القاعدة لا تنطبق إلا على منتج واحد. تبقي فارغة لجميع "
+"المنتجات"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Procurement & Locations"
-msgstr ""
+msgstr "المشتروات والمواقع"
#. module: product
#: model:product.template,name:product.product_product_kitchendesignproject0_product_template
msgid "Kitchen Design Project"
-msgstr ""
+msgstr "مشروع تصميم مطبخ"
#. module: product
#: model:product.uom,name:product.uom_hour
@@ -853,23 +897,23 @@ msgstr "ساعة"
#. module: product
#: selection:product.template,state:0
msgid "In Development"
-msgstr ""
+msgstr "في التطوير"
#. module: product
#: code:addons/product/product.py:363
#, python-format
msgid "UoM categories Mismatch!"
-msgstr ""
+msgstr "عدم تطابق فئات وحدة قياس!"
#. module: product
#: model:product.template,name:product.product_product_shelfofcm1_product_template
msgid "Shelf of 200cm"
-msgstr ""
+msgstr "رف 200 سم"
#. module: product
#: view:product.uom:0
msgid "Ratio & Precision"
-msgstr ""
+msgstr "النسبة والدقة"
#. module: product
#: model:product.uom,name:product.product_uom_gram
@@ -879,7 +923,7 @@ msgstr ""
#. module: product
#: model:product.category,name:product.product_category_11
msgid "IT components kits"
-msgstr ""
+msgstr "مجموعة قطع تقنية"
#. module: product
#: selection:product.category,type:0
@@ -891,7 +935,7 @@ msgstr "عادي"
#: model:process.node,name:product.process_node_supplier0
#: view:product.supplierinfo:0
msgid "Supplier Information"
-msgstr ""
+msgstr "معلومات عن المورد"
#. module: product
#: field:product.price.type,currency_id:0
@@ -903,19 +947,19 @@ msgstr "العملة"
#. module: product
#: model:product.template,name:product.product_product_ram_product_template
msgid "DDR 256MB PC400"
-msgstr ""
+msgstr "دي دي ار 256 ميقا بايت PC400"
#. module: product
#: model:ir.actions.act_window,name:product.product_category_action_form
#: model:ir.ui.menu,name:product.menu_product_category_action_form
#: view:product.category:0
msgid "Product Categories"
-msgstr ""
+msgstr "تصنيف المنتج"
#. module: product
#: view:product.uom:0
msgid " e.g: 1 * (reference unit) = ratio * (this unit)"
-msgstr ""
+msgstr " على سبيل المثال: 1*(الوحدة المرجعية)= النسبة* (الوحدة)"
#. module: product
#: model:ir.actions.act_window,help:product.product_uom_form_action
@@ -924,6 +968,8 @@ msgid ""
"You can define a conversion rate between several Units of Measure within the "
"same category."
msgstr ""
+"إنشاء وإدارة وحدات القياس التي تريد استخدامها في النظام الخاص بك. يمكنك "
+"تعريف معدل التحويل بين عدة وحدات القياس في نفس الفئة."
#. module: product
#: field:product.packaging,weight:0
@@ -938,7 +984,7 @@ msgstr ""
#. module: product
#: help:product.packaging,code:0
msgid "The code of the transport unit."
-msgstr ""
+msgstr "رمز تحويل الوحدة"
#. module: product
#: help:product.template,standard_price:0
@@ -946,38 +992,39 @@ msgid ""
"Product's cost for accounting stock valuation. It is the base price for the "
"supplier price."
msgstr ""
+"تكلفة المنتج لقيمة المخزون المحاسبة. هذا هو السعر الأساسي لسعر المورد."
#. module: product
#: view:product.price.type:0
msgid "Products Price Type"
-msgstr ""
+msgstr "نوع تسعير المنتجات"
#. module: product
#: field:product.product,price_extra:0
msgid "Variant Price Extra"
-msgstr ""
+msgstr "بديل التكلفة الإضافية"
#. module: product
#: model:product.template,name:product.product_product_fan_product_template
msgid "Regular case fan 80mm"
-msgstr ""
+msgstr "كيس مروحة عادية 80مم"
#. module: product
#: model:ir.model,name:product.model_product_supplierinfo
msgid "Information about a product supplier"
-msgstr ""
+msgstr "معلومات عن مورد المنتج"
#. module: product
#: view:product.product:0
#: view:product.template:0
#: field:product.template,description_purchase:0
msgid "Purchase Description"
-msgstr ""
+msgstr "وصف الشراء"
#. module: product
#: constraint:product.pricelist.version:0
msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
+msgstr "لا يمكنك الحصول على 2 إصداراة لائحة أسعار تؤدي للتتداخل!"
#. module: product
#: help:product.supplierinfo,delay:0
@@ -994,6 +1041,9 @@ msgid ""
"manage new versions of a price list. Some examples of versions: 2010, 2011, "
"Summer Promotion, etc."
msgstr ""
+"يمكن أن يكون هناك أكثر من إصدارة لقائمة الأسعار. هنا يمكنك إنشاء وإدارة "
+"الإصدارات الجديدة لقائمة الأسعار. بعد الأمثلة لإصدارات:2010,2011, الترويج "
+"الصيفي, إلى آخره"
#. module: product
#: selection:product.template,type:0
@@ -1018,12 +1068,12 @@ msgstr ""
#. module: product
#: model:ir.model,name:product.model_product_ul
msgid "Shipping Unit"
-msgstr ""
+msgstr "وحدة الشحن"
#. module: product
#: field:pricelist.partnerinfo,suppinfo_id:0
msgid "Partner Information"
-msgstr ""
+msgstr "معلومات عن الشريك"
#. module: product
#: selection:product.ul,type:0
@@ -1040,7 +1090,7 @@ msgstr "معلومات"
#. module: product
#: view:product.pricelist.item:0
msgid "Products Listprices Items"
-msgstr ""
+msgstr "قائمة الأسعار منتجات الأصناف"
#. module: product
#: view:product.packaging:0
@@ -1050,7 +1100,7 @@ msgstr "معلومات أخرى"
#. module: product
#: field:product.pricelist.version,items_id:0
msgid "Price List Items"
-msgstr ""
+msgstr "سعر قطع القائمة"
#. module: product
#: model:ir.actions.act_window,help:product.product_uom_categ_form_action
@@ -1064,7 +1114,7 @@ msgstr ""
#. module: product
#: selection:product.uom,uom_type:0
msgid "Bigger than the reference UoM"
-msgstr ""
+msgstr "أعلى من وحدة القياس المرجعية"
#. module: product
#: field:product.category,parent_right:0
@@ -1074,7 +1124,7 @@ msgstr ""
#. module: product
#: view:product.product:0
msgid "To Sell"
-msgstr ""
+msgstr "للبيع"
#. module: product
#: help:product.product,outgoing_qty:0
@@ -1093,22 +1143,22 @@ msgstr ""
#. module: product
#: model:product.category,name:product.product_category_services0
msgid "Marketable Services"
-msgstr ""
+msgstr "تسويق الخدمات"
#. module: product
#: field:product.pricelist.item,price_surcharge:0
msgid "Price Surcharge"
-msgstr ""
+msgstr "رسوم السعر إضافية"
#. module: product
#: model:product.template,name:product.product_product_mb1_product_template
msgid "Mainboard ASUStek A7N8X"
-msgstr ""
+msgstr "لوحة الأم ASUStek A7N8X"
#. module: product
#: field:product.product,packaging:0
msgid "Logistical Units"
-msgstr ""
+msgstr "وحدات لوجستية"
#. module: product
#: field:product.category,complete_name:0
@@ -1138,11 +1188,15 @@ msgid ""
"contains detailed information about your products related to procurement "
"logistics, sales price, product category, suppliers and so on."
msgstr ""
+"يجب عليك تعريف المنتج لكل شئ قمت بشراءه أو بيعه. المنتجات يمكن أن تكون مواد "
+"الخام والمنتجات قابلة للتخزين والمواد الاستهلاكية أو الخدمات. شكل المنتج "
+"يحتوي على معلومات مفصلة حول المنتجات متعلقة باللوجستية والمشتريات، سعر "
+"البيع، وفئة المنتج، والموردين وهلم جرا."
#. module: product
#: model:product.uom,name:product.product_uom_kgm
msgid "kg"
-msgstr ""
+msgstr "كجم"
#. module: product
#: model:product.uom,name:product.product_uom_meter
@@ -1166,12 +1220,14 @@ msgid ""
"at the end of the year), Average Price: the cost price is recomputed at each "
"reception of products."
msgstr ""
+"السعر القياسي: يتم إصلاح سعر التكلفة وإعادة الحساب دورياً (عادة في نهاية "
+"السنة)، السعر متوسط: إعادة حساب سعر التكلفة لكل المنتجات المستلمة"
#. module: product
#: help:product.category,sequence:0
msgid ""
"Gives the sequence order when displaying a list of product categories."
-msgstr ""
+msgstr "يعطي ترتيب التسلسل عند عرض قائمة من فئات المنتجات"
#. module: product
#: field:product.uom,factor:0
@@ -1185,6 +1241,8 @@ msgid ""
"Determine if the product is visible in the list of products within a "
"selection from a purchase order line."
msgstr ""
+"تحديد ما إذا كان المنتج هو ظاهر في قائمة المنتجات ضمن مجموعة مختارة من شراء "
+"خط النظام."
#. module: product
#: field:product.template,weight_net:0
@@ -1199,7 +1257,7 @@ msgstr "العرض"
#. module: product
#: help:product.price.type,field:0
msgid "Associated field in the product form."
-msgstr ""
+msgstr "الحقل المرتبط بشكل المنتج"
#. module: product
#: view:product.product:0
@@ -1219,7 +1277,7 @@ msgstr ""
#. module: product
#: field:product.template,uos_id:0
msgid "Unit of Sale"
-msgstr ""
+msgstr "وحدة بيع"
#. module: product
#: help:product.template,seller_delay:0
@@ -1232,7 +1290,7 @@ msgstr ""
#. module: product
#: help:product.template,seller_id:0
msgid "Main Supplier who has highest priority in Supplier List."
-msgstr ""
+msgstr "المورد الرئيسي الذي لديه أولوية قصوى في قائمة الموردين."
#. module: product
#: model:product.category,name:product.product_category_6
@@ -1243,12 +1301,12 @@ msgstr "الخدمات"
#. module: product
#: model:ir.actions.act_window,name:product.product_form_config_action
msgid "Create or Import Products"
-msgstr ""
+msgstr "إنشاء أو استيراد المنتجات"
#. module: product
#: field:product.pricelist.item,base_pricelist_id:0
msgid "If Other Pricelist"
-msgstr ""
+msgstr "إذا قائمة الأسعار أخرى"
#. module: product
#: model:ir.actions.act_window,name:product.product_normal_action
@@ -1300,7 +1358,7 @@ msgstr ""
#: view:product.product:0
#: view:product.template:0
msgid "Second UoM"
-msgstr ""
+msgstr "وحدة القياس الثانية"
#. module: product
#: code:addons/product/product.py:143
@@ -1319,7 +1377,7 @@ msgstr ""
#. module: product
#: field:product.supplierinfo,min_qty:0
msgid "Minimal Quantity"
-msgstr ""
+msgstr "أقل كمية"
#. module: product
#: model:product.category,name:product.product_category_9
@@ -1332,21 +1390,23 @@ msgid ""
"This supplier's product code will be used when printing a request for "
"quotation. Keep empty to use the internal one."
msgstr ""
+"رمز مورد المنتج سوف يستخدم عند طباعة طلب عرض أسعار. يحفظ خالياً ليستخدم مرة "
+"داخلياً"
#. module: product
#: selection:product.template,procure_method:0
msgid "Make to Stock"
-msgstr ""
+msgstr "اضفه الى المخزون"
#. module: product
#: field:product.pricelist.item,price_version_id:0
msgid "Price List Version"
-msgstr ""
+msgstr "إصدارة قائمة الأسعار"
#. module: product
#: field:product.product,virtual_available:0
msgid "Quantity Available"
-msgstr ""
+msgstr "الكمية المتاحة"
#. module: product
#: help:product.pricelist.item,sequence:0
@@ -1355,6 +1415,8 @@ msgid ""
"gives highest priority to lowest sequence and stops as soon as a matching "
"item is found."
msgstr ""
+"يعطي الترتيب الذي سيتم به التحقق من عناصر لائحة الأسعار. تقييم يعطي الأولوية "
+"القصوى إلى أدنى تسلسل ويتوقف بمجرد تم العثور على مطابقة البند."
#. module: product
#: selection:product.template,type:0
@@ -1364,17 +1426,17 @@ msgstr ""
#. module: product
#: help:product.price.type,currency_id:0
msgid "The currency the field is expressed in."
-msgstr ""
+msgstr "العملة ويعبر عنها في الحقل"
#. module: product
#: help:product.template,weight:0
msgid "The gross weight in Kg."
-msgstr ""
+msgstr "الوزن الإجمالي بالكيلو جرام"
#. module: product
#: model:product.template,name:product.product_product_sidepanel0_product_template
msgid "Side Panel"
-msgstr ""
+msgstr "لوحة جانبية"
#. module: product
#: view:product.product:0
@@ -1391,17 +1453,17 @@ msgstr "الأوزان"
#. module: product
#: field:product.uom,category_id:0
msgid "UoM Category"
-msgstr ""
+msgstr "تصنيف وحدة القياس"
#. module: product
#: field:product.template,loc_rack:0
msgid "Rack"
-msgstr ""
+msgstr "رف"
#. module: product
#: field:product.template,uom_po_id:0
msgid "Purchase Unit of Measure"
-msgstr ""
+msgstr "قياس وحدة الشراء"
#. module: product
#: field:product.template,supply_method:0
@@ -1415,6 +1477,8 @@ msgid ""
"category to get the list of all products linked to this category or to a "
"child of this category."
msgstr ""
+"وهنا لائحة من المنتجات الخاصة مصنفة حسب الفئة. يمكنك النقر فوق فئة للحصول "
+"على قائمة بجميع المنتجات المرتبطة بهذه الفئة أو لطفل من هذه الفئة."
#. module: product
#: view:product.product:0
@@ -1424,7 +1488,7 @@ msgstr "تجميع حسب..."
#. module: product
#: model:product.template,name:product.product_product_cpu_gen_product_template
msgid "Regular processor config"
-msgstr ""
+msgstr "ضبط المعالج المنتظم"
#. module: product
#: help:product.template,type:0
@@ -1432,6 +1496,8 @@ msgid ""
"Will change the way procurements are processed. Consumable are product where "
"you don't manage stock."
msgstr ""
+"سوف تغير الطريقة التي يتم بها معالجة المشتريات. الاستهلاكية هي المنتج حيث لا "
+"تدار كمخزون."
#. module: product
#: field:product.pricelist.version,date_start:0
@@ -1450,7 +1516,7 @@ msgstr ""
#. module: product
#: model:product.template,name:product.product_product_pc1_product_template
msgid "Basic PC"
-msgstr ""
+msgstr "جهاز الحاسوب أساسي"
#. module: product
#: help:product.pricelist,active:0
@@ -1458,6 +1524,7 @@ msgid ""
"If the active field is set to False, it will allow you to hide the pricelist "
"without removing it."
msgstr ""
+"إذا تم اختيار الحقل النشط كخطأ، سوف تسمح لك بإخفاء قائمة الأسعار بدون حذفها"
#. module: product
#: model:product.uom,name:product.product_uom_cm
@@ -1467,7 +1534,7 @@ msgstr "سم"
#. module: product
#: model:ir.model,name:product.model_product_uom
msgid "Product Unit of Measure"
-msgstr ""
+msgstr "وحدة قياس المنتج"
#. module: product
#: constraint:product.template:0
@@ -1480,17 +1547,17 @@ msgstr ""
#. module: product
#: field:product.uom,rounding:0
msgid "Rounding Precision"
-msgstr ""
+msgstr "دقة التقريب"
#. module: product
#: view:product.uom:0
msgid "Unit of Measure Properties"
-msgstr ""
+msgstr "خصائص وحدة القياس"
#. module: product
#: model:product.template,name:product.product_product_shelf1_product_template
msgid "Rack 200cm"
-msgstr ""
+msgstr "رف 200 سم"
#. module: product
#: selection:product.template,supply_method:0
@@ -1500,22 +1567,22 @@ msgstr "شراء"
#. module: product
#: view:product.uom.categ:0
msgid "Units of Measure categories"
-msgstr ""
+msgstr "فئات وحدات القياس"
#. module: product
#: help:product.packaging,weight_ul:0
msgid "The weight of the empty UL"
-msgstr ""
+msgstr "وزن الـUL الخالي"
#. module: product
#: model:product.template,name:product.product_product_woodmm10_product_template
msgid "Wood 10mm"
-msgstr ""
+msgstr "خشب 10 مم"
#. module: product
#: selection:product.uom,uom_type:0
msgid "Smaller than the reference UoM"
-msgstr ""
+msgstr "أصغر من وحدة قياس المرجعية"
#. module: product
#: field:product.price.type,active:0
@@ -1529,7 +1596,7 @@ msgstr "نشط"
#. module: product
#: field:product.product,price_margin:0
msgid "Variant Price Margin"
-msgstr ""
+msgstr "متغير هامش السعر"
#. module: product
#: sql_constraint:product.uom:0
@@ -1539,27 +1606,27 @@ msgstr ""
#. module: product
#: help:product.packaging,ean:0
msgid "The EAN code of the package unit."
-msgstr ""
+msgstr "رمز UAN لوحدة الحزمة"
#. module: product
#: help:product.supplierinfo,product_uom:0
msgid "This comes from the product form."
-msgstr ""
+msgstr "هذا يأتي من شكل المنتج."
#. module: product
#: field:product.packaging,weight_ul:0
msgid "Empty Package Weight"
-msgstr ""
+msgstr "وزن الحزمة فارغة"
#. module: product
#: field:product.price.type,field:0
msgid "Product Field"
-msgstr ""
+msgstr "حقل المنتج"
#. module: product
#: field:product.template,mes_type:0
msgid "Measure Type"
-msgstr ""
+msgstr "نوع القياس"
#. module: product
#: help:product.uom,factor:0
@@ -1567,17 +1634,19 @@ msgid ""
"How many times this UoM is smaller than the reference UoM in this category:\n"
"1 * (reference unit) = ratio * (this unit)"
msgstr ""
+"كم مرة وحدة قياس أصغر من وحدة قياس المرجعية في هذه الفئة:\n"
+" 1 * (وحدة المرجعية) = نسبة * (هذه الوحدة)"
#. 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 "أنواع السعر"
#. module: product
#: help:product.template,uom_id:0
msgid "Default Unit of Measure used for all stock operation."
-msgstr ""
+msgstr "وحدة القياس الافتراضية تستخدم لجميع العمليات المالية."
#. module: product
#: model:product.category,name:product.product_category_misc0
@@ -1587,7 +1656,7 @@ msgstr "متفرقات"
#. module: product
#: model:product.template,name:product.product_product_pc4_product_template
msgid "Customizable PC"
-msgstr ""
+msgstr "جهاز حاسوب مخصص"
#. module: product
#: field:pricelist.partnerinfo,price:0
@@ -1603,17 +1672,17 @@ msgstr ""
#. module: product
#: model:product.pricelist,name:product.list0
msgid "Public Pricelist"
-msgstr ""
+msgstr "قائمة أسعار عامة"
#. module: product
#: model:product.category,name:product.product_category_marketableproduct0
msgid "Marketable Products"
-msgstr ""
+msgstr "تسويق المنتجات"
#. module: product
#: field:product.supplierinfo,product_code:0
msgid "Supplier Product Code"
-msgstr ""
+msgstr "رمز مورد المنتج"
#. module: product
#: view:product.product:0
@@ -1633,7 +1702,7 @@ msgstr ""
#. module: product
#: field:product.template,warranty:0
msgid "Warranty (months)"
-msgstr ""
+msgstr "تحذير(شهور)"
#. module: product
#: help:product.pricelist.item,categ_id:0
@@ -1641,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 ""
+"تعيين فئة من المنتجات إذا كانت هذه القاعدة تنطبق فقط على المنتجات ضمن تصنيف "
+"وملحقاته. تبقي فارغة لجميع المنتجات"
#. module: product
#: model:ir.model,name:product.model_product_product
@@ -1657,7 +1728,7 @@ msgstr "المنتج"
#. module: product
#: selection:product.template,supply_method:0
msgid "Produce"
-msgstr ""
+msgstr "إنتاج"
#. module: product
#: selection:product.template,procure_method:0
@@ -1670,11 +1741,13 @@ msgid ""
"Produce will generate production order or tasks, according to the product "
"type. Buy will trigger purchase orders when requested."
msgstr ""
+"الإنتاج سوف يولد أمر إنتاج أو مهام، وفقا لنوع المنتج. الشراء سوف يؤدي إلى "
+"تحفيز أوامر الشراء عند الطلب."
#. module: product
#: field:product.product,variants:0
msgid "Variants"
-msgstr ""
+msgstr "تنوعات"
#. module: product
#: model:ir.actions.act_window,name:product.product_category_action
@@ -1690,7 +1763,7 @@ msgstr ""
#. module: product
#: help:product.supplierinfo,sequence:0
msgid "Assigns the priority to the list of product supplier."
-msgstr ""
+msgstr "يعين الأولوية لقائمة موردي المنتجات."
#. module: product
#: field:product.template,uom_id:0
@@ -1700,27 +1773,27 @@ msgstr ""
#. module: product
#: model:product.template,name:product.product_product_tow1_product_template
msgid "ATX Mid-size Tower"
-msgstr ""
+msgstr "برج متوسطة الحجم ATX"
#. module: product
#: view:product.pricelist.item:0
msgid "Rounding Method"
-msgstr ""
+msgstr "طريقة التقريب"
#. module: product
#: model:product.category,name:product.product_category_assembly
msgid "Assembly Service"
-msgstr ""
+msgstr "خدمة التجميع"
#. module: product
#: model:ir.actions.report.xml,name:product.report_product_label
msgid "Products Labels"
-msgstr ""
+msgstr "علامات المنتجات"
#. module: product
#: model:product.ul,name:product.product_ul_big_box
msgid "Box 30x40x60"
-msgstr ""
+msgstr "صندوق 30×40×60"
#. module: product
#: selection:product.template,type:0
@@ -1759,17 +1832,17 @@ msgstr ""
#: code:addons/product/pricelist.py:376
#, python-format
msgid "Partner section of the product form"
-msgstr ""
+msgstr "قسم الشريك من شكل المنتج"
#. module: product
#: help:product.price.type,name:0
msgid "Name of this kind of price."
-msgstr ""
+msgstr "اسم هذا النوع من الأسعار."
#. module: product
#: field:product.supplierinfo,product_uom:0
msgid "Supplier UoM"
-msgstr ""
+msgstr "وحدة قياس المورد"
#. module: product
#: help:product.pricelist.version,date_start:0
@@ -1782,11 +1855,13 @@ msgid ""
"Default Unit of Measure used for purchase orders. It must be in the same "
"category than the default unit of measure."
msgstr ""
+"وحدة القياس الافتراضية المستخدمة في أوامر الشراء. يجب أن يكون من نفس الفئة "
+"من وحدة القياس الافتراضية."
#. module: product
#: model:product.template,description:product.product_product_cpu1_product_template
msgid "This product is configured with example of push/pull flows"
-msgstr ""
+msgstr "هذا المنتج تم تكوين مع مثال على دفع / سحب التدفقات"
#. module: product
#: field:product.packaging,length:0
@@ -1796,7 +1871,7 @@ msgstr "الطول"
#. module: product
#: model:product.uom.categ,name:product.uom_categ_length
msgid "Length / Distance"
-msgstr ""
+msgstr "طول / المسافة"
#. module: product
#: model:product.template,name:product.product_product_0_product_template
@@ -1812,7 +1887,7 @@ msgstr "نوع قائمة الأسعار"
#. module: product
#: model:product.category,name:product.product_category_otherproducts0
msgid "Other Products"
-msgstr ""
+msgstr "منتجات أخرى"
#. module: product
#: field:product.product,color:0
@@ -1822,12 +1897,12 @@ msgstr ""
#. module: product
#: view:product.product:0
msgid "Characteristics"
-msgstr ""
+msgstr "الخصائص"
#. module: product
#: field:product.template,sale_ok:0
msgid "Can be Sold"
-msgstr ""
+msgstr "يمكن بيعها"
#. module: product
#: field:product.template,produce_delay:0
@@ -1837,7 +1912,7 @@ msgstr ""
#. module: product
#: field:product.supplierinfo,pricelist_ids:0
msgid "Supplier Pricelist"
-msgstr ""
+msgstr "قائمة أسعار الموردين"
#. module: product
#: code:addons/product/product.py:175
@@ -1858,29 +1933,29 @@ msgstr ""
#. module: product
#: model:product.category,name:product.product_category_rawmaterial0
msgid "Raw Materials"
-msgstr ""
+msgstr "مواد خام"
#. module: product
#: help:product.template,product_manager:0
msgid "This is use as task responsible"
-msgstr ""
+msgstr "هذا هو الاستخدام كمسؤولية المهمة"
#. module: product
#: field:product.pricelist,name:0
msgid "Pricelist Name"
-msgstr ""
+msgstr "اسم قائمة الأسعار"
#. module: product
#: model:ir.model,name:product.model_product_pricelist_version
#: view:product.pricelist:0
#: view:product.pricelist.version:0
msgid "Pricelist Version"
-msgstr ""
+msgstr "إصدارة قائمة الأسعار"
#. module: product
#: view:product.pricelist.item:0
msgid "* ( 1 + "
-msgstr ""
+msgstr "* ( 1 + "
#. module: product
#: help:product.packaging,weight:0
@@ -1890,7 +1965,7 @@ msgstr ""
#. module: product
#: model:product.template,name:product.product_product_hdd2_product_template
msgid "HDD Seagate 7200.8 120GB"
-msgstr ""
+msgstr "هاردسك سيقيت 7200.8 جيجا بايت"
#. module: product
#: model:product.template,name:product.product_product_employee0_product_template
@@ -1900,7 +1975,7 @@ msgstr "موظف"
#. module: product
#: model:product.template,name:product.product_product_shelfofcm0_product_template
msgid "Shelf of 100cm"
-msgstr ""
+msgstr "رف 100 سم"
#. module: product
#: model:ir.model,name:product.model_product_category
@@ -1911,7 +1986,7 @@ msgstr "فئة المنتج"
#. module: product
#: report:product.pricelist:0
msgid "Price List Name"
-msgstr ""
+msgstr "اسم قائمة الأسعار"
#. module: product
#: field:product.supplierinfo,delay:0
@@ -1923,13 +1998,13 @@ msgstr "الوقت اللازم للتسليم"
msgid ""
"By unchecking the active field you can disable a unit of measure without "
"deleting it."
-msgstr ""
+msgstr "عن طريق إلغاء تحديد الحقل النشط يمكنك تعطيل وحدة القياس دون حذفه."
#. 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 "فئات وحدة القياس"
#. module: product
#: field:product.template,seller_delay:0
@@ -1947,6 +2022,8 @@ msgid ""
"Create and manage your packaging dimensions and types you want to be "
"maintained in your system."
msgstr ""
+"إنشاء وإدارة أبعاد التعبئة والتغليف الخاصة بك وأنواعها هل تريد أن تكون "
+"محفوظة في النظام الخاص بك."
#. module: product
#: model:product.template,name:product.product_product_rearpanelarm1_product_template
@@ -1958,27 +2035,27 @@ msgstr ""
msgid ""
"Used in the code to select specific prices based on the context. Keep "
"unchanged."
-msgstr ""
+msgstr "يستخدم في رمز لتحديد أسعار محددة استنادا إلى السياق. تبقي دون تغيير."
#. module: product
#: view:product.product:0
msgid "Context..."
-msgstr ""
+msgstr "السياق..."
#. module: product
#: model:product.template,name:product.product_product_hdd1_product_template
msgid "HDD Seagate 7200.8 80GB"
-msgstr ""
+msgstr "هاردسك سيقيت 7200.8 80 جيجا بايت"
#. module: product
#: help:product.supplierinfo,qty:0
msgid "This is a quantity which is converted into Default Uom."
-msgstr ""
+msgstr "هذا هو الكمية التي يتم تحويلها إلى وحدة القياس الافتراضية."
#. module: product
#: field:product.packaging,ul:0
msgid "Type of Package"
-msgstr ""
+msgstr "نوع الحزمة"
#. module: product
#: selection:product.ul,type:0
@@ -1988,7 +2065,7 @@ msgstr "حزم"
#. module: product
#: model:product.category,name:product.product_category_4
msgid "Dello Computer"
-msgstr ""
+msgstr "كمبيوتر ديلو"
#. module: product
#: model:product.uom.categ,name:product.product_uom_categ_kgm
@@ -1998,12 +2075,12 @@ msgstr "الوزن"
#. module: product
#: model:product.template,name:product.product_product_22_product_template
msgid "Processor on demand"
-msgstr ""
+msgstr "معالج عند الطلب"
#. module: product
#: model:process.transition,name:product.process_transition_supplierofproduct0
msgid "Supplier of the product"
-msgstr ""
+msgstr "المورد للمنتج"
#. module: product
#: field:product.product,product_image:0
@@ -2013,7 +2090,7 @@ msgstr ""
#. module: product
#: field:product.uom,uom_type:0
msgid "UoM Type"
-msgstr ""
+msgstr "نوع وحدة القياس"
#. module: product
#: help:product.product,active:0
@@ -2021,6 +2098,7 @@ msgid ""
"If the active field is set to False, it will allow you to hide the product "
"without removing it."
msgstr ""
+"إذا تم تعيين الحقل النشط إلى خطأ، وسوف تسمح لك لإخفاء المنتج دون إزالته."
#. module: product
#: help:product.uom,rounding:0
@@ -2033,7 +2111,7 @@ msgstr ""
#: view:product.product:0
#: view:product.template:0
msgid "Descriptions"
-msgstr ""
+msgstr "أوصاف"
#. module: product
#: field:product.template,loc_row:0
@@ -2043,17 +2121,17 @@ msgstr "صف"
#. module: product
#: model:product.template,name:product.product_product_rearpanelarm0_product_template
msgid "Rear Panel SHE100"
-msgstr ""
+msgstr "لوحة الخلفية SHE100"
#. module: product
#: model:product.template,name:product.product_product_23_product_template
msgid "Complete PC With Peripherals"
-msgstr ""
+msgstr "كمبيوتر شخصي مع كامل ملحقاته"
#. module: product
#: model:product.template,name:product.product_product_hotelexpenses0_product_template
msgid "Hotel Expenses"
-msgstr ""
+msgstr "مصاريف الفندق"
#. module: product
#: help:product.uom,factor_inv:0
@@ -2065,17 +2143,17 @@ msgstr ""
#. module: product
#: model:product.template,name:product.product_product_shelf0_product_template
msgid "Rack 100cm"
-msgstr ""
+msgstr "رف 100سم"
#. module: product
#: help:product.packaging,sequence:0
msgid "Gives the sequence order when displaying a list of packaging."
-msgstr ""
+msgstr "يعطي النظام تسلسل عند عرض قائمة التعبئة والتغليف."
#. module: product
#: field:product.pricelist.item,price_round:0
msgid "Price Rounding"
-msgstr ""
+msgstr "السعر بالتقريب"
#. module: product
#: code:addons/product/pricelist.py:178
@@ -2084,11 +2162,13 @@ msgid ""
"At least one pricelist has no active version !\n"
"Please create or activate one."
msgstr ""
+"لائحة الأسعار واحدة على الأقل لا يوجد لديه نسخة نشطة!\n"
+" يرجى إنشاء أو تفعيل واحدة."
#. module: product
#: field:product.pricelist.item,price_max_margin:0
msgid "Max. Price Margin"
-msgstr ""
+msgstr "أعلى هامش سعر"
#. module: product
#: help:product.supplierinfo,product_name:0
@@ -2096,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 ""
+"اسم منتج المورد سوف يستخدم عند طباعة طلب عرض أسعار. تبقي فارغة لاستخدام واحد "
+"داخلي."
#. module: product
#: selection:product.template,mes_type:0
@@ -2105,7 +2187,7 @@ msgstr "متغير"
#. module: product
#: field:product.template,rental:0
msgid "Can be Rent"
-msgstr ""
+msgstr "ويمكن أن تؤجر"
#. module: product
#: model:product.price.type,name:product.standard_price
@@ -2116,7 +2198,7 @@ msgstr "سعر التكلفة"
#. module: product
#: field:product.pricelist.item,price_min_margin:0
msgid "Min. Price Margin"
-msgstr ""
+msgstr "أقل هامش سعر"
#. module: product
#: field:product.template,weight:0
@@ -2126,17 +2208,17 @@ msgstr ""
#. module: product
#: model:product.template,name:product.product_product_assemblysection0_product_template
msgid "Assembly Section"
-msgstr ""
+msgstr "قسم التجميع"
#. module: product
#: model:product.category,name:product.product_category_3
msgid "Computer Stuff"
-msgstr ""
+msgstr "ملحقات كمبيوتر"
#. module: product
#: model:product.category,name:product.product_category_8
msgid "Phone Help"
-msgstr ""
+msgstr "مساعدة هاتفية"
#. module: product
#: field:product.category,sequence:0
@@ -2149,7 +2231,7 @@ msgstr "مسلسل"
#. module: product
#: model:product.template,name:product.product_assembly_product_template
msgid "Assembly Service Cost"
-msgstr ""
+msgstr "تكلفة خدمة التجميع"
#. module: product
#: view:product.price_list:0
@@ -2159,12 +2241,12 @@ msgstr "إغلاق"
#. module: product
#: model:ir.model,name:product.model_product_pricelist_item
msgid "Pricelist item"
-msgstr ""
+msgstr "بنود لائحة الأسعار"
#. module: product
#: model:product.template,name:product.product_product_21_product_template
msgid "RAM on demand"
-msgstr ""
+msgstr "رام عند الطلب"
#. module: product
#: view:res.partner:0
@@ -2180,12 +2262,12 @@ msgstr "تأخيرات"
#. module: product
#: view:product.product:0
msgid "Both stockable and consumable products"
-msgstr ""
+msgstr "كل المنتجات القابلة للتخزين و الاستهلاكية"
#. module: product
#: model:process.node,note:product.process_node_product0
msgid "Creation of the product"
-msgstr ""
+msgstr "إنشاء المنتج"
#. module: product
#: field:pricelist.partnerinfo,name:0
@@ -2226,7 +2308,7 @@ msgstr "الحالة"
#: view:product.product:0
#: model:res.groups,name:product.group_product_variant
msgid "Product Variant"
-msgstr ""
+msgstr "المنتج البديل"
#. module: product
#: model:product.category,name:product.product_category_shelves0
@@ -2237,7 +2319,7 @@ msgstr ""
#: code:addons/product/pricelist.py:375
#, python-format
msgid "Other Pricelist"
-msgstr ""
+msgstr "قوائم أسعار أخرى"
#. module: product
#: model:ir.model,name:product.model_product_template
@@ -2250,7 +2332,7 @@ msgstr "قالب المنتج"
#. module: product
#: field:product.template,cost_method:0
msgid "Costing Method"
-msgstr ""
+msgstr "طريقة حساب التكاليف"
#. module: product
#: view:product.packaging:0
@@ -2261,12 +2343,12 @@ msgstr ""
#. module: product
#: help:product.template,volume:0
msgid "The volume in m3."
-msgstr ""
+msgstr "الحجم بالـ م3"
#. module: product
#: selection:product.template,state:0
msgid "End of Lifecycle"
-msgstr ""
+msgstr "نهاية دورة الحياة"
#. module: product
#: help:product.product,packaging:0
@@ -2274,6 +2356,8 @@ msgid ""
"Gives the different ways to package the same product. This has no impact on "
"the picking order and is mainly used if you use the EDI module."
msgstr ""
+"يعطي طرق مختلفة لحزم نفس المنتج. هذا ليس له أي تأثير على ترتيب واختيار وهي "
+"تستخدم أساسا إذا كنت تستخدم وحدة EDI."
#. module: product
#: model:ir.actions.act_window,name:product.product_pricelist_action
@@ -2285,7 +2369,7 @@ msgstr ""
#. module: product
#: model:product.template,name:product.product_product_span100_product_template
msgid "Shelf Panel"
-msgstr ""
+msgstr "لوحة الرف"
#. module: product
#: help:product.pricelist.item,price_round:0
@@ -2308,7 +2392,7 @@ msgstr ""
#. module: product
#: field:product.category,type:0
msgid "Category Type"
-msgstr ""
+msgstr "نوع التصنيف"
#. module: product
#: model:product.category,name:product.product_category_2
@@ -2330,7 +2414,7 @@ msgstr ""
#. module: product
#: field:product.pricelist.item,price_discount:0
msgid "Price Discount"
-msgstr ""
+msgstr "السعر بعد التخفيض"
#~ msgid ""
#~ "Quantities of products that are planned to arrive in selected locations or "
@@ -2392,3 +2476,15 @@ msgstr ""
#~ msgid "tonne"
#~ msgstr "طن"
+
+#~ msgid "Calculate Product Price per unit base on pricelist version."
+#~ msgstr "احسب سعر المنتج لكل وحده اعتماداً على اصدارة قائمة الأسعار"
+
+#~ msgid "Supply method"
+#~ msgstr "طريقة الإمدادات"
+
+#~ msgid "Default Unit Of Measure"
+#~ msgstr "وحدة القياس الأساسية"
+
+#~ msgid "Gross weight"
+#~ msgstr "الوزن الإجمالي"
diff --git a/addons/product/i18n/bg.po b/addons/product/i18n/bg.po
index bee312cc895..6c2b7587305 100644
--- a/addons/product/i18n/bg.po
+++ b/addons/product/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/bs.po b/addons/product/i18n/bs.po
index 77a0fcb2613..c6ef45f0134 100644
--- a/addons/product/i18n/bs.po
+++ b/addons/product/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/ca.po b/addons/product/i18n/ca.po
index 96d501b5cef..75f33ab7efb 100644
--- a/addons/product/i18n/ca.po
+++ b/addons/product/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/cs.po b/addons/product/i18n/cs.po
index 6904c287473..f1bc1e5f88a 100644
--- a/addons/product/i18n/cs.po
+++ b/addons/product/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
"X-Poedit-Language: Czech\n"
#. module: product
diff --git a/addons/product/i18n/da.po b/addons/product/i18n/da.po
index 2faad67ce7f..206c884ba68 100644
--- a/addons/product/i18n/da.po
+++ b/addons/product/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/de.po b/addons/product/i18n/de.po
index 5e72140b5c6..c5cc4e6297a 100644
--- a/addons/product/i18n/de.po
+++ b/addons/product/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/el.po b/addons/product/i18n/el.po
index 1ab3a760a74..24c2b555611 100644
--- a/addons/product/i18n/el.po
+++ b/addons/product/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/es.po b/addons/product/i18n/es.po
index 61a58edecef..3d8ba7e45ea 100644
--- a/addons/product/i18n/es.po
+++ b/addons/product/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:14+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/es_AR.po b/addons/product/i18n/es_AR.po
index b9707979452..0be6a1dd5ce 100644
--- a/addons/product/i18n/es_AR.po
+++ b/addons/product/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:14+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/es_CL.po b/addons/product/i18n/es_CL.po
index 1e263b6d84a..937e2fab9a3 100644
--- a/addons/product/i18n/es_CL.po
+++ b/addons/product/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:14+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/es_CR.po b/addons/product/i18n/es_CR.po
index 76d0e2a34fb..c7e7d1bb2ae 100644
--- a/addons/product/i18n/es_CR.po
+++ b/addons/product/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:14+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
"Language: \n"
#. module: product
diff --git a/addons/product/i18n/es_EC.po b/addons/product/i18n/es_EC.po
index f454c1d0a85..e0e35534803 100644
--- a/addons/product/i18n/es_EC.po
+++ b/addons/product/i18n/es_EC.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-11-07 01:34+0000\n"
+"PO-Revision-Date: 2012-10-19 00:49+0000\n"
"Last-Translator: Cristian Salamea (Gnuthink) \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-08-28 06:19+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-20 05:07+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
@@ -57,6 +57,17 @@ msgid ""
"Otherwise, this includes goods stored in any Stock Location typed as "
"'internal'."
msgstr ""
+"Stock virtual (calculado como Stock Real - salidas + entradas)\n"
+"En un contexto con una única ubicación de almacén, el cálculo incluye los "
+"productos almacenados en esta ubicación, así como cualquiera de sus hijos.\n"
+"En un contexto de un único almacén, el cálculo incluye los productos "
+"almacenados en la ubicación de este almacén, así como cualquiera de sus "
+"hijos.\n"
+"En un contexto con una única tienda, el cálculo incluye los productos "
+"almacenados en la ubicación del almacén de la tienda, así como cualquiera de "
+"sus hijos.\n"
+"En otros contexto, el cálculo incluye los productos almacenados en cualquier "
+"ubicación de tipo \"interna\""
#. module: product
#: model:product.category,name:product.product_category_1
@@ -433,6 +444,17 @@ msgid ""
"Otherwise, this includes goods stored in any Stock Location typed as "
"'internal'."
msgstr ""
+"Cantidad actual de productos\n"
+"En un contexto con una única ubicación de almacén, el cálculo incluye los "
+"productos almacenados en esta ubicación, así como cualquiera de sus hijos.\n"
+"En un contexto de un único almacén, el cálculo incluye los productos "
+"almacenados en la ubicación de este almacén, así como cualquiera de sus "
+"hijos.\n"
+"En un contexto con una única tienda, el cálculo incluye los productos "
+"almacenados en la ubicación del almacén de la tienda, así como cualquiera de "
+"sus hijos.\n"
+"En otros contexto, el cálculo incluye los productos almacenados en cualquier "
+"ubicación de tipo \"interna\""
#. module: product
#: view:product.pricelist:0
@@ -654,6 +676,10 @@ msgid ""
"you need to change the unit of measure, you may desactivate this product "
"from the 'Procurement & Locations' tab and create a new one."
msgstr ""
+"La nueva UdM '%s' debe pertenecer a la misma categoría de UdM '%s' como la "
+"antigua UdM '%s'. Si necesita cambiar la unidad de medida, debe desactivar "
+"este producto desde la pestaña \"Abastecimiento y localizaciones\" y crear "
+"uno nuevo."
#. module: product
#: view:product.pricelist.item:0
@@ -704,7 +730,7 @@ msgstr "Proveedor"
#. module: product
#: field:product.product,qty_available:0
msgid "Quantity On Hand"
-msgstr ""
+msgstr "Cantidad Disponible"
#. module: product
#: model:product.template,name:product.product_product_26_product_template
@@ -719,7 +745,7 @@ msgstr "Nombre precio"
#. module: product
#: model:product.template,name:product.product_product_arm_product_template
msgid "Cabinet"
-msgstr ""
+msgstr "Gabinete"
#. module: product
#: help:product.product,incoming_qty:0
@@ -734,11 +760,22 @@ msgid ""
"Otherwise, this includes goods arriving to any Stock Location typed as "
"'internal'."
msgstr ""
+"Cantidad de productos que se prevee que lleguen.\n"
+"En un contexto con una única ubicación de almacén, el cálculo incluye los "
+"productos almacenados en esta ubicación, así como cualquiera de sus hijos.\n"
+"En un contexto de un único almacén, el cálculo incluye los productos "
+"almacenados en la ubicación de este almacén, así como cualquiera de sus "
+"hijos.\n"
+"En un contexto con una única tienda, el cálculo incluye los productos "
+"almacenados en la ubicación del almacén de la tienda, así como cualquiera de "
+"sus hijos.\n"
+"En otros contexto, el cálculo incluye los productos almacenados en cualquier "
+"ubicación de tipo \"interna\""
#. module: product
#: model:product.template,name:product.product_product_woodentable0_product_template
msgid "Wooden Table"
-msgstr ""
+msgstr "Mesa de madera"
#. module: product
#: model:product.template,name:product.product_product_cpu3_product_template
@@ -904,7 +941,7 @@ msgstr "En desarrollo"
#: code:addons/product/product.py:363
#, python-format
msgid "UoM categories Mismatch!"
-msgstr ""
+msgstr "UoM categories Mismatch!"
#. module: product
#: model:product.template,name:product.product_product_shelfofcm1_product_template
@@ -981,7 +1018,7 @@ msgstr "Total peso paquete"
#. module: product
#: field:product.template,seller_info_id:0
msgid "unknown"
-msgstr ""
+msgstr "Desconocido"
#. module: product
#: help:product.packaging,code:0
@@ -1070,6 +1107,7 @@ msgstr "Seq"
#: view:product.price_list:0
msgid "Calculate Product Price per Unit Based on Pricelist Version."
msgstr ""
+"Calcular los precios del producto según unidades para una versión de tarifa."
#. module: product
#: model:ir.model,name:product.model_product_ul
@@ -1129,7 +1167,7 @@ msgstr "Mayor que la UdM de referencia"
#. module: product
#: field:product.category,parent_right:0
msgid "Right Parent"
-msgstr ""
+msgstr "Padre derecho"
#. module: product
#: view:product.product:0
@@ -1149,6 +1187,17 @@ msgid ""
"Otherwise, this includes goods leaving from any Stock Location typed as "
"'internal'."
msgstr ""
+"Cantidad de productos que se prevee que salgan.\n"
+"En un contexto con una única ubicación de almacén, el cálculo incluye los "
+"productos almacenados en esta ubicación, así como cualquiera de sus hijos.\n"
+"En un contexto de un único almacén, el cálculo incluye los productos "
+"almacenados en la ubicación de este almacén, así como cualquiera de sus "
+"hijos.\n"
+"En un contexto con una única tienda, el cálculo incluye los productos "
+"almacenados en la ubicación del almacén de la tienda, así como cualquiera de "
+"sus hijos.\n"
+"En otros contexto, el cálculo incluye los productos almacenados en cualquier "
+"ubicación de tipo \"interna\""
#. module: product
#: model:product.category,name:product.product_category_services0
@@ -1261,7 +1310,7 @@ msgstr ""
#. module: product
#: field:product.template,weight_net:0
msgid "Net Weight"
-msgstr ""
+msgstr "Peso neto"
#. module: product
#: field:product.packaging,width:0
@@ -1321,7 +1370,7 @@ msgstr "Servicios"
#. module: product
#: model:ir.actions.act_window,name:product.product_form_config_action
msgid "Create or Import Products"
-msgstr ""
+msgstr "Crear o importar productos"
#. module: product
#: field:product.pricelist.item,base_pricelist_id:0
@@ -1429,7 +1478,7 @@ msgstr "Versión de tarifa"
#. module: product
#: field:product.product,virtual_available:0
msgid "Quantity Available"
-msgstr ""
+msgstr "Cantidad Disponible"
#. module: product
#: help:product.pricelist.item,sequence:0
@@ -1492,7 +1541,7 @@ msgstr "Unidad de medida compra"
#. module: product
#: field:product.template,supply_method:0
msgid "Supply Method"
-msgstr ""
+msgstr "Método suministro"
#. module: product
#: model:ir.actions.act_window,help:product.product_category_action
@@ -1521,6 +1570,8 @@ msgid ""
"Will change the way procurements are processed. Consumable are product where "
"you don't manage stock."
msgstr ""
+"Cambiará el método de gestión de los abastecimientos. Los productos "
+"consumibles son aquellos donde no se gestiona el stock."
#. module: product
#: field:product.pricelist.version,date_start:0
@@ -1604,7 +1655,7 @@ msgstr "El peso del UL vacío"
#. module: product
#: model:product.template,name:product.product_product_woodmm10_product_template
msgid "Wood 10mm"
-msgstr ""
+msgstr "Madera 10mm"
#. module: product
#: selection:product.uom,uom_type:0
@@ -1638,7 +1689,7 @@ msgstr "El código EAN de la unidad del paquete."
#. module: product
#: help:product.supplierinfo,product_uom:0
msgid "This comes from the product form."
-msgstr ""
+msgstr "Esto proviene del formulario del producto"
#. module: product
#: field:product.packaging,weight_ul:0
@@ -1771,6 +1822,8 @@ msgid ""
"Produce will generate production order or tasks, according to the product "
"type. Buy will trigger purchase orders when requested."
msgstr ""
+"\"Fabricar\" generará las ordenes de fabricación o tareas, acorde al tipo de "
+"producto. \"Comprar\" generará ordenes de compra cuando sea requerido."
#. module: product
#: field:product.product,variants:0
@@ -1796,7 +1849,7 @@ msgstr "Asigna la prioridad a la lista de proveedor de producto."
#. module: product
#: field:product.template,uom_id:0
msgid "Default Unit of Measure"
-msgstr ""
+msgstr "Unidad de medida por defecto"
#. module: product
#: model:product.template,name:product.product_product_tow1_product_template
@@ -1811,7 +1864,7 @@ msgstr "Método redondeo"
#. module: product
#: model:product.category,name:product.product_category_assembly
msgid "Assembly Service"
-msgstr ""
+msgstr "Servicio de ensamblaje"
#. module: product
#: model:ir.actions.report.xml,name:product.report_product_label
@@ -1922,7 +1975,7 @@ msgstr "Otros productos"
#. module: product
#: field:product.product,color:0
msgid "Color Index"
-msgstr ""
+msgstr "Índice de colores"
#. module: product
#: view:product.product:0
@@ -1948,7 +2001,7 @@ msgstr "Precio provedor"
#: code:addons/product/product.py:175
#, python-format
msgid "Warning"
-msgstr ""
+msgstr "Alerta"
#. module: product
#: field:product.pricelist.item,base:0
@@ -1958,7 +2011,7 @@ msgstr "Basado en"
#. 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
@@ -2036,7 +2089,7 @@ msgstr ""
#: 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 "Categorías UdM"
#. module: product
#: field:product.template,seller_delay:0
@@ -2074,7 +2127,7 @@ msgstr ""
#. module: product
#: view:product.product:0
msgid "Context..."
-msgstr ""
+msgstr "Contexto..."
#. module: product
#: model:product.template,name:product.product_product_hdd1_product_template
@@ -2119,7 +2172,7 @@ msgstr "Proveedor del producto"
#. module: product
#: field:product.product,product_image:0
msgid "Image"
-msgstr ""
+msgstr "Imágen"
#. module: product
#: field:product.uom,uom_type:0
@@ -2202,6 +2255,8 @@ msgid ""
"At least one pricelist has no active version !\n"
"Please create or activate one."
msgstr ""
+"¡Al menos una lista de precios no tiene una versión activa!\n"
+"Por favor, cree o active una."
#. module: product
#: field:product.pricelist.item,price_max_margin:0
@@ -2241,7 +2296,7 @@ msgstr "Margen precio mín."
#. module: product
#: field:product.template,weight:0
msgid "Gross Weight"
-msgstr ""
+msgstr "Peso bruto"
#. module: product
#: model:product.template,name:product.product_product_assemblysection0_product_template
diff --git a/addons/product/i18n/es_PY.po b/addons/product/i18n/es_PY.po
index 6150919a265..0974107ae05 100644
--- a/addons/product/i18n/es_PY.po
+++ b/addons/product/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:14+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/et.po b/addons/product/i18n/et.po
index 3811d5d2ef4..ccce7a2b1e7 100644
--- a/addons/product/i18n/et.po
+++ b/addons/product/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: code:addons/product/pricelist.py:178
diff --git a/addons/product/i18n/eu.po b/addons/product/i18n/eu.po
index 7302e85ed83..107eea96471 100644
--- a/addons/product/i18n/eu.po
+++ b/addons/product/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/fi.po b/addons/product/i18n/fi.po
index 7a66ee65473..580988783db 100644
--- a/addons/product/i18n/fi.po
+++ b/addons/product/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index 44966fb40b3..e9b3f6cf5fe 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: view:product.product:0
diff --git a/addons/product/i18n/gl.po b/addons/product/i18n/gl.po
index ab2d6ae680b..6ff5b8391bd 100644
--- a/addons/product/i18n/gl.po
+++ b/addons/product/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/hr.po b/addons/product/i18n/hr.po
index 12e3922d6dc..b1884727761 100644
--- a/addons/product/i18n/hr.po
+++ b/addons/product/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:14+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/hu.po b/addons/product/i18n/hu.po
index 88efa494de7..21cbcf2a170 100644
--- a/addons/product/i18n/hu.po
+++ b/addons/product/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
@@ -666,7 +666,7 @@ msgstr "Alapár"
#. module: product
#: model:product.template,name:product.product_consultant_product_template
msgid "Service on Timesheet"
-msgstr ""
+msgstr "Szolgáltatás munkaidő-kimutatás alapján"
#. module: product
#: model:product.template,name:product.product_product_fan2_product_template
diff --git a/addons/product/i18n/id.po b/addons/product/i18n/id.po
index 2d6d3656b5d..fc0312d7501 100644
--- a/addons/product/i18n/id.po
+++ b/addons/product/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/it.po b/addons/product/i18n/it.po
index 3d28002e324..b386105d39c 100644
--- a/addons/product/i18n/it.po
+++ b/addons/product/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
@@ -482,7 +482,7 @@ msgstr "Termine ultimo validità di questa versione del Listino"
#. module: product
#: model:product.category,name:product.product_category_0
msgid "All products"
-msgstr "Tutti i prodotti."
+msgstr "Tutti i prodotti"
#. module: product
#: model:ir.model,name:product.model_pricelist_partnerinfo
@@ -1315,7 +1315,7 @@ msgstr "Servizi"
#. module: product
#: model:ir.actions.act_window,name:product.product_form_config_action
msgid "Create or Import Products"
-msgstr ""
+msgstr "Crea o importa prodotti"
#. module: product
#: field:product.pricelist.item,base_pricelist_id:0
diff --git a/addons/product/i18n/ja.po b/addons/product/i18n/ja.po
index 0b8ce96ebca..c4bda691d47 100644
--- a/addons/product/i18n/ja.po
+++ b/addons/product/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/ko.po b/addons/product/i18n/ko.po
index cb980b4f332..c706a191364 100644
--- a/addons/product/i18n/ko.po
+++ b/addons/product/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po
index e844d91605a..f5b854f0892 100644
--- a/addons/product/i18n/lt.po
+++ b/addons/product/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
"Language: lt\n"
#. module: product
diff --git a/addons/product/i18n/lv.po b/addons/product/i18n/lv.po
index 3a8cb954c54..7c87f264b81 100644
--- a/addons/product/i18n/lv.po
+++ b/addons/product/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po
index b55f32ae558..fe15fcc2085 100644
--- a/addons/product/i18n/mn.po
+++ b/addons/product/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
@@ -1078,7 +1078,7 @@ msgstr ""
#. module: product
#: selection:product.template,type:0
msgid "Stockable Product"
-msgstr "Хадгалж болох"
+msgstr "Хадгалах бараа"
#. module: product
#: field:product.packaging,code:0
@@ -1448,7 +1448,7 @@ msgstr ""
#. module: product
#: selection:product.template,procure_method:0
msgid "Make to Stock"
-msgstr "Агуулахад хийх"
+msgstr "Нөөцлүүлэх"
#. module: product
#: field:product.pricelist.item,price_version_id:0
@@ -1474,7 +1474,7 @@ msgstr ""
#. module: product
#: selection:product.template,type:0
msgid "Consumable"
-msgstr "Зарцуулж болох"
+msgstr "Хангамжийн"
#. module: product
#: help:product.price.type,currency_id:0
@@ -1792,7 +1792,7 @@ msgstr "Үйлдвэрлэх"
#. module: product
#: selection:product.template,procure_method:0
msgid "Make to Order"
-msgstr "Захиалга хийх"
+msgstr "Захиалуулах"
#. module: product
#: help:product.template,supply_method:0
@@ -1801,7 +1801,8 @@ msgid ""
"type. Buy will trigger purchase orders when requested."
msgstr ""
"Үйлдвэрлэх гэдэг нь барааны төрөлөөс хамааруулан холбогдох үйлдвэрлэлийн "
-"захиалга юмуу даалгаврыг үүсгэдэг."
+"захиалга юмуу даалгаврыг үүсгэдэг. Худалдан авах гэдэг нь худалдан авах "
+"захиалга үүсгэдэг."
#. module: product
#: field:product.product,variants:0
@@ -2577,9 +2578,6 @@ msgstr "Үнийн хөнгөлөлт"
#~ "Үнийн санал асуух үед хэвлэгдэх нийлүүлэгчийн барааны нэр. Хэрэв дотоод нэр "
#~ "ашиглах бол хоосон орхино."
-#~ msgid "Supply method"
-#~ msgstr "Түгээх арга"
-
#~ msgid "Suppliers of Product"
#~ msgstr "Барааны нийлүүлэгчид"
@@ -2819,3 +2817,6 @@ msgstr "Үнийн хөнгөлөлт"
#~ msgstr ""
#~ "Уг дүрэм нь сонгосон ангилалын бараануудад үйлчилнэ. Хоосон орхивол бүх "
#~ "бараанд үйлчилнэ."
+
+#~ msgid "Supply method"
+#~ msgstr "Нийлүүлэх арга"
diff --git a/addons/product/i18n/nb.po b/addons/product/i18n/nb.po
index 404fbb3e0ca..16bee51d072 100644
--- a/addons/product/i18n/nb.po
+++ b/addons/product/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
@@ -261,6 +261,8 @@ msgid ""
"Create a product form for everything you buy or sell. Specify a supplier if "
"the product can be purchased."
msgstr ""
+"Lag et produktskjema for alt du kjøper eller selger. Angi en leverandør hvis "
+"produktet kan bli kjøpt."
#. module: product
#: view:product.uom:0
@@ -526,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 ""
+"En prisliste inneholder regler som skal vurderes for å beregne kjøp eller "
+"salgsprisen for alle parter som er tildelt en pris liste. Prislister har "
+"flere versjoner (2010, 2011, vinterkampanje 2010, osv.) og hver versjon har "
+"flere regler. Eksempel: kunde prisen på en produkt kategori vil være basert "
+"på leverandørens pris multiplisert med 1,80."
#. module: product
#: model:product.template,name:product.product_product_metalcleats0_product_template
msgid "Metal Cleats"
-msgstr ""
+msgstr "Metal Cleats"
#. module: product
#: code:addons/product/product.py:175
#, python-format
msgid "Cannot change the category of existing UoM '%s'."
-msgstr ""
+msgstr "Kan ikke endre kategorien til enhet '%s'"
#. module: product
#: model:ir.model,name:product.model_product_uom_categ
@@ -566,7 +573,7 @@ msgstr "Kan kjøpes inn"
#. module: product
#: model:product.template,name:product.product_product_cpu2_product_template
msgid "High speed processor config"
-msgstr ""
+msgstr "High speed processor config"
#. module: product
#: model:process.transition,note:product.process_transition_supplierofproduct0
@@ -574,6 +581,8 @@ msgid ""
"1 or several supplier(s) can be linked to a product. All information stands "
"in the product form."
msgstr ""
+"En eller flere leverandør(er) kan bli forbundet til et produkt. All "
+"informasjon står i produktangivelsen."
#. module: product
#: help:product.uom,category_id:0
@@ -602,7 +611,7 @@ msgstr "Produktmaler"
#. module: product
#: field:product.category,parent_left:0
msgid "Left Parent"
-msgstr ""
+msgstr "Venstre overordnet"
#. module: product
#: model:product.template,name:product.product_product_restaurantexpenses0_product_template
@@ -612,7 +621,7 @@ msgstr "Restaurantutgifter"
#. module: product
#: help:product.packaging,qty:0
msgid "The total number of products you can put by pallet or box."
-msgstr ""
+msgstr "Det totale antallet av produkter du kan sette på pall eller i boks"
#. module: product
#: constraint:product.packaging:0
@@ -638,6 +647,9 @@ msgid ""
"you need to change the unit of measure, you may desactivate this product "
"from the 'Procurement & Locations' tab and create a new one."
msgstr ""
+"Ny enhet '%s' må høre til samme kategori '%s' som gammel enhet '%s'. Hvis du "
+"trenger å endre enhet, kan du deaktivere dette produktet på fanen "
+"'Anskaffelse & lokasjon' og oppretter et nytt."
#. module: product
#: view:product.pricelist.item:0
@@ -671,6 +683,9 @@ msgid ""
"not overlaps with original version. You should change the dates and "
"reactivate the pricelist"
msgstr ""
+"Når en versjon er duplisert er den satt til ikke aktiv, så datoen ikke "
+"overlapper den orginale versjonen. Du burde endre datoen og deaktivere "
+"prislisten."
#. module: product
#: model:product.template,name:product.product_product_kitshelfofcm0_product_template
@@ -753,6 +768,8 @@ msgid ""
"Product UoM if not empty, in the default unit of measure of the product "
"otherwise."
msgstr ""
+"Minste mengde ved kjøp fra denne leverandøren, angitt i leverandørens enhet, "
+"dersom angitt, ellers i standard enhet for produktet."
#. module: product
#: view:product.pricelist.item:0
@@ -788,6 +805,10 @@ 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 ""
+"Brukt av selskaper som benytter to enheter: En for fakturering og en annen "
+"for lagerstyring. I næringsmiddelindustri vil du f.eks. håndtere et lager av "
+"et antall skinker, men fakturere kundene i kg. La stå blank for å bruke "
+"standar enhet."
#. module: product
#: view:product.pricelist.item:0
@@ -877,7 +898,7 @@ msgstr "Under utvikling"
#: code:addons/product/product.py:363
#, python-format
msgid "UoM categories Mismatch!"
-msgstr ""
+msgstr "Uoverstemmelse mellom enhetskategoriene!"
#. module: product
#: model:product.template,name:product.product_product_shelfofcm1_product_template
@@ -887,7 +908,7 @@ msgstr "Shelf of 200cm"
#. module: product
#: view:product.uom:0
msgid "Ratio & Precision"
-msgstr ""
+msgstr "Forhold og presisjon"
#. module: product
#: model:product.uom,name:product.product_uom_gram
@@ -933,7 +954,7 @@ msgstr "Produktkategorier"
#. module: product
#: view:product.uom:0
msgid " e.g: 1 * (reference unit) = ratio * (this unit)"
-msgstr ""
+msgstr " f.eks.: 1 * (referanseenhet) = forhold * (denne enhet)"
#. module: product
#: model:ir.actions.act_window,help:product.product_uom_form_action
@@ -942,6 +963,9 @@ msgid ""
"You can define a conversion rate between several Units of Measure within the "
"same category."
msgstr ""
+"Opprett og administrer enhetene du vil at skal bli brukt i systemet ditt. Du "
+"kan definere en konverteringsfaktor mellom forskjellige enheter innen samme "
+"kategori."
#. module: product
#: field:product.packaging,weight:0
@@ -956,7 +980,7 @@ msgstr "ukjent"
#. module: product
#: help:product.packaging,code:0
msgid "The code of the transport unit."
-msgstr ""
+msgstr "Koden til transportenheten."
#. module: product
#: help:product.template,standard_price:0
@@ -968,7 +992,7 @@ msgstr ""
#. module: product
#: view:product.price.type:0
msgid "Products Price Type"
-msgstr ""
+msgstr "Produktenes pristype"
#. module: product
#: field:product.product,price_extra:0
@@ -1004,6 +1028,8 @@ msgid ""
"reception of the products in your warehouse. Used by the scheduler for "
"automatic computation of the purchase order planning."
msgstr ""
+"Ledetid i dager mellom bekreftelse av innkjøpsordere og mottak av produkter "
+"på lager. Brukt av planleggeren for automatisk beregning av innkjøpsordren."
#. module: product
#: model:ir.actions.act_window,help:product.product_pricelist_action
@@ -1012,6 +1038,9 @@ msgid ""
"manage new versions of a price list. Some examples of versions: 2010, 2011, "
"Summer Promotion, etc."
msgstr ""
+"Det kan være mer enn en versjon av en prisliste. Her kan du lage og "
+"administrere nye versjoner av en prisliste. Noen eksempler på versjoner: "
+"2010, 2011, Sommerkampanje, etc."
#. module: product
#: selection:product.template,type:0
@@ -1078,21 +1107,25 @@ msgid ""
"be converted to each other. For example, in the unit of measure category "
"\"Time\", you will have the following UoM: Hours, Days."
msgstr ""
+"Opprett og administrer enhetskategoriene du vil at skal bli brukt i systemet "
+"ditt. Hvis flere enheter er i den same kategorien, kan de bli koblet sammen. "
+"For eksempel, i enhetskategorien \"Tid\", vil du ha de følgende enhetene: "
+"Timer, dager."
#. module: product
#: selection:product.uom,uom_type:0
msgid "Bigger than the reference UoM"
-msgstr ""
+msgstr "Større en referanseenheten"
#. module: product
#: field:product.category,parent_right:0
msgid "Right Parent"
-msgstr ""
+msgstr "Høyre overordnet"
#. module: product
#: view:product.product:0
msgid "To Sell"
-msgstr ""
+msgstr "Å selge"
#. module: product
#: help:product.product,outgoing_qty:0
@@ -1107,16 +1140,23 @@ msgid ""
"Otherwise, this includes goods leaving from any Stock Location typed as "
"'internal'."
msgstr ""
+"Antall produkter som skal sendes.\n"
+"I sammenheng med hver enkelt varelokasjon, som inkluderer varer sendt fra "
+"dette lageret, eller fra noen av dets underordnede.\n"
+"I sammenheng med hvert enkelt lager, som inkluderer varer sendt fra "
+"varelokasjonen i lageret, eller fra noen av dets underordnede.\n"
+"I sammenheng med hver enkelt butikk, som inkluderer varer sendt fra "
+"varelokasjonen til lageret i butikken, eller fra noen av dens underordnede."
#. module: product
#: model:product.category,name:product.product_category_services0
msgid "Marketable Services"
-msgstr ""
+msgstr "Markedsførte tjenester"
#. module: product
#: field:product.pricelist.item,price_surcharge:0
msgid "Price Surcharge"
-msgstr ""
+msgstr "Pristillegg"
#. module: product
#: model:product.template,name:product.product_product_mb1_product_template
@@ -1126,7 +1166,7 @@ msgstr "Mainboard ASUStek A7N8X"
#. module: product
#: field:product.product,packaging:0
msgid "Logistical Units"
-msgstr ""
+msgstr "Logistikkenheter"
#. module: product
#: field:product.category,complete_name:0
@@ -1156,6 +1196,10 @@ msgid ""
"contains detailed information about your products related to procurement "
"logistics, sales price, product category, suppliers and so on."
msgstr ""
+"Du må angi et produkt for alt du kjøper eller selger. Produkter kan være "
+"råvarer, lagerført, forbruksmateriell eller tjenester. Produktformen "
+"inneholder detaljert informasjon om produktene dine relatert til "
+"innkjøpslogistikk, salgspriser, produktkategori, leverandører osv."
#. module: product
#: model:product.uom,name:product.product_uom_kgm
@@ -1192,7 +1236,7 @@ msgstr ""
#: help:product.category,sequence:0
msgid ""
"Gives the sequence order when displaying a list of product categories."
-msgstr ""
+msgstr "Gir sekvensen orden når det viser en liste over produktkategorier."
#. module: product
#: field:product.uom,factor:0
@@ -1269,7 +1313,7 @@ msgstr "Tjenester"
#. module: product
#: model:ir.actions.act_window,name:product.product_form_config_action
msgid "Create or Import Products"
-msgstr ""
+msgstr "Opprett eller importer produkter"
#. module: product
#: field:product.pricelist.item,base_pricelist_id:0
@@ -1290,12 +1334,12 @@ msgstr "Produkter"
#. module: product
#: help:product.packaging,rows:0
msgid "The number of layers on a pallet or box"
-msgstr ""
+msgstr "Antall lag på en pall eller i en boks"
#. module: product
#: help:product.pricelist.item,base:0
msgid "The mode for computing the price for this rule."
-msgstr ""
+msgstr "Modusen for å beregne prisen til denne regelen"
#. module: product
#: view:product.packaging:0
@@ -1321,6 +1365,8 @@ msgid ""
"order and the delivery of the finished products. It's the time you promise "
"to your customers."
msgstr ""
+"Dette er gjennomsnittet i dager mellom bekreftelse av kundeordre til "
+"levering av det ferdige produktet. Det er tiden du lover kundene dine."
#. module: product
#: view:product.product:0
@@ -1429,7 +1475,7 @@ msgstr "Hylle"
#. module: product
#: field:product.template,uom_po_id:0
msgid "Purchase Unit of Measure"
-msgstr ""
+msgstr "Kjøpsenhet"
#. module: product
#: field:product.template,supply_method:0
@@ -1443,6 +1489,9 @@ msgid ""
"category to get the list of all products linked to this category or to a "
"child of this category."
msgstr ""
+"Her er en liste over alle produktene dine organisert etter kategori. Du kan "
+"trykke på en kategori for å få en liste over alle produktene linket til "
+"denne eller til en underordnet av denne kategorien."
#. module: product
#: view:product.product:0
@@ -1452,7 +1501,7 @@ msgstr "Grupper etter..."
#. module: product
#: model:product.template,name:product.product_product_cpu_gen_product_template
msgid "Regular processor config"
-msgstr ""
+msgstr "Regular processor config"
#. module: product
#: help:product.template,type:0
@@ -1476,6 +1525,10 @@ msgid ""
"the level of this product. Different lead times will be summed for all "
"levels and purchase orders."
msgstr ""
+"Gjennomsnittlig forsinkelse i dager du produserer produktet. Dette er bare "
+"for produksjonsordre, og, hvis det er en flernivået materialliste, er det "
+"bare for nivået på dette produktet. Forskjellige ledetider vil bli lagt "
+"sammen for alle nivåer og innkjøpsordre."
#. module: product
#: model:product.template,name:product.product_product_pc1_product_template
@@ -1488,6 +1541,8 @@ msgid ""
"If the active field is set to False, it will allow you to hide the pricelist "
"without removing it."
msgstr ""
+"Hvis det aktive feltet er satt til usant, vil det tillate deg å skjule "
+"prislisten uten å fjerne den."
#. module: product
#: model:product.uom,name:product.product_uom_cm
@@ -1503,7 +1558,7 @@ msgstr "Produktenhet"
#: constraint:product.template:0
msgid ""
"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
+msgstr "Feil: Standardenheten og innkjøpsenheten må være i samme kategori."
#. module: product
#: field:product.uom,rounding:0
@@ -1513,12 +1568,12 @@ msgstr "Avrundingsfaktor"
#. module: product
#: view:product.uom:0
msgid "Unit of Measure Properties"
-msgstr ""
+msgstr "Egenskaper for enhet"
#. module: product
#: model:product.template,name:product.product_product_shelf1_product_template
msgid "Rack 200cm"
-msgstr ""
+msgstr "Rack 200cm"
#. module: product
#: selection:product.template,supply_method:0
@@ -1533,17 +1588,17 @@ msgstr "Enhetskategorier"
#. module: product
#: help:product.packaging,weight_ul:0
msgid "The weight of the empty UL"
-msgstr ""
+msgstr "Vekten av den tomme pakningen"
#. module: product
#: model:product.template,name:product.product_product_woodmm10_product_template
msgid "Wood 10mm"
-msgstr ""
+msgstr "Tre 10mm"
#. module: product
#: selection:product.uom,uom_type:0
msgid "Smaller than the reference UoM"
-msgstr ""
+msgstr "Mindre enn referanseenheten"
#. module: product
#: field:product.price.type,active:0
@@ -1562,7 +1617,7 @@ msgstr "Variant prismargin"
#. module: product
#: sql_constraint:product.uom:0
msgid "The conversion ratio for a unit of measure cannot be 0!"
-msgstr ""
+msgstr "Konverteringsfaktoren til en enhet kan ikke være 0!"
#. module: product
#: help:product.packaging,ean:0
@@ -1572,7 +1627,7 @@ msgstr "EAN-koden på pakningsenheten."
#. module: product
#: help:product.supplierinfo,product_uom:0
msgid "This comes from the product form."
-msgstr ""
+msgstr "Dette kommer fra produktskjemaet"
#. module: product
#: field:product.packaging,weight_ul:0
@@ -1587,7 +1642,7 @@ msgstr "Prdoukt-felt"
#. module: product
#: field:product.template,mes_type:0
msgid "Measure Type"
-msgstr ""
+msgstr "Måletype"
#. module: product
#: help:product.uom,factor:0
@@ -1595,6 +1650,9 @@ msgid ""
"How many times this UoM is smaller than the reference UoM in this category:\n"
"1 * (reference unit) = ratio * (this unit)"
msgstr ""
+"Hvor mange ganger mindre er denne enheten enn referanseenheten i "
+"kategorien:\n"
+"1 * (referanseenhet) = forhold * (denne enhet)"
#. module: product
#: model:ir.actions.act_window,name:product.product_price_type_action
@@ -1605,7 +1663,7 @@ msgstr "Pristyper"
#. module: product
#: help:product.template,uom_id:0
msgid "Default Unit of Measure used for all stock operation."
-msgstr ""
+msgstr "Standardenhet for all lagerdrift."
#. module: product
#: model:product.category,name:product.product_category_misc0
@@ -1626,7 +1684,7 @@ msgstr "Enhetspris"
#: model:product.category,name:product.product_category_7
#: model:product.template,name:product.product_product_1_product_template
msgid "Onsite Intervention"
-msgstr ""
+msgstr "Inngrep hos kunden"
#. module: product
#: model:product.pricelist,name:product.list0
@@ -1636,12 +1694,12 @@ msgstr "Offentlig prisliste"
#. module: product
#: model:product.category,name:product.product_category_marketableproduct0
msgid "Marketable Products"
-msgstr ""
+msgstr "Markedsførte produkter"
#. module: product
#: field:product.supplierinfo,product_code:0
msgid "Supplier Product Code"
-msgstr ""
+msgstr "Leverandørens produktkode"
#. module: product
#: view:product.product:0
@@ -1721,7 +1779,7 @@ msgstr ""
#. module: product
#: help:product.supplierinfo,sequence:0
msgid "Assigns the priority to the list of product supplier."
-msgstr ""
+msgstr "Tildeler prioriteten til listen over produktleverandører."
#. module: product
#: field:product.template,uom_id:0
@@ -1741,7 +1799,7 @@ msgstr "Avrundingsmetode"
#. module: product
#: model:product.category,name:product.product_category_assembly
msgid "Assembly Service"
-msgstr ""
+msgstr "Montasjeservice"
#. module: product
#: model:ir.actions.report.xml,name:product.report_product_label
@@ -1783,13 +1841,13 @@ msgstr "Firma"
msgid ""
"Base price for computing the customer price. Sometimes called the catalog "
"price."
-msgstr ""
+msgstr "Basispris for beregning av kundeprisen."
#. module: product
#: code:addons/product/pricelist.py:376
#, python-format
msgid "Partner section of the product form"
-msgstr ""
+msgstr "Partnerdelen av produktskjemaet"
#. module: product
#: help:product.price.type,name:0
@@ -1799,7 +1857,7 @@ msgstr "Navn på denne type pris"
#. module: product
#: field:product.supplierinfo,product_uom:0
msgid "Supplier UoM"
-msgstr ""
+msgstr "Leverandørenhet"
#. module: product
#: help:product.pricelist.version,date_start:0
@@ -1812,11 +1870,13 @@ msgid ""
"Default Unit of Measure used for purchase orders. It must be in the same "
"category than the default unit of measure."
msgstr ""
+"Standard enhet for innkjøpesordre. Den må være i samme kategori som standard "
+"lagerenhet."
#. module: product
#: model:product.template,description:product.product_product_cpu1_product_template
msgid "This product is configured with example of push/pull flows"
-msgstr ""
+msgstr "Dette produktet er konfigurert med eksempel på push-/pullstrømmer"
#. module: product
#: field:product.packaging,length:0
@@ -1831,7 +1891,7 @@ msgstr "Lengde / distanse"
#. module: product
#: model:product.template,name:product.product_product_0_product_template
msgid "Onsite Senior Intervention"
-msgstr ""
+msgstr "Senior service hos kunde"
#. module: product
#: model:ir.model,name:product.model_product_pricelist_type
@@ -1847,12 +1907,12 @@ msgstr "Andre produkter"
#. module: product
#: field:product.product,color:0
msgid "Color Index"
-msgstr ""
+msgstr "Fargeindeks"
#. module: product
#: view:product.product:0
msgid "Characteristics"
-msgstr ""
+msgstr "Egenskaper"
#. module: product
#: field:product.template,sale_ok:0
@@ -1930,7 +1990,7 @@ msgstr "Ansatt"
#. module: product
#: model:product.template,name:product.product_product_shelfofcm0_product_template
msgid "Shelf of 100cm"
-msgstr ""
+msgstr "Hylle på 100cm"
#. module: product
#: model:ir.model,name:product.model_product_category
@@ -1954,6 +2014,8 @@ msgid ""
"By unchecking the active field you can disable a unit of measure without "
"deleting it."
msgstr ""
+"Ved å fjerne avkryssingen for 'Aktiv' kan du deaktivere en enhet uten å "
+"slette den."
#. module: product
#: model:ir.actions.act_window,name:product.product_uom_categ_form_action
@@ -1977,11 +2039,13 @@ msgid ""
"Create and manage your packaging dimensions and types you want to be "
"maintained in your system."
msgstr ""
+"Opprett og administrer emballasjedimensjoner og typer du vil opprettholde i "
+"systemet ditt."
#. module: product
#: model:product.template,name:product.product_product_rearpanelarm1_product_template
msgid "Rear Panel SHE200"
-msgstr ""
+msgstr "Rear Panel SHE200"
#. module: product
#: help:product.pricelist.type,key:0
@@ -1993,7 +2057,7 @@ msgstr "Benyttes i programkoden for å velge bestemte priser. Må ikke endres."
#. module: product
#: view:product.product:0
msgid "Context..."
-msgstr ""
+msgstr "Kontekst..."
#. module: product
#: model:product.template,name:product.product_product_hdd1_product_template
@@ -2003,7 +2067,7 @@ msgstr "HDD Seagate 7200.8 80GB"
#. module: product
#: help:product.supplierinfo,qty:0
msgid "This is a quantity which is converted into Default Uom."
-msgstr ""
+msgstr "Dette er en mengde som er omdannet til standard enhet."
#. module: product
#: field:product.packaging,ul:0
@@ -2028,7 +2092,7 @@ msgstr "Vekt"
#. module: product
#: model:product.template,name:product.product_product_22_product_template
msgid "Processor on demand"
-msgstr ""
+msgstr "Prosessor ved behov"
#. module: product
#: model:process.transition,name:product.process_transition_supplierofproduct0
@@ -2043,7 +2107,7 @@ msgstr "Bilde"
#. module: product
#: field:product.uom,uom_type:0
msgid "UoM Type"
-msgstr ""
+msgstr "Enhetstype"
#. module: product
#: help:product.product,active:0
@@ -2051,6 +2115,8 @@ msgid ""
"If the active field is set to False, it will allow you to hide the product "
"without removing it."
msgstr ""
+"Hvis det aktive feltet er satt til usant, vil det tillate deg å skjule "
+"produktet uten å fjerne det."
#. module: product
#: help:product.uom,rounding:0
@@ -2075,7 +2141,7 @@ msgstr "Rad"
#. module: product
#: model:product.template,name:product.product_product_rearpanelarm0_product_template
msgid "Rear Panel SHE100"
-msgstr ""
+msgstr "Rear Panel SHE100"
#. module: product
#: model:product.template,name:product.product_product_23_product_template
@@ -2085,7 +2151,7 @@ msgstr "Komplett PC med tilbehør"
#. module: product
#: model:product.template,name:product.product_product_hotelexpenses0_product_template
msgid "Hotel Expenses"
-msgstr ""
+msgstr "Hotellutgifter"
#. module: product
#: help:product.uom,factor_inv:0
@@ -2093,6 +2159,9 @@ msgid ""
"How many times this UoM is bigger than the reference UoM in this category:\n"
"1 * (this unit) = ratio * (reference unit)"
msgstr ""
+"Hvor mange ganger denne enheten er større enn referanseenheten i denne "
+"kategorien:\n"
+"1 * (denne enhet) = forhold * (referanseenhet)"
#. module: product
#: model:product.template,name:product.product_product_shelf0_product_template
@@ -2116,6 +2185,8 @@ msgid ""
"At least one pricelist has no active version !\n"
"Please create or activate one."
msgstr ""
+"Minst en prisliste har ikke en aktiv versjon!\n"
+"Vær snill å opprett eller aktiver en."
#. module: product
#: field:product.pricelist.item,price_max_margin:0
@@ -2160,12 +2231,12 @@ msgstr "Brutto vekt"
#. module: product
#: model:product.template,name:product.product_product_assemblysection0_product_template
msgid "Assembly Section"
-msgstr ""
+msgstr "Monteringsseksjon"
#. module: product
#: model:product.category,name:product.product_category_3
msgid "Computer Stuff"
-msgstr ""
+msgstr "Datatilbehør"
#. module: product
#: model:product.category,name:product.product_category_8
@@ -2183,7 +2254,7 @@ msgstr "Sekvens"
#. module: product
#: model:product.template,name:product.product_assembly_product_template
msgid "Assembly Service Cost"
-msgstr ""
+msgstr "Kostnad monteringsservice"
#. module: product
#: view:product.price_list:0
@@ -2198,7 +2269,7 @@ msgstr ""
#. module: product
#: model:product.template,name:product.product_product_21_product_template
msgid "RAM on demand"
-msgstr ""
+msgstr "RAM on demand"
#. module: product
#: view:res.partner:0
@@ -2214,7 +2285,7 @@ msgstr "Forsinkelser"
#. module: product
#: view:product.product:0
msgid "Both stockable and consumable products"
-msgstr ""
+msgstr "Både lagerførte produkter og forbruksvarer"
#. module: product
#: model:process.node,note:product.process_node_product0
@@ -2265,7 +2336,7 @@ msgstr "Produktvariant"
#. module: product
#: model:product.category,name:product.product_category_shelves0
msgid "Shelves"
-msgstr ""
+msgstr "Hyller"
#. module: product
#: code:addons/product/pricelist.py:375
@@ -2308,6 +2379,8 @@ msgid ""
"Gives the different ways to package the same product. This has no impact on "
"the picking order and is mainly used if you use the EDI module."
msgstr ""
+"Gir de forskjellige måtene å pakke samme produkt på. Dette har ingen "
+"innvirkning på rangen og er for det i meste bruk hvis du bruker EDI modulen."
#. module: product
#: model:ir.actions.act_window,name:product.product_pricelist_action
@@ -2319,7 +2392,7 @@ msgstr "Prislisteversjoner"
#. module: product
#: model:product.template,name:product.product_product_span100_product_template
msgid "Shelf Panel"
-msgstr ""
+msgstr "Hyllepanel"
#. module: product
#: help:product.pricelist.item,price_round:0
@@ -2328,6 +2401,9 @@ 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 ""
+"Setter prisen så den er multiplisert med denne verdien.\n"
+"Avrunding brukes etter rabatten og før avgift.\n"
+"For å ha priser som ender på 9.99, bruk runding 10, tilleggsavgift -0.01"
#. module: product
#: field:product.template,list_price:0
@@ -2337,7 +2413,7 @@ msgstr "Salgspris"
#. module: product
#: constraint:product.category:0
msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "Feil! Du kan ikke lage uendelig struktur med kategorier."
#. module: product
#: field:product.category,type:0
@@ -2471,3 +2547,9 @@ msgstr "Prisrabatt"
#~ msgid "Gross weight"
#~ msgstr "Bruttovekt"
+
+#~ msgid "Calculate Product Price per unit base on pricelist version."
+#~ msgstr "Beregn produktprisen per enhet basert på prislisteversjonen."
+
+#~ msgid "Default Unit Of Measure"
+#~ msgstr "Standard enhet"
diff --git a/addons/product/i18n/nl.po b/addons/product/i18n/nl.po
index 95753866161..5f5f356f08c 100644
--- a/addons/product/i18n/nl.po
+++ b/addons/product/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
@@ -735,7 +735,7 @@ msgstr "Aanwezige voorraad"
#. module: product
#: model:product.template,name:product.product_product_26_product_template
msgid "Kit Keyboard + Mouse"
-msgstr "Kit Keyboard + Mouse"
+msgstr "Kit Toetsenbord + Muis"
#. module: product
#: field:product.price.type,name:0
diff --git a/addons/product/i18n/nl_BE.po b/addons/product/i18n/nl_BE.po
index e57f9fb1a5b..38ac93703a2 100644
--- a/addons/product/i18n/nl_BE.po
+++ b/addons/product/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-03 05:09+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:14+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
"Language: nl\n"
#. module: product
diff --git a/addons/product/i18n/pl.po b/addons/product/i18n/pl.po
index 78eaf22090b..8fe0bd76934 100644
--- a/addons/product/i18n/pl.po
+++ b/addons/product/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/pt.po b/addons/product/i18n/pt.po
index 86471923a65..7729e6124c4 100644
--- a/addons/product/i18n/pt.po
+++ b/addons/product/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po
index 8288cab55f8..ecf4a513018 100644
--- a/addons/product/i18n/pt_BR.po
+++ b/addons/product/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:14+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
@@ -76,7 +76,7 @@ msgstr "Vendável"
#. module: product
#: model:product.template,name:product.product_product_mb2_product_template
msgid "Mainboard ASUStek A7V8X-X"
-msgstr "Mainboard ASUStek A7V8X-X"
+msgstr "Placa Mãe ASUStek A7V8X-X"
#. module: product
#: help:product.template,seller_qty:0
@@ -91,7 +91,7 @@ msgstr "Dia"
#. module: product
#: view:product.product:0
msgid "UoM"
-msgstr "Unidade de Medida"
+msgstr "UdM"
#. module: product
#: model:product.template,name:product.product_product_pc2_product_template
@@ -126,7 +126,7 @@ msgstr "Fixo"
#: code:addons/product/pricelist.py:178
#, python-format
msgid "Warning !"
-msgstr "Atenção !"
+msgstr "Aviso!"
#. module: product
#: model:ir.actions.report.xml,name:product.report_product_pricelist
@@ -216,7 +216,7 @@ msgstr "Lista de Preços"
#. module: product
#: view:product.template:0
msgid "UOM"
-msgstr "Unidade"
+msgstr "UdM"
#. module: product
#: model:product.uom,name:product.product_uom_unit
@@ -239,8 +239,8 @@ msgid ""
"Determines if the product can be visible in the list of product within a "
"selection from a sale order line."
msgstr ""
-"Determina se o produto pode ficar visível na lista de produtos do pedido de "
-"venda."
+"Determina se o produto pode ser visível na lista de produtos dentro de uma "
+"seleção a partir de uma linha de pedido de venda."
#. module: product
#: model:product.pricelist.version,name:product.ver0
@@ -262,7 +262,7 @@ msgstr "Lista de Preços de Venda"
#: view:product.template:0
#: field:product.template,type:0
msgid "Product Type"
-msgstr "Tipo do produto"
+msgstr "Tipo de Produto"
#. module: product
#: model:ir.actions.act_window,help:product.product_form_config_action
@@ -341,7 +341,7 @@ msgstr "Categoria"
msgid ""
"The rule only applies if the partner buys/sells more than this quantity."
msgstr ""
-"As regras somente se aplicam se o parceiro comprar/vender mais que esta "
+"As regras somente se aplicam se o parceiro comprar/vender mais do que esta "
"quantidade."
#. module: product
@@ -362,14 +362,14 @@ msgstr "Número de pacotes por camada"
#. module: product
#: field:product.packaging,qty:0
msgid "Quantity by Package"
-msgstr "Quantidade por embalagem"
+msgstr "Quantidade por Embalagem"
#. module: product
#: view:product.product:0
#: view:product.template:0
#: field:product.template,state:0
msgid "Status"
-msgstr "Estado"
+msgstr "Situação"
#. module: product
#: help:product.template,categ_id:0
@@ -405,7 +405,7 @@ msgstr "Componentes de TI"
#. module: product
#: field:product.template,product_manager:0
msgid "Product Manager"
-msgstr "Administração do produto"
+msgstr "Administração do Produto"
#. module: product
#: field:product.supplierinfo,product_name:0
@@ -443,6 +443,15 @@ msgid ""
"Otherwise, this includes goods stored in any Stock Location typed as "
"'internal'."
msgstr ""
+"Quantidade atual de produtos.\n"
+"Em um contexto de Estoque Único, inclui bens armazenados neste local, ou "
+"qualquer um dos seus filhos.\n"
+"Em um contexto de Armazém Único, inclui bens armazenados no local de estoque "
+"deste Armazém, ou qualquer um dos seus filhos.\n"
+"Em um contexto de Loja única, inclui bens armazenados no local de estoque do "
+"Armazém da loja, ou qualquer um dos seus filhos.\n"
+"Caso contrário, inclui mercadorias armazenadas em qualquer local do tipo "
+"'interno'."
#. module: product
#: view:product.pricelist:0
@@ -454,13 +463,13 @@ msgstr "Procurar Preços de Produtos"
#: view:product.template:0
#: field:product.template,description_sale:0
msgid "Sale Description"
-msgstr "Descrição da venda"
+msgstr "Descrição da Venda"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Storage Localisation"
-msgstr "Locação"
+msgstr "Localização do Armazenamento"
#. module: product
#: help:product.packaging,length:0
@@ -526,7 +535,7 @@ msgstr "Quantidade-4"
#. module: product
#: view:res.partner:0
msgid "Sales & Purchases"
-msgstr "Compras e Vendas"
+msgstr "Compras & Vendas"
#. module: product
#: model:product.uom.categ,name:product.uom_categ_wtime
@@ -544,7 +553,7 @@ msgid ""
"category will be based on the supplier price multiplied by 1.80."
msgstr ""
"Uma lista de preços contem regras que serão avaliadas para calcular o preço "
-"de compra ou venda de todos os parceiros definidos para esta lista. Listas "
+"de compra ou venda para todos os parceiros definidos para esta lista. Listas "
"de preços podem ter várias versões (2010, 2011, Promoção de Fevereiro 2010, "
"etc.) e cada versão tem várias regras. Exemplo: o preço para cliente de uma "
"categoria de produto será baseado no preço do fornecedor multiplicado por "
@@ -564,7 +573,7 @@ msgstr "Não é possível alterar a categoria de uma UdM '%s' existente."
#. module: product
#: model:ir.model,name:product.model_product_uom_categ
msgid "Product uom categ"
-msgstr "Categorias de unidades"
+msgstr "Categorias UdM de Produtos"
#. module: product
#: model:product.ul,name:product.product_ul_box
@@ -579,12 +588,12 @@ msgstr "Cálculo de Preços"
#. module: product
#: model:res.groups,name:product.group_uos
msgid "Product UoS View"
-msgstr "Ver UoS de Produto"
+msgstr "Visualizar UdV do Produto"
#. module: product
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
-msgstr "Pode ser comprado"
+msgstr "Pode ser Comprado"
#. module: product
#: model:product.template,name:product.product_product_cpu2_product_template
@@ -617,17 +626,17 @@ msgstr "A largura da embalagem"
#. module: product
#: selection:product.category,type:0
msgid "View"
-msgstr "Exibir"
+msgstr "Visualizar"
#. module: product
#: model:ir.actions.act_window,name:product.product_template_action_tree
msgid "Product Templates"
-msgstr "Templates de Produtos"
+msgstr "Modelos de Produtos"
#. module: product
#: field:product.category,parent_left:0
msgid "Left Parent"
-msgstr "Pai anterior"
+msgstr "Pai Esquerda"
#. module: product
#: model:product.template,name:product.product_product_restaurantexpenses0_product_template
@@ -648,7 +657,7 @@ msgstr "Error: código EAN invalido"
#. module: product
#: field:product.pricelist.item,min_quantity:0
msgid "Min. Quantity"
-msgstr "Quantidade mínima"
+msgstr "Quantidade Mínima"
#. module: product
#: model:ir.model,name:product.model_product_price_type
@@ -663,19 +672,19 @@ msgid ""
"you need to change the unit of measure, you may desactivate this product "
"from the 'Procurement & Locations' tab and create a new one."
msgstr ""
-"A nova UoM '%s' precisa pertencer a mesma categoria de UoM '%s' da antiga "
-"'%s'. Se você precisar alterar a Unidade de Medida, você pode desativar este "
-"produto na aba 'Compras & Locais' e criar um novo."
+"A nova UdM '%s' precisa pertencer a mesma categoria de UdM '%s' da antiga "
+"'%s'. Se você precisar alterar a Unidade de Medida (UdM), você pode "
+"desativar este produto na aba 'Aquisições & Locais' e criar um novo."
#. module: product
#: view:product.pricelist.item:0
msgid "Max. Margin"
-msgstr "Margem máxima"
+msgstr "Margem Mínima"
#. module: product
#: view:product.pricelist.item:0
msgid "Base Price"
-msgstr "Preço base"
+msgstr "Preço Base"
#. module: product
#: model:product.template,name:product.product_consultant_product_template
@@ -716,7 +725,7 @@ msgstr "Fornecedor"
#. module: product
#: field:product.product,qty_available:0
msgid "Quantity On Hand"
-msgstr "Quantidade na mÄo"
+msgstr "Quantidade na mão"
#. module: product
#: model:product.template,name:product.product_product_26_product_template
@@ -746,6 +755,15 @@ msgid ""
"Otherwise, this includes goods arriving to any Stock Location typed as "
"'internal'."
msgstr ""
+"Quantidade de produtos que estão previstos para chegar.\n"
+"Em um contexto de Estoque único, inclui mercadorias que chegam a este local, "
+"ou qualquer um dos seus filhos.\n"
+"Em um contexto de Armazém único, inclui mercadorias que chegam ao local de "
+"estoque do Armazém, ou qualquer um dos seus filhos.\n"
+"Em um contexto de Loja única, inclui mercadorias que chegam ao local de "
+"estoque do Armazém da loja, ou qualquer um dos seus filhos.\n"
+"Caso contrário, inclui mercadorias que chegam para qualquer local da escrita "
+"como 'interno'."
#. module: product
#: model:product.template,name:product.product_product_woodentable0_product_template
@@ -809,7 +827,7 @@ msgstr "Acessórios"
#. module: product
#: field:product.template,sale_delay:0
msgid "Customer Lead Time"
-msgstr "Tempo para entrega ao cliente"
+msgstr "Prazo de Entrega ao Cliente"
#. module: product
#: model:product.template,name:product.product_product_25_product_template
@@ -831,7 +849,7 @@ msgstr ""
#. module: product
#: view:product.pricelist.item:0
msgid "Min. Margin"
-msgstr "Margem mínima"
+msgstr "Margem Mínima"
#. module: product
#: field:product.category,child_id:0
@@ -895,7 +913,7 @@ msgstr ""
#: view:product.product:0
#: view:product.template:0
msgid "Procurement & Locations"
-msgstr "Aquisições & Locações"
+msgstr "Aquisições & Locais"
#. module: product
#: model:product.template,name:product.product_product_kitchendesignproject0_product_template
@@ -910,7 +928,7 @@ msgstr "Hora"
#. module: product
#: selection:product.template,state:0
msgid "In Development"
-msgstr "Em desevolvimento"
+msgstr "Em Desenvolvimento"
#. module: product
#: code:addons/product/product.py:363
@@ -948,7 +966,7 @@ msgstr "Normal"
#: model:process.node,name:product.process_node_supplier0
#: view:product.supplierinfo:0
msgid "Supplier Information"
-msgstr "Supplier Information"
+msgstr "Informações de Fornecedores"
#. module: product
#: field:product.price.type,currency_id:0
@@ -967,7 +985,7 @@ msgstr "DDR 256MB PC400"
#: model:ir.ui.menu,name:product.menu_product_category_action_form
#: view:product.category:0
msgid "Product Categories"
-msgstr "Categorias de produtos"
+msgstr "Categorias de Produtos"
#. module: product
#: view:product.uom:0
@@ -1012,7 +1030,7 @@ msgstr ""
#. module: product
#: view:product.price.type:0
msgid "Products Price Type"
-msgstr "Tipo de preço de produtos"
+msgstr "Tipo de Preços de Produtos"
#. module: product
#: field:product.product,price_extra:0
@@ -1034,7 +1052,7 @@ msgstr "As informações sobre um fornecedor do produto"
#: view:product.template:0
#: field:product.template,description_purchase:0
msgid "Purchase Description"
-msgstr "Descrição da compra"
+msgstr "Descrição da Compra"
#. module: product
#: constraint:product.pricelist.version:0
@@ -1066,7 +1084,7 @@ msgstr ""
#. module: product
#: selection:product.template,type:0
msgid "Stockable Product"
-msgstr "Produto estocável"
+msgstr "Produto Estocável"
#. module: product
#: field:product.packaging,code:0
@@ -1087,12 +1105,12 @@ msgstr ""
#. module: product
#: model:ir.model,name:product.model_product_ul
msgid "Shipping Unit"
-msgstr "Unidade de transporte"
+msgstr "Unidade de Envio"
#. module: product
#: field:pricelist.partnerinfo,suppinfo_id:0
msgid "Partner Information"
-msgstr "Informação do parceiro"
+msgstr "Informação do Parceiro"
#. module: product
#: selection:product.ul,type:0
@@ -1163,6 +1181,15 @@ msgid ""
"Otherwise, this includes goods leaving from any Stock Location typed as "
"'internal'."
msgstr ""
+"Quantidade de produtos que estão previstos para sair.\n"
+"Em um contexto com uma única localidade de estoque, isso inclui mercadorias "
+"que saem a partir deste local, ou qualquer um de seus filhos.\n"
+"Em um contexto com um único armazém, isto inclui mercadorias que saem do "
+"local de estoque do Armazém, ou qualquer um dos seus filhos.\n"
+"Em um contexto com uma única loja, isso inclui mercadorias que saem do local "
+"de estoque do Armazém da loja, ou qualquer um dos seus filhos.\n"
+"Caso contrário, isso inclui mercadorias que saem a partir de qualquer local "
+"da escrita como 'interno'."
#. module: product
#: model:product.category,name:product.product_category_services0
@@ -1182,7 +1209,7 @@ msgstr "Placa mãe ASUStek A7N8X"
#. module: product
#: field:product.product,packaging:0
msgid "Logistical Units"
-msgstr "Unidades logísticas"
+msgstr "Unidades Logísticas"
#. module: product
#: field:product.category,complete_name:0
@@ -1334,7 +1361,7 @@ msgstr "Serviços"
#. module: product
#: model:ir.actions.act_window,name:product.product_form_config_action
msgid "Create or Import Products"
-msgstr "Cria ou Importa Produtos"
+msgstr "Crie ou Importe Produtos"
#. module: product
#: field:product.pricelist.item,base_pricelist_id:0
@@ -1394,13 +1421,13 @@ msgstr ""
#: view:product.product:0
#: view:product.template:0
msgid "Second UoM"
-msgstr "Segunda Unidade"
+msgstr "Segunda UdM"
#. module: product
#: code:addons/product/product.py:143
#, python-format
msgid "Error !"
-msgstr "Erro !"
+msgstr "Erro!"
#. module: product
#: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -1408,12 +1435,12 @@ msgstr "Erro !"
#: model:ir.ui.menu,name:product.next_id_16
#: view:product.uom:0
msgid "Units of Measure"
-msgstr "Unidade de medida"
+msgstr "Unidades de Medida"
#. module: product
#: field:product.supplierinfo,min_qty:0
msgid "Minimal Quantity"
-msgstr "Quantidade mínima"
+msgstr "Quantidade Mínima"
#. module: product
#: model:product.category,name:product.product_category_9
@@ -1451,7 +1478,7 @@ msgid ""
"gives highest priority to lowest sequence and stops as soon as a matching "
"item is found."
msgstr ""
-"Define a ordem na qual que os itens da lista de preços serão checados. A "
+"Define a ordem em que os itens da lista de preços serão checados. A "
"avaliação inicia com prioridade para a sequência mais baixa e é encerrada "
"assim que o item é encontrado."
@@ -1490,7 +1517,7 @@ msgstr "Pesos"
#. module: product
#: field:product.uom,category_id:0
msgid "UoM Category"
-msgstr "Categoria de Unidade"
+msgstr "Categoria UdM"
#. module: product
#: field:product.template,loc_rack:0
@@ -1500,7 +1527,7 @@ msgstr "Rack"
#. module: product
#: field:product.template,uom_po_id:0
msgid "Purchase Unit of Measure"
-msgstr "Unid. de Medida de Compra"
+msgstr "Unidade de Medida de Compra"
#. module: product
#: field:product.template,supply_method:0
@@ -1534,8 +1561,8 @@ msgid ""
"Will change the way procurements are processed. Consumable are product where "
"you don't manage stock."
msgstr ""
-"Irá mudar a forma como compras são processadas. Consumíveis são produtos que "
-"você não controla estoque"
+"Irá mudar a forma como aquisições são processadas. Consumíveis são produtos "
+"que você não controla estoque"
#. module: product
#: field:product.pricelist.version,date_start:0
@@ -1577,14 +1604,14 @@ msgstr "cm"
#. module: product
#: model:ir.model,name:product.model_product_uom
msgid "Product Unit of Measure"
-msgstr "Unidade do produto"
+msgstr "Unidade de Medida do Produto"
#. module: product
#: constraint:product.template:0
msgid ""
"Error: The default UOM and the purchase UOM must be in the same category."
msgstr ""
-"Erro: A unidade padrão e a unidade de compra presisam ser da mesma categoria."
+"Erro: A UdM padrão e a UdM de compra precisam estar na mesma categoria."
#. module: product
#: field:product.uom,rounding:0
@@ -1594,7 +1621,7 @@ msgstr "Precisão do arredondamento"
#. module: product
#: view:product.uom:0
msgid "Unit of Measure Properties"
-msgstr "Propriedades da Unid. de Medida"
+msgstr "Propriedades da Unidade de Medida"
#. module: product
#: model:product.template,name:product.product_product_shelf1_product_template
@@ -1658,7 +1685,7 @@ msgstr "Isto vem do formulário do produto"
#. module: product
#: field:product.packaging,weight_ul:0
msgid "Empty Package Weight"
-msgstr "Peso da embalagem"
+msgstr "Peso da Embalagem Vazia"
#. module: product
#: field:product.price.type,field:0
@@ -1668,7 +1695,7 @@ msgstr "Campo Produto"
#. module: product
#: field:product.template,mes_type:0
msgid "Measure Type"
-msgstr "Tipo de medida"
+msgstr "Tipo de Medida"
#. module: product
#: help:product.uom,factor:0
@@ -1688,7 +1715,7 @@ msgstr "Tipos de Preço"
#. module: product
#: help:product.template,uom_id:0
msgid "Default Unit of Measure used for all stock operation."
-msgstr "Unidade padrão usada para todas as operações."
+msgstr "Unidade de Medida padrão usada para todas as operações de estoque."
#. module: product
#: model:product.category,name:product.product_category_misc0
@@ -1703,7 +1730,7 @@ msgstr "PC Customizável"
#. module: product
#: field:pricelist.partnerinfo,price:0
msgid "Unit Price"
-msgstr "Preço unitário"
+msgstr "Preço Unitário"
#. module: product
#: model:product.category,name:product.product_category_7
@@ -1744,7 +1771,7 @@ msgstr "Embalagem por camada"
#. module: product
#: field:product.template,warranty:0
msgid "Warranty (months)"
-msgstr "Garantia(meses)"
+msgstr "Garantia (meses)"
#. module: product
#: help:product.pricelist.item,categ_id:0
@@ -1796,12 +1823,12 @@ msgstr "Subtipos"
#: model:ir.actions.act_window,name:product.product_category_action
#: model:ir.ui.menu,name:product.menu_products_category
msgid "Products by Category"
-msgstr "Produtos por categoria"
+msgstr "Produtos por Categoria"
#. module: product
#: field:product.template,uos_coeff:0
msgid "UOM -> UOS Coeff"
-msgstr "Unidade de medida -> Coeficiente unidade de venda"
+msgstr "Coeficiente UdM -> UdV"
#. module: product
#: help:product.supplierinfo,sequence:0
@@ -1851,7 +1878,7 @@ msgstr "Altura da embalagem"
#. module: product
#: view:product.pricelist:0
msgid "Products Price List"
-msgstr "Lista de preços"
+msgstr "Lista de Preços"
#. module: product
#: field:product.pricelist,company_id:0
@@ -1899,7 +1926,7 @@ msgid ""
"Default Unit of Measure used for purchase orders. It must be in the same "
"category than the default unit of measure."
msgstr ""
-"Unidade de Medida default usada para pedidos de compra. Deve estar na mesma "
+"Unidade de Medida padrão usada para pedidos de compra. Deve estar na mesma "
"categoria que a UdM Padrão."
#. module: product
@@ -1951,7 +1978,7 @@ msgstr "Pode ser Vendido"
#. module: product
#: field:product.template,produce_delay:0
msgid "Manufacturing Lead Time"
-msgstr "Tempo para produção"
+msgstr "Prazo de Fabricação"
#. module: product
#: field:product.supplierinfo,pricelist_ids:0
@@ -1962,7 +1989,7 @@ msgstr "Lista de Preços para Fornecedor"
#: code:addons/product/product.py:175
#, python-format
msgid "Warning"
-msgstr "Alerta"
+msgstr "Aviso"
#. module: product
#: field:product.pricelist.item,base:0
@@ -2025,7 +2052,7 @@ msgstr "Estante de 100cm"
#: model:ir.model,name:product.model_product_category
#: field:product.pricelist.item,categ_id:0
msgid "Product Category"
-msgstr "Categoria de produtos"
+msgstr "Categoria de Produtos"
#. module: product
#: report:product.pricelist:0
@@ -2049,7 +2076,7 @@ msgstr ""
#: 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 "Categorias UoM"
+msgstr "Categorias UdM"
#. module: product
#: field:product.template,seller_delay:0
@@ -2102,7 +2129,7 @@ msgstr "Esta é a quantidade que é convertida para UdM Padrão."
#. module: product
#: field:product.packaging,ul:0
msgid "Type of Package"
-msgstr "Tipo de pacote"
+msgstr "Tipo de Embalagem"
#. module: product
#: selection:product.ul,type:0
@@ -2137,7 +2164,7 @@ msgstr "Imagem"
#. module: product
#: field:product.uom,uom_type:0
msgid "UoM Type"
-msgstr "Tipo de Unid. de Medida"
+msgstr "Tipo de UdM"
#. module: product
#: help:product.product,active:0
@@ -2154,8 +2181,8 @@ 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 ""
-"A quantidade calculada será multipla deste valor. Use 1.0 para Unid. de "
-"Medida que não pode ser dividida."
+"A quantidade calculada será multipla deste valor. Use 1.0 para UdM que não "
+"pode ser dividida, exemplo uma peça."
#. module: product
#: view:product.product:0
@@ -2166,7 +2193,7 @@ msgstr "Descrições"
#. module: product
#: field:product.template,loc_row:0
msgid "Row"
-msgstr "Row"
+msgstr "Linha"
#. module: product
#: model:product.template,name:product.product_product_rearpanelarm0_product_template
@@ -2176,7 +2203,7 @@ msgstr "Painel Traseiro SHE100"
#. module: product
#: model:product.template,name:product.product_product_23_product_template
msgid "Complete PC With Peripherals"
-msgstr "PC Complet com periféricos"
+msgstr "PC Completo com periféricos"
#. module: product
#: model:product.template,name:product.product_product_hotelexpenses0_product_template
@@ -2245,7 +2272,7 @@ msgstr "Pode ser Alugado"
#: model:product.price.type,name:product.standard_price
#: field:product.template,standard_price:0
msgid "Cost Price"
-msgstr "Preço de custo"
+msgstr "Preço de Custo"
#. module: product
#: field:product.pricelist.item,price_min_margin:0
@@ -2270,7 +2297,7 @@ msgstr "Componentes de Computador"
#. module: product
#: model:product.category,name:product.product_category_8
msgid "Phone Help"
-msgstr "Telefone de Ajuda"
+msgstr "Suporte Telefônico"
#. module: product
#: field:product.category,sequence:0
@@ -2293,7 +2320,7 @@ msgstr "Fechar"
#. module: product
#: model:ir.model,name:product.model_product_pricelist_item
msgid "Pricelist item"
-msgstr "Item da lista"
+msgstr "Item da lista de preço"
#. module: product
#: model:product.template,name:product.product_product_21_product_template
@@ -2303,7 +2330,7 @@ msgstr "Memória RAM sob demanda"
#. module: product
#: view:res.partner:0
msgid "Sales Properties"
-msgstr "Propriedades de vendas"
+msgstr "Propriedades da Venda"
#. module: product
#: view:product.product:0
@@ -2339,7 +2366,7 @@ msgstr "EAN"
#. module: product
#: view:product.template:0
msgid "Product Description"
-msgstr "Descrição do produto"
+msgstr "Descrição do Produto"
#. module: product
#: view:product.pricelist.item:0
@@ -2379,7 +2406,7 @@ msgstr "Outra lista"
#: field:product.product,product_tmpl_id:0
#: view:product.template:0
msgid "Product Template"
-msgstr "Template de Produto"
+msgstr "Modelo de Produto"
#. module: product
#: field:product.template,cost_method:0
@@ -2422,7 +2449,7 @@ msgstr "Versões da lista"
#. module: product
#: model:product.template,name:product.product_product_span100_product_template
msgid "Shelf Panel"
-msgstr ""
+msgstr "Painel de Prateleira"
#. module: product
#: help:product.pricelist.item,price_round:0
@@ -2431,15 +2458,15 @@ 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 ""
-"Define o preço, de modo a ser um múltiplo deste valor.\n"
-"Aplica-se o arredondamento após o desconto e antes da sobretaxa.\n"
-"Utilize arredondamento 10 e sobretaxa -0.01 para obter preços que terminam "
-"em 9,99"
+"Define o preço, de modo que é um múltiplo desse valor.\n"
+"O arredondamento é aplicado após o desconto e antes da sobretaxa.\n"
+"Os preços que terminam em 9,99, defina o arredondamento para 10, e -0,01 de "
+"sobretaxa"
#. module: product
#: field:product.template,list_price:0
msgid "Sale Price"
-msgstr "Preço de venda"
+msgstr "Preço de Venda"
#. module: product
#: constraint:product.category:0
@@ -2462,13 +2489,14 @@ msgid ""
"Coefficient to convert UOM to UOS\n"
" uos = uom * coeff"
msgstr ""
-"Coeficiente para converter UdM para UdM de Venda (UdM-V)\n"
-" UdM-V = UdM * Coeficiente"
+"Coeficiente para converter Unidade de Medida UdM para Unidade de Venda UdV "
+"de Venda\n"
+" UdV = UdM * Coeficiente"
#. module: product
#: constraint:res.partner:0
msgid "Error ! You cannot create recursive associated members."
-msgstr "Erro! Você não pode criar recursivamente a membros associados."
+msgstr "Erro! Você não pode criar membros associados recursivamente."
#. module: product
#: field:product.pricelist.item,price_discount:0
@@ -2742,9 +2770,6 @@ msgstr "Desconto"
#~ msgid "Stockable"
#~ msgstr "Estocável"
-#~ msgid "Default Unit Of Measure"
-#~ msgstr "Unid. de Medida Padrão"
-
#~ msgid "Error ! You can not create recursive associated members."
#~ msgstr "Erro ! Você não pode criar membros recursivos associados."
@@ -2838,3 +2863,6 @@ msgstr "Desconto"
#~ "Irá mudar a forma que as aquisições são processadas. Consumíveis são "
#~ "produtos estocáveis com estoque infinito, ou para ser usado quando mesmo "
#~ "quando não há gerenciamento de inventário no sistema."
+
+#~ msgid "Default Unit Of Measure"
+#~ msgstr "Unidade de Medida Padrão"
diff --git a/addons/product/i18n/ro.po b/addons/product/i18n/ro.po
index b6a95e1b63b..00cc3e4980a 100644
--- a/addons/product/i18n/ro.po
+++ b/addons/product/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index 5762449e179..725f3b29342 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
-"X-Generator: Launchpad (build 15887)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
@@ -57,6 +57,16 @@ msgid ""
"Otherwise, this includes goods stored in any Stock Location typed as "
"'internal'."
msgstr ""
+"Прогнозируемое количество (подсчитанное как количество на руках - исходящее "
+"+ поступающее)\n"
+"В контексте с единственным местом хранения запаса, это включает товары "
+"хранимые в этом месте или любом его дочернем.\n"
+"В контексте с единственным складом, это включает товары расположенные в "
+"месте хранения этого склада или любом его дочернем.\n"
+"В контексте с одиночным магазином, это включает товары расположенные в месте "
+" хранения этого склада магазина или любом его дочернем.\n"
+"Иначе, это включает товары хранимые в любом месте хранения представляемом "
+"как 'внутреннее'."
#. module: product
#: model:product.category,name:product.product_category_1
diff --git a/addons/product/i18n/sk.po b/addons/product/i18n/sk.po
index d9d679a035b..81dcaf9d2a6 100644
--- a/addons/product/i18n/sk.po
+++ b/addons/product/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:14+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/sl.po b/addons/product/i18n/sl.po
index 9472eb7fb99..96fd54523b5 100644
--- a/addons/product/i18n/sl.po
+++ b/addons/product/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:14+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/sq.po b/addons/product/i18n/sq.po
index 817c8155a01..c7dcc87ca29 100644
--- a/addons/product/i18n/sq.po
+++ b/addons/product/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:17+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po
index 1ef5fd8081d..849f620b789 100644
--- a/addons/product/i18n/sr.po
+++ b/addons/product/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/sr@latin.po b/addons/product/i18n/sr@latin.po
index 48301e7d00b..185a829bd17 100644
--- a/addons/product/i18n/sr@latin.po
+++ b/addons/product/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:14+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/sv.po b/addons/product/i18n/sv.po
index f216bfc8bdb..27fa7fd8582 100644
--- a/addons/product/i18n/sv.po
+++ b/addons/product/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:14+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
@@ -178,6 +178,8 @@ msgid ""
"Conversion from Product UoM %s to Default UoM %s is not possible as they "
"both belong to different Category!."
msgstr ""
+"Konvertering från produkt måttenheter %s till standard måttenheter %s är "
+"inte möjligt, eftersom båda tillhör annan kategori!."
#. module: product
#: model:product.uom,name:product.product_uom_dozen
@@ -272,7 +274,7 @@ msgstr ""
#. module: product
#: view:product.uom:0
msgid " e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr ""
+msgstr " t ex: 1 * (den här enheten) = förhållande * (referens enhet)"
#. module: product
#: code:addons/product/product.py:418
@@ -437,6 +439,16 @@ msgid ""
"Otherwise, this includes goods stored in any Stock Location typed as "
"'internal'."
msgstr ""
+"Nuvarande kvantitet av produkter.\n"
+"I ett sammanhang med en enda lagerplats omfattar detta varor som lagras på "
+"den här platsen, eller någon av det som ligger därunder.\n"
+"I ett sammanhang med ett enda lager omfattar detta varor som lagrats på "
+"lagerplatsen för detta lager, eller någon av det som ligger därunder.\n"
+"I ett sammanhang med en enda butik, omfattar detta varor som lagrats i "
+"lagerplacering av lagret från det här kontoret, eller någon av det som "
+"ligger därunder.\n"
+"Annars omfattar detta varor som lagras på någon lagerplats som som är "
+"\"intern\"."
#. module: product
#: view:product.pricelist:0
@@ -537,6 +549,12 @@ 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 ""
+"En prislista innehåller regler som skall utvärderas för att beräkna köp "
+"eller försäljningspriset för alla parter som tilldelats en prislista. "
+"Prislistor har flera versioner (2010, 2011, Erbjudanden i februari 2010, "
+"etc.) och varje version har flera regler. Exempel: Kundens pris på en "
+"produktkategori skall att baseras på leverantörspriset multiplicerat med "
+"1,80."
#. module: product
#: model:product.template,name:product.product_product_metalcleats0_product_template
@@ -547,7 +565,7 @@ msgstr "Metallkotsar"
#: code:addons/product/product.py:175
#, python-format
msgid "Cannot change the category of existing UoM '%s'."
-msgstr ""
+msgstr "Det går inte att ändra kategori av befintliga måttenheter '% s'."
#. module: product
#: model:ir.model,name:product.model_product_uom_categ
@@ -651,6 +669,9 @@ msgid ""
"you need to change the unit of measure, you may desactivate this product "
"from the 'Procurement & Locations' tab and create a new one."
msgstr ""
+"Nya måttenheter% s måste tillhöra samma måttenhetskategori '% s' som gamla "
+"måttenhet '% s'. Om du behöver ändra måttenhet kan du avaktivera denna "
+"produkt under \">Inköp & Platser\"-fliken och skapa en ny."
#. module: product
#: view:product.pricelist.item:0
@@ -691,7 +712,7 @@ msgstr ""
#. module: product
#: model:product.template,name:product.product_product_kitshelfofcm0_product_template
msgid "KIT Shelf of 100cm"
-msgstr ""
+msgstr "KIT Hylla 100 cm"
#. module: product
#: field:product.supplierinfo,name:0
@@ -731,6 +752,16 @@ msgid ""
"Otherwise, this includes goods arriving to any Stock Location typed as "
"'internal'."
msgstr ""
+"Kvantitet av produkter som planeras att levereras.\n"
+"I ett sammanhang med en enda lagerplats omfattar detta varor som anländer "
+"till denna plats, eller någon av det som ligger därunder.\n"
+"I ett sammanhang med en enda lager omfattar detta varor som anländer till "
+"lagerplatsen för detta lager, eller någon av det som ligger därunder.\n"
+"I ett sammanhang med en enda butik, omfattar detta varor som anländer till "
+"lagerplacering av lagret från det här butiken, eller någon av det som ligger "
+"därunder.\n"
+"Annars omfattar detta varor som anländer till en lagerplats som skrivs som "
+"\"intern\"."
#. module: product
#: model:product.template,name:product.product_product_woodentable0_product_template
@@ -769,6 +800,9 @@ msgid ""
"Product UoM if not empty, in the default unit of measure of the product "
"otherwise."
msgstr ""
+"Minsta mängd som krävs för att köpa från denna leverantör, uttryckt i "
+"leverantörens måttenhet om den inte är inte tom, i standard måttenhet för "
+"produkten om den är tom."
#. module: product
#: view:product.pricelist.item:0
@@ -781,6 +815,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 ""
+"Detta pris kommer att betraktas som ett pris för leverantörens måttenhet, "
+"annars gäller standard måttenhet för produkten."
#. module: product
#: model:product.category,name:product.product_category_5
@@ -804,6 +840,10 @@ 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 ""
+"Används av företag som hanterar två måttenheter: fakturering och "
+"lagerhantering. Till exempel i livsmedelsindustrin - du har ett lager av "
+"antal skinkor, men fakturerar i kg. Håll tomt för att använda standard "
+"enheten."
#. module: product
#: view:product.pricelist.item:0
@@ -893,7 +933,7 @@ msgstr "Under utveckling"
#: code:addons/product/product.py:363
#, python-format
msgid "UoM categories Mismatch!"
-msgstr ""
+msgstr "Enhetskategorier Fel!"
#. module: product
#: model:product.template,name:product.product_product_shelfofcm1_product_template
@@ -949,7 +989,7 @@ msgstr "Produktkategorier"
#. module: product
#: view:product.uom:0
msgid " e.g: 1 * (reference unit) = ratio * (this unit)"
-msgstr ""
+msgstr " t ex: 1 * (den här enheten) = förhållande * (referens enhet)"
#. module: product
#: model:ir.actions.act_window,help:product.product_uom_form_action
@@ -958,6 +998,8 @@ msgid ""
"You can define a conversion rate between several Units of Measure within the "
"same category."
msgstr ""
+"Skapa och hantera måttenheter som du vill ska användas i systemet. Du kan "
+"definiera en konvertering mellan flera måttenheter inom samma kategori."
#. module: product
#: field:product.packaging,weight:0
@@ -1032,6 +1074,9 @@ msgid ""
"manage new versions of a price list. Some examples of versions: 2010, 2011, "
"Summer Promotion, etc."
msgstr ""
+"Det kan finnas mer än en version av en prislista. Här kan du skapa och "
+"hantera nya versioner av en prislista. Några exempel på varianter: 2010, "
+"2011, Sommarerbjudande etc."
#. module: product
#: selection:product.template,type:0
@@ -1099,11 +1144,15 @@ msgid ""
"be converted to each other. For example, in the unit of measure category "
"\"Time\", you will have the following UoM: Hours, Days."
msgstr ""
+"Skapa och hantera måttenheternas kategorier som du vill ska användas i "
+"systemet. Om flera måttenheter är i samma kategori, kan de omvandlas mellan "
+"varandra. Till exempel i måttenhetskategorin \"Tid\", kan du att ha följande "
+"storlek: minuter, timmar, dagar."
#. module: product
#: selection:product.uom,uom_type:0
msgid "Bigger than the reference UoM"
-msgstr ""
+msgstr "Större än referensmåttenheten"
#. module: product
#: field:product.category,parent_right:0
@@ -1128,6 +1177,16 @@ msgid ""
"Otherwise, this includes goods leaving from any Stock Location typed as "
"'internal'."
msgstr ""
+"Kvantitet produkter som planeras att lämna.\n"
+"I ett sammanhang med en enda lagerplats omfattar detta varor som förs ut "
+"från denna plats, eller något som ligger därunder.\n"
+"I ett sammanhang med ett enda lager omfattar detta varor som lämnar från "
+"lagerplatsen för detta lager, eller något som ligger därunder.\n"
+"I ett sammanhang med en enda butik, omfattar detta varor som lämnar "
+"lagerplatsen på lagret från det här kontoret, eller något som ligger "
+"därunder.\n"
+"Annars omfattar detta varor som förs ut från alla lagerplatser som skrivs "
+"som \"intern\"."
#. module: product
#: model:product.category,name:product.product_category_services0
@@ -1166,7 +1225,7 @@ msgstr "Namn"
#. module: product
#: model:product.template,name:product.product_product_woodlintelm0_product_template
msgid "Wood Lintel 4m"
-msgstr ""
+msgstr "Trä Lintel 4m"
#. module: product
#: model:ir.actions.act_window,help:product.product_normal_action
@@ -1347,6 +1406,9 @@ msgid ""
"order and the delivery of the finished products. It's the time you promise "
"to your customers."
msgstr ""
+"Detta är den genomsnittliga förseningen i dagar mellan bekräftelsen av "
+"kundens beställning och leverans av de färdiga produkterna. Det är den tid "
+"du lovar dina kunder."
#. module: product
#: view:product.product:0
@@ -1409,6 +1471,9 @@ msgid ""
"gives highest priority to lowest sequence and stops as soon as a matching "
"item is found."
msgstr ""
+"Ger ordningen som prislistans punkter kommer att kontrolleras. Utvärderingen "
+"ger högsta prioritet till lägsta sekvens och stannar så snart en matchande "
+"post hittas."
#. module: product
#: selection:product.template,type:0
@@ -1469,6 +1534,9 @@ msgid ""
"category to get the list of all products linked to this category or to a "
"child of this category."
msgstr ""
+"En lista över alla dina produkter indelade i kategorier. Du kan klicka på en "
+"kategori för att få en lista över alla produkter kopplade till denna "
+"kategori eller till något av denna kategori."
#. module: product
#: view:product.product:0
@@ -1486,6 +1554,8 @@ msgid ""
"Will change the way procurements are processed. Consumable are product where "
"you don't manage stock."
msgstr ""
+"Kommer att förändra hur upphandlingar behandlas. Förbrukningsmaterial är "
+"produkter där man inte hanterar lager."
#. module: product
#: field:product.pricelist.version,date_start:0
@@ -1547,7 +1617,7 @@ msgstr "Enhetsinställningar"
#. module: product
#: model:product.template,name:product.product_product_shelf1_product_template
msgid "Rack 200cm"
-msgstr ""
+msgstr "Hylla 200cm"
#. module: product
#: selection:product.template,supply_method:0
@@ -1567,12 +1637,12 @@ msgstr "Tomvikt (UL)"
#. module: product
#: model:product.template,name:product.product_product_woodmm10_product_template
msgid "Wood 10mm"
-msgstr ""
+msgstr "Trä 10 mm"
#. module: product
#: selection:product.uom,uom_type:0
msgid "Smaller than the reference UoM"
-msgstr ""
+msgstr "Mindre än referensmåttenhet"
#. module: product
#: field:product.price.type,active:0
@@ -1601,7 +1671,7 @@ msgstr "EAN-kod för förpackningsenhet"
#. module: product
#: help:product.supplierinfo,product_uom:0
msgid "This comes from the product form."
-msgstr ""
+msgstr "Detta kommer från produktformuläret."
#. module: product
#: field:product.packaging,weight_ul:0
@@ -1624,12 +1694,15 @@ msgid ""
"How many times this UoM is smaller than the reference UoM in this category:\n"
"1 * (reference unit) = ratio * (this unit)"
msgstr ""
+"Hur många gånger denna måttenhet är mindre än referensvärdets måttenhet i "
+"denna kategori:\n"
+"1 * (referensenhet) = förhållande * (denna enhet)"
#. 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 "Pris typ"
#. module: product
#: help:product.template,uom_id:0
@@ -1698,6 +1771,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 ""
+"Sätt en produktkategori om denna regel endast gäller för produkter från en "
+"kategori och det därunder. Håll tom för alla produkter"
#. module: product
#: model:ir.model,name:product.model_product_product
@@ -1769,7 +1844,7 @@ msgstr "Avrundningsmetod"
#. module: product
#: model:product.category,name:product.product_category_assembly
msgid "Assembly Service"
-msgstr ""
+msgstr "Monteringsservice"
#. module: product
#: model:ir.actions.report.xml,name:product.report_product_label
@@ -1827,7 +1902,7 @@ msgstr "Namn på denna pristyp"
#. module: product
#: field:product.supplierinfo,product_uom:0
msgid "Supplier UoM"
-msgstr ""
+msgstr "Leverantörs måttenhet"
#. module: product
#: help:product.pricelist.version,date_start:0
@@ -1846,7 +1921,7 @@ msgstr ""
#. module: product
#: model:product.template,description:product.product_product_cpu1_product_template
msgid "This product is configured with example of push/pull flows"
-msgstr ""
+msgstr "Denna produkt är konfigurerad med exempel på Trycka / Dra flöden"
#. module: product
#: field:product.packaging,length:0
@@ -1923,7 +1998,7 @@ msgstr "Råmeterial"
#. module: product
#: help:product.template,product_manager:0
msgid "This is use as task responsible"
-msgstr ""
+msgstr "Detta är används som ansvarig för uppgiften"
#. module: product
#: field:product.pricelist,name:0
@@ -1960,7 +2035,7 @@ msgstr "Anställd"
#. module: product
#: model:product.template,name:product.product_product_shelfofcm0_product_template
msgid "Shelf of 100cm"
-msgstr ""
+msgstr "Hylla 100 cm"
#. module: product
#: model:ir.model,name:product.model_product_category
@@ -1984,12 +2059,14 @@ msgid ""
"By unchecking the active field you can disable a unit of measure without "
"deleting it."
msgstr ""
+"Genom att avmarkera det aktiva fältet kan du inaktivera en måttenhet utan "
+"att ta bort det."
#. 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 "Enhetskategorier"
#. module: product
#: field:product.template,seller_delay:0
@@ -2013,7 +2090,7 @@ msgstr ""
#. module: product
#: model:product.template,name:product.product_product_rearpanelarm1_product_template
msgid "Rear Panel SHE200"
-msgstr ""
+msgstr "Bakre Panel SHE200"
#. module: product
#: help:product.pricelist.type,key:0
@@ -2094,6 +2171,9 @@ 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 ""
+"Den beräknade kvantiteten kommer att vara en multipel av detta värde. Använd "
+"1,0 för en produktenhet som inte kan delas upp ytterligare, till exempel en "
+"bit."
#. module: product
#: view:product.product:0
@@ -2109,7 +2189,7 @@ msgstr "Rad"
#. module: product
#: model:product.template,name:product.product_product_rearpanelarm0_product_template
msgid "Rear Panel SHE100"
-msgstr ""
+msgstr "Bakre panel SHE100"
#. module: product
#: model:product.template,name:product.product_product_23_product_template
@@ -2127,11 +2207,14 @@ msgid ""
"How many times this UoM is bigger than the reference UoM in this category:\n"
"1 * (this unit) = ratio * (reference unit)"
msgstr ""
+"Hur många gånger denna enhet är större än referensen enhet i denna "
+"kategori:\n"
+"1 * (den här enheten) = förhållande * (referens enhet)"
#. module: product
#: model:product.template,name:product.product_product_shelf0_product_template
msgid "Rack 100cm"
-msgstr ""
+msgstr "Hylla 100cm"
#. module: product
#: help:product.packaging,sequence:0
@@ -2250,7 +2333,7 @@ msgstr "Ledtid"
#. module: product
#: view:product.product:0
msgid "Both stockable and consumable products"
-msgstr ""
+msgstr "Både lagerhållna och förbrukningsvaror"
#. module: product
#: model:process.node,note:product.process_node_product0
@@ -2344,6 +2427,8 @@ msgid ""
"Gives the different ways to package the same product. This has no impact on "
"the picking order and is mainly used if you use the EDI module."
msgstr ""
+"Ger de olika sätten att paketera samma produkt. Detta har ingen inverkan på "
+"plockordern och används främst om du använder EDI-modulen."
#. module: product
#: model:ir.actions.act_window,name:product.product_pricelist_action
@@ -2355,7 +2440,7 @@ msgstr "Prislisteversioner"
#. module: product
#: model:product.template,name:product.product_product_span100_product_template
msgid "Shelf Panel"
-msgstr ""
+msgstr "Hyllplan"
#. module: product
#: help:product.pricelist.item,price_round:0
@@ -2376,7 +2461,7 @@ msgstr "Säljpris"
#. module: product
#: constraint:product.category:0
msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "Fel! Du kan inte skapa rekursiva kategorier"
#. module: product
#: field:product.category,type:0
@@ -2400,7 +2485,7 @@ msgstr ""
#. module: product
#: constraint:res.partner:0
msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Fel ! Du kan inte ansluta medlemmar rekursivt"
#. module: product
#: field:product.pricelist.item,price_discount:0
diff --git a/addons/product/i18n/th.po b/addons/product/i18n/th.po
index 8e28e8e4ff3..23f4b0b11f7 100644
--- a/addons/product/i18n/th.po
+++ b/addons/product/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:14+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/tlh.po b/addons/product/i18n/tlh.po
index 550b4ebae98..e252d46dc6f 100644
--- a/addons/product/i18n/tlh.po
+++ b/addons/product/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:14+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index 44e7b46a7b5..12c5fa2579c 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:14+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
@@ -57,6 +57,15 @@ msgid ""
"Otherwise, this includes goods stored in any Stock Location typed as "
"'internal'."
msgstr ""
+"Tahmin miktarı (Eldek Miktar olarak hesaplanan - Çıkan + Giren)\n"
+"Tek Stok Konumu ile bir bağlamda, bu malların depolandığı konumu içerir , ya "
+"da onun herhangi bir alt konumunu.\n"
+"Tek Depo ile bir bağlamda, bu Depoda malların depolandığı Stok Konumunu "
+"içerir, ya da onun herhangi bir alt konumunu.\n"
+"Tek Mağaza ile bir bağlamda, bu Mağazaya ait Depoda malların depolandığı "
+"Stok Konumunu içerir, ya da onun herhangi bir alt konumunu.\n"
+"Aksi durumda, malların depolandığı 'iç' tipli herhangi bir Stok Konumunu "
+"içerir."
#. module: product
#: model:product.category,name:product.product_category_1
@@ -170,6 +179,8 @@ msgid ""
"Conversion from Product UoM %s to Default UoM %s is not possible as they "
"both belong to different Category!."
msgstr ""
+"Ürün Ölçü Birimin %s den Varsayılan Ölçü Birimi %s e dönüştürmek, eğer her "
+"ikisi de farklı kategorilere aitse, olası değildir."
#. module: product
#: model:product.uom,name:product.product_uom_dozen
@@ -429,6 +440,15 @@ msgid ""
"Otherwise, this includes goods stored in any Stock Location typed as "
"'internal'."
msgstr ""
+"Ürünlerin mevcut miktarı.\n"
+"Tek Stok Konumu ile bir bağlamda, bu Konumda depolanan malları içerir, ya da "
+"herhangi bir altındakini.\n"
+"Tek Depoyla bir bağlamda, bu Depoya ait Stok Konumunda depolanan malları "
+"içerir, ya da herhangi bir altındakini.\n"
+"Tek Mağaza ile bir bağlamda, bu Mağazaya ait Deponun Stok Konumunda "
+"depolanan malları içerir, ya da herhangi bir altındakini.\n"
+"Aksi durumda, 'iç' tipli herhangi bir Stok Konumunda depolanan malları "
+"içerir."
#. module: product
#: view:product.pricelist:0
@@ -648,6 +668,10 @@ msgid ""
"you need to change the unit of measure, you may desactivate this product "
"from the 'Procurement & Locations' tab and create a new one."
msgstr ""
+"'%s' Yeni Ölçü Birimi, eski '%s' Ölçü Biriminin '%s' Ölçü Birimi "
+"kategorisine ait olmalıdır. Ölçü birimini değiştirmek isterseniz, 'Satınalma "
+"& Konumlar' sekmesinden bu ürünün etkinliğini kaldırmanız ve yeni bir tane "
+"oluşturmanız gerekir ."
#. module: product
#: view:product.pricelist.item:0
@@ -728,6 +752,14 @@ msgid ""
"Otherwise, this includes goods arriving to any Stock Location typed as "
"'internal'."
msgstr ""
+"Gelmesi planlanan ürünlerin miktarı.\n"
+"Tek Stok Konumu ile bir bağlamda, bu Konuma gelecek malları içerir, ya da "
+"herhangi bir altındakini.\n"
+"Tek Depoyla bir bağlamda, bu Depoya ait Stok Konumuna gelecek malları "
+"içerir, ya da herhangi bir altındakini.\n"
+"Tek Mağaza ile bir bağlamda, bu Mağazaya ait Deponun Stok Konumuna gelecek "
+"malları içerir, ya da herhangi bir altındakini.\n"
+"Aksi durumda, 'iç' tipli herhangi bir Stok Konumuna gelecek malları içerir."
#. module: product
#: model:product.template,name:product.product_product_woodentable0_product_template
@@ -1143,6 +1175,14 @@ msgid ""
"Otherwise, this includes goods leaving from any Stock Location typed as "
"'internal'."
msgstr ""
+"Gönderilmesi planlanan ürünlerin miktarı.\n"
+"Tek Stok Konumu ile bir bağlamda, bu Konumdan çıkacak malları içerir, ya da "
+"herhangi bir altındakini.\n"
+"Tek Depoyla bir bağlamda, bu Depoya ait Stok Konumundan çıkacak malları "
+"içerir, ya da herhangi bir altındakini.\n"
+"Tek Mağaza ile bir bağlamda, bu Mağazaya ait Deponun Stok Konumundan çıkacak "
+"malları içerir, ya da herhangi bir altındakini.\n"
+"Aksi durumda, 'iç' tipli herhangi bir Stok Konumundan çıkacak malları içerir."
#. module: product
#: model:product.category,name:product.product_category_services0
@@ -1508,6 +1548,8 @@ msgid ""
"Will change the way procurements are processed. Consumable are product where "
"you don't manage stock."
msgstr ""
+"Satınalımaların işlenme yolunu değiştirecektir. Tüketim malları stok olarak "
+"işleyeceğiniz mallar değildir."
#. module: product
#: field:product.pricelist.version,date_start:0
@@ -1754,6 +1796,8 @@ msgid ""
"Produce will generate production order or tasks, according to the product "
"type. Buy will trigger purchase orders when requested."
msgstr ""
+"Üretim ürün türüne göre üretim emri ya da görevi oluşturacaktır. Talep "
+"oluştuğunda satınalma, satınalma siparişini tetikleyecektir."
#. module: product
#: field:product.product,variants:0
@@ -2180,6 +2224,8 @@ msgid ""
"At least one pricelist has no active version !\n"
"Please create or activate one."
msgstr ""
+"Enaz bir fiyat listesinin etkin sürümü yok!\n"
+"Lüten bir tane oluşturun ya da etkinleştirin."
#. module: product
#: field:product.pricelist.item,price_max_margin:0
diff --git a/addons/product/i18n/uk.po b/addons/product/i18n/uk.po
index ae2f900ffde..373f19fef2f 100644
--- a/addons/product/i18n/uk.po
+++ b/addons/product/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:14+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index b392aa5b661..f661bd21a95 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:14+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index 9bf52905906..7b7914b9c3e 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:14+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/zh_TW.po b/addons/product/i18n/zh_TW.po
index fae3fe5d5f1..9da2dcdd723 100644
--- a/addons/product/i18n/zh_TW.po
+++ b/addons/product/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:18+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:14+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/product.py b/addons/product/product.py
index d5acee0333b..6c6c5f2650c 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -109,8 +109,8 @@ class product_uom(osv.osv):
_order = "name"
_columns = {
- 'name': fields.char('Name', size=64, required=True, translate=True),
- 'category_id': fields.many2one('product.uom.categ', 'Unit of Measure Category', required=True, ondelete='cascade',
+ 'name': fields.char('Unit of Measure', size=64, required=True, translate=True),
+ 'category_id': fields.many2one('product.uom.categ', 'Category', required=True, ondelete='cascade',
help="Quantity conversions may happen automatically between Units of Measure in the same category, according to their respective ratios."),
'factor': fields.float('Ratio', required=True,digits=(12, 12),
help='How many times this Unit of Measure is smaller than the reference Unit of Measure in this category:\n'\
@@ -126,7 +126,7 @@ class product_uom(osv.osv):
'active': fields.boolean('Active', help="By unchecking the active field you can disable a unit of measure without deleting it."),
'uom_type': fields.selection([('bigger','Bigger than the reference Unit of Measure'),
('reference','Reference Unit of Measure for this category'),
- ('smaller','Smaller than the reference Unit of Measure')],'Unit of Measure Type', required=1),
+ ('smaller','Smaller than the reference Unit of Measure')],'Type', required=1),
}
_defaults = {
@@ -280,11 +280,8 @@ class product_template(osv.osv):
'description': fields.text('Description',translate=True),
'description_purchase': fields.text('Purchase Description',translate=True),
'description_sale': fields.text('Sale Description',translate=True),
- 'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."),
- 'supply_method': fields.selection([('produce','Manufacture'),('buy','Buy')], 'Supply Method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."),
- 'sale_delay': fields.float('Customer Lead Time', help="This is the average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."),
+ 'type': fields.selection([('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Consumable are product where you don't manage stock, a service is a non-material product provided by a company or an individual."),
'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. This is only for the 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."),
- 'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'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."),
'rental': fields.boolean('Can be Rent'),
'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]" ,help="Select category for the current product"),
'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Product Price'), help="Base price for computing the customer price. Sometimes called the catalog price."),
@@ -296,7 +293,6 @@ class product_template(osv.osv):
help="Standard Price: the cost price is fixed and recomputed periodically (usually at the end of the year), Average Price: the cost price is recomputed at each reception of products."),
'warranty': fields.float('Warranty'),
'sale_ok': fields.boolean('Can be Sold', help="Determines if the product can be visible in the list of product within a selection from a sale order line."),
- 'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."),
'state': fields.selection([('',''),
('draft', 'In Development'),
('sellable','Normal'),
@@ -309,11 +305,8 @@ class product_template(osv.osv):
'uos_coeff': fields.float('Unit of Measure -> UOS Coeff', digits_compute= dp.get_precision('Product UoS'),
help='Coefficient to convert Unit of Measure to UOS\n'
' uos = uom * coeff'),
- 'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type', required=True),
+ 'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type'),
'seller_ids': fields.one2many('product.supplierinfo', 'product_id', 'Partners'),
- 'loc_rack': fields.char('Rack', size=16),
- 'loc_row': fields.char('Row', size=16),
- 'loc_case': fields.char('Case', size=16),
'company_id': fields.many2one('res.company', 'Company', select=1),
}
@@ -351,21 +344,17 @@ class product_template(osv.osv):
_defaults = {
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'product.template', context=c),
- 'list_price': lambda *a: 1,
- 'cost_method': lambda *a: 'standard',
- 'supply_method': lambda *a: 'buy',
- 'standard_price': lambda *a: 0.0,
- 'sale_ok': lambda *a: 1,
- 'sale_delay': lambda *a: 7,
- 'produce_delay': lambda *a: 1,
- 'purchase_ok': lambda *a: 1,
- 'procure_method': lambda *a: 'make_to_stock',
+ 'list_price': 1,
+ 'cost_method': 'standard',
+ 'standard_price': 0.0,
+ 'sale_ok': 1,
+ 'produce_delay': 1,
'uom_id': _get_uom_id,
'uom_po_id': _get_uom_id,
- 'uos_coeff' : lambda *a: 1.0,
- 'mes_type' : lambda *a: 'fixed',
+ 'uos_coeff' : 1.0,
+ 'mes_type' : 'fixed',
'categ_id' : _default_category,
- 'type' : lambda *a: 'consu',
+ 'type' : 'consu',
}
def _check_uom(self, cursor, user, ids, context=None):
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 1974acc6df2..8e5280d036a 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -197,7 +197,6 @@ parameter) will see those record just disappear.
Serviceservice
-
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 66b86fc7b63..14477d2401a 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -70,8 +70,6 @@
20.530.75service
- make_to_order
- produceThis type of service include basic monitoring of products.
@@ -84,8 +82,6 @@
25.538.25service
- make_to_order
- produceThis type of service include assistance for security questions, system configuration requirements, implementation or special needs.
@@ -97,9 +93,7 @@
450.0300.0
- product
- make_to_order
- produce
+ consu4.0
@@ -115,9 +109,8 @@ HDD SH-1500.0750.0
- product
- make_to_order
- produce
+ consu
+
4.0
@@ -133,9 +126,7 @@ HDD SH-1600.0900.0
- product
- make_to_order
- produce
+ consu7.0
@@ -148,7 +139,7 @@ HDD SH-1800.01200.0
- product
+ consu
@@ -158,7 +149,7 @@ HDD SH-1
880.01350.0
- product
+ consu
@@ -168,7 +159,7 @@ HDD SH-1
10.013.0
- product
+ consu
@@ -178,8 +169,7 @@ HDD SH-1
10.013.0
- product
- make_to_order
+ consu
@@ -189,7 +179,7 @@ HDD SH-1
12.5014
- product
+ consu
@@ -199,7 +189,7 @@ HDD SH-1
1416.50
- product
+ consu
@@ -209,8 +199,7 @@ HDD SH-1
1812.50
- product
- make_to_order
+ consu
@@ -220,7 +209,7 @@ HDD SH-1
78.085.0
- product
+ consu
@@ -230,7 +219,7 @@ HDD SH-1
87.095.0
- product
+ consu
@@ -240,7 +229,7 @@ HDD SH-1
80.085.0
- product
+ consu
@@ -250,9 +239,7 @@ HDD SH-1
20.025.0
- product
- make_to_order
- produce
+ consu
@@ -262,7 +249,7 @@ HDD SH-1
860.0975.0
- product
+ consu
@@ -272,9 +259,7 @@ HDD SH-1
1020.01150.0
- product
- make_to_order
- produce
+ consu
@@ -284,9 +269,7 @@ HDD SH-1
1100.01250.0
- product
- make_to_order
- produce
+ consuOn demand hard-disk having capacity based on requirement.
@@ -297,7 +280,7 @@ HDD SH-1
1700.01950.0
- product
+ consu
@@ -307,7 +290,7 @@ HDD SH-1
1790.02000.0
- product
+ consu
@@ -317,7 +300,7 @@ HDD SH-1
2010.02100.0
- product
+ consu
@@ -327,7 +310,7 @@ HDD SH-1
1910.01980.0
- product
+ consu
@@ -337,7 +320,7 @@ HDD SH-1
876.0885.0
- product
+ consu
@@ -347,7 +330,7 @@ HDD SH-1
2870.02950.0
- product
+ consu17" Monitor
@@ -361,7 +344,7 @@ QWERTY keyboard3000.03245.0
- product
+ consu17" Monitor
@@ -375,9 +358,7 @@ QWERTY keyboard3300.03645.0
- product
- make_to_order
- produce
+ consuCustom Laptop based on customer's requirement.
@@ -388,7 +369,7 @@ QWERTY keyboard
390.0405.0
- product
+ consu
@@ -399,7 +380,7 @@ QWERTY keyboard
90.0100.0
- product
+ consu
@@ -410,7 +391,7 @@ QWERTY keyboard
126.0145.0
- product
+ consu
@@ -420,7 +401,7 @@ QWERTY keyboard
134.0150.0
- product
+ consu.
@@ -431,7 +412,7 @@ QWERTY keyboard
57.062.0
- product
+ consuHands free headset for laptop PC with in-line microphone and headphone plug.
@@ -442,8 +423,7 @@ QWERTY keyboard
60.065.0
- product
- make_to_order
+ consuHeadset for laptop PC with USB connector.
@@ -455,7 +435,7 @@ QWERTY keyboard
38.045.0
- product
+ consu
@@ -466,7 +446,7 @@ QWERTY keyboard
18.4020.0
- product
+ consu
@@ -477,7 +457,7 @@ QWERTY keyboard
21.6024.0
- product
+ consu
@@ -488,8 +468,7 @@ QWERTY keyboard
4258.04410.0
- product
- make_to_order
+ consuAll in one hi-speed printer with fax and scanner.
@@ -501,7 +480,7 @@ QWERTY keyboard
60.065.0
- product
+ consu
@@ -512,7 +491,7 @@ QWERTY keyboard
66.070.0
- product
+ consu
@@ -569,8 +548,6 @@ QWERTY keyboard
155.0173.0consu
- make_to_order
- produceFull featured image editing software.
@@ -582,7 +559,7 @@ QWERTY keyboard
55.060.0
- product
+ consu
@@ -593,7 +570,7 @@ QWERTY keyboard
35.040.0
- product
+ consu
@@ -604,7 +581,7 @@ QWERTY keyboard
55.070.0
- product
+ consu
@@ -615,7 +592,7 @@ QWERTY keyboard
13.018.0
- product
+ consu
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 8c19aee026f..b7fbcd560f7 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -10,12 +10,10 @@
-
+
-
-
-
+
@@ -60,7 +58,7 @@
-
+
@@ -73,8 +71,6 @@
-
-
@@ -104,38 +100,15 @@
-
-
-
+
-
-
- When you sell this service, nothing special will be trigered
- to deliver the customer, as you set the procurement method as
- 'Make to Stock'.
-
-
- When you sell this product, OpenERP will use the available
- inventory for the delivery order.
-
- If there are not enough quantities available, the delivery order
- will wait for new products. To fulfill the inventory, you should
- create others rules like orderpoints.
-
-
- When you sell this product, a delivery order will be created.
- OpenERP will consider that the required quantities are always
- available as it's a consumable (as a result of this, the quantity
- on hand may become negative).
-
When you sell this service to a customer, a draft purchase order
will be created in order to subcontract the job
to
.
-
+
When you sell this product, OpenERP will trigger a draft
purchase order to buy the required quantities to the supplier.
The delivery order will be ready after having received the
@@ -609,5 +623,45 @@
- [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]
+ [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]]
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index 8d8da4a078f..bcbd19d8bd8 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -75,7 +75,7 @@
report.intrastat.viewreport.intrastat
-
+
diff --git a/addons/report_webkit/i18n/ar.po b/addons/report_webkit/i18n/ar.po
index af65a530fe6..2aebc3f7b82 100644
--- a/addons/report_webkit/i18n/ar.po
+++ b/addons/report_webkit/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: report_webkit
#: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/bg.po b/addons/report_webkit/i18n/bg.po
index 4b2a7d03b68..e173cdb24f6 100644
--- a/addons/report_webkit/i18n/bg.po
+++ b/addons/report_webkit/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: report_webkit
#: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/ca.po b/addons/report_webkit/i18n/ca.po
index c32bba351da..a3d8b71e0e2 100644
--- a/addons/report_webkit/i18n/ca.po
+++ b/addons/report_webkit/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: report_webkit
#: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/da.po b/addons/report_webkit/i18n/da.po
index 291a28969b9..9dd38abaab4 100644
--- a/addons/report_webkit/i18n/da.po
+++ b/addons/report_webkit/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: report_webkit
#: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/de.po b/addons/report_webkit/i18n/de.po
index febbc46f016..5a9e97592b2 100644
--- a/addons/report_webkit/i18n/de.po
+++ b/addons/report_webkit/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: report_webkit
#: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/es.po b/addons/report_webkit/i18n/es.po
index 06dbb6a38ab..259ef2def19 100644
--- a/addons/report_webkit/i18n/es.po
+++ b/addons/report_webkit/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: report_webkit
#: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/es_CR.po b/addons/report_webkit/i18n/es_CR.po
index 6166014194d..44ad9783b2d 100644
--- a/addons/report_webkit/i18n/es_CR.po
+++ b/addons/report_webkit/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
"Language: es\n"
#. module: report_webkit
diff --git a/addons/report_webkit/i18n/fi.po b/addons/report_webkit/i18n/fi.po
index 974e9c17614..9a2fdc9e180 100644
--- a/addons/report_webkit/i18n/fi.po
+++ b/addons/report_webkit/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: report_webkit
#: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/fr.po b/addons/report_webkit/i18n/fr.po
index 6f5b2b9867a..f42aa58d9c5 100644
--- a/addons/report_webkit/i18n/fr.po
+++ b/addons/report_webkit/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: report_webkit
#: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/hr.po b/addons/report_webkit/i18n/hr.po
index 325e4ea6c3a..1d7c1715a44 100644
--- a/addons/report_webkit/i18n/hr.po
+++ b/addons/report_webkit/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: report_webkit
#: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/hu.po b/addons/report_webkit/i18n/hu.po
index 9fd1c19b8b8..87ba0665aea 100644
--- a/addons/report_webkit/i18n/hu.po
+++ b/addons/report_webkit/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: report_webkit
#: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/it.po b/addons/report_webkit/i18n/it.po
index 13733c0b5dd..066462c57f4 100644
--- a/addons/report_webkit/i18n/it.po
+++ b/addons/report_webkit/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: report_webkit
#: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/ja.po b/addons/report_webkit/i18n/ja.po
index 5dd6503f8b5..cdd0bcb0261 100644
--- a/addons/report_webkit/i18n/ja.po
+++ b/addons/report_webkit/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: report_webkit
#: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/nl.po b/addons/report_webkit/i18n/nl.po
index 7894a1ed11d..c7e25a013d7 100644
--- a/addons/report_webkit/i18n/nl.po
+++ b/addons/report_webkit/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
"PO-Revision-Date: 2012-02-13 15:35+0000\n"
-"Last-Translator: Erwin \n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) \n"
"Language-Team: Dutch \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: report_webkit
#: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/pl.po b/addons/report_webkit/i18n/pl.po
index 3b51ffa8a7e..0e59e79eb27 100644
--- a/addons/report_webkit/i18n/pl.po
+++ b/addons/report_webkit/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: report_webkit
#: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/pt.po b/addons/report_webkit/i18n/pt.po
index 29e0e8b2c88..fe486b8839d 100644
--- a/addons/report_webkit/i18n/pt.po
+++ b/addons/report_webkit/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: report_webkit
#: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/pt_BR.po b/addons/report_webkit/i18n/pt_BR.po
index 8a25e9b7c63..7b17399cc36 100644
--- a/addons/report_webkit/i18n/pt_BR.po
+++ b/addons/report_webkit/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: report_webkit
#: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/ro.po b/addons/report_webkit/i18n/ro.po
index 9557deb86ec..5e1d6b73314 100644
--- a/addons/report_webkit/i18n/ro.po
+++ b/addons/report_webkit/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: report_webkit
#: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/ru.po b/addons/report_webkit/i18n/ru.po
index dd80c4c92bd..b8117033f73 100644
--- a/addons/report_webkit/i18n/ru.po
+++ b/addons/report_webkit/i18n/ru.po
@@ -14,39 +14,39 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: report_webkit
#: view:ir.actions.report.xml:0
msgid "Webkit Template (used if Report File is not found)"
-msgstr ""
+msgstr "Шаблон Webkit (используется если файл отчёта не найден)"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "Tabloid 29 279.4 x 431.8 mm"
-msgstr ""
+msgstr "Tabloid 29 279.4 x 431.8 мм"
#. module: report_webkit
#: field:res.company,lib_path:0
msgid "Webkit Executable Path"
-msgstr ""
+msgstr "Путь к исполняемому файлу Webkit"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "Ledger 28 431.8 x 279.4 mm"
-msgstr ""
+msgstr "Ledger 28 431.8 x 279.4 мм"
#. module: report_webkit
#: code:addons/report_webkit/webkit_report.py:223
#, python-format
msgid "No header defined for this Webkit report!"
-msgstr ""
+msgstr "Неопределен заголовок для этого отчёта Webkit!"
#. module: report_webkit
#: help:ir.header_img,type:0
msgid "Image type(png,gif,jpeg)"
-msgstr ""
+msgstr "Тип изображения (png,gif,jpeg)"
#. module: report_webkit
#: help:ir.actions.report.xml,precise_mode:0
@@ -56,11 +56,14 @@ msgid ""
" but memory and disk "
"usage is wider"
msgstr ""
+"Этот режим позволяет более точное позиционирование элемента, поскольку "
+"каждый объект печатается по отдельному HTML. но больше используется память и "
+"диск"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "Executive 4 7.5 x 10 inches, 190.5 x 254 mm"
-msgstr ""
+msgstr "Executive 4 7.5 x 10 дюймов, 190.5 x 254 мм"
#. module: report_webkit
#: field:ir.header_img,company_id:0
@@ -72,22 +75,22 @@ msgstr "Компания"
#: code:addons/report_webkit/webkit_report.py:100
#, python-format
msgid "path to Wkhtmltopdf is not absolute"
-msgstr ""
+msgstr "путь к Wkhtmltopdf не абсолютный"
#. module: report_webkit
#: view:ir.header_webkit:0
msgid "Company and Page Setup"
-msgstr ""
+msgstr "Задание компании и страницы"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "DLE 26 110 x 220 mm"
-msgstr ""
+msgstr "DLE 26 110 x 220 мм"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "B7 21 88 x 125 mm"
-msgstr ""
+msgstr "B7 21 88 x 125 мм"
#. module: report_webkit
#: code:addons/report_webkit/webkit_report.py:252
@@ -97,7 +100,7 @@ msgstr ""
#: code:addons/report_webkit/webkit_report.py:296
#, python-format
msgid "Webkit render"
-msgstr ""
+msgstr "Исполнитель Webkit"
#. module: report_webkit
#: view:res.company:0
@@ -107,7 +110,7 @@ msgstr "Заголовки"
#. module: report_webkit
#: help:ir.header_img,name:0
msgid "Name of Image"
-msgstr ""
+msgstr "Название изображения"
#. module: report_webkit
#: code:addons/report_webkit/webkit_report.py:94
@@ -117,23 +120,25 @@ msgid ""
" 'Given path is not executable or path is "
"wrong"
msgstr ""
+"Неверен путь к Wkhtmltopdf заданный в компании'+\n"
+" 'Данный путь не исполняемый или путь не верен"
#. module: report_webkit
#: code:addons/report_webkit/webkit_report.py:167
#, python-format
msgid "Webkit raise an error"
-msgstr ""
+msgstr "Webkit вызвал ошибку"
#. module: report_webkit
#: model:ir.actions.act_window,name:report_webkit.action_header_webkit
#: model:ir.ui.menu,name:report_webkit.menu_header_webkit
msgid "Webkit Headers/Footers"
-msgstr ""
+msgstr "Верхние/нижние колонтитулы Webkit"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "Legal 3 8.5 x 14 inches, 215.9 x 355.6 mm"
-msgstr ""
+msgstr "Legal 3 8.5 x 14 дюймов, 215.9 x 355.6 мм"
#. module: report_webkit
#: model:ir.model,name:report_webkit.model_ir_header_webkit
@@ -143,7 +148,7 @@ msgstr "ir.header_webkit"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "A4 0 210 x 297 mm, 8.26 x 11.69 inches"
-msgstr ""
+msgstr "A4 0 210 x 297 мм, 8.26 x 11.69 дюймов"
#. module: report_webkit
#: code:addons/report_webkit/webkit_report.py:82
@@ -158,21 +163,29 @@ msgid ""
"form.'+\n"
" 'Minimal version is 0.9.9"
msgstr ""
+"Установите, пожалуйста, исполняемый файл в вашу систему'+\n"
+" ' (sudo apt-get install wkhtmltopdf) или "
+"загрузите его отсюда:'+\n"
+" ' "
+"http://code.google.com/p/wkhtmltopdf/downloads/list и задайте'+\n"
+" ' путь к исполняемому файлу в форме "
+"компании.'+\n"
+" 'Минимальная версия - 0.9.9"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "B6 20 125 x 176 mm"
-msgstr ""
+msgstr "B6 20 125 x 176 мм"
#. module: report_webkit
#: view:report.webkit.actions:0
msgid "_Cancel"
-msgstr ""
+msgstr "_Отмена"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "B2 17 500 x 707 mm"
-msgstr ""
+msgstr "B2 17 500 x 707 мм"
#. module: report_webkit
#: model:ir.model,name:report_webkit.model_ir_header_img
@@ -182,22 +195,22 @@ msgstr "ir.header_img"
#. module: report_webkit
#: field:ir.actions.report.xml,precise_mode:0
msgid "Precise Mode"
-msgstr ""
+msgstr "Точный режим"
#. module: report_webkit
#: constraint:res.company:0
msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Ошибка ! Нельзя создать рекурсивные компании."
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "A0 5 841 x 1189 mm"
-msgstr ""
+msgstr "A0 5 841 x 1189 мм"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "C5E 24 163 x 229 mm"
-msgstr ""
+msgstr "C5E 24 163 x 229 мм"
#. module: report_webkit
#: field:ir.header_img,type:0
@@ -208,12 +221,12 @@ msgstr "Тип"
#: code:addons/report_webkit/wizard/report_webkit_actions.py:137
#, python-format
msgid "Client Actions Connections"
-msgstr ""
+msgstr "Соединения действий клиентов"
#. module: report_webkit
#: field:res.company,header_image:0
msgid "Available Images"
-msgstr ""
+msgstr "Доступные изображения"
#. module: report_webkit
#: field:ir.header_webkit,html:0
@@ -223,75 +236,75 @@ msgstr ""
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "B1 15 707 x 1000 mm"
-msgstr ""
+msgstr "B1 15 707 x 1000 мм"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "A1 6 594 x 841 mm"
-msgstr ""
+msgstr "A1 6 594 x 841 мм"
#. module: report_webkit
#: help:ir.actions.report.xml,webkit_header:0
msgid "The header linked to the report"
-msgstr ""
+msgstr "Заголовок связанный с отчетом"
#. module: report_webkit
#: code:addons/report_webkit/webkit_report.py:81
#, python-format
msgid "Wkhtmltopdf library path is not set in company"
-msgstr ""
+msgstr "Путь к библиотеке Wkhtmltopdf в компании не задан"
#. module: report_webkit
#: view:ir.actions.report.xml:0
#: view:res.company:0
msgid "Webkit"
-msgstr ""
+msgstr "Webkit"
#. module: report_webkit
#: help:ir.header_webkit,format:0
msgid "Select Proper Paper size"
-msgstr ""
+msgstr "Выберите подходящий размер бумаги"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "B5 1 176 x 250 mm, 6.93 x 9.84 inches"
-msgstr ""
+msgstr "B5 1 176 x 250 мм, 6.93 x 9.84 дюймов"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "A7 11 74 x 105 mm"
-msgstr ""
+msgstr "A7 11 74 x 105 мм"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "A6 10 105 x 148 mm"
-msgstr ""
+msgstr "A6 10 105 x 148 мм"
#. module: report_webkit
#: help:ir.actions.report.xml,report_webkit_data:0
msgid "This template will be used if the main report file is not found"
-msgstr ""
+msgstr "Если не найден главный файл отчёта, будет использован этот шаблон"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "Folio 27 210 x 330 mm"
-msgstr ""
+msgstr "Folio 27 210 x 330 мм"
#. module: report_webkit
#: field:ir.header_webkit,margin_top:0
msgid "Top Margin (mm)"
-msgstr ""
+msgstr "Верхнее поле (мм)"
#. module: report_webkit
#: code:addons/report_webkit/webkit_report.py:224
#, python-format
msgid "Please set a header in company settings"
-msgstr ""
+msgstr "Задайте, пожалуйста, шапку в настройках компании"
#. module: report_webkit
#: view:report.webkit.actions:0
msgid "_Ok"
-msgstr ""
+msgstr "_Ok"
#. module: report_webkit
#: help:report.webkit.actions,print_button:0
@@ -299,21 +312,23 @@ msgid ""
"Check this to add a Print action for this Report in the sidebar of the "
"corresponding document types"
msgstr ""
+"Установите флажок для добавления на боковую панель действия печати для "
+"соответствующих типов документов"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "B3 18 353 x 500 mm"
-msgstr ""
+msgstr "B3 18 353 x 500 мм"
#. module: report_webkit
#: field:ir.actions.report.xml,webkit_header:0
msgid "Webkit Header"
-msgstr ""
+msgstr "Заголовок Webkit"
#. module: report_webkit
#: help:ir.actions.report.xml,webkit_debug:0
msgid "Enable the webkit engine debugger"
-msgstr ""
+msgstr "Разрешить отладчик движка webkit"
#. module: report_webkit
#: field:ir.header_img,img:0
@@ -323,7 +338,7 @@ msgstr "Изображение"
#. module: report_webkit
#: field:res.company,header_webkit:0
msgid "Available html"
-msgstr ""
+msgstr "Доступен html"
#. module: report_webkit
#: help:report.webkit.actions,open_action:0
@@ -331,6 +346,8 @@ msgid ""
"Check this to view the newly added internal print action after creating it "
"(technical view) "
msgstr ""
+"Установите флажок для вида вновь добавленного внутреннего действия печати "
+"после его создания (технический вид) "
#. module: report_webkit
#: view:res.company:0
@@ -350,27 +367,27 @@ msgstr "Альбом"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "B8 22 62 x 88 mm"
-msgstr ""
+msgstr "B8 22 62 x 88 мм"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "A2 7 420 x 594 mm"
-msgstr ""
+msgstr "A2 7 420 x 594 мм"
#. module: report_webkit
#: field:report.webkit.actions,print_button:0
msgid "Add print button"
-msgstr ""
+msgstr "Добавить кнопку печати"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "A9 13 37 x 52 mm"
-msgstr ""
+msgstr "A9 13 37 x 52 мм"
#. module: report_webkit
#: view:ir.header_webkit:0
msgid "Footer"
-msgstr ""
+msgstr "Нижний колонтитул"
#. module: report_webkit
#: model:ir.model,name:report_webkit.model_res_company
@@ -380,22 +397,22 @@ msgstr "Компании"
#. module: report_webkit
#: field:ir.header_webkit,margin_bottom:0
msgid "Bottom Margin (mm)"
-msgstr ""
+msgstr "Нижнее поле (мм)"
#. module: report_webkit
#: model:ir.model,name:report_webkit.model_report_webkit_actions
msgid "Webkit Actions"
-msgstr ""
+msgstr "Действия Webkit"
#. module: report_webkit
#: field:report.webkit.actions,open_action:0
msgid "Open added action"
-msgstr ""
+msgstr "Открыть добавленное действие"
#. module: report_webkit
#: field:ir.header_webkit,margin_right:0
msgid "Right Margin (mm)"
-msgstr ""
+msgstr "Правое поле (мм)"
#. module: report_webkit
#: field:ir.header_webkit,orientation:0
@@ -409,11 +426,14 @@ msgid ""
"Install a static version of the library if you experience missing "
"header/footers on Linux."
msgstr ""
+"Полный путь к исполняемому файлу wkhtmltopdf. Требуется версия 0.9.9. "
+"Установите статическую версию библиотеки, если вы обнаружили пропуск "
+"верхнего/нижнего колонтитула на Linux."
#. module: report_webkit
#: help:ir.header_webkit,html:0
msgid "Set Webkit Report Header"
-msgstr ""
+msgstr "Задать шапку отчёта Webkit"
#. module: report_webkit
#: field:ir.header_webkit,format:0
@@ -423,43 +443,43 @@ msgstr "Размер бумаги"
#. module: report_webkit
#: view:ir.header_webkit:0
msgid "Header"
-msgstr ""
+msgstr "Заголовок"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid ":B10 16 31 x 44 mm"
-msgstr ""
+msgstr ":B10 16 31 x 44 мм"
#. module: report_webkit
#: view:ir.header_webkit:0
msgid "CSS Style"
-msgstr ""
+msgstr "CSS стиль"
#. module: report_webkit
#: field:ir.header_webkit,css:0
msgid "Header CSS"
-msgstr ""
+msgstr "Заголовок CSS"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "B4 19 250 x 353 mm"
-msgstr ""
+msgstr "B4 19 250 x 353 мм"
#. module: report_webkit
#: model:ir.actions.act_window,name:report_webkit.action_header_img
#: model:ir.ui.menu,name:report_webkit.menu_header_img
msgid "Webkit Logos"
-msgstr ""
+msgstr "Логотипы Webkit"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "A3 8 297 x 420 mm"
-msgstr ""
+msgstr "A3 8 297 x 420 мм"
#. module: report_webkit
#: field:ir.actions.report.xml,report_webkit_data:0
msgid "Webkit Template"
-msgstr ""
+msgstr "Шаблон Webkit"
#. module: report_webkit
#: field:ir.header_webkit,footer_html:0
@@ -469,22 +489,22 @@ msgstr ""
#. module: report_webkit
#: field:ir.actions.report.xml,webkit_debug:0
msgid "Webkit debug"
-msgstr ""
+msgstr "Отладка Webkit"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "Letter 2 8.5 x 11 inches, 215.9 x 279.4 mm"
-msgstr ""
+msgstr "Letter 2 8.5 x 11 дюймов, 215.9 x 279.4 мм"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "B0 14 1000 x 1414 mm"
-msgstr ""
+msgstr "B0 14 1000 x 1414 мм"
#. module: report_webkit
#: sql_constraint:res.company:0
msgid "The company name must be unique !"
-msgstr ""
+msgstr "Название компании должно быть уникальным!"
#. module: report_webkit
#: field:ir.header_img,name:0
@@ -495,50 +515,50 @@ msgstr "Название"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "A5 9 148 x 210 mm"
-msgstr ""
+msgstr "A5 9 148 x 210 мм"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "A8 12 52 x 74 mm"
-msgstr ""
+msgstr "A8 12 52 x 74 мм"
#. module: report_webkit
#: model:ir.actions.act_window,name:report_webkit.wizard_ofdo_report_actions
#: view:report.webkit.actions:0
msgid "Add Print Buttons"
-msgstr ""
+msgstr "Добавить кнопки печати"
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "Comm10E 25 105 x 241 mm, U.S. Common 10 Envelope"
-msgstr ""
+msgstr "Comm10E 25 105 x 241 мм, 10 общих наклеек США"
#. module: report_webkit
#: code:addons/report_webkit/webkit_report.py:218
#, python-format
msgid "Webkit Report template not found !"
-msgstr ""
+msgstr "Шаблон отчёта Webkit не найден!"
#. module: report_webkit
#: field:ir.header_webkit,margin_left:0
msgid "Left Margin (mm)"
-msgstr ""
+msgstr "Левое поле (мм)"
#. module: report_webkit
#: code:addons/report_webkit/webkit_report.py:218
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "Ошибка!"
#. module: report_webkit
#: help:ir.header_webkit,footer_html:0
msgid "Set Webkit Report Footer."
-msgstr ""
+msgstr "Задать нижний колонтитул отчёта Webkit."
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "B9 23 33 x 62 mm"
-msgstr ""
+msgstr "B9 23 33 x 62 мм"
#. module: report_webkit
#: model:ir.model,name:report_webkit.model_ir_actions_report_xml
diff --git a/addons/report_webkit/i18n/sv.po b/addons/report_webkit/i18n/sv.po
index 13369165935..061985c7f9b 100644
--- a/addons/report_webkit/i18n/sv.po
+++ b/addons/report_webkit/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: report_webkit
#: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/tr.po b/addons/report_webkit/i18n/tr.po
index 1ec29943e2b..350af06a94f 100644
--- a/addons/report_webkit/i18n/tr.po
+++ b/addons/report_webkit/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: report_webkit
#: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/zh_CN.po b/addons/report_webkit/i18n/zh_CN.po
index 054c32161b0..342dc6af5b0 100644
--- a/addons/report_webkit/i18n/zh_CN.po
+++ b/addons/report_webkit/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:41+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:36+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: report_webkit
#: view:ir.actions.report.xml:0
diff --git a/addons/resource/i18n/ar.po b/addons/resource/i18n/ar.po
index 43638eb80b8..b19af7df5af 100644
--- a/addons/resource/i18n/ar.po
+++ b/addons/resource/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/bg.po b/addons/resource/i18n/bg.po
index 38376aa7474..ec74d8263c8 100644
--- a/addons/resource/i18n/bg.po
+++ b/addons/resource/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/ca.po b/addons/resource/i18n/ca.po
index 7910e847459..e963d59a96d 100644
--- a/addons/resource/i18n/ca.po
+++ b/addons/resource/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/cs.po b/addons/resource/i18n/cs.po
index d4ce34f6bd0..4ccf917ed8e 100644
--- a/addons/resource/i18n/cs.po
+++ b/addons/resource/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
"X-Poedit-Language: Czech\n"
#. module: resource
diff --git a/addons/resource/i18n/da.po b/addons/resource/i18n/da.po
index 00c10e83732..e8d3928c00e 100644
--- a/addons/resource/i18n/da.po
+++ b/addons/resource/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/de.po b/addons/resource/i18n/de.po
index aab7c4d54f4..002d4c7ba6e 100644
--- a/addons/resource/i18n/de.po
+++ b/addons/resource/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/es.po b/addons/resource/i18n/es.po
index 10e7c304bc7..c94dfbc475d 100644
--- a/addons/resource/i18n/es.po
+++ b/addons/resource/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/es_CR.po b/addons/resource/i18n/es_CR.po
index d90043ec206..6c6c76244b9 100644
--- a/addons/resource/i18n/es_CR.po
+++ b/addons/resource/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
"Language: es\n"
#. module: resource
diff --git a/addons/resource/i18n/es_EC.po b/addons/resource/i18n/es_EC.po
index 5e7c24a9253..92844f11ef0 100644
--- a/addons/resource/i18n/es_EC.po
+++ b/addons/resource/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/et.po b/addons/resource/i18n/et.po
index 82af443ba38..cea9f84d654 100644
--- a/addons/resource/i18n/et.po
+++ b/addons/resource/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/fi.po b/addons/resource/i18n/fi.po
index 7efb7831ac9..c5835e5e790 100644
--- a/addons/resource/i18n/fi.po
+++ b/addons/resource/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/fr.po b/addons/resource/i18n/fr.po
index b8a7d32bac6..a989c7a813f 100644
--- a/addons/resource/i18n/fr.po
+++ b/addons/resource/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/gl.po b/addons/resource/i18n/gl.po
index 2dcc5ac5b16..8c7ee114de6 100644
--- a/addons/resource/i18n/gl.po
+++ b/addons/resource/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/hr.po b/addons/resource/i18n/hr.po
index f17001caf6d..333b9e10049 100644
--- a/addons/resource/i18n/hr.po
+++ b/addons/resource/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/hu.po b/addons/resource/i18n/hu.po
index 9a40e4561f0..713697cf22d 100644
--- a/addons/resource/i18n/hu.po
+++ b/addons/resource/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/it.po b/addons/resource/i18n/it.po
index 4756ebcd11e..0df113ba3bb 100644
--- a/addons/resource/i18n/it.po
+++ b/addons/resource/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/ja.po b/addons/resource/i18n/ja.po
index 1ce316b0561..9ce79f33a00 100644
--- a/addons/resource/i18n/ja.po
+++ b/addons/resource/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/lt.po b/addons/resource/i18n/lt.po
index e6d871234bc..d48800fb6fb 100644
--- a/addons/resource/i18n/lt.po
+++ b/addons/resource/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/mn.po b/addons/resource/i18n/mn.po
index 84824c7fe29..44cac237e55 100644
--- a/addons/resource/i18n/mn.po
+++ b/addons/resource/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/nl.po b/addons/resource/i18n/nl.po
index 590acf291f5..19a2139ce0d 100644
--- a/addons/resource/i18n/nl.po
+++ b/addons/resource/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/pl.po b/addons/resource/i18n/pl.po
index 92d62e99347..6eb25e50279 100644
--- a/addons/resource/i18n/pl.po
+++ b/addons/resource/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/pt.po b/addons/resource/i18n/pt.po
index d7cea65ccbd..5f502ceba4b 100644
--- a/addons/resource/i18n/pt.po
+++ b/addons/resource/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/pt_BR.po b/addons/resource/i18n/pt_BR.po
index b57b8ada2cc..3779c2724de 100644
--- a/addons/resource/i18n/pt_BR.po
+++ b/addons/resource/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/ro.po b/addons/resource/i18n/ro.po
index 6a6184775e6..24e0fef2d7a 100644
--- a/addons/resource/i18n/ro.po
+++ b/addons/resource/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/ru.po b/addons/resource/i18n/ru.po
index 76d71677b32..7a7f5e82dbd 100644
--- a/addons/resource/i18n/ru.po
+++ b/addons/resource/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/sl.po b/addons/resource/i18n/sl.po
index 75b6293925d..c5a90609e29 100644
--- a/addons/resource/i18n/sl.po
+++ b/addons/resource/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/sv.po b/addons/resource/i18n/sv.po
index 035821dedc6..cbc3f65caf8 100644
--- a/addons/resource/i18n/sv.po
+++ b/addons/resource/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/tr.po b/addons/resource/i18n/tr.po
index 9eacea8f447..efdd7093563 100644
--- a/addons/resource/i18n/tr.po
+++ b/addons/resource/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
@@ -23,6 +23,8 @@ msgid ""
"If empty, this is a generic holiday for the company. If a resource is set, "
"the holiday/leave is only for this resource"
msgstr ""
+"Boşsa, bu firma için genel bir tatildir. Bir kaynak ayarlanmışsa, tatil/izin "
+"yalnızca bu kaynak içindir"
#. module: resource
#: selection:resource.resource,resource_type:0
@@ -38,12 +40,12 @@ msgstr "Kaynak Tipi"
#: model:ir.model,name:resource.model_resource_calendar_leaves
#: view:resource.calendar.leaves:0
msgid "Leave Detail"
-msgstr ""
+msgstr "İzin Ayrıntısı"
#. module: resource
#: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
msgid "Resources Leaves"
-msgstr ""
+msgstr "İzin Kaynakları"
#. module: resource
#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
@@ -73,7 +75,7 @@ msgstr "Pazar"
#. module: resource
#: view:resource.resource:0
msgid "Search Resource"
-msgstr ""
+msgstr "Arama Kaynağı"
#. module: resource
#: view:resource.resource:0
@@ -91,6 +93,7 @@ msgstr "Kaynaklar"
#, python-format
msgid "Make sure the Working time has been configured with proper week days!"
msgstr ""
+"Çalışma süresinin haftanın doğru günleriyle yapılandırıldığından emin olun!"
#. module: resource
#: field:resource.calendar,manager:0
@@ -100,17 +103,17 @@ msgstr ""
#. module: resource
#: help:resource.calendar.attendance,hour_from:0
msgid "Working time will start from"
-msgstr ""
+msgstr "İş süresinin başlama zamanı"
#. module: resource
#: constraint:resource.calendar.leaves:0
msgid "Error! leave start-date must be lower then leave end-date."
-msgstr ""
+msgstr "Hata! İzin başlangıç tarihi izin bitiş tarihinden önce olmalı."
#. module: resource
#: model:ir.model,name:resource.model_resource_calendar
msgid "Resource Calendar"
-msgstr ""
+msgstr "Kaynak Takvim"
#. module: resource
#: field:resource.calendar,company_id:0
@@ -119,7 +122,7 @@ msgstr ""
#: view:resource.resource:0
#: field:resource.resource,company_id:0
msgid "Company"
-msgstr ""
+msgstr "Firma"
#. module: resource
#: selection:resource.calendar.attendance,dayofweek:0
@@ -134,38 +137,38 @@ msgstr ""
#. module: resource
#: help:resource.calendar.attendance,hour_to:0
msgid "Working time will end at"
-msgstr ""
+msgstr "Çalışma süresinin bitiş zamanı"
#. module: resource
#: field:resource.calendar.attendance,date_from:0
msgid "Starting date"
-msgstr ""
+msgstr "Başlangıç Tarihi"
#. module: resource
#: view:resource.calendar:0
msgid "Search Working Time"
-msgstr ""
+msgstr "Çalışma Süresi Ara"
#. module: resource
#: view:resource.calendar.leaves:0
msgid "Reason"
-msgstr ""
+msgstr "Neden"
#. module: resource
#: view:resource.resource:0
#: field:resource.resource,user_id:0
msgid "User"
-msgstr ""
+msgstr "Kullanıcı"
#. module: resource
#: view:resource.calendar.leaves:0
msgid "Date"
-msgstr ""
+msgstr "Tarih"
#. module: resource
#: view:resource.calendar.leaves:0
msgid "Search Working Period Leaves"
-msgstr ""
+msgstr "Çalışma Dönemi İzinleri Ara"
#. module: resource
#: field:resource.resource,time_efficiency:0
@@ -175,12 +178,12 @@ msgstr ""
#. module: resource
#: field:resource.calendar.leaves,date_to:0
msgid "End Date"
-msgstr ""
+msgstr "Bitiş Tarihi"
#. module: resource
#: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
msgid "Closing Days"
-msgstr ""
+msgstr "Kapanış Günleri"
#. module: resource
#: model:ir.ui.menu,name:resource.menu_resource_config
@@ -188,7 +191,7 @@ msgstr ""
#: field:resource.calendar.leaves,resource_id:0
#: view:resource.resource:0
msgid "Resource"
-msgstr ""
+msgstr "Kaynak"
#. module: resource
#: view:resource.calendar:0
@@ -197,28 +200,28 @@ msgstr ""
#: field:resource.calendar.leaves,name:0
#: field:resource.resource,name:0
msgid "Name"
-msgstr ""
+msgstr "Adı"
#. module: resource
#: selection:resource.calendar.attendance,dayofweek:0
msgid "Wednesday"
-msgstr ""
+msgstr "Çarşamba"
#. module: resource
#: view:resource.calendar.leaves:0
#: view:resource.resource:0
msgid "Working Period"
-msgstr ""
+msgstr "Çalışma Aralığı"
#. module: resource
#: model:ir.model,name:resource.model_resource_resource
msgid "Resource Detail"
-msgstr ""
+msgstr "Kaynak Ayrıntısı"
#. module: resource
#: field:resource.resource,active:0
msgid "Active"
-msgstr ""
+msgstr "Etkin"
#. module: resource
#: help:resource.resource,active:0
@@ -226,16 +229,18 @@ msgid ""
"If the active field is set to False, it will allow you to hide the resource "
"record without removing it."
msgstr ""
+"Etkin alan Yanlış olarak ayarlıysa, kaynak kaydını silmeden gizlemenizi "
+"sağlayacaktır."
#. module: resource
#: field:resource.calendar.attendance,calendar_id:0
msgid "Resource's Calendar"
-msgstr ""
+msgstr "Kaynağın Takvimi"
#. module: resource
#: field:resource.calendar.attendance,hour_from:0
msgid "Work from"
-msgstr ""
+msgstr "Çalışma Başlangıcı"
#. module: resource
#: model:ir.actions.act_window,help:resource.action_resource_calendar_form
@@ -243,31 +248,32 @@ msgid ""
"Define working hours and time table that could be scheduled to your project "
"members"
msgstr ""
+"Proje üyelerinize planlanacak çalışma saatleri ve zaman çizelgesi tanımla"
#. module: resource
#: help:resource.resource,user_id:0
msgid "Related user name for the resource to manage its access."
-msgstr ""
+msgstr "Erişimini yönetmek için kaynak için ilgili kullanıcı adı."
#. module: resource
#: help:resource.resource,calendar_id:0
msgid "Define the schedule of resource"
-msgstr ""
+msgstr "Kaynağın planlamasını tanımla"
#. module: resource
#: view:resource.calendar.leaves:0
msgid "Starting Date of Leave"
-msgstr ""
+msgstr "İzin Başlangıç Tarihi"
#. module: resource
#: field:resource.resource,code:0
msgid "Code"
-msgstr ""
+msgstr "Kod"
#. module: resource
#: selection:resource.calendar.attendance,dayofweek:0
msgid "Monday"
-msgstr ""
+msgstr "Pazartesi"
#. module: resource
#: field:resource.calendar.attendance,hour_to:0
@@ -286,18 +292,18 @@ msgstr ""
#. module: resource
#: selection:resource.calendar.attendance,dayofweek:0
msgid "Tuesday"
-msgstr ""
+msgstr "Salı"
#. module: resource
#: field:resource.calendar.leaves,calendar_id:0
msgid "Working time"
-msgstr ""
+msgstr "Çalışma zamanı"
#. module: resource
#: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
#: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search
msgid "Resource Leaves"
-msgstr ""
+msgstr "Kaynak İzinler"
#. module: resource
#: model:ir.actions.act_window,help:resource.action_resource_resource_tree
@@ -310,42 +316,51 @@ msgstr ""
#. module: resource
#: view:resource.resource:0
msgid "Inactive"
-msgstr ""
+msgstr "Etkinsiz"
#. module: resource
#: code:addons/resource/faces/resource.py:340
#, python-format
msgid "(vacation)"
-msgstr ""
+msgstr "(tatil)"
#. module: resource
#: code:addons/resource/resource.py:392
#, python-format
msgid "Configuration Error!"
-msgstr ""
+msgstr "Yapılandırma Hatası!"
#. module: resource
#: selection:resource.resource,resource_type:0
msgid "Human"
-msgstr ""
+msgstr "İnsan"
#. module: resource
#: model:ir.model,name:resource.model_resource_calendar_attendance
msgid "Work Detail"
-msgstr ""
+msgstr "Çalışma Ayrıntısı"
#. module: resource
#: field:resource.calendar.leaves,date_from:0
msgid "Start Date"
-msgstr ""
+msgstr "Başlangıç Tarihi"
#. module: resource
#: code:addons/resource/resource.py:310
#, python-format
msgid " (copy)"
-msgstr ""
+msgstr " (kopya)"
#. module: resource
#: selection:resource.calendar.attendance,dayofweek:0
msgid "Saturday"
-msgstr ""
+msgstr "Cumartesi"
+
+#~ msgid "Workgroup manager"
+#~ msgstr "İşgrubu Yöneticisi"
+
+#~ msgid "Day of week"
+#~ msgstr "Hafta Günü"
+
+#~ msgid "Efficiency factor"
+#~ msgstr "Verim faktörü"
diff --git a/addons/resource/i18n/vi.po b/addons/resource/i18n/vi.po
index 389b5877f9f..ae85fe74f80 100644
--- a/addons/resource/i18n/vi.po
+++ b/addons/resource/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/zh_CN.po b/addons/resource/i18n/zh_CN.po
index 8e44a860735..ba8e1f3f7be 100644
--- a/addons/resource/i18n/zh_CN.po
+++ b/addons/resource/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:30+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: resource
#: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/sale/i18n/ar.po b/addons/sale/i18n/ar.po
index 59b7977ea33..f3d2bec948d 100644
--- a/addons/sale/i18n/ar.po
+++ b/addons/sale/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/bg.po b/addons/sale/i18n/bg.po
index e826a452719..eaa818985a1 100644
--- a/addons/sale/i18n/bg.po
+++ b/addons/sale/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/bs.po b/addons/sale/i18n/bs.po
index fda88d1349a..8ef87ce46db 100644
--- a/addons/sale/i18n/bs.po
+++ b/addons/sale/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/ca.po b/addons/sale/i18n/ca.po
index ea246ff22ae..822bbee26a2 100644
--- a/addons/sale/i18n/ca.po
+++ b/addons/sale/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/cs.po b/addons/sale/i18n/cs.po
index e0fb20a3819..e20c14718bc 100644
--- a/addons/sale/i18n/cs.po
+++ b/addons/sale/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
"X-Poedit-Language: Czech\n"
#. module: sale
diff --git a/addons/sale/i18n/da.po b/addons/sale/i18n/da.po
index 37a76d7ca9f..ed44ebe6b1d 100644
--- a/addons/sale/i18n/da.po
+++ b/addons/sale/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po
index c8b76340835..d382dad2306 100644
--- a/addons/sale/i18n/de.po
+++ b/addons/sale/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/el.po b/addons/sale/i18n/el.po
index 3bba1db8716..542055c2716 100644
--- a/addons/sale/i18n/el.po
+++ b/addons/sale/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index 4f59a5d728d..96b2d71796d 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:56+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/es_AR.po b/addons/sale/i18n/es_AR.po
index 032476ff046..22a31c08aa4 100644
--- a/addons/sale/i18n/es_AR.po
+++ b/addons/sale/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:56+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/es_CL.po b/addons/sale/i18n/es_CL.po
index 5d2d6a2ac53..19c4b15c1cf 100644
--- a/addons/sale/i18n/es_CL.po
+++ b/addons/sale/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:56+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/es_CR.po b/addons/sale/i18n/es_CR.po
index a9a1d5970ec..9e0adc35173 100644
--- a/addons/sale/i18n/es_CR.po
+++ b/addons/sale/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:56+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
"Language: \n"
#. module: sale
diff --git a/addons/sale/i18n/es_EC.po b/addons/sale/i18n/es_EC.po
index 06532b3b024..10145e272f9 100644
--- a/addons/sale/i18n/es_EC.po
+++ b/addons/sale/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:56+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/et.po b/addons/sale/i18n/et.po
index 3cc8299775a..16ee64df011 100644
--- a/addons/sale/i18n/et.po
+++ b/addons/sale/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: field:sale.order,amount_untaxed:0
diff --git a/addons/sale/i18n/fi.po b/addons/sale/i18n/fi.po
index 2b54907842c..55b58059d21 100644
--- a/addons/sale/i18n/fi.po
+++ b/addons/sale/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po
index 328e8997ae7..f292c335f70 100644
--- a/addons/sale/i18n/fr.po
+++ b/addons/sale/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#, python-format
#~ msgid ""
diff --git a/addons/sale/i18n/gl.po b/addons/sale/i18n/gl.po
index 3c54af5e0b7..b6aede97cb4 100644
--- a/addons/sale/i18n/gl.po
+++ b/addons/sale/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index 070cf9b85b6..aa269f53e42 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:56+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
"Language: hr\n"
#. module: sale
diff --git a/addons/sale/i18n/hu.po b/addons/sale/i18n/hu.po
index 9c67998deaa..ee50143425d 100644
--- a/addons/sale/i18n/hu.po
+++ b/addons/sale/i18n/hu.po
@@ -7,15 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-09-20 07:29+0000\n"
-"PO-Revision-Date: 2012-05-10 17:41+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"\n"
+"PO-Revision-Date: 2012-10-19 17:22+0000\n"
+"Last-Translator: Herczeg Péter \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-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-20 05:07+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
@@ -400,7 +399,7 @@ msgstr "Rendelés"
#. module: sale
#: field:sale.order,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "Üzenetek"
#. module: sale
#: selection:sale.report,month:0
@@ -634,7 +633,7 @@ msgstr "Megerősítés"
#. module: sale
#: view:sale.order:0
msgid "Unread messages"
-msgstr ""
+msgstr "Olvasatlan üzenetek"
#. module: sale
#: field:sale.order,partner_shipping_id:0
@@ -672,7 +671,7 @@ msgstr ""
#. module: sale
#: field:sale.order,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Olvasatlan üzenetek"
#. module: sale
#: view:sale.order:0
@@ -1105,7 +1104,7 @@ msgstr ""
#. module: sale
#: model:ir.model,name:sale.model_mail_message
msgid "Message"
-msgstr ""
+msgstr "Üzenet"
#. module: sale
#: field:sale.config.settings,module_warning:0
@@ -1323,7 +1322,7 @@ msgstr ""
#. module: sale
#: field:sale.order,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "követő"
#. module: sale
#: code:addons/sale/sale.py:261
@@ -1638,7 +1637,7 @@ msgstr "Mégsem"
#. module: sale
#: field:sale.order,message_follower_ids:0
msgid "Followers"
-msgstr ""
+msgstr "Követők"
#. module: sale
#: code:addons/sale/sale.py:947
@@ -2012,7 +2011,7 @@ msgstr ""
#. module: sale
#: help:sale.order,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Üzenetek és kommunikáció történet"
#. module: sale
#: view:sale.order:0
diff --git a/addons/sale/i18n/id.po b/addons/sale/i18n/id.po
index a9a446c9b2f..394b7d34d10 100644
--- a/addons/sale/i18n/id.po
+++ b/addons/sale/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/is.po b/addons/sale/i18n/is.po
index 8b8d4ab992e..0fb56614ca1 100644
--- a/addons/sale/i18n/is.po
+++ b/addons/sale/i18n/is.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/it.po b/addons/sale/i18n/it.po
index 3e72490fab2..7b3ebae23c5 100644
--- a/addons/sale/i18n/it.po
+++ b/addons/sale/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/ja.po b/addons/sale/i18n/ja.po
index 2fb7872fb86..a3813d865f7 100644
--- a/addons/sale/i18n/ja.po
+++ b/addons/sale/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/ko.po b/addons/sale/i18n/ko.po
index a4bfbf0a0b6..80851ad6103 100644
--- a/addons/sale/i18n/ko.po
+++ b/addons/sale/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/lo.po b/addons/sale/i18n/lo.po
index 499331abb3e..38598eff32d 100644
--- a/addons/sale/i18n/lo.po
+++ b/addons/sale/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/lt.po b/addons/sale/i18n/lt.po
index 0e7b97a9d9f..46158f9bbde 100644
--- a/addons/sale/i18n/lt.po
+++ b/addons/sale/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/lv.po b/addons/sale/i18n/lv.po
index 74c4055cbc2..eec95701a90 100644
--- a/addons/sale/i18n/lv.po
+++ b/addons/sale/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/mn.po b/addons/sale/i18n/mn.po
index 65ca489788f..4a783766d9d 100644
--- a/addons/sale/i18n/mn.po
+++ b/addons/sale/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/nb.po b/addons/sale/i18n/nb.po
index 9db247efc1c..db67a0bff1a 100644
--- a/addons/sale/i18n/nb.po
+++ b/addons/sale/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/nl.po b/addons/sale/i18n/nl.po
index a3a50ee99de..bbaa8939751 100644
--- a/addons/sale/i18n/nl.po
+++ b/addons/sale/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-09-20 07:29+0000\n"
"PO-Revision-Date: 2012-08-26 14:09+0000\n"
-"Last-Translator: Erwin \n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) \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-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
@@ -25,7 +25,7 @@ msgstr "Vooruitbetalen"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
msgid "Confirm Quotation"
-msgstr "Bevestig offerte-aanvraag"
+msgstr "Bevestig offerte"
#. module: sale
#: view:board.board:0
@@ -1015,8 +1015,8 @@ msgid ""
msgstr ""
"Factuur kan niet worden gemaakt voor deze verkooporderregel vanwege een van "
"de volgende redenen:\n"
-"1. de status van deze verkooporder is of \"concept\" of \"geannuleerd\"!\n"
-"2. de verkooporderregel is al gefactureerd!"
+"1. De status van deze verkooporder is of \"offerte\" of \"geannuleerd\"!\n"
+"2. De verkooporderregel is al gefactureerd!"
#. module: sale
#: code:addons/sale/sale.py:783
@@ -1195,7 +1195,7 @@ msgstr "Verkooporderregel factuur maken"
#. module: sale
#: selection:sale.order.line,state:0
msgid "Draft"
-msgstr "Concept"
+msgstr "Offerte"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1220,16 +1220,15 @@ msgid ""
" \n"
"* The 'Cancelled' state is set when a user cancel the sales order related."
msgstr ""
-"* De 'Concept' status is gezet als de betreffende verkooporder in concept "
-"is. \n"
-"* De 'Bevestigd' status is gezet als de betreffende verkooporder is "
-"bevestigd. \n"
-"* De 'Fout' status is gezet als de betreffende verkooporder in fout is. "
-" \n"
-"* De 'Gereed' status is gezet als de verkooporderregel is gepickt. "
-" \n"
-"* De 'geannuleerd' status is gezet als een gebruiker de betreffende "
-"verkooporder annuleert."
+"* De status is 'Offerte' bij concept orders of offertes\n"
+"* De status is 'Bevestigd' als de betreffende verkooporder is bevestigd. "
+" \n"
+"* De status is 'Fout' status als de betreffende verkooporder in een fout "
+"situatie terecht komt. \n"
+"* De status is 'Gereed' als de verkooporderregel is verzameld. "
+" \n"
+"* De status is 'Geannuleerd' als een gebruiker de betreffende verkooporder "
+"annuleert."
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -1647,7 +1646,7 @@ msgstr "Geen prijslijst! "
#: model:process.node,name:sale.process_node_quotation0
#: selection:sale.report,state:0
msgid "Quotation"
-msgstr "Offerte-aanvraag"
+msgstr "Offerte"
#. module: sale
#: view:sale.order.line:0
@@ -1961,7 +1960,7 @@ msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_quotation0
msgid "Draft state of sales order"
-msgstr "Concept status van verkooporder"
+msgstr "Offerte status van een verkooporder"
#. module: sale
#: field:sale.order,origin:0
@@ -2063,9 +2062,9 @@ msgid ""
"salesman."
msgstr ""
"Afhankelijk van de factuurinstelling van de verkooporder kan de factuur "
-"gebaseerd zijn op bestelde of geleverde aantallen. Dus, een verkooporder kan "
-"een factuur of leveringsopdracht genereren zodra deze bevestigd is door de "
-"verkoper."
+"gebaseerd zijn op bestelde of geleverde hoeveelheden. Dus, een verkooporder "
+"kan een factuur of uitgaande levering genereren zodra deze bevestigd is door "
+"de verkoper."
#. module: sale
#: selection:sale.advance.payment.inv,advance_payment_method:0
@@ -2122,7 +2121,7 @@ msgstr ""
#. module: sale
#: report:sale.order:0
msgid "Quotation N°"
-msgstr "Offerte-aanvraag nr."
+msgstr "Offerte nr."
#. module: sale
#: model:res.groups,name:sale.group_discount_per_so_line
@@ -2187,9 +2186,6 @@ msgstr "Besteldatum van de verkooporders"
#~ msgid "Recreate Procurement"
#~ msgstr "Vraag opnieuw aan"
-#~ msgid "Delivery Order"
-#~ msgstr "Leveringsopdracht"
-
#~ msgid "from stock"
#~ msgstr "Uit Voorraad"
@@ -3141,10 +3137,6 @@ msgstr "Besteldatum van de verkooporders"
#~ msgid "Layout Sequence"
#~ msgstr "Layout volgorde"
-#, python-format
-#~ msgid "The sales order '%s' has been set in draft state."
-#~ msgstr "De verkooporder '%s' is in status concept gezet."
-
#, python-format
#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
#~ msgstr "Kan geen verkooporder(s) verwijderen die al bevestigd zijn !"
@@ -3581,9 +3573,6 @@ msgstr "Besteldatum van de verkooporders"
#~ msgid "Invoice Based on Deliveries"
#~ msgstr "Factuur gebaseerd op leveringen"
-#~ msgid "Invoice based on deliveries"
-#~ msgstr "Factuur van leveringsopdracht"
-
#~ msgid "Invoice on order after delivery"
#~ msgstr "Factuur van order na levering"
@@ -3593,9 +3582,6 @@ msgstr "Besteldatum van de verkooporders"
#~ msgid "Qty(UoM)"
#~ msgstr "Hoeveelheid"
-#~ msgid "Set to Draft"
-#~ msgstr "Terug naar offerte-aanvraag"
-
#~ msgid "Lines to Invoice"
#~ msgstr "Te factureren orderregels"
@@ -3699,3 +3685,16 @@ msgstr "Besteldatum van de verkooporders"
#~ "(verzendingsfout).\n"
#~ "De 'Wacht op planner' staat wordt ingesteld wanneer de factuur is bevestigd, "
#~ "maar wacht deze op de planner, als deze start op de orderdatum."
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Factuur van uitgaande leveringen"
+
+#~ msgid "Delivery Order"
+#~ msgstr "Uitgaande levering"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Terug naar offerte"
+
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "De verkooporder '%s' is terug gezet in offerte status."
diff --git a/addons/sale/i18n/nl_BE.po b/addons/sale/i18n/nl_BE.po
index 513e7cef0c6..2ea12b4ff09 100644
--- a/addons/sale/i18n/nl_BE.po
+++ b/addons/sale/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-02 05:20+0000\n"
-"X-Generator: Launchpad (build 16061)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
"Language: nl\n"
#. module: sale
diff --git a/addons/sale/i18n/oc.po b/addons/sale/i18n/oc.po
index 68dca593a59..7d42fe62a2d 100644
--- a/addons/sale/i18n/oc.po
+++ b/addons/sale/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po
index 60760f31bf5..4123a72ed65 100644
--- a/addons/sale/i18n/pl.po
+++ b/addons/sale/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:56+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/pt.po b/addons/sale/i18n/pt.po
index af7abc9df22..c21746efc5e 100644
--- a/addons/sale/i18n/pt.po
+++ b/addons/sale/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:56+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index 6376c675b76..8d97794d483 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:56+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
@@ -862,7 +862,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "UoS"
-msgstr "UoS"
+msgstr "UdV"
#. module: sale
#: view:sale.advance.payment.inv:0
diff --git a/addons/sale/i18n/ro.po b/addons/sale/i18n/ro.po
index 6e30bcb2e27..3703af9c2ef 100644
--- a/addons/sale/i18n/ro.po
+++ b/addons/sale/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:56+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index dff3322fb6d..b689b1b1946 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:56+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
@@ -25,7 +25,7 @@ msgstr "Счет на предоплату"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
msgid "Confirm Quotation"
-msgstr "Подтвердить предложение цен"
+msgstr "Подтвердить предложение"
#. module: sale
#: view:board.board:0
@@ -167,7 +167,7 @@ msgstr "Дата подтверждения"
#: view:sale.order.line:0
#: view:sale.report:0
msgid "Group By..."
-msgstr "Объединять по..."
+msgstr "Группировать по ..."
#. module: sale
#: view:sale.order.line:0
@@ -175,7 +175,7 @@ msgid ""
"Sale Order Lines that are confirmed, done or in exception state and haven't "
"yet been invoiced"
msgstr ""
-"Позиции заказа на продажу в состоянии \"Подтвержден\", \"Cделано\" или "
+"Позиции заказа продаж в состоянии \"Подтвержден\", \"Cделано\" или "
"\"Исключение\" и на которые не был выставлен счет"
#. module: sale
@@ -240,7 +240,7 @@ msgstr ""
#. module: sale
#: help:sale.order,date_confirm:0
msgid "Date on which sales order is confirmed."
-msgstr "Дата подтверждения заказа на продажу."
+msgstr "Дата подтверждения заказа продаж."
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree5
@@ -269,7 +269,7 @@ msgstr ""
#. module: sale
#: field:sale.order,project_id:0
msgid "Contract/Analytic Account"
-msgstr ""
+msgstr "Договор/аналитический счёт"
#. module: sale
#: field:sale.order,company_id:0
@@ -283,7 +283,7 @@ msgstr "Компания"
#. module: sale
#: field:sale.make.invoice,invoice_date:0
msgid "Invoice Date"
-msgstr "Дата выставления счета"
+msgstr "Дата счёта"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
@@ -349,7 +349,7 @@ msgstr ""
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
msgid "Cancel Order"
-msgstr "Отменить заказа"
+msgstr "Отменить заказ"
#. module: sale
#: field:sale.order.line,th_weight:0
@@ -462,7 +462,7 @@ msgstr "Отменено"
#. module: sale
#: view:sale.order.line:0
msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Позиции заказа на продажу относящиеся к моим заказам"
+msgstr "Позиции заказа продаж относящиеся к моим заказам"
#. module: sale
#: selection:sale.order,state:0
@@ -501,7 +501,7 @@ msgstr "Адрес выставления счета"
#. module: sale
#: help:sale.order,create_date:0
msgid "Date on which sales order is created."
-msgstr "Дата на которую был создан заказ на продажу."
+msgstr "Дата на которую был создан заказ продаж."
#. module: sale
#: view:res.partner:0
@@ -589,17 +589,17 @@ msgstr ""
#: view:sale.order:0
#, python-format
msgid "Sales Order"
-msgstr "Заказ на продажу"
+msgstr "Заказ продаж"
#. module: sale
#: field:sale.order.line,product_uos_qty:0
msgid "Quantity (UoS)"
-msgstr "Количество (UoS)"
+msgstr "Количество (ед.прод.)"
#. module: sale
#: view:sale.order.line:0
msgid "Sale Order Lines that are in 'done' state"
-msgstr "Позиции заказа на продажу в состоянии «Сделано»"
+msgstr "Позиции заказа продаж в состоянии «Сделано»"
#. module: sale
#: field:sale.advance.payment.inv,amount:0
@@ -645,7 +645,7 @@ msgstr "Адрес доставки"
#. module: sale
#: view:sale.order.line:0
msgid "Sale Order Lines ready to be invoiced"
-msgstr "Позиции заказа на продажу готовы к выставлению счета"
+msgstr "Позиции заказа продаж готовы к выставлению счета"
#. module: sale
#: view:account.invoice.report:0
@@ -668,7 +668,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Sales Order that haven't yet been confirmed"
-msgstr "Заказы на продажу, которые еще не были подтверждены"
+msgstr "Заказы продаж, которые еще не были подтверждены"
#. module: sale
#: field:sale.order,message_unread:0
@@ -773,12 +773,12 @@ msgstr "Дата создания"
#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Waiting Schedule"
-msgstr "В ожидании расписания"
+msgstr "Ожидание планировщика"
#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
-msgstr "Адрес счета для текущего заказа на продажу."
+msgstr "Адрес счета для текущего заказа продаж."
#. module: sale
#: selection:sale.order,invoice_quantity:0
@@ -788,7 +788,7 @@ msgstr "Заказанное кол-во"
#. module: sale
#: view:sale.report:0
msgid "Ordered Year of the sales order"
-msgstr "Год заказа в заказе на продажу"
+msgstr "Год заказа в заказе продаж"
#. module: sale
#: field:sale.config.settings,module_sale_stock:0
@@ -827,7 +827,7 @@ msgstr "Неверное действие !"
#. module: sale
#: field:sale.order,fiscal_position:0
msgid "Fiscal Position"
-msgstr "Налоговая позиция"
+msgstr "Система налогообложения"
#. module: sale
#: selection:sale.report,month:0
@@ -860,7 +860,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "UoS"
-msgstr ""
+msgstr "Ед.прод."
#. module: sale
#: view:sale.advance.payment.inv:0
@@ -873,7 +873,7 @@ msgstr ""
#: code:addons/sale/edi/sale_order.py:151
#, python-format
msgid "EDI Pricelist (%s)"
-msgstr ""
+msgstr "Прайс-лист ЕОД(EDI) (%s)"
#. module: sale
#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
@@ -947,7 +947,7 @@ msgstr ""
#: view:sale.report:0
#: field:sale.report,partner_id:0
msgid "Partner"
-msgstr "Контрагент"
+msgstr "Партнёр"
#. module: sale
#: view:sale.advance.payment.inv:0
@@ -1013,9 +1013,9 @@ msgid ""
"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
"2.The Sales Order Line is Invoiced!"
msgstr ""
-"Нельзя создать счет для этой позиции заказа на продажу по одной из причин:\n"
-"1. Состояние позиции заказа на продажу \"Черновик\" или \"Отменен\"!\n"
-"2. Счет на эту позицию заказа на продажу уже выставлен!"
+"Нельзя создать счет для этой позиции заказа продаж по одной из причин:\n"
+"1. Состояние позиции заказа продаж \"Черновик\" или \"Отменен\"!\n"
+"2. Счет на эту позицию заказа продаж уже выставлен!"
#. module: sale
#: code:addons/sale/sale.py:783
@@ -1028,7 +1028,7 @@ msgstr ""
#. module: sale
#: view:sale.order.line:0
msgid "Sale order lines done"
-msgstr "Позиции заказа на продажу сделаны"
+msgstr "Позиции заказа продаж сделаны"
#. module: sale
#: view:board.board:0
@@ -1076,7 +1076,7 @@ msgstr "Последовательность"
#: code:addons/sale/sale.py:591
#, python-format
msgid "You cannot confirm a sale order which has no line."
-msgstr "Нельзя подтвердить заказ на продажу без товара"
+msgstr "Нельзя подтвердить заказ продаж без товара"
#. module: sale
#: view:sale.order.line:0
@@ -1174,7 +1174,7 @@ msgid ""
"the product is a service, shipped quantities means hours spent on the "
"associated tasks."
msgstr ""
-"Заказ на продажу будет автоматически создавать черновик счета. Заказанное и "
+"Заказ продаж будет автоматически создавать черновик счета. Заказанное и "
"доставленное количество может не совпадать. Вы можете выбрать на основе чего "
"будет счет, на основе заказанного количества или на основе доставленного. "
"Если продукция это услуги, то доставленное количество это часы потраченные "
@@ -1189,7 +1189,7 @@ msgstr ""
#. module: sale
#: model:ir.model,name:sale.model_sale_order_line_make_invoice
msgid "Sale OrderLine Make_invoice"
-msgstr ""
+msgstr "Позиция заказа продажи Make_invoice"
#. module: sale
#: selection:sale.order.line,state:0
@@ -1219,20 +1219,19 @@ msgid ""
" \n"
"* The 'Cancelled' state is set when a user cancel the sales order related."
msgstr ""
-"* 'Черновик' - это черновик заказа на продажу. \n"
-"* 'Подтвержден' - заказа на продажу подтвержден. \n"
+"* 'Черновик' - это черновик заказа продаж. \n"
+"* 'Подтвержден' - заказа продаж подтвержден. \n"
"* 'Исключение' - заказ приостановлен из-за особой ситуации. "
" \n"
-"* 'Сделано' - позиция заказа на продажу скомплектована. "
-"\n"
-"* 'Отменен' - пользователь отменил соответствующий заказ на продажу."
+"* 'Сделано' - позиция заказа продаж скомплектована. \n"
+"* 'Отменен' - пользователь отменил соответствующий заказ продаж."
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
#: model:ir.ui.menu,name:sale.menu_sale_order
#: view:sale.order:0
msgid "Sales Orders"
-msgstr "Заказы"
+msgstr "Заказы продаж"
#. module: sale
#: field:sale.make.invoice,grouped:0
@@ -1334,7 +1333,7 @@ msgstr "Магазин"
#. module: sale
#: model:ir.model,name:sale.model_sale_report
msgid "Sales Orders Statistics"
-msgstr "Статистика заказов на продажу"
+msgstr "Статистика заказов продаж"
#. module: sale
#: field:sale.order,date_order:0
@@ -1344,7 +1343,7 @@ msgstr "Дата"
#. module: sale
#: model:ir.model,name:sale.model_sale_order_line
msgid "Sales Order Line"
-msgstr "Позиция заказа на продажу"
+msgstr "Позиция заказа продаж"
#. module: sale
#: selection:sale.report,month:0
@@ -1453,13 +1452,13 @@ msgid ""
"The salesman confirms the quotation. The state of the sales order becomes "
"'In progress' or 'Manual in progress'."
msgstr ""
-"Продавец подтверждает запрос цен. Состояние заказа на продажу становится 'В "
-"процессе' или 'В процессе вручную'."
+"Продавец подтверждает запрос цен. Состояние заказа продаж становится "
+"'Выполняется' или 'Выполняется вручную'."
#. module: sale
#: help:sale.order,origin:0
msgid "Reference of the document that generated this sales order request."
-msgstr "Ссылка на документ который создал запрос на этот заказ на продажу."
+msgstr "Ссылка на документ который создал запрос на этот заказ продаж."
#. module: sale
#: code:addons/sale/sale.py:958
@@ -1486,12 +1485,12 @@ msgstr "Задержка по обязательствам"
#. module: sale
#: view:sale.order.line:0
msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Не доставленные подтвержденные позиции заказа на продажу"
+msgstr "Не доставленные подтвержденные позиции заказа продаж"
#. module: sale
#: view:sale.order:0
msgid "History"
-msgstr "Журнал"
+msgstr "История"
#. module: sale
#: field:sale.config.settings,module_sale_margin:0
@@ -1505,8 +1504,8 @@ msgid ""
"The same sales order may have been invoiced in several times (by line for "
"example)."
msgstr ""
-"Это список счетов созданных по этому заказу на продажу. По одному заказу на "
-"продажу можно выставить несколько счетов (например: по позициям заказа)."
+"Это список счетов созданных по этому заказу продаж. По одному заказу продаж "
+"можно выставить несколько счетов (например: по позициям заказа)."
#. module: sale
#: report:sale.order:0
@@ -1544,14 +1543,14 @@ msgstr "Счета заказчику"
#. module: sale
#: model:process.node,note:sale.process_node_order0
msgid "Confirmed sales order to invoice."
-msgstr "Подтвержденный заказ на продажу в счет"
+msgstr "Подтвержденный заказ продаж в счет"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
-msgstr "Позиции заказа на продажу"
+msgstr "Позиции заказа продаж"
#. module: sale
#: model:ir.actions.act_window,name:sale.open_board_sales
@@ -1614,7 +1613,7 @@ msgstr "Счет"
#. module: sale
#: view:sale.order.line:0
msgid "My Sales Order Lines"
-msgstr "Мои позиции заказов на продажу"
+msgstr "Мои позиции заказов продаж"
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -1635,7 +1634,7 @@ msgstr ""
#: code:addons/sale/sale.py:947
#, python-format
msgid "No Pricelist ! : "
-msgstr "Нет прайс листа ! : "
+msgstr "Нет прайс-листа ! : "
#. module: sale
#: model:process.node,name:sale.process_node_quotation0
@@ -1725,7 +1724,7 @@ msgstr "Анализ продаж"
#. module: sale
#: help:sale.order,pricelist_id:0
msgid "Pricelist for current sales order."
-msgstr "Каталог для текущего заказа на продажу."
+msgstr "Прайс-лист для текущего заказа продаж."
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -1756,7 +1755,7 @@ msgstr "Показывает, что счет был оплачен."
#: code:addons/sale/sale.py:822
#, python-format
msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr "Нельзя отменить позицию заказа на продажу, которая уже в счете!"
+msgstr "Нельзя отменить позицию заказа продаж, которая уже в счете!"
#. module: sale
#: selection:sale.advance.payment.inv,advance_payment_method:0
@@ -1824,7 +1823,7 @@ msgid ""
"having invoiced yet. If you want to analyse your turnover, you should use "
"the Invoice Analysis report in the Accounting application."
msgstr ""
-"Этот отчет проводит анализ предложений цен и заказов на продажу. Анализ "
+"Этот отчет проводит анализ предложений цен и заказов продаж. Анализ "
"учитывает доходы от продаж и сортирует их по различным группам критериев "
"(ответственный, контрагент, ТМЦ и т.д.). Используйте этот отчет для "
"проведения анализа по продажам без выставления счетов. Если вы хотите "
@@ -1870,7 +1869,7 @@ msgstr "Кол-во"
#. module: sale
#: model:process.node,note:sale.process_node_invoice0
msgid "To be reviewed by the accountant."
-msgstr "Будет проверено бухгалтером"
+msgstr "Будет проверено бухгалтером."
#. module: sale
#: view:sale.order:0
@@ -1885,7 +1884,7 @@ msgstr ""
#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Shipping address for current sales order."
-msgstr "Адрес доставки для текущего заказа на продажу."
+msgstr "Адрес доставки для текущего заказа продаж."
#. module: sale
#: selection:sale.order,state:0
@@ -1907,7 +1906,7 @@ msgstr ""
#: field:sale.order,partner_id:0
#: field:sale.order.line,order_partner_id:0
msgid "Customer"
-msgstr "Клиент"
+msgstr "Заказчик"
#. module: sale
#: model:product.template,name:sale.advance_product_0_product_template
@@ -1943,7 +1942,7 @@ msgstr "Дата заказа"
#. module: sale
#: field:sale.order.line,product_uos:0
msgid "Product UoS"
-msgstr "Вторая ед. изм."
+msgstr "Ед.продажи товара"
#. module: sale
#: help:account.config.settings,group_analytic_account_for_sales:0
@@ -1953,7 +1952,7 @@ msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_quotation0
msgid "Draft state of sales order"
-msgstr "Черновик заказа на продажу"
+msgstr "Черновик заказа продажи"
#. module: sale
#: field:sale.order,origin:0
@@ -1968,7 +1967,7 @@ msgstr "Апрель"
#. module: sale
#: selection:sale.report,state:0
msgid "Manual In Progress"
-msgstr "В процессе вручную"
+msgstr "Выполняется вручную"
#. module: sale
#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
@@ -1994,7 +1993,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "My Sale Orders"
-msgstr "Мои заказы на продажу"
+msgstr "Мои заказы продаж"
#. module: sale
#: model:res.groups,name:sale.group_invoice_so_lines
@@ -2010,7 +2009,7 @@ msgstr ""
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
-msgstr "Искать заказ на продажу"
+msgstr "Искать заказ продаж"
#. module: sale
#: view:sale.config.settings:0
@@ -2024,7 +2023,7 @@ msgstr ""
#. module: sale
#: view:sale.report:0
msgid "Ordered month of the sales order"
-msgstr "Месяц заказа в заказе на продажу"
+msgstr "Месяц заказа в заказе продаж"
#. module: sale
#: code:addons/sale/sale.py:945
@@ -2039,7 +2038,7 @@ msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_saleinvoice0
msgid "From a sales order"
-msgstr "Из заказа на продажу"
+msgstr "Из заказа продаж"
#. module: sale
#: view:sale.order:0
@@ -2054,9 +2053,9 @@ msgid ""
"generates an invoice or a delivery order as soon as it is confirmed by the "
"salesman."
msgstr ""
-"В зависимости от метода выставления счетов по заказам на продажу, счет может "
+"В зависимости от метода выставления счетов по заказам продаж, счет может "
"основываться на доставляемом или заказанном количестве. Таким образом, заказ "
-"на продажу может создать счет или заказ на доставку, как только он будет "
+"продаж может создать счет или заказ доставки, как только он будет "
"подтвержден менеджером продаж."
#. module: sale
@@ -2073,7 +2072,7 @@ msgstr ""
#. module: sale
#: help:sale.order,project_id:0
msgid "The analytic account related to a sales order."
-msgstr "Счет аналитики связанный с заказом на продажу."
+msgstr "Счет аналитики связанный с заказом продаж."
#. module: sale
#: report:sale.order:0
@@ -2084,7 +2083,7 @@ msgstr "Условия оплаты"
#. module: sale
#: view:sale.order:0
msgid "Sales Order ready to be invoiced"
-msgstr "Заказ на продажу готов к выставлению счета"
+msgstr "Заказ продаж готов к выставлению счета"
#. module: sale
#: help:account.config.settings,module_sale_analytic_plans:0
@@ -2171,7 +2170,10 @@ msgstr ""
#. module: sale
#: view:sale.report:0
msgid "Ordered date of the sales order"
-msgstr "Дата заказа в заказе на продажу"
+msgstr "Дата заказа в заказе продаж"
+
+#~ msgid "Salesman"
+#~ msgstr "Продавец"
#~ msgid "Set to Draft"
#~ msgstr "Установить в 'Черновик'"
@@ -2227,12 +2229,6 @@ msgstr "Дата заказа в заказе на продажу"
#~ msgid "Order Ref"
#~ msgstr "Ссылка на заказ"
-#~ msgid "Salesman"
-#~ msgstr "Менеджер продаж"
-
-#~ msgid "on order"
-#~ msgstr "в заказе"
-
#~ msgid "Procurement Corrected"
#~ msgstr "Закупка скорректирована"
@@ -2337,13 +2333,6 @@ msgstr "Дата заказа в заказе на продажу"
#~ msgid "Partial Delivery"
#~ msgstr "Частичная доставка"
-#~ msgid ""
-#~ "If you don't have enough stock available to deliver all at once, do you "
-#~ "accept partial shipments or not?"
-#~ msgstr ""
-#~ "Если у вас недостаточно места на складе, чтобы доставить все за раз, примите "
-#~ "ли вы частичную доставку?"
-
#~ msgid "sale.config.picking_policy"
#~ msgstr "sale.config.picking_policy"
@@ -2375,9 +2364,6 @@ msgstr "Дата заказа в заказе на продажу"
#~ msgid "Steps To Deliver a Sale Order"
#~ msgstr "Шаги по доставке заказа на продажу"
-#~ msgid "Delivery Order"
-#~ msgstr "Заказ на доставку"
-
#~ msgid "You invoice has been successfully created !"
#~ msgstr "Ваш счет был успешно создан !"
@@ -2413,9 +2399,6 @@ msgstr "Дата заказа в заказе на продажу"
#~ msgid "All Sales Order"
#~ msgstr "Все заказы на продажу"
-#~ msgid "Invoice Based on Sales Orders"
-#~ msgstr "Счет, основанный на заказе на продажу"
-
#~ msgid "Shipped Quantities"
#~ msgstr "Отправленное количество"
@@ -2534,11 +2517,6 @@ msgstr "Дата заказа в заказе на продажу"
#~ "Политика доставки должна быть настроена по заказу, если вы хотите доставлять "
#~ "как можно скорее каждый товар или вы ждете все товары ..."
-#~ msgid ""
-#~ "You can generate invoices based on sales orders or based on shippings."
-#~ msgstr ""
-#~ "Вы можете создать счет на основе заказов на продажу или на основе доставок."
-
#~ msgid "Shipping Default Policy"
#~ msgstr "Политика доставки по умолчанию"
@@ -2548,9 +2526,6 @@ msgstr "Дата заказа в заказе на продажу"
#~ msgid "Delivery Order Only"
#~ msgstr "Только заказ на доставку"
-#~ msgid "Create Delivery Order"
-#~ msgstr "Создать заказ на доставку"
-
#~ msgid "Delivery Costs"
#~ msgstr "Стоимость доставки"
@@ -2566,9 +2541,6 @@ msgstr "Дата заказа в заказе на продажу"
#~ msgid "Warning !"
#~ msgstr "Внимание!"
-#~ msgid "Procurement Order"
-#~ msgstr "Заказ на закупку"
-
#~ msgid "Dates"
#~ msgstr "Даты"
@@ -2692,9 +2664,6 @@ msgstr "Дата заказа в заказе на продажу"
#~ msgid "Stock Move"
#~ msgstr "Движение запасов"
-#~ msgid "Create Procurement Order"
-#~ msgstr "Создать заказ на снабжение"
-
#, python-format
#~ msgid "Error !"
#~ msgstr "Ошибка !"
@@ -2810,15 +2779,6 @@ msgstr "Дата заказа в заказе на продажу"
#~ msgid "invalid mode for test_state"
#~ msgstr "неверный режим для test_state"
-#~ msgid ""
-#~ "Depending on the configuration of the location Output, the move between the "
-#~ "output area and the customer is done through the Delivery Order manually or "
-#~ "automatically."
-#~ msgstr ""
-#~ "В зависимости от настройки исходящего места хранения, перемещение между "
-#~ "зоной отгрузки и заказчиком выполняется с помощью заказа на доставку вручную "
-#~ "или автоматически."
-
#~ msgid "Sales Order Layout Improvement"
#~ msgstr "Улучшение шаблонов заказов на продажу"
@@ -2837,12 +2797,12 @@ msgstr "Дата заказа в заказе на продажу"
#~ msgid "Create Final Invoice"
#~ msgstr "Создать итоговый счет"
-#~ msgid "Sales by Salesman"
-#~ msgstr "Продажи по менеджеру"
-
#~ msgid "You try to assign a lot which is not from the same product"
#~ msgstr "Вы пытаетесь назначит партию состоящую из другой продукции"
+#~ msgid "Sales by Partner"
+#~ msgstr "Продажи по партнеру"
+
#~ msgid "Error! You can not create recursive companies."
#~ msgstr "Ошибка ! Нельзя создать рекурсивные компании."
@@ -2855,46 +2815,24 @@ msgstr "Дата заказа в заказе на продажу"
#~ msgid "Configure"
#~ msgstr "Настройка"
-#, python-format
-#~ msgid "The quotation '%s' has been converted to a sales order."
-#~ msgstr "Запрос цен '%s' был преобразован в заказ на продажу"
-
#, python-format
#~ msgid "(n/a)"
#~ msgstr "(нет)"
-#, python-format
-#~ msgid "Could not cancel this sales order !"
-#~ msgstr "Нельзя отменить этот заказ на продажу !"
-
#~ msgid "Setup your sales workflow and default values."
#~ msgstr "Настройте рабочий процесс продаж и значения по умолчанию."
#~ msgid "Invoice On Order After Delivery"
#~ msgstr "Счет на заказ после доставки"
-#, python-format
-#~ msgid "Could not cancel sales order line!"
-#~ msgstr "Нельзя отменить позицию заказа на продажу!"
-
#, python-format
#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
#~ msgstr ""
#~ "Нельзя отменить позицию заказа на продажу на которую был выставлен счет !"
-#, python-format
-#~ msgid "You must first cancel all picking attached to this sales order."
-#~ msgstr ""
-#~ "Сначала вы должны отменить все комплектования связанные с этим заказом на "
-#~ "продажу."
-
#~ msgid "Invoice From The Picking"
#~ msgstr "Счет из комплектования"
-#, python-format
-#~ msgid "Could not cancel sales order !"
-#~ msgstr "Нельзя отменить заказ на продажу !"
-
#, python-format
#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
#~ msgstr "Не определен журнал продаж для этой компании: \"%s\" (id:%d)"
@@ -2910,19 +2848,6 @@ msgstr "Дата заказа в заказе на продажу"
#~ msgid "Configure Your Sales Management Application"
#~ msgstr "Настройка модуля управления продажами"
-#, python-format
-#~ msgid "The sales order '%s' has been cancelled."
-#~ msgstr "Заказ на продажу '%s' был отменен."
-
-#, python-format
-#~ msgid "You must first cancel all invoices attached to this sales order."
-#~ msgstr ""
-#~ "Сначала вы должны отменить все счета связанные с этим заказом на продажу."
-
-#, python-format
-#~ msgid "The sales order '%s' has been set in draft state."
-#~ msgstr "Заказ на продажу '%s' был установлен а состояние \"Черновик\"."
-
#~ msgid "Layout Sequence"
#~ msgstr "Последовательность размещения"
@@ -2930,35 +2855,12 @@ msgstr "Дата заказа в заказе на продажу"
#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
#~ msgstr "Нельзя удалить подтвержденные заказы на продажу !"
-#, python-format
-#~ msgid "You must first cancel stock moves attached to this sales order line."
-#~ msgstr ""
-#~ "Сначала вы должны отменить перемещения ТМЦ связанные с этой позицией заказа "
-#~ "на продажу."
-
-#~ msgid ""
-#~ "Here is a list of each sales order line to be invoiced. You can invoice "
-#~ "sales orders partially, by lines of sales order. You do not need this list "
-#~ "if you invoice from the delivery orders or if you invoice sales totally."
-#~ msgstr ""
-#~ "Это список позиций заказов на продажу на которые выставляются счета. Вы "
-#~ "можете выставлять счета на отдельные позиции заказов на продажу. Вам не "
-#~ "нужен этот список, если вы выставляете счета по заказам на доставку или если "
-#~ "вы выставляете счета на весь заказ на продажу."
-
-#~ msgid "Sales by Salesman in last 90 days"
-#~ msgstr "Продажи по менеджеру за 90 дней"
-
#~ msgid "Configure Sales Order Logistics"
#~ msgstr "Настройка логистики заказа на продажу"
#~ msgid "Recreate Packing"
#~ msgstr "Восстановить упаковку"
-#~ msgid "Drives procurement orders for every sales order line."
-#~ msgstr ""
-#~ "Управление заказами на снабжение для каждой позиции заказа на продажу."
-
#~ msgid "Order Reference must be unique !"
#~ msgstr "Ссылка на заказ должна быть уникальной !"
@@ -2968,20 +2870,6 @@ msgstr "Дата заказа в заказе на продажу"
#~ msgid "Sales Open Invoice"
#~ msgstr "Продажи - открыть счет"
-#~ msgid ""
-#~ "For every sales order line, a procurement order is created to supply the "
-#~ "sold product."
-#~ msgstr ""
-#~ "Для каждой позиции заказа на продажу создается заказ на снабжение для "
-#~ "поставки проданных ТМЦ."
-
-#~ msgid ""
-#~ "It indicates that the sales order has been delivered. This field is updated "
-#~ "only after the scheduler(s) have been launched."
-#~ msgstr ""
-#~ "Показывает, что заказ на продажу был доставлен. Это поле обновляется только "
-#~ "после запуска планировщика."
-
#~ msgid "Sales per Customer in last 90 days"
#~ msgstr "Продажи по заказчику за 90 дней"
@@ -2999,35 +2887,6 @@ msgstr "Дата заказа в заказе на продажу"
#~ msgid "Packings"
#~ msgstr "Упаковки"
-#~ msgid ""
-#~ "The Pick List form is created as soon as the sales order is confirmed, in "
-#~ "the same time as the procurement order. It represents the assignment of "
-#~ "parts to the sales order. There is 1 pick list by sales order line which "
-#~ "evolves with the availability of parts."
-#~ msgstr ""
-#~ "Форма комплектовочного листа создастся как только заказ на продажу будет "
-#~ "подтвержден, в одно время с заказом на снабжение. Он представляет собой "
-#~ "определение комплектующих для заказа на продажу. Один комплектовочный лист "
-#~ "на позицию заказа на продажу, который будет меняться в соответствии с "
-#~ "наличием комплектующих."
-
-#~ msgid ""
-#~ "A procurement order is automatically created as soon as a sales order is "
-#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
-#~ "production of products regarding to the rules and to the sales order's "
-#~ "parameters. "
-#~ msgstr ""
-#~ "Заказ на снабжение создастся автоматически как только заказ на продажу будет "
-#~ "подтвержден или счет будет оплачен. Он определяет закупку и производство ТМЦ "
-#~ "по правилам и параметрам заказа на продажу. "
-
-#~ msgid ""
-#~ "One Procurement order for each sales order line and for each of the "
-#~ "components."
-#~ msgstr ""
-#~ "Один заказ на снабжение для каждой позиции заказа на продажу и для каждого "
-#~ "компонента."
-
#, python-format
#~ msgid ""
#~ "You selected a quantity of %d Units.\n"
@@ -3042,66 +2901,18 @@ msgstr "Дата заказа в заказе на продажу"
#~ "\n"
#~ "Штрих-код: %s количество: %s Type of ul: %s"
-#, python-format
-#~ msgid ""
-#~ "You cannot make an advance on a sales order "
-#~ "that is defined as 'Automatic Invoice after delivery'."
-#~ msgstr ""
-#~ "Вы не можете сделать аванс по заказу на продажу, который определен как 'Счет "
-#~ "автоматически после доставки'."
-
#~ msgid ""
#~ "Number of days between the order confirmation the shipping of the products "
#~ "to the customer"
#~ msgstr ""
#~ "Количество дней между подтверждением заказа и отгрузкой ТМЦ заказчику."
-#~ msgid ""
-#~ "This is a list of picking that has been generated for this sales order."
-#~ msgstr "Это комплектовочный лист созданный для этого заказа на продажу."
-
-#~ msgid "Sales Order Requisition"
-#~ msgstr "Запрос заказа на продажу"
-
#~ msgid "Steps To Deliver a Sales Order"
#~ msgstr "Шаги по доставке заказа на продажу"
-#~ msgid ""
-#~ "If you have more than one shop reselling your company products, you can "
-#~ "create and manage that from here. Whenever you will record a new quotation "
-#~ "or sales order, it has to be linked to a shop. The shop also defines the "
-#~ "warehouse from which the products will be delivered for each particular "
-#~ "sales."
-#~ msgstr ""
-#~ "Если у вас больше одного магазина, то здесь вы можете создавать их и "
-#~ "управлять ими. Всякий раз, когда вы вводите новый запрос цен или заказ на "
-#~ "продажу он связывается с магазином. Магазин определяет склад с которого "
-#~ "будет отгружен товар для каждой продажи."
-
#~ msgid "Picking Default Policy"
#~ msgstr "Политика комплектования по умолчанию"
-#~ msgid ""
-#~ "Sales Orders help you manage quotations and orders from your customers. "
-#~ "OpenERP suggests that you start by creating a quotation. Once it is "
-#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-#~ "handle several types of products so that a sales order may trigger tasks, "
-#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
-#~ "configuration of the sales order, a draft invoice will be generated so that "
-#~ "you just have to confirm it when you want to bill your customer."
-#~ msgstr ""
-#~ "Заказы на продажу помогают вам управлять запросами/предложениями цен и "
-#~ "заказами от клиентов. OpenERP предполагает, что вы начинаете с создания "
-#~ "запроса/предложения цен. Как только это подтверждается, запрос/предложение "
-#~ "цен будет преобразован в заказ на продажу. OpenERP может обрабатывать "
-#~ "множество видов ТМЦ так, что заказ может вызвать выполнение задач, доставку "
-#~ "заказов, заказы на производство, закупки и так далее. В зависимости от вида "
-#~ "заказа на продажу, черновик счета будет создан и вы просто должны "
-#~ "подтвердить его в случае выставления счета заказчику."
-
-#~ msgid "Reference UoM"
-#~ msgstr "Базовая единица измерения"
-
#~ msgid "Accounting"
#~ msgstr "Бухгалтерия"
@@ -3170,19 +2981,9 @@ msgstr "Дата заказа в заказе на продажу"
#~ "на продажу, после того, как все комплектовочные листы будут завершены.\n"
#~ " - \"Счет из комплектования\" - счет создается в процессе комплектования."
-#~ msgid ""
-#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
-#~ "pick' or 'Invoice on order after delivery'."
-#~ msgstr ""
-#~ "Счет создается автоматически если политика доставки \"Счет из "
-#~ "комплектования\" или \"Счет на заказ после доставки\"."
-
#~ msgid "Sales Manager Dashboard"
#~ msgstr "Панель менеджера продаж"
-#~ msgid "Sales by Partner"
-#~ msgstr "Продажи по контрагенту"
-
#~ msgid ""
#~ "By default, OpenERP is able to manage complex routing and paths of products "
#~ "in your warehouse and partner locations. This will configure the most common "
@@ -3249,12 +3050,6 @@ msgstr "Дата заказа в заказе на продажу"
#~ msgid "Based on Timesheet"
#~ msgstr "Основано на затратах времени"
-#~ msgid "Invoice based on deliveries"
-#~ msgstr "Счет основанный на отгрузке"
-
-#~ msgid "Based on Delivery Orders"
-#~ msgstr "Основанный на заказе на отгрузку"
-
#~ msgid "The company name must be unique !"
#~ msgstr "Название компании должно быть уникальным!"
@@ -3268,15 +3063,9 @@ msgstr "Дата заказа в заказе на продажу"
#~ msgid "Configuration Error !"
#~ msgstr "Ошибка конфигурации !"
-#~ msgid "Deliver each product when available"
-#~ msgstr "Отгрузка каждого товара по готовности."
-
#~ msgid "You can not move products from or to a location of the type view."
#~ msgstr "Нельзя переместить ТМЦ в/из место хранения типа вид."
-#~ msgid "Based on Sales Orders"
-#~ msgstr "Основанный на заказах на продажу"
-
#~ msgid "Line Sequence"
#~ msgstr "Последовательность"
@@ -3290,19 +3079,10 @@ msgstr "Дата заказа в заказе на продажу"
#~ msgid "Cannot delete a sales order line which is in state '%s'!"
#~ msgstr "Нельзя удалить позицию заказа на продажу со статусом '%s'!"
-#~ msgid "Deliver all products at once"
-#~ msgstr "Отгрузка всех товаров за раз"
-
-#~ msgid "Sales order created in current month"
-#~ msgstr "Заказы на продажу, созданные в этом месяце"
-
#, python-format
#~ msgid "Picking Information ! : "
#~ msgstr "Информация по комплектованию ! : "
-#~ msgid "Pay before delivery"
-#~ msgstr "Оплата перед отгрузкой"
-
#~ msgid "Setup your Invoicing Method"
#~ msgstr "Настройка способа выставления счета"
@@ -3312,32 +3092,16 @@ msgstr "Дата заказа в заказе на продажу"
#~ msgid "Print Order"
#~ msgstr "Печать заказа"
-#~ msgid "Sales order created in current year"
-#~ msgstr "Заказы на продажу созданные в этом году"
-
#, python-format
#~ msgid "Not enough stock ! : "
#~ msgstr "Не достаточно запасов ! : "
-#~ msgid "Invoice on order after delivery"
-#~ msgstr "Счет на заказ после отгрузки"
-
#~ msgid "Qty(UoM)"
#~ msgstr "Кол-во(Ед.изм)"
#~ msgid "Main Working Time Unit"
#~ msgstr "Основная единица рабочего времени"
-#, python-format
-#~ msgid ""
-#~ "In order to delete a confirmed sale order, you must cancel it before ! To "
-#~ "cancel a sale order, you must first cancel related picking or delivery "
-#~ "orders."
-#~ msgstr ""
-#~ "Для удаления подтвержденного заказа на продажу надо сначала его отменить ! "
-#~ "Для отмены заказа на продажу надо отменить его комплектование или заказ на "
-#~ "доставку."
-
#~ msgid "Main Method Based On"
#~ msgstr "Основной метод основан на"
@@ -3349,9 +3113,6 @@ msgstr "Дата заказа в заказе на продажу"
#~ "Не удалось найти позицию в прайс-листе для этого товара и этого количества.\n"
#~ "Вы должны изменить товар, количество или прайс-лист."
-#~ msgid "Sales order created in last month"
-#~ msgstr "Заказы на продажу созданные в прошлом месяце"
-
#~ msgid ""
#~ "This tool will help you to install the right module and configure the system "
#~ "according to the method you use to invoice your customers."
@@ -3360,5 +3121,464 @@ msgstr "Дата заказа в заказе на продажу"
#~ "в соответствии с методом который вы используете для выставления счетов своим "
#~ "клиентам."
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Продажи по продавцу за 90 дней"
+
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Если у вас недостаточно товара на складе, чтобы доставить все за раз, "
+#~ "примите ли вы частичную доставку?"
+
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "Запрос цен '%s' был преобразован в заказ продаж"
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Это список позиций заказов продаж на которые выставляются счета. Вы можете "
+#~ "выставлять счета на отдельные позиции заказов продаж. Вам не нужен этот "
+#~ "список, если вы выставляете счета по заказам доставки или если вы "
+#~ "выставляете счета на весь заказ продаж."
+
+#, python-format
+#~ msgid ""
+#~ "In order to delete a confirmed sale order, you must cancel it before ! To "
+#~ "cancel a sale order, you must first cancel related picking or delivery "
+#~ "orders."
+#~ msgstr ""
+#~ "Для удаления подтвержденного заказа продаж надо сначала его отменить ! Для "
+#~ "отмены заказа продаж надо отменить его комплектование или заказ доставки."
+
+#~ msgid "Procurement Order"
+#~ msgstr "Заказ снабжения"
+
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "Управление заказами снабжения для каждой позиции заказа продаж."
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Заказы продаж помогают вам управлять запросами/предложениями цен и заказами "
+#~ "от клиентов. OpenERP предполагает, что вы начинаете с создания "
+#~ "запроса/предложения цен. Как только это подтверждается, запрос/предложение "
+#~ "цен будет преобразован в заказ продажи. OpenERP может обрабатывать множество "
+#~ "видов ТМЦ так, что заказ может вызвать выполнение задач, доставку заказов, "
+#~ "заказы на производство, закупки и так далее. В зависимости от вида заказа "
+#~ "продаж, черновик счета будет создан и вы просто должны подтвердить его в "
+#~ "случае выставления счета заказчику."
+
+#~ msgid "Based on Delivery Orders"
+#~ msgstr "Основанный на заказе доставки"
+
+#~ msgid "Based on Tasks' Work"
+#~ msgstr "Основан на работе по задаче"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Продажи по продавцу"
+
#~ msgid "Deliver & invoice on demand"
-#~ msgstr "Доставка и счета по требованию"
+#~ msgstr "Доставка и счёт по заказу"
+
+#~ msgid "Pay before delivery"
+#~ msgstr "Оплата перед доставкой"
+
+#~ msgid "Invoice on order after delivery"
+#~ msgstr "Счет по заказу после доставки"
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "Счет создается автоматически если политика доставки \"Счет из "
+#~ "комплектования\" или \"Счет по заказу после доставки\"."
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Счет основанный на доставках"
+
+#~ msgid ""
+#~ "The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+#~ " - The 'Pay before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ " - The 'Deliver & Invoice on demand' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice based on the sale order or the sale order lines.\n"
+#~ " - The 'Invoice on order after delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ " - The 'Invoice based on deliveries' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "Политика выставления счёта используется для синхронизации счёта и операций "
+#~ "доставки.\n"
+#~ " - выбор 'Оплата перед доставкой' сначала создаст счёт и затем создаст "
+#~ "заказ комплектования после платежа по этому счёту.\n"
+#~ " - 'Доставка и счёт по заказу' создаст непосредственно заказ комплектования "
+#~ "и ждёт ручного нажатия пользователем кнопки 'Выставить счёт' для создания "
+#~ "черновика счёта основанного на заказе продажи или позициях заказа продажи.\n"
+#~ " - выбор 'Счёт по заказу после доставки' создаст черновик счёта основанный "
+#~ "на заказе продаж после завершения всех комплектовочных списков.\n"
+#~ " - выбор 'Счёт основанный на доставках' используется для создания счёта в "
+#~ "течении процесса комплектования."
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Нельзя отменить этот заказ продаж !"
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "Сначала вы должны отменить перемещения ТМЦ связанные с этой позицией заказа "
+#~ "продаж."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "Вы не можете сделать аванс по заказу продаж, который определен как 'Счет "
+#~ "автоматически после доставки'."
+
+#~ msgid "Deliver each product when available"
+#~ msgstr "Доставка каждого товара по готовности."
+
+#~ msgid "Delivery Order"
+#~ msgstr "Заказ доставки"
+
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "Для каждой позиции заказа продаж создается заказ снабжения для поставки "
+#~ "проданных ТМЦ."
+
+#~ msgid "Based on Sales Orders"
+#~ msgstr "Основан на заказах продаж"
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Нельзя отменить позицию заказа продаж!"
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "The exception state is automatically set when a cancel operation occurs in "
+#~ "the invoice validation (Invoice Exception) or in the picking list process "
+#~ "(Shipping Exception). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the order date."
+#~ msgstr ""
+#~ "Даёт состояние предложения или заказа продаж. \n"
+#~ "Состояние \"Исключение\" автоматически устанавливается при отмене операции в "
+#~ "утверждении счёта (исключение счёта) или в обработке комплектовочного листа "
+#~ "(исключение доставки). \n"
+#~ "Состояние 'Ожидание планировщика' устанавливается при подтверждении счёта, "
+#~ "но ожидании запуска планировщика по дате заказа."
+
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "Показывает, что заказ продаж был доставлен. Это поле обновляется только "
+#~ "после запуска планировщика."
+
+#~ msgid "Auto-email confirmed sale orders"
+#~ msgstr "Автоматическое e-mail подтвердившее заказы продаж"
+
+#~ msgid "on order"
+#~ msgstr "по заказу"
+
+#~ msgid "Deliver all products at once"
+#~ msgstr "Доставка всех товаров за раз"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Создать заказ доставки"
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Создать заказ снабжения"
+
+#~ msgid ""
+#~ "\n"
+#~ "Hello${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Here is your order confirmation for ${object.partner_id.name}:\n"
+#~ " | Order number: *${object.name}*\n"
+#~ " | Order total: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ " | Order date: ${object.date_order}\n"
+#~ " % if object.origin:\n"
+#~ " | Order reference: ${object.origin}\n"
+#~ " % endif\n"
+#~ " % if object.client_order_ref:\n"
+#~ " | Your reference: ${object.client_order_ref} \n"
+#~ " % endif\n"
+#~ " | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+#~ "and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "You can view the order confirmation, download it and even pay online using "
+#~ "the following link:\n"
+#~ " ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ " "
+#~ "\"¤cy_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ " "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "It is also possible to directly pay with Paypal:\n"
+#~ " ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "If you have any question, do not hesitate to contact us.\n"
+#~ "\n"
+#~ "\n"
+#~ "Thank you for choosing ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Phone: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ "Здравствуйте ${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Здесь подтверждение вашего заказа для ${object.partner_id.name}:\n"
+#~ " | Номер заказа: *${object.name}*\n"
+#~ " | Сумма заказа: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ " | Дата заказа: ${object.date_order}\n"
+#~ " % if object.origin:\n"
+#~ " | Ссылка заказа: ${object.origin}\n"
+#~ " % endif\n"
+#~ " % if object.client_order_ref:\n"
+#~ " | Ваша ссылка: ${object.client_order_ref} \n"
+#~ " % endif\n"
+#~ " | Ваш контакт: ${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "Вы можете видеть подтверждение заказа, загрузить его и даже оплатить онлайн "
+#~ "используя следующую ссылку:\n"
+#~ " ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \\\"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\\\" \\\\\n"
+#~ " \\"
+#~ "\"¤cy_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\\\" % \\\\\n"
+#~ " "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "Возможна прямая оплата через Paypal:\n"
+#~ " ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "Если у вас есть какой-то вопрос, не стесняйтесь обратиться к нам.\n"
+#~ "\n"
+#~ "\n"
+#~ "Спасибо вам за выбор ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Телефон: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ " "
+
+#~ msgid "Do you charge the delivery?"
+#~ msgstr "Вы поручаете доставку?"
+
+#~ msgid "Sales order created in current month"
+#~ msgstr "Заказы продаж, созданные в этом месяце"
+
+#~ msgid ""
+#~ "If 'on order', it triggers a procurement when the sale order is confirmed to "
+#~ "create a task, purchase order or manufacturing order linked to this sale "
+#~ "order line."
+#~ msgstr ""
+#~ "Если 'на заказ', то это запускает снабжение когда заказ продажи подтверждён "
+#~ "для создания задачи, заказ закупки или заказ производства связанный с этой "
+#~ "позицией заказа продажи."
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Счет, основанный на заказе продаж"
+
+#~ msgid "Qty(UoS)"
+#~ msgstr "Кол-во (ед.прод.)"
+
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Нельзя отменить заказ продаж !"
+
+#~ msgid "Reference UoM"
+#~ msgstr "Базовая ед. изм."
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Вы выбрали количество из %d единиц.\n"
+#~ "Но это не совместимо с выбранным комплектованием.\n"
+#~ "Вот предложение количеств в соответствии с комплектованием:\n"
+#~ "штрих-код: %s количество: %s тип ul: %s"
+
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "Вы можете создать счет на основе заказов продаж или на основе доставок."
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr ""
+#~ "Сначала вы должны отменить все комплектования связанные с этим заказом "
+#~ "продаж."
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "В зависимости от настройки исходящего места хранения, перемещение между "
+#~ "зоной отгрузки и заказчиком выполняется с помощью заказа доставки вручную "
+#~ "или автоматически."
+
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr "Это комплектовочный лист созданный для этого заказа продаж."
+
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "Форма комплектовочного листа создастся как только заказ продаж будет "
+#~ "подтвержден, в одно время с заказом снабжения. Он представляет собой "
+#~ "определение комплектующих для заказа продаж. Один комплектовочный лист на "
+#~ "позицию заказа продаж, который будет меняться в соответствии с наличием "
+#~ "комплектующих."
+
+#~ msgid "Sales order created in current year"
+#~ msgstr "Заказы продаж созданные в этом году"
+
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "Заказ снабжения создастся автоматически как только заказ продаж будет "
+#~ "подтвержден или счет будет оплачен. Он определяет закупку и производство ТМЦ "
+#~ "по правилам и параметрам заказа продаж. "
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "Заказ продаж '%s' был отменен."
+
+#~ msgid "Sales order created in last month"
+#~ msgstr "Заказы продаж созданные в прошлом месяце"
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr ""
+#~ "Сначала вы должны отменить все счета связанные с этим заказом продаж."
+
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr ""
+#~ "Один заказ снабжения для каждой позиции заказа продаж и для каждого "
+#~ "компонента."
+
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "Заказ продаж '%s' был установлен а состояние \"Черновик\"."
+
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "Если у вас больше одного магазина, то здесь вы можете создавать их и "
+#~ "управлять ими. Всякий раз, когда вы вводите новый запрос цен или заказ "
+#~ "продаж он связывается с магазином. Магазин определяет склад с которого будет "
+#~ "отгружен товар для каждой продажи."
+
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Запрос заказа продаж"
diff --git a/addons/sale/i18n/sk.po b/addons/sale/i18n/sk.po
index 49da8c6e842..9f9ea9fdf8a 100644
--- a/addons/sale/i18n/sk.po
+++ b/addons/sale/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:56+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/sl.po b/addons/sale/i18n/sl.po
index 5cdda2702b0..7142d99d46c 100644
--- a/addons/sale/i18n/sl.po
+++ b/addons/sale/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:56+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/sq.po b/addons/sale/i18n/sq.po
index 3c4b3e10327..8a8773dba42 100644
--- a/addons/sale/i18n/sq.po
+++ b/addons/sale/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:55+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/sr.po b/addons/sale/i18n/sr.po
index 208d8e96f19..d1cf4c0987d 100644
--- a/addons/sale/i18n/sr.po
+++ b/addons/sale/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:56+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/sr@latin.po b/addons/sale/i18n/sr@latin.po
index 9a688ed3513..2f71629a2c2 100644
--- a/addons/sale/i18n/sr@latin.po
+++ b/addons/sale/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:56+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index b9566a67d98..b75a9582c55 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:56+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/th.po b/addons/sale/i18n/th.po
index bd2fd888629..24916d81506 100644
--- a/addons/sale/i18n/th.po
+++ b/addons/sale/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:56+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/tlh.po b/addons/sale/i18n/tlh.po
index 612e2e45921..9f7850f14fe 100644
--- a/addons/sale/i18n/tlh.po
+++ b/addons/sale/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:56+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index e17103ec2bc..3743f270a0a 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:56+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po
index 4b818f9f7a8..34ba1d8893b 100644
--- a/addons/sale/i18n/uk.po
+++ b/addons/sale/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:56+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/vi.po b/addons/sale/i18n/vi.po
index 576d617695b..a2aaf32aa7a 100644
--- a/addons/sale/i18n/vi.po
+++ b/addons/sale/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:56+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po
index 6ff2c3bbe22..80bce011aaf 100644
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/sale/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:56+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:13+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/i18n/zh_TW.po b/addons/sale/i18n/zh_TW.po
index eeba93dfbd1..53fe5643154 100644
--- a/addons/sale/i18n/zh_TW.po
+++ b/addons/sale/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-22 04:56+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index a7153f57a9e..8f725a9eacb 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -7,7 +7,7 @@
sale.report.treesale.report
-
+
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index 843e1fd3343..4f1a7ce9083 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -48,9 +48,6 @@ class sale_configuration(osv.osv_memory):
'group_uom':fields.boolean("Allow using different units of measures",
implied_group='product.group_uom',
help="""Allows you to select and maintain different units of measure for products."""),
- 'group_sale_delivery_address': fields.boolean("Allow a different address for delivery and invoicing ",
- implied_group='sale.group_delivery_invoice_address',
- help="Allows you to specify different delivery and invoice addresses on a sale order."),
'group_discount_per_so_line': fields.boolean("Allow setting a discount on the sale order lines",
implied_group='sale.group_discount_per_so_line',
help="Allows you to apply some discount per sale order line."),
@@ -125,7 +122,7 @@ class sale_configuration(osv.osv_memory):
class account_config_settings(osv.osv_memory):
_inherit = 'account.config.settings'
_columns = {
- 'module_sale_analytic_plans': fields.boolean('Several analytic accounts on sales',
+ 'module_sale_analytic_plans': fields.boolean('Use multiple analytic accounts on sales',
help="""This allows install module sale_analytic_plans."""),
'group_analytic_account_for_sales': fields.boolean('Analytic accounting for sales',
implied_group='sale.group_analytic_accounting',
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 6150d4ce1a3..daf396d302b 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -12,6 +12,10 @@
+
+
+
+
@@ -29,10 +33,6 @@
-
-
-
-
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index ed7a2835425..a2ee88ab860 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -194,13 +194,14 @@ class sale_order(osv.osv):
'user_id': fields.many2one('res.users', 'Salesperson', states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, select=True),
'partner_id': fields.many2one('res.partner', 'Customer', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, required=True, change_default=True, select=True),
'partner_invoice_id': fields.many2one('res.partner', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Invoice address for current sales order."),
- 'partner_shipping_id': fields.many2one('res.partner', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Shipping address for current sales order."),
+ 'partner_shipping_id': fields.many2one('res.partner', 'Delivery Address', readonly=True, required=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Delivery address for current sales order."),
'order_policy': fields.selection([
('manual', 'On Demand'),
], 'Create Invoice', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]},
help="""This field controls how invoice and delivery operations are synchronized.
- With 'Before Delivery', a draft invoice is created, and it must be paid before delivery."""),
'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Pricelist for current sales order."),
+ 'currency_id': fields.related('pricelist_id', 'currency_id', type="many2one", relation="res.currency", readonly=True, required=True),
'project_id': fields.many2one('account.analytic.account', 'Contract/Analytic Account', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="The analytic account related to a sales order."),
'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}),
@@ -264,13 +265,18 @@ class sale_order(osv.osv):
return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
def onchange_pricelist_id(self, cr, uid, ids, pricelist_id, order_lines, context=None):
- if (not pricelist_id) or (not order_lines):
+ if not pricelist_id:
return {}
+ value = {
+ 'currency_id': self.pool.get('product.pricelist').browse(cr, uid, pricelist_id, context=context).currency_id.id
+ }
+ if not order_lines:
+ return {'value': value}
warning = {
'title': _('Pricelist Warning!'),
'message' : _('If you change the pricelist of this order (and eventually the currency), prices of existing order lines will not be updated.')
}
- return {'warning': warning}
+ return {'warning': warning, 'value': value}
def onchange_partner_id(self, cr, uid, ids, part):
if not part:
@@ -704,7 +710,7 @@ class sale_order_line(osv.osv):
_description = 'Sales Order Line'
_columns = {
'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, states={'draft':[('readonly',False)]}),
- 'name': fields.text('Product Description', size=256, required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}),
+ 'name': fields.text('Description', size=256, required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}),
'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sales order lines."),
'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
@@ -745,13 +751,13 @@ class sale_order_line(osv.osv):
if (line.order_id.invoice_quantity=='order'):
if line.product_uos:
return line.product_uos_qty or 0.0
- return line.product_uom_qty
+ return line.product_uom_qty
def _get_line_uom(self, cr, uid, line, context=None):
if (line.order_id.invoice_quantity=='order'):
if line.product_uos:
return line.product_uos.id
- return line.product_uom.id
+ return line.product_uom.id
def _prepare_order_line_invoice_line(self, cr, uid, line, account_id=False, context=None):
"""Prepare the dict of values to create the new invoice line for a
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 2cedf6f58ab..ba75b1571cb 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -294,8 +294,8 @@
sale.orderHi,
-I have a confusion for pricing of Services, I have heard there is a discount above 25 hours.
-Can you clarify please?
+I have a question regarding services pricing: I heard of a possible discount for quantities exceeding 25 hours.
+Could you confirm, please?
comment
@@ -305,10 +305,9 @@ Can you clarify please?
Hello,
-Sorry but that scheme is not available for now,
-We would like to know if you confirm the quotation with pricing we sent to you.
-Thanks,
-Sales Department
+Unfortunately that was a temporary discount that is not available anymore.
+Do you still plan to confirm the order based on the quoted prices?
+Thanks!
comment
@@ -317,7 +316,7 @@ Sales Department
sale.order
- Ok, fine, we will intimate you after discussing with our team.
+ Alright, thanks for the clarification. I will confirm the order as soon as I get my manager's approval.comment
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 4323261a19d..37323bfeb22 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -174,9 +174,9 @@
-
-
-
+
+
+
@@ -184,6 +184,7 @@
+
@@ -214,7 +215,7 @@