- [[ line['date_maturity'] ]]
+ [[ line['date_maturity'] and formatLang(line['date_maturity'],date=True) or '' ]]
- [[ formatLang(line['debit']) and formatLang(line['debit'] * (line['account_id']['type'] == 'payable' and -1 or 1)) ]]
+ [[ (line['account_id']['type'] == 'receivable' and formatLang(line['debit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['credit'] * -1) or ' ') ]]
- [[ formatLang(line['credit']) and formatLang(line['credit'] * (line['account_id']['type'] == 'payable' and -1 or 1)) ]]
+ [[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]]
- [[ formatLang((line['date_maturity'] < time.strftime('%Y-%m-%d')) and ((line['debit'] - line['credit']) * (line['account_id']['type'] == 'payable' and -1 or 1))) ]]
+ [[ formatLang((line['date_maturity'] < time.strftime('%Y-%m-%d'))) and (line['debit'] - line['credit']) ]]
[[ line['blocked'] and 'X' or '' ]]
@@ -205,13 +205,13 @@
Sub-Total :
- [[ formatLang((reduce(lambda x, y: x + (y['debit'] * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0))) ]]
+ [[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['debit'] or 0) or (y['account_id']['type'] == 'payable' and y['credit'] * -1 or 0)), getLines(o), 0))) ]]
- [[ formatLang((reduce(lambda x ,y: x + (y['credit'] * (y['account_id']['type'] == 'payable' and -1 or 1)), getLines(o), 0))) ]]
+ [[ 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))) ]]
+
+
+
+
+
+
+
+ [[ module.file_graph and setTag('para','image', {'width':'300.0','height':'250.0'}) ]][[ module.file_graph ]]
+
+
+
diff --git a/addons/base_module_doc_rst/report/ir_module_reference_print_graph.py b/addons/base_module_doc_rst/report/ir_module_reference_print_graph.py
new file mode 100644
index 00000000000..62848383000
--- /dev/null
+++ b/addons/base_module_doc_rst/report/ir_module_reference_print_graph.py
@@ -0,0 +1,82 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2009 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+import time
+from report import report_sxw
+
+class ir_module_reference_print_graph(report_sxw.rml_parse):
+ def __init__(self, cr, uid, name, context):
+ super(ir_module_reference_print_graph, self).__init__(cr, uid, name, context=context)
+ self.localcontext.update({
+ 'time': time,
+ 'findobj': self._object_find,
+ 'objdoc': self._object_doc,
+ 'objdoc2': self._object_doc2,
+ 'findflds': self._fields_find,
+ })
+ def _object_doc(self, obj):
+ modobj = self.pool.get(obj)
+ strdocs= modobj.__doc__
+ if not strdocs:
+ return None
+ else:
+ strdocs=strdocs.strip().splitlines(True)
+ res = ''
+ for stre in strdocs:
+ if not stre or stre.isspace():
+ break
+ res += stre
+ return res
+
+ def _object_doc2(self, obj):
+ modobj = self.pool.get(obj)
+ strdocs= modobj.__doc__
+ if not strdocs:
+ return None
+ else:
+ strdocs=strdocs.strip().splitlines(True)
+ res = []
+ fou = False
+ for stre in strdocs:
+ if fou:
+ res.append(stre.strip())
+ elif not stre or stre.isspace():
+ fou = True
+ return res
+
+ def _object_find(self, module):
+ ids2 = self.pool.get('ir.model.data').search(self.cr, self.uid, [('module','=',module), ('model','=','ir.model')])
+ ids = []
+ for mod in self.pool.get('ir.model.data').browse(self.cr, self.uid, ids2):
+ ids.append(mod.res_id)
+ modobj = self.pool.get('ir.model')
+ return modobj.browse(self.cr, self.uid, ids)
+
+ def _fields_find(self, obj):
+ modobj = self.pool.get(obj)
+ res = modobj.fields_get(self.cr, self.uid).items()
+ return res
+
+report_sxw.report_sxw('report.ir.module.reference.graph', 'ir.module.module',
+ 'addons/base_module_doc_rst/report/ir_module_reference_graph.rml',
+ parser=ir_module_reference_print_graph, header=False)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/base_module_doc_rst/report/report_proximity_graph.py b/addons/base_module_doc_rst/report/report_proximity_graph.py
new file mode 100644
index 00000000000..10f5d28fc20
--- /dev/null
+++ b/addons/base_module_doc_rst/report/report_proximity_graph.py
@@ -0,0 +1,84 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2009 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+import time, os
+import pydot
+
+import report,pooler,tools
+
+class report_graph(report.interface.report_int):
+ def __init__(self, name, table):
+ report.interface.report_int.__init__(self, name)
+ self.table = table
+
+ def get_proximity_graph(self, cr, uid, module_id, context=None):
+ pool_obj = pooler.get_pool(cr.dbname)
+ module_obj = pool_obj.get('ir.module.module')
+ nodes = [('base','unknown')]
+ edges = []
+ def get_dpend_module(module_id):
+ module_record = module_obj.browse(cr, uid, module_id, context=context)
+ if module_record.name not in nodes:
+ # Add new field ir.module.module object in server side. field name = module_type/
+# if module_record.module_type:
+# nodes.append((module_record.name, module_record.module_type))
+# else:
+ nodes.append((module_record.name, "unknown"))
+ if module_record.dependencies_id:
+ for depen in module_record.dependencies_id:
+ if (module_record.name,depen.name) not in edges:
+ edges.append((module_record.name,depen.name))
+ if depen.name == "base":
+ continue
+ id = module_obj.browse(cr, uid, module_obj.search(cr, uid, [('name', '=' ,depen.name)]), context=context)
+ if id:
+ get_dpend_module(id[0].id)
+ get_dpend_module(module_id)
+ graph = pydot.Dot(graph_type='digraph',fontsize='10', label="\\nProximity Graph. \\n\\nGray Color:Official Modules, Red Color:Extra Addons Modules, Blue Color:Community Modules, Purple Color:Unknow Modules"
+ , center='1')
+ for node in nodes:
+ if node[1] == "official":
+ graph.add_node(pydot.Node(node[0], style="filled", fillcolor="lightgray"))
+ elif node[1] == "extra_addons":
+ graph.add_node(pydot.Node(node[0], style="filled", fillcolor="red"))
+ elif node[1] == "community":
+ graph.add_node(pydot.Node(node[0], style="filled", fillcolor="#000FFF"))
+ elif node[1] == "unknown":
+ graph.add_node(pydot.Node(node[0], style="filled", fillcolor="purple"))
+ for edge in edges:
+ graph.add_edge(pydot.Edge(edge[0], edge[1]))
+
+ ps_string = graph.create(prog='dot', format='ps')
+ if os.name == "nt":
+ prog = 'ps2pdf.bat'
+ else:
+ prog = 'ps2pdf'
+
+ args = (prog, '-', '-')
+ input, output = tools.exec_command_pipe(*args)
+ input.write(ps_string)
+ input.close()
+ return output.read()
+
+ def create(self, cr, uid, ids, data, context={}):
+ pdf_string = self.get_proximity_graph(cr, uid, data['id'])
+ return (pdf_string, 'pdf')
+
+report_graph('report.proximity.graph', 'ir.module.module')
\ No newline at end of file
diff --git a/addons/base_module_doc_rst/wizard/__init__.py b/addons/base_module_doc_rst/wizard/__init__.py
new file mode 100644
index 00000000000..6f6e62e8767
--- /dev/null
+++ b/addons/base_module_doc_rst/wizard/__init__.py
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2009 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+import wizard_tech_guide_rst
+import generate_relation_graph
+
diff --git a/addons/smtpclient/wizard/testemail.py b/addons/base_module_doc_rst/wizard/generate_relation_graph.py
similarity index 51%
rename from addons/smtpclient/wizard/testemail.py
rename to addons/base_module_doc_rst/wizard/generate_relation_graph.py
index 5cd03db74ca..0d4453b0bcc 100644
--- a/addons/smtpclient/wizard/testemail.py
+++ b/addons/base_module_doc_rst/wizard/generate_relation_graph.py
@@ -1,7 +1,8 @@
+# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL ().
+# Copyright (C) 2004-2010 Tiny SPRL ().
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -14,44 +15,35 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
-
import wizard
-import pooler
from osv import osv
+import pooler
from tools.translate import _
-form = '''
-'''
-fields = {
- 'emailto': {'string': 'Email Address', 'required':True, 'size': 255 , 'type': 'char', 'help': 'Enter the address Email where you want to get the Test Email'}
-}
-
-class testemail(wizard.interface):
-
- def send_code(self, cr, uid, data, context):
- state = pooler.get_pool(cr.dbname).get('email.smtpclient').test_verify_email(cr, uid, [data['id']], data['form']['emailto'], test=True)
- if not state:
- raise osv.except_osv(_('Error'), _('Verification Failed. Please check the Server Configuration!'))
- return {}
+def _get_graph(self, cr, uid, datas, context={}):
+ mod_obj = pooler.get_pool(cr.dbname).get('ir.module.module')
+ modules = mod_obj.browse(cr, uid, datas['ids'], context=context)
+ for module in modules:
+ module_data = mod_obj.get_relation_graph(cr, uid, module.name, context=context)
+ if module_data['module_file']:
+ mod_obj.write(cr, uid, [module.id], {'file_graph': module_data['module_file']}, context=context)
+ return {}
+class create_graph(wizard.interface):
states = {
'init': {
- 'actions': [],
- 'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel'),('send','Send Email')]}
+ 'actions': [_get_graph],
+ 'result': {'type': 'form', 'arch': form_rep, 'fields': {}, 'state': [('end','Ok')]}
},
- 'send': {
- 'actions': [send_code],
- 'result': {'type':'state', 'state':'end'}
- }
}
-testemail('email.testemail')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+create_graph('create.relation.graph')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py b/addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py
new file mode 100644
index 00000000000..da161ba1917
--- /dev/null
+++ b/addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py
@@ -0,0 +1,522 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2009 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+from os.path import join
+import base64
+import tempfile
+import tarfile
+import httplib
+
+import netsvc
+import wizard
+import pooler
+import os
+import tools
+
+import base_module_doc_rst
+
+
+choose_file_form = '''
+
+'''
+
+choose_file_fields = {
+ 'rst_file': {'string': 'file', 'type': 'binary', 'required': True, 'readonly': True},
+ 'name': {'string': 'filename', 'type': 'char', 'required': True, 'readonly': True},
+}
+
+class RstDoc(object):
+ def __init__(self, module, objects):
+ self.dico = {
+ 'name': module.name,
+ 'shortdesc': module.shortdesc,
+ 'latest_version': module.latest_version,
+ 'website': module.website,
+ 'description': self._handle_text(module.description.strip() or 'None'),
+ 'report_list': self._handle_list_items(module.reports_by_module),
+ 'menu_list': self._handle_list_items(module.menus_by_module),
+ 'view_list': self._handle_list_items(module.views_by_module),
+ 'depends': module.dependencies_id,
+ 'quality_certified': bool(module.certificate) and 'yes' or 'no',
+ 'official_module': str(module.certificate)[:2] == '00' and 'yes' or 'no',
+ 'author': module.author,
+ 'quality_certified_label': self._quality_certified_label(module),
+ }
+ self.objects = objects
+ self.module = module
+
+ def _quality_certified_label(self, module):
+ label = ""
+ certificate = module.certificate
+ if certificate and len(certificate) > 1:
+ if certificate[:2] == '00':
+ # addons
+ label = "(Official, Quality Certified)"
+ elif certificate[:2] == '01':
+ # extra addons
+ label = "(Quality Certified)"
+
+ return label
+
+ def _handle_list_items(self, list_item_as_string):
+ list_item_as_string = list_item_as_string.strip()
+ if list_item_as_string:
+ return [item.replace('*', '\*') for item in list_item_as_string.split('\n')]
+ else:
+ return []
+
+ def _handle_text(self, txt):
+ lst = [' %s' % line for line in txt.split('\n')]
+ return '\n'.join(lst)
+
+ def _get_download_links(self):
+ def _is_connection_status_good(link):
+ server = "openerp.com"
+ status_good = False
+ try:
+ conn = httplib.HTTPConnection(server)
+ conn.request("HEAD", link)
+ res = conn.getresponse()
+ if res.status in (200, ):
+ status_good = True
+ except (Exception, ), e:
+ logger = netsvc.Logger()
+ msg = "error connecting to server '%s' with link '%s'. Error message: %s" % (server, link, str(e))
+ logger.notifyChannel("base_module_doc_rst", netsvc.LOG_ERROR, msg)
+ status_good = False
+ return status_good
+
+ versions = ('4.2', '5.0', 'trunk')
+ download_links = []
+ for ver in versions:
+ link = 'http://www.openerp.com/download/modules/%s/%s.zip' % (ver, self.dico['name'])
+ if _is_connection_status_good(link):
+ download_links.append(" * `%s <%s>`_" % (ver, link))
+
+ if download_links:
+ res = '\n'.join(download_links)
+ else:
+ res = "(No download links available)"
+ return res
+
+ def _write_header(self):
+ dico = self.dico
+ title = "%s (*%s*)" % (dico['shortdesc'], dico['name'])
+ title_underline = "=" * len(title)
+ dico['title'] = title
+ dico['title_underline'] = title_underline
+ dico['download_links'] = self._get_download_links()
+
+ sl = [
+ "",
+ ".. module:: %(name)s",
+ " :synopsis: %(shortdesc)s %(quality_certified_label)s",
+ " :noindex:",
+ ".. ",
+ "",
+ ".. raw:: html",
+ "",
+ " ",
+ """ """,
+ "",
+ """.. tip:: This module is part of the Open ERP software, the leading Open Source """,
+ """ enterprise management system. If you want to discover Open ERP, check our """,
+ """ `screencasts `_ or download """,
+ """ `Open ERP `_ directly.""",
+ "",
+ ".. raw:: html",
+ "",
+ """ """ % (dico['name'], ),
+ """ """,
+ "",
+ "%(title)s",
+ "%(title_underline)s",
+ ":Module: %(name)s",
+ ":Name: %(shortdesc)s",
+ ":Version: %(latest_version)s",
+ ":Author: %(author)s",
+ ":Directory: %(name)s",
+ ":Web: %(website)s",
+ ":Official module: %(official_module)s",
+ ":Quality certified: %(quality_certified)s",
+ "",
+ "Description",
+ "-----------",
+ "",
+ "::",
+ "",
+ "%(description)s",
+ "",
+ "Download links",
+ "--------------",
+ "",
+ "You can download this module as a zip file in the following version:",
+ "",
+ "%(download_links)s",
+ "",
+ ""]
+ return '\n'.join(sl) % (dico)
+
+ def _write_reports(self):
+ sl = ["",
+ "Reports",
+ "-------"]
+ reports = self.dico['report_list']
+ if reports:
+ for report in reports:
+ if report:
+ sl.append("")
+ sl.append(" * %s" % report)
+ else:
+ sl.extend(["", "None", ""])
+
+ sl.append("")
+ return '\n'.join(sl)
+
+ def _write_menus(self):
+ sl = ["",
+ "Menus",
+ "-------",
+ ""]
+ menus = self.dico['menu_list']
+ if menus:
+ for menu in menus:
+ if menu:
+ sl.append(" * %s" % menu)
+ else:
+ sl.extend(["", "None", ""])
+
+ sl.append("")
+ return '\n'.join(sl)
+
+ def _write_views(self):
+ sl = ["",
+ "Views",
+ "-----",
+ ""]
+ views = self.dico['view_list']
+ if views:
+ for view in views:
+ if view:
+ sl.append(" * %s" % view)
+ else:
+ sl.extend(["", "None", ""])
+
+ sl.append("")
+ return '\n'.join(sl)
+
+ def _write_depends(self):
+ sl = ["",
+ "Dependencies",
+ "------------",
+ ""]
+ depends = self.dico['depends']
+ if depends:
+ for dependency in depends:
+ sl.append(" * :mod:`%s`" % (dependency.name))
+ else:
+ sl.extend(["", "None", ""])
+ sl.append("")
+ return '\n'.join(sl)
+
+ def _write_objects(self):
+ def write_field(field_def):
+ if not isinstance(field_def, tuple):
+ logger = netsvc.Logger()
+ msg = "Error on Object %s: field_def: %s [type: %s]" % (obj_name.encode('utf8'), field_def.encode('utf8'), type(field_def))
+ logger.notifyChannel("base_module_doc_rst", netsvc.LOG_ERROR, msg)
+ return ""
+
+ field_name = field_def[0]
+ field_dict = field_def[1]
+ field_required = field_dict.get('required', '') and ', required'
+ field_readonly = field_dict.get('readonly', '') and ', readonly'
+
+ field_help_s = field_dict.get('help', '').strip()
+ if field_help_s:
+ field_help_s = "*%s*" % (field_help_s)
+ field_help = '\n'.join([' %s' % line.strip() for line in field_help_s.split('\n')])
+ else:
+ field_help = ''
+
+ sl = ["",
+ ":%s: %s, %s%s%s" % (field_name, field_dict.get('string', 'Unknown'), field_dict['type'], field_required, field_readonly),
+ "",
+ field_help,
+ ]
+ return '\n'.join(sl)
+
+ sl = ["",
+ "",
+ "Objects",
+ "-------"]
+ if self.objects:
+ for obj in self.objects:
+ obj_name = obj['object'].name
+ obj_model = obj['object'].model
+ title = "Object: %s (%s)" % (obj_name, obj_model)
+ slo = [
+ "",
+ title,
+ '#' * len(title),
+ "",
+ #".. index::",
+ #" single: %s object" % (obj_name),
+ #".. ",
+ ]
+
+ for field in obj['fields']:
+ slf = [
+ "",
+ write_field(field),
+ "",
+ #".. index::",
+ #" single: %s field" % (field[0]),
+ #".. ",
+ #"",
+ #"",
+ ]
+ slo.extend(slf)
+ sl.extend(slo)
+ else:
+ sl.extend(["", "None", ""])
+
+ return u'\n'.join([a.decode('utf8') for a in sl])
+
+ def _write_relationship_graph(self, module_name=False):
+ sl = ["",
+ "Relationship Graph",
+ "------------------",
+ "",
+ ".. figure:: %s_module.png" % (module_name, ),
+ " :scale: 50",
+ " :align: center",
+ ""]
+ sl.append("")
+ return '\n'.join(sl)
+
+ def write(self, module_name=False):
+ s = ''
+ s += self._write_header()
+ s += self._write_depends()
+ s += self._write_reports()
+ s += self._write_menus()
+ s += self._write_views()
+ s += self._write_objects()
+ if module_name:
+ s += self._write_relationship_graph(module_name)
+ return s
+
+
+class wizard_tech_guide_rst(wizard.interface):
+
+
+ def _generate(self, cr, uid, data, context):
+ pool = pooler.get_pool(cr.dbname)
+ module_model = pool.get('ir.module.module')
+ module_ids = data['ids']
+
+ module_index = []
+
+ # create a temporary gzipped tarfile:
+ tgz_tmp_filename = tempfile.mktemp('_rst_module_doc.tgz')
+ try:
+ tarf = tarfile.open(tgz_tmp_filename, 'w:gz')
+
+ modules = module_model.browse(cr, uid, module_ids)
+ for module in modules:
+ index_dict = {
+ 'name': module.name,
+ 'shortdesc': module.shortdesc,
+ }
+ module_index.append(index_dict)
+
+ objects = self._get_objects(cr, uid, module)
+ module.test_views = self._get_views(cr, uid, module.id, context=context)
+ rstdoc = RstDoc(module, objects)
+
+ # Append Relationship Graph on rst
+ graph_mod = False
+ module_name = False
+ if module.file_graph:
+ graph_mod = base64.decodestring(module.file_graph)
+ else:
+ module_data = module_model.get_relation_graph(cr, uid, module.name, context=context)
+ if module_data['module_file']:
+ graph_mod = base64.decodestring(module_data['module_file'])
+ if graph_mod:
+ module_name = module.name
+ try:
+ tmpdir = tempfile.mkdtemp()
+ tmp_file_graph = tempfile.NamedTemporaryFile()
+ tmp_file_graph.write(graph_mod)
+ tmp_file_graph.file.flush()
+ tarf.add(tmp_file_graph.name, arcname= module.name + '_module.png')
+ finally:
+ tmp_file_graph.close()
+
+ out = rstdoc.write(module_name)
+ try:
+ tmp_file = tempfile.NamedTemporaryFile()
+ tmp_file.write(out.encode('utf8'))
+ tmp_file.file.flush() # write content to file
+ tarf.add(tmp_file.name, arcname=module.name + '.rst')
+ finally:
+ tmp_file.close()
+
+ # write index file:
+ tmp_file = tempfile.NamedTemporaryFile()
+ out = self._create_index(module_index)
+ tmp_file.write(out.encode('utf8'))
+ tmp_file.file.flush()
+ tarf.add(tmp_file.name, arcname='index.rst')
+ finally:
+ tarf.close()
+
+ f = open(tgz_tmp_filename, 'rb')
+ out = f.read()
+ f.close()
+
+ if os.path.exists(tgz_tmp_filename):
+ try:
+ os.unlink(tgz_tmp_filename)
+ except Exception, e:
+ logger = netsvc.Logger()
+ msg = "Temporary file %s could not be deleted. (%s)" % (tgz_tmp_filename, e)
+ logger.notifyChannel("warning", netsvc.LOG_WARNING, msg)
+
+ return {
+ 'rst_file': base64.encodestring(out),
+ 'name': 'modules_technical_guide_rst.tgz'
+ }
+
+ def _get_views(self, cr, uid, module_id, context={}):
+ pool = pooler.get_pool(cr.dbname)
+ module_module_obj = pool.get('ir.module.module')
+ res = {}
+ model_data_obj = pool.get('ir.model.data')
+ view_obj = pool.get('ir.ui.view')
+ report_obj = pool.get('ir.actions.report.xml')
+ menu_obj = pool.get('ir.ui.menu')
+ mlist = module_module_obj.browse(cr, uid, [module_id], context=context)
+ mnames = {}
+ for m in mlist:
+ mnames[m.name] = m.id
+ res[m.id] = {
+ 'menus_by_module': [],
+ 'reports_by_module': [],
+ 'views_by_module': []
+ }
+ view_id = model_data_obj.search(cr, uid, [('module', 'in', mnames.keys()),
+ ('model', 'in', ('ir.ui.view', 'ir.actions.report.xml', 'ir.ui.menu'))])
+ for data_id in model_data_obj.browse(cr, uid, view_id, context):
+ # We use try except, because views or menus may not exist
+ try:
+ key = data_id['model']
+ if key == 'ir.ui.view':
+ v = view_obj.browse(cr, uid, data_id.res_id)
+ v_dict = {
+ 'name': v.name,
+ 'inherit': v.inherit_id,
+ 'type': v.type}
+ res[mnames[data_id.module]]['views_by_module'].append(v_dict)
+ elif key == 'ir.actions.report.xml':
+ res[mnames[data_id.module]]['reports_by_module'].append(report_obj.browse(cr, uid, data_id.res_id).name)
+ elif key == 'ir.ui.menu':
+ res[mnames[data_id.module]]['menus_by_module'].append(menu_obj.browse(cr, uid, data_id.res_id).complete_name)
+ except (KeyError, ):
+ pass
+ return res
+
+ def _create_index(self, module_index):
+ sl = ["",
+ ".. _module-technical-guide-link:",
+ "",
+ "Module Technical Guide: Introspection report on objects",
+ "=======================================================",
+ "",
+ ".. toctree::",
+ " :maxdepth: 1",
+ "",
+ ]
+ for mod in module_index:
+ sl.append(" %s" % mod['name'])
+ sl.append("")
+ return '\n'.join(sl)
+
+ def _get_objects(self, cr, uid, module):
+ res = []
+ objects = self._object_find(cr, uid, module)
+ for obj in objects:
+ fields = self._fields_find(cr, uid, obj.model)
+ dico = {
+ 'object': obj,
+ 'fields': fields
+ }
+ res.append(dico)
+ return res
+
+ def _object_find(self, cr, uid, module):
+ pool = pooler.get_pool(cr.dbname)
+ ids2 = pool.get('ir.model.data').search(cr, uid, [('module', '=', module.name), ('model', '=', 'ir.model')])
+ ids = []
+ for mod in pool.get('ir.model.data').browse(cr, uid, ids2):
+ ids.append(mod.res_id)
+ modobj = pool.get('ir.model')
+ return modobj.browse(cr, uid, ids)
+
+ def _fields_find(self, cr, uid, obj):
+ pool = pooler.get_pool(cr.dbname)
+ modobj = pool.get(obj)
+ if modobj:
+ res = modobj.fields_get(cr, uid).items()
+ return res
+ else:
+ logger = netsvc.Logger()
+ msg = "Object %s not found" % (obj)
+ logger.notifyChannel("base_module_doc_rst", netsvc.LOG_ERROR, msg)
+ return ""
+
+## def _object_doc(self, cr, uid, obj):
+## pool = pooler.get_pool(cr.dbname)
+## modobj = pool.get(obj)
+## return modobj.__doc__
+
+ states = {
+ 'init': {
+ 'actions': [_generate],
+ 'result': {
+ 'type': 'form',
+ 'arch': choose_file_form,
+ 'fields': choose_file_fields,
+ 'state': [
+ ('end', 'Close', 'gtk-close'),
+ ]
+ }
+ },
+ }
+
+wizard_tech_guide_rst('tech.guide.rst')
+
diff --git a/addons/base_module_merge/i18n/oc.po b/addons/base_module_merge/i18n/oc.po
new file mode 100644
index 00000000000..e4cc7b748e1
--- /dev/null
+++ b/addons/base_module_merge/i18n/oc.po
@@ -0,0 +1,155 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-05-18 08:33+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) \n"
+"Language-Team: Occitan (post 1500) \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr "Categoria"
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,save:0
+msgid "Information"
+msgstr "Informacion"
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,init:0
+msgid "Module Merging"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,author:0
+msgid "Author"
+msgstr "Autor"
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,directory_name:0
+msgid "Directory Name"
+msgstr "Nom del dorsièr"
+
+#. module: base_module_merge
+#: selection:base_module_merge.module_merge,info,data_kind:0
+msgid "Demo Data"
+msgstr "Donadas de demo"
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,save,module_filename:0
+msgid "Filename"
+msgstr "Nom del fichièr"
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,version:0
+msgid "Version"
+msgstr "Version"
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,info:0
+#: wizard_view:base_module_merge.module_merge,save:0
+msgid "Module Recording"
+msgstr "Modul d'Enregistrament"
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,save:0
+msgid "Thanks in advance for your contribution."
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,description:0
+msgid "Full Description"
+msgstr "Descripcion completa"
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,name:0
+msgid "Module Name"
+msgstr "Nom de modul"
+
+#. module: base_module_merge
+#: model:ir.actions.wizard,name:base_module_merge.wizard_base_module_merger
+#: model:ir.ui.menu,name:base_module_merge.menu_wizard_base_module_merger
+msgid "Merge module"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,save,module_file:0
+msgid "Module .zip File"
+msgstr "Fichièr zip del Modul"
+
+#. module: base_module_merge
+#: model:ir.module.module,shortdesc:base_module_merge.module_meta_information
+msgid "Module Merger"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,save:0
+msgid "Module successfully created !"
+msgstr "Modul creat amb succès !"
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,website:0
+msgid "Documentation URL"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,init,modules_list:0
+msgid "Modules"
+msgstr "Moduls"
+
+#. module: base_module_merge
+#: wizard_button:base_module_merge.module_merge,info,save:0
+#: wizard_button:base_module_merge.module_merge,init,info:0
+msgid "Continue"
+msgstr "Contunhar"
+
+#. module: base_module_merge
+#: selection:base_module_merge.module_merge,info,data_kind:0
+msgid "Normal Data"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,save:0
+msgid ""
+"If you think your module could interrest others people, we'd like you to "
+"publish it on OpenERP.com, in the 'Modules' section. You can do it through "
+"the website or using features of the 'base_module_publish' module."
+msgstr ""
+
+#. module: base_module_merge
+#: help:base_module_merge.module_merge,init,modules_list:0
+msgid "Select Modules which you want to merge in single module"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,data_kind:0
+msgid "Type of Data"
+msgstr "Tipe de Donada"
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,info:0
+msgid "Module Information"
+msgstr "Informacion sul Modul"
+
+#. module: base_module_merge
+#: wizard_button:base_module_merge.module_merge,info,end:0
+#: wizard_button:base_module_merge.module_merge,init,end:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: base_module_merge
+#: wizard_button:base_module_merge.module_merge,save,end:0
+msgid "Close"
+msgstr "Tampar"
diff --git a/addons/base_module_quality/speed_test/speed_test.py b/addons/base_module_quality/speed_test/speed_test.py
index ab50afe1293..f3d802451f4 100644
--- a/addons/base_module_quality/speed_test/speed_test.py
+++ b/addons/base_module_quality/speed_test/speed_test.py
@@ -19,12 +19,28 @@
#
##############################################################################
-from osv import fields, osv
from tools.translate import _
import pooler
from base_module_quality import base_module_quality
+class CounterCursor(object):
+ def __init__(self, real_cursor):
+ self.cr = real_cursor
+ self.count = 0
+
+ def reset(self):
+ self.count = 0
+
+ def execute(self, query, params=None):
+ if query.lower().startswith('select '):
+ self.count += 1
+ return self.cr.execute(query, params)
+
+ def __getattr__(self, attr):
+ return getattr(self.cr, attr)
+
+
class quality_test(base_module_quality.abstract_quality_check):
def __init__(self):
@@ -63,6 +79,7 @@ This test checks the speed of the module. Note that at least 5 demo data is need
result_dict = {}
result_dict2 = {}
self.result_details += _("O(1) means that the number of SQL requests to read the object does not depand on the number of objects we are reading. This feature is hardly wished.\n")
+ ccr = CounterCursor(cr)
for obj, ids in obj_ids.items():
code_base_complexity = 0
code_half_complexity = 0
@@ -73,22 +90,22 @@ This test checks the speed of the module. Note that at least 5 demo data is need
list2 = []
if size:
speed_list = []
- #we perform the operation twice, and count the number of queries in the second run. This allows to avoid the cache effect. (like translated terms that asks for more queries)
try:
- pool.get(obj).read(cr, uid, [ids[0]])
- cnt = cr.count
- pool.get(obj).read(cr, uid, [ids[0]])
- code_base_complexity = cr.count - cnt
-
- pool.get(obj).read(cr, uid, ids[:size/2])
- cnt = cr.count
- pool.get(obj).read(cr, uid, ids[:size/2])
- code_half_complexity = cr.count - cnt
-
+ # perform the operation once to put data in cache
pool.get(obj).read(cr, uid, ids)
- cnt = cr.count
- pool.get(obj).read(cr, uid, ids)
- code_size_complexity = cr.count - cnt
+
+ ccr.reset()
+ pool.get(obj).read(ccr, uid, [ids[0]])
+ code_base_complexity = ccr.count
+
+ ccr.reset()
+ pool.get(obj).read(ccr, uid, ids[:size/2])
+ code_half_complexity = ccr.count
+
+ ccr.reset()
+ pool.get(obj).read(ccr, uid, ids)
+ code_size_complexity = ccr.count
+
except Exception, e:
list2 = [obj, _("Error in Read method")]
speed_list = [obj, size, code_base_complexity, code_half_complexity, code_size_complexity, _("Error in Read method:" + str(e))]
diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py
index 33c2608c85a..764753f5cc2 100644
--- a/addons/base_report_creator/base_report_creator.py
+++ b/addons/base_report_creator/base_report_creator.py
@@ -35,7 +35,7 @@ class report_creator(osv.osv):
#
def export_data(self, cr, uid, ids, fields_to_export, context=None):
- if not context:
+ if context is None:
context = {}
data_l = self.read(cr, uid, ids, ['sql_query'], context)
final_datas = []
@@ -61,7 +61,7 @@ class report_creator(osv.osv):
@param Fields: List of field of customer reports form.
@return: Dictionary of Fields
"""
- if not context:
+ if context is None:
context = {}
data = context and context.get('report_id', False) or False
@@ -95,7 +95,7 @@ class report_creator(osv.osv):
@param user: the current user’s ID for security checks,
@return: Dictionary of Fields, arch and toolbar.
"""
- if not context:
+ if context is None:
context = {}
data = context and context.get('report_id', False) or False
@@ -116,9 +116,11 @@ class report_creator(osv.osv):
arch = '\n'
if view_type == 'graph':
- arch += '' % (report.name, report.view_graph_type, report.view_graph_orientation)
+ orientation_eval = {'horz':'horizontal','vert' :'vertical'}
+ orientation = eval(report.view_graph_orientation,orientation_eval)
+ arch +='' % (report.name, report.view_graph_type, orientation)
+ i = 0
for val in ('x','y'):
- i = 0
for f in report.field_ids:
if f.graph_mode == val:
if f.field_id.model:
@@ -191,7 +193,9 @@ class report_creator(osv.osv):
@param fields: List of fields.
@return: List of Dictionary of form [{‘name_of_the_field’: value, ...}, ...]
"""
- data = context and context.get('report_id', False) or False
+ if context is None:
+ context = {}
+ data = context.get('report_id', False)
if (not context) or 'report_id' not in context:
return super(report_creator, self).read(cr, user, ids, fields, context, load)
ctx = context or {}
@@ -225,8 +229,9 @@ class report_creator(osv.osv):
@param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
@return: List of id
"""
-
- context_id = context and context.get('report_id', False) or False
+ if context is None:
+ context = {}
+ context_id = context.get('report_id', False)
if (not context) or 'report_id' not in context:
return super(report_creator, self).search(cr, user, args, offset, limit, order, context, count)
@@ -372,9 +377,10 @@ class report_creator(osv.osv):
t = self.pool.get(f.field_id.model_id.model)._table
if f.group_method == 'group':
fields.append('\t'+t+'.'+f.field_id.name+' as field'+str(i))
+ groupby.append(t+'.'+f.field_id.name)
else:
fields.append('\t'+f.group_method+'('+t+'.'+f.field_id.name+')'+' as field'+str(i))
- groupby.append(t+'.'+f.field_id.name)
+
i += 1
models = self._path_get(cr, uid, obj.model_ids, obj.filter_ids)
check = self._id_get(cr, uid, ids[0], context)
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py b/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
index 9ba1fc6dfaa..7f7a8178ded 100644
--- a/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
+++ b/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
@@ -309,27 +309,32 @@ class PyOpenOffice(object):
return new_c
def sxw2rml(sxw_file, xsl, output='.', save_pict=False):
- import libxslt
- import libxml2
+ from lxml import etree
+ from StringIO import StringIO
+
tool = PyOpenOffice(output, save_pict = save_pict)
res = tool.unpackNormalize(sxw_file)
- styledoc = libxml2.parseDoc(xsl)
- style = libxslt.parseStylesheetDoc(styledoc)
- doc = libxml2.parseMemory(res,len(res))
- result = style.applyStylesheet(doc, None)
-
- root = result.xpathEval("/document/stylesheet")
+
+ f = StringIO(xsl)
+ styledoc = etree.parse(f)
+ style = etree.XSLT(styledoc)
+
+ f = StringIO(res)
+ doc = etree.parse(f)
+ result = style(doc)
+ root = etree.XPathEvaluator(result)("/document/stylesheet")
+
if root:
root=root[0]
- images = libxml2.newNode("images")
+ images = etree.Element("images")
for img in tool.images:
- node = libxml2.newNode('image')
- node.setProp('name', img)
- node.setContent( base64.encodestring(tool.images[img]))
- images.addChild(node)
- root.addNextSibling(images)
+ node = etree.Element('image', name=img)
+ node.text = base64.encodestring(tool.images[img])
+ images.append(node)
+ root.append(images)
+
try:
- xml = style.saveResultToString(result)
+ xml = str(result)
return xml
except:
return result
@@ -349,7 +354,7 @@ if __name__ == "__main__":
import StringIO
fname = sys.argv[1]
- f = StringIO.StringIO(file(fname).read())
+ f = fname
xsl_file = 'normalized_oo2rml.xsl'
z = zipfile.ZipFile(fname,"r")
mimetype = z.read('mimetype')
diff --git a/addons/base_setup/gtk_contact_form.py b/addons/base_setup/gtk_contact_form.py
index c13ae39aee3..a9fde39ffde 100644
--- a/addons/base_setup/gtk_contact_form.py
+++ b/addons/base_setup/gtk_contact_form.py
@@ -74,23 +74,38 @@ class base_gtkcontactform(osv.osv_memory):
'contact_me':fields.boolean('Contact Me'),
}
def execute(self, cr, uid, ids, context=None):
- company_id = self.pool.get('base.setup.company').search(cr, uid, [])
- company_data = self.pool.get('base.setup.company').read(cr, uid, company_id)
- company_data = company_data and company_data[0] or False
- country1 = ''
- if company_data and company_data.get('country_id', False):
- country = self.pool.get('res.country').read(cr, uid, company_data['country_id'],['name'])['name']
- for res in self.read(cr, uid, ids):
+ if context is None:
+ context = {}
+
+ company_id = self.pool.get('base.setup.company').search(cr, uid, [], context=context)
+ company_data = self.pool.get('base.setup.company').read(cr, uid, company_id, context=context)
+ company_data = company_data and company_data[0] or {}
+ country = ''
+
+ if company_data.get('country_id', False):
+ country = self.pool.get('res.country').read(cr, uid, company_data['country_id'],['name'], context=context)['name']
+
+ for res in self.read(cr, uid, ids, context=context):
email = res.get('email','')
- result = "\ncompany: "+ str(company_data.get('name',''))
- result += "\nname: " + str(res.get('name',''))
+ result = "\ncompany: "+ tools.ustr(company_data.get('name',''))
+ result += "\nname: " + tools.ustr(res.get('name',''))
+ result += "\njob: " + tools.ustr(res.get('job',''))
result += "\nphone: " + str(res.get('phone',''))
- result += "\ncity: " + str(company_data.get('city',''))
+ result += "\ncity: " + tools.ustr(company_data.get('city',''))
result += "\ncountry: " + str(country)
- result += "\nindustry: " + str(res.get('industry', ''))
+ result += "\nindustry: " + tools.ustr(res.get('industry', ''))
result += "\ntotal_employees: " + str(res.get('total_employees', ''))
result += "\nplan_use: " + str(res.get('use_openerp', False))
+ result += "\nalready_using_openerp: " + str(res.get('already_using_openerp', False))
result += "\nsell_openerp: " + str(res.get('sell_openerp', False))
+ result += "\nalready_selling__openerp: " + str(res.get('already_selling__openerp', False))
+ result += "\nfeatures: " + str(res.get('features', False))
+ result += "\nsaas: " + str(res.get('saas', False))
+ result += "\npartners_program: " + str(res.get('partners_program', False))
+ result += "\nsupport: " + str(res.get('support', False))
+ result += "\ntraining: " + str(res.get('training', False))
+ result += "\nupdates: " + str(res.get('updates', False))
+ result += "\ncontact_me: " + str(res.get('contact_me', False))
result += "\nebook: " + str(res.get('ebook',False))
result += "\ngtk: " + str(True)
misc.upload_data(email, result, type='SURVEY')
diff --git a/addons/base_setup/i18n/th.po b/addons/base_setup/i18n/th.po
new file mode 100644
index 00000000000..0d613b0573b
--- /dev/null
+++ b/addons/base_setup/i18n/th.po
@@ -0,0 +1,277 @@
+# Thai translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-05-20 04:32+0000\n"
+"Last-Translator: Songpon Phusing \n"
+"Language-Team: Thai \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-21 03:37+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,city:0
+#: wizard_field:base_setup.base_setup,init,city:0
+#: wizard_field:base_setup.base_setup,update,city:0
+msgid "City"
+msgstr "อำเภอ"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,finish:0
+msgid ""
+"You can start configuring the system or connect directly to the database "
+"using the default setup."
+msgstr "คุณอาจจะเริ่มตั้งค่าหรือใช้ค่าพื้นฐานเบื้องต้น"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,zip:0
+#: wizard_field:base_setup.base_setup,init,zip:0
+#: wizard_field:base_setup.base_setup,update,zip:0
+msgid "Zip code"
+msgstr "รหัสไปรษณีย์"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,init:0
+msgid "Select a Profile"
+msgstr "เลือกแบบ"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "Report header"
+msgstr "หัวรายงาน"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,finish,config:0
+msgid "Start Configuration"
+msgstr "เริ่มการตั้งค่า"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,init:0
+msgid ""
+"You'll be able to install more modules later through the Administration menu."
+msgstr "คุณสามารถลงโมดูลใหม่ๆได้ในเมนูการบริหารระบบ"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,init:0
+msgid ""
+"A profile sets a pre-selection of modules for specific needs. These profiles "
+"have been setup to help you discover the different aspects of OpenERP. This "
+"is just an overview, we have 300+ available modules."
+msgstr ""
+"รูปแบบโมดูลเป็นเพียงการตั้งค่าแนะนำในการใช้งานเพื่อตั้งค่าได้ง่ายขึ้น "
+"แต่เรามีโมดูลที่สามารถหาติดตั้งได้มากกว่า 500 โมดูล"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,company,update:0
+#: wizard_button:base_setup.base_setup,init,company:0
+msgid "Next"
+msgstr "ถัดไป"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,email:0
+#: wizard_field:base_setup.base_setup,init,email:0
+#: wizard_field:base_setup.base_setup,update,email:0
+msgid "E-mail"
+msgstr "อีเมล์"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,state_id:0
+#: wizard_field:base_setup.base_setup,init,state_id:0
+#: wizard_field:base_setup.base_setup,update,state_id:0
+msgid "State"
+msgstr "จังหวัด"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,finish:0
+msgid "Your new database is now fully installed."
+msgstr "ฐานข้อมูลใหม่ตั้งตั้งเสร็จสิ้น"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,profile:0
+#: wizard_field:base_setup.base_setup,init,profile:0
+#: wizard_field:base_setup.base_setup,update,profile:0
+msgid "Profile"
+msgstr "รูปแบบ"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,rml_footer1:0
+#: wizard_field:base_setup.base_setup,init,rml_footer1:0
+#: wizard_field:base_setup.base_setup,update,rml_footer1:0
+msgid "Report Footer 1"
+msgstr "หัวรายงาน 1"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,rml_footer2:0
+#: wizard_field:base_setup.base_setup,init,rml_footer2:0
+#: wizard_field:base_setup.base_setup,update,rml_footer2:0
+msgid "Report Footer 2"
+msgstr "ท้ายรายงาน 2"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "General Information"
+msgstr "ข้อมูลทั่วไป"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,street2:0
+#: wizard_field:base_setup.base_setup,init,street2:0
+#: wizard_field:base_setup.base_setup,update,street2:0
+msgid "Street2"
+msgstr "ตำบล"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "Report Information"
+msgstr "ข้อมูลรายงาน"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,phone:0
+#: wizard_field:base_setup.base_setup,init,phone:0
+#: wizard_field:base_setup.base_setup,update,phone:0
+msgid "Phone"
+msgstr "โทรศัพท์"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "Define Main Company"
+msgstr "ตั้งบริษัทหลัก"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,name:0
+#: wizard_field:base_setup.base_setup,init,name:0
+#: wizard_field:base_setup.base_setup,update,name:0
+msgid "Company Name"
+msgstr "ชื่อบริษัท"
+
+#. module: base_setup
+#: help:base_setup.base_setup,company,rml_footer2:0
+#: help:base_setup.base_setup,init,rml_footer2:0
+#: help:base_setup.base_setup,update,rml_footer2:0
+msgid ""
+"This sentence will appear at the bottom of your reports.\n"
+"We suggest you to put bank information here:\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
+msgstr ""
+"ข้อมูลนี่จะอยู่ในท้ายกระดาษของรายงาน\n"
+"เราแนะนำให้เปลี่ยนโดยใส่ข้อมูลของธนาคาร\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,country_id:0
+#: wizard_field:base_setup.base_setup,init,country_id:0
+#: wizard_field:base_setup.base_setup,update,country_id:0
+msgid "Country"
+msgstr "ประเทศ"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+#: wizard_view:base_setup.base_setup,finish:0
+#: wizard_view:base_setup.base_setup,init:0
+#: wizard_view:base_setup.base_setup,update:0
+#: model:ir.actions.wizard,name:base_setup.action_wizard_setup
+#: model:ir.actions.wizard,name:base_setup.wizard_base_setup
+msgid "Setup"
+msgstr "ตั้งค่า"
+
+#. module: base_setup
+#: help:base_setup.base_setup,company,rml_footer1:0
+#: help:base_setup.base_setup,init,rml_footer1:0
+#: help:base_setup.base_setup,update,rml_footer1:0
+msgid ""
+"This sentence will appear at the bottom of your reports.\n"
+"We suggest you to write legal sentences here:\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
+msgstr ""
+"ข้อมูลนี่จะอยู่ในท้ายกระดาษของรายงาน\n"
+"เราแนะนำให้ท่านนำข้อมูลเกี่ยวกับทางกฏหมาย\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,update:0
+msgid "Summary"
+msgstr "สรุป"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,update,finish:0
+msgid "Install"
+msgstr "ติดตั้ง"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,finish:0
+msgid "Installation Done"
+msgstr "ติดตั้งเสร็จสิ้น"
+
+#. module: base_setup
+#: help:base_setup.base_setup,company,rml_header1:0
+#: help:base_setup.base_setup,init,rml_header1:0
+#: help:base_setup.base_setup,update,rml_header1:0
+msgid ""
+"This sentence will appear at the top right corner of your reports.\n"
+"We suggest you to put a slogan here:\n"
+"\"Open Source Business Solutions\"."
+msgstr ""
+"ข้อมูลนี่จะอยู่ในด้านบนขวาของรายงานท่าน\n"
+"กรุณาใส่ สโลแกน\n"
+"\"Open Source Business Solutions\"."
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,rml_header1:0
+#: wizard_field:base_setup.base_setup,init,rml_header1:0
+#: wizard_field:base_setup.base_setup,update,rml_header1:0
+msgid "Report Header"
+msgstr "หัวรายงาน"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "Your Logo - Use a size of about 450x150 pixels."
+msgstr "กรุณาใช้โลโก้ขนาด 450X150 px"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,currency:0
+#: wizard_field:base_setup.base_setup,init,currency:0
+#: wizard_field:base_setup.base_setup,update,currency:0
+msgid "Currency"
+msgstr "อัตราแลกเปลี่ยน"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,street:0
+#: wizard_field:base_setup.base_setup,init,street:0
+#: wizard_field:base_setup.base_setup,update,street:0
+msgid "Street"
+msgstr "ที่อยู่"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,finish,menu:0
+msgid "Use Directly"
+msgstr "ใช้ทันที"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,init,menu:0
+msgid "Cancel"
+msgstr "ยกเลิก"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,logo:0
+#: wizard_field:base_setup.base_setup,init,logo:0
+#: wizard_field:base_setup.base_setup,update,logo:0
+msgid "Logo"
+msgstr "โลโก้"
+
+#. module: base_setup
+#: model:ir.module.module,shortdesc:base_setup.module_meta_information
+msgid "Base Setup"
+msgstr "โครงสร้าง ตั้งค่า"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,company,init:0
+#: wizard_button:base_setup.base_setup,update,company:0
+msgid "Previous"
+msgstr "ก่อนหน้า"
diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index c072891179a..5f6318ec5a1 100644
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -152,5 +152,23 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''),
context=context)
base_setup_company()
+class res_currency(osv.osv):
+ _inherit = 'res.currency'
+
+ def name_get(self, cr, uid, ids, context=None):
+ if context is None:
+ context = {}
+# We can use the following line,if we want to restrict this name_get for company setup only
+# But, its better to show currencies as name(Code).
+# if not (context.get('active_model','') == 'ir.actions.todo'):
+# return super(res_currency,self).name_get(cr, uid, ids, context=context)
+ if not len(ids):
+ return []
+ if isinstance(ids, (int, long)):
+ ids = [ids]
+ reads = self.read(cr, uid, ids, ['name','code'], context, load='_classic_write')
+ return [(x['id'], tools.ustr(x['name']) + ' (' + tools.ustr(x['code']) + ')') for x in reads]
+
+res_currency()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_vat/__init__.py b/addons/base_vat/__init__.py
index 5a220084ca0..e1999d38b87 100644
--- a/addons/base_vat/__init__.py
+++ b/addons/base_vat/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,11 +15,11 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
-import partner
+import base_vat
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_vat/__openerp__.py b/addons/base_vat/__openerp__.py
index bdef947f77f..ff34cd3e09c 100644
--- a/addons/base_vat/__openerp__.py
+++ b/addons/base_vat/__openerp__.py
@@ -18,8 +18,6 @@
# along with this program. If not, see .
#
##############################################################################
-
-
{
'name': 'Base VAT - To check VAT number validity',
'version': '1.0',
@@ -31,10 +29,11 @@
checking the validity of VAT Number assinged to partners in European countries.
""",
'author': 'Tiny',
- 'depends': ['base', 'account'],
- 'update_xml': ['base_vat_data.xml'],
+ 'depends': ['account'],
+ 'website': 'http://www.openerp.com',
+ 'update_xml': ['base_vat_view.xml'],
'installable': True,
'active': False,
'certificate': '0084849360989',
}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/base_vat/partner.py b/addons/base_vat/base_vat.py
similarity index 96%
rename from addons/base_vat/partner.py
rename to addons/base_vat/base_vat.py
index c4f166fd7d5..5cba9ea7053 100644
--- a/addons/base_vat/partner.py
+++ b/addons/base_vat/base_vat.py
@@ -1,9 +1,9 @@
# -*- coding: utf-8 -*-
##############################################################################
#
-# OpenERP, Open Source Management Solution
+# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (). All Rights Reserved
-# Copyright (C) 2008-2009 B2CK, Cedric Krier, Bertrand Chenal (the methods "check_vat_[a-z]{2}"
+# Copyright (C) 2008-2009 B2CK, Cedric Krier, Bertrand Chenal (the methods "check_vat_[a-z]{2}"
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,16 +19,28 @@
# along with this program. If not, see .
#
##############################################################################
-
-from osv import osv
-from osv import fields
import string
+
+from osv import osv, fields
from tools.func import partial
from tools.translate import _
_ref_vat = {
- 'be': 'BE0477472701',
-}
+ 'be': 'BE0477472701', 'at': 'ATU12345675',
+ 'bg': 'BG1234567892', 'cy': 'CY12345678F',
+ 'cz': 'CZ12345679', 'de': 'DE123456788',
+ 'dk': 'DK12345674', 'ee': 'EE123456780',
+ 'es': 'ESA12345674', 'fi': 'FI12345671',
+ 'fr': 'FR32123456789', 'gb': 'GB123456782',
+ 'gr': 'GR12345670', 'hu': 'HU12345676',
+ 'ie': 'IE1234567T', 'it': 'IT12345670017',
+ 'lt': 'LT123456715', 'lu': 'LU12345613',
+ 'lv': 'LV41234567891', 'mt': 'MT12345634',
+ 'nl': 'NL123456782B90', 'pl': 'PL1234567883',
+ 'pt': 'PT123456789', 'ro': 'RO1234567897',
+ 'se': 'SE123456789701', 'si': 'SI12345679',
+ 'sk': 'SK0012345675', 'el': 'EL12345670'
+ }
def mult_add(i, j):
"""Sum each digits of the multiplication of i and j."""
@@ -48,18 +60,16 @@ class res_partner(osv.osv):
'''
for partner in self.browse(cr, uid, ids):
if not partner.vat:
- continue
-
+ continue
vat_country, vat_number = self._split_vat(partner.vat)
if not hasattr(self, 'check_vat_' + vat_country):
return False
check = getattr(self, 'check_vat_' + vat_country)
if not check(vat_number):
return False
-
return True
- def vat_change(self, cr, uid, ids, value, context={}):
+ def vat_change(self, cr, uid, ids, value, context=None):
return {'value': {'vat_subjected': bool(value)}}
_columns = {
@@ -75,13 +85,14 @@ class res_partner(osv.osv):
vat_country, vat_number = self._split_vat(self.browse(cr, uid, ids)[0].vat)
if default_vat_check(vat_country, vat_number):
- return _('The Vat does not seems to be correct. You should have entered something like this %s'), (_ref_vat[vat_country])
- return _('The VAT is invalid, it shoul begin with the country code'), ()
+ vat_no = vat_country in _ref_vat and _ref_vat[vat_country] or 'Country Code + Vat Number'
+ return _('The Vat does not seems to be correct. You should have entered something like this %s'), (vat_no)
+ return _('The VAT is invalid, It should begin with the country code'), ()
_constraints = [(check_vat, _construct_constraint_msg, ["vat"])]
# code from the following methods come from Tryton (B2CK)
- # http://www.tryton.org/hgwebdir.cgi/modules/relationship/file/544d1de586d9/party.py
+ # http://www.tryton.org/hgwebdir.cgi/modules/relationship/file/544d1de586d9/party.py
def check_vat_at(self, vat):
'''
Check Austria VAT number.
@@ -980,10 +991,10 @@ class res_partner(osv.osv):
if int(vat[9:11]) < 0:
return False
-
+
# if int(vat[-2:]) != 1:
# return False
-
+
sum = mult_add(2, int(vat[0])) + int(vat[1]) + \
mult_add(2, int(vat[2])) + int(vat[3]) + \
mult_add(2, int(vat[4])) + int(vat[5]) + \
@@ -1066,5 +1077,4 @@ class res_partner(osv.osv):
res_partner()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/base_vat/base_vat_data.xml b/addons/base_vat/base_vat_view.xml
similarity index 100%
rename from addons/base_vat/base_vat_data.xml
rename to addons/base_vat/base_vat_view.xml
diff --git a/addons/board_association/i18n/lt.po b/addons/board_association/i18n/lt.po
index cf53291f10b..581b5bc4c83 100644
--- a/addons/board_association/i18n/lt.po
+++ b/addons/board_association/i18n/lt.po
@@ -7,13 +7,13 @@ 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-08 15:20+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-05-19 09:15+0000\n"
+"Last-Translator: Rytis Ūsalis \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:57+0000\n"
+"X-Launchpad-Export-Date: 2010-05-20 05:23+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board_association
@@ -40,7 +40,7 @@ msgstr ""
#. module: board_association
#: view:board.board:0
msgid "My tasks"
-msgstr ""
+msgstr "Mano užduotys"
#. module: board_association
#: view:board.board:0
diff --git a/addons/board_document/i18n/oc.po b/addons/board_document/i18n/oc.po
new file mode 100644
index 00000000000..4f6aa7e41d2
--- /dev/null
+++ b/addons/board_document/i18n/oc.po
@@ -0,0 +1,90 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-05-18 09:06+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) \n"
+"Language-Team: Occitan (post 1500) \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: board_document
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: board_document
+#: view:board.board:0
+msgid "New Files"
+msgstr "Fichièrs novèls"
+
+#. module: board_document
+#: model:ir.actions.act_window,name:board_document.open_board_document_manager
+#: model:ir.ui.menu,name:board_document.menu_board_document_manager
+msgid "Document Dashboard"
+msgstr ""
+
+#. module: board_document
+#: view:board.board:0
+msgid "Wall of Shame"
+msgstr "Paret de la Vergonha"
+
+#. module: board_document
+#: view:board.board:0
+msgid "File Size by Month"
+msgstr "Talha dels Fichièrs per Mes"
+
+#. module: board_document
+#: view:board.board:0
+msgid "Files by Month"
+msgstr "Fichièrs per Mes"
+
+#. module: board_document
+#: model:ir.actions.act_window,name:board_document.open_board_document_manager1
+#: model:ir.ui.menu,name:board_document.menu_board_document_manager1
+msgid "Statistics by User"
+msgstr ""
+
+#. module: board_document
+#: view:board.board:0
+msgid "Files by Resource Type"
+msgstr "Fichièrs per Tipe de Ressorsa"
+
+#. module: board_document
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: board_document
+#: model:ir.module.module,shortdesc:board_document.module_meta_information
+msgid "Dashboard for Document Management"
+msgstr ""
+
+#. module: board_document
+#: view:board.board:0
+msgid "Files by Partner"
+msgstr "Fichièrs per Partenari"
+
+#. module: board_document
+#: model:ir.ui.menu,name:board_document.menu_board_document
+msgid "Document"
+msgstr "Document"
+
+#. module: board_document
+#: view:board.board:0
+msgid "Files by Users"
+msgstr "Fichièrs per Utilizaire"
+
+#. module: board_document
+#: view:board.board:0
+msgid "Document board"
+msgstr "Tablèu dels Documents"
diff --git a/addons/board_hr/board_hr_view.xml b/addons/board_hr/board_hr_view.xml
index d26b4b2e6cf..44e2b98c96c 100644
--- a/addons/board_hr/board_hr_view.xml
+++ b/addons/board_hr/board_hr_view.xml
@@ -11,7 +11,7 @@
My Expenseshr.expense.expenseform
- [('state','=','draft'),('user_id','=',uid)]
+ [('state','in',('draft', 'confirm')),('user_id','=',uid)]
diff --git a/addons/board_manufacturing/i18n/oc.po b/addons/board_manufacturing/i18n/oc.po
new file mode 100644
index 00000000000..67f60dc5222
--- /dev/null
+++ b/addons/board_manufacturing/i18n/oc.po
@@ -0,0 +1,74 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-05-18 09:03+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) \n"
+"Language-Team: Occitan (post 1500) \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:11+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: board_manufacturing
+#: view:board.board:0
+msgid "Procurement in Exception"
+msgstr "Aprovisionament en excepcion"
+
+#. module: board_manufacturing
+#: view:board.board:0
+msgid "Next production orders"
+msgstr "Òrdre de fabricacion seguent"
+
+#. module: board_manufacturing
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: board_manufacturing
+#: view:board.board:0
+msgid "Deliveries (Out packing)"
+msgstr "Liurasons"
+
+#. module: board_manufacturing
+#: view:board.board:0
+msgid "Manufacturing board"
+msgstr "Tablèu de bòrd de produccion"
+
+#. module: board_manufacturing
+#: model:ir.ui.menu,name:board_manufacturing.next_id_87
+msgid "Production"
+msgstr "Produccion"
+
+#. module: board_manufacturing
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: board_manufacturing
+#: model:ir.actions.act_window,name:board_manufacturing.open_board_manufacturing
+#: model:ir.ui.menu,name:board_manufacturing.menu_board_manufacturing
+msgid "Production Dashboard"
+msgstr "Tablèu de bòrd de produccion"
+
+#. module: board_manufacturing
+#: model:ir.module.module,shortdesc:board_manufacturing.module_meta_information
+msgid "Board for manufacturing"
+msgstr "Tablèu per la produccion"
+
+#. module: board_manufacturing
+#: view:board.board:0
+msgid "Stock value variation"
+msgstr "Variacion de la valor de l'emmagazinatge"
+
+#. module: board_manufacturing
+#: view:board.board:0
+msgid "Workcenter futur load"
+msgstr ""
diff --git a/addons/board_manufacturing/i18n/pl.po b/addons/board_manufacturing/i18n/pl.po
index 26654a8a158..7f70507e0a7 100644
--- a/addons/board_manufacturing/i18n/pl.po
+++ b/addons/board_manufacturing/i18n/pl.po
@@ -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-11-21 15:58+0000\n"
-"Last-Translator: Andrzej MoST (Marcin Ostajewski) \n"
+"PO-Revision-Date: 2010-05-23 20:02+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \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-05-24 03:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board_manufacturing
#: view:board.board:0
msgid "Procurement in Exception"
-msgstr ""
+msgstr "Niepoprawne nabycia"
#. module: board_manufacturing
#: view:board.board:0
@@ -34,7 +34,7 @@ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
#. module: board_manufacturing
#: view:board.board:0
msgid "Deliveries (Out packing)"
-msgstr ""
+msgstr "Dostawy do klientów"
#. module: board_manufacturing
#: view:board.board:0
@@ -49,7 +49,7 @@ msgstr "Produkcja"
#. module: board_manufacturing
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
#. module: board_manufacturing
#: model:ir.actions.act_window,name:board_manufacturing.open_board_manufacturing
@@ -65,9 +65,9 @@ msgstr "Konsola dla produkcji"
#. module: board_manufacturing
#: view:board.board:0
msgid "Stock value variation"
-msgstr ""
+msgstr "Zmiany wartości zapasów"
#. module: board_manufacturing
#: view:board.board:0
msgid "Workcenter futur load"
-msgstr "Przyszłe obiciążenie centrum roboczego"
+msgstr "Obciążenie centrów roboczych"
diff --git a/addons/board_project/board_project_issue_view.xml b/addons/board_project/board_project_issue_view.xml
index eaf3a2f8612..60103007985 100644
--- a/addons/board_project/board_project_issue_view.xml
+++ b/addons/board_project/board_project_issue_view.xml
@@ -7,24 +7,72 @@
project.issueformtree,form
- [('create_date', '>=', time.strftime('%Y-%m-%d 00:00:00')),('create_date', '<=', time.strftime('%Y-%m-%d 23:59:59'))]
+ [('user_id','=',uid),('state','in',['draft','open'])]
+
+ Project issues
+ project.issue
+ form
+ tree,form
+ [('user_id','=',uid),('state','=','pending')]
+
+
+
+
+ Project Issue
+ project.issue.report
+ form
+ graph
+ [('user_id','=',uid)]
+
+
+
+
+ project.issue.report.graph
+ project.issue.report
+ graph
+
+
+
+
+
+
+
+
+
+
+ Project Issue
+ project.issue.report
+ form
+ graph
+ [('user_id','=',uid)]
+
+
+
board.project.issue.formboard.boardform
-
diff --git a/addons/board_project/i18n/oc.po b/addons/board_project/i18n/oc.po
new file mode 100644
index 00000000000..c1452a23e89
--- /dev/null
+++ b/addons/board_project/i18n/oc.po
@@ -0,0 +1,140 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-05-18 09:08+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) \n"
+"Language-Team: Occitan (post 1500) \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:11+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: board_project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr "Mon planning de projèctes"
+
+#. module: board_project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:board_project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr "Fuèlh de preséncia"
+
+#. module: board_project
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: board_project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_project.act_my_project
+msgid "My projects"
+msgstr "Mos projèctes"
+
+#. module: board_project
+#: model:ir.actions.act_window,name:board_project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr "Las Datas Limitas de mos Prètzfaches"
+
+#. module: board_project
+#: view:project.task:0
+msgid "My Tasks"
+msgstr "Mos prètzfaches"
+
+#. module: board_project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr "Nòtas publicas"
+
+#. module: board_project
+#: model:ir.actions.act_window,name:board_project.open_board_project
+#: model:ir.ui.menu,name:board_project.menu_board_project
+msgid "Project Dashboard"
+msgstr "Tablèu de bòrd de projècte"
+
+#. module: board_project
+#: model:ir.module.module,shortdesc:board_project.module_meta_information
+msgid "Board for project users"
+msgstr ""
+
+#. module: board_project
+#: model:ir.actions.act_window,name:board_project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr ""
+
+#. module: board_project
+#: view:board.board:0
+msgid "My Planning"
+msgstr ""
+
+#. module: board_project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_project.act_my_account
+msgid "My accounts to invoice"
+msgstr "Mos comptes de facturar"
+
+#. module: board_project
+#: model:ir.actions.act_window,name:board_project.open_board_project_manager
+#: model:ir.ui.menu,name:board_project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr "Tablèu de bòrd de gestion de projècte"
+
+#. module: board_project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr "Mas datas limitas"
+
+#. module: board_project
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: board_project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr "Fuèlh de preséncia de l'utilizaire"
+
+#. module: board_project
+#: model:ir.ui.menu,name:board_project.next_id_86
+msgid "Project"
+msgstr "Projècte"
+
+#. module: board_project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr "Tablèu del responsable del projècte"
+
+#. module: board_project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr "Mos prètzfaches dobèrts"
+
+#. module: board_project
+#: view:board.board:0
+msgid "My Board"
+msgstr "Mon Tablèu"
+
+#. module: board_project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr "Mon tablèu de prètzfaches"
+
+#. module: board_project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr ""
+
+#. module: board_project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr "Mon Fuèlh de preséncia"
diff --git a/addons/board_purchase/board_purchase_view.xml b/addons/board_purchase/board_purchase_view.xml
index 2370e247eec..5548b3f2838 100644
--- a/addons/board_purchase/board_purchase_view.xml
+++ b/addons/board_purchase/board_purchase_view.xml
@@ -8,6 +8,15 @@
name="Purchase"
parent="base.dashboard"/>
+
+ Draft Purchases
+ ir.actions.act_window
+ purchase.order
+ form
+ tree,form
+ [('date_order','>',time.strftime('%Y-01-01 00:00:00')),('date_order','<',time.strftime('%Y-12-31 23:59:59')), ('state','=','draft')]
+
+ Quotation Requestir.actions.act_window
@@ -26,7 +35,7 @@
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index aaca747e594..3fbca9d5595 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -47,7 +47,7 @@
name="convert_opportunity"
string="Convert"
help="Convert to Opportunity"
- icon="gtk-index"
+ icon="gtk-index"
type="object"/>
-
-
+
+
@@ -110,7 +110,8 @@
+ sequence="10" action="action_view_attendee_form"
+ groups="base.group_extended" />
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 6712ffe23ce..ac61809cfad 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -24,18 +24,18 @@
form
@@ -260,25 +263,21 @@
-
-
+
-
+
+ help="My Sale Team" />
-
+
-
+
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 308954c297d..3bc9fdd6d81 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -36,12 +36,10 @@ AVAILABLE_STATES = [
class crm_opportunity(osv.osv):
""" Opportunity Cases """
-
_name = "crm.lead"
- _description = "Opportunity Cases"
+ _description = "Opportunity"
_order = "priority,date_action,id desc"
_inherit = 'crm.lead'
-
_columns = {
# From crm.case
'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
@@ -56,7 +54,6 @@ class crm_opportunity(osv.osv):
'date_deadline': fields.date('Expected Closing'),
'date_action': fields.date('Next Action'),
}
-
def case_close(self, cr, uid, ids, *args):
"""Overrides close for crm_case for setting probability and close date
@param self: The object pointer
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index cfce1a6aa9a..737e6ac633d 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -2,16 +2,6 @@
-
-
+
+
Opportunitiescrm.leadtree,form,graph[('type','=','opportunity')]
- {'search_default_current':1}
+ {'search_default_current':1, 'default_type': 'opportunity'}
+ {"search_default_user_id":uid}
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 7594eb09361..3ce0ce788f6 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -56,7 +56,7 @@
@@ -211,12 +211,13 @@
crm.leadtree
-
+
+
-
+
+ icon="gtk-apply" />
@@ -295,7 +296,7 @@
help="My Opportunities" default="1"
/>
+ help="My Sale Team" />
@@ -315,8 +316,6 @@
domain="[]" context="{'group_by':'categ_id'}" />
-
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 6244ba1807a..7131a3730d2 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -29,12 +29,15 @@ class crm_phonecall(osv.osv, crm_case):
""" Phonecall Cases """
_name = "crm.phonecall"
- _description = "Phonecall Cases"
+ _description = "Phonecall"
_order = "id desc"
- _inherit = 'mailgate.thread'
+ _inherits = {'mailgate.thread': 'thread_id'}
_columns = {
# From crm.case
+ 'name': fields.char('Name', size=64),
+ 'active': fields.boolean('Active', required=False),
+ 'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False),
'section_id': fields.many2one('crm.case.section', 'Sales Team', \
select=True, help='Sales team to which Case belongs to.\
Define Responsible user and Email account for mail gateway.'),
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 916cd5f64f3..a5caf10b673 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -10,6 +10,7 @@
view_mode="calendar,tree,form"
context="{'default_partner_id': active_id, 'default_duration': 1.0}"
domain="[('partner_id', '=', active_id)]"
+ groups="base.group_extended"
/>
@@ -20,6 +21,7 @@
formtree,calendar
+ {"search_default_user_id":uid}
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 3bfa284b017..a72a8df9de8 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -263,9 +263,6 @@
-
@@ -274,7 +271,7 @@
select="1" widget="selection" string="Sales Team">
+ help="My Sale Team" />
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 3f308f3cd6d..79e1fc3496b 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -16,31 +16,28 @@
-
-
-
- crm.case.history.tree
- crm.case.history
- tree
-
-
-
-
-
-
-
-
-
-
-
-
-
- crm.case.calendar
- mailgate.thread
- calendar
-
-
-
-
-
-
-
-
-
-
-
-
- crm.case.tree
- mailgate.thread
- tree
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- crm.case.form
- mailgate.thread
- form
-
-
-
-
-
-
-
-
-
-
- crm.case.select
- mailgate.thread
- search
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Cases
- mailgate.thread
- form
-
-
-
-
-
- Open Cases
- mailgate.thread
- form
-
- [('state','<>','done'),('state','<>','cancel'),('state','<>','pending')]
-
-
-
-
-
- Cases
- mailgate.thread
- [('section_id','child_of',[active_id])]
- form
- tree,form,calendar
-
-
-
-
- Open Cases
-
-
-
-
-
-
-
- crm.case.history.form
- crm.case.history
- form
-
-
-
-
-
-
-
-
- crm.case.history.select
- crm.case.history
- search
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Histories
- crm.case.history
- form
- tree,form
-
-
-
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index b9424d024dd..d0b526f542e 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-04-29 10:04+0000\n"
-"Last-Translator: Jordi Esteve - http://www.zikzakmedia.com "
-"\n"
+"PO-Revision-Date: 2010-05-17 23:03+0000\n"
+"Last-Translator: Carlos Incaser \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-05-05 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
@@ -1508,7 +1507,7 @@ msgstr "crm.phonecall.assign_wizard"
#. module: crm
#: view:report.crm.case.section.categ2:0
msgid "Cases by Section and Category2"
-msgstr ""
+msgstr "Casos por sección y 2ª categoría"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -1520,7 +1519,7 @@ msgstr "realizado"
#: view:crm.meeting:0
#: view:crm.phonecall:0
msgid "Reminder"
-msgstr ""
+msgstr "Recordatorio"
#. module: crm
#: help:crm.segmentation,sales_purchase_active:0
@@ -1546,7 +1545,7 @@ msgstr "Recordar con adjunto"
#: model:crm.case.categ,name:crm.categ_lead6
#: model:crm.case.categ,name:crm.categ_oppor6
msgid "Website"
-msgstr ""
+msgstr "Sitio web"
#. module: crm
#: field:crm.case.rule,act_remind_user:0
@@ -1568,7 +1567,7 @@ msgstr ""
#. module: crm
#: view:crm.fundraising:0
msgid "Funds"
-msgstr ""
+msgstr "Fondos"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -1580,7 +1579,7 @@ msgstr "borrador"
#: model:crm.case.stage,name:crm.stage_claim5
#: model:crm.case.stage,name:crm.stage_meet4
msgid "Awaiting Response"
-msgstr ""
+msgstr "Esperando respuesta"
#. module: crm
#: field:crm.case,date:0
@@ -1600,17 +1599,17 @@ msgstr ""
#: model:crm.case.categ,name:crm.categ_lead2
#: model:crm.case.categ,name:crm.categ_oppor2
msgid "Self Generated"
-msgstr ""
+msgstr "Auto generado"
#. module: crm
#: model:crm.case.stage,name:crm.stage_claim3
msgid "Won't fix"
-msgstr ""
+msgstr "No será corregido"
#. module: crm
#: model:crm.case.stage,name:crm.stage_lead4
msgid "Converted"
-msgstr ""
+msgstr "Convertido"
#. module: crm
#: view:crm.case:0
@@ -1650,7 +1649,7 @@ msgstr ""
#. module: crm
#: view:crm.job:0
msgid "Jobs - Recruitment Tree"
-msgstr ""
+msgstr "Trabajos - selección de personal"
#. module: crm
#: field:crm.case.rule,regex_name:0
@@ -1664,7 +1663,7 @@ msgstr ""
#: field:report.crm.case.section.categ2,state:0
#: field:report.crm.case.section.stage,state:0
msgid "State"
-msgstr ""
+msgstr "Estado/Provincia"
#. module: crm
#: view:crm.case:0
@@ -1725,7 +1724,7 @@ msgstr ""
#. module: crm
#: view:crm.claim:0
msgid "Type of claim"
-msgstr ""
+msgstr "Tipo de reclamación"
#. module: crm
#: view:crm.case:0
@@ -1745,13 +1744,13 @@ msgstr ""
#. module: crm
#: view:crm.claim:0
msgid "Claim Cost"
-msgstr ""
+msgstr "Coste reclamación"
#. module: crm
#: view:crm.job:0
#: view:crm.opportunity:0
msgid "Schedule a Phone Call"
-msgstr ""
+msgstr "Programar una llamada"
#. module: crm
#: field:crm.case,ref:0
@@ -1771,7 +1770,7 @@ msgstr ""
#. module: crm
#: model:crm.case.category2,name:crm.category_lead2
msgid "Mail"
-msgstr ""
+msgstr "Correo electrónico"
#. module: crm
#: field:crm.case.rule,act_priority:0
@@ -1781,12 +1780,12 @@ msgstr "Establecer prioridad a"
#. module: crm
#: model:crm.case.stage,name:crm.stage_oppor2
msgid "Needs Analysis"
-msgstr ""
+msgstr "Necesita análisis"
#. module: crm
#: view:crm.claim:0
msgid "Search Claims"
-msgstr ""
+msgstr "Búsqueda reclamaciones"
#. module: crm
#: field:crm.case.rule,act_mail_body:0
@@ -1796,7 +1795,7 @@ msgstr "Texto correo"
#. module: crm
#: help:crm.menu.config_wizard,meeting:0
msgid "Manages the calendar of meetings of the users."
-msgstr ""
+msgstr "Gestiona el calendario de reuniones de los usuarios."
#. module: crm
#: selection:crm.segmentation.line,expr_name:0
@@ -1829,12 +1828,12 @@ msgstr "Nombre"
#. module: crm
#: view:crm.opportunity:0
msgid "Sales Stage"
-msgstr ""
+msgstr "Fase de ventas"
#. module: crm
#: field:crm.meeting,alarm_id:0
msgid "Alarm"
-msgstr ""
+msgstr "Alarma"
#. module: crm
#: field:crm.case.rule,act_mail_to_watchers:0
@@ -1845,7 +1844,7 @@ msgstr ""
#: view:crm.fundraising:0
#: view:crm.meeting:0
msgid "Next Meeting"
-msgstr ""
+msgstr "Próxima reunión"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -1870,7 +1869,7 @@ msgstr ""
#. module: crm
#: field:crm.menu.config_wizard,bugs:0
msgid "Bug Tracking"
-msgstr ""
+msgstr "Seguimiento de errores"
#. module: crm
#: view:crm.case:0
@@ -1919,12 +1918,12 @@ msgstr "Demora después fecha del disparo:"
#. module: crm
#: model:crm.case.category2,name:crm.category_lead5
msgid "Web"
-msgstr ""
+msgstr "Web"
#. module: crm
#: view:crm.lead:0
msgid "Campaign Type"
-msgstr ""
+msgstr "Tipo campaña"
#. module: crm
#: view:crm.segmentation:0
@@ -1936,22 +1935,22 @@ msgstr "Cálculo grado de satisfacción"
#: code:addons/crm/wizard/wizard_crm_send_email.py:0
#, python-format
msgid "Error"
-msgstr ""
+msgstr "Error"
#. module: crm
#: model:ir.model,name:crm.model_crm_meeting_generic_wizard
msgid "crm.meeting.generic_wizard"
-msgstr ""
+msgstr "crm.reunion.asistente_generico"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_history-act
msgid "Histories"
-msgstr ""
+msgstr "Historial"
#. module: crm
#: model:crm.case.category2,name:crm.category_job1
msgid "Graduate"
-msgstr ""
+msgstr "Graduado"
#. module: crm
#: wizard_view:crm.job.meeting_set,init:0
@@ -1960,11 +1959,13 @@ msgid ""
"Note that you can also use the calendar view to graphically schedule your "
"next meeting."
msgstr ""
+"Observe que también puede utilizar la vista de calendario para programar "
+"gráficamente su siguiente reunión."
#. module: crm
#: view:crm.lead:0
msgid "Leads Tree"
-msgstr ""
+msgstr "Árbol de iniciativas"
#. module: crm
#: field:crm.meeting,caldav_url:0
@@ -1988,12 +1989,12 @@ msgstr ""
#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
#: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
msgid "Inbound"
-msgstr ""
+msgstr "Entrante"
#. module: crm
#: constraint:crm.case.section:0
msgid "Error ! You cannot create recursive sections."
-msgstr ""
+msgstr "¡Error! No puede crear secciones recursivas."
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm
@@ -2006,6 +2007,8 @@ msgid ""
" Will allow you to synchronise your Open ERP calendars with your phone, "
"outlook, Sunbird, ical, ..."
msgstr ""
+" Le permite sincronizar sus calendarios OpenERP con su teléfono, Outlook, "
+"Sunbird, iCal, ..."
#. module: crm
#: view:report.crm.case.section.categ.categ2:0
@@ -2013,7 +2016,7 @@ msgstr ""
#: view:report.crm.case.section.categ2:0
#: view:report.crm.case.section.stage:0
msgid "This Year"
-msgstr ""
+msgstr "Este año"
#. module: crm
#: field:crm.case.rule,act_remind_partner:0
@@ -2031,7 +2034,7 @@ msgstr "Muy alto"
#. module: crm
#: view:crm.job:0
msgid "Contract Data"
-msgstr ""
+msgstr "Datos contrato"
#. module: crm
#: selection:crm.case.rule,trg_date_range_type:0
@@ -2046,7 +2049,7 @@ msgstr ""
#. module: crm
#: field:crm.menu.config_wizard,document_ics:0
msgid "Shared Calendar"
-msgstr ""
+msgstr "Calendario compartido"
#. module: crm
#: field:crm.case.section,reply_to:0
@@ -2056,7 +2059,7 @@ msgstr "Responder a"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ
msgid "Cases by Leads and Type"
-msgstr ""
+msgstr "Casos por iniciativas y tipo"
#. module: crm
#: selection:crm.case.rule,trg_date_range_type:0
@@ -2067,12 +2070,12 @@ msgstr "Minutos"
#: field:report.crm.case.section.categ2,amount_revenue:0
#: field:report.crm.case.section.stage,amount_revenue:0
msgid "Est.Revenue"
-msgstr ""
+msgstr "Retorno est."
#. module: crm
#: model:crm.case.stage,name:crm.stage_job1
msgid "Initial Jobs Demand"
-msgstr ""
+msgstr "Solicitudes de trabajo iniciales"
#. module: crm
#: field:crm.case.rule,trg_priority_to:0
@@ -2087,7 +2090,7 @@ msgstr ""
#. module: crm
#: view:crm.claim:0
msgid "Claims Info"
-msgstr ""
+msgstr "Info reclamaciones"
#. module: crm
#: field:crm.case.category2,name:0
@@ -2100,7 +2103,7 @@ msgstr ""
#: model:ir.actions.wizard,name:crm.wizard_crm_lead_opportunity_set
#: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_opportunity_set
msgid "Convert To Opportunity"
-msgstr ""
+msgstr "Convertir en oportunidad"
#. module: crm
#: model:crm.case.stage,name:crm.stage_phone2
@@ -2111,18 +2114,18 @@ msgstr ""
#. module: crm
#: view:crm.case:0
msgid "Helpdesk Supports"
-msgstr ""
+msgstr "Asistencia técnica"
#. module: crm
#: model:crm.case.section,name:crm.section_support4
#: model:ir.ui.menu,name:crm.menu_crm_case_fund_raise
msgid "Fund Raising"
-msgstr ""
+msgstr "Obtención de fondos"
#. module: crm
#: selection:crm.new.send.mail,init,state:0
msgid "Unchanged"
-msgstr ""
+msgstr "Sin cambios"
#. module: crm
#: wizard_view:crm.job.partner_create,init:0
@@ -2131,7 +2134,7 @@ msgstr ""
#: wizard_view:crm.phonecall.opportunity_set,create_partner:0
#: wizard_view:crm.phonecall.partner_create,init:0
msgid "Convert To Partner"
-msgstr ""
+msgstr "Convertir en empresa"
#. module: crm
#: field:crm.case.rule,trg_state_from:0
@@ -2192,7 +2195,7 @@ msgstr "Sección del caso"
#. module: crm
#: model:process.node,note:crm.process_node_meeting0
msgid "Schedule a normal or phone meeting"
-msgstr ""
+msgstr "Programar una reunión normal o telefónica"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -2213,7 +2216,7 @@ msgstr "Campos a cambiar"
#. module: crm
#: model:crm.case.category2,name:crm.category_lead1
msgid "Telesales"
-msgstr ""
+msgstr "Ventas a distancia"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm_case_history-act_main
@@ -2240,7 +2243,7 @@ msgstr "Línea de segmentación"
#: wizard_field:crm.opportunity.reschedule_phone_call,init,deadline:0
#: view:crm.phonecall:0
msgid "Planned Date"
-msgstr ""
+msgstr "Fecha prevista"
#. module: crm
#: selection:crm.case.rule,trg_date_range_type:0
@@ -2257,7 +2260,7 @@ msgstr ""
#. module: crm
#: model:ir.actions.wizard,name:crm.wizard_crm_cal_import
msgid "Import ICS File"
-msgstr ""
+msgstr "Importar fichero ICS"
#. module: crm
#: view:crm.meeting:0
@@ -2275,7 +2278,7 @@ msgstr ""
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "July"
-msgstr ""
+msgstr "Julio"
#. module: crm
#: model:crm.case.stage,name:crm.stage_oppor1
@@ -2285,7 +2288,7 @@ msgstr ""
#. module: crm
#: field:crm.case,partner_name2:0
msgid "Employee Email"
-msgstr ""
+msgstr "Email empleado"
#. module: crm
#: model:ir.model,name:crm.model_crm_meeting
@@ -2295,17 +2298,17 @@ msgstr ""
#. module: crm
#: view:crm.job:0
msgid "Job Info"
-msgstr ""
+msgstr "Info. trabajo"
#. module: crm
#: view:crm.meeting:0
msgid "Cancel Meeting"
-msgstr ""
+msgstr "Cancelar reunión"
#. module: crm
#: model:crm.case.section,name:crm.section_support0
msgid "Jobs"
-msgstr ""
+msgstr "Trabajos"
#. module: crm
#: view:crm.case.rule:0
@@ -2316,7 +2319,7 @@ msgstr ""
#: model:crm.case.stage,name:crm.stage_phone3
#: view:crm.phonecall:0
msgid "Not Held"
-msgstr ""
+msgstr "No ocupado"
#. module: crm
#: field:crm.case.rule,act_mail_to_user:0
@@ -2326,12 +2329,12 @@ msgstr "Enviar correo a responsable"
#. module: crm
#: view:crm.job:0
msgid "Jobs - Recruitment Form"
-msgstr ""
+msgstr "Trabajo - Formulario de selección"
#. module: crm
#: model:crm.case.category2,name:crm.category_claim1
msgid "Corrective"
-msgstr ""
+msgstr "Correctivo"
#. module: crm
#: model:ir.model,name:crm.model_crm_opportunity
@@ -2354,7 +2357,7 @@ msgstr "Plantilla de Email a enviar"
#: field:report.crm.case.section.categ2,month:0
#: field:report.crm.case.section.stage,month:0
msgid "Month"
-msgstr ""
+msgstr "Mes"
#. module: crm
#: model:crm.case.section,name:crm.section_support2
@@ -2364,13 +2367,13 @@ msgstr ""
#: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
#: model:process.node,name:crm.process_node_leads0
msgid "Leads"
-msgstr ""
+msgstr "Iniciativas"
#. module: crm
#: wizard_button:crm.new.send.mail,init,send:0
#: wizard_button:crm.send.mail,init,send:0
msgid "Send Email"
-msgstr ""
+msgstr "Enviar correo"
#. module: crm
#: wizard_view:crm.new.send.mail,init:0
@@ -2380,7 +2383,7 @@ msgstr ""
#. module: crm
#: model:crm.case.category2,name:crm.categ2_fund3
msgid "Credit Card"
-msgstr ""
+msgstr "Tarjeta de crédito"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -2407,11 +2410,13 @@ msgstr "Registro"
msgid ""
"This may help associations in their fund raising process and tracking."
msgstr ""
+"Esto puede ayudar a las organizaciones en su proceso de obtención de fondos "
+"y seguimiento."
#. module: crm
#: view:crm.meeting:0
msgid "Reset to Unconfirmed"
-msgstr ""
+msgstr "Restablecer a no confirmado"
#. module: crm
#: view:crm.case:0
@@ -2471,7 +2476,7 @@ msgstr "cancelado"
#. module: crm
#: model:crm.case.categ,name:crm.categ_meet2
msgid "Internal Meeting"
-msgstr ""
+msgstr "Reunión interna"
#. module: crm
#: view:crm.case:0
@@ -2480,7 +2485,7 @@ msgstr ""
#: view:crm.lead:0
#: view:crm.opportunity:0
msgid "Events"
-msgstr ""
+msgstr "Eventos"
#. module: crm
#: help:crm.menu.config_wizard,lead:0
@@ -2488,6 +2493,8 @@ msgid ""
"Allows you to track and manage leads which are pre-sales requests or "
"contacts, the very first contact with a customer request."
msgstr ""
+"Le permite seguir y gestionar iniciativas que son peticiones de pre-ventas o "
+"contactos, el primer contacto de una solicitud de un posible cliente."
#. module: crm
#: help:crm.case,som:0
@@ -2536,7 +2543,7 @@ msgstr ""
#: model:ir.ui.menu,name:crm.menu_crm_case_phone
#, python-format
msgid "Phone Calls"
-msgstr ""
+msgstr "Llamadas telefónicas"
#. module: crm
#: help:crm.case,active:0
@@ -2548,7 +2555,7 @@ msgstr ""
#. module: crm
#: model:ir.model,name:crm.model_crm_menu_config_wizard
msgid "crm.menu.config_wizard"
-msgstr ""
+msgstr "crm.menu.asistente_config"
#. module: crm
#: view:crm.case.history:0
@@ -2558,12 +2565,12 @@ msgstr "Historial del caso"
#. module: crm
#: field:crm.case,partner_phone:0
msgid "Phone"
-msgstr ""
+msgstr "Teléfono"
#. module: crm
#: model:crm.case.category2,name:crm.categ2_fund2
msgid "Cheque"
-msgstr ""
+msgstr "Cheque"
#. module: crm
#: field:crm.case,active:0
@@ -2599,7 +2606,7 @@ msgstr ""
#. module: crm
#: model:ir.actions.wizard,name:crm.wizard_crm_send_mail
msgid "Send Mail"
-msgstr ""
+msgstr "Enviar correo"
#. module: crm
#: selection:crm.case.rule,trg_date_range_type:0
@@ -2627,7 +2634,7 @@ msgstr ""
#. module: crm
#: model:process.node,note:crm.process_node_opportunities0
msgid "When a real project/opportunity is detected"
-msgstr ""
+msgstr "Cuando un proyecto/oportunidad real es detectado"
#. module: crm
#: wizard_view:crm.job.partner_create,init:0
@@ -2649,7 +2656,7 @@ msgstr "Acción"
#: model:ir.ui.menu,name:crm.menu_crm_case_claims
#, python-format
msgid "Claims"
-msgstr ""
+msgstr "Reclamaciones"
#. module: crm
#: field:crm.segmentation,som_interval_decrease:0
@@ -2670,7 +2677,7 @@ msgstr ""
#: wizard_field:crm.new.send.mail,init,to:0
#: wizard_field:crm.send.mail,init,to:0
msgid "To"
-msgstr ""
+msgstr "Para"
#. module: crm
#: view:crm.case.rule:0
@@ -2680,7 +2687,7 @@ msgstr "%(case_user_email)s = Email del responsable"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_presale
msgid "Sales"
-msgstr ""
+msgstr "Ventas"
#. module: crm
#: view:crm.case:0
@@ -2691,12 +2698,12 @@ msgstr "General"
#. module: crm
#: model:crm.case.stage,name:crm.stage_lead2
msgid "Assigned"
-msgstr ""
+msgstr "Asignado"
#. module: crm
#: model:crm.case.stage,name:crm.stage_lead5
msgid "Recycled"
-msgstr ""
+msgstr "Reciclado"
#. module: crm
#: model:crm.case.categ,name:crm.categ_lead8
@@ -2722,7 +2729,7 @@ msgstr "Intervalo máx"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_category_act_oppor11
msgid "All Opportunities"
-msgstr ""
+msgstr "Todas las oportunidades"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -2756,7 +2763,7 @@ msgstr ""
#: code:addons/crm/wizard/crm_phonecall_wizard.py:0
#, python-format
msgid "A partner is already existing with the same name."
-msgstr ""
+msgstr "Ya existe una empresa con el mismo nombre."
#. module: crm
#: model:ir.model,name:crm.model_crm_phonecall
diff --git a/addons/crm/i18n/it.po b/addons/crm/i18n/it.po
index 9a00ef01bb0..00d2f7958e5 100644
--- a/addons/crm/i18n/it.po
+++ b/addons/crm/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-02-24 10:59+0000\n"
-"Last-Translator: Carlo Vettore \n"
+"PO-Revision-Date: 2010-05-21 06:51+0000\n"
+"Last-Translator: eLBati - albatos.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:02+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
@@ -2506,7 +2506,7 @@ msgstr ""
#. module: crm
#: model:crm.case.categ,name:crm.categ_meet1
msgid "Customer Meeting"
-msgstr "Riunione del cliente"
+msgstr "Riunione con il cliente"
#. module: crm
#: wizard_field:crm.new.send.mail,init,doc2:0
diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po
index 33979fe06f8..a0d430695ac 100644
--- a/addons/crm/i18n/pl.po
+++ b/addons/crm/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-05-12 20:13+0000\n"
+"PO-Revision-Date: 2010-05-21 17:59+0000\n"
"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \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-05-13 04:36+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
@@ -27,16 +27,13 @@ msgid ""
"This property defines the list of date/time exceptions for "
"arecurring calendar component."
msgstr ""
-"Ta cecha definiuje listę wyjątków daty/czasu dla powtarzanych elementów "
-"kalendarza."
#. module: crm
#: help:crm.case.rule,act_mail_to_user:0
msgid ""
"Check this if you want the rule to send an email to the responsible person."
msgstr ""
-"Zaznacz to jeżeli chcesz aby przez regułę został wysłany email do "
-"odpowiedzialnej osoby."
+"Zaznacz, jeśli chcesz aby reguła wysłała wiadomość do osoby odpowiedzialnej."
#. module: crm
#: view:crm.meeting:0
@@ -46,12 +43,12 @@ msgstr "Tytuł"
#. module: crm
#: model:ir.model,name:crm.model_report_crm_case_section_categ2
msgid "Cases by section and category2"
-msgstr ""
+msgstr "Sprawy wg sekcji i kategorii"
#. module: crm
#: wizard_field:crm.lead.partner_create,init,close:0
msgid "Close Lead"
-msgstr "Zamknij ślad"
+msgstr "Zamknij sygnał"
#. module: crm
#: view:crm.job:0
@@ -64,12 +61,12 @@ msgstr " 7 Dni "
#. module: crm
#: help:crm.menu.config_wizard,helpdesk:0
msgid "Manages an Helpdesk service."
-msgstr ""
+msgstr "Zarządza usługą Helpdesku."
#. module: crm
#: view:crm.job:0
msgid "Pending Jobs"
-msgstr "Zadania Oczekujące"
+msgstr "Wstrzymane prace"
#. module: crm
#: field:crm.case.rule,trg_state_to:0
@@ -84,12 +81,12 @@ msgstr "Planowane koszty"
#. module: crm
#: wizard_field:crm.job.partner_create,init,close:0
msgid "Close job request"
-msgstr "Żądanie zakończenia zadania."
+msgstr "Zamknij zgłoszenie pracy"
#. module: crm
#: field:crm.case.stage,name:0
msgid "Stage Name"
-msgstr ""
+msgstr "Nazwa etapu"
#. module: crm
#: view:crm.case:0
@@ -99,7 +96,7 @@ msgstr ""
#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
#: model:ir.ui.menu,name:crm.next_id_51
msgid "Cases"
-msgstr "Przypadki"
+msgstr "Sprawy"
#. module: crm
#: help:crm.segmentation,categ_id:0
@@ -118,7 +115,7 @@ msgstr "Zasoby ludzkie"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_categ2
msgid "Cases by Opportunities, Category and Type"
-msgstr ""
+msgstr "Sprawy wg szans, kategorii i typów"
#. module: crm
#: help:crm.menu.config_wizard,claims:0
@@ -126,24 +123,24 @@ msgid ""
"Manages the supplier and customers claims, including your corrective or "
"preventive actions."
msgstr ""
-"Zarządza skargami dostawców i klientów, wliczając twoje działania naprawcze "
-"i prewencyjne."
+"Zarządza reklamacjami dostawców i klientów, oraz twoimi działaniami "
+"naprawczymi i prewencyjnymi."
#. module: crm
#: view:crm.fundraising:0
msgid "Amount"
-msgstr "Ilość"
+msgstr "Kwota"
#. module: crm
#: model:process.transition,note:crm.process_transition_opportunitymeeting0
msgid "Normal or phone meeting for opportunity"
-msgstr ""
+msgstr "Spotkanie albo rozmowa telefoniczna w sprawie szansy"
#. module: crm
#: model:crm.case.stage,name:crm.stage_claim2
#: model:crm.case.stage,name:crm.stage_meet1
msgid "Fixed"
-msgstr ""
+msgstr "Naprawione"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -168,13 +165,13 @@ msgstr "Kampania"
#. module: crm
#: view:crm.opportunity:0
msgid "Search Opportunities"
-msgstr "Szukaj w Okazjach"
+msgstr "Szukaj szans"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm_case_section_stage_tree
#: view:report.crm.case.section.stage:0
msgid "Cases by Section and Stage"
-msgstr "Przypadki w Sekcjach i Etapach"
+msgstr "Sprawy wg sekcji i etapów"
#. module: crm
#: wizard_field:crm.job.meeting_set,init,duration:0
@@ -202,8 +199,8 @@ msgid ""
"Section to which Case belongs to. Define Responsible user and Email account "
"for mail gateway."
msgstr ""
-"Sekcja do której należy Przypadek. Zdefiniuj odpowiedzialnego użytkownika "
-"oraz konto Email dla bramy pocztowej."
+"Sekcja do której należy Sprawa. Zdefiniuj odpowiedzialnego użytkownika oraz "
+"konto Email dla bramy pocztowej."
#. module: crm
#: view:crm.case:0
@@ -232,7 +229,7 @@ msgstr "Partner"
#: field:crm.case.stage,section_id:0
#: model:ir.model,name:crm.model_crm_case_section
msgid "Case Section"
-msgstr ""
+msgstr "Sekcja sprawy"
#. module: crm
#: view:crm.job:0
@@ -242,7 +239,7 @@ msgstr "Proponowane wynagrodzenie"
#. module: crm
#: help:crm.case.section,sequence:0
msgid "Gives the sequence order when displaying a list of case sections."
-msgstr ""
+msgstr "Ustala kolejność wyświetlania listy sekcji spraw."
#. module: crm
#: code:addons/crm/wizard/crm_job_wizard.py:0
@@ -255,12 +252,12 @@ msgstr "Rozmowa telefoniczna"
#. module: crm
#: model:ir.model,name:crm.model_report_crm_case_section_stage
msgid "Cases by section and stage"
-msgstr ""
+msgstr "Sprawy wg sekcji i etapów"
#. module: crm
#: field:crm.case.rule,act_mail_to_email:0
msgid "Mail to these emails"
-msgstr ""
+msgstr "Wyślij wiadomości do tych adresów email."
#. module: crm
#: selection:crm.case.rule,trg_date_type:0
@@ -302,7 +299,7 @@ msgstr "Sekcje"
#: help:crm.menu.config_wizard,opportunity:0
msgid "Tracks identified business opportunities for your sales pipeline."
msgstr ""
-"Ścieżki zidentyfikowanych okazji biznesowych dla twoich kanałów sprzedaży."
+"Śledzi zidentyfikowane szanse biznesowe dla twoich kanałów sprzedaży."
#. module: crm
#: view:crm.meeting:0
@@ -317,7 +314,7 @@ msgstr "Data ostatniej akcji"
#. module: crm
#: view:crm.job:0
msgid "Appreciation"
-msgstr ""
+msgstr "Ocena"
#. module: crm
#: model:crm.case.stage,name:crm.stage_job3
@@ -339,7 +336,7 @@ msgstr "Kategorie"
#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
#, python-format
msgid "Warning!"
-msgstr ""
+msgstr "Uwaga!"
#. module: crm
#: view:crm.case:0
@@ -381,7 +378,7 @@ msgstr "Połączenie do istniejącego partnera"
#. module: crm
#: field:crm.case.rule,trg_date_range_type:0
msgid "Delay type"
-msgstr ""
+msgstr "Typ opóźnienia"
#. module: crm
#: view:crm.claim:0
@@ -401,7 +398,7 @@ msgstr "Następna rozmowa kwalifikacyjna"
#. module: crm
#: field:crm.case.rule,regex_history:0
msgid "Regular Expression on Case History"
-msgstr ""
+msgstr "Wyrażenie regularne dla historii sprawy"
#. module: crm
#: model:ir.model,name:crm.model_crm_email_add_cc
@@ -411,7 +408,7 @@ msgstr ""
#. module: crm
#: model:process.transition,name:crm.process_transition_opportunitymeeting0
msgid "Opportunity Meeting"
-msgstr ""
+msgstr "Spotkanie szansy"
#. module: crm
#: help:crm.case,canal_id:0
@@ -420,22 +417,24 @@ msgid ""
"customer. With each commercial opportunity, you can indicate the canall "
"which is this opportunity source."
msgstr ""
+"Kanały są różnymi, dostępnymi trybami komunikacji z klientem. Do każdej "
+"szansy możesz dowiązać kanał, który jest jej źródłem."
#. module: crm
#: view:crm.meeting:0
msgid "Exception Rules"
-msgstr ""
+msgstr "Reguły wyjątku"
#. module: crm
#: field:crm.menu.config_wizard,opportunity:0
#: model:ir.actions.report.xml,name:crm.crm_business_opportunities_report
msgid "Business Opportunities"
-msgstr ""
+msgstr "Szanse biznesowe"
#. module: crm
#: model:crm.case.stage,name:crm.stage_claim1
msgid "Accepted as Claim"
-msgstr ""
+msgstr "Zaakceptowano jako reklamację"
#. module: crm
#: view:crm.case.rule:0
@@ -443,6 +442,8 @@ msgid ""
"The rule use a AND operator. The case must match all non empty fields so "
"that the rule execute the action described in the 'Actions' tab."
msgstr ""
+"Reguła stosuje operator I. Sprawa musi pasować do wszystkich niepustych pól, "
+"aby została wykonana akcja zapisana w zakładce 'Akcje'."
#. module: crm
#: field:crm.case,history_line:0
@@ -492,7 +493,7 @@ msgstr "Kategoria"
#: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_stage_tree
#: view:report.crm.case.section.categ.stage:0
msgid "Cases by Section, Category and Stage"
-msgstr ""
+msgstr "Sprawy wg sekcji, kategorii i etapów"
#. module: crm
#: help:crm.case.rule,act_mail_to_watchers:0
@@ -524,7 +525,7 @@ msgstr "Informacja o akcji"
#. module: crm
#: view:crm.case.rule:0
msgid "%(case_user_phone)s = Responsible phone"
-msgstr ""
+msgstr "%(case_user_phone)s = Telefon odpowiedzialnego"
#. module: crm
#: constraint:ir.model:0
@@ -547,7 +548,7 @@ msgstr "Warunki"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_categ0-act_open
msgid "Open Cases"
-msgstr "Otwarte przypadki"
+msgstr "Otwarte sprawy"
#. module: crm
#: field:crm.case.log,name:0
@@ -564,7 +565,7 @@ msgstr "Stan"
#: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity
#: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity1
msgid "Create Opportunity"
-msgstr ""
+msgstr "Utwórz szansę"
#. module: crm
#: selection:report.crm.case.section.categ.categ2,month:0
@@ -589,7 +590,7 @@ msgstr "Drzewo spotkań"
#: view:crm.opportunity:0
#, python-format
msgid "Escalate"
-msgstr ""
+msgstr "Przekaż"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
@@ -605,7 +606,7 @@ msgstr "Zarządzanie relacjami z klientami i dostawcami"
#: view:crm.email.add.cc:0
#: model:ir.actions.act_window,name:crm.action_view_crm_email_add_cc_wizard
msgid "Add CC"
-msgstr ""
+msgstr "Dodaj DW"
#. module: crm
#: selection:report.crm.case.section.categ.categ2,month:0
@@ -618,12 +619,12 @@ msgstr "Czerwiec"
#. module: crm
#: field:crm.segmentation,som_interval_default:0
msgid "Default (0=None)"
-msgstr ""
+msgstr "Domyślne (0=Nic)"
#. module: crm
#: model:crm.case.stage,name:crm.stage_job7
msgid "Refused by Company"
-msgstr ""
+msgstr "Odrzucone przez firmę"
#. module: crm
#: field:crm.case,planned_revenue:0
@@ -646,22 +647,22 @@ msgstr "Październik"
#. module: crm
#: model:crm.case.stage,name:crm.stage_oppor3
msgid "Value Proposition"
-msgstr ""
+msgstr "Propozycja wartości"
#. module: crm
#: view:crm.case.rule:0
msgid "%(case_id)s = Case ID"
-msgstr ""
+msgstr "%(case_id)s = ID sprawy"
#. module: crm
#: model:crm.case.category2,name:crm.category_oppor2
msgid "New Business"
-msgstr ""
+msgstr "Nowy biznes"
#. module: crm
#: help:crm.case,email_from:0
msgid "These people will receive email."
-msgstr ""
+msgstr "Ci ludzie otrzymają wiadomość"
#. module: crm
#: help:crm.case.section,calendar:0
@@ -685,7 +686,7 @@ msgstr "Opis rozmowy telefonicznej"
#. module: crm
#: view:crm.case.categ:0
msgid "Case Category"
-msgstr "Kategoria przypadku"
+msgstr "Kategoria sprawy"
#. module: crm
#: help:crm.segmentation,som_interval_default:0
@@ -700,7 +701,7 @@ msgstr ""
#. module: crm
#: model:crm.case.categ,name:crm.categ_claim3
msgid "Policy Claims"
-msgstr ""
+msgstr "Reklamacja postępowania"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -710,6 +711,8 @@ msgstr ""
msgid ""
"You must define a responsible user for this case in order to use this action!"
msgstr ""
+"Musisz zdefiniować użytkownika odpowiedzialnego za sprawę, aby zastosować tę "
+"akcję!"
#. module: crm
#: view:crm.phonecall:0
@@ -724,7 +727,7 @@ msgstr "Zdarzenia partnera"
#. module: crm
#: model:crm.case.stage,name:crm.stage_job4
msgid "Contract Proposed"
-msgstr ""
+msgstr "Zaproponowano umowę"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm_case_job_req_main
@@ -737,7 +740,7 @@ msgstr "Praca - proces zatrudnienia"
#: view:crm.lead:0
#: view:crm.opportunity:0
msgid "Related Cases"
-msgstr ""
+msgstr "Sprawy powiązane"
#. module: crm
#: selection:report.crm.case.section.categ.categ2,month:0
@@ -760,7 +763,7 @@ msgstr "Historia komunikacji"
#. module: crm
#: view:crm.claim:0
msgid "New Claims"
-msgstr ""
+msgstr "Nowe reklamacje"
#. module: crm
#: view:crm.meeting:0
@@ -770,23 +773,23 @@ msgstr "Formularz spotkań"
#. module: crm
#: model:crm.case.stage,name:crm.stage_oppor5
msgid "Negotiation/Review"
-msgstr ""
+msgstr "Negocjacje/Przegląd"
#. module: crm
#: code:addons/crm/wizard/crm_phonecall_wizard.py:0
#, python-format
msgid "A partner is already defined on this phonecall."
-msgstr ""
+msgstr "Partner jest już zdefiniowany dla tej rozmowy."
#. module: crm
#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_stage
msgid "Cases by Opportunities and Stage"
-msgstr ""
+msgstr "Sprawy wg szans i etapów"
#. module: crm
#: view:crm.claim:0
msgid "Date of Claim"
-msgstr ""
+msgstr "Data reklamacji"
#. module: crm
#: view:crm.segmentation.line:0
@@ -796,18 +799,18 @@ msgstr "Pozycje segmentacji partnera"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
msgid "All Leads"
-msgstr ""
+msgstr "Wszystkie sygnały"
#. module: crm
#: view:crm.lead:0
msgid "Leads Form"
-msgstr ""
+msgstr "Formularz sygnałów"
#. module: crm
#: view:crm.segmentation:0
#: model:ir.model,name:crm.model_crm_segmentation
msgid "Partner Segmentation"
-msgstr ""
+msgstr "Segmentacja partnerów"
#. module: crm
#: model:crm.case.stage,name:crm.stage_job5
@@ -822,7 +825,7 @@ msgstr ""
#. module: crm
#: model:crm.case.category2,name:crm.category_oppor1
msgid "Existing Business"
-msgstr ""
+msgstr "Istniejący biznes"
#. module: crm
#: field:crm.case,probability:0
@@ -833,7 +836,7 @@ msgstr "Prawdopodobieństwo (%)"
#. module: crm
#: model:ir.model,name:crm.model_crm_lead
msgid "Leads Cases"
-msgstr ""
+msgstr "Sprawy - sygnały"
#. module: crm
#: help:crm.case.section,reply_to:0
@@ -841,12 +844,14 @@ msgid ""
"The email address put in the 'Reply-To' of all emails sent by Open ERP about "
"cases in this section"
msgstr ""
+"Adres umieszczony w 'Reply-To' ('Odpowiedz na adres') dla wszystkich "
+"wiadomości wysłanych przez OpenERP w sprawach z tej sekcji"
#. module: crm
#: view:crm.case.rule:0
#: model:ir.model,name:crm.model_crm_case_rule
msgid "Case Rule"
-msgstr ""
+msgstr "Reguła sprawy"
#. module: crm
#: code:addons/crm/crm_opportunity.py:0
@@ -858,7 +863,7 @@ msgstr ""
#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor
#, python-format
msgid "Opportunity"
-msgstr ""
+msgstr "Szansa"
#. module: crm
#: view:crm.case:0
@@ -868,7 +873,7 @@ msgstr ""
#: view:crm.lead:0
#: view:crm.opportunity:0
msgid "Emails"
-msgstr ""
+msgstr "Wiadomości e-mail"
#. module: crm
#: model:crm.case.category2,name:crm.category_lead7
@@ -883,18 +888,18 @@ msgstr "Zatrzymaj proces"
#. module: crm
#: model:crm.case.categ,name:crm.categ_claim1
msgid "Factual Claims"
-msgstr ""
+msgstr "Reklamacja rzeczowa"
#. module: crm
#: view:crm.phonecall:0
msgid "Search Phonecalls"
-msgstr ""
+msgstr "Przeszukaj rozmowy"
#. module: crm
#: wizard_button:crm.lead.opportunity_set,create_partner,create:0
#: wizard_button:crm.phonecall.opportunity_set,create_partner,create:0
msgid "Continue"
-msgstr ""
+msgstr "Dalej"
#. module: crm
#: field:crm.segmentation,som_interval:0
@@ -909,13 +914,13 @@ msgstr "Wartość"
#. module: crm
#: help:caldav.crm.export,init,name:0
msgid "Save in .ics format"
-msgstr ""
+msgstr "Zapisz w formacie .ics"
#. module: crm
#: wizard_field:crm.new.send.mail,init,text:0
#: wizard_field:crm.send.mail,init,text:0
msgid "Message"
-msgstr ""
+msgstr "Wiadomość"
#. module: crm
#: help:crm.segmentation,exclusif:0
@@ -924,6 +929,9 @@ msgid ""
"criterions. If checked, remove the category from partners that doesn't match "
"segmentation criterions"
msgstr ""
+"Zaznacz to, jeśli kategoria ma być ograniczona do partnerów odpowiadających "
+"kryteriom segmentacji. Jeśli zaznaczone, to usuń kategorię z partnerów, "
+"którzy nie odpowiadają kryteriom segmentacji."
#. module: crm
#: field:crm.segmentation,exclusif:0
@@ -961,7 +969,7 @@ msgstr ""
#. module: crm
#: view:crm.case.rule:0
msgid "Conditions on States"
-msgstr ""
+msgstr "Warunki stanów"
#. module: crm
#: field:crm.case.rule,trg_date_type:0
@@ -971,12 +979,12 @@ msgstr "Data wyzwolenia"
#. module: crm
#: view:crm.case.history:0
msgid "Search Histories"
-msgstr ""
+msgstr "Przeszukuj historie"
#. module: crm
#: help:crm.case.stage,sequence:0
msgid "Gives the sequence order when displaying a list of case stages."
-msgstr ""
+msgstr "Ustala kolejność wyświetlania listy etapów spraw."
#. module: crm
#: model:crm.case.section,name:crm.section_support3
@@ -984,7 +992,7 @@ msgstr ""
#: model:ir.ui.menu,name:crm.menu_crm_case_opp
#: model:process.node,name:crm.process_node_opportunities0
msgid "Opportunities"
-msgstr ""
+msgstr "Szanse"
#. module: crm
#: help:crm.segmentation,name:0
@@ -1010,7 +1018,7 @@ msgstr "Kwota zakupów"
#. module: crm
#: view:crm.phonecall:0
msgid "Direction"
-msgstr ""
+msgstr "Kierunek"
#. module: crm
#: help:crm.case,email_cc:0
@@ -1026,12 +1034,12 @@ msgstr ""
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "March"
-msgstr ""
+msgstr "Marzec"
#. module: crm
#: view:crm.case.rule:0
msgid "Server Action to be Triggered"
-msgstr ""
+msgstr "Akcja serwera do wykonania"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_rule-act
@@ -1043,18 +1051,18 @@ msgstr "Reguły"
#: wizard_view:crm.job.meeting_set,init:0
#: wizard_view:crm.phonecall.meeting_set,init:0
msgid "Plan Meeting"
-msgstr ""
+msgstr "Zaplanuj spotkanie"
#. module: crm
#: wizard_field:crm.new.send.mail,init,state:0
msgid "Set State to"
-msgstr ""
+msgstr "Ustaw stan na"
#. module: crm
#: code:addons/crm/wizard/wizard_crm_send_email.py:0
#, python-format
msgid "There is no mail to reply!"
-msgstr ""
+msgstr "Nie ma wiadomości do odpowiedzi"
#. module: crm
#: wizard_button:crm.job.partner_create,init,confirm:0
@@ -1064,7 +1072,7 @@ msgstr ""
#: model:ir.actions.wizard,name:crm.wizard_crm_lead_partner_create
#: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_partner_create
msgid "Create Partner"
-msgstr ""
+msgstr "Utwórz partnera"
#. module: crm
#: selection:crm.segmentation.line,expr_operator:0
@@ -1074,17 +1082,17 @@ msgstr ""
#. module: crm
#: view:crm.case.rule:0
msgid "%(case_description)s = Case description"
-msgstr ""
+msgstr "%(case_description)s = Opis sprawy"
#. module: crm
#: view:crm.fundraising:0
msgid "My Funds"
-msgstr ""
+msgstr "Moje fundusze"
#. module: crm
#: field:crm.case,partner_mobile:0
msgid "Mobile"
-msgstr ""
+msgstr "Tel. komórkowy"
#. module: crm
#: field:crm.case.rule,name:0
@@ -1100,27 +1108,27 @@ msgstr "Planowane koszty"
#. module: crm
#: model:ir.model,name:crm.model_crm_case_history
msgid "Case history"
-msgstr ""
+msgstr "Historia sprawy"
#. module: crm
#: model:crm.case.categ,name:crm.categ_job2
msgid "Junior Developer"
-msgstr ""
+msgstr "Młodszy inżynier"
#. module: crm
#: view:crm.meeting:0
msgid "My Meetings"
-msgstr ""
+msgstr "Moje spotkania"
#. module: crm
#: field:crm.case.categ,name:0
msgid "Case Category Name"
-msgstr ""
+msgstr "Nazwa kategorii sprawy"
#. module: crm
#: model:crm.case.category2,name:crm.category_claim2
msgid "Preventive"
-msgstr ""
+msgstr "Prewencyjnie"
#. module: crm
#: field:crm.case.rule,act_email_cc:0
@@ -1130,7 +1138,7 @@ msgstr "Dodaj obserwatorów (DW)"
#. module: crm
#: wizard_view:caldav.crm.export,init:0
msgid "Export ICS"
-msgstr ""
+msgstr "Eksportuj ICS"
#. module: crm
#: code:addons/crm/crm_claim.py:0
@@ -1140,13 +1148,14 @@ msgstr ""
#: code:addons/crm/crm_phonecall.py:0
#, python-format
msgid "You can not assign Closed Case."
-msgstr ""
+msgstr "Nie możesz przypisać do zamkniętej sprawy"
#. module: crm
#: help:crm.case.rule,act_remind_partner:0
msgid ""
"Check this if you want the rule to send a reminder by email to the partner."
msgstr ""
+"Zaznacz, jeśli chcesz aby reguła wysyłała przypomnienie mailem do partnera."
#. module: crm
#: code:addons/crm/crm_meeting.py:0
@@ -1156,12 +1165,12 @@ msgstr ""
#: view:crm.meeting:0
#, python-format
msgid "Meetings"
-msgstr ""
+msgstr "Spotkania"
#. module: crm
#: view:crm.case.rule:0
msgid "Conditions on Case Fields"
-msgstr ""
+msgstr "Warunki na pola sprawy"
#. module: crm
#: field:crm.case,date_action_next:0
@@ -1181,27 +1190,27 @@ msgstr "Ostateczny czas ukończenia"
#: wizard_button:caldav.crm.import,init,end:0
#: wizard_button:caldav.crm.subscribe,init,end:0
msgid "_Cancel"
-msgstr ""
+msgstr "_Anuluj"
#. module: crm
#: field:crm.case,category2_id:0
msgid "Category Name"
-msgstr ""
+msgstr "Nazwa kategorii"
#. module: crm
#: view:crm.segmentation:0
msgid "Partner Segmentations"
-msgstr ""
+msgstr "Segmentacja partnera"
#. module: crm
#: view:crm.meeting:0
msgid "Recurrency Rule"
-msgstr ""
+msgstr "Reguła rekurencyjna"
#. module: crm
#: model:ir.model,name:crm.model_crm_case_categ
msgid "Category of case"
-msgstr "Kategoria przypadku"
+msgstr "Kategoria sprawy"
#. module: crm
#: field:crm.email.add.cc,subject:0
@@ -1210,12 +1219,12 @@ msgstr "Kategoria przypadku"
#: view:crm.phonecall:0
#: wizard_field:crm.send.mail,init,subject:0
msgid "Subject"
-msgstr ""
+msgstr "Temat"
#. module: crm
#: field:crm.meeting,attendees:0
msgid "Attendees"
-msgstr ""
+msgstr "Uczestnicy"
#. module: crm
#: model:ir.module.module,description:crm.module_meta_information
@@ -1245,31 +1254,50 @@ msgid ""
"The CRM module has a email gateway for the synchronisation interface\n"
"between mails and Open ERP."
msgstr ""
+"Podstawowy moduł Zarządzania Relacjami z Klientami (CRM) Open ERP\n"
+"pozwala grupie ludzi inteligentnie i efektywnie zarządzać sygnałami, "
+"szansami,\n"
+"zadaniami, problemami, zgłoszeniami, błędami, reklamacjami, kampaniami itp.\n"
+"Moduł zarządza kluczowymi dziedzinami jak komunikacja, identyfikacja, \n"
+"priorytezacja, powiązania i powiadamianie.\n"
+"\n"
+"OpenERP zapewnia, że sprawy są skutecznie obsługiwane przez \n"
+"użytkowników, klientów i dostawców. System automatycznie wysyła \n"
+"przypomnienia, przekazuje odpowiedzialność, wysyła zgłoszenia, wyzwala\n"
+"specjalne metody i wykonuje inne akcje na podstawie twoich własnych reguł.\n"
+"\n"
+"Najważniejszą cechą systemu jest, że klient nie musi wykonywać żadnych \n"
+"specjalnych czynności. Wystarczy, że wyśle wiadomość do centrum zgłoszeń.\n"
+"OpenERP podziękuje za wiadomość, przekieruje ją do odpowiednich osób i \n"
+"zapewni, że cała przyszła korespondencja trafi w odpowiednie miejsce.\n"
+"\n"
+"Moduł CRM zawiera bramę korespondencyjną do łączenia OpenERP z \n"
+"systemem pocztowym."
#. module: crm
#: model:process.transition,note:crm.process_transition_leadpartner0
msgid "Prospect is converting to business partner"
-msgstr ""
+msgstr "Partner potencjalny jest konwertowany do partnera biznesowego."
#. module: crm
#: view:crm.case.rule:0
msgid "Regex on Case Name"
-msgstr ""
+msgstr "Wyrażenie regularne dla nazwy sprawy"
#. module: crm
#: view:crm.claim:0
msgid "Pending Claims"
-msgstr ""
+msgstr "Oczekujące reklamacje"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_stage
msgid "Cases by Opportunities, Category and Stage"
-msgstr ""
+msgstr "Sprawy wg szans, kategorii i etapów"
#. module: crm
#: model:crm.case.category2,name:crm.category_lead4
msgid "Print"
-msgstr ""
+msgstr "Drukuj"
#. module: crm
#: field:crm.case,som:0
@@ -1284,12 +1312,12 @@ msgstr "Stan emocji"
#: field:report.crm.case.section.categ.categ2,category2_id:0
#: field:report.crm.case.section.categ2,category2_id:0
msgid "Type"
-msgstr ""
+msgstr "Typ"
#. module: crm
#: view:crm.job:0
msgid "Candidate Refused"
-msgstr ""
+msgstr "Kandydat odrzucony"
#. module: crm
#: view:crm.segmentation:0
@@ -1299,7 +1327,7 @@ msgstr "Oblicz segmentację"
#. module: crm
#: view:crm.lead:0
msgid "Lead Email"
-msgstr ""
+msgstr "Email sygnału"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_segmentation-act
@@ -1319,7 +1347,7 @@ msgstr "Data utworzenia"
#: view:crm.phonecall:0
#: model:process.node,name:crm.process_node_meeting0
msgid "Meeting"
-msgstr ""
+msgstr "Spotkanie"
#. module: crm
#: view:crm.case.rule:0
@@ -1340,12 +1368,12 @@ msgstr "Przywróć do projektu"
#. module: crm
#: model:ir.model,name:crm.model_report_crm_case_section_categ_categ2
msgid "Cases by section, Category and Category2"
-msgstr ""
+msgstr "Sprawy wg sekcji, kategorii i kategorii2"
#. module: crm
#: model:crm.case.stage,name:crm.stage_oppor6
msgid "Closed Won"
-msgstr ""
+msgstr "Zamknięte z sukcesem"
#. module: crm
#: model:ir.actions.act_window,name:crm.act_crm_case_categ_crm_case_opened
@@ -1354,7 +1382,7 @@ msgstr ""
#: model:ir.actions.act_window,name:crm.act_res_partner_canal_2_crm_case_opened
#: model:ir.actions.act_window,name:crm.act_res_users_2_crm_case_opened
msgid "Open cases"
-msgstr "Otwarte praypadki"
+msgstr "Otwarte sprawy"
#. module: crm
#: field:crm.case,stage_id:0
@@ -1364,7 +1392,7 @@ msgstr "Otwarte praypadki"
#: field:report.crm.case.section.categ2,stage_id:0
#: field:report.crm.case.section.stage,stage_id:0
msgid "Stage"
-msgstr ""
+msgstr "Etap"
#. module: crm
#: constraint:ir.ui.view:0
@@ -1377,48 +1405,51 @@ msgid ""
"If the active field is set to true, it will allow you to hide the case "
"section without removing it."
msgstr ""
+"Jeśli pole aktywne jest ustawione na true (prawda), to będziesz mógł ukryć "
+"sekcję sprawy bez jej usuwania."
#. module: crm
#: model:crm.case.categ,name:crm.categ_fund2
msgid "Learning And Education"
-msgstr ""
+msgstr "Nauka i edukacja"
#. module: crm
#: wizard_view:crm.phonecall.opportunity_set,create_partner:0
#: wizard_view:crm.phonecall.partner_create,init:0
msgid "Are you sure you want to create a partner based on this phonecall ?"
msgstr ""
+"Jesteś pewien, że chcesz utworzyć partnera na podstawie tej rozmowy ?"
#. module: crm
#: view:crm.case.stage:0
#: model:ir.actions.act_window,name:crm.crm_case_stage_act
#: model:ir.ui.menu,name:crm.menu_crm_case_stage_act
msgid "Stages"
-msgstr ""
+msgstr "Etapy"
#. module: crm
#: wizard_field:crm.case.opportunity.partner_opportunity,init,planned_revenue:0
#: wizard_field:crm.lead.opportunity_set,opportunity,planned_revenue:0
#: wizard_field:crm.phonecall.opportunity_set,opportunity,planned_revenue:0
msgid "Expected Revenue"
-msgstr ""
+msgstr "Spodziewany dochód"
#. module: crm
#: view:crm.meeting:0
msgid "Meeting Date"
-msgstr ""
+msgstr "Data spotkania"
#. module: crm
#: view:crm.job:0
#: view:crm.lead:0
#: view:crm.phonecall:0
msgid "Convert to Partner"
-msgstr ""
+msgstr "Konwertuj do partnera"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_category_act_meetall3
msgid "Next Meetings"
-msgstr ""
+msgstr "Następne spotkania"
#. module: crm
#: field:crm.segmentation,partner_id:0
@@ -1429,32 +1460,32 @@ msgstr ""
#: code:addons/crm/crm.py:0
#, python-format
msgid "You can not delete this case. You should better cancel it."
-msgstr ""
+msgstr "Nie możesz usunąć tej sprawy. Powinieneś ją raczej anulować."
#. module: crm
#: wizard_button:caldav.crm.subscribe,init,open:0
msgid "_Subscribe"
-msgstr ""
+msgstr "_Subskrybuj"
#. module: crm
#: field:crm.case.rule,trg_priority_from:0
msgid "Minimum Priority"
-msgstr ""
+msgstr "Minimalny priorytet"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_meeting_generic_wizard_act
msgid "Meeting Generic Wizard"
-msgstr ""
+msgstr "Podstawowy kreator spotkań"
#. module: crm
#: model:crm.case.categ,name:crm.categ_claim2
msgid "Value Claims"
-msgstr ""
+msgstr "Reklamacje wartości"
#. module: crm
#: wizard_view:caldav.crm.subscribe,display:0
msgid "Message..."
-msgstr ""
+msgstr "Wiadomość..."
#. module: crm
#: model:ir.model,name:crm.model_crm_phonecall_assign_wizard
@@ -1464,19 +1495,19 @@ msgstr ""
#. module: crm
#: view:report.crm.case.section.categ2:0
msgid "Cases by Section and Category2"
-msgstr ""
+msgstr "Sprawy wg sekcji i kategorii2"
#. module: crm
#: code:addons/crm/crm.py:0
#, python-format
msgid "done"
-msgstr "wykonano"
+msgstr ""
#. module: crm
#: view:crm.meeting:0
#: view:crm.phonecall:0
msgid "Reminder"
-msgstr ""
+msgstr "Przypomnienie"
#. module: crm
#: help:crm.segmentation,sales_purchase_active:0
@@ -1484,28 +1515,30 @@ msgid ""
"Check if you want to use this tab as part of the segmentation rule. If not "
"checked, the criteria beneath will be ignored"
msgstr ""
+"Zaznacz, jeśli chcesz stosować tę zakładkę jako część reguły segmentacji. "
+"Jeśli nie zaznaczone, to kryteria poniżej zostaną zignorowane."
#. module: crm
#: code:addons/crm/crm.py:0
#, python-format
msgid "open"
-msgstr "otwarty"
+msgstr ""
#. module: crm
#: field:crm.case.rule,act_remind_attach:0
msgid "Remind with attachment"
-msgstr ""
+msgstr "Przpomnij z załącznikiem"
#. module: crm
#: model:crm.case.categ,name:crm.categ_lead6
#: model:crm.case.categ,name:crm.categ_oppor6
msgid "Website"
-msgstr ""
+msgstr "Strona WWW"
#. module: crm
#: field:crm.case.rule,act_remind_user:0
msgid "Remind responsible"
-msgstr ""
+msgstr "Przpomnij odpowiedzialnym"
#. module: crm
#: field:crm.segmentation,state:0
@@ -1518,23 +1551,25 @@ msgid ""
"Helps you to organise the jobs hiring process: evaluation, meetings, email "
"integration..."
msgstr ""
+"Pomaga organizować proces zatrudniania: ocena, spotkania, integracja "
+"wiadomości..."
#. module: crm
#: view:crm.fundraising:0
msgid "Funds"
-msgstr ""
+msgstr "Fundusze"
#. module: crm
#: code:addons/crm/crm.py:0
#, python-format
msgid "draft"
-msgstr "projekt"
+msgstr ""
#. module: crm
#: model:crm.case.stage,name:crm.stage_claim5
#: model:crm.case.stage,name:crm.stage_meet4
msgid "Awaiting Response"
-msgstr ""
+msgstr "Oczekuje na odpowiedź"
#. module: crm
#: field:crm.case,date:0
@@ -1548,23 +1583,23 @@ msgstr "Data"
#. module: crm
#: view:crm.job:0
msgid "Candidate Name"
-msgstr ""
+msgstr "Nazwisko kandydata"
#. module: crm
#: model:crm.case.categ,name:crm.categ_lead2
#: model:crm.case.categ,name:crm.categ_oppor2
msgid "Self Generated"
-msgstr ""
+msgstr "Samogenerowane"
#. module: crm
#: model:crm.case.stage,name:crm.stage_claim3
msgid "Won't fix"
-msgstr ""
+msgstr "Nie do naprawienia"
#. module: crm
#: model:crm.case.stage,name:crm.stage_lead4
msgid "Converted"
-msgstr ""
+msgstr "Skonwertowano"
#. module: crm
#: view:crm.case:0
@@ -1574,7 +1609,7 @@ msgstr ""
#: view:crm.lead:0
#: view:crm.opportunity:0
msgid "Reply to Last Email"
-msgstr ""
+msgstr "Odpowiedz na ostatnią wiadomość"
#. module: crm
#: view:crm.segmentation:0
@@ -1584,7 +1619,7 @@ msgstr "Opis segmentacji"
#. module: crm
#: help:crm.meeting,location:0
msgid "Gives Location of Meeting"
-msgstr ""
+msgstr "Ustala miejsce spotkania"
#. module: crm
#: view:crm.case:0
@@ -1599,17 +1634,17 @@ msgstr "Historia"
#. module: crm
#: model:ir.model,name:crm.model_crm_job
msgid "Job Cases"
-msgstr ""
+msgstr "Sprawy rekrutacji"
#. module: crm
#: view:crm.job:0
msgid "Jobs - Recruitment Tree"
-msgstr ""
+msgstr "Praca - Drzewo rekrutacji"
#. module: crm
#: field:crm.case.rule,regex_name:0
msgid "Regular Expression on Case Name"
-msgstr ""
+msgstr "Wyrażenie regularne dla nazwy sprawy"
#. module: crm
#: field:crm.case,state:0
@@ -1618,7 +1653,7 @@ msgstr ""
#: field:report.crm.case.section.categ2,state:0
#: field:report.crm.case.section.stage,state:0
msgid "State"
-msgstr ""
+msgstr "Stan"
#. module: crm
#: view:crm.case:0
@@ -1669,22 +1704,22 @@ msgstr "Anuluj"
#: code:addons/crm/crm.py:0
#, python-format
msgid "No E-Mail ID Found for your Company address!"
-msgstr ""
+msgstr "Brak ID email dla adresu twojej firmy !"
#. module: crm
#: view:crm.fundraising:0
msgid "Search Funds"
-msgstr ""
+msgstr "Przeszukaj fundusze"
#. module: crm
#: view:crm.claim:0
msgid "Type of claim"
-msgstr ""
+msgstr "Typ reklamacji"
#. module: crm
#: view:crm.case:0
msgid "Helpdesk Support Tree"
-msgstr ""
+msgstr "Drzewo wsparcia helpdesku"
#. module: crm
#: view:res.partner.events:0
@@ -1694,33 +1729,33 @@ msgstr "Ogólny opis"
#. module: crm
#: view:crm.meeting:0
msgid "Other Info"
-msgstr ""
+msgstr "Inne informacje"
#. module: crm
#: view:crm.claim:0
msgid "Claim Cost"
-msgstr ""
+msgstr "Koszt reklamacji"
#. module: crm
#: view:crm.job:0
#: view:crm.opportunity:0
msgid "Schedule a Phone Call"
-msgstr ""
+msgstr "Zaplanuj rozmowę"
#. module: crm
#: field:crm.case,ref:0
msgid "Reference"
-msgstr "Odnośnik"
+msgstr "Numer"
#. module: crm
#: field:crm.meeting,exrule:0
msgid "Exception Rule"
-msgstr ""
+msgstr "Reguła wyjątku"
#. module: crm
#: help:crm.case.rule,act_mail_to_partner:0
msgid "Check this if you want the rule to send an email to the partner."
-msgstr ""
+msgstr "Zaznacz to, jeśli chcesz aby reguła wysyłała wiadomość do partnera."
#. module: crm
#: model:crm.case.category2,name:crm.category_lead2
@@ -1735,22 +1770,22 @@ msgstr "Ustaw priorytet na"
#. module: crm
#: model:crm.case.stage,name:crm.stage_oppor2
msgid "Needs Analysis"
-msgstr ""
+msgstr "Wymaga analizy"
#. module: crm
#: view:crm.claim:0
msgid "Search Claims"
-msgstr ""
+msgstr "Przeszukaj reklamacje"
#. module: crm
#: field:crm.case.rule,act_mail_body:0
msgid "Mail body"
-msgstr ""
+msgstr "Treść wiadomości"
#. module: crm
#: help:crm.menu.config_wizard,meeting:0
msgid "Manages the calendar of meetings of the users."
-msgstr ""
+msgstr "Zarządza kalendarzem spotkań użytkownika"
#. module: crm
#: selection:crm.segmentation.line,expr_name:0
@@ -1765,7 +1800,7 @@ msgstr "Kwota sprzedaży"
#: view:crm.lead:0
#: view:crm.opportunity:0
msgid "Add a CC"
-msgstr ""
+msgstr "Dodaj DW"
#. module: crm
#: selection:crm.segmentation.line,expr_operator:0
@@ -1783,7 +1818,7 @@ msgstr "Nazwa"
#. module: crm
#: view:crm.opportunity:0
msgid "Sales Stage"
-msgstr ""
+msgstr "Etap sprzedaży"
#. module: crm
#: field:crm.meeting,alarm_id:0
@@ -1793,13 +1828,13 @@ msgstr ""
#. module: crm
#: field:crm.case.rule,act_mail_to_watchers:0
msgid "Mail to watchers (CC)"
-msgstr ""
+msgstr "Wiadomość dla obserwatorów (DW)"
#. module: crm
#: view:crm.fundraising:0
#: view:crm.meeting:0
msgid "Next Meeting"
-msgstr ""
+msgstr "Następne spotkanie"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -1808,21 +1843,23 @@ msgid ""
"No E-Mail ID Found for your Company address or missing reply address in "
"section!"
msgstr ""
+"Nie znaleziono ID email dla adresu twojej firmy lub brak adresu zwrotnego w "
+"sekcji!"
#. module: crm
#: help:crm.case.section,allow_unlink:0
msgid "Allows to delete non draft cases"
-msgstr "Pozwala usuwać przypadki inne niż projekty"
+msgstr "Pozwala usuwać sprawy inne niż w stanie projekt"
#. module: crm
#: model:crm.case.stage,name:crm.stage_oppor7
msgid "Closed Lost"
-msgstr ""
+msgstr "Zamknięte z porażką"
#. module: crm
#: field:crm.menu.config_wizard,bugs:0
msgid "Bug Tracking"
-msgstr ""
+msgstr "Obsługa błędów"
#. module: crm
#: view:crm.case:0
@@ -1846,12 +1883,12 @@ msgstr "Wysoki"
#. module: crm
#: model:process.node,note:crm.process_node_partner0
msgid "Convert to prospect to business partner"
-msgstr ""
+msgstr "Konwertuj potencjalnego do partnera biznesowego"
#. module: crm
#: view:crm.claim:0
msgid "In Progress Claims"
-msgstr ""
+msgstr "Reklamacje w toku"
#. module: crm
#: model:ir.actions.wizard,name:crm.wizard_crm_set_rrule
@@ -1861,22 +1898,22 @@ msgstr ""
#. module: crm
#: model:crm.case.stage,name:crm.stage_oppor4
msgid "Proposal/Price Quote"
-msgstr ""
+msgstr "Propozycja/Oferta ceny"
#. module: crm
#: view:crm.case.rule:0
msgid "Delay After Trigger Date:"
-msgstr ""
+msgstr "Opóźnienie po dacie wyzwolenia"
#. module: crm
#: model:crm.case.category2,name:crm.category_lead5
msgid "Web"
-msgstr ""
+msgstr "WWW"
#. module: crm
#: view:crm.lead:0
msgid "Campaign Type"
-msgstr ""
+msgstr "Typ kampanii"
#. module: crm
#: view:crm.segmentation:0
@@ -1888,7 +1925,7 @@ msgstr "Obliczanie stanu emocji"
#: code:addons/crm/wizard/wizard_crm_send_email.py:0
#, python-format
msgid "Error"
-msgstr ""
+msgstr "Błąd"
#. module: crm
#: model:ir.model,name:crm.model_crm_meeting_generic_wizard
@@ -1898,12 +1935,12 @@ msgstr ""
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_history-act
msgid "Histories"
-msgstr ""
+msgstr "Historie"
#. module: crm
#: model:crm.case.category2,name:crm.category_job1
msgid "Graduate"
-msgstr ""
+msgstr "Wykształcenie"
#. module: crm
#: wizard_view:crm.job.meeting_set,init:0
@@ -1912,11 +1949,12 @@ msgid ""
"Note that you can also use the calendar view to graphically schedule your "
"next meeting."
msgstr ""
+"Zauważ, że możesz stosować kalendarz do graficznego planowania spotkań."
#. module: crm
#: view:crm.lead:0
msgid "Leads Tree"
-msgstr ""
+msgstr "Drzewo sygnałów"
#. module: crm
#: field:crm.meeting,caldav_url:0
@@ -1926,13 +1964,13 @@ msgstr ""
#. module: crm
#: view:crm.meeting:0
msgid "Attendee"
-msgstr ""
+msgstr "Uczestnik"
#. module: crm
#: code:addons/crm/crm.py:0
#, python-format
msgid "Email Fail!"
-msgstr ""
+msgstr "Błąd wiadomości"
#. module: crm
#: model:crm.case.categ,name:crm.categ_phone1
@@ -1940,12 +1978,12 @@ msgstr ""
#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
#: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
msgid "Inbound"
-msgstr ""
+msgstr "Przychodzące"
#. module: crm
#: constraint:crm.case.section:0
msgid "Error ! You cannot create recursive sections."
-msgstr ""
+msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych sekcji."
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm
@@ -1958,6 +1996,8 @@ msgid ""
" Will allow you to synchronise your Open ERP calendars with your phone, "
"outlook, Sunbird, ical, ..."
msgstr ""
+" Pozwoli ci synchronizować kalendarze OpenERP z twoim telefonem, outlook, "
+"Sunbird, ical, ..."
#. module: crm
#: view:report.crm.case.section.categ.categ2:0
@@ -1965,7 +2005,7 @@ msgstr ""
#: view:report.crm.case.section.categ2:0
#: view:report.crm.case.section.stage:0
msgid "This Year"
-msgstr ""
+msgstr "Ten rok"
#. module: crm
#: field:crm.case.rule,act_remind_partner:0
@@ -1983,7 +2023,7 @@ msgstr "Najwyższy"
#. module: crm
#: view:crm.job:0
msgid "Contract Data"
-msgstr ""
+msgstr "Data umowy"
#. module: crm
#: selection:crm.case.rule,trg_date_range_type:0
@@ -1994,11 +2034,13 @@ msgstr "Dni"
#: help:crm.menu.config_wizard,bugs:0
msgid "Used by companies to track bugs and support requests on software"
msgstr ""
+"Stosowane przez firmy do śledzenia błędów i zgłoszeń do wsparcia dla "
+"oprogramowania"
#. module: crm
#: field:crm.menu.config_wizard,document_ics:0
msgid "Shared Calendar"
-msgstr ""
+msgstr "Współdzielony kalendarz"
#. module: crm
#: field:crm.case.section,reply_to:0
@@ -2008,7 +2050,7 @@ msgstr "Odpowiedz do"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ
msgid "Cases by Leads and Type"
-msgstr ""
+msgstr "Sprawy wg sygnałów i typów"
#. module: crm
#: selection:crm.case.rule,trg_date_range_type:0
@@ -2019,12 +2061,12 @@ msgstr "Minuty"
#: field:report.crm.case.section.categ2,amount_revenue:0
#: field:report.crm.case.section.stage,amount_revenue:0
msgid "Est.Revenue"
-msgstr ""
+msgstr "Szac. dochód"
#. module: crm
#: model:crm.case.stage,name:crm.stage_job1
msgid "Initial Jobs Demand"
-msgstr ""
+msgstr "Potrzeba stanowiska"
#. module: crm
#: field:crm.case.rule,trg_priority_to:0
@@ -2039,12 +2081,12 @@ msgstr ""
#. module: crm
#: view:crm.claim:0
msgid "Claims Info"
-msgstr ""
+msgstr "Informacja o reklamacji"
#. module: crm
#: field:crm.case.category2,name:0
msgid "Case Category2 Name"
-msgstr ""
+msgstr "Nazwa kategorii2 sprawy"
#. module: crm
#: wizard_view:crm.lead.opportunity_set,opportunity:0
@@ -2052,29 +2094,29 @@ msgstr ""
#: model:ir.actions.wizard,name:crm.wizard_crm_lead_opportunity_set
#: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_opportunity_set
msgid "Convert To Opportunity"
-msgstr ""
+msgstr "Konwertuj do szansy"
#. module: crm
#: model:crm.case.stage,name:crm.stage_phone2
#: view:crm.phonecall:0
msgid "Held"
-msgstr ""
+msgstr "Odebrane"
#. module: crm
#: view:crm.case:0
msgid "Helpdesk Supports"
-msgstr ""
+msgstr "Wsparcie helpdesk"
#. module: crm
#: model:crm.case.section,name:crm.section_support4
#: model:ir.ui.menu,name:crm.menu_crm_case_fund_raise
msgid "Fund Raising"
-msgstr ""
+msgstr "Zwiększenie funduszu"
#. module: crm
#: selection:crm.new.send.mail,init,state:0
msgid "Unchanged"
-msgstr ""
+msgstr "Niezmienione"
#. module: crm
#: wizard_view:crm.job.partner_create,init:0
@@ -2083,12 +2125,12 @@ msgstr ""
#: wizard_view:crm.phonecall.opportunity_set,create_partner:0
#: wizard_view:crm.phonecall.partner_create,init:0
msgid "Convert To Partner"
-msgstr ""
+msgstr "Konwertuj do partnera"
#. module: crm
#: field:crm.case.rule,trg_state_from:0
msgid "Case State"
-msgstr "Stan przypadku"
+msgstr "Stan sprawy"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -2109,17 +2151,17 @@ msgstr "Priorytet"
#. module: crm
#: view:crm.opportunity:0
msgid "Source"
-msgstr ""
+msgstr "Źródło"
#. module: crm
#: field:crm.meeting,location:0
msgid "Location"
-msgstr ""
+msgstr "Lokalizacja"
#. module: crm
#: view:crm.fundraising:0
msgid "Payment Mode"
-msgstr ""
+msgstr "Sposób zapłaty"
#. module: crm
#: help:crm.case.rule,trg_date_range:0
@@ -2134,17 +2176,17 @@ msgstr ""
#: view:crm.job:0
#: view:crm.lead:0
msgid "Stage: "
-msgstr ""
+msgstr "Etap: "
#. module: crm
#: view:crm.case.section:0
msgid "Case section"
-msgstr "Sekcja przypadku"
+msgstr "Sekcja sprawy"
#. module: crm
#: model:process.node,note:crm.process_node_meeting0
msgid "Schedule a normal or phone meeting"
-msgstr ""
+msgstr "Zaplanuj zwykłe spotkanie albo telefoniczne"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -2165,12 +2207,12 @@ msgstr "Pola do zmiany"
#. module: crm
#: model:crm.case.category2,name:crm.category_lead1
msgid "Telesales"
-msgstr ""
+msgstr "Telesprzedaż"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm_case_history-act_main
msgid "Cases Histories"
-msgstr "Historie przypadków"
+msgstr "Historie spraw"
#. module: crm
#: field:crm.case,create_date:0
@@ -2180,7 +2222,7 @@ msgstr "Utworzono"
#. module: crm
#: view:crm.lead:0
msgid "Lead Information"
-msgstr ""
+msgstr "Informacja sygnału"
#. module: crm
#: model:ir.model,name:crm.model_crm_segmentation_line
@@ -2192,7 +2234,7 @@ msgstr "Pozycja segmentacji"
#: wizard_field:crm.opportunity.reschedule_phone_call,init,deadline:0
#: view:crm.phonecall:0
msgid "Planned Date"
-msgstr ""
+msgstr "Planowana data"
#. module: crm
#: selection:crm.case.rule,trg_date_range_type:0
@@ -2205,16 +2247,17 @@ msgid ""
"Helps you to encode the result of a phone call or to plan a list of phone "
"calls to process."
msgstr ""
+"Pomaga wprowadzić rezultat rozmowy lub zaplanować rozmowy do wykonania."
#. module: crm
#: model:ir.actions.wizard,name:crm.wizard_crm_cal_import
msgid "Import ICS File"
-msgstr ""
+msgstr "Importuj plik ICS"
#. module: crm
#: view:crm.meeting:0
msgid "Attendee Detail"
-msgstr ""
+msgstr "Szczegóły uczestnika"
#. module: crm
#: model:crm.case.category2,name:crm.category_job3
@@ -2227,58 +2270,58 @@ msgstr ""
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "July"
-msgstr ""
+msgstr "Lipiec"
#. module: crm
#: model:crm.case.stage,name:crm.stage_oppor1
msgid "Prospecting"
-msgstr ""
+msgstr "Ocenianie"
#. module: crm
#: field:crm.case,partner_name2:0
msgid "Employee Email"
-msgstr ""
+msgstr "Email pracownika"
#. module: crm
#: model:ir.model,name:crm.model_crm_meeting
msgid "Meeting Cases"
-msgstr ""
+msgstr "Sprawy spotkań"
#. module: crm
#: view:crm.job:0
msgid "Job Info"
-msgstr ""
+msgstr "Informacja o stanowisko"
#. module: crm
#: view:crm.meeting:0
msgid "Cancel Meeting"
-msgstr ""
+msgstr "Anuluj spotkanie"
#. module: crm
#: model:crm.case.section,name:crm.section_support0
msgid "Jobs"
-msgstr ""
+msgstr "Stanowiska"
#. module: crm
#: view:crm.case.rule:0
msgid "%(case_date)s = Creation date"
-msgstr ""
+msgstr "%(case_date)s = Data utworzenia"
#. module: crm
#: model:crm.case.stage,name:crm.stage_phone3
#: view:crm.phonecall:0
msgid "Not Held"
-msgstr ""
+msgstr "Nie odebrane"
#. module: crm
#: field:crm.case.rule,act_mail_to_user:0
msgid "Mail to responsible"
-msgstr ""
+msgstr "Mail do odpowiedzialnych"
#. module: crm
#: view:crm.job:0
msgid "Jobs - Recruitment Form"
-msgstr ""
+msgstr "Praca - Formularz rekrutacji"
#. module: crm
#: model:crm.case.category2,name:crm.category_claim1
@@ -2288,12 +2331,12 @@ msgstr ""
#. module: crm
#: model:ir.model,name:crm.model_crm_opportunity
msgid "Opportunity Cases"
-msgstr ""
+msgstr "Sprawy szans"
#. module: crm
#: view:crm.case:0
msgid "Support Query"
-msgstr ""
+msgstr "Zapytanie o wsparcie"
#. module: crm
#: view:crm.case.rule:0
@@ -2306,7 +2349,7 @@ msgstr "Szablon emaila do wysłania"
#: field:report.crm.case.section.categ2,month:0
#: field:report.crm.case.section.stage,month:0
msgid "Month"
-msgstr ""
+msgstr "Miesiąc"
#. module: crm
#: model:crm.case.section,name:crm.section_support2
@@ -2316,23 +2359,23 @@ msgstr ""
#: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
#: model:process.node,name:crm.process_node_leads0
msgid "Leads"
-msgstr ""
+msgstr "Sygnały"
#. module: crm
#: wizard_button:crm.new.send.mail,init,send:0
#: wizard_button:crm.send.mail,init,send:0
msgid "Send Email"
-msgstr ""
+msgstr "Wyślij e-mail"
#. module: crm
#: wizard_view:crm.new.send.mail,init:0
msgid "Set case state to"
-msgstr ""
+msgstr "Ustaw stan sprawy na"
#. module: crm
#: model:crm.case.category2,name:crm.categ2_fund3
msgid "Credit Card"
-msgstr ""
+msgstr "Karta kredytowa"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -2345,7 +2388,7 @@ msgstr ""
#. module: crm
#: view:crm.job:0
msgid "Search Jobs"
-msgstr ""
+msgstr "Przeszukuj stanowiska"
#. module: crm
#: field:crm.case.history,log_id:0
@@ -2356,17 +2399,17 @@ msgstr "Log"
#: help:crm.menu.config_wizard,fund:0
msgid ""
"This may help associations in their fund raising process and tracking."
-msgstr ""
+msgstr "To może pomóc stowarzyszeniom w poszukiwaniu funduszy."
#. module: crm
#: view:crm.meeting:0
msgid "Reset to Unconfirmed"
-msgstr ""
+msgstr "Przywróć do niepotwierdzonych"
#. module: crm
#: view:crm.case:0
msgid "Helpdesk Support"
-msgstr ""
+msgstr "Wsparcie helpdesku"
#. module: crm
#: field:crm.case,email_cc:0
@@ -2384,7 +2427,7 @@ msgstr "Uwaga"
#: field:report.crm.case.section.categ2,delay_close:0
#: field:report.crm.case.section.stage,delay_close:0
msgid "Delay Close"
-msgstr ""
+msgstr "Zamknij opóźnienie"
#. module: crm
#: selection:crm.case,priority:0
@@ -2410,18 +2453,18 @@ msgstr "Zamknięty"
#. module: crm
#: view:crm.job:0
msgid "Candidate Name2"
-msgstr ""
+msgstr "Nazwa 2 kandydata"
#. module: crm
#: code:addons/crm/crm.py:0
#, python-format
msgid "cancel"
-msgstr "anuluj"
+msgstr ""
#. module: crm
#: model:crm.case.categ,name:crm.categ_meet2
msgid "Internal Meeting"
-msgstr ""
+msgstr "Spotkanie wewnętrzne"
#. module: crm
#: view:crm.case:0
@@ -2430,7 +2473,7 @@ msgstr ""
#: view:crm.lead:0
#: view:crm.opportunity:0
msgid "Events"
-msgstr ""
+msgstr "Wydarzenia"
#. module: crm
#: help:crm.menu.config_wizard,lead:0
@@ -2438,6 +2481,8 @@ msgid ""
"Allows you to track and manage leads which are pre-sales requests or "
"contacts, the very first contact with a customer request."
msgstr ""
+"Pozwala śledzić i zarządzać sygnałami, które są pytaniami sondażowymi lub "
+"przypadkowymi kontaktami."
#. module: crm
#: help:crm.case,som:0
@@ -2455,27 +2500,27 @@ msgstr ""
#. module: crm
#: model:crm.case.categ,name:crm.categ_meet1
msgid "Customer Meeting"
-msgstr ""
+msgstr "Spotkanie z klientem"
#. module: crm
#: wizard_field:crm.new.send.mail,init,doc2:0
msgid "Attachment2"
-msgstr ""
+msgstr "Załącznik2"
#. module: crm
#: wizard_field:crm.new.send.mail,init,doc3:0
msgid "Attachment3"
-msgstr ""
+msgstr "Załącznik3"
#. module: crm
#: view:crm.job:0
msgid "Degree"
-msgstr ""
+msgstr "Stopień"
#. module: crm
#: wizard_field:crm.new.send.mail,init,doc1:0
msgid "Attachment1"
-msgstr ""
+msgstr "Załącznik1"
#. module: crm
#: code:addons/crm/crm_phonecall.py:0
@@ -2486,7 +2531,7 @@ msgstr ""
#: model:ir.ui.menu,name:crm.menu_crm_case_phone
#, python-format
msgid "Phone Calls"
-msgstr ""
+msgstr "Rozmowy telefoniczne"
#. module: crm
#: help:crm.case,active:0
@@ -2494,6 +2539,8 @@ msgid ""
"If the active field is set to true, it will allow you to hide the case "
"without removing it."
msgstr ""
+"Jeśli aktywne pole jest ustawione na true (prawda), to będziesz mógł ukryć "
+"sprawę bez jej usuwania."
#. module: crm
#: model:ir.model,name:crm.model_crm_menu_config_wizard
@@ -2503,24 +2550,24 @@ msgstr ""
#. module: crm
#: view:crm.case.history:0
msgid "Case History"
-msgstr "Historia przypadku"
+msgstr "Historia sprawy"
#. module: crm
#: field:crm.case,partner_phone:0
msgid "Phone"
-msgstr ""
+msgstr "Telefon"
#. module: crm
#: model:crm.case.category2,name:crm.categ2_fund2
msgid "Cheque"
-msgstr ""
+msgstr "Czek"
#. module: crm
#: field:crm.case,active:0
#: field:crm.case.rule,active:0
#: field:crm.case.section,active:0
msgid "Active"
-msgstr "Aktywny"
+msgstr "Aktywne"
#. module: crm
#: help:crm.case.rule,act_remind_attach:0
@@ -2528,6 +2575,8 @@ msgid ""
"Check this if you want that all documents attached to the case be attached "
"to the reminder email sent."
msgstr ""
+"Zaznacz to, jeśli chcesz aby wszystkie dokumenty załączone do sprawy zostały "
+"dołączone do przypomnień."
#. module: crm
#: selection:crm.segmentation.line,operator:0
@@ -2542,12 +2591,12 @@ msgstr ""
#. module: crm
#: view:crm.job:0
msgid "Candidate Phone"
-msgstr ""
+msgstr "Telefon kandydata"
#. module: crm
#: model:ir.actions.wizard,name:crm.wizard_crm_send_mail
msgid "Send Mail"
-msgstr ""
+msgstr "Wyślij wiadomość"
#. module: crm
#: selection:crm.case.rule,trg_date_range_type:0
@@ -2564,23 +2613,25 @@ msgstr "Miesiące"
#: model:ir.actions.act_window,name:crm.action_crm_opportunity_assign_wizard
#: model:ir.actions.act_window,name:crm.action_crm_phonecall_assign_wizard
msgid "To Assign"
-msgstr ""
+msgstr "Do przypisania"
#. module: crm
#: code:addons/crm/wizard/wizard_cal_subscribe.py:0
#, python-format
msgid "Please provide Proper URL !"
-msgstr ""
+msgstr "Podaj poprawny URL !"
#. module: crm
#: model:process.node,note:crm.process_node_opportunities0
msgid "When a real project/opportunity is detected"
-msgstr ""
+msgstr "Kiedy rzeczywisty projekt/szansa została wykryta"
#. module: crm
#: wizard_view:crm.job.partner_create,init:0
msgid "Are you sure you want to create a partner based on this job request ?"
msgstr ""
+"Jesteś pewien, że chcesz utworzyć partnera na podstawie tego zgłoszenia do "
+"pracy ?"
#. module: crm
#: wizard_field:crm.lead.opportunity_set,create_partner,action:0
@@ -2597,7 +2648,7 @@ msgstr "Akcja"
#: model:ir.ui.menu,name:crm.menu_crm_case_claims
#, python-format
msgid "Claims"
-msgstr ""
+msgstr "Reklamacje"
#. module: crm
#: field:crm.segmentation,som_interval_decrease:0
@@ -2607,28 +2658,28 @@ msgstr ""
#. module: crm
#: model:ir.actions.wizard,name:crm.wizard_case_history_event
msgid "History of Events"
-msgstr ""
+msgstr "Historia wydarzeń"
#. module: crm
#: model:ir.model,name:crm.model_crm_case_category2
msgid "Category2 of case"
-msgstr ""
+msgstr "Kategoria2 sprawy"
#. module: crm
#: wizard_field:crm.new.send.mail,init,to:0
#: wizard_field:crm.send.mail,init,to:0
msgid "To"
-msgstr ""
+msgstr "Do"
#. module: crm
#: view:crm.case.rule:0
msgid "%(case_user_email)s = Responsible email"
-msgstr ""
+msgstr "%(case_user_email)s = email odpowiedzialnego"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_presale
msgid "Sales"
-msgstr ""
+msgstr "Sprzedaż"
#. module: crm
#: view:crm.case:0
@@ -2639,18 +2690,18 @@ msgstr "Ogólne"
#. module: crm
#: model:crm.case.stage,name:crm.stage_lead2
msgid "Assigned"
-msgstr ""
+msgstr "Przydzielony"
#. module: crm
#: model:crm.case.stage,name:crm.stage_lead5
msgid "Recycled"
-msgstr ""
+msgstr "Usunięty"
#. module: crm
#: model:crm.case.categ,name:crm.categ_lead8
#: model:crm.case.categ,name:crm.categ_oppor8
msgid "Other"
-msgstr ""
+msgstr "Inne"
#. module: crm
#: view:crm.case:0
@@ -2660,17 +2711,17 @@ msgstr ""
#: selection:crm.new.send.mail,init,state:0
#: view:crm.opportunity:0
msgid "Done"
-msgstr ""
+msgstr "Wykonano"
#. module: crm
#: field:crm.segmentation,som_interval_max:0
msgid "Max Interval"
-msgstr "Maks. interwału"
+msgstr "Maks. interwał"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_category_act_oppor11
msgid "All Opportunities"
-msgstr ""
+msgstr "Wszystkie sprawy"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -2704,17 +2755,17 @@ msgstr ""
#: code:addons/crm/wizard/crm_phonecall_wizard.py:0
#, python-format
msgid "A partner is already existing with the same name."
-msgstr ""
+msgstr "Istnieje już partner z tą samą nazwą"
#. module: crm
#: model:ir.model,name:crm.model_crm_phonecall
msgid "Phonecall Cases"
-msgstr ""
+msgstr "Sprawy telefoniczne"
#. module: crm
#: help:crm.case.rule,sequence:0
msgid "Gives the sequence order when displaying a list of case rules."
-msgstr ""
+msgstr "Ustala kolejność wyświetlania listy reguł spraw"
#. module: crm
#: field:crm.menu.config_wizard,helpdesk:0
@@ -2741,23 +2792,23 @@ msgstr "Odpowiedzialny"
#: model:crm.case.stage,name:crm.stage_claim4
#: model:crm.case.stage,name:crm.stage_meet3
msgid "Invalid"
-msgstr ""
+msgstr "Niepoprawny"
#. module: crm
#: wizard_button:crm.job.meeting_set,init,order:0
#: wizard_button:crm.phonecall.meeting_set,init,order:0
msgid "Set Meeting"
-msgstr ""
+msgstr "Ustal spotkanie"
#. module: crm
#: field:crm.menu.config_wizard,meeting:0
msgid "Calendar of Meetings"
-msgstr ""
+msgstr "Kalendarz spotkań"
#. module: crm
#: view:crm.case:0
msgid "Cases By Stage and Estimates"
-msgstr ""
+msgstr "Sprawy wg etapów i szacunków"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -2766,16 +2817,18 @@ msgid ""
"You can not escalate this case.\n"
"You are already at the top level."
msgstr ""
+"Nie możesz przekazać tej sprawy.\n"
+"Jesteś na najwyższym poziomie."
#. module: crm
#: view:crm.lead:0
msgid "Lead Name"
-msgstr ""
+msgstr "Nazwa sygnału"
#. module: crm
#: view:crm.claim:0
msgid "Claim/Action Description"
-msgstr ""
+msgstr "Reklamacja/Opis akcji"
#. module: crm
#: field:crm.case.rule,trg_max_history:0
@@ -2785,28 +2838,29 @@ msgstr ""
#. module: crm
#: view:crm.lead:0
msgid "Meeting For Leads Generation"
-msgstr ""
+msgstr "Spotkanie do generacji sygnałów"
#. module: crm
#: wizard_view:crm.lead.opportunity_set,create_partner:0
#: wizard_view:crm.lead.partner_create,init:0
msgid "Are you sure you want to create a partner based on this lead ?"
msgstr ""
+"Jesteś pewien, że chcesz utworzyć partnera na podstawie tego sygnału ?"
#. module: crm
#: model:crm.case.stage,name:crm.stage_job6
msgid "Refused by Employee"
-msgstr ""
+msgstr "Odmowa pracownika"
#. module: crm
#: field:crm.case,partner_name:0
msgid "Employee's Name"
-msgstr ""
+msgstr "Nazwisko pracownika"
#. module: crm
#: model:crm.case.stage,name:crm.stage_job2
msgid "First Interview"
-msgstr ""
+msgstr "Pierwsza rozmowa"
#. module: crm
#: view:report.crm.case.section.categ.categ2:0
@@ -2814,17 +2868,17 @@ msgstr ""
#: view:report.crm.case.section.categ2:0
#: view:report.crm.case.section.stage:0
msgid "This Month"
-msgstr ""
+msgstr "Bieżący miesiąc"
#. module: crm
#: view:crm.job:0
msgid "Availability (weeks)"
-msgstr ""
+msgstr "Dostępność (tygodnie)"
#. module: crm
#: view:crm.opportunity:0
msgid "Opportunities Tree"
-msgstr ""
+msgstr "Drzewo szans"
#. module: crm
#: help:crm.case,state:0
@@ -2837,16 +2891,23 @@ msgid ""
" \n"
"If the case needs to be reviewed then the state is set to 'Pending'."
msgstr ""
+"Stan jest ustawiony na 'Projekt', gdy sprawa jest tworzona. "
+" \n"
+"Jeśli sprawa jest w toku, to stan jest ustawiony na 'Otwarte'. "
+" \n"
+"Kiedy sprawa jest zakończona, stan jest 'Wykonano'. "
+" \n"
+"Jeśli sprawa wymaga interwencji, to stan jest 'Oczekiwanie'."
#. module: crm
#: view:crm.job:0
msgid "Open Jobs"
-msgstr ""
+msgstr "Otwarte stanowiska"
#. module: crm
#: selection:crm.email.add.cc,name:0
msgid "Email Address"
-msgstr ""
+msgstr "Adres email"
#. module: crm
#: help:crm.segmentation,som_interval_max:0
@@ -2854,52 +2915,54 @@ msgid ""
"The computation is made on all events that occured during this interval, the "
"past X periods."
msgstr ""
+"Obliczenia są wykonywane na wszystkich zdarzeniach, które wystąpiły w "
+"trakcie tego interwału, w ostatnich X okresach."
#. module: crm
#: field:crm.case,case_id:0
msgid "Related Case"
-msgstr ""
+msgstr "Sprawa związana"
#. module: crm
#: field:crm.case.rule,server_action_id:0
msgid "Server Action"
-msgstr ""
+msgstr "Akcja serwera"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_categ_claim0
msgid "All Claims"
-msgstr ""
+msgstr "Wszystkie reklamacje"
#. module: crm
#: field:crm.case.log,user_id:0
msgid "User Responsible"
-msgstr ""
+msgstr "Użytkownik odpowiedzialny"
#. module: crm
#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
#, python-format
msgid "Email not sent !"
-msgstr ""
+msgstr "Wiadomość nie wysłana !"
#. module: crm
#: wizard_field:crm.phonecall.partner_create,init,close:0
msgid "Close Phonecall"
-msgstr ""
+msgstr "Zamknij rozmowę"
#. module: crm
#: field:crm.case,email_last:0
msgid "Latest E-Mail"
-msgstr ""
+msgstr "Ostatni email"
#. module: crm
#: view:crm.case.rule:0
msgid "Regex on Communication History"
-msgstr ""
+msgstr "Wyrażenia reg. dla historii komunikacji"
#. module: crm
#: model:crm.case.category2,name:crm.categ2_fund4
msgid "Demand Draft"
-msgstr ""
+msgstr "Wymagaj projektu"
#. module: crm
#: field:crm.case,id:0
@@ -2909,18 +2972,18 @@ msgstr ""
#. module: crm
#: field:crm.case,log_ids:0
msgid "Logs History"
-msgstr ""
+msgstr "Zapisuje historię"
#. module: crm
#: wizard_field:crm.lead.opportunity_set,opportunity,name:0
#: wizard_field:crm.phonecall.opportunity_set,opportunity,name:0
msgid "Opportunity Summary"
-msgstr ""
+msgstr "Podsumowanie szans"
#. module: crm
#: view:crm.case:0
msgid "Search Case"
-msgstr ""
+msgstr "Przeszukaj sprawę"
#. module: crm
#: view:crm.segmentation:0
@@ -2930,13 +2993,13 @@ msgstr "Kontynuuj proces"
#. module: crm
#: view:crm.case.history:0
msgid "Case Description"
-msgstr "Opis przypadku"
+msgstr "Opis sprawy"
#. module: crm
#: wizard_field:crm.job.reschedule_phone_call,init,user_id:0
#: wizard_field:crm.opportunity.reschedule_phone_call,init,user_id:0
msgid "Assign To"
-msgstr ""
+msgstr "Przypisz do"
#. module: crm
#: field:crm.case,date_action_last:0
@@ -2946,38 +3009,38 @@ msgstr "Ostatnia akcja"
#. module: crm
#: field:crm.case,duration:0
msgid "Duration"
-msgstr ""
+msgstr "Czas trwania"
#. module: crm
#: model:ir.model,name:crm.model_report_crm_case_section_categ_stage
msgid "Cases by section, Category and stage"
-msgstr ""
+msgstr "Sprawy wg sekcji, kategorii i etapu"
#. module: crm
#: view:crm.job:0
msgid "Candidate Hired"
-msgstr ""
+msgstr "Kandydat zatrudniony"
#. module: crm
#: field:crm.menu.config_wizard,jobs:0
msgid "Jobs Hiring Process"
-msgstr ""
+msgstr "Proces zatrudniania"
#. module: crm
#: model:ir.ui.menu,name:crm.next_id_52
msgid "All Cases"
-msgstr "Wszystkie przypadki"
+msgstr "Wszystkie sprawy"
#. module: crm
#: code:addons/crm/wizard/crm_lead_wizard.py:0
#, python-format
msgid "A partner is already defined on this lead."
-msgstr ""
+msgstr "Na podstawie tego sygnału juz został utworzony partner."
#. module: crm
#: view:crm.lead:0
msgid "Lead Source"
-msgstr ""
+msgstr "Źródło sygnału"
#. module: crm
#: field:report.crm.case.section.categ.categ2,nbr:0
@@ -2985,7 +3048,7 @@ msgstr ""
#: field:report.crm.case.section.categ2,nbr:0
#: field:report.crm.case.section.stage,nbr:0
msgid "# of Cases"
-msgstr ""
+msgstr "# spraw"
#. module: crm
#: selection:crm.meeting,class:0
@@ -2995,7 +3058,7 @@ msgstr ""
#. module: crm
#: wizard_view:caldav.crm.subscribe,init:0
msgid "Provide path for Remote Calendar"
-msgstr ""
+msgstr "Wprowadź ścieżkę dla zdalnego kalendarza"
#. module: crm
#: view:crm.segmentation:0
@@ -3006,28 +3069,28 @@ msgstr "Segmentacja"
#. module: crm
#: view:crm.fundraising:0
msgid "Funds Form"
-msgstr ""
+msgstr "Formularz funduszy"
#. module: crm
#: view:crm.meeting:0
msgid "Search Meetings"
-msgstr ""
+msgstr "Przeszukuj spotkania"
#. module: crm
#: selection:crm.lead.opportunity_set,create_partner,action:0
#: selection:crm.phonecall.opportunity_set,create_partner,action:0
msgid "Create a new partner"
-msgstr ""
+msgstr "Utwórz nowego partnera"
#. module: crm
#: field:crm.case,company_id:0
msgid "Company"
-msgstr ""
+msgstr "Firma"
#. module: crm
#: model:crm.case.stage,name:crm.stage_lead3
msgid "In Process"
-msgstr ""
+msgstr "W toku"
#. module: crm
#: selection:crm.segmentation,state:0
@@ -3037,24 +3100,24 @@ msgstr "Uruchomione"
#. module: crm
#: view:crm.case.rule:0
msgid "%(case_user)s = Responsible name"
-msgstr ""
+msgstr "%(case_user)s = Nazwa odpowiedzialnego"
#. module: crm
#: wizard_field:crm.job.reschedule_phone_call,init,note:0
#: wizard_field:crm.opportunity.reschedule_phone_call,init,note:0
msgid "Goals"
-msgstr ""
+msgstr "Cele"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_tree
#: view:report.crm.case.section.categ2:0
msgid "Cases by Section and Type"
-msgstr ""
+msgstr "Sprawy wg sekcji i typu"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_aftersale
msgid "After-Sale Services"
-msgstr ""
+msgstr "Obsługa posprzedażna"
#. module: crm
#: wizard_button:caldav.crm.export,init,end:0
@@ -3067,12 +3130,12 @@ msgstr ""
#. module: crm
#: wizard_field:caldav.crm.export,init,name:0
msgid "File name"
-msgstr ""
+msgstr "Nazwa pliku"
#. module: crm
#: view:crm.lead:0
msgid "Search Leads"
-msgstr ""
+msgstr "Przeszukuj sygnały"
#. module: crm
#: help:crm.case.rule,active:0
@@ -3080,6 +3143,8 @@ msgid ""
"If the active field is set to true, it will allow you to hide the case rule "
"without removing it."
msgstr ""
+"Jeśli aktywne pole jest ustawione na true (prawda), to będziesz mógł ukryć "
+"regułę sprawy bez jej usuwania."
#. module: crm
#: code:addons/crm/crm.py:0
@@ -3097,7 +3162,7 @@ msgstr ""
#: model:ir.actions.act_window,name:crm.crm_case_categ0_act_job
#: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_job
msgid "All Jobs Requests"
-msgstr ""
+msgstr "Wszystkie zgłoszenia na stanowisko"
#. module: crm
#: selection:crm.case,state:0
@@ -3109,7 +3174,7 @@ msgstr ""
#: selection:report.crm.case.section.categ2,state:0
#: selection:report.crm.case.section.stage,state:0
msgid "Cancelled"
-msgstr ""
+msgstr "Anulowano"
#. module: crm
#: view:crm.job:0
@@ -3126,27 +3191,27 @@ msgstr ""
#. module: crm
#: view:crm.phonecall:0
msgid "Relevant"
-msgstr ""
+msgstr "Odpowiedni"
#. module: crm
#: wizard_field:crm.case.opportunity.partner_opportunity,init,name:0
msgid "Opportunity Name"
-msgstr ""
+msgstr "Nazwa szansy"
#. module: crm
#: field:crm.meeting,rrule:0
msgid "Recurrent Rule"
-msgstr ""
+msgstr "Reguła rekurencyjna"
#. module: crm
#: wizard_view:caldav.crm.import,init:0
msgid "Import ICS"
-msgstr ""
+msgstr "Importuj ICS"
#. module: crm
#: view:crm.phonecall:0
msgid "Call Summary"
-msgstr ""
+msgstr "Podsumowanie rozmowy"
#. module: crm
#: field:crm.segmentation.line,expr_operator:0
@@ -3156,17 +3221,17 @@ msgstr "Operator"
#. module: crm
#: model:ir.model,name:crm.model_crm_case_log
msgid "Case Communication History"
-msgstr "Historia komunikacji przypadku"
+msgstr "Historia komunikacji sprawy"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ
msgid "Cases by Opportunities and Type"
-msgstr ""
+msgstr "Sprawy wg szans i typów"
#. module: crm
#: view:crm.case.rule:0
msgid "%(case_subject)s = Case subject"
-msgstr ""
+msgstr "%(case_subject)s = Temat sprawy"
#. module: crm
#: field:crm.case,section_id:0
@@ -3200,12 +3265,12 @@ msgstr ""
#: code:addons/crm/wizard/crm_job_wizard.py:0
#, python-format
msgid "A partner is already defined on this job request."
-msgstr ""
+msgstr "Dla tego zgłoszenia do pracy partner jest juz zdefiniowany."
#. module: crm
#: model:crm.case.stage,name:crm.stage_lead1
msgid "New"
-msgstr ""
+msgstr "Nowe"
#. module: crm
#: field:crm.case,description:0
@@ -3234,37 +3299,37 @@ msgstr ""
#. module: crm
#: model:ir.model,name:crm.model_crm_claim
msgid "Claim Cases"
-msgstr ""
+msgstr "Sprawy reklamacji"
#. module: crm
#: view:crm.case.rule:0
msgid "E-Mail Reminders (includes the content of the case)"
-msgstr ""
+msgstr "Przypomnienie email (zawiera sprawę)"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_stage
msgid "Cases by Leads and Stage"
-msgstr ""
+msgstr "Sprawy wg sygnałów i etapów"
#. module: crm
#: field:crm.meeting,exdate:0
msgid "Exception Date/Times"
-msgstr ""
+msgstr "Daty/Czasy wyjątków"
#. module: crm
#: view:crm.meeting.generic_wizard:0
msgid "Generic Wizard"
-msgstr ""
+msgstr "Podstawowy kreator"
#. module: crm
#: model:process.transition,note:crm.process_transition_leadopportunity0
msgid "Creating business opportunities from Leads"
-msgstr ""
+msgstr "Tworzenie szansy z sygnału"
#. module: crm
#: model:ir.ui.menu,name:crm.next_id_64
msgid "Reporting"
-msgstr ""
+msgstr "Raportowanie"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -3285,17 +3350,17 @@ msgstr ""
#: selection:report.crm.case.section.stage,state:0
#, python-format
msgid "Pending"
-msgstr "Oczekuje"
+msgstr "Oczekiwanie"
#. module: crm
#: model:process.transition,name:crm.process_transition_leadopportunity0
msgid "Prospect Opportunity"
-msgstr ""
+msgstr "Potencjalna szansa"
#. module: crm
#: view:crm.job:0
msgid "Expected Salary"
-msgstr ""
+msgstr "Oczekiwane wynagrodzenie"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm_configuration
@@ -3305,64 +3370,64 @@ msgstr "Konfiguracja"
#. module: crm
#: model:ir.actions.wizard,name:crm.wizard_crm_new_send_mail
msgid "Send New Mail"
-msgstr ""
+msgstr "Wyślij nową wiadomość"
#. module: crm
#: constraint:ir.cron:0
msgid "Invalid arguments"
-msgstr ""
+msgstr "Niepoprawne argumenty"
#. module: crm
#: field:crm.meeting,transparent:0
msgid "Trensparent"
-msgstr ""
+msgstr "Przezroczysty"
#. module: crm
#: view:crm.case:0
msgid "My Cases"
-msgstr ""
+msgstr "Moje sprawy"
#. module: crm
#: model:crm.case.categ,name:crm.categ_lead7
#: model:crm.case.categ,name:crm.categ_oppor7
msgid "Word of mouth"
-msgstr ""
+msgstr "Ustna wiadomość"
#. module: crm
#: view:crm.lead:0
msgid "Lead Subject"
-msgstr ""
+msgstr "Temat sygnału"
#. module: crm
#: view:crm.lead:0
#: view:crm.phonecall:0
msgid "Convert to Opportunity"
-msgstr ""
+msgstr "Konwertuj do szansy"
#. module: crm
#: model:crm.case.stage,name:crm.stage_phone1
msgid "Planned"
-msgstr ""
+msgstr "Planowane"
#. module: crm
#: model:crm.case.category2,name:crm.category_meet3
msgid "Customer Office"
-msgstr ""
+msgstr "Biuro klienta"
#. module: crm
#: view:crm.job:0
msgid "Candidate Email"
-msgstr ""
+msgstr "Email kandydata"
#. module: crm
#: view:crm.opportunity:0
msgid "Sales Stage: "
-msgstr ""
+msgstr "Etap sprzedaży: "
#. module: crm
#: view:crm.claim:0
msgid "Type of Action"
-msgstr ""
+msgstr "Typ akcji"
#. module: crm
#: field:crm.case.rule,act_user_id:0
@@ -3372,7 +3437,7 @@ msgstr "Ustaw odpowiedzialnego na"
#. module: crm
#: view:crm.job:0
msgid "Meeting With Candidates"
-msgstr ""
+msgstr "Spotkanie z kandydatami"
#. module: crm
#: help:crm.segmentation,som_interval:0
@@ -3383,6 +3448,11 @@ msgid ""
"has decreased because he probably bought goods to another supplier. Use this "
"functionality for recurring businesses."
msgstr ""
+"Okres jest średnią (w dniach) pomiędzy dwiema sprzedażami lub dwoma zakupami "
+"dla tej segmentacji. To jest stosowane głównie do wykrycia, czy partner nie "
+"kupował u nas zbyt długo, co może oznaczać, że jego stan emocji obniżył się, "
+"ponieważ prawdopodobnie dokonał zakupów u innego dostawcy. Stosuj te "
+"funkcjonalność do biznesów powtarzalnych."
#. module: crm
#: selection:report.crm.case.section.categ.categ2,month:0
@@ -3390,27 +3460,27 @@ msgstr ""
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "December"
-msgstr ""
+msgstr "Grudzień"
#. module: crm
#: view:report.crm.case.section.categ.categ2:0
msgid "Search Cases by User"
-msgstr ""
+msgstr "Przeszukuj sprawy wg użytkownika"
#. module: crm
#: view:crm.case.rule:0
msgid "Condition on Communication History"
-msgstr ""
+msgstr "Warunki dla historii komunikacji"
#. module: crm
#: field:crm.case.rule,act_mail_to_partner:0
msgid "Mail to partner"
-msgstr ""
+msgstr "Mail do partnera"
#. module: crm
#: view:crm.fundraising:0
msgid "Funds Tree"
-msgstr ""
+msgstr "Drzewo funduszy"
#. module: crm
#: field:crm.case.rule,act_method:0
@@ -3420,7 +3490,7 @@ msgstr ""
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_category_act_fund_all1
msgid "All Funds"
-msgstr ""
+msgstr "Wszystkie fundusze"
#. module: crm
#: field:crm.case.section,calendar:0
@@ -3432,7 +3502,7 @@ msgstr "Kalendarz"
#. module: crm
#: model:crm.case.categ,name:crm.categ_job1
msgid "Salesman"
-msgstr ""
+msgstr "Sprzedawca"
#. module: crm
#: model:crm.case.section,name:crm.section_support_help
@@ -3454,12 +3524,12 @@ msgstr ""
#: model:ir.actions.wizard,name:crm.wizard_crm_job_meeting_set
#: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_meeting_set
msgid "Schedule Meeting"
-msgstr ""
+msgstr "Zaplanuj spotkanie"
#. module: crm
#: model:crm.case.categ,name:crm.categ_fund4
msgid "Arts And Culture"
-msgstr ""
+msgstr "Kultura i sztuka"
#. module: crm
#: model:crm.case.categ,name:crm.categ_phone2
@@ -3467,18 +3537,18 @@ msgstr ""
#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
#: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
msgid "Outbound"
-msgstr ""
+msgstr "Ruch wychodzący"
#. module: crm
#: code:addons/crm/crm.py:0
#, python-format
msgid "Historize"
-msgstr ""
+msgstr "Zapisz do historii"
#. module: crm
#: view:crm.meeting:0
msgid "Confirmed"
-msgstr ""
+msgstr "Potwierdzone"
#. module: crm
#: selection:crm.segmentation,state:0
@@ -3490,7 +3560,7 @@ msgstr "Nie uruchomiony"
#: wizard_field:crm.lead.opportunity_set,opportunity,probability:0
#: wizard_field:crm.phonecall.opportunity_set,opportunity,probability:0
msgid "Success Probability"
-msgstr ""
+msgstr "Prawdopodobieństwo sukcesu"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -3510,12 +3580,12 @@ msgstr "Projekt"
#. module: crm
#: field:crm.case.rule,trg_date_range:0
msgid "Delay after trigger date"
-msgstr ""
+msgstr "Opóźnienie po dacie wyzwolenia"
#. module: crm
#: view:crm.lead:0
msgid "Lead Details"
-msgstr ""
+msgstr "Szczegóły sygnału"
#. module: crm
#: field:crm.case.rule,act_section_id:0
@@ -3536,7 +3606,7 @@ msgstr "Normalny"
#: code:addons/crm/wizard/wizard_crm_send_email.py:0
#, python-format
msgid "You must put a Partner eMail to use this action!"
-msgstr ""
+msgstr "Musisz podac email pertnera, aby zastosować tę akcję!"
#. module: crm
#: wizard_view:crm.job.partner_create,init:0
@@ -3545,17 +3615,17 @@ msgstr ""
#: wizard_view:crm.phonecall.opportunity_set,create_partner:0
#: wizard_view:crm.phonecall.partner_create,init:0
msgid "You may have to verify that this partner does not exist already."
-msgstr ""
+msgstr "Powinieneś sprawdzić, czy ten partner już istnieje."
#. module: crm
#: view:crm.job:0
msgid "Qualication"
-msgstr ""
+msgstr "Kwalifikacje"
#. module: crm
#: view:crm.meeting:0
msgid "Change RRule"
-msgstr ""
+msgstr "Zmień regułę"
#. module: crm
#: selection:crm.email.add.cc,name:0
@@ -3565,14 +3635,14 @@ msgstr ""
#: field:report.crm.case.section.categ2,user_id:0
#: field:report.crm.case.section.stage,user_id:0
msgid "User"
-msgstr ""
+msgstr "Użytkownik"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ_categ2
#: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_categ2_tree
#: view:report.crm.case.section.categ.categ2:0
msgid "Cases by Section, Category and Type"
-msgstr ""
+msgstr "Sprawy wg sekcji, kategorii i typu"
#. module: crm
#: selection:report.crm.case.section.categ.categ2,month:0
@@ -3580,7 +3650,7 @@ msgstr ""
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "November"
-msgstr ""
+msgstr "Listopad"
#. module: crm
#: model:crm.case.category2,name:crm.category_job2
@@ -3601,14 +3671,14 @@ msgstr "Sekcja nadrzędna"
#: model:ir.actions.wizard,name:crm.wizard_crm_job_reschedule_phone_call
#: model:ir.actions.wizard,name:crm.wizard_crm_opportunity_reschedule_phone_call
msgid "Schedule Phone Call"
-msgstr ""
+msgstr "Zaplanuj rozmowę telefoniczną"
#. module: crm
#: code:addons/crm/crm.py:0
#, python-format
msgid ""
"Can not send mail with empty body,you should have description in the body"
-msgstr ""
+msgstr "Nie można wysłać wiadomości z pustą treścią."
#. module: crm
#: selection:report.crm.case.section.categ.categ2,month:0
@@ -3616,12 +3686,12 @@ msgstr ""
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "January"
-msgstr ""
+msgstr "Styczeń"
#. module: crm
#: model:process.process,name:crm.process_process_contractprocess0
msgid "Contract"
-msgstr ""
+msgstr "Umowa"
#. module: crm
#: field:crm.case.section,child_ids:0
@@ -3636,7 +3706,7 @@ msgstr "Planowany dochód"
#. module: crm
#: model:crm.case.categ,name:crm.categ_fund3
msgid "Healthcare"
-msgstr ""
+msgstr "Służba zdrowia"
#. module: crm
#: view:crm.case:0
@@ -3650,7 +3720,7 @@ msgstr ""
#: view:crm.phonecall:0
#: view:crm.phonecall.assign_wizard:0
msgid "Assign"
-msgstr ""
+msgstr "Przydziel"
#. module: crm
#: field:crm.case,partner_address_id:0
@@ -3660,17 +3730,17 @@ msgstr "Kontakt do partnera"
#. module: crm
#: model:crm.case.category2,name:crm.category_meet1
msgid "Office"
-msgstr ""
+msgstr "Biuro"
#. module: crm
#: model:ir.model,name:crm.model_crm_fundraising
msgid "Fund Raising Cases"
-msgstr ""
+msgstr "Sprawy podwyższania funduszy"
#. module: crm
#: model:ir.model,name:crm.model_crm_case_stage
msgid "Stage of case"
-msgstr ""
+msgstr "Etap sprawy"
#. module: crm
#: view:crm.case:0
@@ -3699,49 +3769,49 @@ msgstr ""
#. module: crm
#: view:crm.case.rule:0
msgid "Conditions on Case Partner"
-msgstr ""
+msgstr "Warunki na partnera sprawy"
#. module: crm
#: field:crm.case.section,code:0
msgid "Section Code"
-msgstr ""
+msgstr "Kod sekcji"
#. module: crm
#: wizard_field:crm.job.meeting_set,init,date:0
#: wizard_field:crm.phonecall.meeting_set,init,date:0
msgid "Meeting date"
-msgstr ""
+msgstr "Data spotkania"
#. module: crm
#: selection:crm.meeting,class:0
msgid "CONFIDENTIAL"
-msgstr ""
+msgstr "POUFNE"
#. module: crm
#: help:crm.case.rule,act_mail_body:0
msgid "Content of mail"
-msgstr ""
+msgstr "Treść wiaodmości"
#. module: crm
#: model:crm.case.stage,name:crm.stage_meet2
msgid "Not fixed"
-msgstr ""
+msgstr "Nie ustalone"
#. module: crm
#: model:crm.case.categ,name:crm.categ_lead3
#: model:crm.case.categ,name:crm.categ_oppor3
msgid "Employee"
-msgstr ""
+msgstr "Pracownik"
#. module: crm
#: field:crm.case,email_from:0
msgid "Partner Email"
-msgstr ""
+msgstr "Email partnera"
#. module: crm
#: view:crm.case.rule:0
msgid "% = The '%' Character"
-msgstr ""
+msgstr "% = Znak '%'"
#. module: crm
#: view:crm.case:0
@@ -3762,18 +3832,20 @@ msgstr "Opis"
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "May"
-msgstr ""
+msgstr "Maj"
#. module: crm
#: view:crm.job:0
msgid "Internal Notes"
-msgstr ""
+msgstr "Wiadomości wewnętrzne"
#. module: crm
#: help:crm.case.rule,act_remind_user:0
msgid ""
"Check this if you want the rule to send a reminder by email to the user."
msgstr ""
+"Zaznacz to, jeśli chcesz aby reguła wysłała przypomnienie mailem do "
+"użytkownika."
#. module: crm
#: view:crm.case:0
@@ -3785,7 +3857,7 @@ msgstr ""
#: view:crm.opportunity:0
#: wizard_field:crm.send.mail,init,cc:0
msgid "CC"
-msgstr ""
+msgstr "DW"
#. module: crm
#: field:crm.segmentation.line,operator:0
@@ -3795,7 +3867,7 @@ msgstr "Obowiązkowe / Opcjonalne"
#. module: crm
#: wizard_button:caldav.crm.import,init,open:0
msgid "_Import"
-msgstr ""
+msgstr "_Importuj"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -3812,7 +3884,7 @@ msgstr ""
#: model:res.request.link,name:crm.req_link_case
#, python-format
msgid "Case"
-msgstr "Przypadek"
+msgstr "Sprawa"
#. module: crm
#: selection:crm.case,priority:0
@@ -3828,19 +3900,19 @@ msgstr "Najniższy"
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "February"
-msgstr ""
+msgstr "Luty"
#. module: crm
#: view:crm.phonecall:0
#: model:ir.actions.act_window,name:crm.crm_case_categ_meet_case
#: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
msgid "Schedule a Meeting"
-msgstr ""
+msgstr "Zaplanuj spotkanie"
#. module: crm
#: view:crm.case.rule:0
msgid "Conditions on Priority Range"
-msgstr ""
+msgstr "Warunki na zakres priorytetu"
#. module: crm
#: help:crm.segmentation,som_interval_decrease:0
@@ -3848,17 +3920,19 @@ msgid ""
"If the partner has not purchased (or buied) during a period, decrease the "
"state of mind by this factor. It's a multiplication"
msgstr ""
+"Jeśli partner nie zakupił nic przez ten okres, to zmniejsz jego stan emocji "
+"o ten współczynnik. To jest dzielenie."
#. module: crm
#: wizard_view:crm.new.send.mail,init:0
#: wizard_view:crm.send.mail,init:0
msgid "Mass Mailing"
-msgstr ""
+msgstr "Poczta masowa"
#. module: crm
#: view:crm.case.rule:0
msgid "E-Mail Actions"
-msgstr ""
+msgstr "Akcje email"
#. module: crm
#: field:report.crm.case.section.categ.categ2,name:0
@@ -3866,22 +3940,22 @@ msgstr ""
#: field:report.crm.case.section.categ2,name:0
#: field:report.crm.case.section.stage,name:0
msgid "Year"
-msgstr ""
+msgstr "Rok"
#. module: crm
#: model:crm.case.category2,name:crm.categ2_fund1
msgid "Cash"
-msgstr ""
+msgstr "Gotówka"
#. module: crm
#: view:crm.fundraising:0
msgid "Funds by Categories"
-msgstr ""
+msgstr "Fundusze wg kategorii"
#. module: crm
#: model:process.node,note:crm.process_node_leads0
msgid "Very first contact with new prospect"
-msgstr ""
+msgstr "Pierwszy kontakt z tą okazją"
#. module: crm
#: selection:report.crm.case.section.categ.categ2,month:0
@@ -3889,42 +3963,42 @@ msgstr ""
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "April"
-msgstr ""
+msgstr "Kwiecień"
#. module: crm
#: model:crm.case.stage,name:crm.stage_meet5
msgid "Future"
-msgstr ""
+msgstr "Przyszłe"
#. module: crm
#: wizard_field:caldav.crm.export,init,file_path:0
msgid "Save ICS file"
-msgstr ""
+msgstr "Zapisz plik ICS"
#. module: crm
#: wizard_field:caldav.crm.subscribe,init,url_path:0
msgid "Provide path for remote calendar"
-msgstr ""
+msgstr "Wprowadź ścieżkę dla zdalnego kalendarza"
#. module: crm
#: view:crm.case.log:0
msgid "Case logs"
-msgstr ""
+msgstr "Log sprawy"
#. module: crm
#: view:crm.case.rule:0
msgid "Conditions on Timing"
-msgstr ""
+msgstr "Warunki na czas"
#. module: crm
#: model:ir.model,name:crm.model_crm_helpdesk
msgid "Helpdesk Cases"
-msgstr ""
+msgstr "Sprawy helpdesku"
#. module: crm
#: model:ir.actions.wizard,name:crm.wizard_crm_cal_export
msgid "Export ICS File"
-msgstr ""
+msgstr "Eksportuj plik ICS"
#. module: crm
#: field:crm.case.rule,sequence:0
@@ -3937,38 +4011,38 @@ msgstr "Numeracja"
#: wizard_view:caldav.crm.import,init:0
#: wizard_field:caldav.crm.import,init,file_path:0
msgid "Select ICS file"
-msgstr ""
+msgstr "Wybierz plik ICS"
#. module: crm
#: wizard_view:caldav.crm.import,display:0
msgid "Import Message"
-msgstr ""
+msgstr "Importuj wiadomość"
#. module: crm
#: field:crm.segmentation.line,expr_name:0
msgid "Control Variable"
-msgstr ""
+msgstr "Zmienna kontrolna"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
#: model:ir.ui.menu,name:crm.menu_crm_case_section_act_tree
msgid "Cases by section"
-msgstr "Przypadki wg sekcji"
+msgstr "Sprawy wg sekcji"
#. module: crm
#: view:crm.job:0
msgid "New Jobs"
-msgstr ""
+msgstr "Nowe stanowiska"
#. module: crm
#: field:crm.menu.config_wizard,fund:0
msgid "Fund Raising Operations"
-msgstr ""
+msgstr "Operacje zwiększania funduszy"
#. module: crm
#: model:crm.case.category2,name:crm.category_lead8
msgid "Newsletter"
-msgstr ""
+msgstr "Biuletyn"
#~ msgid "My "
#~ msgstr "Moje "
diff --git a/addons/crm/i18n/pt_BR.po b/addons/crm/i18n/pt_BR.po
index 22ee8947778..d848e510234 100644
--- a/addons/crm/i18n/pt_BR.po
+++ b/addons/crm/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-02-02 17:06+0000\n"
-"Last-Translator: pedrobom \n"
+"PO-Revision-Date: 2010-05-22 04:53+0000\n"
+"Last-Translator: Guilherme Santos \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:02+0000\n"
+"X-Launchpad-Export-Date: 2010-05-23 03:57+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
@@ -111,7 +111,7 @@ msgstr ""
#. module: crm
#: model:ir.ui.menu,name:crm.menu_hr
msgid "Human Resources"
-msgstr ""
+msgstr "Recursos Humanos"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_categ2
@@ -229,7 +229,7 @@ msgstr "Seção de caso"
#. module: crm
#: view:crm.job:0
msgid "Proposed Salary"
-msgstr "Salário proposto"
+msgstr "Salário Proposto"
#. module: crm
#: help:crm.case.section,sequence:0
@@ -272,7 +272,7 @@ msgstr "Palavras-chave especiais a serem utilizadas no corpo"
#: view:crm.lead:0
#: view:crm.opportunity:0
msgid "Send New Email"
-msgstr "Envia Novo Email"
+msgstr "Enviar Novo Email"
#. module: crm
#: view:crm.case.history:0
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 4db4660f1ef..70230e4c072 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -119,7 +119,7 @@
-
+
@@ -180,9 +180,9 @@
-
+
-
+
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index f78044ea38e..1f90f74f281 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -6,12 +6,8 @@
"access_crm_meeting","crm.meeting","model_crm_meeting","crm.group_crm_manager",1,1,1,1
"access_crm_lead","crm.lead","model_crm_lead","crm.group_crm_manager",1,1,1,1
"access_crm_phonecall","crm.phonecall","model_crm_phonecall","crm.group_crm_manager",1,1,1,1
-"access_crm_case_log","crm.case.log","model_crm_case_log","crm.group_crm_user",1,1,1,1
-"access_crm_case_history","crm.case.history","model_crm_case_history","crm.group_crm_user",1,1,1,1
-"o","crm.case.section.manager","model_crm_case_section","crm.group_crm_manager",1,1,1,1
+"access_crm_case_section_manager","crm.case.section.manager","model_crm_case_section","crm.group_crm_manager",1,1,1,1
"access_crm_case_categ_manager","crm.case.categ.manager","model_crm_case_categ","crm.group_crm_manager",1,1,1,1
-"access_crm_case_log_manager","crm.case.log manager","model_crm_case_log","crm.group_crm_manager",1,1,1,1
-"access_crm_case_history_manager","crm.case.history manager","model_crm_case_history","crm.group_crm_manager",1,1,1,1
"access_crm_case_stage","crm.case.stage","model_crm_case_stage","crm.group_crm_user",1,0,0,0
"access_crm_case_stage_manager","crm.case.stage","model_crm_case_stage","crm.group_crm_manager",1,1,1,1
"access_crm_case_resource_type_user","crm_case_resource_type user","model_crm_case_resource_type","crm.group_crm_user",1,0,0,0
diff --git a/addons/crm/test/test_crm_lead.yml b/addons/crm/test/test_crm_lead.yml
index 0a051d2310d..bfdbe912fed 100644
--- a/addons/crm/test/test_crm_lead.yml
+++ b/addons/crm/test/test_crm_lead.yml
@@ -16,7 +16,6 @@
login: user_crm
name: user_crm
password: user_crm
-
- |
I start by creating a new lead "New Customer" and I provide an address to this
@@ -25,7 +24,7 @@
!record {model: crm.lead, id: crm_lead_newcustomer0}:
email_from: info@mycustomer.com
name: New Customer
- partner_name: Sandip zala
+ partner_name: Capegemini
phone: (855) 924-4364
mobile: (333) 715-1450
section_id: crm.section_sales_department
@@ -41,6 +40,11 @@
-
!python {model: crm.lead}: |
self.case_open(cr, uid, [ref("crm_lead_newcustomer0")])
+- |
+ I check that lead is now in 'open' state.
+-
+ !assert {model: crm.lead, id: crm_lead_newcustomer0, string: Lead in open state}:
+ - state == "open"
- |
As the lead seems to be a real business opportunity, I will convert it to a
@@ -49,8 +53,8 @@
-
!python {model: crm.lead}: |
lead = self.browse(cr, uid, ref('crm_lead_newcustomer0'))
- if not lead.partner_id:
- self.convert_opportunity(cr, uid, [ref("crm_lead_newcustomer0")], {'active_ids': [ref("crm_lead_newcustomer0")]})
+ action = self.convert_opportunity(cr, uid, [ref("crm_lead_newcustomer0")], {'active_ids': [ref("crm_lead_newcustomer0")]})
+ assert action['res_model'] == 'crm.lead2opportunity.partner'
-
|
Now, select "create a new partner" option in this wizard.
@@ -66,7 +70,7 @@
Now, I give value to this wizard field.
-
!record {model: crm.lead2opportunity, id: crm_lead2opportunity_stonage_0}:
- name: Sandip zala
+ name: Capegemini
planned_revenue: 0.00
probability: 0.00
-
@@ -79,8 +83,8 @@
I can check that a lead and a business opportunity is now assigned to this
lead.
-
- # !python {model: crm.lead, id: crm_lead_newcustomer0}:
- # - opportunity_id.id != False
+ # !python {model: crm.lead, id: crm_lead_newcustomer0}:
+ # - opportunity_id == False
- |
I check that the partner associated to this lead as the same country, phone number
@@ -109,4 +113,4 @@
- |
I Reply to last Email to lead with some document attached.and check that communication history generated or not.
-
\ No newline at end of file
+
diff --git a/addons/crm/test/test_crm_phonecall.yml b/addons/crm/test/test_crm_phonecall.yml
index feb87e0a879..f2020659aed 100644
--- a/addons/crm/test/test_crm_phonecall.yml
+++ b/addons/crm/test/test_crm_phonecall.yml
@@ -4,44 +4,55 @@
!record {model: crm.phonecall, id: crm_phonecall_interviewcall0}:
date: '2010-04-21 18:59:00'
name: Interview call
- partner_address_id: base.res_partner_address_1
- partner_id: base.res_partner_9
- partner_mobile: (+32)2 211 34 83
section_id: crm.section_sales_department
+- |
+ Now , I select partner by click on "Create a Partner" button.
+
+-
+ !record {model: crm.phonecall2partner, id: crm_phonecall2partner_1}:
+ action: exist
+ partner_id: base.res_partner_9
+
+-
+ Now, click on "Continue" button of this wizard.
+-
+ !python {model: crm.phonecall2partner}: |
+ self.make_partner(cr, uid, [ref("crm_phonecall2partner_1")], {"active_ids": [ref("crm_phonecall_interviewcall0")]})
- |
As the success of phonecall seems to be a real business opportunity, I will convert
it to opportunity by clicking on the "Convert to Opportunity" button.
+-
+ !record {model: crm.phonecall2opportunity, id: crm_phonecall2opportunity_interviewcall0}:
+ name: Interview call
+ partner_id: base.res_partner_9
+ planned_revenue: 0.0
+ probability: 0.0
+-
+ Now, I click on "Convert" button of this wizard.
-
-# !python {model: crm.phonecall2opportunity}: |
-# self.action_apply(cr, uid, [1], {'active_id': ref('crm_phonecall_interviewcall0')})
-
+ !python {model: crm.phonecall2opportunity}: |
+ self.action_apply(cr, uid, [ref("crm_phonecall2opportunity_interviewcall0")], {"active_id": ref("crm_phonecall_interviewcall0")})
-
# This is not working, find a way to do that in YAML
-
+
- |
I can see that a business opportunity is now assigned to this phonecall
-- |
- I check that the partner associated to this as the same country, phone number
- and name than the phonecall.
-- |
- In order to avoid the duplication of similar partner, OpenERP should be able to
- detect if the partner exists or if it should be created from the phonecall during the
- conversion.
-- |
- In order to test this, I log as the user "user_crm2"
-- |
- Then, I create the same phonecall than the preceeding one but I change the name
- of the phonecall. But this customer keeps the same email.
-- |
- This time OpenERP should detect that this customer already exists in the
- partner base and I check that in the wizard, proposes me to link to this existing
- partner instead of creating another one.
-- |
- I confirm the conversion wizard.
+-
+ !assert {model: crm.phonecall, id: crm_phonecall_interviewcall0}:
+ - opportunity_id == True
+
- |
And I check that the phonecall and the newly created business opportunity is linked
- to the partner
+ to same partner
+-
+ !python {model: crm.phonecall}: |
+ xid= ref('crm_phonecall_interviewcall0')
+ obj_phonecall = self.browse(cr, uid, xid)
+ ids = self.pool.get('crm.lead').search(cr, uid, [('name', '=', obj_phonecall.opportunity_id.name)])
+ obj_opp = self.pool.get('crm.lead').browse(cr, uid, ids)[0]
+ assert obj_phonecall.partner_id == obj_opp.partner_id
+
- |
I schedule Meeting on this current phonecall by clicking on "schedule
Meeting"
diff --git a/addons/crm/wizard/crm_forward_to_partner.py b/addons/crm/wizard/crm_forward_to_partner.py
index 98d5392faa3..153f136cfb2 100644
--- a/addons/crm/wizard/crm_forward_to_partner.py
+++ b/addons/crm/wizard/crm_forward_to_partner.py
@@ -176,7 +176,6 @@ class crm_lead_forward_to_partner(osv.osv_memory):
this = self.browse(cr, uid, ids[0], context=context)
- hist_obj = self.pool.get('crm.case.history')
smtp_pool = self.pool.get('email.smtpclient')
case_pool = self.pool.get(model)
case = case_pool.browse(cr, uid, res_id, context=context)
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index f4cecbe508f..12edf5edc6d 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -57,7 +57,6 @@ class crm_lead2opportunity(osv.osv_memory):
lead_obj = self.pool.get('crm.lead')
data_obj = self.pool.get('ir.model.data')
- history_obj = self.pool.get('crm.case.history')
model_obj = self.pool.get('ir.model')
# Get Opportunity views
diff --git a/addons/crm/wizard/crm_lead_to_partner_view.xml b/addons/crm/wizard/crm_lead_to_partner_view.xml
index ee6c1522e22..2f7f8540e7f 100644
--- a/addons/crm/wizard/crm_lead_to_partner_view.xml
+++ b/addons/crm/wizard/crm_lead_to_partner_view.xml
@@ -42,12 +42,15 @@
-
-
+
+
+ Create a Partner
+ ir.actions.act_window
+ crm.lead2partner
+ form
+
+ new
+
diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index 41c32a9fa42..7bda631e032 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -39,7 +39,8 @@
key2="client_action_multi" name="Create Opportunity"
res_model="crm.partner2opportunity" src_model="res.partner"
view_id="view_crm_lead2partner_create"
- view_mode="form" target="new" view_type="form" />
+ view_mode="form" target="new" view_type="form"
+ groups="base.group_extended"/>
diff --git a/addons/crm/wizard/crm_phonecall_to_partner_view.xml b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
index 524384328f3..c7da406f687 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
@@ -43,11 +43,15 @@
-
+
+ Create a Partner
+ ir.actions.act_window
+ crm.phonecall2partner
+ form
+
+ new
+
+
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index f9b3a2e64dc..8458172104a 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -98,7 +98,9 @@ class crm_send_new_email(osv.osv_memory):
message_id = hist.message_id
model = hist.model_id.model
model_pool = self.pool.get(model)
- case = model_pool.browse(cr, uid, hist.res_id)
+ res_ids = model_pool.search(cr, uid, [('thread_id','=', hist.thread_id.id)])
+ res_id = res_ids and res_ids[0] or False
+ case = model_pool.browse(cr, uid, res_id)
emails = [obj.email_to] + (obj.email_cc or '').split(',')
emails = filter(None, emails)
body = obj.text
@@ -115,28 +117,17 @@ class crm_send_new_email(osv.osv_memory):
x_headers['References'] = "%s" % (message_id)
flag = False
- if case.section_id and case.section_id.server_id:
- flag = smtp_pool.send_email(
- cr=cr,
- uid=uid,
- server_id=case.section_id.server_id.id,
- emailto=emails,
- subject=obj.subject,
- body="
%s
" % body,
- attachments=attach,
- headers=x_headers
- )
- else:
- flag = tools.email_send(
- email_from,
- emails,
- obj.subject,
- body,
- attach=attach,
- reply_to=case.section_id.reply_to,
- openobject_id=str(case.id),
- x_headers=x_headers
- )
+
+ flag = tools.email_send(
+ email_from,
+ emails,
+ obj.subject,
+ body,
+ attach=attach,
+ reply_to=case.section_id.reply_to,
+ openobject_id=str(case.id),
+ x_headers=x_headers
+ )
if flag:
if obj.state == 'unchanged':
@@ -208,7 +199,9 @@ class crm_send_new_email(osv.osv_memory):
return {}
model_pool = self.pool.get(model)
- case = model_pool.browse(cr, uid, hist.res_id)
+ res_ids = model_pool.search(cr, uid, [('thread_id','=', hist.thread_id.id)])
+ res_id = res_ids and res_ids[0] or False
+ case = model_pool.browse(cr, uid, res_id)
if 'email_to' in fields:
res.update({'email_to': case.email_from or hist.email_from or False})
if 'email_from' in fields:
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index a535efbdb81..d9a7a2b34c0 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -29,10 +29,15 @@ class crm_claim(osv.osv, crm.crm_case):
_name = "crm.claim"
_description = "Claim Cases"
_order = "id desc"
- _inherit = 'mailgate.thread'
+ _inherits = {'mailgate.thread': 'thread_id'}
+
_columns = {
+ 'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False),
'id': fields.integer('ID', readonly=True),
'name': fields.char('Name', size=128, required=True),
+ 'active': fields.boolean('Active', required=False),
+ 'date_action_last': fields.datetime('Last Action', readonly=1),
+ 'date_action_next': fields.datetime('Next Action', readonly=1),
'description': fields.text('Description'),
'create_date': fields.datetime('Creation Date' , readonly=True),
'write_date': fields.datetime('Update Date' , readonly=True),
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index b0d17495dee..7fb1c08f84b 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -14,7 +14,7 @@
formtree,calendar,form,graph
- {"search_default_section_id":section_id,"search_default_current":1,"search_default_my_claims":1}
+ {"search_default_section_id":section_id,"search_default_current":1,"search_default_user_id":uid}
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 4228096e670..7a3dd4cc829 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -246,8 +246,8 @@
search
-
-
-
-
+ widget="selection"/>
Fundscrm.fundraisingtree,form,graph
- {"search_default_current":1}
+ {"search_default_user_id":uid,"search_default_current":1}
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 9a2b3b4c524..68fcd768d74 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -249,8 +249,7 @@
-
-
+
CRM - Funds Searchcrm.fundraising
@@ -269,12 +268,6 @@
domain="[('state','=','pending')]"
help="Pending Funds" />
-
-
@@ -306,6 +299,5 @@
-
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 4329ef7d73b..d07d2261013 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -28,11 +28,15 @@ class crm_helpdesk(osv.osv, crm.crm_case):
_name = "crm.helpdesk"
_description = "Helpdesk Cases"
_order = "id desc"
- _inherit = 'mailgate.thread'
+ _inherits = {'mailgate.thread': 'thread_id'}
_columns = {
+ 'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False),
'id': fields.integer('ID', readonly=True),
'name': fields.char('Name', size=128, required=True),
+ 'active': fields.boolean('Active', required=False),
+ 'date_action_last': fields.datetime('Last Action', readonly=1),
+ 'date_action_next': fields.datetime('Next Action', readonly=1),
'description': fields.text('Description'),
'create_date': fields.datetime('Creation Date' , readonly=True),
'write_date': fields.datetime('Update Date' , readonly=True),
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index 5030fd65506..f671e3b77e0 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -11,6 +11,7 @@
crm.helpdesktree,calendar,form
+ {"search_default_user_id":uid}
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 93311395510..27ccee6ef0d 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -236,11 +236,7 @@
-
-
-
+ \n"
+"PO-Revision-Date: 2010-05-21 20:20+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \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:17+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_profiling
@@ -49,7 +49,7 @@ msgstr ""
#. module: crm_profiling
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
#. module: crm_profiling
#: field:crm_profiling.answer,name:0
@@ -70,7 +70,7 @@ msgstr "Opis"
#. module: crm_profiling
#: field:crm.segmentation,answer_no:0
msgid "Excluded Answers"
-msgstr ""
+msgstr "Wyłączone odpowiedzi"
#. module: crm_profiling
#: view:crm_profiling.answer:0
@@ -111,12 +111,12 @@ msgstr "Kwestionariusz"
#. module: crm_profiling
#: constraint:crm.segmentation:0
msgid "Error ! You can not create recursive profiles."
-msgstr ""
+msgstr "Błąd ! Nie możesz tworzyć profilów rekurencyjnych."
#. module: crm_profiling
#: field:crm.segmentation,profiling_active:0
msgid "Use The Profiling Rules"
-msgstr ""
+msgstr "Stosuj reguły profili"
#. module: crm_profiling
#: view:crm_profiling.question:0
@@ -127,7 +127,7 @@ msgstr "Dostępne odpowiedzi"
#. module: crm_profiling
#: field:crm.segmentation,answer_yes:0
msgid "Included Answers"
-msgstr ""
+msgstr "Włączone odpowiedzi"
#. module: crm_profiling
#: help:crm.segmentation,profiling_active:0
@@ -147,7 +147,7 @@ msgstr "Pytania"
#. module: crm_profiling
#: field:crm.segmentation,parent_id:0
msgid "Parent Profile"
-msgstr ""
+msgstr "Profil nadrzędny"
#. module: crm_profiling
#: wizard_button:open_questionnaire,init,end:0
@@ -158,12 +158,12 @@ msgstr "Anuluj"
#. module: crm_profiling
#: view:crm.segmentation:0
msgid "Partner Segmentations"
-msgstr ""
+msgstr "Segmentacja partnera"
#. module: crm_profiling
#: model:ir.actions.wizard,name:crm_profiling.wizard_open_questionnaire
msgid "Using a questionnaire"
-msgstr "Uzywanie kwestionariusza"
+msgstr "Używanie kwestionariusza"
#. module: crm_profiling
#: wizard_button:open_questionnaire,open,compute:0
diff --git a/addons/crm_vertical/i18n/id.po b/addons/crm_vertical/i18n/id.po
index 78fa6ce730c..2001657f4ab 100644
--- a/addons/crm_vertical/i18n/id.po
+++ b/addons/crm_vertical/i18n/id.po
@@ -7,16 +7,16 @@ 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:48+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-05-18 10:59+0000\n"
+"Last-Translator: Pandu Pradana \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:20+0000\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:12+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_vertical
#: model:ir.module.module,description:crm_vertical.module_meta_information
msgid "Simplification of the interface for CRM."
-msgstr ""
+msgstr "Penyederhanaan dari antar-muka CRM."
diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index 9b0949e07e1..684547e0a89 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -39,6 +39,7 @@
'partner_view.xml'
],
'demo_xml': ['delivery_demo.xml'],
+ 'test':['test/delivery_test.yml',],
'installable': True,
'active': False,
'certificate': '0033981912253',
diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 35b3ed481e9..4b87e4c790e 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -26,7 +26,7 @@ from tools.translate import _
class delivery_carrier(osv.osv):
_name = "delivery.carrier"
- _description = "Carrier and delivery grids"
+ _description = "Carrier"
def name_get(self, cr, uid, ids, context={}):
if not len(ids):
@@ -144,7 +144,7 @@ delivery_grid()
class delivery_grid_line(osv.osv):
_name = "delivery.grid.line"
- _description = "Delivery line of grid"
+ _description = "Delivery Grid Line"
_columns = {
'name': fields.char('Name', size=32, required=True),
'grid_id': fields.many2one('delivery.grid', 'Grid',required=True),
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 6a8058ff8bc..427f5bfd6f2 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -128,7 +128,7 @@
-
+
diff --git a/addons/delivery/security/ir.model.access.csv b/addons/delivery/security/ir.model.access.csv
index 948a85c35c7..e459c423b59 100644
--- a/addons/delivery/security/ir.model.access.csv
+++ b/addons/delivery/security/ir.model.access.csv
@@ -7,3 +7,5 @@
"access_delivery_grid_line_manager","delivery.grid.line","model_delivery_grid_line","sale.group_sale_manager",1,1,1,1
"access_delivery_carrier_partner_manager","delivery.carrier partner_manager","model_delivery_carrier","base.group_partner_manager",1,0,0,0
"access_delivery_carrier_stock_worker","delivery.carrier stock_worker","model_delivery_carrier","stock.group_stock_user",1,0,0,0
+"access_delivery_sale_order_manager","delivery.sale.order","model_delivery_sale_order","sale.group_sale_manager",1,1,1,1
+"access_delivery_sale_order","delivery.sale.order","model_delivery_sale_order","sale.group_sale_user",1,0,0,0
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index 6d8d5a17bd1..91dfed96f11 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -29,7 +29,7 @@ import decimal_precision as dp
# Overloaded stock_picking to manage carriers :
class stock_picking(osv.osv):
_name = "stock.picking"
- _description = "Picking list"
+ _description = "Packing List"
_inherit = 'stock.picking'
def _cal_weight(self, cr, uid, ids, name, args, context=None):
@@ -55,7 +55,7 @@ class stock_picking(osv.osv):
'weight': fields.function(_cal_weight, method=True, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'),
store={
'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
- 'stock.move': (_get_picking_line, ['product_id','product_uos_qty'], 20),
+ 'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
}),
}
diff --git a/addons/delivery/test/delivery_test.yml b/addons/delivery/test/delivery_test.yml
new file mode 100644
index 00000000000..9225cbca66b
--- /dev/null
+++ b/addons/delivery/test/delivery_test.yml
@@ -0,0 +1,155 @@
+-
+ In order to test the delivery module, I will do Configuration -> Delivery -> Delivery Method
+ And there are two methods for doing that
+ Delivery based on order quantities,
+ Delivery based on delivered quantities.
+-
+ I create the partner associated with the transport.
+-
+ I create partner.
+-
+ !record {model: res.partner, id: res_partner_thepost0}:
+ address:
+ - country_id: base.in
+ name: Micro Link
+ credit_limit: 0.0
+ name: The Post
+ property_account_payable: account.a_pay
+ property_account_receivable: account.a_recv
+-
+
+ I create associated product for delivery.
+-
+ !record {model: product.product, id: product_product_deliverybypost0}:
+ categ_id: product.product_category_services
+ cost_method: standard
+ mes_type: fixed
+ name: Delivery Product
+ procure_method: make_to_stock
+ supply_method: buy
+ type: service
+ uom_id: product.product_uom_unit
+ uom_po_id: product.product_uom_unit
+ warranty: 0.0
+-
+ I create the Delivery Method.
+-
+ !record {model: delivery.carrier, id: delivery_carrier_theopenerpexperss0}:
+ name: The OpenERP Experss
+ partner_id: res_partner_thepost0
+ product_id: product_product_deliverybypost0
+-
+ I create a delivery grid record and define the region for which the tariffs in the grid will be applicable.
+ Then set the condition for which this rule is applicable.
+-
+ !record {model: delivery.grid, id: delivery_grid_weight0}:
+ carrier_id: delivery_carrier_theopenerpexperss0
+ line_ids:
+ - list_price: 120.0
+ max_value: 250.0
+ name: Weight of product
+ operator: <=
+ standard_price: 60.0
+ type: weight
+ price_type: fixed
+ variable_factor: weight
+ - list_price: 0.0
+ max_value: 500.0
+ name: Price >= 500
+ operator: <=
+ standard_price: 20.0
+ type: price
+ price_type: fixed
+ variable_factor: weight
+ country_ids:
+ - base.id
+ - base.be
+ - base.in
+ - base.io
+
+ name: Weight
+ sequence: 1
+-
+ To check the Delivery based on order quantities , I have created sale order and picking_policy is direct .
+-
+ !record {model: sale.order, id: sale_order_so0}:
+ date_order: '2010-05-11'
+ invoice_quantity: order
+ name: Test/delivery
+ order_line:
+ - name: '[PC1] Basic PC'
+ price_unit: 450.0
+ product_uom: product.product_uom_unit
+ product_uom_qty: 10.0
+ state: draft
+ delay: 2.0
+ product_id: product.product_product_pc1
+ product_uos_qty: 10.0
+ th_weight: 0.0
+ type: make_to_stock
+ order_policy: manual
+ partner_id: base.res_partner_agrolait
+ partner_invoice_id: base.res_partner_address_8
+ partner_order_id: base.res_partner_address_8
+ partner_shipping_id: base.res_partner_address_8
+ picking_policy: direct
+ pricelist_id: product.list0
+ shop_id: sale.shop
+-
+ I create delivery.sale.order record.
+-
+ !record {model: delivery.sale.order, id: delivery_sale_order_0}:
+ carrier_id: delivery_carrier_theopenerpexperss0
+-
+ To add the delivery charges on the quotation, I click on Delivery costs button and select the carrier.
+-
+ !python {model: delivery.sale.order}: |
+ self.delivery_set(cr, uid, [ref("delivery_sale_order_0")], {"lang": "en_US", "active_model":
+ "sale.order", "tz": False, "order_id": 8, "active_ids": [ref("sale_order_so0")],
+ "active_id": ref("sale_order_so0"), })
+-
+ I confirm the sale order.
+-
+ !workflow {model: sale.order, action: order_confirm, ref: sale_order_so0}
+-
+ To check the Invoicing based on deliveries.I create new sale order and picking_policy is Complete Delivery.
+-
+ !record {model: sale.order, id: sale_order_test_complete0}:
+ name: Test/Complete Deliver
+ carrier_id: delivery.delivery_carrier_theopenerpexperss0
+ invoice_quantity: procurement
+ order_line:
+ - name: '[PC1] Basic PC'
+ price_unit: 450.0
+ product_uom: product.product_uom_unit
+ product_uom_qty: 10.0
+ state: draft
+ delay: 2.0
+ product_id: product.product_product_pc1
+ product_uos_qty: 10.0
+ th_weight: 0.0
+ type: make_to_stock
+ partner_id: base.res_partner_4
+ partner_order_id: base.res_partner_address_7
+ partner_invoice_id: base.res_partner_address_7
+ partner_shipping_id: base.res_partner_address_7
+ pricelist_id: product.list0
+ order_policy: picking
+-
+ I confirm the sale order.
+-
+ !workflow {model: sale.order, action: order_confirm, ref: sale_order_test_complete0}
+-
+ I Create stock.invoice.onshipping
+-
+ !record {model: stock.invoice.onshipping, id: stock_invoice_onshipping_0}:
+ journal_id: account.sales_journal
+ type: out_invoice
+-
+ I Create Invoice form picking.
+-
+ !python {model: stock.invoice.onshipping}: |
+ so=self.pool.get('sale.order').browse(cr,uid,ref('sale_order_test_complete0'))
+ self.create_invoice(cr, uid, [ref("stock_invoice_onshipping_0")], {"lang": "en_US",
+ "tz": False, "active_model": "stock.picking", "contact_display": "partner",
+ "active_ids": [so.picking_ids[0].id], "active_id": so.picking_ids[0].id })
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 25e172d2817..56e52aa9b69 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -31,7 +31,7 @@ from tools.translate import _
class document_directory(osv.osv):
_name = 'document.directory'
- _description = 'Document directory'
+ _description = 'Directory'
_order = 'name desc'
_columns = {
'name': fields.char('Name', size=64, required=True, select=1),
@@ -286,7 +286,7 @@ class document_directory_dctx(osv.osv):
appended to all children down the tree.
"""
_name = 'document.directory.dctx'
- _description = 'Directory dynamic context'
+ _description = 'Directory Dynamic Context'
_columns = {
'dir_id': fields.many2one('document.directory', 'Directory', required=True),
'field': fields.char('Field', size=20, required=True, select=1, help="The name of the field. Note that the prefix \"dctx_\" will be prepended to what is typed here."),
diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py
index 421c423b900..d20870ff825 100644
--- a/addons/document/document_storage.py
+++ b/addons/document/document_storage.py
@@ -95,7 +95,7 @@ class document_storage(osv.osv):
the same tree of filesystem storage.
"""
_name = 'document.storage'
- _description = 'Document storage media'
+ _description = 'Storage Media'
_columns = {
'name': fields.char('Name', size=64, required=True, select=1),
'write_date': fields.datetime('Date Modified', readonly=True),
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index b8bee399f82..c6d59fa3d29 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -42,7 +42,6 @@
-
@@ -65,6 +64,7 @@
report.document.userformtree
+ {"search_default_user":uid}
diff --git a/addons/document_ftp/doc_conf_wizard.py b/addons/document_ftp/doc_conf_wizard.py
index 72011c39759..1399bc276b5 100644
--- a/addons/document_ftp/doc_conf_wizard.py
+++ b/addons/document_ftp/doc_conf_wizard.py
@@ -30,7 +30,7 @@ import os
class document_configuration_wizard(osv.osv_memory):
_name='document.configuration.wizard'
- _description = 'Auto Directory configuration'
+ _description = 'Auto Directory Configuration'
_inherit = 'res.config'
_rec_name = 'host'
_columns = {
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index 58fe3cc358b..70870b50783 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -123,7 +123,7 @@ class abstracted_fs:
def db_list(self):
#return pooler.pool_dic.keys()
s = netsvc.ExportService.getService('db')
- result = s.exp_list()
+ result = s.exp_list(document=True)
self.db_name_list = []
for db_name in result:
db, cr = None, None
diff --git a/addons/document_ics/document_demo.xml b/addons/document_ics/document_demo.xml
index 06c72022fe7..a0e35563857 100644
--- a/addons/document_ics/document_demo.xml
+++ b/addons/document_ics/document_demo.xml
@@ -23,32 +23,32 @@
dtstart
-
+ dtend
-
+ summary
-
+ uid
-
+ description
-
+ url
-
+
diff --git a/addons/document_ics/document_ics.py b/addons/document_ics/document_ics.py
index 00f8927eb18..56998a9408a 100644
--- a/addons/document_ics/document_ics.py
+++ b/addons/document_ics/document_ics.py
@@ -177,7 +177,6 @@ class document_directory_content(osv.osv):
fexprs[n.name] = n.expr
if 'uid' not in fields:
- print "uid not in ", fields
# FIXME: should pass
return True
for child in parsedCal.getChildren():
@@ -189,7 +188,6 @@ class document_directory_content(osv.osv):
if enl =='uid':
uuid = event.value
if not enl in fields:
- # print "skip", enl
continue
if fields[enl] and funcs[enl] == 'field':
if ICS_TAGS[enl]=='normal':
@@ -216,7 +214,6 @@ class document_directory_content(osv.osv):
# end for
if not uuid:
- print "Skipping cal", child
# FIXME: should pass
continue
diff --git a/addons/document_ics/document_view.xml b/addons/document_ics/document_view.xml
index 0cbfb6f81e2..39b6908dc76 100644
--- a/addons/document_ics/document_view.xml
+++ b/addons/document_ics/document_view.xml
@@ -45,7 +45,7 @@
form
-
+
diff --git a/addons/document_ics/i18n/fr.po b/addons/document_ics/i18n/fr.po
index 829e71f8bb1..79a9107259d 100644
--- a/addons/document_ics/i18n/fr.po
+++ b/addons/document_ics/i18n/fr.po
@@ -7,13 +7,13 @@ 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-11-09 17:33+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-05-21 20:29+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ \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:18+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document_ics
@@ -37,17 +37,17 @@ msgstr "Erreur ! Vous ne pouvez pas créer de Répertoires récursivement."
#. module: document_ics
#: field:document.ics.crm.wizard,jobs:0
msgid "Jobs Hiring Process"
-msgstr ""
+msgstr "Procédure de recrutement"
#. module: document_ics
#: view:document.ics.crm.wizard:0
msgid "Configure Calendars for CRM Sections"
-msgstr ""
+msgstr "Configure les calendriers pour les sections de la CRM"
#. module: document_ics
#: field:document.ics.crm.wizard,helpdesk:0
msgid "Helpdesk"
-msgstr ""
+msgstr "Support"
#. module: document_ics
#: field:document.directory.ics.fields,field_id:0
@@ -57,7 +57,7 @@ msgstr "Champ Open ERP"
#. module: document_ics
#: view:document.ics.crm.wizard:0
msgid "Next"
-msgstr ""
+msgstr "Suivant"
#. module: document_ics
#: field:document.directory.ics.fields,content_id:0
@@ -67,7 +67,7 @@ msgstr "Contenu"
#. module: document_ics
#: field:document.ics.crm.wizard,meeting:0
msgid "Calendar of Meetings"
-msgstr ""
+msgstr "Calendrier des Rendez Vous"
#. module: document_ics
#: model:crm.case.section,name:document_ics.section_meeting
@@ -82,12 +82,14 @@ msgstr "url"
#. module: document_ics
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nom de modèle invalide pour la définition de l'action"
#. module: document_ics
#: help:document.ics.crm.wizard,bugs:0
msgid "Used by companies to track bugs and support requests on softwares"
msgstr ""
+"Utilisé par les sociétés pour suivre des anomalies et des demandes de "
+"supports sur les logiciels"
#. module: document_ics
#: model:ir.actions.todo,note:document_ics.config_wizard_step_case_section_menu
@@ -95,6 +97,8 @@ msgid ""
"This Configuration step use to create Calendars in document for all Case "
"Sections"
msgstr ""
+"Cette étape de configuration est utilisé pour créer un calendrier dans la "
+"GED pour toutes les sections"
#. module: document_ics
#: selection:document.directory.ics.fields,name:0
@@ -107,6 +111,8 @@ msgid ""
"Help you to organise the jobs hiring process: evaluation, meetings, email "
"integration..."
msgstr ""
+"Aide à organiser le processus d'embauche: évaluation, rendez vous, gestion "
+"des emails"
#. module: document_ics
#: selection:document.directory.ics.fields,name:0
@@ -116,28 +122,30 @@ msgstr "description"
#. module: document_ics
#: model:ir.actions.act_window,name:document_ics.action_view_document_ics_config_directories
msgid "Configure Calendars for Sections "
-msgstr ""
+msgstr "Configurer les Calendriers pour ces Sections "
#. module: document_ics
#: help:document.ics.crm.wizard,opportunity:0
msgid "Tracks identified business opportunities for your sales pipeline."
-msgstr ""
+msgstr "Suivi des occasions identifiées d'affaires pour vos canaux de vente."
#. module: document_ics
#: help:document.ics.crm.wizard,fund:0
msgid ""
"This may help associations in their fund raising process and tracking."
msgstr ""
+"Ceci peut aider les associations dans leur procédure de collecte de fonds et "
+"de suivi."
#. module: document_ics
#: help:document.ics.crm.wizard,helpdesk:0
msgid "Manages an Helpdesk service."
-msgstr ""
+msgstr "Diriger un service d'assistance"
#. module: document_ics
#: field:document.ics.crm.wizard,fund:0
msgid "Fund Raising Operations"
-msgstr ""
+msgstr "Opérations de levée de fonds"
#. module: document_ics
#: field:document.directory.content,ics_object_id:0
@@ -147,12 +155,12 @@ msgstr "Objet"
#. module: document_ics
#: constraint:crm.case.section:0
msgid "Error ! You cannot create recursive sections."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de sections récursives."
#. module: document_ics
#: model:ir.module.module,shortdesc:document_ics.module_meta_information
msgid "Support for iCal based on Document Management System"
-msgstr ""
+msgstr "Support iCal basé sur la gestion documentaire"
#. module: document_ics
#: selection:document.directory.ics.fields,name:0
@@ -173,6 +181,7 @@ msgstr "Valeur ICS"
#: model:ir.module.module,description:document_ics.module_meta_information
msgid "Allows to synchronise calendars with others applications."
msgstr ""
+"Autorise la syncrhonisation des calendriers avec les autres applications."
#. module: document_ics
#: constraint:ir.ui.view:0
@@ -189,12 +198,12 @@ msgstr ""
#. module: document_ics
#: field:document.ics.crm.wizard,name:0
msgid "Name"
-msgstr ""
+msgstr "Nom"
#. module: document_ics
#: help:document.ics.crm.wizard,meeting:0
msgid "Manages the calendar of meetings of the users."
-msgstr ""
+msgstr "Gère le calendrier des rendez-vous des utilisateurs"
#. module: document_ics
#: field:document.directory.content,ics_domain:0
@@ -207,6 +216,8 @@ msgid ""
"Manages the supplier and customers claims, including your corrective or "
"preventive actions."
msgstr ""
+"Gérér les réclamations fournisseurs et clients, incluant vos actions "
+"correctives ou préventives."
#. module: document_ics
#: selection:document.directory.ics.fields,name:0
@@ -221,17 +232,17 @@ msgstr "Correspondance ICS"
#. module: document_ics
#: view:crm.case:0
msgid "Duration(In Hour)"
-msgstr ""
+msgstr "Durée (en heure)"
#. module: document_ics
#: field:document.ics.crm.wizard,document_ics:0
msgid "Shared Calendar"
-msgstr ""
+msgstr "Calendrier partagé"
#. module: document_ics
#: field:document.ics.crm.wizard,claims:0
msgid "Claims"
-msgstr ""
+msgstr "Réclamations"
#. module: document_ics
#: help:document.ics.crm.wizard,phonecall:0
@@ -239,6 +250,8 @@ msgid ""
"Help you to encode the result of a phone call or to planify a list of phone "
"calls to process."
msgstr ""
+"Aide à encoder le résultat d'une conversation téléphonique ou à plannifier "
+"une liste"
#. module: document_ics
#: selection:document.directory.ics.fields,name:0
@@ -248,12 +261,12 @@ msgstr "dtstart"
#. module: document_ics
#: field:document.ics.crm.wizard,phonecall:0
msgid "Phone Calls"
-msgstr ""
+msgstr "Appels téléphoniques"
#. module: document_ics
#: field:document.ics.crm.wizard,bugs:0
msgid "Bug Tracking"
-msgstr ""
+msgstr "Suivi des Bugs"
#. module: document_ics
#: selection:document.directory.ics.fields,name:0
@@ -263,12 +276,12 @@ msgstr "catégories"
#. module: document_ics
#: field:document.ics.crm.wizard,lead:0
msgid "Prospect"
-msgstr ""
+msgstr "Prospect"
#. module: document_ics
#: view:document.ics.crm.wizard:0
msgid "Create Pre-Configured Calendars"
-msgstr ""
+msgstr "Création de calendriers pré-configurer"
#. module: document_ics
#: selection:document.directory.ics.fields,name:0
@@ -278,7 +291,7 @@ msgstr "créé"
#. module: document_ics
#: field:crm.case,code:0
msgid "Calendar Code"
-msgstr ""
+msgstr "Code Calendrier"
#. module: document_ics
#: selection:document.directory.ics.fields,name:0
@@ -288,7 +301,7 @@ msgstr "résumé"
#. module: document_ics
#: model:ir.model,name:document_ics.model_document_ics_crm_wizard
msgid "document.ics.crm.wizard"
-msgstr ""
+msgstr "document.ics.crm.wizard"
#. module: document_ics
#: selection:document.directory.ics.fields,name:0
@@ -308,14 +321,14 @@ msgstr "Correspondance des champs"
#. module: document_ics
#: view:document.ics.crm.wizard:0
msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
#. module: document_ics
#: field:document.ics.crm.wizard,opportunity:0
msgid "Business Opportunities"
-msgstr ""
+msgstr "Opportunités d'affaire"
#. module: document_ics
#: selection:document.directory.ics.fields,name:0
msgid "dtstamp"
-msgstr ""
+msgstr "dtstamp"
diff --git a/addons/event/event.py b/addons/event/event.py
index ffdeb84d15d..1985cf9cc7d 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -27,23 +27,12 @@ import tools
from tools.translate import _
from crm import crm
-class crm_case_log(osv.osv):
- _inherit = 'crm.case.log'
- _description = 'crm.case.log'
- def create(self, cr, uid, vals, *args, **kwargs):
- if not 'name' in vals:
- vals['name']='Historize'
- return super(osv.osv,self).create(cr, uid, vals, *args, **kwargs)
- _defaults = {
- 'user_id': lambda self,cr,uid,context: uid,
- }
-crm_case_log()
class event_type(osv.osv):
_name = 'event.type'
_description= 'Event type'
_columns = {
- 'name': fields.char('Event type', size=64, required=True),
+ 'name': fields.char('Event type', size=64, required=True),
}
event_type()
@@ -54,58 +43,53 @@ class event(osv.osv):
_order = 'date_begin'
def copy(self, cr, uid, id, default=None, context=None):
- return super(event, self).copy(cr, uid,id, default={'code': self.pool.get('ir.sequence').get(cr, uid, 'event.event'),'state':'draft'})
+ return super(event, self).copy(cr, uid, id, default={'code': self.pool.get('ir.sequence').get(cr, uid, 'event.event'), 'state': 'draft'})
def button_draft(self, cr, uid, ids, context={}):
- return self.write(cr, uid, ids, {'state':'draft'})
+ return self.write(cr, uid, ids, {'state': 'draft'})
def button_cancel(self, cr, uid, ids, context={}):
- return self.write(cr, uid, ids, {'state':'cancel'})
+ return self.write(cr, uid, ids, {'state': 'cancel'})
def button_done(self, cr, uid, ids, context={}):
- return self.write(cr, uid, ids, {'state':'done'})
+ return self.write(cr, uid, ids, {'state': 'done'})
def button_confirm(self, cr, uid, ids, context={}):
for eve in self.browse(cr, uid, ids):
if eve.mail_auto_confirm:
#send reminder that will confirm the event for all the people that were already confirmed
- reg_ids = self.pool.get('event.registration').search(cr, uid, [('event_id','=',eve.id),('state','not in',['draft','cancel'])])
+ reg_ids = self.pool.get('event.registration').search(cr, uid, [('event_id', '=', eve.id), ('state', 'not in', ['draft', 'cancel'])])
if reg_ids:
self.pool.get('event.registration').mail_user_confirm(cr, uid, reg_ids)
- return self.write(cr, uid, ids, {'state':'confirm'})
+ return self.write(cr, uid, ids, {'state': 'confirm'})
def _get_register(self, cr, uid, ids, name, args, context=None):
res={}
for event in self.browse(cr, uid, ids, context):
- query = """select sum(nb_register) from crm_case c left join crm_case_section s on (c.section_id=s.id) right join event_event e on (e.section_id=s.id) right join event_registration r on (r.case_id=c.id) where e.section_id = %s and c.state in ('open','done')"""
- cr.execute(query,(event.section_id.id,))
+ res[event.id] = {}
+ state = 'draft'
+ if name[0] == 'register_current':
+ state = 'open'
+ query = """SELECT sum(r.nb_register)
+ from event_registration r
+ where state=%s and event_id=%s"""
+
+ cr.execute(query, (state, event.id, ))
res2 = cr.fetchone()
if res2 and res2[0]:
- res[event.id] = res2[0]
+ res[event.id][name[0]] = res2[0]
else:
- res[event.id] = 0
+ res[event.id][name[0]] = 0
return res
- def _get_prospect(self, cr, uid, ids, name, args, context=None):
- res={}
- for event in self.browse(cr, uid, ids, context):
- query = """select sum(nb_register) from crm_case c left join crm_case_section s on (c.section_id=s.id) right join event_event e on (e.section_id=s.id) right join event_registration r on (r.case_id=c.id) where e.section_id = %s and c.state = 'draft'"""
- cr.execute(query,(event.section_id.id,))
- res2 = cr.fetchone()
- if res2 and res2[0]:
- res[event.id] = res2[0]
- else:
- res[event.id] = 0
- return res
-
- def write(self, cr, uid, ids,vals, *args, **kwargs):
- res = super(event,self).write(cr, uid, ids,vals, *args, **kwargs)
+ def write(self, cr, uid, ids, vals, *args, **kwargs):
+ res = super(event, self).write(cr, uid, ids, vals, *args, **kwargs)
if 'date_begin' in vals and vals['date_begin']:
for eve in self.browse(cr, uid, ids):
#change the deadlines of the registration linked to this event
- reg_ids = self.pool.get('event.registration').search(cr, uid, [('event_id','=',eve.id)])
+ reg_ids = self.pool.get('event.registration').search(cr, uid, [('event_id', '=', eve.id)])
if reg_ids:
- self.pool.get('event.registration').write(cr, uid, reg_ids, {'date_deadline':vals['date_begin']})
+ self.pool.get('event.registration').write(cr, uid, reg_ids, {'date_deadline': vals['date_begin']})
#change the description of the registration linked to this event
if 'mail_auto_confirm' in vals:
@@ -117,36 +101,36 @@ class event(osv.osv):
vals['mail_confirm']=False
if 'mail_confirm' in vals:
for eve in self.browse(cr, uid, ids):
- reg_ids = self.pool.get('event.registration').search(cr, uid, [('event_id','=',eve.id)])
+ reg_ids = self.pool.get('event.registration').search(cr, uid, [('event_id', '=', eve.id)])
if reg_ids:
- self.pool.get('event.registration').write(cr, uid, reg_ids, {'description':vals['mail_confirm']})
+ self.pool.get('event.registration').write(cr, uid, reg_ids, {'description': vals['mail_confirm']})
return res
_columns = {
- 'type': fields.many2one('event.type', 'Type'),
- 'section_id': fields.many2one('crm.case.section', 'Case section', required=True),
- 'register_max': fields.integer('Maximum Registrations'),
- 'register_min': fields.integer('Minimum Registrations'),
- 'register_current': fields.function(_get_register, method=True, string='Confirmed Registrations'),
- 'register_prospect': fields.function(_get_prospect, method=True, string='Unconfirmed Registrations'),
- 'date_begin': fields.datetime('Beginning date', required=True),
- 'date_end': fields.datetime('Ending date', required=True),
- 'state': fields.selection([('draft','Draft'),('confirm','Confirmed'),('done','Done'),('cancel','Cancelled')], 'State', readonly=True, required=True,
+ 'type': fields.many2one('event.type', 'Type'),
+ 'section_id': fields.many2one('crm.case.section', 'Case section', required=True),
+ 'register_max': fields.integer('Maximum Registrations'),
+ 'register_min': fields.integer('Minimum Registrations'),
+ 'register_current': fields.function(_get_register, method=True, string='Confirmed Registrations', multi='register_current'),
+ 'register_prospect': fields.function(_get_register, method=True, string='Unconfirmed Registrations', multi='register_prospect'),
+ 'date_begin': fields.datetime('Beginning date', required=True),
+ 'date_end': fields.datetime('Ending date', required=True),
+ 'state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, required=True,
help='If event is created, the state is \'Draft\'.\n If event is confirmed for the particular dates the state is set to \'Confirmed\'.\
- \nIf the event is over, the state is set to \'Done\'.\n If event is cancelled the state is set to \'Cancelled\'.'),
- 'mail_auto_registr':fields.boolean('Mail Auto Register',help='Check this box if you want to use the automatic mailing for new registration'),
- 'mail_auto_confirm':fields.boolean('Mail Auto Confirm',help='Check this box if you want ot use the automatic confirmation emailing or the reminder'),
- 'mail_registr':fields.text('Registration Email',help='This email will be sent when someone subscribes to the event.'),
- 'mail_confirm': fields.text('Confirmation Email', help="This email will be sent when the event gets confimed or when someone subscribes to a confirmed event. This is also the email sent to remind someone about the event."),
- 'product_id':fields.many2one('product.product','Product', required=True),
+ \nIf the event is over, the state is set to \'Done\'.\n If event is cancelled the state is set to \'Cancelled\'.'),
+ 'mail_auto_registr': fields.boolean('Mail Auto Register', help='Check this box if you want to use the automatic mailing for new registration'),
+ 'mail_auto_confirm': fields.boolean('Mail Auto Confirm', help='Check this box if you want ot use the automatic confirmation emailing or the reminder'),
+ 'mail_registr': fields.text('Registration Email', help='This email will be sent when someone subscribes to the event.'),
+ 'mail_confirm': fields.text('Confirmation Email', help="This email will be sent when the event gets confimed or when someone subscribes to a confirmed event. This is also the email sent to remind someone about the event."),
+ 'product_id': fields.many2one('product.product', 'Product', required=True),
}
_defaults = {
- 'state': lambda *args: 'draft',
- 'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'event.event'),
- 'user_id': lambda self,cr,uid,ctx: uid,
-
+ 'state': lambda *args: 'draft',
+ 'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'event.event'),
+ 'user_id': lambda self, cr, uid, ctx: uid,
}
+
event()
class event_registration(osv.osv):
@@ -156,48 +140,45 @@ class event_registration(osv.osv):
current_registration = self.browse(cr, uid, [ids[0]])[0]
total_confirmed = current_registration.event_id.register_current + current_registration.nb_register
if total_confirmed <= current_registration.event_id.register_max or current_registration.event_id.register_max == 0:
- self.write(cr, uid, [ids[0]], {'state':'open'}, context=context)
+ self.write(cr, uid, [ids[0]], {'state': 'open'}, context=context)
self._history(cr, uid, [ids[0]], 'Open', history=True)
self.mail_user(cr, uid, [ids[0]])
return True
else:
- model_data_ids = mod_obj.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_event_confirm_registration')], context=context)
+ model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'view_event_confirm_registration')], context=context)
resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
context.update({'reg_id': ids[0]})
return {
- 'name': _('Confirm Registration'),
- 'context': context,
- 'view_type': 'form',
- 'view_mode': 'tree,form',
- 'res_model': 'event.confirm.registration',
- 'views': [(resource_id,'form')],
- 'type': 'ir.actions.act_window',
- 'target': 'new',
+ 'name': _('Confirm Registration'),
+ 'context': context,
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'res_model': 'event.confirm.registration',
+ 'views': [(resource_id, 'form')],
+ 'type': 'ir.actions.act_window',
+ 'target': 'new',
'nodestroy': True
}
- def _history(self, cr, uid,ids,keyword, history=False, email=False, context={}):
+ def _history(self, cr, uid, ids, keyword, history=False, email=False, context={}):
for case in self.browse(cr, uid, ids):
- if not case.case_id:
- return True
data = {
- 'name': keyword,
- 'som': case.som.id,
- 'canal_id': case.canal_id.id,
- 'user_id': uid,
- 'case_id': case.case_id.id
+ 'name': keyword,
+ 'som': case.som.id,
+ 'canal_id': case.canal_id.id,
+ 'user_id': uid,
}
- obj = self.pool.get('crm.case.log')
- obj.create(cr, uid, data, context)
+ obj = self.pool.get('mailgate.message')
+ obj.create(cr, uid, data, context=context)
return True
def button_reg_close(self, cr, uid, ids, *args):
- self.write(cr, uid, ids, {'state':'done',})
+ self.write(cr, uid, ids, {'state': 'done', })
self._history(cr, uid, ids, 'Done', history=True)
return True
def button_reg_cancel(self, cr, uid, ids, *args):
- self.write(cr, uid, ids, {'state':'cancel',})
+ self.write(cr, uid, ids, {'state': 'cancel', })
self._history(cr, uid, ids, 'Cancel', history=True)
return True
@@ -207,7 +188,7 @@ class event_registration(osv.osv):
args[0]['date_deadline']= event.date_begin
args[0]['description']= event.mail_confirm
res = super(event_registration, self).create(cr, uid, *args, **argv)
- self._history(cr, uid,[res], 'Created', history=True)
+ self._history(cr, uid, [res], 'Created', history=True)
return res
def write(self, cr, uid, *args, **argv):
@@ -218,71 +199,76 @@ class event_registration(osv.osv):
args[1]['description']= event.mail_confirm
return super(event_registration, self).write(cr, uid, *args, **argv)
- def mail_user_confirm(self,cr,uid,ids):
- reg_ids=self.browse(cr,uid,ids)
+ def mail_user_confirm(self, cr, uid, ids):
+ reg_ids = self.browse(cr,uid,ids)
for reg_id in reg_ids:
src = reg_id.event_id.reply_to or False
- dest = [reg_id.email_from]
+ dest = []
+ if reg_id.email_from:
+ dest += [reg_id.email_from]
if reg_id.email_cc:
dest += [reg_id.email_cc]
if dest and src:
- tools.email_send(src, dest,'Auto Confirmation: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_confirm, openobject_id = str(reg_id.case_id.id))
+ tools.email_send(src, dest, 'Auto Confirmation: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_confirm, openobject_id = str(reg_id.id))
if not src:
raise osv.except_osv(_('Error!'), _('You must define a reply-to address in order to mail the participant. You can do this in the Mailing tab of your event. Note that this is also the place where you can configure your event to not send emails automaticly while registering'))
return False
- def mail_user(self,cr,uid,ids):
- reg_ids=self.browse(cr,uid,ids)
+ def mail_user(self, cr, uid, ids):
+ reg_ids = self.browse(cr, uid, ids)
for reg_id in reg_ids:
src = reg_id.event_id.reply_to or False
- dest = [reg_id.email_from]
+ dest = []
+ if reg_id.email_from:
+ dest += [reg_id.email_from]
if reg_id.email_cc:
dest += [reg_id.email_cc]
if reg_id.event_id.mail_auto_confirm or reg_id.event_id.mail_auto_registr:
if dest and src:
- if reg_id.event_id.state in ['draft', 'fixed', 'open','confirm','running'] and reg_id.event_id.mail_auto_registr:
- tools.email_send(src, dest,'Auto Registration: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_registr, openobject_id = str(reg_id.case_id.id))
- if (reg_id.event_id.state in ['confirm','running']) and reg_id.event_id.mail_auto_confirm:
- tools.email_send(src, dest,'Auto Confirmation: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_confirm, openobject_id = str(reg_id.case_id.id))
+ if reg_id.event_id.state in ['draft', 'fixed', 'open', 'confirm', 'running'] and reg_id.event_id.mail_auto_registr:
+ tools.email_send(src, dest, 'Auto Registration: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_registr, openobject_id = str(reg_id.id))
+ if (reg_id.event_id.state in ['confirm', 'running']) and reg_id.event_id.mail_auto_confirm:
+ tools.email_send(src, dest, 'Auto Confirmation: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_confirm, openobject_id = str(reg_id.id))
if not src:
raise osv.except_osv(_('Error!'), _('You must define a reply-to address in order to mail the participant. You can do this in the Mailing tab of your event. Note that this is also the place where you can configure your event to not send emails automaticly while registering'))
return False
def _create_invoice_lines(self, cr, uid, ids, vals):
- return self.pool.get('account.invoice.line').create(cr, uid,vals )
+ return self.pool.get('account.invoice.line').create(cr, uid, vals)
_name= 'event.registration'
_description = 'Event Registration'
- _inherits = {'crm.case': 'case_id'}
+ _inherit = 'crm.meeting'
+
_columns = {
- 'case_id':fields.many2one('crm.case','Case'),
- 'nb_register': fields.integer('Number of Registration', readonly=True, states={'draft':[('readonly',False)]}),
- 'event_id':fields.many2one('event.event', 'Event Related', required=True),
- "partner_invoice_id":fields.many2one('res.partner', 'Partner Invoiced'),
- "contact_id":fields.many2one('res.partner.contact', 'Partner Contact'), #TODO: filter only the contacts that have a function into the selected partner_id
- "unit_price": fields.float('Unit Price'),
- "badge_title":fields.char('Badge Title',size=128),
- "badge_name":fields.char('Badge Name',size=128),
- "badge_partner":fields.char('Badge Partner',size=128),
- "invoice_label":fields.char("Label Invoice",size=128,required=True),
- "tobe_invoiced":fields.boolean("To be Invoiced"),
- "invoice_id":fields.many2one("account.invoice","Invoice"),
- 'date_closed': fields.datetime('Closed', readonly=True),
- 'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
- 'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
- 'categ_id': fields.many2one('crm.case.categ','Category', domain="[('section_id','=',section_id)]"),
- 'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
- " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
+ 'email_cc': fields.text('Watchers Emails', size=252 , help="These \
+people will receive a copy of the future communication between partner \
+and users by email"),
+ 'nb_register': fields.integer('Number of Registration', readonly=True, states={'draft': [('readonly', False)]}),
+ 'event_id': fields.many2one('event.event', 'Event Related', required=True),
+ "partner_invoice_id": fields.many2one('res.partner', 'Partner Invoiced'),
+ "contact_id": fields.many2one('res.partner.contact', 'Partner Contact'), #TODO: filter only the contacts that have a function into the selected partner_id
+ "unit_price": fields.float('Unit Price'),
+ "badge_title": fields.char('Badge Title', size=128),
+ "badge_name": fields.char('Badge Name', size=128),
+ "badge_partner": fields.char('Badge Partner', size=128),
+ "invoice_label": fields.char("Label Invoice", size=128, required=True),
+ "tobe_invoiced": fields.boolean("To be Invoiced"),
+ "invoice_id": fields.many2one("account.invoice", "Invoice"),
+ 'date_closed': fields.datetime('Closed', readonly=True),
+ 'ref': fields.reference('Reference', selection=crm._links_get, size=128),
+ 'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128),
+ 'canal_id': fields.many2one('res.partner.canal', 'Channel', help="The channels represent the different communication modes available with the customer." \
+ " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
"the partner mentality in relation to our services.The scale has" \
- "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
-
+ "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
}
+
_defaults = {
- 'nb_register': lambda *a: 1,
- 'tobe_invoiced' : lambda *a: True,
- 'name': lambda *a: 'Registration',
- 'state': lambda *b: 'draft'
+ 'nb_register': lambda *a: 1,
+ 'tobe_invoiced': lambda *a: True,
+ 'name': lambda *a: 'Registration',
}
def onchange_badge_name(self, cr, uid, ids, badge_name):
@@ -290,7 +276,7 @@ class event_registration(osv.osv):
if not badge_name:
return data
data['name'] = 'Registration: ' + badge_name
- return {'value':data}
+ return {'value': data}
def onchange_contact_id(self, cr, uid, ids, contact, partner):
data ={}
@@ -300,109 +286,76 @@ class event_registration(osv.osv):
data['badge_name'] = contact_id.name
data['badge_title'] = contact_id.title
if partner:
- partner_addresses = self.pool.get('res.partner.address').search(cr, uid, [('partner_id','=',partner)])
- job_ids = self.pool.get('res.partner.job').search(cr, uid, [('contact_id','=',contact),('address_id','in',partner_addresses)])
+ partner_addresses = self.pool.get('res.partner.address').search(cr, uid, [('partner_id', '=', partner)])
+ job_ids = self.pool.get('res.partner.job').search(cr, uid, [('contact_id', '=', contact), ('address_id', 'in', partner_addresses)])
if job_ids:
data['email_from'] = self.pool.get('res.partner.job').browse(cr, uid, job_ids[0]).email
- d = self.onchange_badge_name(cr, uid, ids,data['badge_name'])
+ d = self.onchange_badge_name(cr, uid, ids, data['badge_name'])
data.update(d['value'])
- return {'value':data}
+ return {'value': data}
def onchange_event(self, cr, uid, ids, event_id, partner_invoice_id):
context={}
if not event_id:
- return {'value':{'unit_price' : False ,'invoice_label' : False }}
- data_event = self.pool.get('event.event').browse(cr,uid,event_id)
+ return {'value': {'unit_price': False , 'invoice_label': False }}
+ data_event = self.pool.get('event.event').browse(cr, uid, event_id)
if data_event.product_id:
if not partner_invoice_id:
- unit_price=self.pool.get('product.product').price_get(cr, uid, [data_event.product_id.id],context=context)[data_event.product_id.id]
- return {'value':{'unit_price' : unit_price , 'invoice_label' : data_event.product_id.name}}
- data_partner = self.pool.get('res.partner').browse(cr,uid,partner_invoice_id)
- context.update({'partner_id':data_partner})
- unit_price = self.pool.get('product.product')._product_price(cr, uid, [data_event.product_id.id], False, False, {'pricelist':data_partner.property_product_pricelist.id})[data_event.product_id.id]
- return {'value':{'unit_price' :unit_price , 'invoice_label' : data_event.product_id.name}}
- return {'value':{'unit_price' : False,'invoice_label' : False}}
+ unit_price=self.pool.get('product.product').price_get(cr, uid, [data_event.product_id.id], context=context)[data_event.product_id.id]
+ return {'value': {'unit_price': unit_price , 'invoice_label': data_event.product_id.name}}
+ data_partner = self.pool.get('res.partner').browse(cr, uid, partner_invoice_id)
+ context.update({'partner_id': data_partner})
+ unit_price = self.pool.get('product.product')._product_price(cr, uid, [data_event.product_id.id], False, False, {'pricelist': data_partner.property_product_pricelist.id})[data_event.product_id.id]
+ return {'value': {'unit_price': unit_price , 'invoice_label': data_event.product_id.name}}
+ return {'value': {'unit_price': False, 'invoice_label': False}}
def onchange_partner_id(self, cr, uid, ids, part, event_id, email=False):
data={}
data['badge_partner'] = data['contact_id'] = data['partner_invoice_id'] = data['email_from'] = data['badge_title'] = data['badge_name'] = False
if not part:
- return {'value':data}
+ return {'value': data}
data['partner_invoice_id']=part
# this calls onchange_partner_invoice_id
- d = self.onchange_partner_invoice_id(cr, uid, ids, event_id,part)
+ d = self.onchange_partner_invoice_id(cr, uid, ids, event_id, part)
# this updates the dictionary
data.update(d['value'])
addr = self.pool.get('res.partner').address_get(cr, uid, [part])
if addr:
if addr.has_key('default'):
- job_ids = self.pool.get('res.partner.job').search(cr, uid, [('address_id','=',addr['default'])])
+ job_ids = self.pool.get('res.partner.job').search(cr, uid, [('address_id', '=', addr['default'])])
if job_ids:
data['contact_id'] = self.pool.get('res.partner.job').browse(cr, uid, job_ids[0]).contact_id.id
- d = self.onchange_contact_id(cr, uid, ids, data['contact_id'],part)
+ d = self.onchange_contact_id(cr, uid, ids, data['contact_id'], part)
data.update(d['value'])
partner_data = self.pool.get('res.partner').browse(cr, uid, part)
data['badge_partner'] = partner_data.name
- return {'value':data}
+ return {'value': data}
def onchange_partner_invoice_id(self, cr, uid, ids, event_id, partner_invoice_id):
data={}
context={}
data['unit_price']=False
if not event_id:
- return {'value':data}
- data_event = self.pool.get('event.event').browse(cr,uid,event_id)
+ return {'value': data}
+ data_event = self.pool.get('event.event').browse(cr, uid, event_id)
if data_event.product_id:
if not partner_invoice_id:
- data['unit_price']=self.pool.get('product.product').price_get(cr, uid, [data_event.product_id.id],context=context)[data_event.product_id.id]
- return {'value':data}
- data_partner = self.pool.get('res.partner').browse(cr,uid,partner_invoice_id)
- context.update({'partner_id':data_partner})
- data['unit_price'] = self.pool.get('product.product')._product_price(cr, uid, [data_event.product_id.id], False, False, {'pricelist':data_partner.property_product_pricelist.id})[data_event.product_id.id]
- return {'value':data}
- return {'value':data}
+ data['unit_price']=self.pool.get('product.product').price_get(cr, uid, [data_event.product_id.id], context=context)[data_event.product_id.id]
+ return {'value': data}
+ data_partner = self.pool.get('res.partner').browse(cr, uid, partner_invoice_id)
+ context.update({'partner_id': data_partner})
+ data['unit_price'] = self.pool.get('product.product')._product_price(cr, uid, [data_event.product_id.id], False, False, {'pricelist': data_partner.property_product_pricelist.id})[data_event.product_id.id]
+ return {'value': data}
+ return {'value': data}
def onchange_categ_id(self, cr, uid, ids, categ, context={}):
if not categ:
- return {'value':{}}
+ return {'value': {}}
cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability
- return {'value':{'probability':cat}}
-
- def _map_ids(self,method,cr, uid, ids, *args, **argv):
- case_data = self.browse(cr,uid,ids)
- new_ids=[]
- for case in case_data:
- if case.case_id:
- new_ids.append(case.case_id.id)
- return getattr(self.pool.get('crm.case'),method)(cr, uid, new_ids, *args, **argv)
-
-
- def case_close(self,cr, uid, ids, *args, **argv):
- return self._map_ids('case_close',cr,uid,ids,*args,**argv)
- def case_escalate(self,cr, uid, ids, *args, **argv):
- return self._map_ids('case_escalate',cr,uid,ids,*args,**argv)
- def case_open(self,cr, uid, ids, *args, **argv):
- return self._map_ids('case_open',cr,uid,ids,*args,**argv)
- def case_cancel(self,cr, uid, ids, *args, **argv):
- return self._map_ids('case_cancel',cr,uid,ids,*args,**argv)
- def case_pending(self,cr, uid, ids, *args, **argv):
- return self._map_ids('case_pending',cr,uid,ids,*args,**argv)
- def case_reset(self,cr, uid, ids, *args, **argv):
- return self._map_ids('case_reset',cr,uid,ids,*args,**argv)
- def case_log(self,cr, uid, ids, *args, **argv):
- return self._map_ids('case_log',cr,uid,ids,*args,**argv)
- def case_log_reply(self,cr, uid, ids, *args, **argv):
- return self._map_ids('case_log_reply',cr,uid,ids,*args,**argv)
- def add_reply(self,cr, uid, ids, *args, **argv):
- return self._map_ids('add_reply',cr,uid,ids,*args,**argv)
- def remind_partner(self,cr, uid, ids, *args, **argv):
- return self._map_ids('remind_partner',cr,uid,ids,*args,**argv)
- def remind_user(self,cr, uid, ids, *args, **argv):
- return self._map_ids('remind_user',cr,uid,ids,*args,**argv)
-
+ return {'value': {'probability': cat}}
event_registration()
@@ -413,12 +366,12 @@ class report_event_registration(osv.osv):
_description = "Events on registrations"
_auto = False
_columns = {
- 'name': fields.char('Event',size=20),
- 'date_begin': fields.datetime('Beginning date', required=True),
- 'date_end': fields.datetime('Ending date', required=True),
- 'draft_state': fields.integer('Draft Registration',size=20),
- 'confirm_state': fields.integer('Confirm Registration',size=20),
- 'register_max': fields.integer('Maximum Registrations'),
+ 'name': fields.char('Event', size=20),
+ 'date_begin': fields.datetime('Beginning date', required=True),
+ 'date_end': fields.datetime('Ending date', required=True),
+ 'draft_state': fields.integer('Draft Registration', size=20),
+ 'confirm_state': fields.integer('Confirm Registration', size=20),
+ 'register_max': fields.integer('Maximum Registrations'),
}
def init(self, cr):
cr.execute("""
@@ -428,8 +381,8 @@ class report_event_registration(osv.osv):
c.name as name,
e.date_begin as date_begin,
e.date_end as date_end,
- (SELECT sum(nb_register) FROM event_registration x , crm_case c WHERE x.case_id=c.id and c.section_id=e.section_id and state in ('draft')) as draft_state,
- (SELECT sum(nb_register) FROM event_registration x , crm_case c WHERE x.case_id=c.id and c.section_id=e.section_id and state in ('open')) as confirm_state,
+ (SELECT sum(c.nb_register) FROM event_registration c WHERE c.section_id=e.section_id and state in ('draft')) as draft_state,
+ (SELECT sum(c.nb_register) FROM event_registration c WHERE c.section_id=e.section_id and state in ('open')) as confirm_state,
e.register_max as register_max
from
event_event e,crm_case_section c
@@ -444,19 +397,21 @@ class report_event_type_registration(osv.osv):
_description = "Event type on registration"
_auto = False
_columns = {
- 'name': fields.char('Event Type',size=20),
- 'nbevent':fields.integer('Number Of Events'),
- 'draft_state': fields.integer('Draft Registrations',size=20),
- 'confirm_state': fields.integer('Confirm Registrations',size=20),
+ 'name': fields.char('Event Type', size=20),
+ 'nbevent': fields.integer('Number Of Events'),
+ 'draft_state': fields.integer('Draft Registrations', size=20),
+ 'confirm_state': fields.integer('Confirm Registrations', size=20),
}
+
+
def init(self, cr):
cr.execute("""
create or replace view report_event_type_registration as (
select
count(t.id) as id,
t.name as name,
- (select sum(nb_register) from event_registration r , crm_case c , event_event e where c.section_id=e.section_id and r.case_id=c.id and c.state='draft' and e.type=t.id ) as draft_state ,
- (select sum(nb_register) from event_registration r , crm_case c , event_event e where c.section_id=e.section_id and r.case_id=c.id and c.state='open' and e.type=t.id ) as confirm_state,
+ (select sum(c.nb_register) from event_registration c, event_event e where c.section_id=e.section_id and c.state='draft' and e.type=t.id ) as draft_state ,
+ (select sum(c.nb_register) from event_registration c, event_event e where c.section_id=e.section_id and c.state='open' and e.type=t.id ) as confirm_state,
count(t.id) as nbevent
from
event_event e
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index cb13b0662a8..37ac26ac7b4 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -33,8 +33,8 @@
event.typeform
-
-
+
+
@@ -126,7 +126,6 @@
-
@@ -147,6 +146,7 @@
event.eventformtree,form
+ {"search_default_user_id":uid}
@@ -221,23 +221,26 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -271,7 +274,6 @@
-
@@ -292,6 +294,7 @@
formtree,form
+ {"search_default_user_id":uid}
-
+
hr.contract.view.formhr.contract
diff --git a/addons/hr_contract/i18n/ar.po b/addons/hr_contract/i18n/ar.po
index 3ac9d53e7a9..4122d40f142 100644
--- a/addons/hr_contract/i18n/ar.po
+++ b/addons/hr_contract/i18n/ar.po
@@ -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 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-05-17 17:45+0000\n"
+"Last-Translator: aakari \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:14+0000\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:12+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_contract
@@ -81,7 +81,7 @@ msgstr ""
#. module: hr_contract
#: field:hr.contract,function:0
msgid "Function"
-msgstr ""
+msgstr "الدالة"
#. module: hr_contract
#: field:hr.employee,marital_status:0
@@ -90,7 +90,7 @@ msgstr ""
#: model:ir.actions.act_window,name:hr_contract.action_hr_marital_status
#: model:ir.ui.menu,name:hr_contract.hr_menu_marital_status
msgid "Marital Status"
-msgstr ""
+msgstr "الحالة الزوجية"
#. module: hr_contract
#: view:hr.employee:0
@@ -107,7 +107,7 @@ msgstr ""
#. module: hr_contract
#: field:hr.contract.wage.type,type:0
msgid "Type"
-msgstr ""
+msgstr "النّوع"
#. module: hr_contract
#: field:hr.contract,wage_type_id:0
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index b4d7d1c39d0..99e3a03c4b9 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -346,7 +346,6 @@
-
@@ -362,7 +361,7 @@
formtree,form[('is_evaluation' ,'=', True)]
- {"search_default_todo":1,"search_default_my":1}
+ {"search_default_todo":1,"search_default_user_id":uid}
diff --git a/addons/hr_evaluation/i18n/zh_CN.po b/addons/hr_evaluation/i18n/zh_CN.po
new file mode 100644
index 00000000000..39db3d4077c
--- /dev/null
+++ b/addons/hr_evaluation/i18n/zh_CN.po
@@ -0,0 +1,277 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-11-25 12:18+0000\n"
+"PO-Revision-Date: 2010-05-15 06:32+0000\n"
+"Last-Translator: Wei \"oldrev\" Li \n"
+"Language-Team: Chinese (Simplified) \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-17 05:01+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+#: field:hr_evaluation.type,info:0
+msgid "Information"
+msgstr ""
+
+#. module: hr_evaluation
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Schedule next evaluation"
+msgstr "安排下次考核"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_bad:0
+msgid "Bad Points"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_my_list
+msgid "My Next Evaluation"
+msgstr "我的下次考核"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,value_ids:0
+msgid "Values"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_good:0
+msgid "Good Points"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,score:0
+#: field:hr_evaluation.quote,score:0
+#: field:hr_evaluation.type,score:0
+#: field:hr_evaluation.type.value,score:0
+msgid "Score"
+msgstr "评分"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Informal Data"
+msgstr ""
+
+#. module: hr_evaluation
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,employee_id:0
+msgid "Employee"
+msgstr "员工"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_improve:0
+msgid "To Improve"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,evaluation_id:0
+msgid "Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type.value,type_id:0
+msgid "Evaluation Type"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Status"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Apply to categories"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.module.module,description:hr_evaluation.module_meta_information
+msgid "Ability to create employees evaluation."
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,name:0
+msgid "Quote"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,category_ids:0
+msgid "Appliable Role"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,user_id:0
+msgid "Evaluation User"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Choices Results"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,date:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_form
+msgid "Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_config
+msgid "Configuration"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_list
+msgid "Next Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_evaluation_type_form
+msgid "Evaluation Criterions"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_my_old_evaluation_list
+msgid "My Preceeding Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_resp_hr
+msgid "HR Responsible"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,value_id:0
+#: field:hr_evaluation.type.value,name:0
+msgid "Value"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,name:0
+msgid "Summary"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
+msgid "Employee Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type
+msgid "Employee Evaluation Type"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Quotations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_list
+msgid "Next Employee Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,type_id:0
+msgid "Type"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+#: field:hr_evaluation.type,name:0
+msgid "Evaluation Criterion"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_my_list
+msgid "My Next Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.quote:0
+msgid "Evalution Quote"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
+msgid "Human Resources Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,quote_ids:0
+msgid "Quotes"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Done"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_quote
+msgid "Employee Evaluation Quote"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_employee:0
+msgid "Employee Response"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type_value
+msgid "Evaluation Type Value"
+msgstr ""
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index 3f3948c00db..e43c73ed108 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -8,3 +8,5 @@
"access_hr_evaluation_interview","hr.evaluation.interview","model_hr_evaluation_interview","hr.group_hr_user",1,0,0,0
"access_hr_evaluation_interview_manager","hr.evaluation.interview","model_hr_evaluation_interview","hr.group_hr_manager",1,1,1,1
"access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report",,1,0,0,0
+"access_hr_evaluation_reminder_manager","hr.evaluation.reminder","model_hr_evaluation_reminder","hr.group_hr_manager",1,1,1,1
+"access_hr_evaluation_reminder","hr.evaluation.reminder","model_hr_evaluation_reminder","hr.group_hr_user",1,0,0,0
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 03fab346c77..d8d6e23ac51 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -51,7 +51,9 @@
'process/hr_expense_process.xml',
'report/hr_expense_report_view.xml'
],
- 'demo_xml': ['hr.expense.expense.csv'],
+ 'demo_xml': ['hr_expense_demo.xml',
+# 'hr.expense.expense.csv'
+ ],
'installable': True,
'active': False,
'certificate': '0062479841789',
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 4e1e3033a92..5e40e6e5773 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -50,7 +50,7 @@ class hr_expense_expense(osv.osv):
return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)])[0]
_name = "hr.expense.expense"
- _description = "HR Expense"
+ _description = "Expense"
_columns = {
'name': fields.char('Expense Sheet', size=128, required=True),
'id': fields.integer('Sheet ID', readonly=True),
diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml
new file mode 100644
index 00000000000..51a77f8d4e9
--- /dev/null
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+ September Expenses
+
+ 2010-05-03
+ draft
+
+
+ Travel by Car - Customer Seagate 2 - Double
+ 2010-05-03
+
+
+
+
+
+
+ Basic PC - Server for Seagate
+ 2010-05-03
+
+
+
+
+
+
+
+
+
+
+
+ Hotel Expenses
+
+ 2010-04-20
+ draft
+
+
+ Hotel Expenses - Thymbra
+ 2010-05-03
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 37b7eb27900..4562886af6c 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -66,7 +66,6 @@
@@ -133,7 +136,7 @@
hr.expense.reportformtree,graph
- {'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}
+ {'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}
diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index aa00dab4fa1..43ae736b9ff 100644
--- a/addons/hr_expense/security/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
@@ -1,3 +1,4 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_hr_expense_expense","hr.expense.expense","model_hr_expense_expense","hr.group_hr_user",1,1,1,1
"access_hr_expense_line","hr.expense.line","model_hr_expense_line","hr.group_hr_user",1,1,1,1
+"access_hr_expense_report","hr.expense.report","model_hr_expense_report","hr.group_hr_user",1,0,0,0
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 412d4218df8..1d99a417d34 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -20,18 +20,34 @@
# along with this program. If not, see .
#
##############################################################################
-
-from mx import DateTime
import time
+import datetime
import pooler
import netsvc
-import datetime
from osv import fields, osv
from tools.translate import _
class hr_holidays_status(osv.osv):
_name = "hr.holidays.status"
- _description = "Leave Types"
+ _description = "Leave Type"
+
+ def get_days_cat(self, cr, uid, ids, category_id, return_false, context={}):
+ res = {}
+ for record in self.browse(cr, uid, ids, context):
+ res[record.id] = {}
+ max_leaves = leaves_taken = 0
+ if not return_false:
+ cr.execute("""SELECT type, sum(number_of_days) FROM hr_holidays WHERE category_id = %s AND state='validate' AND holiday_status_id = %s GROUP BY type""", (str(category_id), str(record.id)))
+ for line in cr.fetchall():
+ if line[0] =='remove':
+ leaves_taken = -line[1]
+ if line[0] =='add':
+ max_leaves = line[1]
+ res[record.id]['max_leaves'] = max_leaves
+ res[record.id]['leaves_taken'] = leaves_taken
+ res[record.id]['remaining_leaves'] = max_leaves - leaves_taken
+ return res
+
def get_days(self, cr, uid, ids, employee_id, return_false, context={}):
res = {}
for record in self.browse(cr, uid, ids, context):
@@ -53,8 +69,6 @@ class hr_holidays_status(osv.osv):
return_false = False
employee_id = False
res = {}
- for id in ids:
- res[id] = {}.fromkeys(name, 0)
if context and context.has_key('employee_id'):
if not context['employee_id']:
return_false = True
@@ -67,31 +81,35 @@ class hr_holidays_status(osv.osv):
return_false = True
if employee_id:
res = self.get_days(cr, uid, ids, employee_id, return_false, context=context)
+ else:
+ res = dict.fromkeys(ids, {name: 0})
return res
+ # To do: we can add remaining_leaves_category field to display remaining leaves for particular type
_columns = {
- 'name' : fields.char('Name', size=64, required=True, translate=True),
+ 'name': fields.char('Name', size=64, required=True, translate=True),
'categ_id': fields.many2one('crm.case.categ', 'Meeting Category', domain="[('object_id.model', '=', 'crm.meeting')]", help='If you link this type of leave with a category in the CRM, it will synchronize each leave asked with a case in this category, to display it in the company shared calendar for example.'),
- 'color_name' : fields.selection([('red', 'Red'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'),
- 'limit' : fields.boolean('Allow to Override Limit', help='If you thick this checkbox, the system will allow, for this team, the employees to take more leaves than the available ones.'),
- 'active' : fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."),
- 'max_leaves' : fields.function(_user_left_days, method=True, string='Maximum Leaves Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'),
- 'leaves_taken' : fields.function(_user_left_days, method=True, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'),
- 'remaining_leaves' : fields.function(_user_left_days, method=True, string='Remaining Leaves', help='Maximum Leaves Allowed - Leaves Already Taken', multi='user_left_days'),
-
+ 'color_name': fields.selection([('red', 'Red'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'),
+ 'limit': fields.boolean('Allow to Override Limit', help='If you thick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones.'),
+ 'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."),
+ 'max_leaves': fields.function(_user_left_days, method=True, string='Maximum Leaves Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'),
+ 'leaves_taken': fields.function(_user_left_days, method=True, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'),
+ 'remaining_leaves': fields.function(_user_left_days, method=True, string='Remaining Leaves', help='Maximum Leaves Allowed - Leaves Already Taken', multi='user_left_days'),
+ 'double_validation': fields.boolean('Apply Double Validation', help="If its True then its Allocation/Request have to be validated by second validator")
}
_defaults = {
- 'color_name': lambda *args: 'red',
- 'active' : lambda *a: True,
+ 'color_name': 'red',
+ 'active': True,
}
+
hr_holidays_status()
class hr_holidays(osv.osv):
_name = "hr.holidays"
- _description = "Holidays"
+ _description = "Leave"
_order = "type desc, date_from asc"
- def _employee_get(obj,cr,uid,context={}):
+ def _employee_get(obj, cr, uid, context=None):
ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
if ids:
return ids[0]
@@ -99,7 +117,7 @@ class hr_holidays(osv.osv):
_columns = {
'name' : fields.char('Description', required=True, readonly=True, size=64, states={'draft':[('readonly',False)]}),
- 'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Validation'), ('refuse', 'Refused'), ('validate', 'Validated'), ('cancel', 'Cancelled')], 'State', readonly=True, help='When the holiday request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Validation\'.\
+ 'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Validation'), ('refuse', 'Refused'), ('validate1', 'Waiting Second Validation'), ('validate', 'Validated'), ('cancel', 'Cancelled')], 'State', readonly=True, help='When the holiday request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Validation\'.\
If the admin accepts it, the state is \'Validated\'. If it is refused, the state is \'Refused\'.'),
'date_from' : fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)]}),
'user_id':fields.many2one('res.users', 'User', states={'draft':[('readonly',False)]}, select=True, readonly=True),
@@ -116,31 +134,99 @@ class hr_holidays(osv.osv):
'parent_id': fields.many2one('hr.holidays', 'Parent'),
'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
- }
+ 'category_id': fields.many2one('hr.employee.category', "Employee Category", help='Category Of employee'),
+ 'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Holiday Type', help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category'),
+ 'manager_id2': fields.many2one('hr.employee', 'Second Validator', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)')
+ }
_defaults = {
'employee_id' : _employee_get ,
- 'state' : lambda *a: 'draft',
- 'type': lambda *a: 'remove',
- 'allocation_type': lambda *a: 'employee',
+ 'state' : 'draft',
+ 'type': 'remove',
+ 'allocation_type': 'employee',
'user_id': lambda obj, cr, uid, context: uid,
+ 'holiday_type': 'employee'
}
- _order = 'date_from desc'
- def create(self, cr, uid, vals, context={}):
- if context:
- if context.has_key('type'):
- vals['type'] = context['type']
- if context.has_key('allocation_type'):
- vals['allocation_type'] = context['allocation_type']
- return super(osv.osv,self).create(cr, uid, vals, context)
+ def create(self, cr, uid, vals, context=None):
+ if context is None:
+ context = {}
+ if 'holiday_type' in vals:
+ if vals['holiday_type'] == 'employee':
+ vals.update({'category_id': False})
+ else:
+ vals.update({'employee_id': False})
+ if context.has_key('type'):
+ vals['type'] = context['type']
+ if context.has_key('allocation_type'):
+ vals['allocation_type'] = context['allocation_type']
+ return super(hr_holidays, self).create(cr, uid, vals, context=context)
+
+ def write(self, cr, uid, ids, vals, context=None):
+ if context is None:
+ context = {}
+ if 'holiday_type' in vals:
+ if vals['holiday_type'] == 'employee':
+ vals.update({'category_id': False})
+ else:
+ vals.update({'employee_id': False})
+ return super(hr_holidays, self).write(cr, uid, ids, vals, context=context)
+
+ def onchange_type(self, cr, uid, ids, holiday_type):
+ result = {}
+ if holiday_type=='employee':
+ ids_employee = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
+ if ids_employee:
+ result['value'] = {
+ 'employee_id': ids_employee[0]
+ }
+ return result
+
+ def _get_number_of_days(self, date_from, date_to):
+ """Returns a float equals to the timedelta between two dates given as string."""
+
+ DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S"
+ from_dt = datetime.datetime.strptime(date_from, DATETIME_FORMAT)
+ to_dt = datetime.datetime.strptime(date_to, DATETIME_FORMAT)
+ timedelta = to_dt - from_dt
+ diff_day = timedelta.days + float(timedelta.seconds) / 86400
+ return diff_day
+
+ def _update_user_holidays(self, cr, uid, ids):
+ for record in self.browse(cr, uid, ids):
+ if record.state=='validate':
+ if record.case_id:
+ self.pool.get('crm.meeting').unlink(cr,uid,[record.case_id.id])
+ if record.linked_request_ids:
+ list_ids = []
+ [list_ids.append(i) for id in record.linked_request_ids]
+ self.holidays_cancel(cr, uid, list_ids)
+ self.unlink(cr, uid, list_ids)
+
+ def _check_date(self, cr, uid, ids):
+ for rec in self.read(cr, uid, ids, ['number_of_days_temp','date_from','date_to']):
+ if rec['number_of_days_temp'] < 0:
+ return False
+ date_from = time.strptime(rec['date_from'], '%Y-%m-%d %H:%M:%S')
+ date_to = time.strptime(rec['date_to'], '%Y-%m-%d %H:%M:%S')
+ if date_from > date_to:
+ return False
+ return True
+
+ _constraints = [(_check_date, 'Start date should not be larger than end date!\nNumber of Days should be greater than 1!', ['number_of_days_temp'])]
+
+ def unlink(self, cr, uid, ids, context={}):
+ leave_obj = self.pool.get('resource.calendar.leaves')
+ self._update_user_holidays(cr, uid, ids)
+ leave_ids = leave_obj.search(cr, uid, [('holiday_id', 'in', ids)])
+ leave_obj.unlink(cr, uid, leave_ids)
+ return super(hr_holidays, self).unlink(cr, uid, ids, context)
+
def onchange_date_from(self, cr, uid, ids, date_to, date_from):
result = {}
if date_to and date_from:
- from_dt = time.mktime(time.strptime(date_from,'%Y-%m-%d %H:%M:%S'))
- to_dt = time.mktime(time.strptime(date_to,'%Y-%m-%d %H:%M:%S'))
- diff_day = (to_dt-from_dt)/(3600*24)
+ diff_day = self._get_number_of_days(date_from, date_to)
result['value'] = {
'number_of_days_temp': round(diff_day)+1
}
@@ -150,48 +236,8 @@ class hr_holidays(osv.osv):
}
return result
- def _update_user_holidays(self, cr, uid, ids):
- for record in self.browse(cr, uid, ids):
- if record.state=='validate':
- if record.case_id:
- self.pool.get('crm.meeting').unlink(cr,uid,[record.case_id.id])
- if record.linked_request_ids:
- list_ids = []
- for id in record.linked_request_ids:
- list_ids.append(id.id)
- self.holidays_cancel(cr,uid,list_ids)
- self.unlink(cr,uid,list_ids)
-
- def _check_date(self, cr, uid, ids):
- if ids:
- cr.execute('select number_of_days_temp from hr_holidays where id in ('+','.join(map(str, ids))+')')
- res = cr.fetchall()
- if res and res[0][0] < 0:
- return False
- return True
-
- _constraints = [(_check_date, 'Start date should not be larger than end date! ', ['number_of_days'])]
-
-
- def unlink(self, cr, uid, ids, context={}):
- self._update_user_holidays(cr, uid, ids)
- return super(hr_holidays, self).unlink(cr, uid, ids, context)
-
-
def onchange_date_to(self, cr, uid, ids, date_from, date_to):
- result = {}
- if date_from and date_to:
- from_dt = time.mktime(time.strptime(date_from,'%Y-%m-%d %H:%M:%S'))
- to_dt = time.mktime(time.strptime(date_to,'%Y-%m-%d %H:%M:%S'))
- diff_day = (to_dt-from_dt)/(3600*24)
- result['value'] = {
- 'number_of_days_temp': round(diff_day)+1
- }
- return result
- result['value'] = {
- 'number_of_days_temp': 0
- }
- return result
+ return self.onchange_date_from(cr, uid, ids, date_to, date_from)
def onchange_sec_id(self, cr, uid, ids, status, context={}):
warning = {}
@@ -204,7 +250,6 @@ class hr_holidays(osv.osv):
}
return {'warning': warning}
-
def set_to_draft(self, cr, uid, ids, *args):
self.write(cr, uid, ids, {
'state':'draft',
@@ -216,43 +261,64 @@ class hr_holidays(osv.osv):
wf_service.trg_create(uid, 'hr.holidays', holiday_id, cr)
return True
- def holidays_validate(self, cr, uid, ids, *args):
- self.check_holidays(cr,uid,ids)
- vals = {
- 'state':'validate',
- }
+ def holidays_validate2(self, cr, uid, ids, *args):
+ vals = {'state':'validate1'}
+ self.check_holidays(cr, uid, ids)
ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
if ids2:
vals['manager_id'] = ids2[0]
else:
raise osv.except_osv(_('Warning !'),_('No user related to the selected employee.'))
self.write(cr, uid, ids, vals)
- for record in self.browse(cr, uid, ids):
- if record.type=='remove':
- vals= {
- 'name':record.name,
- 'date_from':record.date_from,
- 'date_to':record.date_to,
- 'calendar_id':record.employee_id.calendar_id.id,
- 'company_id':record.employee_id.company_id.id,
- 'resource_id':record.employee_id.resource_id.id
+ return True
+
+ def holidays_validate(self, cr, uid, ids, *args):
+ data_holiday = self.browse(cr, uid, ids)
+ self.check_holidays(cr, uid, ids)
+ vals = {'state':'validate'}
+ ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
+ if ids2:
+ if data_holiday[0].state == 'validate1':
+ vals['manager_id2'] = ids2[0]
+ else:
+ vals['manager_id'] = ids2[0]
+ else:
+ raise osv.except_osv(_('Warning !'),_('No user related to the selected employee.'))
+ self.write(cr, uid, ids, vals)
+ for record in data_holiday:
+ if record.holiday_type=='employee' and record.type=='remove':
+ vals = {
+ 'name':record.name,
+ 'date_from':record.date_from,
+ 'date_to':record.date_to,
+ 'calendar_id':record.employee_id.calendar_id.id,
+ 'company_id':record.employee_id.company_id.id,
+ 'resource_id':record.employee_id.resource_id.id,
+ 'holiday_id':record.id
}
- self.pool.get('resource.calendar.leaves').create(cr,uid,vals)
+ self.pool.get('resource.calendar.leaves').create(cr, uid, vals)
return True
def holidays_confirm(self, cr, uid, ids, *args):
for record in self.browse(cr, uid, ids):
user_id = False
leave_asked = record.number_of_days_temp
- if record.type == 'remove':
+ if record.holiday_type=='employee' and record.type == 'remove':
if record.employee_id and not record.holiday_status_id.limit:
leaves_rest = self.pool.get('hr.holidays.status').get_days( cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
if leaves_rest < leave_asked:
raise osv.except_osv(_('Warning!'),_('You cannot validate leaves for %s while available leaves are less than asked leaves.' %(record.employee_id.name)))
nb = -(record.number_of_days_temp)
+ elif record.holiday_type=='category' and record.type == 'remove':
+ if record.category_id and not record.holiday_status_id.limit:
+ leaves_rest = self.pool.get('hr.holidays.status').get_days_cat( cr, uid, [record.holiday_status_id.id], record.category_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
+ if leaves_rest < leave_asked:
+ raise osv.except_osv(_('Warning!'),_('You cannot validate leaves for %s while available leaves are less than asked leaves.' %(record.category_id.name)))
+ nb = -(record.number_of_days_temp)
else:
nb = record.number_of_days_temp
- if record.employee_id:
+
+ if record.holiday_type=='employee' and record.employee_id:
user_id = record.employee_id.user_id and record.employee_id.user_id.id or uid
self.write(cr, uid, [record.id], {
@@ -273,31 +339,41 @@ class hr_holidays(osv.osv):
return True
def holidays_cancel(self, cr, uid, ids, *args):
+ leave_obj = self.pool.get('resource.calendar.leaves')
self._update_user_holidays(cr, uid, ids)
self.write(cr, uid, ids, {
'state':'cancel'
})
+ leave_ids = leave_obj.search(cr, uid, [('holiday_id', 'in', ids)])
+ leave_obj.unlink(cr, uid, leave_ids)
return True
def holidays_draft(self, cr, uid, ids, *args):
self.write(cr, uid, ids, {
'state':'draft'
})
+ self.pool.get('resource.calendar.leaves')
return True
- def check_holidays(self,cr,uid,ids):
+ def check_holidays(self, cr, uid, ids):
for record in self.browse(cr, uid, ids):
if not record.number_of_days:
- raise osv.except_osv(_('Warning!'),_('Wrong leave definition.'))
- if record.employee_id:
+ raise osv.except_osv(_('Warning!'),_('Wrong leave definition.'))
+ if record.holiday_type=='employee' and record.employee_id:
leave_asked = record.number_of_days
if leave_asked < 0.00:
if not record.holiday_status_id.limit:
- leaves_rest = self.pool.get('hr.holidays.status').get_days( cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
-
+ leaves_rest = self.pool.get('hr.holidays.status').get_days(cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
if leaves_rest < -(leave_asked):
raise osv.except_osv(_('Warning!'),_('You Cannot Validate leaves while available leaves are less than asked leaves.'))
- else:
+ elif record.holiday_type=='category' and record.category_id:
+ leave_asked = record.number_of_days
+ if leave_asked < 0.00:
+ if not record.holiday_status_id.limit:
+ leaves_rest = self.pool.get('hr.holidays.status').get_days_cat(cr, uid, [record.holiday_status_id.id], record.category_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
+ if leaves_rest < -(leave_asked):
+ raise osv.except_osv(_('Warning!'),_('You Cannot Validate leaves while available leaves are less than asked leaves.'))
+ else:# This condition will never meet!!
holiday_ids = []
vals = {
'name' : record.name,
@@ -322,19 +398,41 @@ class hr_holidays(osv.osv):
self.holidays_confirm(cr, uid, holiday_ids)
self.holidays_validate(cr, uid, holiday_ids)
+ #if record.holiday_status_id.categ_id and record.date_from and record.date_to and record.employee_id:
+# if record.holiday_status_id.categ_id and record.date_from and record.date_to:
+# vals={}
+# vals['name']=record.name
+# vals['categ_id']=record.holiday_status_id.categ_id.id
+# epoch_c = time.mktime(time.strptime(record.date_to,'%Y-%m-%d %H:%M:%S'))
+# epoch_d = time.mktime(time.strptime(record.date_from,'%Y-%m-%d %H:%M:%S'))
+# diff_day = (epoch_c - epoch_d)/(3600*24)
+# vals['duration'] = (diff_day) * 8
+# vals['note'] = record.notes
+## vals['user_id'] = record.user_id.id
+# vals['date'] = record.date_from
+# if record.holiday_type=='employee':
+# vals['user_id'] = record.user_id.id
if record.holiday_status_id.categ_id and record.date_from and record.date_to and record.employee_id:
- vals={}
- vals['name']=record.name
- vals['categ_id']=record.holiday_status_id.categ_id.id
- epoch_c = time.mktime(time.strptime(record.date_to,'%Y-%m-%d %H:%M:%S'))
- epoch_d = time.mktime(time.strptime(record.date_from,'%Y-%m-%d %H:%M:%S'))
- diff_day = (epoch_c - epoch_d)/(3600*24)
- vals['duration'] = (diff_day) * 8
- vals['note'] = record.notes
- vals['user_id'] = record.user_id.id
- vals['date'] = record.date_from
+ diff_day = self._get_number_of_days(record.date_from, record.date_to)
+ vals = {
+ 'name' : record.name,
+ 'categ_id' : record.holiday_status_id.categ_id.id,
+ 'duration' : (diff_day) * 8,
+ 'note' : record.notes,
+ 'user_id' : record.user_id.id,
+ 'date' : record.date_from,
+ }
case_id = self.pool.get('crm.meeting').create(cr,uid,vals)
self.write(cr, uid, ids, {'case_id':case_id})
return True
hr_holidays()
+class resource_calendar_leaves(osv.osv):
+ _inherit = "resource.calendar.leaves"
+ _description = "Leave Detail"
+ _columns = {
+ 'holiday_id': fields.many2one("hr.holidays", "Holiday"),
+ }
+
+resource_calendar_leaves()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 3617286fb29..8dbfebf6231 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -45,14 +45,21 @@
@@ -80,11 +91,17 @@
@@ -111,7 +132,9 @@
@@ -289,6 +312,7 @@
+
@@ -318,6 +342,19 @@
id="menu_open_view_holiday_status"
parent="hr.menu_open_view_attendance_reason_config"/>
+
+
+ resource.calendar.leaves.form.inherit
+ resource.calendar.leaves
+ form
+
+
+
+
+
+
+
+
holidays_validate()
+
+
+ second_validate
+ function
+ holidays_validate2()
+
+
+
refuse
@@ -53,8 +61,8 @@
holidays_cancel()XOR
-
-
@@ -63,11 +71,12 @@
confirm
-
+
validate
+ (holiday_status_id.double_validation == False)
@@ -97,6 +106,32 @@
set_to_draft
-
+
+
+
+
+ second_validate
+
+
+
+
+
+
+
+ refuse
+
+
+
+
+
+ (holiday_status_id.double_validation == True)
+ validate
+
+
+
diff --git a/addons/hr_holidays/i18n/es.po b/addons/hr_holidays/i18n/es.po
index 9d0158f14b2..245cacc6dee 100644
--- a/addons/hr_holidays/i18n/es.po
+++ b/addons/hr_holidays/i18n/es.po
@@ -7,13 +7,14 @@ 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: 2010-04-30 21:12+0000\n"
-"Last-Translator: Cristian Salamea (GnuThink) \n"
+"PO-Revision-Date: 2010-05-18 13:49+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.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-05-05 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-05-19 05:12+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_holidays
@@ -49,7 +50,7 @@ msgstr "Azul claro"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Brown"
-msgstr "Café"
+msgstr "Marrón"
#. module: hr_holidays
#: xsl:holidays.summary:0
@@ -89,7 +90,7 @@ msgstr "hasta"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Light Cyan"
-msgstr "Cian Claro"
+msgstr "Cian claro"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
@@ -185,12 +186,12 @@ msgstr "Estado Vacaciones"
#. module: hr_holidays
#: model:ir.model,name:hr_holidays.model_hr_holidays_status
msgid "Holidays Status"
-msgstr "Estado de Vacaciones"
+msgstr "Estado de vacaciones"
#. module: hr_holidays
#: field:hr.holidays,date_to:0
msgid "Vacation end day"
-msgstr "Fecha Fin Vacaciones"
+msgstr "Fecha fin vacaciones"
#. module: hr_holidays
#: view:hr.holidays.per.user:0
@@ -261,7 +262,7 @@ msgstr "Empleado"
#. module: hr_holidays
#: selection:hr.holidays,state:0
msgid "Waiting Validation"
-msgstr "Esperando Validación"
+msgstr "Esperando validación"
#. module: hr_holidays
#: model:process.transition,note:hr_holidays.process_transition_employeeholidays0
@@ -276,7 +277,7 @@ msgstr "Salmón claro"
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Wheat"
-msgstr "Abano"
+msgstr "Trigo"
#. module: hr_holidays
#: field:hr.holidays.log,nb_holidays:0
@@ -292,20 +293,20 @@ msgstr "Mis peticiones"
#: view:hr.holidays:0
#: view:hr.holidays.per.user:0
msgid "Number of Days"
-msgstr "Número de Días"
+msgstr "Número de días"
#. module: hr_holidays
#: field:hr.holidays.status,name:0
#: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
#: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
msgid "Holiday Status"
-msgstr "Estado de Vacaciones"
+msgstr "Estado vacaciones"
#. module: hr_holidays
#: wizard_view:hr.holidays.summary,init:0
#: wizard_view:hr.holidays.summary.employee,init:0
msgid "Report Options"
-msgstr "Opciones de Reporte"
+msgstr "Opciones del informe"
#. module: hr_holidays
#: constraint:ir.ui.view:0
@@ -368,7 +369,7 @@ msgstr "Lavanda"
#. module: hr_holidays
#: model:ir.model,name:hr_holidays.model_hr_holidays_log
msgid "hr.holidays.log"
-msgstr "Log de Vacaciones"
+msgstr "hr.holidays.log"
#. module: hr_holidays
#: model:ir.actions.wizard,name:hr_holidays.wizard_holidays_summary
@@ -383,7 +384,7 @@ msgstr "Calendario"
#. module: hr_holidays
#: field:hr.holidays,date_from:0
msgid "Vacation start day"
-msgstr "Inicio de Vacaciones"
+msgstr "Fecha inicio de vacaciones"
#. module: hr_holidays
#: model:ir.module.module,description:hr_holidays.module_meta_information
@@ -422,21 +423,36 @@ msgid ""
" for example, you maybe will do it for the user 'admin'.\n"
msgstr ""
"Recursos Humanos: Registro y seguimiento de Vacaciones\n"
-"Este modulo permite administrar las vacaciones y peticiones. Para cada "
-"empleado se puede definir un numero de vacaciones disponibles.\n"
-"Ademas:\n"
-"Sincronizacion con la agenda (usando el modulo de CRM) es posible: "
-"automatizar la creacion de casos cuando una peticion es aceptada, tiene un "
-"link para los estados de vacaciones. Puede configurar esta info en el color "
-"de su preferencia.\n"
-"Estado de Vacaciones:\n"
-"Un empleado puede crear peticiones negativas (pedir -2 dias por ejemplo). es "
-"es considerado por el sistema como una peticion de mas dias de ausencia.\n"
-"Hay 2 maneras para imprimir las vacaciones:\n"
-"Elegir empleados por departamento y usar un asistente.\n"
-"O imprimir un empleado especifico.\n"
-"Ademas el asistente permite elegir las vacaciones validadas y confirmadas o "
-"solo una.\n"
+" Este módulo permite administrar las vacaciones y peticiones de "
+"vacaciones. Para cada empleado se puede definir un numero de vacaciones "
+"disponibles.\n"
+" Además:\n"
+" - Es posible sincronizar con la agenda (usando el módulo de CRM): Para "
+"poder automatizar la creación de casos cuando una petición es aceptada, "
+"tiene que relacionar un estado de vacaciones con una sección de casos. Puede "
+"configurar esta información y también el color preferido en RRHH / "
+"Configuración / Estado de vacaciones.\n"
+" - Un empleado puede crear peticiones negativas (pedir -2 días por "
+"ejemplo). Esto el sistema lo considera como una petición de más días de "
+"ausencia. Incrementará su total de vacaciones disponibles de este tipo (si "
+"la petición es aceptada).\n"
+" - Hay 2 maneras de imprimir las vacaciones:\n"
+" * La primera permite seleccionar empleados por departamento y está "
+"disponible desde el menú\n"
+" RRHH / Petición de vacaciones / Imprimir resumen de "
+"vacaciones\n"
+" * La segunda permite seleccionar el informe de vacaciones para "
+"ciertos empleados. Desde la lista\n"
+" RRHH / Empleados / Empleados\n"
+" seleccione los empleados que desee, haga clic en el icono de "
+"imprimir y seleccione la opción\n"
+" 'Imprimir resumen de vacaciones de los empleados'\n"
+" - El asistente permite elegir si quiere imprimir las vacaciones "
+"confirmadas y validadas o sólo las validadas. Estos estados deben "
+"configurarse por un usuario del grupo 'HR' con el rol de 'holidays'. Puede "
+"definirlo en la pestaña de seguridad en la ficha de usuario en el menú\n"
+" Administración / Usuarios / Usuarios\n"
+" por ejemplo, quizá quiere hacerlo para el usuario 'admin'.\n"
#. module: hr_holidays
#: wizard_view:hr.holidays.summary,notify:0
@@ -447,7 +463,7 @@ msgstr "Notificación"
#. module: hr_holidays
#: model:process.node,note:hr_holidays.process_node_holidaysrequest0
msgid "Employee fills in a request for holidays"
-msgstr "Petición de Vacaciones"
+msgstr "Empleado rellena una petición de vacaciones"
#. module: hr_holidays
#: model:process.transition,note:hr_holidays.process_transition_setholiday0
@@ -508,7 +524,7 @@ msgstr "Mis peticiones de vacaciones"
#. module: hr_holidays
#: field:hr.holidays.status,color_name:0
msgid "Color of the status"
-msgstr "Color de Estado"
+msgstr "Color del estado"
#. module: hr_holidays
#: selection:hr.holidays.summary,init,holiday_type:0
@@ -569,7 +585,7 @@ msgstr "Activo"
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_draft
msgid "My Holidays Request Draft"
-msgstr "Mis peticiones en Borrador"
+msgstr "Mis peticiones en borrador"
#. module: hr_holidays
#: model:process.transition,name:hr_holidays.process_transition_approvedrequest0
@@ -680,7 +696,7 @@ msgstr "Caso"
#. module: hr_holidays
#: field:hr.holidays,holiday_user_id:0
msgid "Holiday per user"
-msgstr "Vacaiones por usuario"
+msgstr "Vacaciones por usuario"
#. module: hr_holidays
#: model:process.node,note:hr_holidays.process_node_holidays0
@@ -705,7 +721,7 @@ msgstr "Rojo"
#. module: hr_holidays
#: model:ir.module.module,shortdesc:hr_holidays.module_meta_information
msgid "Human Resources: Holidays management"
-msgstr "Gestión de Vacaciones"
+msgstr "Recursos humanos: Gestión de vacaciones"
#. module: hr_holidays
#: model:process.process,name:hr_holidays.process_process_holidaysprocess0
diff --git a/addons/hr_holidays/report/available_holidays.py b/addons/hr_holidays/report/available_holidays.py
index 4a1972f1f7d..5499a914f6c 100644
--- a/addons/hr_holidays/report/available_holidays.py
+++ b/addons/hr_holidays/report/available_holidays.py
@@ -25,8 +25,9 @@ class available_holidays_report(osv.osv):
_name = "available.holidays.report"
_auto = False
_columns = {
- 'date': fields.datetime('Date', readonly=True),
+ 'date': fields.date('Date', readonly=True),
'year': fields.char('Year', size=4, readonly=True),
+ 'day': fields.char('Day', size=15, readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
@@ -35,6 +36,7 @@ class available_holidays_report(osv.osv):
'max_leave': fields.float('Allocated Leaves', readonly=True),
'taken_leaves': fields.float('Taken Leaves', readonly=True),
'remaining_leave': fields.float('Remaining Leaves',readonly=True),
+ 'department_id':fields.many2one('hr.department','Department',readonly=True),
'user_id':fields.many2one('res.users', 'User', readonly=True),
}
def init(self, cr):
@@ -46,8 +48,10 @@ class available_holidays_report(osv.osv):
date_trunc('day',h.create_date) as date,
to_char(s.create_date, 'YYYY') as year,
to_char(s.create_date, 'MM') as month,
+ to_char(s.create_date, 'YYYY-MM-DD') as day,
h.employee_id as employee_id,
h.user_id as user_id,
+ h.department_id,
h.state as state,
h.holiday_status_id as holiday_status_id,
sum(number_of_days) as remaining_leave,
@@ -68,7 +72,8 @@ class available_holidays_report(osv.osv):
and s.active <> 'f'
group by h.holiday_status_id, h.employee_id,
date_trunc('day',h.create_date),to_char(s.create_date, 'YYYY'),
- to_char(s.create_date, 'MM'),h.user_id,h.state
+ to_char(s.create_date, 'MM'),to_char(s.create_date, 'YYYY-MM-DD'),h.user_id,
+ h.state,h.department_id
)""")
available_holidays_report()
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index 18ea7d58d45..a89655b503c 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -10,40 +10,32 @@
tree
-
-
-
-
+
+
+
+
+
-
+
+
-
- available.holidays.report.form
- available.holidays.report
- form
-
-
-
-
-
-
-
- available.holidays.report.graphavailable.holidays.reportgraph
-
+
+
+
-
+
@@ -55,32 +47,47 @@
-
-
+
+
+
-
+<<<<<<< TREE
+
-
+
+
+
+
+
+
+=======
+
+
+>>>>>>> MERGE-SOURCE
+
-
+
-
-
+
+
+
@@ -93,6 +100,7 @@
available.holidays.reportformtree,graph
+ {'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}
diff --git a/addons/hr_holidays/report/hr_holidays_report.py b/addons/hr_holidays/report/hr_holidays_report.py
index 435eee71ea5..29127922dac 100644
--- a/addons/hr_holidays/report/hr_holidays_report.py
+++ b/addons/hr_holidays/report/hr_holidays_report.py
@@ -28,16 +28,19 @@ class hr_holidays_report(osv.osv):
_auto = False
_rec_name = 'date'
_columns = {
- 'date': fields.datetime('Date', readonly=True),
+ 'date': fields.date('Date', readonly=True),
'year': fields.char('Year', size=4, readonly=True),
+ 'day': fields.char('Day', size=15, readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
- 'date_from' : fields.datetime('Start Date', readonly=True),
- 'date_to' : fields.datetime('End Date', readonly=True),
- 'number_of_days_temp': fields.float('Number of Days', readonly=True),
+ 'date_from' : fields.date('Start Date', readonly=True),
+ 'date_to' : fields.date('End Date', readonly=True),
+ 'number_of_days_temp': fields.float('#Days', readonly=True),
'employee_id' : fields.many2one('hr.employee', "Employee's Name",readonly=True),
'user_id':fields.many2one('res.users', 'User', readonly=True),
+ 'holiday_status_id' : fields.many2one("hr.holidays.status", "Leave Type",readonly=True),
+ 'department_id':fields.many2one('hr.department','Department',readonly=True),
'state': fields.selection([('draft', 'Draft'),
('confirm', 'Waiting Validation'),
('refuse', 'Refused'),
@@ -52,21 +55,26 @@ class hr_holidays_report(osv.osv):
create or replace view hr_holidays_report as (
select
min(s.id) as id,
- date_trunc('seconds',s.create_date) as date,
+ date_trunc('day',s.create_date) as date,
date_trunc('day',s.date_from) as date_from,
date_trunc('day',s.date_to) as date_to,
- s.number_of_days_temp,
+ sum(s.number_of_days_temp) as number_of_days_temp,
s.employee_id,
s.user_id as user_id,
to_char(s.create_date, 'YYYY') as year,
to_char(s.create_date, 'MM') as month,
+ to_char(s.create_date, 'YYYY-MM-DD') as day,
+ s.holiday_status_id,
+ s.department_id,
s.state
from
hr_holidays s
- where type='remove'
+ where type='remove' and
+ s.employee_id is not null
group by
s.create_date,s.state,s.date_from,s.date_to,
- s.number_of_days_temp,s.employee_id,s.user_id
+ s.employee_id,s.user_id,s.holiday_status_id,
+ s.department_id
)
""")
hr_holidays_report()
@@ -98,7 +106,7 @@ class hr_holidays_remaining_leaves_user(osv.osv):
where
hrs.employee_id = hre.id and
hre.resource_id = rr.id and
- hhs.id = hrs.holiday_status_id
+ hhs.id = hrs.holiday_status_id
group by
rr.name,rr.user_id,hhs.name
)
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index a5502b9450d..e508e242827 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -7,14 +7,18 @@
tree
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
@@ -27,6 +31,7 @@
+
@@ -37,56 +42,82 @@
search
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
-
+
+
+
- Leaves
+ Leaves By Employeehr.holidays.reportformtree,graph
- {'search_default_employee': 1}
+ {'search_default_month':1,'search_default_Employee':1,'group_by_no_leaf':1,'group_by':[]}
diff --git a/addons/hr_recruitment/__init__.py b/addons/hr_recruitment/__init__.py
index 75b9049aa0f..2619a3139f2 100644
--- a/addons/hr_recruitment/__init__.py
+++ b/addons/hr_recruitment/__init__.py
@@ -19,9 +19,8 @@
# along with this program. If not, see .
#
##############################################################################
-
-
import hr_recruitment
import report
import wizard
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 14557c33c42..1e0af949825 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -19,7 +19,6 @@
# along with this program. If not, see .
#
##############################################################################
-
{
'name': 'HR - Recruitement',
'version': '1.0',
@@ -35,9 +34,6 @@ system to store and search in your CV base.
'author': 'Tiny',
'website': 'http://www.openerp.com',
'depends': ['hr','survey','crm'],
- 'init_xml': [
- 'hr_recruitment_data.xml'
- ],
'update_xml': [
'wizard/hr_recruitment_phonecall_view.xml',
'hr_recruitment_view.xml',
@@ -49,10 +45,14 @@ system to store and search in your CV base.
'report/hr_recruitment_report_view.xml',
'wizard/hr_recruitment_create_partner_job_view.xml',
],
+ 'init_xml': [
+ 'hr_recruitment_data.xml'
+ ],
'demo_xml': [
'hr_recruitment_demo.xml'
],
'installable': True,
'active': False,
}
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index eac882874c7..42d643f165d 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -23,71 +23,97 @@ from osv import fields, osv
from crm import crm
AVAILABLE_STATES = [
- ('draft', 'New'),
- ('open', 'In Progress'),
- ('cancel', 'Refused'),
- ('done', 'Hired'),
+ ('draft', 'New'),
+ ('open', 'In Progress'),
+ ('cancel', 'Refused'),
+ ('done', 'Hired'),
('pending', 'Pending')
]
AVAILABLE_PRIORITIES = [
- ('5', 'Not Good'),
- ('4', 'On Average'),
- ('3', 'Good'),
- ('2', 'Very Good'),
+ ('5', 'Not Good'),
+ ('4', 'On Average'),
+ ('3', 'Good'),
+ ('2', 'Very Good'),
('1', 'Excellent')
]
+class hr_recruitment_stage(osv.osv):
+ """ Stage of HR Recruitment """
+
+ _name = "hr.recruitment.stage"
+ _description = "Stage of Recruitment"
+ _columns = {
+ 'name': fields.char('Name', size=64, required=True, translate=True),
+ 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of stages."),
+ 'requirements': fields.text('Requirements')
+ }
+ _defaults = {
+ 'sequence': 1,
+ }
+hr_recruitment_stage()
class hr_applicant(osv.osv, crm.crm_case):
_name = "hr.applicant"
- _description = "Applicant Cases"
+ _description = "Applicant"
_order = "id desc"
- _inherit ='mailgate.thread'
+ _inherits = {'mailgate.thread': 'thread_id'}
_columns = {
+ 'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False),
+ 'name': fields.char('Name', size=128, required=True),
'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."),
'description': fields.text('Description'),
'section_id': fields.many2one('crm.case.section', 'Sales Team', \
select=True, help='Sales team to which Case belongs to.\
- Define Responsible user and Email account for mail gateway.'),
- 'email_from': fields.char('Email', size=128, help="These people will receive email."),
+ Define Responsible user and Email account for mail gateway.'),
+ 'email_from': fields.char('Email', size=128, help="These people will receive email."),
'email_cc': fields.text('Watchers Emails', size=252 , help="These people\
will receive a copy of the future" \
- " communication between partner and users by email"),
- 'probability': fields.float('Probability'),
- 'partner_id': fields.many2one('res.partner', 'Partner'),
+ " communication between partner and users by email"),
+ 'probability': fields.float('Probability'),
+ 'partner_id': fields.many2one('res.partner', 'Partner'),
'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
- domain="[('partner_id','=',partner_id)]"),
- 'create_date': fields.datetime('Creation Date' , readonly=True),
- 'write_date': fields.datetime('Update Date' , readonly=True),
+ domain="[('partner_id','=',partner_id)]"),
+ 'create_date': fields.datetime('Creation Date' , readonly=True),
+ 'write_date': fields.datetime('Update Date' , readonly=True),
'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
domain="[('section_id','=',section_id),\
- ('object_id.model', '=', 'crm.opportunity')]"),
- 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True,
+ ('object_id.model', '=', 'crm.opportunity')]"),
+ 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True,
help='The state is set to \'Draft\', when a case is created.\
\nIf the case is in progress the state is set to \'Open\'.\
\nWhen the case is over, the state is set to \'Done\'.\
- \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
- 'company_id': fields.many2one('res.company', 'Company'),
- 'user_id': fields.many2one('res.users', 'Responsible'),
+ \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
+ 'company_id': fields.many2one('res.company', 'Company'),
+ 'user_id': fields.many2one('res.users', 'Responsible'),
# Applicant Columns
- 'date_closed': fields.datetime('Closed', readonly=True),
- 'date': fields.datetime('Date'),
- 'priority': fields.selection(AVAILABLE_PRIORITIES, 'Appreciation'),
- 'job_id': fields.many2one('hr.job', 'Applied Job'),
- 'salary_proposed': fields.float('Proposed Salary'),
- 'salary_expected': fields.float('Expected Salary'),
- 'availability': fields.integer('Availability (Days)'),
- 'partner_name': fields.char("Applicant's Name", size=64),
- 'partner_phone': fields.char('Phone', size=32),
- 'partner_mobile': fields.char('Mobile', size=32),
- 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"),
- 'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"),
- 'department_id':fields.many2one('hr.department', 'Department'),
- 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
- 'survey' : fields.related('job_id', 'survey_id', type='many2one', relation='survey', string='Survey'),
- 'response' : fields.integer("Response"),
+ 'date_closed': fields.datetime('Closed', readonly=True),
+ 'date': fields.datetime('Date'),
+ 'priority': fields.selection(AVAILABLE_PRIORITIES, 'Appreciation'),
+ 'job_id': fields.many2one('hr.job', 'Applied Job'),
+ 'salary_proposed': fields.float('Proposed Salary'),
+ 'salary_expected': fields.float('Expected Salary'),
+ 'availability': fields.integer('Availability (Days)'),
+ 'partner_name': fields.char("Applicant's Name", size=64),
+ 'partner_phone': fields.char('Phone', size=32),
+ 'partner_mobile': fields.char('Mobile', size=32),
+ 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"),
+ 'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"),
+ 'department_id':fields.many2one('hr.department', 'Department'),
+ 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
+ 'survey' : fields.related('job_id', 'survey_id', type='many2one', relation='survey', string='Survey'),
+ 'response' : fields.integer("Response"),
+ }
+
+ _defaults = {
+ 'active': lambda *a: 1,
+ 'user_id': crm.crm_case._get_default_user,
+ 'email_from': crm.crm_case. _get_default_email,
+ 'state': lambda *a: 'draft',
+ 'section_id': crm.crm_case. _get_section,
+ 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
+ 'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
}
def onchange_job(self,cr, uid, ids, job, context={}):
@@ -111,7 +137,7 @@ class hr_applicant(osv.osv, crm.crm_case):
for case in self.browse(cr, uid, ids, context):
section = (case.section_id.id or False)
st = case.stage_id.id or False
- stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [])
+ stage_ids = self.pool.get('hr.recruitment.stage').search(cr, uid, [])
if st and stage_ids.index(st):
self.write(cr, uid, [case.id], {'stage_id': stage_ids[stage_ids.index(st)-1]})
return True
@@ -129,7 +155,7 @@ class hr_applicant(osv.osv, crm.crm_case):
for case in self.browse(cr, uid, ids, context):
section = (case.section_id.id or False)
st = case.stage_id.id or False
- stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [])
+ stage_ids = self.pool.get('hr.recruitment.stage').search(cr, uid, [])
if st and len(stage_ids) != stage_ids.index(st)+1:
self.write(cr, uid, [case.id], {'stage_id': stage_ids[stage_ids.index(st)+1]})
return True
@@ -163,24 +189,24 @@ class hr_applicant(osv.osv, crm.crm_case):
id3 = data_obj.browse(cr, uid, id3, context=context).res_id
context = {
- 'default_opportunity_id': opp.id,
- 'default_partner_id': opp.partner_id and opp.partner_id.id or False,
- 'default_section_id': opp.section_id and opp.section_id.id or False,
- 'default_email_from': opp.email_from,
- 'default_state': 'open',
+ 'default_opportunity_id': opp.id,
+ 'default_partner_id': opp.partner_id and opp.partner_id.id or False,
+ 'default_section_id': opp.section_id and opp.section_id.id or False,
+ 'default_email_from': opp.email_from,
+ 'default_state': 'open',
'default_name': opp.name
}
value = {
- 'name': ('Meetings'),
- 'domain': "[('user_id','=',%s)]" % (uid),
- 'context': context,
- 'view_type': 'form',
- 'view_mode': 'calendar,form,tree',
- 'res_model': 'crm.meeting',
- 'view_id': False,
- 'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')],
- 'type': 'ir.actions.act_window',
- 'search_view_id': res['res_id'],
+ 'name': ('Meetings'),
+ 'domain': "[('user_id','=',%s)]" % (uid),
+ 'context': context,
+ 'view_type': 'form',
+ 'view_mode': 'calendar,form,tree',
+ 'res_model': 'crm.meeting',
+ 'view_id': False,
+ 'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')],
+ 'type': 'ir.actions.act_window',
+ 'search_view_id': res['res_id'],
'nodestroy': True
}
return value
@@ -209,7 +235,9 @@ class hr_job(osv.osv):
_inherit = "hr.job"
_name = "hr.job"
_columns = {
- 'survey_id': fields.many2one('survey', 'Survey'),
+ 'survey_id': fields.many2one('survey', 'Survey'),
}
-hr_job()
\ No newline at end of file
+hr_job()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index e2b23cc09f5..77f15c4afd5 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -32,31 +32,31 @@
-
+ Initial Jobs Demand
-
+ First Interview
-
+ Second Interview
-
+ Contract Proposed
-
+ Contract Signed
-
+ Refused by Employee
-
+ Refused by Company
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 760c7f08f2f..1723c802b0a 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -9,6 +9,7 @@
hr.applicanttree,form,graph
+ {"search_default_user_id":uid}
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 617bcea4dbe..a3bf7a08ab9 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -7,12 +7,12 @@
# ------------------------------------------------------
- Applicant Categories
- crm.case.categ
- form
-
- [('object_id.model', '=', 'hr.applicant')]
- {'object_id':'hr.applicant'}
+ Applicant Categories
+ crm.case.categ
+ form
+
+ [('object_id.model', '=', 'hr.applicant')]
+ {'object_id':'hr.applicant'}
# ------------------------------------------------------
# Stage
@@ -108,7 +108,7 @@
-
+
@@ -224,7 +224,6 @@
-
@@ -267,5 +266,58 @@
+
+
+
+ hr.recruitment.stage.tree
+ hr.recruitment.stage
+ tree
+
+
+
+
+
+
+
+
+
+
+
+ hr.recruitment.stage.form
+ hr.recruitment.stage
+ form
+
+
+
+
+
+
+
+
+ Stages
+ hr.recruitment.stage
+ form
+
+
+
+
+
+
+
diff --git a/addons/hr_recruitment/hr_recruitment_wizard.xml b/addons/hr_recruitment/hr_recruitment_wizard.xml
deleted file mode 100644
index d82153eabbb..00000000000
--- a/addons/hr_recruitment/hr_recruitment_wizard.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index d2c9aa4a4ae..00d15ef3f21 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -18,7 +18,6 @@
# along with this program. If not, see .
#
##############################################################################
-
import tools
from osv import fields,osv
from hr_recruitment import hr_recruitment
@@ -99,12 +98,15 @@ class hr_recruitment_report(osv.osv):
'date': fields.date('Date', readonly=True),
'date_closed': fields.date('Closed', readonly=True),
'job_id': fields.many2one('hr.job', 'Applied Job',readonly=True),
- 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]",readonly=True),
+ 'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage'),
+# 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]",readonly=True),
'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"),
'department_id':fields.many2one('hr.department','Department',readonly=True),
'priority': fields.selection(hr_recruitment.AVAILABLE_PRIORITIES, 'Appreciation'),
'salary_prop' : fields.float("Salary Proposed"),
'salary_exp' : fields.float("Salary Expected"),
+ 'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
+ 'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact Name',readonly=True),
'available' : fields.float("Availability")
}
@@ -121,7 +123,9 @@ class hr_recruitment_report(osv.osv):
to_char(s.create_date, 'MM') as month,
to_char(s.create_date, 'YYYY-MM-DD') as day,
s.state,
+ s.partner_id,
s.company_id,
+ s.partner_address_id,
s.user_id,
s.job_id,
s.type_id,
@@ -140,6 +144,8 @@ class hr_recruitment_report(osv.osv):
date_trunc('day',s.create_date),
date_trunc('day',s.date_closed),
s.state,
+ s.partner_id,
+ s.partner_address_id,
s.company_id,
s.user_id,
s.stage_id,
@@ -151,3 +157,4 @@ class hr_recruitment_report(osv.osv):
""")
hr_recruitment_report()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 8e0c3f0845a..2315e707911 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -10,9 +10,11 @@
-
+
+
+
@@ -72,7 +74,7 @@
help = "Pending tasks"/>
-
@@ -84,10 +86,6 @@
-
-
+
+
-
-
+
+
+
+
+
+
-
+
+
-
-
-
-
+
+
+
+
+
@@ -136,7 +141,7 @@
hr.recruitment.reportformtree,graph
- {'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}
+ {'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index 3e611ae02e8..f8898499c4d 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -1,2 +1,3 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_hr_applicant","hr.applicant","model_hr_applicant","hr.group_hr_manager",1,1,1,1
+"access_hr_recruitment_report","hr.recruitment.report","model_hr_recruitment_report",,1,0,0,0
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
index 4627751f731..e9b68de37ea 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
@@ -19,7 +19,6 @@
# along with this program. If not, see .
#
##############################################################################
-
from osv import osv, fields
from tools.translate import _
@@ -54,12 +53,11 @@ class hr_recruitment_partner_create(osv.osv_memory):
partner_id = partner_obj.search(cr, uid, [('name', '=', case.partner_name or case.name)])
if partner_id:
raise osv.except_osv(_('Warning !'),_('A partner is already existing with the same name.'))
- else:
- partner_id = partner_obj.create(cr, uid, {
- 'name': case.partner_name or case.name,
- 'user_id': case.user_id.id,
- 'comment': case.description,
- })
+ partner_id = partner_obj.create(cr, uid, {
+ 'name': case.partner_name or case.name,
+ 'user_id': case.user_id.id,
+ 'comment': case.description,
+ })
contact_id = contact_obj.create(cr, uid, {
'partner_id': partner_id,
'name': case.partner_name,
@@ -68,14 +66,14 @@ class hr_recruitment_partner_create(osv.osv_memory):
'email': case.email_from
})
- case_obj.write(cr, uid, context['active_ids'], {
- 'partner_id': partner_id,
- 'partner_address_id': contact_id
- })
+ case_obj.write(cr, uid, case.id, {
+ 'partner_id': partner_id,
+ 'partner_address_id': contact_id
+ })
if data['close']:
case_obj.case_close(cr, uid, context['active_ids'])
- value = {
+ return {
'domain': "[]",
'view_type': 'form',
'view_mode': 'form,tree',
@@ -84,8 +82,7 @@ class hr_recruitment_partner_create(osv.osv_memory):
'view_id': False,
'type': 'ir.actions.act_window',
'search_view_id': res['res_id']
- }
- return value
+ }
hr_recruitment_partner_create()
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
index 27c0a2c49bd..0517d7d7965 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
@@ -19,7 +19,6 @@
# along with this program. If not, see .
#
##############################################################################
-
import time
from osv import osv, fields
@@ -99,17 +98,16 @@ class job2phonecall(osv.osv_memory):
job_case_obj.case_cancel(cr, uid, [job.id])
phonecall_case_obj.case_open(cr, uid, [new_phonecall_id])
- value = {
+ return {
'name': _('Phone Call'),
'view_type': 'form',
'view_mode': 'tree,form',
'res_model': 'crm.phonecall',
'res_id' : new_phonecall_id,
- 'views': [(id3,'form'),(id2,'tree'),(False,'calendar'),(False,'graph')],
+ 'views': [(id3,'form'), (id2,'tree'), (False,'calendar'), (False,'graph')],
'type': 'ir.actions.act_window',
'search_view_id': res['res_id']
}
- return value
job2phonecall()
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 25c61483391..1530f18981c 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -39,7 +39,7 @@ hr_employee()
class hr_analytic_timesheet(osv.osv):
_name = "hr.analytic.timesheet"
_table = 'hr_analytic_timesheet'
- _description = "Timesheet line"
+ _description = "Timesheet Line"
_inherits = {'account.analytic.line': 'line_id'}
_order = "id desc"
_columns = {
@@ -60,7 +60,7 @@ class hr_analytic_timesheet(osv.osv):
# if prod_id and unit_amount:
if prod_id:
# find company
- company_id=self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context)
+ company_id=self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=context)
res = self.pool.get('account.analytic.line').on_change_unit_amount(cr, uid, id, prod_id, unit_amount,company_id,unit, context)
return res
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 6c52c99d081..d7c12b14df7 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -51,7 +51,6 @@
-
@@ -72,6 +71,7 @@
tree,form[('user_id','=',uid)]
+ {"search_default_user_id":uid}
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 4b8fad8fab5..c20c7110b63 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -25,7 +25,7 @@ from tools.translate import _
class hr_timesheet_invoice_factor(osv.osv):
_name = "hr_timesheet_invoice.factor"
- _description = "Invoice rate"
+ _description = "Invoice Rate"
_columns = {
'name': fields.char('Internal name', size=128, required=True),
'customer_name': fields.char('Name', size=128),
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 6ff2e597561..67c885a576d 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -61,10 +61,6 @@
help="Timesheet lines during last 7 days"/>
- report.timesheet.lineformtree,graph
- {'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}
+ {'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}
-
+
@@ -169,7 +165,6 @@
-
@@ -187,6 +182,7 @@
report_timesheet.userformgraph,tree
+ {"search_default_user_id":uid}
@@ -224,7 +220,6 @@
search
-
@@ -253,6 +248,7 @@
report_timesheet.invoiceformgraph,tree
+ {"search_default_user_id":uid}
@@ -308,7 +304,6 @@
-
@@ -327,6 +322,7 @@
report_timesheet.account.dateformgraph,tree
+ {"search_default_user_id":uid}
@@ -382,7 +378,6 @@
@@ -91,6 +101,7 @@
+
@@ -106,21 +117,23 @@
-
+
+
-
-
-
+
+
+
+
@@ -133,6 +146,7 @@
purchase.requisitionformtree,form
+ {"search_default_user_id":uid}
diff --git a/addons/purchase_requisition/test/purchase_requisition.yml b/addons/purchase_requisition/test/purchase_requisition.yml
new file mode 100644
index 00000000000..8983d238e0e
--- /dev/null
+++ b/addons/purchase_requisition/test/purchase_requisition.yml
@@ -0,0 +1,183 @@
+
+-
+ In order to test the purchase requisition module, I will do a sale order -> purchase_requisition ->
+ purchase flow and I will buy the required products at two different suppliers.
+-
+ I start by creating a new product 'Laptop ACER', which is purchased at Asustek, in MTO,
+ with the generation of purchase requisitions.
+-
+ !record {model: product.product, id: product_product_laptopacer0}:
+ categ_id: product.product_category_3
+ cost_method: standard
+ mes_type: fixed
+ name: Laptop ACER
+ procure_method: make_to_order
+ purchase_requisition: 1
+ seller_ids:
+ - delay: 1
+ name: base.res_partner_asus
+ qty: 5.0
+ supply_method: buy
+ type: product
+ uom_id: product.product_uom_unit
+ uom_po_id: product.product_uom_unit
+ volume: 0.0
+ warranty: 0.0
+ weight: 0.0
+ weight_net: 0.0
+ list_price: 100.0
+-
+ Then I sell 5 Laptop ACER to the customer Agrolait, sale order TEST/TENDER/0001.
+-
+ !record {model: sale.order, id: sale_order_testtender0}:
+ date_order: '2010-05-10'
+ invoice_quantity: order
+ name: TEST/TENDER/0001
+ order_line:
+ - name: Laptop ACER
+ price_unit: 100.0
+ product_uom: product.product_uom_unit
+ product_uom_qty: 5.0
+ state: draft
+ delay: 7.0
+ product_id: product_product_laptopacer0
+ product_uos_qty: 5.0
+ th_weight: 0.0
+ type: make_to_order
+ order_policy: manual
+ partner_id: base.res_partner_agrolait
+ partner_invoice_id: base.res_partner_address_8
+ partner_order_id: base.res_partner_address_8
+ partner_shipping_id: base.res_partner_address_8
+ picking_policy: direct
+ pricelist_id: product.list0
+ shop_id: sale.shop
+-
+ I confirm the sale order.
+-
+ !workflow {model: sale.order, action: order_confirm, ref: sale_order_testtender0}
+-
+ I launch he scheduler to compute all procurements, and specify all requisitions orders.
+-
+ !python {model: mrp.procurement.compute.all}: |
+ proc_obj = self.pool.get('mrp.procurement')
+ proc_obj._procure_confirm(cr,uid)
+-
+ On the purchase tender, I create a new purchase order for the supplier 'DistriPC' by clicking on
+ the button 'New RfQ'. This opens a window to ask me the supplier and I set DistriPC .
+-
+ !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}:
+ partner_address_id: base.res_partner_address_7
+ partner_id: base.res_partner_4
+-
+ I create a new purchase order.
+-
+ !python {model: purchase.requisition.partner}: |
+ req_obj = self.pool.get('purchase.requisition')
+ ids =req_obj.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
+ self.create_order(cr, uid, [ref("purchase_requisition_partner_0")], {"lang":
+ 'en_US', "active_model": "purchase.requisition", "tz": False, "record_id":
+ 1, "active_ids": ids, "active_id": ids[0], })
+
+-
+ I check that I have two purchase orders on the purchase tender.
+-
+ !python {model: purchase.order}: |
+ order_ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
+ ids=len(order_ids)
+ assert (ids==2), "Purchase order hasn't Created"
+-
+ I set the purchase requisition as 'Not Exclusive'.
+-
+ !python {model: purchase.requisition}: |
+ ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
+ self.write(cr,uid,ids[0],{'exclusive': 'multiple' })
+-
+ I change the quantities so that the purchase order for DistriPC includes 3 pieces and the
+ purchase order for Asustek includes 2 pieces.
+-
+ !python {model: purchase.order}: |
+ line_obj=self.pool.get('purchase.order.line')
+ partner_obj=self.pool.get('res.partner')
+ requistion_obj=self.pool.get('purchase.requisition')
+ requistion_ids =requistion_obj.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
+ partner_id1=partner_obj.search(cr,uid,[('name','=','ASUStek')])[0]
+ partner_id2=partner_obj.search(cr,uid,[('name','=','Distrib PC')])[0]
+ purchase_id1= self.search(cr, uid, [('partner_id','=',partner_id1),('requisition_id','in',requistion_ids)])
+ purchase_id2= self.search(cr, uid, [('partner_id','=',partner_id2),('requisition_id','in',requistion_ids)])
+ order_line1=self.browse(cr, uid, purchase_id1, context)[0].order_line[0].id
+ order_line2=self.browse(cr, uid, purchase_id2, context)[0].order_line[0].id
+ line_obj.write(cr, uid, order_line1, {'product_qty':2})
+ line_obj.write(cr, uid, order_line2, {'product_qty':3})
+-
+ I confirm and validate both purchase orders.
+-
+ !python {model: purchase.order}: |
+ order_ids= self.search(cr, uid, [])
+ import netsvc
+ wf_service = netsvc.LocalService("workflow")
+ for id in order_ids:
+ wf_service.trg_validate(uid, 'purchase.order',id,'purchase_confirm', cr)
+ wf_service.trg_validate(uid, 'purchase.order',id,'purchase_approve', cr)
+-
+ I check that the delivery order of the customer is in state 'Waiting Goods'.
+-
+ !python {model: stock.picking }: |
+ picking_id = self.search(cr, uid, [('origin','=','TEST/TENDER/0001'),('type','=','delivery')])
+ if picking_id:
+ pick=self.browse(cr,uid,picking_id[0])
+ assert (pick.state) =='confirmed'," Order is not confirm"
+ assert(pick.move_lines[0].state=='wating'),'Order is not wating"'
+-
+ I receive the order of the supplier Asustek from the Incoming Products menu.
+-
+ !python {model: stock.picking }: |
+ import time
+ partner_obj=self.pool.get('res.partner')
+ order_obj=self.pool.get('purchase.order')
+ partner_id=partner_obj.search(cr,uid,[('name','=','ASUStek')])[0]
+ picking_id = self.search(cr, uid, [('address_id.partner_id','=',partner_id),('type','=','in')])
+ if picking_id:
+ pick=self.browse(cr,uid,picking_id[0])
+ move =pick.move_lines[0]
+ partial_datas = {
+ 'partner_id': 2,
+ 'address_id': 6,
+ 'delivery_date' : time.strftime('%Y-%m-%d'),
+ }
+ partial_datas['move%s'%(move.id)]= {
+ 'product_id': move.product_id,
+ 'product_qty': move.product_qty,
+ 'product_uom': move.product_uom.id,
+ }
+ self.do_partial(cr, uid, picking_id,partial_datas)
+-
+ I receive the order of the supplier DistriPC from the Incoming Shipments menu.
+-
+ !python {model: stock.picking }: |
+ import time
+ partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','Distrib PC')])[0]
+ picking_id = self.search(cr, uid, [('address_id.partner_id','=',partner_id),('type','=','in')])
+ if picking_id:
+ pick=self.browse(cr,uid,picking_id[0])
+ move =pick.move_lines[0]
+ partial_datas = {
+ 'partner_id':pick.address_id.partner_id.id,
+ 'address_id': pick.address_id.id,
+ 'delivery_date' : time.strftime('%Y-%m-%d'),
+ }
+ partial_datas['move%s'%(move.id)]= {
+ 'product_id': move.product_id,
+ 'product_qty': move.product_qty,
+ 'product_uom': move.product_uom.id,
+ }
+ self.do_partial(cr, uid, picking_id,partial_datas)
+-
+ I check that the delivery order of the customer is in the state Available.
+-
+ !python {model: stock.picking }: |
+ picking_id = self.search(cr, uid, [('origin','=','TEST/TENDER/0001'),('type','=','out')])
+ if picking_id:
+ pick=self.browse(cr,uid,picking_id[0])
+ assert (pick.state) =='available'," Order is not available"
+
diff --git a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
new file mode 100644
index 00000000000..e2cba67fca9
--- /dev/null
+++ b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml
@@ -0,0 +1,112 @@
+-
+ In order to test the purchase requisition module, I will do a sale order -> purchase_requisition ->
+ purchase flow and I will buy the required products at two different suppliers.
+-
+ I start by creating a new product 'Laptop ACER', which is purchased at Asustek, in MTO,
+ with the generation of purchase requisitions.
+-
+ !record {model: product.product, id: product_product_laptopacer1}:
+ categ_id: product.product_category_3
+ cost_method: standard
+ list_price: 1000.0
+ mes_type: fixed
+ name: Laptop ACER1
+ procure_method: make_to_order
+ purchase_requisition: 1
+ seller_ids:
+ - delay: 1
+ name: base.res_partner_asus
+ qty: 5.0
+ supply_method: buy
+ type: product
+ uom_id: product.product_uom_unit
+ uom_po_id: product.product_uom_unit
+-
+ Then I sell 5 Laptop ACER to the customer Agrolait, sale order TEST/TENDER/0002
+-
+ !record {model: sale.order, id: sale_order_testtender1}:
+ date_order: '2010-04-20'
+ invoice_quantity: order
+ name: TEST/TENDER/0002
+ order_line:
+ - name: Laptop ACER1
+ price_unit: 1000.0
+ product_uom: product.product_uom_unit
+ product_uom_qty: 5.0
+ state: draft
+ 'delay': 7.0
+ 'product_id': product_product_laptopacer1
+ 'type': make_to_order
+ order_policy: manual
+ partner_id: base.res_partner_agrolait
+ partner_invoice_id: base.res_partner_address_8
+ partner_order_id: base.res_partner_address_8
+ partner_shipping_id: base.res_partner_address_8
+ picking_policy: direct
+ pricelist_id: product.list0
+ shop_id: sale.shop
+-
+ I confirm sale order.
+-
+ !workflow {model: sale.order, action: order_confirm, ref: sale_order_testtender1}
+-
+ I launch he scheduler to compute all procurements, and planify all requisitions orders.
+-
+ !python {model: mrp.procurement.compute.all}: |
+ proc_obj = self.pool.get('mrp.procurement')
+ proc_obj._procure_confirm(cr,uid)
+-
+ I should find a purchase requisition with the origin 'TEST/TENDER/0002', that includes a request for
+ 5 Laptop ACER, and a purchase order on the default supplier for this product.
+-
+ !python {model: purchase.requisition}: |
+ requisition_ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0002')])
+ ids=len(requisition_ids)
+ assert len(requisition_ids), "Purchase requisition hasn't Created"
+-
+ On the purchase tender, I create a new purchase order for the supplier 'DistriPC' by clicking on
+ the button 'New Request for Quotation'. This opens a window to ask me the supplier and I set DistriPC .
+-
+ I Create purchase.requisition.partner .
+-
+ !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}:
+ partner_address_id: base.res_partner_address_7
+ partner_id: base.res_partner_4
+-
+ I create a new purchase order for the supplier 'DistriPC'.
+-
+ !python {model: purchase.requisition.partner}: |
+ req_obj = self.pool.get('purchase.requisition')
+ ids =req_obj.search(cr, uid, [('origin','=','TEST/TENDER/0002')])
+ self.create_order(cr, uid, [ref("purchase_requisition_partner_0")], {"lang":
+ 'en_US', "active_model": "purchase.requisition", "tz": False, "record_id":
+ 1, "active_ids": ids, "active_id": ids[0], })
+-
+ I set the purchase tender as 'Exclusive'
+-
+ !python {model: purchase.requisition}: |
+ ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0002')])
+ self.write(cr,uid,ids[0],{'exclusive': 'exclusive' })
+-
+ I confirm and validate the Request for Quotation of ASUStek.
+-
+ !python {model: purchase.order}: |
+ partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','ASUStek')])[0]
+ req_obj = self.pool.get('purchase.requisition')
+ ids =req_obj.search(cr, uid, [('origin','=','TEST/TENDER/0002')])
+ purchase_id= self.search(cr, uid, [('partner_id','=',partner_id),('requisition_id','in',ids)])[0]
+ import netsvc
+ wf_service = netsvc.LocalService("workflow")
+ if purchase_id:
+ wf_service.trg_validate(uid, 'purchase.order',purchase_id,'purchase_confirm', cr)
+ wf_service.trg_validate(uid, 'purchase.order',purchase_id,'purchase_approve', cr)
+-
+ I check that Request for Quotation of DistriPC is cancelled.
+-
+ !python {model: purchase.order}: |
+ partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','Distrib PC')])[0]
+ req_obj = self.pool.get('purchase.requisition')
+ ids =req_obj.search(cr, uid, [('origin','=','TEST/TENDER/0002')])
+ purchase_id= self.search(cr, uid, [('partner_id','=',partner_id),('requisition_id','in',ids)])[0]
+ state=self.browse(cr,uid,purchase_id).state
+ assert (state=='cancel')
\ No newline at end of file
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index ea5195936cc..e886ba302b9 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -111,11 +111,11 @@ class purchase_requisition_partner(osv.osv_memory):
})
list_line.append(purchase_order_line)
purchase_id = order_obj.create(cr, uid, {
- 'origin': tender.name,
+ 'origin': tender.purchase_ids and tender.purchase_ids[0].origin or tender.name,
'partner_id': partner_id,
'partner_address_id': address_id,
'pricelist_id': pricelist_id,
- 'location_id': line.product_id.product_tmpl_id.property_stock_production.id,
+ 'location_id': tender.purchase_ids and tender.purchase_ids[0].location_id.id or line.product_id.product_tmpl_id.property_stock_production.id,
'company_id': tender.company_id.id,
'fiscal_position': partner.property_account_position and partner.property_account_position.id or False,
'requisition_id':tender.id,
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
index abac95bba16..c7a38cf64e1 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
@@ -9,6 +9,7 @@
@@ -192,6 +190,7 @@
Resourcesresource.resourcetree,form
+ {"search_default_user_id":uid}
@@ -201,12 +200,13 @@
form
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 23e72c60775..651945752a7 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -47,6 +47,7 @@
'update_xml': [
'wizard/sale_make_invoice_advance.xml',
'wizard/sale_line_invoice.xml',
+ 'wizard/sale_make_invoice.xml',
'security/sale_security.xml',
'security/ir.model.access.csv',
'company_view.xml',
@@ -60,6 +61,12 @@
# 'process/sale_process.xml',
],
'demo_xml': ['sale_demo.xml'],
+ 'test': [
+ 'test/shipping_manual_sale_order.yml',
+ 'test/prepaid_sale_order.yml',
+ 'test/advance_invoice.yml',
+ 'test/sale_procurement.yml',
+ ],
'installable': True,
'active': False,
'certificate': '0058103601429',
diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po
index 3d9f2727a80..c81d4b09f23 100644
--- a/addons/sale/i18n/fr.po
+++ b/addons/sale/i18n/fr.po
@@ -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-11-17 10:31+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-05-22 09:28+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ \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:09+0000\n"
+"X-Launchpad-Export-Date: 2010-05-23 03:57+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
@@ -210,7 +210,7 @@ msgstr "Politique d'expédition"
#. module: sale
#: selection:sale.order,state:0 selection:sale.order.line,state:0
msgid "Cancelled"
-msgstr ""
+msgstr "Annuler"
#. module: sale
#: selection:sale.order,state:0
diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po
index 2454f253ba1..5a29059512f 100644
--- a/addons/sale/i18n/pl.po
+++ b/addons/sale/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-12 15:59+0000\n"
-"Last-Translator: Adam Zastróżny \n"
+"PO-Revision-Date: 2010-05-21 08:21+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \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:09+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
@@ -222,7 +222,7 @@ msgstr "Wydawanie produktów"
#. module: sale
#: view:sale.order:0
msgid "Reference"
-msgstr "Odnośnik"
+msgstr "Numer"
#. module: sale
#: selection:sale.config.picking_policy,picking_policy:0
@@ -634,7 +634,7 @@ msgstr "Podatki :"
#: field:sale.order,invoiced_rate:0
#: field:sale.order.line,invoiced:0
msgid "Invoiced"
-msgstr "Zafakturowana"
+msgstr "Zafakturowano"
#. module: sale
#: model:ir.actions.wizard,name:sale.advance_payment
diff --git a/addons/sale/report/order.rml b/addons/sale/report/order.rml
index 1c205b6c256..1b1256cee19 100644
--- a/addons/sale/report/order.rml
+++ b/addons/sale/report/order.rml
@@ -134,7 +134,7 @@
Shipping address :
- [[ o.partner_id.name ]] [[ o.partner_id.title or '' ]]
+ [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]][[ o.partner_shipping_id.title or '' ]] [[ o.partner_shipping_id.name ]][[ o.partner_shipping_id.street ]][[ o.partner_shipping_id.street2 or '' ]]
@@ -144,10 +144,10 @@
Invoice address :
- [[ o.partner_invoice_id.title or '' ]] [[ o.partner_invoice_id.name or '' ]]
+ [[ o.partner_invoice_id.title or '' ]] [[ o.partner_invoice_id.name or '' ]][[ o.partner_invoice_id.street ]] [[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]][[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]]
- [[ o.partner_invoice_id.state_id and o.partner_invoice_id.state_id.name or '' ]] [[ o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '' ]]
+ [[ o.partner_invoice_id.state_id and o.partner_invoice_id.state_id.name or '' ]][[ o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '' ]]
@@ -155,7 +155,7 @@
- [[ o.partner_id.name ]] [[ o.partner_id.title or '' ]]
+ [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]][[ o.partner_order_id.title or '' ]] [[ o.partner_order_id.name ]][[ o.partner_order_id.street ]][[ o.partner_order_id.street2 or '' ]]
@@ -187,7 +187,8 @@
Your Reference
- [[ o.state=='draft' and 'Quotation Date' or 'Date Ordered' ]]
+ [[ o.state=='draft' and removeParentNode('para') ]] Date Ordered
+ [[ o.state <> 'draft' and removeParentNode('para') ]] Quotation Date
[[ line.name ]]
@@ -370,4 +371,4 @@
-
+
\ No newline at end of file
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index d1081a4b21f..c8b616ced78 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -57,6 +57,12 @@ class sale_report(osv.osv):
('done', 'Done'),
('cancel', 'Cancelled')
], 'Order State', readonly=True),
+ 'partner_invoice_id': fields.many2one('res.partner.address', 'Invoice Address Name', readonly=True),
+ 'partner_order_id': fields.many2one('res.partner.address', 'Ordering Contact Name', readonly=True),
+ 'partner_shipping_id': fields.many2one('res.partner.address', 'Shipping Address Name', readonly=True),
+ 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True),
+ 'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
+ 'date_confirm': fields.date('Confirmation Date', readonly=True)
}
_order = 'date desc'
def init(self, cr):
@@ -81,7 +87,13 @@ class sale_report(osv.osv):
sum(l.product_uom_qty*l.price_unit) as price_total,
(sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty * u.factor))::decimal(16,2) as price_average,
count(*) as nbr,
- s.state
+ s.state,
+ s.partner_invoice_id as partner_invoice_id,
+ s.partner_order_id as partner_order_id,
+ s.partner_shipping_id as partner_shipping_id,
+ s.pricelist_id as pricelist_id,
+ s.project_id as analytic_account_id,
+ s.date_confirm as date_confirm
from
sale_order_line l
left join
@@ -97,7 +109,13 @@ class sale_report(osv.osv):
s.shop_id,
s.company_id,
s.fiscal_position,
- s.payment_term
+ s.payment_term,
+ s.partner_invoice_id,
+ s.partner_order_id,
+ s.partner_shipping_id,
+ s.pricelist_id,
+ s.project_id,
+ s.date_confirm
)
""")
sale_report()
@@ -167,10 +185,14 @@ class product_bought_by_sale_order(osv.osv):
_name = "product.bought.by.sale.order"
_description = "Product bought by sale order"
_auto = False
- _rec_name = 'partner'
+ _rec_name = 'month'
_columns = {
'total_products': fields.integer('Total Products', readonly=True),
- 'name': fields.char('Sale order', size=64, readonly=True)
+ 'product_id':fields.many2one('product.product', 'Product', readonly=True),
+ 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
+ ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
+ ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+ 'year': fields.char('Year', size=64, readonly=True)
}
_order = 'total_products desc'
def init(self, cr):
@@ -179,8 +201,10 @@ class product_bought_by_sale_order(osv.osv):
create or replace view product_bought_by_sale_order as (
select
min(s.id) as id,
- count(*) as total_products,
- s.name as name
+ l.product_id as product_id,
+ to_char(l.create_date, 'MM') as month,
+ to_char(l.create_date, 'YYYY') as year,
+ count(*) as total_products
from
sale_order_line l
left join
@@ -188,7 +212,7 @@ class product_bought_by_sale_order(osv.osv):
where
s.state='manual' or s.state='progress'
group by
- s.name
+ l.product_id, to_char(l.create_date, 'MM'), to_char(l.create_date, 'YYYY')
)
""")
product_bought_by_sale_order()
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 4a333fbc077..ed1f17a0833 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -24,6 +24,12 @@
+
+
+
+
+
+
@@ -72,10 +78,6 @@
-
+
+
+
+
+
+
+
+
@@ -112,9 +122,16 @@
+
+
+
+
+
+
+
-
+
@@ -127,7 +144,7 @@
formtree,graph
- {'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}
+ {'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}
@@ -205,7 +222,9 @@
tree
-
+
+
+
@@ -217,8 +236,9 @@
graph
-
-
+
+
+
@@ -227,7 +247,8 @@
Product bought by sale orderproduct.bought.by.sale.orderform
- tree,graph
+ graph,tree
+ [('year','=', time.strftime('%Y'))]
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 718f29f12d7..272ee0ecd70 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -52,6 +52,7 @@ def _incoterm_get(self, cr, uid, context=None):
class sale_order(osv.osv):
_name = "sale.order"
+ _log_create = True
_description = "Sale Order"
def copy(self, cr, uid, id, default=None, context=None):
@@ -106,17 +107,19 @@ class sale_order(osv.osv):
for id in ids:
res[id] = [0.0, 0.0]
cr.execute('''SELECT
- p.sale_id,sum(m.product_qty), m.state
+ p.sale_id,sum(m.product_qty), mp.state as mp_state
FROM
stock_move m
LEFT JOIN
stock_picking p on (p.id=m.picking_id)
+ LEFT JOIN
+ mrp_procurement mp on (mp.move_id=m.id)
WHERE
- p.sale_id = ANY(%s) GROUP BY m.state, p.sale_id''',(ids,))
- for oid, nbr, state in cr.fetchall():
- if state == 'cancel':
+ p.sale_id = ANY(%s) GROUP BY mp.state, p.sale_id''',(ids,))
+ for oid, nbr, mp_state in cr.fetchall():
+ if mp_state == 'cancel':
continue
- if state == 'done':
+ if mp_state == 'done':
res[oid][0] += nbr or 0.0
res[oid][1] += nbr or 0.0
else:
@@ -434,7 +437,7 @@ class sale_order(osv.osv):
'currency_id': order.pricelist_id.currency_id.id,
'comment': order.note,
'payment_term': pay_term,
- 'fiscal_position': order.partner_id.property_account_position.id,
+ 'fiscal_position': order.fiscal_position.id or order.partner_id.property_account_position.id,
'date_invoice' : context.get('date_invoice',False),
'company_id' : order.company_id.id,
}
@@ -508,18 +511,14 @@ class sale_order(osv.osv):
def action_invoice_end(self, cr, uid, ids, context=None):
if context is None:
context = {}
+
for order in self.browse(cr, uid, ids, context=context):
- val = {'invoiced': True}
- if order.state == 'invoice_except':
- val['state'] = 'progress'
-
for line in order.order_line:
- towrite = []
if line.state == 'exception':
- towrite.append(line.id)
- if towrite:
- self.pool.get('sale.order.line').write(cr, uid, towrite, {'state': 'confirmed'}, context=context)
- self.write(cr, uid, [order.id], val)
+ self.pool.get('sale.order.line').write(cr, uid, [line.id], {'state': 'confirmed'}, context=context)
+
+ if order.state == 'invoice_except':
+ self.write(cr, uid, [order.id], {'state' : 'progress'}, context=context)
return True
@@ -553,16 +552,10 @@ class sale_order(osv.osv):
return True
def action_wait(self, cr, uid, ids, *args):
- event_p = self.pool.get('res.partner.event.type').check(cr, uid, 'sale_open')
- event_obj = self.pool.get('res.partner.event')
+ for (id,name) in self.name_get(cr, uid, ids):
+ message = _('Quotation ') + " '" + name + "' "+ _("converted to sale order.")
+ self.log(cr, uid, id, message)
for o in self.browse(cr, uid, ids):
- if event_p:
- event_obj.create(cr, uid, {'name': 'Sale Order: '+ o.name,\
- 'partner_id': o.partner_id.id,\
- 'date': time.strftime('%Y-%m-%d %H:%M:%S'),\
- 'user_id': (o.user_id and o.user_id.id) or uid,\
- 'partner_type': 'customer', 'probability': 1.0,\
- 'planned_revenue': o.amount_untaxed})
if (o.order_policy == 'manual'):
self.write(cr, uid, [o.id], {'state': 'manual', 'date_confirm': time.strftime('%Y-%m-%d')})
else:
@@ -813,7 +806,7 @@ class sale_order_line(osv.osv):
return res
_name = 'sale.order.line'
- _description = 'Sale Order line'
+ _description = 'Sale 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.char('Description', size=256, required=True, select=True, readonly=True, states={'draft':[('readonly',False)]}),
@@ -1072,7 +1065,7 @@ class sale_order_line(osv.osv):
'product_uos':
[('category_id', '=', uos_category_id)]}
- elif uos: # only happens if uom is False
+ elif uos and not uom: # only happens if uom is False
result['product_uom'] = product_obj.uom_id and product_obj.uom_id.id
result['product_uom_qty'] = qty_uos / product_obj.uos_coeff
result['th_weight'] = result['product_uom_qty'] * product_obj.weight
@@ -1117,7 +1110,7 @@ class sale_order_line(osv.osv):
uom=False, qty_uos=0, uos=False, name='', partner_id=False,
lang=False, update_tax=True, date_order=False):
res = self.product_id_change(cursor, user, ids, pricelist, product,
- qty=0, uom=uom, qty_uos=qty_uos, uos=uos, name=name,
+ qty=qty, uom=uom, qty_uos=qty_uos, uos=uos, name=name,
partner_id=partner_id, lang=lang, update_tax=update_tax,
date_order=date_order)
if 'product_uom' in res['value']:
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index cbfa3e77665..9a0804a9118 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -97,20 +97,20 @@
@@ -279,6 +277,7 @@
sale.orderformtree,form,calendar,graph
+ {"search_default_user_id":uid}
@@ -366,11 +365,11 @@
-
-
+
+
-
+
@@ -417,16 +416,16 @@
-
-
-
-
+
+
+
+
-
+
@@ -445,14 +444,14 @@
domain="[('state','=','done')]"
name="unshipped"
separator="1" />
-
-
-
-
-
+
+
+
+
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index e2f632bf711..48c00d8afba 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -63,11 +63,8 @@ class stock_picking(osv.osv):
user, picking)
def _get_comment_invoice(self, cursor, user, picking):
- if picking.sale_id and picking.sale_id.note:
- if picking.note:
- return picking.note + '\n' + picking.sale_id.note
- else:
- return picking.sale_id.note
+ if picking.note or (picking.sale_id and picking.sale_id.note):
+ return picking.note or picking.sale_id.note
return super(stock_picking, self)._get_comment_invoice(cursor, user,
picking)
@@ -139,6 +136,10 @@ class stock_picking(osv.osv):
sale_lines = picking.sale_id.order_line
invoice_created = invoices[result[picking.id]]
+ for inv in invoice_obj.browse(cursor, user, [invoice_created.id], context=context):
+ if not inv.fiscal_position:
+ invoice_obj.write(cursor, user, [inv.id], {'fiscal_position': picking.sale_id.fiscal_position.id}, context=context)
+
if picking.sale_id.client_order_ref:
inv_name = picking.sale_id.client_order_ref + " : " + invoice_created.name
invoice_obj.write(cursor, user, [invoice_created.id], {'name': inv_name}, context=context)
@@ -188,6 +189,19 @@ class stock_picking(osv.osv):
})
return result
+
+ def action_cancel(self, cr, uid, ids, context={}):
+ res = super(stock_picking, self).action_cancel(cr, uid, ids, context=context)
+ for pick in self.browse(cr, uid, ids, context):
+ call_ship_end = True
+ if pick.sale_id:
+ for picks in pick.sale_id.picking_ids:
+ if picks.state not in ('done','cancel'):
+ call_ship_end = False
+ break
+ if call_ship_end:
+ self.pool.get('sale.order').action_ship_end(cr, uid, [pick.sale_id.id], context)
+ return res
stock_picking()
diff --git a/addons/sale/test/advance_invoice.yml b/addons/sale/test/advance_invoice.yml
new file mode 100644
index 00000000000..870b3ec0428
--- /dev/null
+++ b/addons/sale/test/advance_invoice.yml
@@ -0,0 +1,301 @@
+-
+ In order to test the sale module in the Open-ERP, I need to configure details regarding product & customer.
+-
+ I am going to sell my Mobile products to the customer with name Cleartrail
+-
+ I create View Account Type.
+-
+ !record {model: account.account.type, id: account_account_type_view0}:
+ close_method: none
+ code: View
+ name: View
+ sign: 1
+-
+ I create Income Account Type.
+-
+ !record {model: account.account.type, id: account_account_type_income0}:
+ close_method: unreconciled
+ code: Income
+ name: Income
+ sign: 1
+-
+ I create Expense Account Type.
+-
+ !record {model: account.account.type, id: account_account_type_expense0}:
+ close_method: unreconciled
+ code: Expense
+ name: Expense
+ sign: 1
+-
+ I create Cash Account Type.
+-
+ !record {model: account.account.type, id: account_account_type_cash0}:
+ close_method: balance
+ code: Cash
+ name: Cash
+ sign: 1
+-
+ I create Minimal Chart Account.
+-
+ !record {model: account.account, id: account_account_minimalchart0}:
+ code: '0'
+ company_id: base.main_company
+ currency_mode: current
+ name: Minimal Chart
+ parent_left: 1
+ parent_right: 12
+ type: view
+ user_type: account_account_type_view0
+-
+ I create Payable Account.
+-
+ !record {model: account.account, id: account_account_payable1}:
+ code: AP
+ company_id: base.main_company
+ currency_mode: current
+ name: Payable
+ parent_id: account_account_minimalchart0
+ parent_left: 2
+ parent_right: 3
+ reconcile: true
+ type: payable
+ user_type: account_account_type_expense0
+-
+ I create Receivable Account.
+-
+ !record {model: account.account, id: account_account_receivable0}:
+ code: AR
+ company_id: base.main_company
+ currency_mode: current
+ name: Receivable
+ parent_id: account_account_minimalchart0
+ parent_left: 4
+ parent_right: 5
+ reconcile: true
+ type: receivable
+ user_type: account_account_type_income0
+-
+ I create Cash Account.
+-
+ !record {model: account.account, id: account_account_cash0}:
+ code: C
+ company_id: base.main_company
+ currency_mode: current
+ name: Cash
+ parent_id: account_account_minimalchart0
+ parent_left: 6
+ parent_right: 7
+ type: other
+ user_type: account_account_type_cash0
+-
+ I create Purchases Account.
+-
+ !record {model: account.account, id: account_account_purchases0}:
+ code: P
+ company_id: base.main_company
+ currency_mode: current
+ name: Purchases
+ parent_id: account_account_minimalchart0
+ parent_left: 8
+ parent_right: 9
+ type: other
+ user_type: account_account_type_expense0
+-
+ I create Sales Account.
+-
+ !record {model: account.account, id: account_account_sales0}:
+ code: S
+ company_id: base.main_company
+ currency_mode: current
+ name: Sales
+ parent_id: account_account_minimalchart0
+ parent_left: 10
+ parent_right: 11
+ type: other
+ user_type: account_account_type_income0
+-
+ I create Purchase Journal.
+-
+ !record {model: account.journal, id: account_journal_purchasejournal0}:
+ code: PUJ
+ company_id: base.main_company
+ default_credit_account_id: account_account_purchases0
+ default_debit_account_id: account_account_purchases0
+ name: Purchase Journal
+ sequence_id: account.sequence_purchase_journal
+ type: purchase
+ view_id: account.account_journal_view
+-
+ I create Sale Journal.
+-
+ !record {model: account.journal, id: account_journal_salejournal0}:
+ code: SAJ
+ company_id: base.main_company
+ default_credit_account_id: account_account_sales0
+ default_debit_account_id: account_account_sales0
+ name: Sale Journal
+ sequence_id: account.sequence_sale_journal
+ type: sale
+ view_id: account.account_journal_view
+-
+ I create Bank Journal.
+-
+ !record {model: account.journal, id: account_journal_bankjournal0}:
+ code: BNK
+ company_id: base.main_company
+ default_credit_account_id: account_account_cash0
+ default_debit_account_id: account_account_cash0
+ name: Bank Journal
+ sequence_id: account.sequence_journal
+ type: cash
+ view_id: account.account_journal_bank_view
+-
+ I create ir.property for account payable.
+-
+ !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}:
+ company_id: base.main_company
+ fields_id: account.field_res_partner_property_account_payable
+ name: property_account_expense_categ
+ value_reference: account.account,5
+-
+ I create ir.property for account receivable.
+-
+ !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}:
+ company_id: base.main_company
+ fields_id: account.field_res_partner_property_account_receivable
+ name: property_account_income_categ
+ value_reference: account.account,6
+-
+ I create Partner category Customers.
+-
+ !record {model: res.partner.category, id: res_partner_category_customers0}:
+ name: Customers
+-
+ I create Cleartrail Customer.
+-
+ !record {model: res.partner, id: res_partner_cleartrail0}:
+ category_id:
+ - res_partner_category_customers0
+ name: Cleartrail
+-
+ I create contact address for Cleartrail.
+-
+ !record {model: res.partner.address, id: res_partner_address_1}:
+ partner_id: res_partner_cleartrail0
+ street: onam plaza, 14 B palasia A B Road
+ type: contact
+-
+ I create invoice address for Cleartrail.
+-
+ !record {model: res.partner.address, id: res_partner_address_2}:
+ partner_id: res_partner_cleartrail0
+ street: sarda house 24 B palasia, A B Road
+ type: invoice
+-
+ I create delivery address for Cleartrail.
+-
+ !record {model: res.partner.address, id: res_partner_address_3}:
+ partner_id: res_partner_cleartrail0
+ street: sangam house 15 B palasia, A B Road
+ type: delivery
+-
+ Customer Cleartrail has specific instrument requirement regarding the stockable products.
+-
+ I define product category Mobile Products Sellable.
+-
+ !record {model: product.category, id: product_category_allproductssellable0}:
+ name: Mobile Products Sellable
+
+
+-
+ I define product category Mobile Services.
+-
+ !record {model: product.category, id: product_category_services0}:
+ name: Mobile Services
+-
+ I define LG Viewty Smart product template.
+-
+ !record {model: product.template, id: product_template_lgviewtysmart0}:
+ categ_id: product_category_allproductssellable0
+ cost_method: standard
+ list_price: 170.0
+ mes_type: fixed
+ name: LG Viewty Smart
+ procure_method: make_to_order
+ standard_price: 160.0
+ supply_method: produce
+ type: product
+ uom_id: product.product_uom_unit
+ uom_po_id: product.product_uom_unit
+
+-
+ I define LG Viewty Smart product.
+-
+ !record {model: product.product, id: product_product_lgviewtysmart0}:
+ categ_id: product_category_allproductssellable0
+ cost_method: standard
+ list_price: 170.0
+ mes_type: fixed
+ name: LG Viewty Smart
+ pricelist_purchase: 'Default Purchase Pricelist (0.00) : 160.00\n'
+ pricelist_sale: 'Public Pricelist (0.00) : 170.00\n'
+ procure_method: make_to_order
+ property_account_expense: sale.account_account_payable1
+ property_account_income: sale.account_account_receivable0
+ seller_delay: '1'
+ standard_price: 160.0
+ supply_method: produce
+ type: product
+ uom_id: product.product_uom_unit
+ uom_po_id: product.product_uom_unit
+-
+ I create a Sale Order for LG Viewty Smart for qty 500 having order_policy prepaid.
+-
+ !record {model: sale.order, id: sale_order_so0}:
+ date_order: '2010-05-03'
+ invoice_quantity: order
+ name: SO004
+ order_line:
+ - name: LG Viewty Smart
+ price_unit: 170.0
+ product_uom: product.product_uom_unit
+ product_uom_qty: 500.0
+ state: draft
+ delay: 7.0
+ product_id: sale.product_product_lgviewtysmart0
+ product_uos_qty: 500.0
+ th_weight: 0.0
+ type: make_to_order
+ order_policy: prepaid
+ partner_id: sale.res_partner_cleartrail0
+ partner_invoice_id: sale.res_partner_address_2
+ partner_order_id: sale.res_partner_address_1
+ partner_shipping_id: sale.res_partner_address_3
+ picking_policy: direct
+ pricelist_id: product.list0
+ shop_id: sale.shop
+
+-
+ I use the Advance Payment wizard.
+-
+ !record {model: sale.advance.payment.inv, id: sale_advance_payment_inv_0}:
+ amount: 1000.0
+ product_id: product.product_product_pc3
+ qtty: 3.0
+
+
+-
+ Performing an osv_memory action create_invoices on module sale.advance.payment.inv
+-
+ !python {model: sale.advance.payment.inv}: |
+ self.create_invoices(cr, uid, [ref("sale_advance_payment_inv_0")], {"lang": 'en_US',
+ "active_model": 'sale.order', "active_ids": [ref("sale_order_so0")], "tz":
+ False, "active_id": ref("sale_order_so0"), })
+-
+ I will verify whether the invoice has been generated.
+-
+ !python {model: sale.order}: |
+ so = self.browse(cr, uid, ref("sale_order_so0"))
+ assert so.invoice_ids, "Invoices has not been generated for sale_order_so0"
+
+
diff --git a/addons/sale/test/prepaid_sale_order.yml b/addons/sale/test/prepaid_sale_order.yml
new file mode 100644
index 00000000000..cd33b1bc73e
--- /dev/null
+++ b/addons/sale/test/prepaid_sale_order.yml
@@ -0,0 +1,379 @@
+-
+ In order to test the sale module in the Open-ERP, I need to configure details regarding product & customer.
+-
+ I am going to sell my Mobile products to the customer with name Cleartrail
+-
+ I create View Account Type.
+-
+ !record {model: account.account.type, id: account_account_type_view0}:
+ close_method: none
+ code: View
+ name: View
+ sign: 1
+-
+ I create Income Account Type.
+-
+ !record {model: account.account.type, id: account_account_type_income0}:
+ close_method: unreconciled
+ code: Income
+ name: Income
+ sign: 1
+-
+ I create Expense Account Type.
+-
+ !record {model: account.account.type, id: account_account_type_expense0}:
+ close_method: unreconciled
+ code: Expense
+ name: Expense
+ sign: 1
+-
+ I create Cash Account Type.
+-
+ !record {model: account.account.type, id: account_account_type_cash0}:
+ close_method: balance
+ code: Cash
+ name: Cash
+ sign: 1
+-
+ I create Minimal Chart Account.
+-
+ !record {model: account.account, id: account_account_minimalchart0}:
+ code: '0'
+ company_id: base.main_company
+ currency_mode: current
+ name: Minimal Chart
+ parent_left: 1
+ parent_right: 12
+ type: view
+ user_type: account_account_type_view0
+-
+ I create Payable Account.
+-
+ !record {model: account.account, id: account_account_payable1}:
+ code: AP
+ company_id: base.main_company
+ currency_mode: current
+ name: Payable
+ parent_id: account_account_minimalchart0
+ parent_left: 2
+ parent_right: 3
+ reconcile: true
+ type: payable
+ user_type: account_account_type_expense0
+-
+ I create Receivable Account.
+-
+ !record {model: account.account, id: account_account_receivable0}:
+ code: AR
+ company_id: base.main_company
+ currency_mode: current
+ name: Receivable
+ parent_id: account_account_minimalchart0
+ parent_left: 4
+ parent_right: 5
+ reconcile: true
+ type: receivable
+ user_type: account_account_type_income0
+-
+ I create Cash Account.
+-
+ !record {model: account.account, id: account_account_cash0}:
+ code: C
+ company_id: base.main_company
+ currency_mode: current
+ name: Cash
+ parent_id: account_account_minimalchart0
+ parent_left: 6
+ parent_right: 7
+ type: other
+ user_type: account_account_type_cash0
+-
+ I create Purchases Account.
+-
+ !record {model: account.account, id: account_account_purchases0}:
+ code: P
+ company_id: base.main_company
+ currency_mode: current
+ name: Purchases
+ parent_id: account_account_minimalchart0
+ parent_left: 8
+ parent_right: 9
+ type: other
+ user_type: account_account_type_expense0
+-
+ I create Sales Account.
+-
+ !record {model: account.account, id: account_account_sales0}:
+ code: S
+ company_id: base.main_company
+ currency_mode: current
+ name: Sales
+ parent_id: account_account_minimalchart0
+ parent_left: 10
+ parent_right: 11
+ type: other
+ user_type: account_account_type_income0
+-
+ I create Purchase Journal.
+-
+ !record {model: account.journal, id: account_journal_purchasejournal0}:
+ code: PUJ
+ company_id: base.main_company
+ default_credit_account_id: account_account_purchases0
+ default_debit_account_id: account_account_purchases0
+ name: Purchase Journal
+ sequence_id: account.sequence_purchase_journal
+ type: purchase
+ view_id: account.account_journal_view
+-
+ I create Sale Journal.
+-
+ !record {model: account.journal, id: account_journal_salejournal0}:
+ code: SAJ
+ company_id: base.main_company
+ default_credit_account_id: account_account_sales0
+ default_debit_account_id: account_account_sales0
+ name: Sale Journal
+ sequence_id: account.sequence_sale_journal
+ type: sale
+ view_id: account.account_journal_view
+-
+ I create Bank Journal.
+-
+ !record {model: account.journal, id: account_journal_bankjournal0}:
+ code: BNK
+ company_id: base.main_company
+ default_credit_account_id: account_account_cash0
+ default_debit_account_id: account_account_cash0
+ name: Bank Journal
+ sequence_id: account.sequence_journal
+ type: cash
+ view_id: account.account_journal_bank_view
+-
+ I create ir.property for account payable.
+-
+ !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}:
+ company_id: base.main_company
+ fields_id: account.field_res_partner_property_account_payable
+ name: property_account_expense_categ
+ value_reference: account.account,5
+-
+ I create ir.property for account receivable.
+-
+ !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}:
+ company_id: base.main_company
+ fields_id: account.field_res_partner_property_account_receivable
+ name: property_account_income_categ
+ value_reference: account.account,6
+-
+ I create Partner category Customers.
+-
+ !record {model: res.partner.category, id: res_partner_category_customers0}:
+ name: Customers
+-
+ I create Cleartrail Customer.
+-
+ !record {model: res.partner, id: res_partner_cleartrail0}:
+ category_id:
+ - res_partner_category_customers0
+ name: Cleartrail
+-
+ I create contact address for Cleartrail.
+-
+ !record {model: res.partner.address, id: res_partner_address_1}:
+ partner_id: res_partner_cleartrail0
+ street: onam plaza, 14 B palasia A B Road
+ type: contact
+-
+ I create invoice address for Cleartrail.
+-
+ !record {model: res.partner.address, id: res_partner_address_2}:
+ partner_id: res_partner_cleartrail0
+ street: sarda house 24 B palasia, A B Road
+ type: invoice
+-
+ I create delivery address for Cleartrail.
+-
+ !record {model: res.partner.address, id: res_partner_address_3}:
+ partner_id: res_partner_cleartrail0
+ street: sangam house 15 B palasia, A B Road
+ type: delivery
+-
+ Customer Cleartrail has specific instrument requirement regarding the stockable products.
+-
+ I define product category Mobile Products Sellable.
+-
+ !record {model: product.category, id: product_category_allproductssellable0}:
+ name: Mobile Products Sellable
+
+
+-
+ I define product category Mobile Services.
+-
+ !record {model: product.category, id: product_category_services0}:
+ name: Mobile Services
+-
+ I define LG Viewty Smart product template.
+-
+ !record {model: product.template, id: product_template_lgviewtysmart0}:
+ categ_id: product_category_allproductssellable0
+ cost_method: standard
+ list_price: 170.0
+ mes_type: fixed
+ name: LG Viewty Smart
+ procure_method: make_to_order
+ standard_price: 160.0
+ supply_method: produce
+ type: product
+ uom_id: product.product_uom_unit
+ uom_po_id: product.product_uom_unit
+-
+ I define LG Viewty Smart product.
+-
+ !record {model: product.product, id: product_product_lgviewtysmart0}:
+ categ_id: product_category_allproductssellable0
+ cost_method: standard
+ list_price: 170.0
+ mes_type: fixed
+ name: LG Viewty Smart
+ pricelist_purchase: 'Default Purchase Pricelist (0.00) : 160.00\n'
+ pricelist_sale: 'Public Pricelist (0.00) : 170.00\n'
+ procure_method: make_to_order
+ property_account_expense: sale.account_account_payable1
+ property_account_income: sale.account_account_receivable0
+ seller_delay: '1'
+ standard_price: 160.0
+ supply_method: produce
+ type: product
+ uom_id: product.product_uom_unit
+ uom_po_id: product.product_uom_unit
+-
+ I create a Sale Order for LG Viewty Smart for qty 500 having order_policy prepaid.
+-
+ !record {model: sale.order, id: sale_order_so1}:
+ date_order: '2010-05-03'
+ invoice_quantity: order
+ name: Test_SO001
+ order_line:
+ - name: LG Viewty Smart
+ price_unit: 170.0
+ product_uom: product.product_uom_unit
+ product_uom_qty: 500.0
+ state: draft
+ delay: 7.0
+ product_id: sale.product_product_lgviewtysmart0
+ product_uos_qty: 500.0
+ th_weight: 0.0
+ type: make_to_order
+ order_policy: prepaid
+ partner_id: sale.res_partner_cleartrail0
+ partner_invoice_id: sale.res_partner_address_2
+ partner_order_id: sale.res_partner_address_1
+ partner_shipping_id: sale.res_partner_address_3
+ picking_policy: direct
+ pricelist_id: product.list0
+ shop_id: sale.shop
+
+
+-
+ I confirm the sale order.
+-
+ !workflow {model: sale.order, action: order_confirm, ref: sale_order_so1}
+-
+ I will verify whether the invoice has been generated for SO since Shipping policy is 'Payment Before Delivery'
+-
+ !python {model: sale.order}: |
+ so = self.browse(cr, uid, ref("sale_order_so1"))
+ assert so.invoice_ids, "Invoices has not been generated for sale_order_so1"
+-
+ I open the Invoice for the SO.
+-
+ !python {model: account.invoice}: |
+ sale_order_obj = self.pool.get('sale.order')
+ so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
+ import netsvc
+ wf_service = netsvc.LocalService("workflow")
+ invoice_ids = so.invoice_ids
+ for invoice in invoice_ids:
+ wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
+-
+ Creating a account invoice pay entry.
+-
+ !record {model: account.invoice.pay, id: account_invoice_pay_tst1}:
+ amount: 85000.0
+ date: '2010-05-10'
+ journal_id: sale.account_journal_bankjournal0
+ name: tst
+ period_id: account.period_5
+-
+ I pay the invoice.
+-
+ !python {model: account.invoice.pay}: |
+ sale_order_obj = self.pool.get('sale.order')
+ so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
+ self.wo_check(cr, uid, [ref("account_invoice_pay_tst1")], {"lang": "en_US", "tz":
+ False, "active_model": 'account.invoice', "active_ids": [so.invoice_ids[0].id], "type":
+ "out_invoice", "active_id": so.invoice_ids[0].id, })
+
+
+-
+ Creating an account invoice pay writeoff entry.
+-
+ !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
+ analytic_id: account.analytic_customers
+ comment: Write-Off
+ writeoff_acc_id: account.a_sale
+ writeoff_journal_id: sale.account_journal_bankjournal0
+
+
+-
+ Pay and Reconcile the Invoice.
+-
+ !python {model: account.invoice.pay.writeoff}: |
+ sale_order_obj = self.pool.get('sale.order')
+ so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
+ self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
+ {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
+ [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id })
+
+
+-
+ I will verify the picking associated with the sale order sale_order_so1
+-
+ !python {model: sale.order}: |
+ so = self.browse(cr, uid, ref("sale_order_so1"))
+ assert so.picking_ids,"Picking has not been generated for sale_order_so1"
+-
+ Products are delivered to the Cleartrail Customer.
+-
+ !python {model: stock.picking }: |
+ import time
+ sale_order_obj = self.pool.get('sale.order')
+ so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
+ picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
+ if picking_id:
+ pick=self.browse(cr,uid,picking_id[0])
+ pick.force_assign(cr, uid)
+ partial_datas = {
+ 'partner_id':pick.address_id.partner_id.id,
+ 'address_id': pick.address_id.id,
+ 'delivery_date' : time.strftime('%Y-%m-%d'),
+ }
+ move = pick.move_lines[0]
+ partial_datas['move%s'%(move.id)]= {
+ 'product_id': move.product_id.id,
+ 'product_qty': move.product_qty,
+ 'product_uom': move.product_uom.id,
+ }
+ self.do_partial(cr, uid, [pick.id],partial_datas)
+-
+ I verify that picking order is in done state.
+-
+ !python {model: stock.picking }: |
+ sale_order_obj = self.pool.get('sale.order')
+ so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
+ picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
+
+ if picking_id:
+ pick = self.browse(cr,uid,picking_id[0])
+ assert (pick.state) =='done', "Picking for SO is not in done state."
diff --git a/addons/sale/test/sale_procurement.yml b/addons/sale/test/sale_procurement.yml
new file mode 100644
index 00000000000..c9d26baec9f
--- /dev/null
+++ b/addons/sale/test/sale_procurement.yml
@@ -0,0 +1,91 @@
+-
+ In order to test the sale order working with procurements I will create some
+ products with different supply method and procurement method.
+-
+ I create two products.
+-
+ !record {model: product.product, id: product_product_table0}:
+ categ_id: product.cat1
+ name: Table
+ procure_method: make_to_order
+ supply_method: produce
+ type: product
+ uom_id: product.product_uom_unit
+ uom_po_id: product.product_uom_unit
+-
+ !record {model: product.product, id: product_product_wood0}:
+ categ_id: product.cat1
+ name: Wood
+ procure_method: make_to_stock
+ supply_method: buy
+ type: product
+ uom_id: product.product_uom_kgm
+ uom_po_id: product.product_uom_kgm
+-
+ I define Minimum stock rule for my stockable product wood
+-
+ !record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op0}:
+ company_id: base.main_company
+ location_id: stock.stock_location_stock
+ logic: max
+ product_id: product_product_wood0
+ product_max_qty: 15.0
+ product_min_qty: 10.0
+ product_uom: product.product_uom_kgm
+ qty_multiple: 1
+ warehouse_id: stock.warehouse0
+-
+ Now I make a sale order for table.
+-
+ !record {model: sale.order, id: sale_order_so3}:
+ amount_total: 5.0
+ amount_untaxed: 5.0
+ date_order: '2010-04-30'
+ invoice_quantity: order
+ order_line:
+ - company_id: base.main_company
+ delay: 7.0
+ name: Table
+ price_unit: 1.0
+ product_id: product_product_table0
+ product_uom: product.product_uom_unit
+ product_uom_qty: 5.0
+ product_uos_qty: 5.0
+ state: draft
+ type: make_to_order
+ order_policy: manual
+ partner_id: base.res_partner_agrolait
+ partner_invoice_id: base.res_partner_address_8
+ partner_order_id: base.res_partner_address_8
+ partner_shipping_id: base.res_partner_address_8
+ picking_policy: direct
+ pricelist_id: product.list0
+ shop_id: sale.shop
+-
+ I confirm the order.
+-
+ !workflow {model: sale.order, action: order_confirm, ref: sale_order_so3}
+-
+ I check that one procurement is generated.
+-
+ !python {model: mrp.procurement}: |
+ from tools.translate import _
+ proc_ids = self.search(cr, uid, [('state','=','confirmed')])
+ assert proc_ids, _('No Procurements!')
+-
+ The scheduler runs.
+-
+ !function {model: mrp.procurement, name: run_scheduler}:
+ - model: mrp.procurement
+ search: "[('state','=','confirmed')]"
+-
+ I check that the procurement for the product table is in exception state.
+ As my product's supply method is produce and mrp module is yet not installed.
+-
+ !python {model: mrp.procurement}: |
+ from tools.translate import _
+ proc_ids = self.search(cr, uid, [('state','=','exception')])
+ assert proc_ids, _('No Procurements are in exception state!')
+
+
+
\ No newline at end of file
diff --git a/addons/sale/test/shipping_manual_sale_order.yml b/addons/sale/test/shipping_manual_sale_order.yml
new file mode 100644
index 00000000000..4bbbbb74dc5
--- /dev/null
+++ b/addons/sale/test/shipping_manual_sale_order.yml
@@ -0,0 +1,384 @@
+-
+ In order to test the sale module in the Open-ERP, I need to configure details regarding product & customer.
+-
+ I am going to sell my Mobile products to the customer with name Cleartrail
+-
+ I create View Account Type.
+-
+ !record {model: account.account.type, id: account_account_type_view0}:
+ close_method: none
+ code: View
+ name: View
+ sign: 1
+-
+ I create Income Account Type.
+-
+ !record {model: account.account.type, id: account_account_type_income0}:
+ close_method: unreconciled
+ code: Income
+ name: Income
+ sign: 1
+-
+ I create Expense Account Type.
+-
+ !record {model: account.account.type, id: account_account_type_expense0}:
+ close_method: unreconciled
+ code: Expense
+ name: Expense
+ sign: 1
+-
+ I create Cash Account Type.
+-
+ !record {model: account.account.type, id: account_account_type_cash0}:
+ close_method: balance
+ code: Cash
+ name: Cash
+ sign: 1
+-
+ I create Minimal Chart Account.
+-
+ !record {model: account.account, id: account_account_minimalchart0}:
+ code: '0'
+ company_id: base.main_company
+ currency_mode: current
+ name: Minimal Chart
+ parent_left: 1
+ parent_right: 12
+ type: view
+ user_type: account_account_type_view0
+-
+ I create Payable Account.
+-
+ !record {model: account.account, id: account_account_payable1}:
+ code: AP
+ company_id: base.main_company
+ currency_mode: current
+ name: Payable
+ parent_id: account_account_minimalchart0
+ parent_left: 2
+ parent_right: 3
+ reconcile: true
+ type: payable
+ user_type: account_account_type_expense0
+-
+ I create Receivable Account.
+-
+ !record {model: account.account, id: account_account_receivable0}:
+ code: AR
+ company_id: base.main_company
+ currency_mode: current
+ name: Receivable
+ parent_id: account_account_minimalchart0
+ parent_left: 4
+ parent_right: 5
+ reconcile: true
+ type: receivable
+ user_type: account_account_type_income0
+-
+ I create Cash Account.
+-
+ !record {model: account.account, id: account_account_cash0}:
+ code: C
+ company_id: base.main_company
+ currency_mode: current
+ name: Cash
+ parent_id: account_account_minimalchart0
+ parent_left: 6
+ parent_right: 7
+ type: other
+ user_type: account_account_type_cash0
+-
+ I create Purchases Account.
+-
+ !record {model: account.account, id: account_account_purchases0}:
+ code: P
+ company_id: base.main_company
+ currency_mode: current
+ name: Purchases
+ parent_id: account_account_minimalchart0
+ parent_left: 8
+ parent_right: 9
+ type: other
+ user_type: account_account_type_expense0
+-
+ I create Sales Account.
+-
+ !record {model: account.account, id: account_account_sales0}:
+ code: S
+ company_id: base.main_company
+ currency_mode: current
+ name: Sales
+ parent_id: account_account_minimalchart0
+ parent_left: 10
+ parent_right: 11
+ type: other
+ user_type: account_account_type_income0
+-
+ I create Purchase Journal.
+-
+ !record {model: account.journal, id: account_journal_purchasejournal0}:
+ code: PUJ
+ company_id: base.main_company
+ default_credit_account_id: account_account_purchases0
+ default_debit_account_id: account_account_purchases0
+ name: Purchase Journal
+ sequence_id: account.sequence_purchase_journal
+ type: purchase
+ view_id: account.account_journal_view
+-
+ I create Sale Journal.
+-
+ !record {model: account.journal, id: account_journal_salejournal0}:
+ code: SAJ
+ company_id: base.main_company
+ default_credit_account_id: account_account_sales0
+ default_debit_account_id: account_account_sales0
+ name: Sale Journal
+ sequence_id: account.sequence_sale_journal
+ type: sale
+ view_id: account.account_journal_view
+-
+ I create Bank Journal.
+-
+ !record {model: account.journal, id: account_journal_bankjournal0}:
+ code: BNK
+ company_id: base.main_company
+ default_credit_account_id: account_account_cash0
+ default_debit_account_id: account_account_cash0
+ name: Bank Journal
+ sequence_id: account.sequence_journal
+ type: cash
+ view_id: account.account_journal_bank_view
+-
+ I create ir.property for account payable.
+-
+ !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}:
+ company_id: base.main_company
+ fields_id: account.field_res_partner_property_account_payable
+ name: property_account_expense_categ
+ value_reference: account.account,5
+-
+ I create ir.property for account receivable.
+-
+ !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}:
+ company_id: base.main_company
+ fields_id: account.field_res_partner_property_account_receivable
+ name: property_account_income_categ
+ value_reference: account.account,6
+-
+ I create Partner category Customers.
+-
+ !record {model: res.partner.category, id: res_partner_category_customers0}:
+ name: Customers
+-
+ I create Cleartrail Customer.
+-
+ !record {model: res.partner, id: res_partner_cleartrail0}:
+ category_id:
+ - res_partner_category_customers0
+ name: Cleartrail
+-
+ I create contact address for Cleartrail.
+-
+ !record {model: res.partner.address, id: res_partner_address_1}:
+ partner_id: res_partner_cleartrail0
+ street: onam plaza, 14 B palasia A B Road
+ type: contact
+-
+ I create invoice address for Cleartrail.
+-
+ !record {model: res.partner.address, id: res_partner_address_2}:
+ partner_id: res_partner_cleartrail0
+ street: sarda house 24 B palasia, A B Road
+ type: invoice
+-
+ I create delivery address for Cleartrail.
+-
+ !record {model: res.partner.address, id: res_partner_address_3}:
+ partner_id: res_partner_cleartrail0
+ street: sangam house 15 B palasia, A B Road
+ type: delivery
+-
+ Customer Cleartrail has specific instrument requirement regarding the stockable products.
+-
+ I define product category Mobile Products Sellable.
+-
+ !record {model: product.category, id: product_category_allproductssellable0}:
+ name: Mobile Products Sellable
+-
+ I define product category Mobile Services.
+-
+ !record {model: product.category, id: product_category_services0}:
+ name: Mobile Services
+-
+ I define LG Viewty Smart product template.
+-
+ !record {model: product.template, id: product_template_newchocolateslidermobile0}:
+ categ_id: product_category_allproductssellable0
+ cost_method: standard
+ list_price: 200.0
+ mes_type: fixed
+ name: New Chocolate Slider Mobile
+ procure_method: make_to_order
+ standard_price: 189.0
+ supply_method: buy
+ type: product
+ uom_id: product.product_uom_unit
+ uom_po_id: product.product_uom_unit
+-
+ I define LG Viewty Smart product.
+-
+ !record {model: product.product, id: product_product_newchocolateslidermobile0}:
+ categ_id: product_category_allproductssellable0
+ cost_method: standard
+ list_price: 200.0
+ mes_type: fixed
+ name: New Chocolate Slider Mobile
+ pricelist_purchase: 'Default Purchase Pricelist (0.00) : 189.00\n'
+ pricelist_sale: 'Public Pricelist (0.00) : 200.00\n'
+ procure_method: make_to_order
+ property_account_expense: sale.account_account_payable1
+ property_account_income: sale.account_account_receivable0
+ seller_delay: '1'
+ standard_price: 189.0
+ supply_method: buy
+ type: product
+ uom_id: product.product_uom_unit
+ uom_po_id: product.product_uom_unit
+-
+ I create a Sale Order for LG Viewty Smart for qty 500 having order_policy manual.
+-
+ !record {model: sale.order, id: sale_order_so0}:
+ date_order: '2010-05-12'
+ invoice_quantity: order
+ name: Test_SO002
+ order_line:
+ - name: New Chocolate Slider Mobile
+ price_unit: 200.0
+ product_uom: product.product_uom_unit
+ product_uom_qty: 500.0
+ state: draft
+ delay: 7.0
+ product_id: sale.product_product_newchocolateslidermobile0
+ product_uos_qty: 500.0
+ type: make_to_order
+ order_policy: manual
+ partner_id: sale.res_partner_cleartrail0
+ partner_invoice_id: sale.res_partner_address_2
+ partner_order_id: sale.res_partner_address_1
+ partner_shipping_id: sale.res_partner_address_3
+ picking_policy: direct
+ pricelist_id: product.list0
+ shop_id: sale.shop
+-
+ I confirm the Sale Order.
+-
+ !workflow {model: sale.order, action: order_confirm, ref: sale_order_so0}
+-
+ I click on Create Invoice button to create the invoice.
+-
+ !workflow {model: sale.order, action: manual_invoice, ref: sale_order_so0}
+-
+ I verify whether the invoice has been generated for SO
+-
+ !python {model: sale.order}: |
+ so = self.browse(cr, uid, ref("sale_order_so0"))
+ assert so.invoice_ids, "Invoices has not been generated for sale_order_so0"
+-
+ I open the Invoice for the SO.
+-
+ !python {model: account.invoice}: |
+ sale_order_obj = self.pool.get('sale.order')
+ so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+ import netsvc
+ wf_service = netsvc.LocalService("workflow")
+ invoice_ids = so.invoice_ids
+ for invoice in invoice_ids:
+ wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
+-
+ Creating a account invoice pay entry.
+-
+ !record {model: account.invoice.pay, id: account_invoice_pay_tst0}:
+ amount: 100000.0
+ date: '2010-05-10'
+ journal_id: sale.account_journal_bankjournal0
+ name: test
+ period_id: account.period_5
+-
+ I pay the invoice.
+-
+ !python {model: account.invoice.pay}: |
+ sale_order_obj = self.pool.get('sale.order')
+ so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+ self.wo_check(cr, uid, [ref("account_invoice_pay_tst0")], {"lang": "en_US", "tz":
+ False, "active_model": 'account.invoice', "active_ids": [so.invoice_ids[0].id], "type":
+ "out_invoice", "active_id": so.invoice_ids[0].id})
+
+
+-
+ Creating an account invoice pay writeoff entry.
+-
+ !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
+ analytic_id: account.analytic_customers
+ comment: Write-Off
+ writeoff_acc_id: account.a_sale
+ writeoff_journal_id: sale.account_journal_bankjournal0
+
+
+-
+ Pay and Reconcile the Invoice.
+-
+ !python {model: account.invoice.pay.writeoff}: |
+ sale_order_obj = self.pool.get('sale.order')
+ so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+ self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
+ {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
+ [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id, })
+-
+ I verify the invoice are in paid state or not.
+-
+ !python {model: account.invoice}: |
+ sale_order_obj = self.pool.get('sale.order')
+ so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+ invoice_ids = so.invoice_ids
+ for invoice in invoice_ids:
+ assert (invoice.state) =='paid', "Invoice for SO is not in done state."
+-
+ I verify the picking associated with the sale order sale_order_so0.
+-
+ !python {model: sale.order}: |
+ so = self.browse(cr, uid, ref("sale_order_so0"))
+ assert so.picking_ids,"Picking has not been generated for sale_order_so0"
+-
+ Products are delivered to the Cleartrail Customer.
+-
+ !python {model: stock.picking }: |
+ import time
+ sale_order_obj = self.pool.get('sale.order')
+ so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+ picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
+ if picking_id:
+ pick=self.browse(cr,uid,picking_id[0])
+ pick.force_assign(cr, uid)
+ partial_datas = {
+ 'partner_id':pick.address_id.partner_id.id,
+ 'address_id': pick.address_id.id,
+ 'delivery_date' : time.strftime('%Y-%m-%d'),
+ }
+ move = pick.move_lines[0]
+ partial_datas['move%s'%(move.id)]= {
+ 'product_id': move.product_id.id,
+ 'product_qty': move.product_qty,
+ 'product_uom': move.product_uom.id,
+ }
+ self.do_partial(cr, uid, [pick.id],partial_datas)
+-
+ I verify that picking order is in done state.
+-
+ !python {model: stock.picking }: |
+ sale_order_obj = self.pool.get('sale.order')
+ so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+ picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
+ if picking_id:
+ pick = self.browse(cr,uid,picking_id[0])
+ assert (pick.state) =='done', "Picking for SO is not in done state."
diff --git a/addons/sale/wizard/__init__.py b/addons/sale/wizard/__init__.py
index 07c5ceea83d..ba6fd677a3c 100644
--- a/addons/sale/wizard/__init__.py
+++ b/addons/sale/wizard/__init__.py
@@ -19,8 +19,9 @@
#
##############################################################################
-#remaining make_invoice
+import sale_make_invoice
import sale_line_invoice
import sale_make_invoice_advance
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/wizard/make_invoice.py b/addons/sale/wizard/make_invoice.py
deleted file mode 100644
index 7b190c3b2d6..00000000000
--- a/addons/sale/wizard/make_invoice.py
+++ /dev/null
@@ -1,96 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-invoice_form = """
-
-"""
-
-invoice_fields = {
- 'grouped' : {'string':'Group the invoices', 'type':'boolean', 'default': lambda x,y,z: False},
- 'invoice_date': {'string': 'Invoiced date', 'type':'date' }
-}
-
-ack_form = """
-"""
-
-ack_fields = {}
-
-def _makeInvoices(self, cr, uid, data, context):
- pool_obj = pooler.get_pool(cr.dbname)
- mod_obj = pool_obj.get('ir.model.data')
- order_obj = pool_obj.get('sale.order')
- newinv = []
-
- order_obj.action_invoice_create(cr, uid, data['ids'], data['form']['grouped'], date_inv = data['form']['invoice_date'])
- for id in data['ids']:
- wf_service = netsvc.LocalService("workflow")
- wf_service.trg_validate(uid, 'sale.order', id, 'manual_invoice', cr)
-
- for o in order_obj.browse(cr, uid, data['ids'], context):
- for i in o.invoice_ids:
- newinv.append(i.id)
- act_obj = pool_obj.get('ir.actions.act_window')
- xml_id='action_invoice_tree5'
- result = mod_obj._get_id(cr, uid, 'account', xml_id)
- id = mod_obj.read(cr, uid, result, ['res_id'])['res_id']
- result = act_obj.read(cr, uid, id)
- result['domain'] ="[('id','in', ["+','.join(map(str,newinv))+"])]"
- return result
- #return {
- # 'domain': "[('id','in', ["+','.join(map(str,newinv))+"])]",
- # 'name': 'Invoices',
- # 'view_type': 'form',
- # 'view_mode': 'tree,form',
- # 'res_model': 'account.invoice',
- # 'view_id': False,
- # 'context': "{'type':'out_refund'}",
- # 'type': 'ir.actions.act_window'
- #}
- #return {}
-
-class make_invoice(wizard.interface):
- states = {
- 'init' : {
- 'actions' : [],
- 'result' : {'type' : 'form',
- 'arch' : invoice_form,
- 'fields' : invoice_fields,
- 'state' : [('end', 'Cancel'),('invoice', 'Create invoices') ]}
- },
- 'invoice' : {
- 'actions' : [_makeInvoices],
- 'result' : {'type': 'state', 'state': 'end'}
- },
- }
-make_invoice("sale.order.make_invoice")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index 4bf3074db54..15405f07874 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -20,22 +20,11 @@
##############################################################################
from osv import fields, osv
-from service import web_services
-import wizard
-import netsvc
-import ir
-import pooler
+from tools.translate import _
class sale_order_line_make_invoice(osv.osv_memory):
_name = "sale.order.line.make.invoice"
_description = "Sale OrderLine Make_invoice"
- _columns = {
- 'grouped': fields.boolean('Group the invoices'),
- }
- _default = {
- 'grouped' : lambda *a: False
- }
-
def make_invoices(self, cr, uid, ids, context):
"""
To make invoices.
@@ -82,7 +71,7 @@ class sale_order_line_make_invoice(osv.osv_memory):
'currency_id' : order.pricelist_id.currency_id.id,
'comment': order.note,
'payment_term': pay_term,
- 'fiscal_position': order.partner_id.property_account_position.id
+ 'fiscal_position': order.fiscal_position.id or order.partner_id.property_account_position.id,
}
inv_id = self.pool.get('account.invoice').create(cr, uid, inv)
return inv_id
@@ -110,6 +99,8 @@ class sale_order_line_make_invoice(osv.osv_memory):
wf_service.trg_validate(uid, 'sale.order', line.order_id.id, 'all_lines', cr)
sales_order_obj.write(cr,uid,[line.order_id.id],{'state' : 'progress'})
+ if not invoices:
+ raise osv.except_osv(_('Warning'),_('Invoice cannot be created for this Sale Order Line due to one of the following reasons:\n1.The state of this sale order line is either "draft" or "cancel"!\n2.The Sale Order Line is Invoiced!'))
for result in invoices.values():
order = result[0][0].order_id
il = map(lambda x: x[1], result)
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index 90bdf2a6828..436fabc91fc 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -8,8 +8,6 @@
diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py
new file mode 100644
index 00000000000..5ea01b1db6c
--- /dev/null
+++ b/addons/sale/wizard/sale_make_invoice.py
@@ -0,0 +1,74 @@
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import fields, osv
+from service import web_services
+from tools.translate import _
+import ir
+import netsvc
+
+class sale_make_invoice(osv.osv_memory):
+ _name = "sale.make.invoice"
+ _description = "Sale Make Invoice"
+ _columns = {
+ 'grouped': fields.boolean('Group the invoices'),
+ 'invoice_date':fields.date('Invoice Date'),
+ }
+ _default = {
+ 'grouped' : lambda *a: False
+ }
+ def view_init(self, cr, uid, fields_list, context=None):
+ record_id = context and context.get('active_id', False)
+ order = self.pool.get('sale.order').browse(cr, uid, record_id)
+ if order.state=='draft':
+ raise osv.except_osv(_('Warning !'),'You can not create invoice when sale order is not confirmed.')
+ return False
+ def make_invoices(self, cr, uid, ids, context={}):
+ order_obj = self.pool.get('sale.order')
+ newinv = []
+ data=self.read(cr,uid,ids)[0]
+ order_obj.action_invoice_create(cr, uid, context.get(('active_ids'),[]), data['grouped'],date_inv = data['invoice_date'])
+ wf_service = netsvc.LocalService("workflow")
+ for id in context.get(('active_ids'),[]):
+ wf_service.trg_validate(uid, 'sale.order', id, 'manual_invoice', cr)
+
+ for o in order_obj.browse(cr, uid, context.get(('active_ids'),[]), context):
+ for i in o.invoice_ids:
+ newinv.append(i.id)
+
+ mod_obj =self.pool.get('ir.model.data')
+ result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+
+ id = mod_obj.read(cr, uid, result, ['res_id'])
+ return {
+ 'domain': "[('id','in', ["+','.join(map(str,newinv))+"])]",
+ 'name': 'Invoices',
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'res_model': 'account.invoice',
+ 'view_id': False,
+ 'context': "{'type':'out_refund'}",
+ 'type': 'ir.actions.act_window',
+ 'search_view_id': id['id']
+ }
+
+sale_make_invoice()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml
new file mode 100644
index 00000000000..ade720be1f4
--- /dev/null
+++ b/addons/sale/wizard/sale_make_invoice.xml
@@ -0,0 +1,29 @@
+
+
+
+
+ Create invoices
+ sale.make.invoice
+ form
+
+
+
+
+
+
+
+
+
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 6c9ca17b836..2861a046205 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -22,10 +22,6 @@ from osv import fields, osv
from service import web_services
from tools.translate import _
import ir
-import netsvc
-import pooler
-import wizard
-
class sale_advance_payment_inv(osv.osv_memory):
_name = "sale.advance.payment.inv"
@@ -95,7 +91,7 @@ class sale_advance_payment_inv(osv.osv_memory):
'currency_id' :sale.pricelist_id.currency_id.id,
'comment': '',
'payment_term':sale.payment_term.id,
- 'fiscal_position': sale.partner_id.property_account_position.id
+ 'fiscal_position': sale.fiscal_position.id or sale.partner_id.property_account_position.id
}
inv_id = inv_obj.create(cr, uid, inv)
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index 613d8af7b7a..14c1a07e336 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -23,7 +23,6 @@ from osv import osv,fields
class sale_order(osv.osv):
_inherit = 'sale.order'
- _description = 'Sale orders'
_columns = {
'section_id': fields.many2one('crm.case.section', 'Sales Team'),
}
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 7660dcc5cd2..7a8cd419718 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -22,7 +22,7 @@
-
+
@@ -34,7 +34,7 @@
-
+ [[line.product_id.code ]] [[ line.product_id and line.product_id.name or '']]
- [[ (line.prodlot_id and (line.prodlot_id.name + '/' + line.prodlot_id.ref)) or ' ' ]]
+ [[ (line.prodlot_id and (line.prodlot_id.name + (line.prodlot_id.ref and ('/' + line.prodlot_id.ref) or ''))) or ' ' ]]
[[ formatLang(line.product_qty) ]]
diff --git a/addons/sale_journal/picking_journal_view.xml b/addons/sale_journal/picking_journal_view.xml
index 7d2d657b7de..f6b59668150 100644
--- a/addons/sale_journal/picking_journal_view.xml
+++ b/addons/sale_journal/picking_journal_view.xml
@@ -10,12 +10,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -41,10 +41,10 @@
tree
-
-
-
-
+
+
+
+
@@ -57,13 +57,12 @@
-
-
-
-
-
+
+
+
+
@@ -73,6 +72,7 @@
sale_journal.picking.journalformtree,form
+ {"search_default_user_id":uid}
diff --git a/addons/sale_journal/picking_journal_view_report.xml b/addons/sale_journal/picking_journal_view_report.xml
index d2940fa3d2b..62c8d0a9ca1 100644
--- a/addons/sale_journal/picking_journal_view_report.xml
+++ b/addons/sale_journal/picking_journal_view_report.xml
@@ -11,11 +11,11 @@
form
@@ -91,10 +91,10 @@
form
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index c041a934274..8b636241285 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -25,7 +25,7 @@ import time
class sale_journal_invoice_type(osv.osv):
_name = 'sale_journal.invoice.type'
- _description = 'Invoice Types'
+ _description = 'Invoice Type'
_columns = {
'name': fields.char('Invoice Type', size=64, required=True),
'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the invoice type without removing it."),
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 7783f646292..c1e415b8833 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -42,12 +42,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -83,10 +83,10 @@
tree
-
-
-
-
+
+
+
+
@@ -99,13 +99,12 @@
-
-
-
-
-
+
+
+
+
@@ -115,6 +114,7 @@
sale_journal.sale.journalformtree,form
+ {"search_default_user_id":uid}
@@ -285,9 +285,9 @@
form
diff --git a/addons/scrum/__openerp__.py b/addons/scrum/__openerp__.py
index 19facdbaed3..3170baca2a1 100644
--- a/addons/scrum/__openerp__.py
+++ b/addons/scrum/__openerp__.py
@@ -56,6 +56,7 @@
'scrum_view.xml',
'process/scrum_process.xml',
'wizard/scrum_backlog_sprint_view.xml',
+ 'wizard/scrum_backlog_merger_view.xml',
],
'demo_xml': ['scrum_demo.xml'],
'installable': True,
diff --git a/addons/scrum/i18n/fr.po b/addons/scrum/i18n/fr.po
index 5dd1943ab4a..9d1982fc341 100644
--- a/addons/scrum/i18n/fr.po
+++ b/addons/scrum/i18n/fr.po
@@ -7,13 +7,13 @@ 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-08 13:49+0000\n"
-"Last-Translator: nel \n"
+"PO-Revision-Date: 2010-05-22 09:49+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ \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-05-23 03:57+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: scrum
@@ -29,7 +29,7 @@ msgstr "Nom du Rendez-vous"
#. module: scrum
#: model:process.transition,note:scrum.process_transition_backlogtask0
msgid "From backlog create task."
-msgstr ""
+msgstr "Créer une tâche à partir du référentiel"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.action_view_task4
@@ -46,17 +46,17 @@ msgstr "Mes Sprints Ouverts (Directeur de Produit)"
#. module: scrum
#: model:process.node,note:scrum.process_node_productbacklog0
msgid "Create task from backlogs"
-msgstr ""
+msgstr "Créer une tâche à partir des référentiels"
#. module: scrum
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nom de modèle invalide pour la définition de l'action"
#. module: scrum
#: model:ir.module.module,shortdesc:scrum.module_meta_information
msgid "Scrum, Agile Development Method"
-msgstr ""
+msgstr "Scrum, méthode de développement agile"
#. module: scrum
#: field:scrum.project,progress_rate:0
@@ -69,6 +69,8 @@ msgid ""
"Total remaining time, can be re-estimated periodically by the assignee of "
"the task."
msgstr ""
+"Le temps restant total peut être réévalué périodiquement par le prescripteur "
+"de la tâche."
#. module: scrum
#: field:scrum.project,child_id:0
@@ -88,7 +90,7 @@ msgstr "Est-ce que l'estimation du Retard du Sprint est correcte ?"
#. module: scrum
#: field:scrum.project,members:0
msgid "Project Members"
-msgstr ""
+msgstr "Membres du projet"
#. module: scrum
#: view:scrum.project:0
@@ -106,6 +108,8 @@ msgid ""
"Header added at the beginning of the email for the warning message sent to "
"the customer when a task is closed."
msgstr ""
+"L'entête est ajouté au début de l'email pour que le message d'avertissement "
+"soit envoyer au client lorsque la tâche est fermé."
#. module: scrum
#: field:scrum.task,priority:0
@@ -127,6 +131,8 @@ msgstr "Voir le Retard du Projet"
msgid ""
"Project's member. Not used in any computation, just for information purpose."
msgstr ""
+"Membre du projet. Non utilisé dans aucun calcul, juste proposer à titre "
+"d'information"
#. module: scrum
#: selection:scrum.product.backlog,priority:0
@@ -150,6 +156,8 @@ msgid ""
"Estimated time to do the task, usually set by the project manager when the "
"task is in draft state."
msgstr ""
+"Temps estimé pour réaliser la tâche, habituellement fixé par le responsable "
+"du projet quand la tâche est à l'état brouillon"
#. module: scrum
#: field:scrum.project,notes:0
@@ -175,6 +183,8 @@ msgid ""
"If you check this field, the project manager will receive a request each "
"time a task is completed by his team."
msgstr ""
+"Si vous cochez ce champs, le responsable du projet recevra une requête "
+"chaque fois qu'une tâche est completé par son équipe."
#. module: scrum
#: selection:scrum.project,state:0
@@ -190,7 +200,7 @@ msgstr "Nom de l'équipe"
#. module: scrum
#: field:scrum.project,warn_header:0
msgid "Mail Header"
-msgstr ""
+msgstr "En-tête de courrier"
#. module: scrum
#: field:scrum.project,sprint_size:0
@@ -205,7 +215,7 @@ msgstr "Date de fin"
#. module: scrum
#: help:scrum.task,effective_hours:0
msgid "Computed using the sum of the task work done."
-msgstr ""
+msgstr "Calculé en utilisant la somme du travail de tâche effectuée."
#. module: scrum
#: help:scrum.project,warn_customer:0
@@ -213,6 +223,8 @@ msgid ""
"If you check this, the user will have a popup when closing a task that "
"propose a message to send by email to the customer."
msgstr ""
+"Si vous cochez la case, l'utilisateur verra un menu surgissant quand une "
+"tâche sera fermé proposant un message pour envoyer un mail au client."
#. module: scrum
#: model:ir.actions.act_window,name:scrum.action_sprint_task_open
@@ -239,7 +251,7 @@ msgstr "Date limite"
#: field:scrum.project,partner_id:0
#: field:scrum.task,partner_id:0
msgid "Partner"
-msgstr ""
+msgstr "Partenaire"
#. module: scrum
#: field:scrum.product.backlog,planned_hours:0
@@ -251,7 +263,7 @@ msgstr "Heures planifiés"
#. module: scrum
#: selection:scrum.project,state:0
msgid "Template"
-msgstr ""
+msgstr "Modèle"
#. module: scrum
#: field:scrum.product.backlog,priority:0
@@ -268,11 +280,12 @@ msgstr "État"
#: help:scrum.project,progress_rate:0
msgid "Percent of tasks closed according to the total of tasks todo."
msgstr ""
+"Pourcentage des tâches fermés en accord avec le total des tâches à faire."
#. module: scrum
#: help:scrum.project,notes:0
msgid "Internal description of the project."
-msgstr ""
+msgstr "Description interne du projet"
#. module: scrum
#: field:scrum.sprint,meetings_id:0
@@ -282,7 +295,7 @@ msgstr "Scrum Journalier"
#. module: scrum
#: help:scrum.task,total_hours:0
msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
+msgstr "Calculer comme: Temps passé + Temps restant"
#. module: scrum
#: field:scrum.task,type:0
@@ -292,7 +305,7 @@ msgstr "Type"
#. module: scrum
#: view:scrum.project:0
msgid "Scrum Data"
-msgstr ""
+msgstr "Données Scrum"
#. module: scrum
#: selection:scrum.product.backlog,priority:0
@@ -303,7 +316,7 @@ msgstr "Moyenne"
#. module: scrum
#: field:scrum.project,total_hours:0
msgid "Total Time"
-msgstr ""
+msgstr "Temps Total"
#. module: scrum
#: model:ir.ui.menu,name:scrum.next_id_67
@@ -356,7 +369,7 @@ msgstr "Voir les tâches du projet"
#. module: scrum
#: field:scrum.task,delay_hours:0
msgid "Delay Hours"
-msgstr ""
+msgstr "Delais en heures"
#. module: scrum
#: field:scrum.project,contact_id:0
@@ -392,18 +405,18 @@ msgstr "Créer tâches"
#. module: scrum
#: field:scrum.task,progress:0
msgid "Progress (%)"
-msgstr ""
+msgstr "Progression (%)"
#. module: scrum
#: help:scrum.task,progress:0
msgid "Computed as: Time Spent / Total Time."
-msgstr ""
+msgstr "Calculer comme: Temps passé / Temps total"
#. module: scrum
#: field:scrum.project,scrum:0
#: field:scrum.task,scrum:0
msgid "Is Scrum"
-msgstr ""
+msgstr "Est Scrum"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.action_product_backlog_form_draft
@@ -482,7 +495,7 @@ msgstr "Mes Tâches Ouvertes"
#. module: scrum
#: field:scrum.project,manager:0
msgid "Project Manager"
-msgstr ""
+msgstr "Responsable du projet"
#. module: scrum
#: selection:scrum.project,state:0
@@ -511,13 +524,13 @@ msgstr "Sprints Ouverts"
#. module: scrum
#: field:scrum.project,effective_hours:0
msgid "Time Spent"
-msgstr ""
+msgstr "Temps écoulé"
#. module: scrum
#: field:scrum.project,complete_name:0
#: field:scrum.project,name:0
msgid "Project Name"
-msgstr ""
+msgstr "Nom du Projet"
#. module: scrum
#: field:scrum.project,product_owner_id:0
@@ -561,6 +574,9 @@ msgid ""
"Computed as: Total Time - Estimated Time. It gives the difference of the "
"time estimated by the project manager and the real time to close the task."
msgstr ""
+"Calculer comme: Temps total - Temps estimé. Cela donne la différence de "
+"temps estimé par le responsable projet et le temps réel pour fermer cette "
+"tâche."
#. module: scrum
#: field:scrum.task,timebox_id:0
@@ -576,7 +592,7 @@ msgstr "Sprints Brouillon"
#. module: scrum
#: field:scrum.project,timesheet_id:0
msgid "Working Time"
-msgstr ""
+msgstr "Temps de travail"
#. module: scrum
#: field:scrum.task,work_ids:0
@@ -591,7 +607,7 @@ msgstr "Voir les retards du sprint"
#. module: scrum
#: field:scrum.task,delegated_user_id:0
msgid "Delegated To"
-msgstr ""
+msgstr "Déléguer à"
#. module: scrum
#: field:scrum.task,date_close:0
@@ -611,7 +627,7 @@ msgstr "Retard Correct"
#. module: scrum
#: help:scrum.project,effective_hours:0
msgid "Sum of spent hours of all tasks related to this project."
-msgstr ""
+msgstr "Total des heures passés de toutes les tâches reliés à ce projet"
#. module: scrum
#: help:scrum.task,project_id:0
@@ -619,16 +635,18 @@ msgid ""
"If you have [?] in the project name, it means there are no analytic account "
"linked to this project."
msgstr ""
+"Si vous avez [?] dans le nom du projet, cela signifie que vous n'avez pas de "
+"compte analytique lié à ce projet"
#. module: scrum
#: help:scrum.project,planned_hours:0
msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
+msgstr "Somme des tâches planifiés de toutes les tâches relier à ce projet."
#. module: scrum
#: field:scrum.project,warn_customer:0
msgid "Warn Partner"
-msgstr ""
+msgstr "Avertir le partenaire"
#. module: scrum
#: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
@@ -648,6 +666,10 @@ msgid ""
"projects. It enables you to connect projects with budgets, planning, cost "
"and revenue analysis, timesheets on projects, etc."
msgstr ""
+"Lier ce projet à un compte analytique si vous souhaitez une gestion "
+"financière sur les projets. Il vous active la gestion des projets avec les "
+"budgets, agenda, coût, analyse de revenu, feuilles de temps sur le projet, "
+"etc."
#. module: scrum
#: selection:scrum.product.backlog,state:0
@@ -680,12 +702,12 @@ msgstr "Heures effectives"
#. module: scrum
#: field:scrum.project,warn_manager:0
msgid "Warn Manager"
-msgstr ""
+msgstr "Avertir le responsable"
#. module: scrum
#: selection:scrum.task,state:0
msgid "In Progress"
-msgstr ""
+msgstr "En cours"
#. module: scrum
#: field:scrum.sprint,review:0
diff --git a/addons/scrum/scrum.py b/addons/scrum/scrum.py
index 7595a8a5a28..9d3d9705674 100644
--- a/addons/scrum/scrum.py
+++ b/addons/scrum/scrum.py
@@ -18,11 +18,10 @@
# along with this program. If not, see .
#
##############################################################################
-
import time
import netsvc
-from osv import fields, osv, orm
+from osv import fields, osv, orm
from mx import DateTime
import re
@@ -35,8 +34,8 @@ class scrum_project(osv.osv):
}
_defaults = {
'product_owner_id': lambda self,cr,uid,context={}: uid,
- 'sprint_size': lambda *a: 15,
- 'scrum': lambda *a: 1
+ 'sprint_size': 15,
+ 'scrum': 1
}
scrum_project()
@@ -93,25 +92,43 @@ class scrum_sprint(osv.osv):
return True
_columns = {
'name' : fields.char('Sprint Name', required=True, size=64),
+ 'active' : fields.boolean('Active', help="If Active field is set to true, it will allow you to select sprint from task list view. "),
'date_start': fields.date('Starting Date', required=True),
'date_stop': fields.date('Ending Date', required=True),
- 'project_id': fields.many2one('project.project', 'Project', required=True, domain=[('scrum','=',1)]),
+ 'project_id': fields.many2one('project.project', 'Project', required=True, domain=[('scrum','=',1)], help="If you have [?] in the project name, it means there are no analytic account linked to this project."),
'product_owner_id': fields.many2one('res.users', 'Product Owner', required=True),
'scrum_master_id': fields.many2one('res.users', 'Scrum Manager', required=True),
'meeting_ids': fields.one2many('scrum.meeting', 'sprint_id', 'Daily Scrum'),
'review': fields.text('Sprint Review'),
'retrospective': fields.text('Sprint Retrospective'),
'backlog_ids': fields.one2many('scrum.product.backlog', 'sprint_id', 'Sprint Backlog'),
- 'progress': fields.function(_calc_progress, method=True, string='Progress (0-100)'),
- 'effective_hours': fields.function(_calc_effective, method=True, string='Effective hours'),
- 'planned_hours': fields.function(_calc_planned, method=True, string='Planned Hours'),
- 'expected_hours': fields.function(_calc_expected, method=True, string='Expected Hours'),
+ 'progress': fields.function(_calc_progress, method=True, string='Progress (0-100)', help="Computed as: Time Spent / Total Time."),
+ 'effective_hours': fields.function(_calc_effective, method=True, string='Effective hours', help="Computed using the sum of the task work done."),
+ 'planned_hours': fields.function(_calc_planned, method=True, string='Planned Hours', help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
+ 'expected_hours': fields.function(_calc_expected, method=True, string='Expected Hours', help='Estimated time to do the task.'),
'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('cancel','Cancelled'),('done','Done')], 'State', required=True),
}
_defaults = {
- 'state': lambda *a: 'draft',
- 'date_start' : lambda *a:time.strftime('%Y-%m-%d'),
+ 'state': 'draft',
+ 'date_start' : time.strftime('%Y-%m-%d'),
+ 'active': 1,
}
+
+ def copy(self, cr, uid, id, default=None, context=None):
+ """Overrides orm copy method
+ @param self: The object pointer
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param ids: List of case’s IDs
+ @param context: A standard dictionary for contextual values
+ """
+ if context is None:
+ context = {}
+ if default is None:
+ default = {}
+ default.update({'backlog_ids': [], 'meeting_ids': []})
+ return super(scrum_sprint, self).copy(cr, uid, id, default=default, context=context)
+
def onchange_project_id(self, cr, uid, ids, project_id):
v = {}
if project_id:
@@ -178,6 +195,8 @@ class scrum_product_backlog(osv.osv):
return True
def button_close(self, cr, uid, ids, context={}):
self.write(cr, uid, ids, {'state':'done'}, context=context)
+ for backlog in self.browse(cr, uid, ids, context=context):
+ self.pool.get('project.task').write(cr, uid, [i.id for i in backlog.tasks_id], {'state': 'done'})
return True
def button_pending(self, cr, uid, ids, context={}):
self.write(cr, uid, ids, {'state':'pending'}, context=context)
@@ -186,23 +205,23 @@ class scrum_product_backlog(osv.osv):
_columns = {
'name' : fields.char('Feature', size=64, required=True),
'note' : fields.text('Note'),
- 'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the product backlog without removing it."),
- 'project_id': fields.many2one('project.project', 'Project', required=True, domain=[('scrum','=',1)]),
+ 'active' : fields.boolean('Active', help="If Active field is set to true, it will allow you to hide the product backlog without removing it."),
+ 'project_id': fields.many2one('project.project', 'Project', required=True, domain=[('scrum','=',1)], help="If you have [?] in the project name, it means there are no analytic account linked to this project."),
'user_id': fields.many2one('res.users', 'Responsible'),
'sprint_id': fields.many2one('scrum.sprint', 'Sprint'),
'sequence' : fields.integer('Sequence', help="Gives the sequence order when displaying a list of product backlog."),
'tasks_id': fields.one2many('project.task', 'product_backlog_id', 'Tasks Details'),
'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('done','Done'),('cancel','Cancelled')], 'State', required=True),
- 'progress': fields.function(_calc_progress, method=True, string='Progress'),
- 'effective_hours': fields.function(_calc_effective, method=True, string='Effective hours'),
- 'planned_hours': fields.function(_calc_planned, method=True, string='Planned Hours'),
- 'expected_hours': fields.float('Expected Hours'),
+ 'progress': fields.function(_calc_progress, method=True, string='Progress', help="Computed as: Time Spent / Total Time."),
+ 'effective_hours': fields.function(_calc_effective, method=True, string='Effective hours', help="Computed using the sum of the task work done (Time spent on tasks)"),
+ 'planned_hours': fields.function(_calc_planned, method=True, string='Planned Hours', help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
+ 'expected_hours': fields.float('Expected Hours', help='Estimated total time to do the Backlog'),
'date':fields.datetime("Created Date"),
}
_defaults = {
- 'state': lambda *a: 'draft',
- 'active': lambda *a: 1,
- 'user_id': lambda self,cr,uid,context: uid,
+ 'state': 'draft',
+ 'active': 1,
+ 'user_id': lambda self, cr, uid, context: uid,
}
_order = "sequence"
scrum_product_backlog()
@@ -234,8 +253,9 @@ scrum_task()
class scrum_meeting(osv.osv):
_name = 'scrum.meeting'
_description = 'Scrum Meeting'
+ _order = 'date desc'
_columns = {
- 'name' : fields.char('Meeting Name', size=64, required=True),
+ 'name' : fields.char('Meeting Name', size=64),
'date': fields.date('Meeting Date', required=True),
'sprint_id': fields.many2one('scrum.sprint', 'Sprint', required=True),
'project_id': fields.many2one('project.project', 'Project'),
@@ -249,7 +269,7 @@ class scrum_meeting(osv.osv):
# TODO: Find the right sprint thanks to users and date
#
_defaults = {
- 'date' : lambda *a:time.strftime('%Y-%m-%d'),
+ 'date' : time.strftime('%Y-%m-%d'),
}
scrum_meeting()
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 8ff66680131..08c0473e31e 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -40,16 +40,13 @@
-
-
+
-
+
-
-
@@ -66,21 +63,47 @@
-
-
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -115,22 +138,16 @@
-
-
-
-
-
+
+
+
@@ -148,6 +165,7 @@
Product Backlogsscrum.product.backlogform
+ {"search_default_user_id":uid}