From b1a02e0b153ee21b9069646c9f9c0222b446617e Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 6 Nov 2012 22:28:18 +0100 Subject: [PATCH 1/7] [IMP] Expenses configuration menu simplified bzr revid: fp@openerp.com-20121106212818-hlq7s697ww3y3kbq --- addons/hr_expense/hr_expense_view.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index fbaa4c1f87e..74b77009aae 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -211,8 +211,7 @@ - - + From 3d1f9eacc5e419c9bc74d7ae78c14afb7eecac4f Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 6 Nov 2012 23:05:08 +0100 Subject: [PATCH 2/7] [IMP] typo bzr revid: fp@openerp.com-20121106220508-2fojaq6021v2i2jt --- addons/hr_holidays/hr_holidays_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 4691f7ebd71..ef300741139 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -466,7 +466,7 @@ - Leave Type + Leave Types ir.actions.act_window hr.holidays.status form From 75ef7f2a9983cdcfe2b7a043f607ce8e94af43ab Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 6 Nov 2012 23:39:12 +0100 Subject: [PATCH 3/7] [FIX] css bzr revid: fp@openerp.com-20121106223912-yz8yyjpbd6d1kjn0 --- addons/web_kanban/static/src/css/kanban.css | 6 +++++- addons/web_kanban/static/src/css/kanban.sass | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 837d11949bc..f968364c987 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -144,8 +144,13 @@ margin-left: 4px; cursor: pointer; position: relative; +} +.openerp .oe_kanban_view .oe_kanban_add { top: -8px; } +.openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle { + top: -2px; +} .openerp .oe_kanban_view .oe_kanban_card, .openerp .oe_kanban_view .oe_dropdown_toggle { cursor: pointer; display: inline-block; @@ -481,7 +486,6 @@ } .openerp .oe_kanban_view .oe_dropdown_kanban { float: right; - clear: both; cursor: pointer; margin-top: -6px; } diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index aea5d6bc8c0..459fc56092d 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -168,7 +168,10 @@ margin-left: 4px cursor: pointer position: relative + .oe_kanban_add top: -8px + .oe_kanban_header .oe_dropdown_toggle + top: -2px .oe_kanban_card, .oe_dropdown_toggle cursor: pointer display: inline-block @@ -414,7 +417,6 @@ // KanbanDropDown {{{ .oe_dropdown_kanban float: right - clear: both cursor: pointer margin-top: -6px &:hover From 92cce486cde5e52065869f65f86d3078352f5ae4 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 7 Nov 2012 00:04:16 +0100 Subject: [PATCH 4/7] [IMP] note CSS bzr revid: fp@openerp.com-20121106230416-xi6ddk7ll02wii7i --- addons/note/note_view.xml | 10 +++++----- addons/note/static/src/css/note.css | 2 +- addons/note/static/src/css/note.sass | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml index 5c3a77b7626..18a3ec840a9 100644 --- a/addons/note/note_view.xml +++ b/addons/note/note_view.xml @@ -59,18 +59,18 @@
- - W - W - -
+ í
diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css index 43bc455e04a..1b7e9315e74 100644 --- a/addons/note/static/src/css/note.css +++ b/addons/note/static/src/css/note.css @@ -46,7 +46,7 @@ .openerp .oe_kanban_record .oe_kanban_card_fancy { text-shadow: none; border-radius: 2px; - padding: 12px; + padding: 8px; margin-left: 3px; margin-right: 3px; padding-bottom: 16px; diff --git a/addons/note/static/src/css/note.sass b/addons/note/static/src/css/note.sass index ff39ce8708c..b5bc28a2593 100644 --- a/addons/note/static/src/css/note.sass +++ b/addons/note/static/src/css/note.sass @@ -50,7 +50,7 @@ .oe_kanban_card_fancy text-shadow: none border-radius: 2px - padding: 12px + padding: 8px margin-left: 3px margin-right: 3px padding-bottom: 16px From d07f7e0d995f61d3b435898b0c75eec2d6339d50 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 7 Nov 2012 00:05:28 +0100 Subject: [PATCH 5/7] [IMP] CSS small improvement bzr revid: fp@openerp.com-20121106230528-1rq72g0n0okde870 --- addons/web/static/src/css/base.css | 3 ++- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index c97b59ec6fe..30fe4d415cf 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -25,6 +25,7 @@ display: none !important; } } + .openerp.openerp_webclient_container { height: 100%; } @@ -659,7 +660,7 @@ cursor: pointer; } .openerp .oe_dropdown_toggle { - color: rgba(0, 0, 0, 0.5); + color: rgba(0, 0, 0, 0.3); font-weight: normal; } .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 18451352370..e388ad16727 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -569,7 +569,7 @@ $sheet-padding: 16px position: relative cursor: pointer .oe_dropdown_toggle - color: rgba(0,0,0,0.5) + color: rgba(0,0,0,0.3) font-weight: normal .oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened display: block From e77725eb892022793e575bbfdbdcde7331e79128 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 7 Nov 2012 02:57:08 +0100 Subject: [PATCH 6/7] [IMP] improve experience on for openerp developers on windows, notes in setup.py and fix some imports bzr revid: al@openerp.com-20121107015708-o9l893ll9f32wjcy --- README | 26 +++---- openerp/service/__init__.py | 2 +- openerp/service/workers.py | 13 ++-- setup.py | 139 ++++++++++++++++++++++++++++++++++++ 4 files changed, 154 insertions(+), 26 deletions(-) create mode 100755 setup.py diff --git a/README b/README index e7639e08fed..9449819d766 100644 --- a/README +++ b/README @@ -6,17 +6,9 @@ Customer Relationship Management software. More info at: http://www.openerp.com -Installation on Debian Ubuntu +Installation on Debian/Ubuntu ----------------------------- -Download the deb file and type: - - $ sudo dpkg -i - $ sudo apt-get install install -f - -Installation on Debian Ubuntu from nightly build ------------------------------------------------- - Add the the apt repository deb http://nightly.openerp.com/6.1/deb/ ./ @@ -26,6 +18,11 @@ in your source.list and type: $ sudo apt-get update $ sudo apt-get install openerp +Or download the deb file and type: + + $ sudo dpkg -i + $ sudo apt-get install install -f + Installation on RedHat, Fedora, CentOS -------------------------------------- @@ -42,6 +39,8 @@ Install the openerp rpm Installation on Windows ----------------------- + Check the notes in setup.py + Installation on MacOSX ----------------------- @@ -54,14 +53,7 @@ default master password is "admin". Detailed System Requirements ---------------------------- -You need the following software installed: - - postgresql-client, python-dateutil, python-feedparser, python-gdata, - python-ldap, python-libxslt1, python-lxml, python-mako, python-openid, - python-psycopg2, python-pybabel, python-pychart, python-pydot, - python-pyparsing, python-reportlab, python-simplejson, python-tz, - python-vatnumber, python-vobject, python-webdav, python-werkzeug, python-xlwt, - python-yaml, python-zsi +The dependencies are listed in setup.py For Luxembourg localization, you also need: diff --git a/openerp/service/__init__.py b/openerp/service/__init__.py index a1c19914268..491af631202 100644 --- a/openerp/service/__init__.py +++ b/openerp/service/__init__.py @@ -34,7 +34,6 @@ import openerp.netsvc import openerp.osv import openerp.tools import openerp.service.wsgi_server -import openerp.service.workers #.apidoc title: RPC Services @@ -119,6 +118,7 @@ def stop_services(): openerp.modules.registry.RegistryManager.delete_all() def start_services_workers(): + import openerp.service.workers openerp.multi_process = True # Nah! openerp.service.workers.Multicorn(openerp.service.wsgi_server.application).run() diff --git a/openerp/service/workers.py b/openerp/service/workers.py index eae1b2839a8..7bdf45c079f 100644 --- a/openerp/service/workers.py +++ b/openerp/service/workers.py @@ -3,20 +3,17 @@ # TODO rename class: Multicorn -> Arbiter ? #----------------------------------------------------------- import errno -try: - import fcntl -except ImportError: - fcntl = None +import fcntl +import logging +import os import psutil import random import resource import select -import socket -import time -import logging -import os import signal +import socket import sys +import time import werkzeug.serving diff --git a/setup.py b/setup.py new file mode 100755 index 00000000000..45f19ea7a7d --- /dev/null +++ b/setup.py @@ -0,0 +1,139 @@ +#!/usr/bin/env python +# -*- 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 glob, os, re, setuptools, sys +from os.path import join, isfile + +# List all data files +def data(): + files = [] + for root, dirnames, filenames in os.walk('openerp'): + for filename in filenames: + if not re.match(r'.*(\.pyc|\.pyo|\~)$',filename): + files.append(os.path.join(root, filename)) + d = {} + for v in files: + k=os.path.dirname(v) + if k in d: + d[k].append(v) + else: + d[k]=[v] + r = d.items() + if os.name == 'nt': + r.append(("Microsoft.VC90.CRT", glob.glob('C:\Microsoft.VC90.CRT\*.*'))) + + import babel + r.append(("localedata", + glob.glob(os.path.join(os.path.dirname(babel.__file__), "localedata" , '*')))) + + return r + +def gen_manifest(): + file_list="\n".join(data()) + open('MANIFEST','w').write(file_list) + +if os.name == 'nt': + sys.path.append("C:\Microsoft.VC90.CRT") + +def py2exe_options(): + if os.name == 'nt': + import py2exe + return { + "console" : [ { "script": "openerp-server", "icon_resources": [(1, join("install","openerp-icon.ico"))], }], + 'options' : { + "py2exe": { + "skip_archive": 1, + "optimize": 2, + "dist_dir": 'dist', + "packages": [ "DAV", "HTMLParser", "PIL", "asynchat", "asyncore", "commands", "dateutil", "decimal", "email", "encodings", "imaplib", "lxml", "lxml._elementpath", "lxml.builder", "lxml.etree", "lxml.objectify", "mako", "openerp", "poplib", "pychart", "pydot", "pyparsing", "reportlab", "select", "simplejson", "smtplib", "uuid", "vatnumber", "vobject", "xml", "xml.dom", "yaml", ], + "excludes" : ["Tkconstants","Tkinter","tcl"], + } + } + } + else: + return {} + +execfile(join(os.path.dirname(__file__), 'openerp', 'release.py')) + +# Notes for OpenERP developer on windows: +# +# To setup a windows developer evironement install python2.7 then pip and use +# "pip install " for every dependency listed below. +# +# Dependecies that requires DLLs are not installable with pip install, for +# them we added comments with links where you can find the installers. +# +# OpenERP on windows also require the pywin32, the binary can be found at +# http://pywin32.sf.net +# +# Both python2.7 32bits and 64bits are known to work. + +setuptools.setup( + name = 'openerp', + version = version, + description = description, + long_description = long_desc, + url = url, + author = author, + author_email = author_email, + classifiers = filter(None, classifiers.split("\n")), + license = license, + scripts = ['openerp-server'], + data_files = data(), + packages = setuptools.find_packages(), + dependency_links = ['http://download.gna.org/pychart/'], + #include_package_data = True, + install_requires = [ + 'pychart', # not on pypi, use: pip install http://download.gna.org/pychart/PyChart-1.39.tar.gz + 'babel', + 'docutils', + 'feedparser', + 'gdata', + 'lxml < 3', # windows binary http://www.lfd.uci.edu/~gohlke/pythonlibs/ + 'mako', + 'PIL', # windows binary http://www.lfd.uci.edu/~gohlke/pythonlibs/ + 'psutil', # windows binary code.google.com/p/psutil/downloads/list + 'psycopg2', + 'pydot', + 'python-dateutil < 2', + 'python-ldap', # optional + 'python-openid', + 'pytz', + 'pywebdav', + 'pyyaml', + 'reportlab', # windows binary pypi.python.org/pypi/reportlab + 'simplejson', + 'vatnumber', + 'vobject', + 'werkzeug', + 'xlwt', + 'zsi', # optional + ], + extras_require = { + 'SSL' : ['pyopenssl'], + }, + tests_require = ['unittest2'], + **py2exe_options() +) + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 1c5e8da2765e51b2c8bb49c6d1bf3c6b55c95dbf Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Wed, 7 Nov 2012 04:55:49 +0000 Subject: [PATCH 7/7] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20121107043841-l0evnkldw3r700x5 bzr revid: launchpad_translations_on_behalf_of_openerp-20121107045549-xo24icru3zmufl8e --- addons/crm_todo/i18n/es.po | 96 ++++++++++++++++++++++++++++++++++++++ addons/stock/i18n/zh_CN.po | 10 ++-- addons/web/i18n/zh_CN.po | 2 +- 3 files changed, 102 insertions(+), 6 deletions(-) create mode 100644 addons/crm_todo/i18n/es.po diff --git a/addons/crm_todo/i18n/es.po b/addons/crm_todo/i18n/es.po new file mode 100644 index 00000000000..0749835649b --- /dev/null +++ b/addons/crm_todo/i18n/es.po @@ -0,0 +1,96 @@ +# Spanish translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-11-06 15:26+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-11-07 04:38+0000\n" +"X-Generator: Launchpad (build 16232)\n" + +#. module: crm_todo +#: model:ir.model,name:crm_todo.model_project_task +msgid "Task" +msgstr "Tarea" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Timebox" +msgstr "Periodo de tiempo" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "For cancelling the task" +msgstr "Para cancelar la tarea" + +#. module: crm_todo +#: constraint:project.task:0 +msgid "Error ! Task end-date must be greater then task start-date" +msgstr "" +"¡ Error ! La fecha final de la tarea debe ser mayor que la fecha de inicio" + +#. module: crm_todo +#: model:ir.model,name:crm_todo.model_crm_lead +msgid "crm.lead" +msgstr "crm.iniciativa" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Next" +msgstr "Siguiente" + +#. module: crm_todo +#: model:ir.actions.act_window,name:crm_todo.crm_todo_action +#: model:ir.ui.menu,name:crm_todo.menu_crm_todo +msgid "My Tasks" +msgstr "Mis tareas" + +#. module: crm_todo +#: view:crm.lead:0 +#: field:crm.lead,task_ids:0 +msgid "Tasks" +msgstr "Tareas" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Done" +msgstr "Realizado" + +#. module: crm_todo +#: constraint:project.task:0 +msgid "Error ! You cannot create recursive tasks." +msgstr "¡Error! No se pueden crear tareas recursivas." + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Cancel" +msgstr "Cancelar" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Extra Info" +msgstr "Información extra" + +#. module: crm_todo +#: field:project.task,lead_id:0 +msgid "Lead / Opportunity" +msgstr "Iniciativa / Oportunidad" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "For changing to done state" +msgstr "Para cambiar a estado 'Realizada'" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Previous" +msgstr "Anterior" diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po index 9610ef7dc1d..64a500b1cca 100644 --- a/addons/stock/i18n/zh_CN.po +++ b/addons/stock/i18n/zh_CN.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 01:37+0100\n" -"PO-Revision-Date: 2012-06-20 09:34+0000\n" -"Last-Translator: openerp-china.black-jack \n" +"PO-Revision-Date: 2012-11-06 14:21+0000\n" +"Last-Translator: Wei \"oldrev\" Li \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n" -"X-Generator: Launchpad (build 16206)\n" +"X-Launchpad-Export-Date: 2012-11-07 04:38+0000\n" +"X-Generator: Launchpad (build 16232)\n" #. module: stock #: field:product.product,track_outgoing:0 @@ -940,7 +940,7 @@ msgstr "如果您需要在成品库位生产请留空.如在固定地点生产 #. module: stock #: view:res.partner:0 msgid "Inventory Properties" -msgstr "盘点表属性" +msgstr "库存属性" #. module: stock #: field:report.stock.move,day_diff:0 diff --git a/addons/web/i18n/zh_CN.po b/addons/web/i18n/zh_CN.po index d90ed916ffd..09a7d041b88 100644 --- a/addons/web/i18n/zh_CN.po +++ b/addons/web/i18n/zh_CN.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-11-06 05:12+0000\n" +"X-Launchpad-Export-Date: 2012-11-07 04:55+0000\n" "X-Generator: Launchpad (build 16232)\n" #. openerp-web