[MERGE]: Merge with lp:openobject-addons

bzr revid: rpa@tinyerp.com-20100420051057-oil2xv332ipq0qvw
This commit is contained in:
rpa (Open ERP)
2010-04-20 10:40:57 +05:30
44 changed files with 198 additions and 180 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-19 03:45+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-19 03:46+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-19 03:46+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_anglo_saxon
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-19 03:45+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-19 03:46+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-19 03:45+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_merge
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_publish
@@ -143,7 +143,7 @@ class base_module_record(osv.osv):
obj = dt.browse(cr, uid, dtids[0])
self.depends[obj.module] = True
return obj.module+'.'+obj.name, obj.noupdate
def _create_record(self, cr, uid, doc, model, data, record_id, noupdate=False):
data_pool = self.pool.get('ir.model.data')
@@ -384,7 +384,7 @@ class base_module_record(osv.osv):
elif rec[3]=='create':
id = self._create_id(cr, uid, rec[2],rec[4])
record,noupdate = self._create_record(cr, uid, doc, rec[2], rec[4], id)
self.ids[(rec[3], result)] = id
self.ids[(rec[2], result)] = id
record_list += record
elif rec[3]=='copy':
@@ -446,8 +446,8 @@ class base_module_record(osv.osv):
terp.appendChild(data)
wkf = doc.createElement('workflow')
data.appendChild(wkf)
wkf.setAttribute("model", rec[1][3])
wkf.setAttribute("action", rec[1][4])
wkf.setAttribute("model", rec[1][2])
wkf.setAttribute("action", rec[1][3])
if noupdate:
data.setAttribute("noupdate", "1")
wkf.setAttribute("ref", rec_id)
@@ -482,10 +482,12 @@ class base_module_record(osv.osv):
continue
if self.mode == "workflow":
record= self._generate_object_yaml(cr, uid, rec[1],rec[0])
yaml_file+="!comment Performing a workflow action %s on module %s"%(record['action'], record['model']) + '''\n'''
object=yaml.load(unicode('''\n !workflow %s \n'''%record,'iso-8859-1'))
yaml_file += str(object) + '''\n'''
yaml_file += str(object) + '''\n\n'''
else:
record= self._generate_object_yaml(cr, uid, rec[1],rec[3])
yaml_file+="!comment Creating an %s record"%(record['model']) + '''\n'''
object= yaml.load(unicode('''\n !record %s \n'''%record,'iso-8859-1'))
yaml_file += str(object) + '''\n'''
attrs=yaml.dump(object.attrs, default_flow_style=False)
@@ -497,7 +499,9 @@ class base_module_record(osv.osv):
if line.find('!record') == 0:
line = "- \n" + " " + line
elif line.find('!workflow') == 0:
line = "- \n" + " " + line
line = "- \n" + " " + line
elif line.find('!comment') == 0:
line=line.replace('!comment','- \n ')
elif line.find('- -') != -1:
line=line.replace('- -',' -')
line = " " + line
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_record
+7 -7
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2008-11-04 11:49+0000\n"
"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n"
"PO-Revision-Date: 2010-04-19 09:39+0000\n"
"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\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: 2010-04-17 04:00+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board_manufacturing
@@ -34,7 +34,7 @@ msgstr "Неправильный XML для просмотра архитект
#. module: board_manufacturing
#: view:board.board:0
msgid "Deliveries (Out packing)"
msgstr ""
msgstr "Поставки(Исходящие)"
#. module: board_manufacturing
#: view:board.board:0
@@ -49,7 +49,7 @@ msgstr "Производство"
#. module: board_manufacturing
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
msgstr "Недопустимое имя модели в определении действия"
#. module: board_manufacturing
#: model:ir.actions.act_window,name:board_manufacturing.open_board_manufacturing
@@ -60,7 +60,7 @@ msgstr "Панель аналитики производства"
#. module: board_manufacturing
#: model:ir.module.module,shortdesc:board_manufacturing.module_meta_information
msgid "Board for manufacturing"
msgstr ""
msgstr "Панель для производства"
#. module: board_manufacturing
#: view:board.board:0
@@ -70,4 +70,4 @@ msgstr "Изменения оценки запасов"
#. module: board_manufacturing
#: view:board.board:0
msgid "Workcenter futur load"
msgstr ""
msgstr "Загрузка мощности в будущем"
+7 -7
View File
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-09-28 07:55+0000\n"
"Last-Translator: Artem Karimov <skybon@gmail.com>\n"
"PO-Revision-Date: 2010-04-19 09:44+0000\n"
"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\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: 2010-04-17 03:59+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board_sale
#: model:ir.module.module,shortdesc:board_sale.module_meta_information
msgid "Dashboard for sales"
msgstr ""
msgstr "Панель для продаж"
#. module: board_sale
#: model:ir.actions.act_window,name:board_sale.open_board_sales_manager
@@ -40,7 +40,7 @@ msgstr "Панель менеджера продаж"
#. module: board_sale
#: view:board.board:0
msgid "Cases of the month"
msgstr ""
msgstr "Случаи месяца"
#. module: board_sale
#: constraint:ir.ui.view:0
@@ -55,7 +55,7 @@ msgstr "Мои незакрытые предложения"
#. module: board_sale
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
msgstr "Недопустимое имя модели в определении действия"
#. module: board_sale
#: model:ir.ui.menu,name:board_sale.next_id_88
@@ -65,7 +65,7 @@ msgstr "Продажи"
#. module: board_sale
#: view:board.board:0
msgid "Cases statistics"
msgstr ""
msgstr "Статистика случаев"
#. module: board_sale
#: view:board.board:0
+17 -10
View File
@@ -32,6 +32,8 @@ import tools
from osv import fields,osv,orm
from osv.orm import except_orm
from tools import command_re
class crm_cases(osv.osv):
""" crm cases """
@@ -39,7 +41,7 @@ class crm_cases(osv.osv):
_inherit = "crm.case"
def message_new(self, cr, uid, msg, context):
"""
"""
Automatically calls when new email message arrives
@param self: The object pointer
@@ -90,15 +92,20 @@ class crm_cases(osv.osv):
if msg.get('priority', False):
vals['priority'] = msg.get('priority')
# act = 'case_'+default_act
# if 'state' in msg_actions:
# if msg_actions['state'] in ['draft','close','cancel','open','pending']:
# act = 'case_' + msg_actions['state']
# for k1,k2 in [('cost','planned_cost'),('revenue','planned_revenue'),('probability','probability')]:
# if k1 in msg_actions:
# data[k2] = float(msg_actions[k1])
maps = {
'cost':'planned_cost',
'revenue': 'planned_revenue',
'probability':'probability'
}
vls = { }
for line in msg['body'].split('\n'):
line = line.strip()
res = command_re.match(line)
if res and maps.get(res.group(1).lower(), False):
key = maps.get(res.group(1).lower())
vls[key] = res.group(2).lower()
vals.update(vls)
res = self.write(cr, uid, ids, vals)
cases = self.browse(cr, uid, ids)
message_id = context.get('references_id', False)
-5
View File
@@ -132,11 +132,6 @@ class crm_send_new_email(osv.osv_memory):
getattr(case_pool, act)(cr, uid, [case.id])
cr.commit()
# Commented because form does not close due to raise
# raise osv.except_osv(_('Email!'), ("Email Successfully Sent"))
# else:
# raise osv.except_osv(_('Warning!'), _("Email not sent !"))
return {}
def default_get(self, cr, uid, fields, context=None):
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_profiling
+9 -9
View File
@@ -7,20 +7,20 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-09 13:36+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2010-04-19 06:52+0000\n"
"Last-Translator: Łukasz Przybylok <Unknown>\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: 2010-04-17 04:00+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: event
#: field:event.event,date_end:0
#: field:report.event.registration,date_end:0
msgid "Ending date"
msgstr ""
msgstr "Data zakończenia"
#. module: event
#: field:event.event,register_min:0
@@ -40,27 +40,27 @@ msgstr ""
#. module: event
#: model:crm.case.section,name:event.event_0_crm_case_section
msgid "Concert of Bon Jovi"
msgstr ""
msgstr "Koncert Bon Jovi"
#. module: event
#: field:event.event,mail_confirm:0
msgid "Confirmation Email"
msgstr ""
msgstr "Email potwierdzający"
#. module: event
#: constraint:crm.case.section:0
msgid "Error ! You cannot create recursive sections."
msgstr ""
msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych sekcji."
#. module: event
#: model:ir.model,name:event.model_event_registration
msgid "Event Registration"
msgstr ""
msgstr "Rejestracja wydarzenia"
#. module: event
#: model:ir.actions.wizard,name:event.event_reg_invoice
msgid "Make Invoice"
msgstr ""
msgstr "Utwórz fakturę"
#. module: event
#: field:report.event.type.registration,draft_state:0
+34 -19
View File
@@ -32,6 +32,9 @@ import mimetypes
from imaplib import IMAP4
from imaplib import IMAP4_SSL
from poplib import POP3
from poplib import POP3_SSL
from email.header import Header
from email.header import decode_header
@@ -40,8 +43,6 @@ from osv import osv
from osv import fields
from tools.translate import _
command_re = re.compile("^Set-([a-z]+) *: *(.+)$", re.I + re.UNICODE)
logger = netsvc.Logger()
def html2plaintext(html, body_id=None, encoding='utf-8'):
@@ -134,7 +135,7 @@ class mail_server(osv.osv):
'type':fields.selection([
('pop','POP Server'),
('imap','IMAP Server'),
],'State', select=True, readonly=True),
],'State', select=True, readonly=False),
'is_ssl':fields.boolean('SSL ?', required=False),
'date': fields.date('Date'),
'user' : fields.char('User Name', size=256, required=True, readonly=True, states={'draft':[('readonly',False)]}),
@@ -145,7 +146,7 @@ class mail_server(osv.osv):
'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly',False)]}, help="Priority between 0 to 10, select define the order of Processing"),
}
_defaults = {
'type': lambda *a: "imap",
# 'type': lambda *a: "imap",
'state': lambda *a: "draft",
'active': lambda *a: True,
'priority': lambda *a: 5,
@@ -270,19 +271,9 @@ class mail_server(osv.osv):
context.update({
'references_id':ref[0]
})
maps = {
'cost':'planned_cost',
'revenue': 'planned_revenue',
'probability':'probability'
vals = {
}
vals = { }
for line in msg['body'].split('\n'):
line = line.strip()
res = command_re.match(line)
if res and maps.get(res.group(1).lower(), False):
key = maps.get(res.group(1).lower())
vals[key] = res.group(2).lower()
model_pool.message_update(cr, uid, [history.res_id], vals, msg, context=context)
res_id = id
else:
@@ -325,7 +316,7 @@ class mail_server(osv.osv):
fp = os.popen('ping www.google.com -c 1 -w 5',"r")
if not fp.read():
logger.notifyChannel('imap', netsvc.LOG_WARNING, 'No address associated with hostname !')
for server in self.browse(cr, uid, ids, context):
logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name))
@@ -340,7 +331,6 @@ class mail_server(osv.osv):
imap_server.login(server.user, server.password)
imap_server.select()
result, data = imap_server.search(None, '(UNSEEN)')
count = 0
for num in data[0].split():
result, data = imap_server.fetch(num, '(RFC822)')
self._process_email(cr, uid, server, data[0][1], context)
@@ -350,11 +340,36 @@ class mail_server(osv.osv):
imap_server.close()
imap_server.logout()
elif server.type == 'pop':
pop_server = None
if server.is_ssl:
pop_server = POP3_SSL(server.server, int(server.port))
else:
pop_server = POP3(server.server, int(server.port))
#TODO: use this to remove only unread messages
#pop_server.user("recent:"+server.user)
pop_server.user(server.user)
pop_server.pass_(server.password)
pop_server.list()
(numMsgs, totalSize) = pop_server.stat()
count = 0
for num in range(1, numMsgs + 1):
(header, msges, octets) = pop_server.retr(num)
msg = '\n'.join(msges)
self._process_email(cr, uid, server, msg, context)
pop_server.dele(num)
pop_server.quit()
logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail fetch %s email(s) from %s' % (numMsgs, server.name))
except Exception, e:
logger.notifyChannel('IMAP', netsvc.LOG_WARNING, '%s' % (e))
return True
mail_server()
class mail_server_history(osv.osv):
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-19 03:46+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_chart_uk_minimal
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-19 03:46+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: olap_sale
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: olap_sale
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: profile_manufacturing
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project
+21 -23
View File
@@ -171,29 +171,6 @@
</search>
</field>
</record>
<record id="purchase_rfq" model="ir.actions.act_window">
<field name="name">Requests for Quotation</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.order</field>
<field name="view_type">form</field>
<field name="context">{'search_default_draft': 1}</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_purchase_order_filter"/>
</record>
<menuitem action="purchase_rfq" id="menu_purchase_rfq" parent="menu_procurement_management"
sequence="6"/>
<record id="purchase_form_action" model="ir.actions.act_window">
<field name="name">Purchase Orders</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.order</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="search_view_id" ref="view_purchase_order_filter"/>
<field name="context">{'search_default_approved': 1}</field>
</record>
<menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management"/>
<record id="purchase_order_tree" model="ir.ui.view">
<field name="name">purchase.order.tree</field>
<field name="model">purchase.order</field>
@@ -216,6 +193,27 @@
</field>
</record>
<record id="purchase_rfq" model="ir.actions.act_window">
<field name="name">Requests for Quotation</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.order</field>
<field name="view_type">form</field>
<field name="context">{'search_default_draft': 1}</field>
<field name="view_mode">tree,form,graph,calendar</field>
</record>
<menuitem action="purchase_rfq" id="menu_purchase_rfq" parent="menu_procurement_management"
sequence="6"/>
<record id="purchase_form_action" model="ir.actions.act_window">
<field name="name">Purchase Orders</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.order</field>
<field name="view_mode">tree,form,graph,calendar</field>
<field name="context">{'search_default_approved': 1}</field>
</record>
<menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management"/>
<record id="purchase_order_line_form" model="ir.ui.view">
<field name="name">purchase.order.line.form</field>
<field name="model">purchase.order.line</field>
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_document
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-19 03:46+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_mrp
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-19 03:45+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_project
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-19 03:45+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_purchase
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-19 03:46+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-19 03:46+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_analytic_plans
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-19 03:45+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_crm
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_crm
+1 -1
View File
@@ -396,7 +396,7 @@ class smtpclient(osv.osv):
if body == False:
body = ''
if smtp_server.disclaimers != False:
if smtp_server.disclaimers:
body = body + "\n" + smtp_server.disclaimers
try:
-1
View File
@@ -98,7 +98,6 @@
</group>
<group col="2" colspan="2">
<separator string="Message Queue Configuration" colspan="2" />
<field name="type" select="1" />
<field name="active" select="2" />
<field name="delete_queue" select="2" />
<field name="delete_queue_period" select="2" attrs="{'readonly':[('delete_queue','not in',['content','all'])]}"/>
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
+59 -59
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-02-03 11:06+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2010-04-19 05:33+0000\n"
"Last-Translator: grisha <Unknown>\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: 2010-04-17 03:56+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
@@ -44,7 +44,7 @@ msgstr ""
#. module: stock
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
msgstr "Недопустимое имя модели в определении действия"
#. module: stock
#: model:ir.module.module,shortdesc:stock.module_meta_information
@@ -70,7 +70,7 @@ msgstr ""
#. module: stock
#: rml:lot.location:0
msgid "Total :"
msgstr ""
msgstr "Итого:"
#. module: stock
#: selection:stock.location,icon:0
@@ -81,7 +81,7 @@ msgstr ""
#: rml:lot.stock.overview:0
#: rml:lot.stock.overview_all:0
msgid "UoM"
msgstr ""
msgstr "Ед. изм."
#. module: stock
#: model:ir.actions.wizard,name:stock.return_picking
@@ -114,7 +114,7 @@ msgstr ""
#. module: stock
#: view:stock.picking:0
msgid "Products Received"
msgstr ""
msgstr "Получено изделий"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree4
@@ -141,7 +141,7 @@ msgstr "Партнер"
#. module: stock
#: help:product.product,track_incoming:0
msgid "Force to use a Production Lot during receptions"
msgstr ""
msgstr "Принудительно назначать серийный номер партии при приёмке"
#. module: stock
#: field:stock.move,move_history_ids:0
@@ -154,7 +154,7 @@ msgstr "Журнал перемещений"
#: field:stock.production.lot.revision,lot_id:0
#: field:stock.report.prodlots,prodlot_id:0
msgid "Production lot"
msgstr ""
msgstr "Партия изделий"
#. module: stock
#: selection:stock.location,icon:0
@@ -196,17 +196,17 @@ msgstr "Ед. изм."
#: selection:stock.picking,state:0
#: field:stock.production.lot,stock_available:0
msgid "Available"
msgstr ""
msgstr "Доступно"
#. module: stock
#: view:stock.move:0
msgid "Make Parcel"
msgstr ""
msgstr "Сформировать упаковку"
#. module: stock
#: wizard_view:stock.partial_picking,end2:0
msgid "Packing result"
msgstr ""
msgstr "Сформировать упаковку"
#. module: stock
#: selection:stock.location,icon:0
@@ -256,7 +256,7 @@ msgstr ""
#. module: stock
#: view:stock.picking:0
msgid "Products Sent"
msgstr ""
msgstr "Отправлено изделий"
#. module: stock
#: selection:stock.location,icon:0
@@ -284,7 +284,7 @@ msgstr ""
#: rml:lot.stock.overview:0
#: rml:lot.stock.overview_all:0
msgid "Grand Total:"
msgstr ""
msgstr "Общий итог"
#. module: stock
#: view:stock.location:0
@@ -327,12 +327,12 @@ msgstr ""
#: view:stock.move:0
#: view:stock.picking:0
msgid "Move Information"
msgstr ""
msgstr "Сведения о перемещении товаров"
#. module: stock
#: view:stock.picking:0
msgid "Unreceived Products"
msgstr ""
msgstr "Неполученные изделия"
#. module: stock
#: field:stock.inventory,state:0
@@ -370,7 +370,7 @@ msgstr "Местоположение снабжения"
#: model:ir.actions.act_window,name:stock.action_production_lot_form
#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
msgid "Production Lots"
msgstr ""
msgstr "Партии изделий"
#. module: stock
#: rml:stock.picking.list:0
@@ -424,7 +424,7 @@ msgstr "Адрес местоположения"
#. module: stock
#: help:stock.move,prodlot_id:0
msgid "Production lot is used to put a serial number on the production"
msgstr ""
msgstr "Партии изделий используются для присвоения серийных номеров"
#. module: stock
#: model:stock.location,name:stock.stock_location_13
@@ -485,12 +485,12 @@ msgstr ""
#. module: stock
#: field:product.template,property_stock_inventory:0
msgid "Inventory Location"
msgstr ""
msgstr "Расположение склада"
#. module: stock
#: help:product.product,track_production:0
msgid "Force to use a Production Lot during production order"
msgstr ""
msgstr "Принудительно назначать серийны номера для партий изделий"
#. module: stock
#: selection:stock.location,icon:0
@@ -639,7 +639,7 @@ msgstr ""
#. module: stock
#: selection:stock.location,chained_auto_packing:0
msgid "Manual Operation"
msgstr ""
msgstr "Ручное управление"
#. module: stock
#: field:stock.picking,date_done:0
@@ -680,7 +680,7 @@ msgstr "Метоположения партнера"
#: help:stock.move,tracking_id:0
msgid ""
"Tracking lot is the code that will be put on the logistical unit/pallet"
msgstr ""
msgstr "Логистическая единица - это код, присваиваемый упаковке."
#. module: stock
#: view:stock.tracking:0
@@ -700,7 +700,7 @@ msgstr ""
#. module: stock
#: rml:stock.picking.list:0
msgid "Packing List:"
msgstr ""
msgstr "Упаковочный перечень"
#. module: stock
#: selection:stock.location,icon:0
@@ -715,12 +715,12 @@ msgstr ""
#. module: stock
#: wizard_field:stock.location.products,init,from_date:0
msgid "From"
msgstr ""
msgstr "От"
#. module: stock
#: rml:stock.picking.list:0
msgid "weight"
msgstr ""
msgstr "Вес"
#. module: stock
#: rml:stock.picking.list:0
@@ -735,7 +735,7 @@ msgstr ""
#. module: stock
#: model:ir.model,name:stock.model_stock_production_lot_revision
msgid "Production lot revisions"
msgstr ""
msgstr "Ревизии партий изделий"
#. module: stock
#: view:stock.picking:0
@@ -918,12 +918,12 @@ msgstr "Отправка товаров"
#. module: stock
#: view:stock.picking:0
msgid "Cancel Availability"
msgstr ""
msgstr "Отменить доступность"
#. module: stock
#: field:stock.inventory,move_ids:0
msgid "Created Moves"
msgstr ""
msgstr "Созданные перемещения товаров"
#. module: stock
#: selection:stock.location,icon:0
@@ -950,7 +950,7 @@ msgstr ""
#: view:stock.move:0
#: field:stock.move,date_planned:0
msgid "Date"
msgstr ""
msgstr "Дата"
#. module: stock
#: view:product.product:0
@@ -1042,7 +1042,7 @@ msgstr "Отменить"
#: view:stock.move:0
#: view:stock.picking:0
msgid "Split in production lots"
msgstr ""
msgstr "Разделить партию по отдельным серийным номерам"
#. module: stock
#: model:ir.model,name:stock.model_stock_inventory
@@ -1070,7 +1070,7 @@ msgstr ""
#. module: stock
#: model:ir.model,name:stock.model_stock_tracking
msgid "Stock Tracking Lots"
msgstr ""
msgstr "Отслеживание партий"
#. module: stock
#: rml:lot.stock.overview:0
@@ -1110,7 +1110,7 @@ msgstr ""
#: model:ir.actions.act_window,name:stock.action_move_form4
#: model:ir.ui.menu,name:stock.menu_action_move_form4
msgid "Available Moves"
msgstr ""
msgstr "Доступные перемещения товаров"
#. module: stock
#: selection:stock.location,icon:0
@@ -1269,7 +1269,7 @@ msgstr ""
#: rml:lot.stock.overview:0
#: rml:lot.stock.overview_all:0
msgid "Value"
msgstr ""
msgstr "Значение"
#. module: stock
#: field:stock.picking,type:0
@@ -1289,7 +1289,7 @@ msgstr "Метод доставки"
#. module: stock
#: model:ir.actions.wizard,name:stock.partial_picking
msgid "Partial packing"
msgstr ""
msgstr "Упаковка по частям"
#. module: stock
#: selection:stock.location,icon:0
@@ -1422,7 +1422,7 @@ msgstr ""
#: model:ir.actions.act_window,name:stock.action_picking_tree
#: model:ir.ui.menu,name:stock.menu_action_picking_tree
msgid "Outgoing Products"
msgstr ""
msgstr "Изделия к отправке"
#. module: stock
#: selection:stock.location,icon:0
@@ -1452,7 +1452,7 @@ msgstr ""
#. module: stock
#: field:stock.production.lot,date:0
msgid "Created Date"
msgstr ""
msgstr "Дата создания"
#. module: stock
#: selection:stock.location,usage:0
@@ -1467,7 +1467,7 @@ msgstr ""
#. module: stock
#: view:stock.picking:0
msgid "Force Availability"
msgstr ""
msgstr "Сделать доступным принудительно"
#. module: stock
#: wizard_view:stock.location.products,init:0
@@ -1504,7 +1504,7 @@ msgstr "Учет движения партий"
#. module: stock
#: wizard_button:inventory.merge,init,merge:0
msgid "Yes"
msgstr ""
msgstr "Да"
#. module: stock
#: field:stock.inventory,inventory_line_id:0
@@ -1524,7 +1524,7 @@ msgstr ""
#. module: stock
#: field:stock.location,stock_real:0
msgid "Real Stock"
msgstr ""
msgstr "Доступные запасы"
#. module: stock
#: model:ir.actions.wizard,name:stock.wizard_fill_inventory
@@ -1546,7 +1546,7 @@ msgstr ""
#. module: stock
#: rml:stock.picking.list:0
msgid "Lot"
msgstr ""
msgstr "Партия"
#. module: stock
#: wizard_view:inventory.merge.stock.zero,init:0
@@ -1556,7 +1556,7 @@ msgstr ""
#. module: stock
#: field:stock.move,product_uos_qty:0
msgid "Quantity (UOS)"
msgstr ""
msgstr "Количество(единицы продажи)"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree5
@@ -1620,7 +1620,7 @@ msgstr "Инкотермс"
#: rml:lot.stock.overview:0
#: rml:lot.stock.overview_all:0
msgid "Total:"
msgstr ""
msgstr "Итого:"
#. module: stock
#: selection:stock.location,icon:0
@@ -1650,7 +1650,7 @@ msgstr ""
#. module: stock
#: field:stock.production.lot.revision,name:0
msgid "Revision Name"
msgstr ""
msgstr "Наименование ревизии"
#. module: stock
#: selection:stock.location,icon:0
@@ -1723,7 +1723,7 @@ msgstr "Склады"
#. module: stock
#: help:product.product,track_outgoing:0
msgid "Force to use a Production Lot during deliveries"
msgstr ""
msgstr "Принудительно назначать серийный номер партии при перевозке"
#. module: stock
#: view:stock.picking:0
@@ -1862,7 +1862,7 @@ msgstr ""
#. module: stock
#: view:product.product:0
msgid "Lots"
msgstr ""
msgstr "Партии"
#. module: stock
#: selection:stock.picking,move_type:0
@@ -1872,7 +1872,7 @@ msgstr "Все сразу"
#. module: stock
#: field:product.product,track_outgoing:0
msgid "Track Outging Lots"
msgstr ""
msgstr "Отслеживать исходящие партии"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_stock_line_date
@@ -1910,7 +1910,7 @@ msgstr ""
#. module: stock
#: field:stock.location,icon:0
msgid "Icon"
msgstr ""
msgstr "Значок"
#. module: stock
#: field:stock.tracking,name:0
@@ -1934,12 +1934,12 @@ msgstr ""
#. module: stock
#: model:stock.location,name:stock.stock_location_8
msgid "Non European Customers"
msgstr ""
msgstr "Неевропейские заказчики"
#. module: stock
#: model:stock.location,name:stock.stock_location_components
msgid "Components"
msgstr ""
msgstr "Компоненты"
#. module: stock
#: wizard_view:inventory.merge,init:0
@@ -2008,7 +2008,7 @@ msgstr "Подтвердить"
#. module: stock
#: view:stock.picking:0
msgid "Check Availability"
msgstr ""
msgstr "Проверять доступность"
#. module: stock
#: wizard_view:inventory.merge,init:0
@@ -2078,7 +2078,7 @@ msgstr ""
#: model:ir.ui.menu,name:stock.menu_stock_report_prodlots
#: view:stock.report.prodlots:0
msgid "Stock by Lots"
msgstr ""
msgstr "Склады с партиями этого товара"
#. module: stock
#: field:stock.move,auto_validate:0
@@ -2100,7 +2100,7 @@ msgstr ""
#: selection:stock.move,state:0
#: selection:stock.picking,state:0
msgid "Canceled"
msgstr ""
msgstr "Отменено"
#. module: stock
#: selection:stock.location,icon:0
@@ -2163,7 +2163,7 @@ msgstr "Полки (Y)"
#. module: stock
#: model:ir.actions.wizard,name:stock.wizard_merge_inventory_zero
msgid "Set Stock to 0"
msgstr ""
msgstr "Установить запасы в 0"
#. module: stock
#: view:stock.location:0
@@ -2188,7 +2188,7 @@ msgstr ""
#. module: stock
#: field:product.product,track_production:0
msgid "Track Production Lots"
msgstr ""
msgstr "Отслеживать партии изделий"
#. module: stock
#: view:stock.picking:0
@@ -2218,7 +2218,7 @@ msgstr ""
#: field:stock.move,prodlot_id:0
#: view:stock.production.lot:0
msgid "Production Lot"
msgstr ""
msgstr "Партия изделий"
#. module: stock
#: model:ir.ui.menu,name:stock.menu_traceability
@@ -2229,7 +2229,7 @@ msgstr "Возможность учета движения"
#. module: stock
#: field:stock.picking,date:0
msgid "Date Order"
msgstr ""
msgstr "Дата заказа"
#. module: stock
#: selection:stock.invoice_onshipping,init,type:0
@@ -2267,12 +2267,12 @@ msgstr ""
#. module: stock
#: model:ir.actions.report.xml,name:stock.report_move_labels
msgid "Print Item Labels"
msgstr ""
msgstr "Печать этикеток товаров"
#. module: stock
#: view:stock.move:0
msgid "Moves"
msgstr ""
msgstr "Перемещения тоаров"
#. module: stock
#: field:stock.move,location_dest_id:0
@@ -2380,7 +2380,7 @@ msgstr ""
#: view:stock.move:0
#: view:stock.picking:0
msgid "Move State"
msgstr ""
msgstr "Состояни перемещния товаров"
#. module: stock
#: model:stock.location,name:stock.stock_location_locations
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock_location
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock_no_autopicking
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-18 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-04-20 03:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: subscription