From a4a9c2941f95cbd229171adf9d23c977485a1804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 17 Apr 2012 10:43:15 +0200 Subject: [PATCH 001/841] [REF] Moved nex features merges from api to revisions. bzr revid: tde@openerp.com-20120417084315-omitzsd21sq3mby0 --- doc/index.rst | 31 +++----------------- doc/index.rst.inc | 12 ++++---- doc/{api => revisions}/need_action_specs.rst | 0 doc/{api => revisions}/user_img_specs.rst | 0 4 files changed, 10 insertions(+), 33 deletions(-) rename doc/{api => revisions}/need_action_specs.rst (100%) rename doc/{api => revisions}/user_img_specs.rst (100%) diff --git a/doc/index.rst b/doc/index.rst index 815633aed54..51162354913 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -1,29 +1,6 @@ -.. OpenERP Web documentation master file, created by - sphinx-quickstart on Fri Mar 18 16:31:55 2011. - You can adapt this file completely to your liking, but it should at least - contain the root `toctree` directive. +:orphan: -Welcome to OpenERP Web's documentation! -======================================= +OpenERP Server Developers Documentation +======================================== -Contents: - -.. toctree:: - :maxdepth: 2 - - search-view - - getting-started - production - widgets - addons - development - project - old-version - -Indices and tables -================== - -* :ref:`genindex` -* :ref:`modindex` -* :ref:`search` +.. include:: index.rst.inc diff --git a/doc/index.rst.inc b/doc/index.rst.inc index 80873a696ec..da37481785f 100644 --- a/doc/index.rst.inc +++ b/doc/index.rst.inc @@ -1,17 +1,17 @@ -OpenERP Server -'''''''''''''' +OpenERP Server Documentation +''''''''''''''''''''''''''''' .. toctree:: :maxdepth: 1 test-framework -New feature merges -++++++++++++++++++ +Main revisions and new features +++++++++++++++++++++++++++++++++ .. toctree:: :maxdepth: 1 - api/user_img_specs - api/need_action_specs + revisions/user_img_specs + revisions/need_action_specs diff --git a/doc/api/need_action_specs.rst b/doc/revisions/need_action_specs.rst similarity index 100% rename from doc/api/need_action_specs.rst rename to doc/revisions/need_action_specs.rst diff --git a/doc/api/user_img_specs.rst b/doc/revisions/user_img_specs.rst similarity index 100% rename from doc/api/user_img_specs.rst rename to doc/revisions/user_img_specs.rst From 05cbf324d405716eef963984eff530e27c55a02a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 17 Apr 2012 11:21:34 +0200 Subject: [PATCH 002/841] [REN] Renamed test-framework to 99_test_framework (temp modification to include dev book) bzr revid: tde@openerp.com-20120417092134-rpmk8rd14svdgde2 --- doc/99_test_framework.rst | 100 ++++++++++++++++++++++++++++++++++++++ doc/index.rst.inc | 3 +- 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 doc/99_test_framework.rst diff --git a/doc/99_test_framework.rst b/doc/99_test_framework.rst new file mode 100644 index 00000000000..56951b1a8e1 --- /dev/null +++ b/doc/99_test_framework.rst @@ -0,0 +1,100 @@ +.. _test-framework: + +Test framework +============== + +In addition to the YAML-based tests, OpenERP uses the unittest2_ testing +framework to test both the core ``openerp`` package and its addons. For the +core and each addons, tests are divided between three (overlapping) sets: + +1. A test suite that comprises all the tests that can be run right after the + addons is installed (or, for the core, right after a database is created). + That suite is called ``fast_suite`` and must contain only tests that can be run + frequently. Actually most of the tests should be considered fast enough to be + included in that ``fast_suite`` list and only tests that take a long time to run + (e.g. more than a minute) should not be listed. Those long tests should come up + pretty rarely. + +2. A test suite called ``checks`` provides sanity checks. These tests are + invariants that must be full-filled at any time. They are expected to always + pass: obviously they must pass right after the module is installed (i.e. just + like the ``fast_suite`` tests), but they must also pass after any other module is + installed, after a migration, or even after the database was put in production + for a few months. + +3. The third suite is made of all the tests: those provided by the two above + suites, but also tests that are not explicitely listed in ``fast_suite`` or + ``checks``. They are not explicitely listed anywhere and are discovered + automatically. + +As the sanity checks provide stronger guarantees about the code and database +structure, new tests must be added to the ``checks`` suite whenever it is +possible. Said with other words: one should try to avoid writing tests that +assume a freshly installed/unaltered module or database. + +It is possible to have tests that are not listed in ``fast_suite`` or +``checks``. This is useful if a test takes a lot of time. By default, when +using the testing infrastructure, tests should run fast enough so that people +can use them frequently. One can also use that possiblity for tests that +require some complex setup before they can be successfuly run. + +As a rule of thumb when writing a new test, try to add it to the ``checks`` +suite. If it really needs that the module it belongs to is freshly installed, +add it to ``fast_suite``. Finally, if it can not be run in an acceptable time +frame, don't add it to any explicit list. + +Writing tests +------------- + +The tests must be developed under ``.tests`` (or ``openerp.tests`` +for the core). For instance, with respect to the tests, a module ``foo`` +should be organized as follow:: + + foo/ + __init__.py # does not import .tests + tests/ + __init__.py # import some of the tests sub-modules, and + # list them in fast_suite or checks + test_bar.py # contains unittest2 classes + test_baz.py # idem + ... and so on ... + +The two explicit lists of tests are thus the variables ``foo.tests.fast_suite`` +and ``foo.tests.checks``. As an example, you can take a look at the +``openerp.tests`` module (which follows exactly the same conventions even if it +is not an addons). + +Note that the ``fast_suite`` and ``checks`` variables are really lists of +module objects. They could be directly unittest2 suite objects if necessary in +the future. + +Running the tests +----------------- + +To run the tests (see :ref:`above ` to learn how tests are +organized), the simplest way is to use the ``oe`` command (provided by the +``openerp-command`` project). + +:: + + > oe run-tests # will run all the fast_suite tests + > oe run-tests -m openerp # will run all the fast_suite tests defined in `openerp.tests` + > oe run-tests -m sale # will run all the fast_suite tests defined in `openerp.addons.sale.tests` + > oe run-tests -m foo.test_bar # will run the tests defined in `openerp.addons.foo.tests.test_bar` + +In addition to the above possibilities, when invoked with a non-existing module +(or module.sub-module) name, oe will reply with a list of available test +sub-modules. + +Depending on the unittest2_ class that is used to write the tests (see +``openerp.tests.common`` for some helper classes that you can re-use), a database +may be created before the test is run, and the module providing the test will +be installed on that database. + +Because creating a database, installing modules, and then dropping it is +expensive, it is possible to interleave the run of the ``fast_suite`` tests +with the initialization of a new database: the dabase is created, and after +each requested module is installed, its fast_suite tests are run. The database +is thus created and dropped (and the modules installed) only once. + +.. _unittest2: http://pypi.python.org/pypi/unittest2 diff --git a/doc/index.rst.inc b/doc/index.rst.inc index da37481785f..e36bccd79d5 100644 --- a/doc/index.rst.inc +++ b/doc/index.rst.inc @@ -5,7 +5,8 @@ OpenERP Server Documentation .. toctree:: :maxdepth: 1 - test-framework + 01_getting_started + 99_test_framework Main revisions and new features ++++++++++++++++++++++++++++++++ From efa85ca0809d109f377adef17fa209d6c81e4e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 17 Apr 2012 11:22:05 +0200 Subject: [PATCH 003/841] [REF] Added first chapter from dev book: getting started. Rewrote the installation guide. bzr revid: tde@openerp.com-20120417092205-5mfvukv35qysj6h6 --- doc/01_getting_started.rst | 279 +++++++++++++++++++++++++++++++++++++ doc/test-framework.rst | 100 ------------- 2 files changed, 279 insertions(+), 100 deletions(-) create mode 100644 doc/01_getting_started.rst delete mode 100644 doc/test-framework.rst diff --git a/doc/01_getting_started.rst b/doc/01_getting_started.rst new file mode 100644 index 00000000000..e7bd882305a --- /dev/null +++ b/doc/01_getting_started.rst @@ -0,0 +1,279 @@ +========================================= +Getting started with OpenERP development +========================================= + +.. toctree:: + :maxdepth: 1 + +Installation from sources +++++++++++++++++++++++++++ + +.._getting_started_installation_source-link: + +Source code is hosted on Launchpad_. In order to get the sources, you will need Bazaar_ to pull the source from Launchpad. Bazaar is a version control system that helps you track project history over time and collaborate efficiently. You may have to create an account on Launchpad to be able to collaborate on OpenERP development. Please refer to the Launchpad and Bazaar documentation to install and setup your development environment. + +The running example of this section is based on an Ubuntu environment. You may have to adapt the steps according to your system. Once your working environment is ready, prepare a working directory that will contain the sources. For a ``source`` base directory, type:: + + mkdir source;cd source + +OpenERP provides a setup script that automatizes the tasks of creating a shared repository and getting the source code. Get the setup script of OpenERP by typing:: + + bzr cat -d lp:~openerp-dev/openerp-tools/trunk setup.sh | sh + +This will create the following two files in your ``source`` directory:: + + -rw-rw-r-- 1 openerp openerp 5465 2012-04-17 11:05 Makefile + -rw-rw-r-- 1 openerp openerp 2902 2012-04-17 11:05 Makefile_helper.py + +If you want some help about the available options, please type:: + + make help + +Next step is to initialize the shared repository and download the sources. Get the current trunk version of OpenERP by typing:: + + make init-trunk + +This will create the following structure inside your ``source`` directory, and fetch the latest source code from ``trunk``:: + + drwxrwxr-x 3 openerp openerp 4096 2012-04-17 11:10 addons + drwxrwxr-x 3 openerp openerp 4096 2012-04-17 11:10 client + drwxrwxr-x 3 openerp openerp 4096 2012-04-17 11:10 client-web + drwxrwxr-x 2 openerp openerp 4096 2012-04-17 11:10 dump + drwxrwxr-x 3 openerp openerp 4096 2012-04-17 11:10 misc + drwxrwxr-x 3 openerp openerp 4096 2012-04-17 11:10 server + drwxrwxr-x 3 openerp openerp 4096 2012-04-17 11:10 web + +Some dependencies are necessary to use OpenERP. Depending on your environment, you might have to install the following packages:: + + sudo apt-get install graphviz ghostscript postgresql + python-imaging python-matplotlib + +Next step is to initialize the database. This will create a new openerp role:: + + make db-setup + +Finally, launch the OpenERP server:: + + make server + +Testing your installation can be done on http://localhost:8069/ . You should see the OpenERP main login page. + +.. _Launchpad: https://launchpad.net/ +.. _Bazaar: http://bazaar.canonical.com/en/ + +Configuration +============= + +.. _getrting_started_configuration-link: + +Two configuration files are available: + + * one for the client: ~/.openerprc + * one for the server: ~/.openerp_serverrc + +Those files follow the convention used by python's ConfigParser module. + +Lines beginning with "#" or ";" are comments. + +The client configuration file is automatically generated upon the first start. The one of the server can automatically be created using the command: :: + + openerp-server.py -s + +If they are not found, the server and the client will start with the default configuration. + + +**Server Configuration File** + +The server configuration file .openerp_serverrc is used to save server startup options. Here is the list of the available options: + +:interface: + Address to which the server will be bound + +:port: + Port the server will listen on + +:database: + Name of the database to use + +:user: + Username used when connecting to the database + +:translate_in: + File used to translate OpenERP to your language + +:translate_out: + File used to export the language OpenERP use + +:language: + Use this language as the language of the server. This must be specified as an ISO country code, as specified by the W3C. + +:verbose: + Enable debug output + +:init: + init a module (use "all" for all modules) + +:update: + update a module (use "all" for all modules) + +:upgrade: + Upgrade/install/uninstall modules + +:db_name: + specify the database name + +:db_user: + specify the database user name + +:db_password: + specify the database password + +:pg_path: + specify the pg executable path + +:db_host: + specify the database host + +:db_port: + specify the database port + +:translate_modules: + Specify modules to export. Use in combination with --i18n-export + + +You can create your own configuration file by specifying -s or --save on the server command line. If you would like to write an alternative configuration file, use -c or --config= +Here is a basic configuration for a server:: + + [options] + verbose = False + xmlrpc = True + database = terp + update = {} + port = 8069 + init = {} + interface = 127.0.0.1 + reportgz = False + +Full Example for Server V5.0 :: + + [printer] + path = none + softpath_html = none + preview = True + softpath = none + + [logging] + output = stdout + logger = + verbose = True + level = error + + [help] + index = http://www.openerp.com/documentation/user-manual/ + context = http://www.openerp.com/scripts/context_index.php + + [form] + autosave = False + toolbar = True + + [support] + recipient = support@openerp.com + support_id = + + [tip] + position = 0 + autostart = False + + [client] + lang = en_US + default_path = /home/user + filetype = {} + theme = none + toolbar = icons + form_tab_orientation = 0 + form_tab = top + + [survey] + position = 3 + + [path] + pixmaps = /usr/share/pixmaps/openerp-client/ + share = /usr/share/openerp-client/ + + [login] + db = eo2 + login = admin + protocol = http:// + port = 8069 + server = localhost + + +Command line options +==================== + +General Options +--------------- + + --version show program version number and exit + -h, --help show this help message and exit + -c CONFIG, --config=CONFIG + specify alternate config file + -s, --save save configuration to ~/.terp_serverrc + -v, --verbose enable debugging + --pidfile=PIDFILE file where the server pid will be stored + --logfile=LOGFILE file where the server log will be stored + -n INTERFACE, --interface=INTERFACE + specify the TCP IP address + -p PORT, --port=PORT specify the TCP port + --net_interface=NETINTERFACE + specify the TCP IP address for netrpc + --net_port=NETPORT specify the TCP port for netrpc + --no-netrpc disable netrpc + --no-xmlrpc disable xmlrpc + -i INIT, --init=INIT init a module (use "all" for all modules) + --without-demo=WITHOUT_DEMO + load demo data for a module (use "all" for all + modules) + -u UPDATE, --update=UPDATE + update a module (use "all" for all modules) + --stop-after-init stop the server after it initializes + --debug enable debug mode + -S, --secure launch server over https instead of http + --smtp=SMTP_SERVER specify the SMTP server for sending mail + +Database related options: +------------------------- + + -d DB_NAME, --database=DB_NAME + specify the database name + -r DB_USER, --db_user=DB_USER + specify the database user name + -w DB_PASSWORD, --db_password=DB_PASSWORD + specify the database password + --pg_path=PG_PATH specify the pg executable path + --db_host=DB_HOST specify the database host + --db_port=DB_PORT specify the database port + +Internationalization options: +----------------------------- + + Use these options to translate OpenERP to another language.See i18n + section of the user manual. Option '-l' is mandatory. + + -l LANGUAGE, --language=LANGUAGE + specify the language of the translation file. Use it + with --i18n-export and --i18n-import + --i18n-export=TRANSLATE_OUT + export all sentences to be translated to a CSV file + and exit + --i18n-import=TRANSLATE_IN + import a CSV file with translations and exit + --modules=TRANSLATE_MODULES + specify modules to export. Use in combination with + --i18n-export + +Options from previous versions: +------------------------------- +Some options were removed in version 6. For example, ``price_accuracy`` is now +configured through the :ref:`decimal_accuracy` screen. + diff --git a/doc/test-framework.rst b/doc/test-framework.rst deleted file mode 100644 index 56951b1a8e1..00000000000 --- a/doc/test-framework.rst +++ /dev/null @@ -1,100 +0,0 @@ -.. _test-framework: - -Test framework -============== - -In addition to the YAML-based tests, OpenERP uses the unittest2_ testing -framework to test both the core ``openerp`` package and its addons. For the -core and each addons, tests are divided between three (overlapping) sets: - -1. A test suite that comprises all the tests that can be run right after the - addons is installed (or, for the core, right after a database is created). - That suite is called ``fast_suite`` and must contain only tests that can be run - frequently. Actually most of the tests should be considered fast enough to be - included in that ``fast_suite`` list and only tests that take a long time to run - (e.g. more than a minute) should not be listed. Those long tests should come up - pretty rarely. - -2. A test suite called ``checks`` provides sanity checks. These tests are - invariants that must be full-filled at any time. They are expected to always - pass: obviously they must pass right after the module is installed (i.e. just - like the ``fast_suite`` tests), but they must also pass after any other module is - installed, after a migration, or even after the database was put in production - for a few months. - -3. The third suite is made of all the tests: those provided by the two above - suites, but also tests that are not explicitely listed in ``fast_suite`` or - ``checks``. They are not explicitely listed anywhere and are discovered - automatically. - -As the sanity checks provide stronger guarantees about the code and database -structure, new tests must be added to the ``checks`` suite whenever it is -possible. Said with other words: one should try to avoid writing tests that -assume a freshly installed/unaltered module or database. - -It is possible to have tests that are not listed in ``fast_suite`` or -``checks``. This is useful if a test takes a lot of time. By default, when -using the testing infrastructure, tests should run fast enough so that people -can use them frequently. One can also use that possiblity for tests that -require some complex setup before they can be successfuly run. - -As a rule of thumb when writing a new test, try to add it to the ``checks`` -suite. If it really needs that the module it belongs to is freshly installed, -add it to ``fast_suite``. Finally, if it can not be run in an acceptable time -frame, don't add it to any explicit list. - -Writing tests -------------- - -The tests must be developed under ``.tests`` (or ``openerp.tests`` -for the core). For instance, with respect to the tests, a module ``foo`` -should be organized as follow:: - - foo/ - __init__.py # does not import .tests - tests/ - __init__.py # import some of the tests sub-modules, and - # list them in fast_suite or checks - test_bar.py # contains unittest2 classes - test_baz.py # idem - ... and so on ... - -The two explicit lists of tests are thus the variables ``foo.tests.fast_suite`` -and ``foo.tests.checks``. As an example, you can take a look at the -``openerp.tests`` module (which follows exactly the same conventions even if it -is not an addons). - -Note that the ``fast_suite`` and ``checks`` variables are really lists of -module objects. They could be directly unittest2 suite objects if necessary in -the future. - -Running the tests ------------------ - -To run the tests (see :ref:`above ` to learn how tests are -organized), the simplest way is to use the ``oe`` command (provided by the -``openerp-command`` project). - -:: - - > oe run-tests # will run all the fast_suite tests - > oe run-tests -m openerp # will run all the fast_suite tests defined in `openerp.tests` - > oe run-tests -m sale # will run all the fast_suite tests defined in `openerp.addons.sale.tests` - > oe run-tests -m foo.test_bar # will run the tests defined in `openerp.addons.foo.tests.test_bar` - -In addition to the above possibilities, when invoked with a non-existing module -(or module.sub-module) name, oe will reply with a list of available test -sub-modules. - -Depending on the unittest2_ class that is used to write the tests (see -``openerp.tests.common`` for some helper classes that you can re-use), a database -may be created before the test is run, and the module providing the test will -be installed on that database. - -Because creating a database, installing modules, and then dropping it is -expensive, it is possible to interleave the run of the ``fast_suite`` tests -with the initialization of a new database: the dabase is created, and after -each requested module is installed, its fast_suite tests are run. The database -is thus created and dropped (and the modules installed) only once. - -.. _unittest2: http://pypi.python.org/pypi/unittest2 From 8624a85a20be8c77c3d7ab118cf2f21e01e7163b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 17 Apr 2012 13:09:40 +0200 Subject: [PATCH 004/841] [DOC] getting_started: improved content bzr revid: tde@openerp.com-20120417110940-b8mq1sqone0wpycp --- doc/01_getting_started.rst | 547 ++++++++++++++++++++++++------------- 1 file changed, 355 insertions(+), 192 deletions(-) diff --git a/doc/01_getting_started.rst b/doc/01_getting_started.rst index e7bd882305a..d126c4ccb82 100644 --- a/doc/01_getting_started.rst +++ b/doc/01_getting_started.rst @@ -1,14 +1,14 @@ -========================================= +======================================== Getting started with OpenERP development -========================================= +======================================== .. toctree:: - :maxdepth: 1 + :maxdepth: 1 Installation from sources -++++++++++++++++++++++++++ +========================== -.._getting_started_installation_source-link: +.. _getting_started_installation_source-link: Source code is hosted on Launchpad_. In order to get the sources, you will need Bazaar_ to pull the source from Launchpad. Bazaar is a version control system that helps you track project history over time and collaborate efficiently. You may have to create an account on Launchpad to be able to collaborate on OpenERP development. Please refer to the Launchpad and Bazaar documentation to install and setup your development environment. @@ -45,8 +45,14 @@ This will create the following structure inside your ``source`` directory, and f Some dependencies are necessary to use OpenERP. Depending on your environment, you might have to install the following packages:: - sudo apt-get install graphviz ghostscript postgresql - python-imaging python-matplotlib + sudo apt-get install graphviz ghostscript postgresql-client + + sudo apt-get install 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 python-imaging python-matplotlib Next step is to initialize the database. This will create a new openerp role:: @@ -61,189 +67,46 @@ Testing your installation can be done on http://localhost:8069/ . You should see .. _Launchpad: https://launchpad.net/ .. _Bazaar: http://bazaar.canonical.com/en/ -Configuration -============= - -.. _getrting_started_configuration-link: - -Two configuration files are available: - - * one for the client: ~/.openerprc - * one for the server: ~/.openerp_serverrc - -Those files follow the convention used by python's ConfigParser module. - -Lines beginning with "#" or ";" are comments. - -The client configuration file is automatically generated upon the first start. The one of the server can automatically be created using the command: :: - - openerp-server.py -s - -If they are not found, the server and the client will start with the default configuration. - - -**Server Configuration File** - -The server configuration file .openerp_serverrc is used to save server startup options. Here is the list of the available options: - -:interface: - Address to which the server will be bound - -:port: - Port the server will listen on - -:database: - Name of the database to use - -:user: - Username used when connecting to the database - -:translate_in: - File used to translate OpenERP to your language - -:translate_out: - File used to export the language OpenERP use - -:language: - Use this language as the language of the server. This must be specified as an ISO country code, as specified by the W3C. - -:verbose: - Enable debug output - -:init: - init a module (use "all" for all modules) - -:update: - update a module (use "all" for all modules) - -:upgrade: - Upgrade/install/uninstall modules - -:db_name: - specify the database name - -:db_user: - specify the database user name - -:db_password: - specify the database password - -:pg_path: - specify the pg executable path - -:db_host: - specify the database host - -:db_port: - specify the database port - -:translate_modules: - Specify modules to export. Use in combination with --i18n-export - - -You can create your own configuration file by specifying -s or --save on the server command line. If you would like to write an alternative configuration file, use -c or --config= -Here is a basic configuration for a server:: - - [options] - verbose = False - xmlrpc = True - database = terp - update = {} - port = 8069 - init = {} - interface = 127.0.0.1 - reportgz = False - -Full Example for Server V5.0 :: - - [printer] - path = none - softpath_html = none - preview = True - softpath = none - - [logging] - output = stdout - logger = - verbose = True - level = error - - [help] - index = http://www.openerp.com/documentation/user-manual/ - context = http://www.openerp.com/scripts/context_index.php - - [form] - autosave = False - toolbar = True - - [support] - recipient = support@openerp.com - support_id = - - [tip] - position = 0 - autostart = False - - [client] - lang = en_US - default_path = /home/user - filetype = {} - theme = none - toolbar = icons - form_tab_orientation = 0 - form_tab = top - - [survey] - position = 3 - - [path] - pixmaps = /usr/share/pixmaps/openerp-client/ - share = /usr/share/openerp-client/ - - [login] - db = eo2 - login = admin - protocol = http:// - port = 8069 - server = localhost - - Command line options ==================== -General Options ---------------- +Using the command :: - --version show program version number and exit - -h, --help show this help message and exit - -c CONFIG, --config=CONFIG - specify alternate config file - -s, --save save configuration to ~/.terp_serverrc - -v, --verbose enable debugging - --pidfile=PIDFILE file where the server pid will be stored - --logfile=LOGFILE file where the server log will be stored - -n INTERFACE, --interface=INTERFACE - specify the TCP IP address - -p PORT, --port=PORT specify the TCP port - --net_interface=NETINTERFACE - specify the TCP IP address for netrpc - --net_port=NETPORT specify the TCP port for netrpc - --no-netrpc disable netrpc - --no-xmlrpc disable xmlrpc - -i INIT, --init=INIT init a module (use "all" for all modules) - --without-demo=WITHOUT_DEMO - load demo data for a module (use "all" for all - modules) - -u UPDATE, --update=UPDATE - update a module (use "all" for all modules) - --stop-after-init stop the server after it initializes - --debug enable debug mode - -S, --secure launch server over https instead of http - --smtp=SMTP_SERVER specify the SMTP server for sending mail - -Database related options: -------------------------- + ./openerp-server --help + +gives you the available command line options. For OpenERP server at revision 4133, an output example is given in the `Command line options example`_. Here are a few interesting command line options. + +General Options ++++++++++++++++ + +:: + + --version show program version number and exit + -h, --help show this help message and exit + -c CONFIG, --config=CONFIG specify alternate config file + -s, --save save configuration to ~/.terp_serverrc + -v, --verbose enable debugging + --pidfile=PIDFILE file where the server pid will be stored + --logfile=LOGFILE file where the server log will be stored + -n INTERFACE, --interface=INTERFACE specify the TCP IP address + -p PORT, --port=PORT specify the TCP port + --net_interface=NETINTERFACE specify the TCP IP address for netrpc + --net_port=NETPORT specify the TCP port for netrpc + --no-netrpc disable netrpc + --no-xmlrpc disable xmlrpc + -i INIT, --init=INIT init a module (use "all" for all modules) + --without-demo=WITHOUT_DEMO load demo data for a module (use "all" for all modules) + -u UPDATE, --update=UPDATE update a module (use "all" for all modules) + --stop-after-init stop the server after it initializes + --debug enable debug mode + -S, --secure launch server over https instead of http + --smtp=SMTP_SERVER specify the SMTP server for sending mail +Database related options +++++++++++++++++++++++++ + +:: + -d DB_NAME, --database=DB_NAME specify the database name -r DB_USER, --db_user=DB_USER @@ -254,11 +117,10 @@ Database related options: --db_host=DB_HOST specify the database host --db_port=DB_PORT specify the database port -Internationalization options: ------------------------------ +Internationalization options +++++++++++++++++++++++++++++ - Use these options to translate OpenERP to another language.See i18n - section of the user manual. Option '-l' is mandatory. +Use these options to translate OpenERP to another language.See i18n section of the user manual. Option '-l' is mandatory.:: -l LANGUAGE, --language=LANGUAGE specify the language of the translation file. Use it @@ -272,8 +134,309 @@ Internationalization options: specify modules to export. Use in combination with --i18n-export -Options from previous versions: -------------------------------- -Some options were removed in version 6. For example, ``price_accuracy`` is now +Options from previous versions +++++++++++++++++++++++++++++++ + +Some options were removed in OpenERP version 6. For example, ``price_accuracy`` is now configured through the :ref:`decimal_accuracy` screen. +Configuration +============== + +.. _getting_started_configuration-link: + +Two configuration files are available: + + * one for the client: ``~/.openerprc`` + * one for the server: ``~/.openerp_serverrc`` + +If they are not found, the server and the client will start with a default configuration. Those files follow the convention used by python's ConfigParser module. Please note that lines beginning with "#" or ";" are comments. The client configuration file is automatically generated upon the first start. The sezrver configuration file can automatically be created using the command :: + + ./openerp-server -s or ./openerp-server --save + +You can specify alternate configuration files with :: + + -c CONFIG, --config=CONFIG specify alternate config file + +An example of server configuration file for + +Appendix +======== + +Command line options example +++++++++++++++++++++++++++++ + +Usage: openerp-server [options] + +**Options**:: + + --version show program's version number and exit + -h, --help show this help message and exit + +**Common options**:: + + -c CONFIG, --config=CONFIG + specify alternate config file + -s, --save save configuration to ~/.openerp_serverrc + -i INIT, --init=INIT + install one or more modules (comma-separated list, use + "all" for all modules), requires -d + -u UPDATE, --update=UPDATE + update one or more modules (comma-separated list, use + "all" for all modules). Requires -d. + --without-demo=WITHOUT_DEMO + disable loading demo data for modules to be installed + (comma-separated, use "all" for all modules). Requires + -d and -i. Default is none + -P IMPORT_PARTIAL, --import-partial=IMPORT_PARTIAL + Use this for big data importation, if it crashes you + will be able to continue at the current state. Provide + a filename to store intermediate importation states. + --pidfile=PIDFILE file where the server pid will be stored + --addons-path=ADDONS_PATH + specify additional addons paths (separated by commas). + --load=SERVER_WIDE_MODULES + Comma-separated list of server-wide modules + default=web + +**XML-RPC Configuration**:: + + --xmlrpc-interface=XMLRPC_INTERFACE + Specify the TCP IP address for the XML-RPC protocol. + The empty string binds to all interfaces. + --xmlrpc-port=XMLRPC_PORT + specify the TCP port for the XML-RPC protocol + --no-xmlrpc disable the XML-RPC protocol + --proxy-mode Enable correct behavior when behind a reverse proxy + +**XML-RPC Secure Configuration**:: + + --xmlrpcs-interface=XMLRPCS_INTERFACE + Specify the TCP IP address for the XML-RPC Secure + protocol. The empty string binds to all interfaces. + --xmlrpcs-port=XMLRPCS_PORT + specify the TCP port for the XML-RPC Secure protocol + --no-xmlrpcs disable the XML-RPC Secure protocol + --cert-file=SECURE_CERT_FILE + specify the certificate file for the SSL connection + --pkey-file=SECURE_PKEY_FILE + specify the private key file for the SSL connection + +**NET-RPC Configuration**:: + + --netrpc-interface=NETRPC_INTERFACE + specify the TCP IP address for the NETRPC protocol + --netrpc-port=NETRPC_PORT + specify the TCP port for the NETRPC protocol + --no-netrpc disable the NETRPC protocol + +**Web interface Configuration**:: + + --db-filter=REGEXP Filter listed database + +**Static HTTP service**:: + + --static-http-enable + enable static HTTP service for serving plain HTML + files + --static-http-document-root=STATIC_HTTP_DOCUMENT_ROOT + specify the directory containing your static HTML + files (e.g '/var/www/') + --static-http-url-prefix=STATIC_HTTP_URL_PREFIX + specify the URL root prefix where you want web + browsers to access your static HTML files (e.g '/') + +**Testing Configuration**:: + + --test-file=TEST_FILE + Launch a YML test file. + --test-report-directory=TEST_REPORT_DIRECTORY + If set, will save sample of all reports in this + directory. + --test-enable Enable YAML and unit tests. + --test-commit Commit database changes performed by YAML or XML + tests. + +**Logging Configuration**:: + + --logfile=LOGFILE file where the server log will be stored + --no-logrotate do not rotate the logfile + --syslog Send the log to the syslog server + --log-handler=PREFIX:LEVEL + setup a handler at LEVEL for a given PREFIX. An empty + PREFIX indicates the root logger. This option can be + repeated. Example: "openerp.orm:DEBUG" or + "werkzeug:CRITICAL" (default: ":INFO") + --log-request shortcut for --log- + handler=openerp.netsvc.rpc.request:DEBUG + --log-response shortcut for --log- + handler=openerp.netsvc.rpc.response:DEBUG + --log-web shortcut for --log- + handler=openerp.addons.web.common.http:DEBUG + --log-sql shortcut for --log-handler=openerp.sql_db:DEBUG + --log-level=LOG_LEVEL + specify the level of the logging. Accepted values: + ['info', 'debug_rpc', 'warn', 'test', 'critical', + 'debug_sql', 'error', 'debug', 'debug_rpc_answer', + 'notset'] (deprecated option). + +**SMTP Configuration**:: + + --email-from=EMAIL_FROM + specify the SMTP email address for sending email + --smtp=SMTP_SERVER specify the SMTP server for sending email + --smtp-port=SMTP_PORT + specify the SMTP port + --smtp-ssl specify the SMTP server support SSL or not + --smtp-user=SMTP_USER + specify the SMTP username for sending email + --smtp-password=SMTP_PASSWORD + specify the SMTP password for sending email + +**Database related options**:: + + -d DB_NAME, --database=DB_NAME + specify the database name + -r DB_USER, --db_user=DB_USER + specify the database user name + -w DB_PASSWORD, --db_password=DB_PASSWORD + specify the database password + --pg_path=PG_PATH specify the pg executable path + --db_host=DB_HOST specify the database host + --db_port=DB_PORT specify the database port + --db_maxconn=DB_MAXCONN + specify the the maximum number of physical connections + to posgresql + --db-template=DB_TEMPLATE + specify a custom database template to create a new + database + +**Internationalisation options**:: + + Use these options to translate OpenERP to another language.See i18n + section of the user manual. Option '-d' is mandatory.Option '-l' is + mandatory in case of importation + + --load-language=LOAD_LANGUAGE + specifies the languages for the translations you want + to be loaded + -l LANGUAGE, --language=LANGUAGE + specify the language of the translation file. Use it + with --i18n-export or --i18n-import + --i18n-export=TRANSLATE_OUT + export all sentences to be translated to a CSV file, a + PO file or a TGZ archive and exit + --i18n-import=TRANSLATE_IN + import a CSV or a PO file with translations and exit. + The '-l' option is required. + --i18n-overwrite overwrites existing translation terms on updating a + module or importing a CSV or a PO file. + --modules=TRANSLATE_MODULES + specify modules to export. Use in combination with + --i18n-export + +**Security-related options**:: + + --no-database-list disable the ability to return the list of databases + +**Advanced options**:: + + --cache-timeout=CACHE_TIMEOUT + set the timeout for the cache system + --debug enable debug mode + --stop-after-init stop the server after its initialization + -t TIMEZONE, --timezone=TIMEZONE + specify reference timezone for the server (e.g. + Europe/Brussels + --osv-memory-count-limit=OSV_MEMORY_COUNT_LIMIT + Force a limit on the maximum number of records kept in + the virtual osv_memory tables. The default is False, + which means no count-based limit. + --osv-memory-age-limit=OSV_MEMORY_AGE_LIMIT + Force a limit on the maximum age of records kept in + the virtual osv_memory tables. This is a decimal value + expressed in hours, and the default is 1 hour. + --max-cron-threads=MAX_CRON_THREADS + Maximum number of threads processing concurrently cron + jobs. + --virtual-memory-limit=VIRTUAL_MEMORY_LIMIT + Maximum allowed virtual memory per Gunicorn process. + When the limit is reached, any memory allocation will + fail. + --virtual-memory-reset=VIRTUAL_MEMORY_RESET + Maximum allowed virtual memory per Gunicorn process. + When the limit is reached, the worker will be reset + after the current request. + --cpu-time-limit=CPU_TIME_LIMIT + Maximum allowed CPU time per Gunicorn process. When + the limit is reached, an exception is raised. + --unaccent Use the unaccent function provided by the database + when available. + +Server configuration file ++++++++++++++++++++++++++ + +:: + + [options] + addons_path = /home/openerp/workspace/openerp-dev/addons/trunk,/home/openerp/workspace/openerp-dev/web/trunk/addons + admin_passwd = admin + cache_timeout = 100000 + cpu_time_limit = 60 + csv_internal_sep = , + db_host = False + db_maxconn = 64 + db_name = False + db_password = False + db_port = False + db_template = template0 + db_user = openerp + dbfilter = .* + debug_mode = False + demo = {} + email_from = False + import_partial = + list_db = True + log_handler = [':INFO'] + log_level = info + logfile = False + login_message = False + logrotate = True + max_cron_threads = 4 + netrpc = True + netrpc_interface = + netrpc_port = 8070 + osv_memory_age_limit = 1.0 + osv_memory_count_limit = False + pg_path = None + pidfile = False + proxy_mode = False + reportgz = False + secure_cert_file = server.cert + secure_pkey_file = server.pkey + server_wide_modules = None + smtp_password = False + smtp_port = 25 + smtp_server = localhost + smtp_ssl = False + smtp_user = False + static_http_document_root = None + static_http_enable = False + static_http_url_prefix = None + syslog = False + test_commit = False + test_enable = False + test_file = False + test_report_directory = False + timezone = False + translate_modules = ['all'] + unaccent = False + virtual_memory_limit = 805306368 + virtual_memory_reset = 671088640 + without_demo = False + xmlrpc = True + xmlrpc_interface = + xmlrpc_port = 8069 + xmlrpcs = True + xmlrpcs_interface = + xmlrpcs_port = 8071 From 6d16d56970f1f01a5e360916e792c640bd127655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 17 Apr 2012 13:10:16 +0200 Subject: [PATCH 005/841] [DOC] [ADD] Added architecture chapter. bzr revid: tde@openerp.com-20120417111016-nnjncznndlcchyrg --- doc/02_architecture.rst | 569 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 569 insertions(+) create mode 100644 doc/02_architecture.rst diff --git a/doc/02_architecture.rst b/doc/02_architecture.rst new file mode 100644 index 00000000000..867d5be7c15 --- /dev/null +++ b/doc/02_architecture.rst @@ -0,0 +1,569 @@ +======================================== +Architecture +======================================== + +MVC architecture +================ + +According to `Wikipedia `_, "a Model-view-controller (MVC) is an architectural pattern used in software engineering". In complex computer applications presenting lots of data to the user, one often wishes to separate data (model) and user interface (view) concerns. Changes to the user interface does therefore not impact data management, and data can be reorganized without changing the user interface. The model-view-controller solves this problem by decoupling data access and business logic from data presentation and user interaction, by introducing an intermediate component: the controller. + +.. figure:: images/MVCDiagram.png + :scale: 100 + :align: center + + MVC Diagram + +For example in the diagram above, the solid lines for the arrows starting from the controller and going to both the view and the model mean that the controller has a complete access to both the view and the model. The dashed line for the arrow going from the view to the controller means that the view has a limited access to the controller. The reasons of this design are : + + * From **View** to **Model** : the model sends notification to the view when its data has been modified in order the view to redraw its content. The model doesn't need to know the inner workings of the view to perform this operation. However, the view needs to access the internal parts of the model. + * From **View** to **Controller** : the reason why the view has limited access to the controller is because the dependencies from the view to the controller need to be minimal: the controller can be replaced at any moment. + +MVC Model in OpenERP +-------------------- + +In OpenERP, we can apply this model-view-controller semantic with + + * model : The PostgreSQL tables. + * view : views are defined in XML files in OpenERP. + * controller : The objects of OpenERP. + + +MVCSQL +------ + +Example 1 ++++++++++ + +Suppose sale is a variable on a record of the sale.order object related to the 'sale_order' table. You can acquire such a variable doing this.:: + + sale = self.browse(cr, uid, ID) + +(where cr is the current row, from the database cursor, uid is the current user's ID for security checks, and ID is the sale order's ID or list of IDs if we want more than one) + +Suppose you want to get: the country name of the first contact of a partner related to the ID sale order. You can do the following in OpenERP:: + + country_name = sale.partner_id.address[0].country_id.name + +If you want to write the same thing in traditional SQL development, it will be in python: (we suppose cr is the cursor on the database, with psycopg) + +.. code-block:: python + + cr.execute('select partner_id from sale_order where id=%d', (ID,)) + partner_id = cr.fetchone()[0] + cr.execute('select country_id from res_partner_address where partner_id=%d', (partner_id,)) + country_id = cr.fetchone()[0] + cr.execute('select name from res_country where id=%d', (country_id,)) + del partner_id + del country_id + country_name = cr.fetchone()[0] + +Of course you can do better if you develop smartly in SQL, using joins or subqueries. But you have to be smart and most of the time you will not be able to make such improvements: + + * Maybe some parts are in others functions + * There may be a loop in different elements + * You have to use intermediate variables like country_id + +The first operation as an object call is much better for several reasons: + + * It uses objects facilities and works with modules inheritances, overload, ... + * It's simpler, more explicit and uses less code + * It's much more efficient as you will see in the following examples + * Some fields do not directly correspond to a SQL field (e.g.: function fields in Python) + + +Prefetching ++++++++++++ + +Suppose that later in the code, in another function, you want to access the name of the partner associated to your sale order. You can use this:: + + partner_name = sale.partner_id.name + +And this will not generate any SQL query as it has been prefetched by the object relational mapping engine of OpenERP. + + +Loops and special fields +++++++++++++++++++++++++ + +Suppose now that you want to compute the totals of 10 sales order by countries. You can do this in OpenERP within a OpenERP object: + +.. code-block:: python + + def get_totals(self, cr, uid, ids): + countries = {} + for sale in self.browse(cr, uid, ids): + country = sale.partner_invoice_id.country + countries.setdefault(country, 0.0) + countries[country] += sale.amount_untaxed + return countries + +And, to print them as a good way, you can add this on your object: + +.. code-block:: python + + def print_totals(self, cr, uid, ids): + result = self.get_totals(cr, uid, ids) + for country in result.keys(): + print '[%s] %s: %.2f' (country.code, country.name, result[country]) + +The 2 functions will generate 4 SQL queries in total ! This is due to the SQL engine of OpenERP that does prefetching, works on lists and uses caching methods. The 3 queries are: + + 1. Reading the sale.order to get ID's of the partner's address + 2. Reading the partner's address for the countries + 3. Calling the amount_untaxed function that will compute a total of the sale order lines + 4. Reading the countries info (code and name) + +That's great because if you run this code on 1000 sales orders, you have the guarantee to only have 4 SQL queries. + +Notes: + + * IDS is the list of the 10 ID's: [12,15,18,34, ...,99] + * The arguments of a function are always the same: + + - cr: the cursor database (from psycopg) + - uid: the user id (for security checks) + * If you run this code on 5000 sales orders, you may have 8 SQL queries because as SQL queries are not allowed to take too much memory, it may have to do two separate readings. + + +Complex example ++++++++++++++++ + +Here is a complete example, from the OpenERP official distribution, of the function that does bill of material explosion and computation of associated routings: + +.. code-block:: python + + class mrp_bom(osv.osv): + ... + def _bom_find(self, cr, uid, product_id, product_uom, properties=[]): + bom_result = False + # Why searching on BoM without parent ? + cr.execute('select id from mrp_bom where product_id=%d and bom_id is null + order by sequence', (product_id,)) + ids = map(lambda x: x[0], cr.fetchall()) + max_prop = 0 + result = False + for bom in self.pool.get('mrp.bom').browse(cr, uid, ids): + prop = 0 + for prop_id in bom.property_ids: + if prop_id.id in properties: + prop+=1 + if (prop>max_prop) or ((max_prop==0) and not result): + result = bom.id + max_prop = prop + return result + + def _bom_explode(self, cr, uid, bom, factor, properties, addthis=False, level=10): + factor = factor / (bom.product_efficiency or 1.0) + factor = rounding(factor, bom.product_rounding) + if factor`_, +`three-tier architecture +`_. +The application tier itself is written as a core, multiple additional +modules can be installed to create a particular configuration of +OpenERP. + +The core of OpenERP and its modules are written in `Python +`_. The functionality of a module is exposed through +XML-RPC (and/or NET-RPC depending on the server's configuration)[#]. Modules +typically make use of OpenERP's ORM to persist their data in a relational +database (PostgreSQL). Modules can insert data in the database during +installation by providing XML, CSV, or YML files. + +.. figure:: images/client_server.png + :scale: 85 + :align: center + +.. [#] JSON-RPC is planned for OpenERP v6.1. + +The OpenERP server +------------------ + +OpenERP provides an application server on which specific business applications +can be built. It is also a complete development framework, offering a range of +features to write those applications. The salient features are a flexible ORM, +a MVC architecture, extensible data models and views, different report engines, +all tied together in a coherent, network-accessible framework. + +From a developer perspective, the server acts both as a library which brings +the above benefits while hiding the low-level, nitty-gritty details, and as a +simple way to install, configure and run the written applications. + +Modules +------- + +By itself, the OpenERP server is not very useful. For any enterprise, the value +of OpenERP lies in its different modules. It is the role of the modules to +implement any business needs. The server is only the necessary machinery to run +the modules. A lot of modules already exist. Any official OpenERP release +includes about 170 of them, and hundreds of modules are available through the +community. Examples of modules are Account, CRM, HR, Marketing, MRP, Sale, etc. + +A module is usually composed of data models, together with some initial data, +views definitions (i.e. how data from specific data models should be displayed +to the user), wizards (specialized screens to help the user for specific +interactions), workflows definitions, and reports. + +Clients +------- + +Clients can communicate with an OpenERP server using XML-RPC. A custom, faster +protocol called NET-RPC is also provided but will shortly disappear, replaced +by JSON-RPC. XML-RPC, as JSON-RPC in the future, makes it possible to write +clients for OpenERP in a variety of programming languages. OpenERP S.A. +develops two different clients: a desktop client, written with the widely used +`GTK+ `_ graphical toolkit, and a web client that should +run in any modern web browser. + +As the logic of OpenERP should entirely reside on the server, the client is +conceptually very simple; it issues a request to the server and display the result +(e.g. a list of customers) in different manners (as forms, lists, calendars, +...). Upon user actions, it will send modified data to the server. + +Relational database server and ORM +---------------------------------- + +The data tier of OpenERP is provided by a PostgreSQL relational database. While +direct SQL queries can be executed from OpenERP modules, most database access +to the relational database is done through the `Object-Relational Mapping +`_. + +The ORM is one of the salient features mentioned above. The data models are +described in Python and OpenERP creates the underlying database tables. All the +benefits of RDBMS (unique constraints, relational integrity, efficient +querying, ...) are used when possible and completed by Python flexibility. For +instance, arbitrary constraints written in Python can be added to any model. +Different modular extensibility mechanisms are also afforded by OpenERP[#]. + +.. [#] It is important to understand the ORM responsibility before attempting to by-pass it and access directly the underlying database via raw SQL queries. When using the ORM, OpenERP can make sure the data remains free of any corruption. For instance, a module can react to data creation in a particular table. This reaction can only happen if the ORM is used to create that data. + +Models +------ + +To define data models and otherwise pursue any work with the associated data, +OpenERP as many ORMs uses the concept of 'model'. A model is the authoritative +specification of how some data are structured, constrained, and manipulated. In +practice, a model is written as a Python class. The class encapsulates anything +there is to know about the model: the different fields composing the model, +default values to be used when creating new records, constraints, and so on. It +also holds the dynamic aspect of the data it controls: methods on the class can +be written to implement any business needs (for instance, what to do upon user +action, or upon workflow transitions). + +There are two different models. One is simply called 'model', and the second is +called 'transient model'. The two models provide the same capabilities with a +single difference: transient models are automatically cleared from the +database (they can be cleaned when some limit on the number of records is +reached, or when they are untouched for some time). + +To describe the data model per se, OpenERP offers a range of different kind of +fields. There are basic fields such as integer, or text fields. There are +relational fields to implement one-to-many, many-to-one, and many-to-many +relationships. There are so-called function fields, which are dynamically +computed and are not necessarily available in database, and more. + +Access to data is controlled by OpenERP and configured by different mechanisms. +This ensures that different users can have read and/or write access to only the +relevant data. Access can be controlled with respect to user groups and rules +based on the value of the data themselves. + +Modules +------- + +OpenERP supports a modular approach both from a development perspective and a +deployment point of view. In essence, a module groups everything related to a +single concern in one meaningful entity. It is comprised of models, views, +workflows, and wizards. + +Services and WSGI +----------------- + +Everything in OpenERP, and models methods in particular, are exposed via the +network and a security layer. Access to the data model is in fact a 'service' +and it is possible to expose new services. For instance, a WebDAV service and a +FTP service are available. + +While not mandatory, the services can make use of the `WSGI +`_ stack. +WSGI is a standard solution in the Python ecosystem to write HTTP servers, +applications, and middleware which can be used in a mix-and-match fashion. +By using WSGI, it is possible to run OpenERP in any WSGI-compliant server, but +also to use OpenERP to host a WSGI application. + +A striking example of this possibility is the OpenERP Web project. OpenERP Web +is the server-side counter part to the web clients. It is OpenERP Web which +provides the web pages to the browser and manages web sessions. OpenERP Web is +a WSGI-compliant application. As such, it can be run as a stand-alone HTTP +server or embedded inside OpenERP. + +XML-RPC, JSON-RPC +----------------- + +The access to the models makes also use of the WSGI stack. This can be done +using the XML-RPC protocol, and JSON-RPC will be added soon. + + +Explanation of modules: + +**Server - Base distribution** + +We use a distributed communication mechanism inside the OpenERP server. Our engine supports most commonly distributed patterns: request/reply, publish/subscribe, monitoring, triggers/callback, ... + +Different business objects can be in different computers or the same objects can be on multiple computers to perform load-balancing. + +**Server - Object Relational Mapping (ORM)** + +This layer provides additional object functionality on top of PostgreSQL: + + * Consistency: powerful validity checks, + * Work with objects (methods, references, ...) + * Row-level security (per user/group/role) + * Complex actions on a group of resources + * Inheritance + +**Server - Web-Services** + +The web-service module offer a common interface for all web-services + + * SOAP + * XML-RPC + * NET-RPC + +Business objects can also be accessed via the distributed object mechanism. They can all be modified via the client interface with contextual views. + +**Server - Workflow Engine** + +Workflows are graphs represented by business objects that describe the dynamics of the company. Workflows are also used to track processes that evolve over time. + +An example of workflow used in OpenERP: + +A sales order generates an invoice and a shipping order + +**Server - Report Engine** + +Reports in OpenERP can be rendered in different ways: + + * Custom reports: those reports can be directly created via the client interface, no programming required. Those reports are represented by business objects (ir.report.custom) + * High quality personalized reports using openreport: no programming required but you have to write 2 small XML files: + + - a template which indicates the data you plan to report + - an XSL:RML stylesheet + * Hard coded reports + * OpenOffice Writer templates + +Nearly all reports are produced in PDF. + +**Server - Business Objects** + +Almost everything is a business object in OpenERP, they describe all data of the program (workflows, invoices, users, customized reports, ...). Business objects are described using the ORM module. They are persistent and can have multiple views (described by the user or automatically calculated). + +Business objects are structured in the /module directory. + +**Client - Wizards** + +Wizards are graphs of actions/windows that the user can perform during a session. + +**Client - Widgets** + +Widgets are probably, although the origin of the term seems to be very difficult to trace, "WIndow gaDGETS" in the IT world, which mean they are gadgets before anything, which implement elementary features through a portable visual tool. + +All common widgets are supported: + + * entries + * textboxes + * floating point numbers + * dates (with calendar) + * checkboxes + * ... + +And also all special widgets: + + * buttons that call actions + * references widgets + + - one2one + + - many2one + + - many2many + + - one2many in list + + - ... + +Widget have different appearances in different views. For example, the date widget in the search dialog represents two normal dates for a range of date (from...to...). + +Some widgets may have different representations depending on the context. For example, the one2many widget can be represented as a form with multiple pages or a multi-columns list. + +Events on the widgets module are processed with a callback mechanism. A callback mechanism is a process whereby an element defines the type of events he can handle and which methods should be called when this event is triggered. Once the event is triggered, the system knows that the event is bound to a specific method, and calls that method back. Hence callback. + + +Module Integrations +=================== + +The are many different modules available for OpenERP and suited for different business models. Nearly all of these are optional (except ModulesAdminBase), making it easy to customize OpenERP to serve specific business needs. All the modules are in a directory named addons/ on the server. You simply need to copy or delete a module directory in order to either install or delete the module on the OpenERP platform. + +Some modules depend on other modules. See the file addons/module/__openerp__.py for more information on the dependencies. + +Here is an example of __openerp__.py: + +.. code-block:: python + + { + "name" : "Open TERP Accounting", + "version" : "1.0", + "author" : "Bob Gates - Not So Tiny", + "website" : "http://www.openerp.com/", + "category" : "Generic Modules/Others", + "depends" : ["base"], + "description" : """A + Multiline + Description + """, + "init_xml" : ["account_workflow.xml", "account_data.xml", "account_demo.xml"], + "demo_xml" : ["account_demo.xml"], + "update_xml" : ["account_view.xml", "account_report.xml", "account_wizard.xml"], + "active": False, + "installable": True + } + +When initializing a module, the files in the init_xml list are evaluated in turn and then the files in the update_xml list are evaluated. When updating a module, only the files from the **update_xml** list are evaluated. + + +Inheritance +=========== + +Traditional Inheritance +----------------------- + +Introduction +++++++++++++ + +Objects may be inherited in some custom or specific modules. It is better to inherit an object to add/modify some fields. + +It is done with:: + + _inherit='object.name' + +Extension of an object +++++++++++++++++++++++ + +There are two possible ways to do this kind of inheritance. Both ways result in a new class of data, which holds parent fields and behaviour as well as additional fields and behaviour, but they differ in heavy programatical consequences. + +While Example 1 creates a new subclass "custom_material" that may be "seen" or "used" by any view or tree which handles "network.material", this will not be the case for Example 2. + +This is due to the table (other.material) the new subclass is operating on, which will never be recognized by previous "network.material" views or trees. + +Example 1:: + + class custom_material(osv.osv): + _name = 'network.material' + _inherit = 'network.material' + _columns = { + 'manuf_warranty': fields.boolean('Manufacturer warranty?'), + } + _defaults = { + 'manuf_warranty': lambda *a: False, + } + custom_material() + +.. tip:: Notice + + _name == _inherit + +In this example, the 'custom_material' will add a new field 'manuf_warranty' to the object 'network.material'. New instances of this class will be visible by views or trees operating on the superclasses table 'network.material'. + +This inheritancy is usually called "class inheritance" in Object oriented design. The child inherits data (fields) and behavior (functions) of his parent. + + +Example 2:: + + class other_material(osv.osv): + _name = 'other.material' + _inherit = 'network.material' + _columns = { + 'manuf_warranty': fields.boolean('Manufacturer warranty?'), + } + _defaults = { + 'manuf_warranty': lambda *a: False, + } + other_material() + +.. tip:: Notice + + _name != _inherit + +In this example, the 'other_material' will hold all fields specified by 'network.material' and it will additionally hold a new field 'manuf_warranty'. All those fields will be part of the table 'other.material'. New instances of this class will therefore never been seen by views or trees operating on the superclasses table 'network.material'. + +This type of inheritancy is known as "inheritance by prototyping" (e.g. Javascript), because the newly created subclass "copies" all fields from the specified superclass (prototype). The child inherits data (fields) and behavior (functions) of his parent. + +Inheritance by Delegation +------------------------- + + **Syntax :**:: + + class tiny_object(osv.osv) + _name = 'tiny.object' + _table = 'tiny_object' + _inherits = { 'tiny.object_a' : 'name_col_a', 'tiny.object_b' : 'name_col_b', + ..., 'tiny.object_n' : 'name_col_n' } + (...) + + +The object 'tiny.object' inherits from all the columns and all the methods from the n objects 'tiny.object_a', ..., 'tiny.object_n'. + +To inherit from multiple tables, the technique consists in adding one column to the table tiny_object per inherited object. This column will store a foreign key (an id from another table). The values *'name_col_a' 'name_col_b' ... 'name_col_n'* are of type string and determine the title of the columns in which the foreign keys from 'tiny.object_a', ..., 'tiny.object_n' are stored. + +This inheritance mechanism is usually called " *instance inheritance* " or " *value inheritance* ". A resource (instance) has the VALUES of its parents. From 597a2877235c88750b5441d4e5325b4561977f80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 17 Apr 2012 14:52:42 +0200 Subject: [PATCH 006/841] [DOC] [REF] Refactored architecture chapter. bzr revid: tde@openerp.com-20120417125242-5xy4tugaa9fd7e4q --- doc/02_architecture.rst | 727 +++++++++++----------------------------- doc/index.rst.inc | 3 +- 2 files changed, 196 insertions(+), 534 deletions(-) diff --git a/doc/02_architecture.rst b/doc/02_architecture.rst index 867d5be7c15..bf1b3192e37 100644 --- a/doc/02_architecture.rst +++ b/doc/02_architecture.rst @@ -2,568 +2,229 @@ Architecture ======================================== -MVC architecture -================ +OpenERP as a multitenant three-tiers architecture +================================================= -According to `Wikipedia `_, "a Model-view-controller (MVC) is an architectural pattern used in software engineering". In complex computer applications presenting lots of data to the user, one often wishes to separate data (model) and user interface (view) concerns. Changes to the user interface does therefore not impact data management, and data can be reorganized without changing the user interface. The model-view-controller solves this problem by decoupling data access and business logic from data presentation and user interaction, by introducing an intermediate component: the controller. +This section presents the OpenERP architecture along with technology details +of the application. The tiers composing OpenERP are presented. Communication +means and protocols between the application components are also presented. +Some details about used development languages and technology stack are then summarized. -.. figure:: images/MVCDiagram.png - :scale: 100 +OpenERP is a `multitenant `_, `three-tiers architecture +`_: +database tier for data storage, application tier for processing and functionalities +and presentation tier providing user interface. Those are separate layers +inside OpenERP. The application tier itself is written as a core; multiple +additional modules can be installed in order to create a particular instance +of OpenERP adapted to specific needs and requirements. Moreover, OpenERP +follows the Model-View-Controller (MVC) architectural pattern. + +A typical deployment of OpenERP is shown on `Figure 1`_. This deployment is +called Web embedded deployment. As shown, an OpenERP system consists of +three main components: + +- a PostgreSQL database server which contains all OpenERP databases. + Databases contain all application data, and also most of the OpenERP + system configuration elements. Note that this server can possibly be + deployed using clustered databases. +- the OpenERP Server, which contains all the enterprise logic and ensures + that OpenERP runs optimally. One layer of the server is dedicated to + communicate and interface with the PostgreSQL database, the ORM engine. + Another layer allows communications between the server and a web browser, + the Web layer. Having more than one server is possible, for example in + conjunction with a load balancing mechanism. +- the client, which allow users to access OpenERP. Two clients exist, a + desktop GTK client and a browser-based client + + - the GTK client access directly to the OpenERP Server + - users can also use standard web browsers to access OpenERP. In that + case, an OpenERP application is loaded. It handles communications between + the browser and the Web layer of the server. + +The database server and the OpenERP server can be installed on the same computer, +or distributed onto separate computer servers, for example for performance considerations. + +.. _`Figure 1`: +.. figure:: _static/02_openerp_architecture.png + :width: 50% + :alt: OpenERP 6.1 architecture for embedded web deployment :align: center + + OpenERP 6.1 architecture for embedded web deployment - MVC Diagram +The next subsections give details about the different tiers of the OpenERP +architecture. -For example in the diagram above, the solid lines for the arrows starting from the controller and going to both the view and the model mean that the controller has a complete access to both the view and the model. The dashed line for the arrow going from the view to the controller means that the view has a limited access to the controller. The reasons of this design are : +PostgreSQL database ++++++++++++++++++++ - * From **View** to **Model** : the model sends notification to the view when its data has been modified in order the view to redraw its content. The model doesn't need to know the inner workings of the view to perform this operation. However, the view needs to access the internal parts of the model. - * From **View** to **Controller** : the reason why the view has limited access to the controller is because the dependencies from the view to the controller need to be minimal: the controller can be replaced at any moment. +The data tier of OpenERP is provided by a PostgreSQL relational database. +While direct SQL queries can be executed from OpenERP modules, most accesses +to the relational database are done through the server Object Relational +Mapping layer. -MVC Model in OpenERP --------------------- +Databases contain all application data, and also most of the OpenERP system +configuration elements. Note that this server can possibly be deployed using +clustered databases. -In OpenERP, we can apply this model-view-controller semantic with - - * model : The PostgreSQL tables. - * view : views are defined in XML files in OpenERP. - * controller : The objects of OpenERP. - - -MVCSQL ------- - -Example 1 -+++++++++ - -Suppose sale is a variable on a record of the sale.order object related to the 'sale_order' table. You can acquire such a variable doing this.:: - - sale = self.browse(cr, uid, ID) - -(where cr is the current row, from the database cursor, uid is the current user's ID for security checks, and ID is the sale order's ID or list of IDs if we want more than one) - -Suppose you want to get: the country name of the first contact of a partner related to the ID sale order. You can do the following in OpenERP:: - - country_name = sale.partner_id.address[0].country_id.name - -If you want to write the same thing in traditional SQL development, it will be in python: (we suppose cr is the cursor on the database, with psycopg) - -.. code-block:: python - - cr.execute('select partner_id from sale_order where id=%d', (ID,)) - partner_id = cr.fetchone()[0] - cr.execute('select country_id from res_partner_address where partner_id=%d', (partner_id,)) - country_id = cr.fetchone()[0] - cr.execute('select name from res_country where id=%d', (country_id,)) - del partner_id - del country_id - country_name = cr.fetchone()[0] - -Of course you can do better if you develop smartly in SQL, using joins or subqueries. But you have to be smart and most of the time you will not be able to make such improvements: - - * Maybe some parts are in others functions - * There may be a loop in different elements - * You have to use intermediate variables like country_id - -The first operation as an object call is much better for several reasons: - - * It uses objects facilities and works with modules inheritances, overload, ... - * It's simpler, more explicit and uses less code - * It's much more efficient as you will see in the following examples - * Some fields do not directly correspond to a SQL field (e.g.: function fields in Python) - - -Prefetching -+++++++++++ - -Suppose that later in the code, in another function, you want to access the name of the partner associated to your sale order. You can use this:: - - partner_name = sale.partner_id.name - -And this will not generate any SQL query as it has been prefetched by the object relational mapping engine of OpenERP. - - -Loops and special fields -++++++++++++++++++++++++ - -Suppose now that you want to compute the totals of 10 sales order by countries. You can do this in OpenERP within a OpenERP object: - -.. code-block:: python - - def get_totals(self, cr, uid, ids): - countries = {} - for sale in self.browse(cr, uid, ids): - country = sale.partner_invoice_id.country - countries.setdefault(country, 0.0) - countries[country] += sale.amount_untaxed - return countries - -And, to print them as a good way, you can add this on your object: - -.. code-block:: python - - def print_totals(self, cr, uid, ids): - result = self.get_totals(cr, uid, ids) - for country in result.keys(): - print '[%s] %s: %.2f' (country.code, country.name, result[country]) - -The 2 functions will generate 4 SQL queries in total ! This is due to the SQL engine of OpenERP that does prefetching, works on lists and uses caching methods. The 3 queries are: - - 1. Reading the sale.order to get ID's of the partner's address - 2. Reading the partner's address for the countries - 3. Calling the amount_untaxed function that will compute a total of the sale order lines - 4. Reading the countries info (code and name) - -That's great because if you run this code on 1000 sales orders, you have the guarantee to only have 4 SQL queries. - -Notes: - - * IDS is the list of the 10 ID's: [12,15,18,34, ...,99] - * The arguments of a function are always the same: - - - cr: the cursor database (from psycopg) - - uid: the user id (for security checks) - * If you run this code on 5000 sales orders, you may have 8 SQL queries because as SQL queries are not allowed to take too much memory, it may have to do two separate readings. - - -Complex example -+++++++++++++++ - -Here is a complete example, from the OpenERP official distribution, of the function that does bill of material explosion and computation of associated routings: - -.. code-block:: python - - class mrp_bom(osv.osv): - ... - def _bom_find(self, cr, uid, product_id, product_uom, properties=[]): - bom_result = False - # Why searching on BoM without parent ? - cr.execute('select id from mrp_bom where product_id=%d and bom_id is null - order by sequence', (product_id,)) - ids = map(lambda x: x[0], cr.fetchall()) - max_prop = 0 - result = False - for bom in self.pool.get('mrp.bom').browse(cr, uid, ids): - prop = 0 - for prop_id in bom.property_ids: - if prop_id.id in properties: - prop+=1 - if (prop>max_prop) or ((max_prop==0) and not result): - result = bom.id - max_prop = prop - return result - - def _bom_explode(self, cr, uid, bom, factor, properties, addthis=False, level=10): - factor = factor / (bom.product_efficiency or 1.0) - factor = rounding(factor, bom.product_rounding) - if factor`_, -`three-tier architecture -`_. -The application tier itself is written as a core, multiple additional -modules can be installed to create a particular configuration of -OpenERP. - -The core of OpenERP and its modules are written in `Python -`_. The functionality of a module is exposed through -XML-RPC (and/or NET-RPC depending on the server's configuration)[#]. Modules -typically make use of OpenERP's ORM to persist their data in a relational -database (PostgreSQL). Modules can insert data in the database during -installation by providing XML, CSV, or YML files. - -.. figure:: images/client_server.png - :scale: 85 - :align: center - -.. [#] JSON-RPC is planned for OpenERP v6.1. - -The OpenERP server ------------------- +OpenERP server +++++++++++++++ OpenERP provides an application server on which specific business applications -can be built. It is also a complete development framework, offering a range of -features to write those applications. The salient features are a flexible ORM, -a MVC architecture, extensible data models and views, different report engines, -all tied together in a coherent, network-accessible framework. +can be built. It is also a complete development framework, offering a range +of features to write those applications. Among those features, the OpenERP +ORM provides functionalities and an interface on top of the PostgreSQL server. +The OpenERP server also features a specific layer designed to communicate +with the web browser-based client. This layer connects users using standard +browsers to the server. From a developer perspective, the server acts both as a library which brings -the above benefits while hiding the low-level, nitty-gritty details, and as a -simple way to install, configure and run the written applications. +the above benefits while hiding the low-level details, and as a simple way +to install, configure and run the written applications. The server also contains +other services, such as extensible data models and view, workflow engine or +reports engine. However, those are OpenERP services not specifically related +to security, and are therefore not discussed in details in this document. -Modules -------- +**Server - ORM** -By itself, the OpenERP server is not very useful. For any enterprise, the value -of OpenERP lies in its different modules. It is the role of the modules to -implement any business needs. The server is only the necessary machinery to run -the modules. A lot of modules already exist. Any official OpenERP release -includes about 170 of them, and hundreds of modules are available through the -community. Examples of modules are Account, CRM, HR, Marketing, MRP, Sale, etc. +The Object Relational Mapping ORM layer is one of the salient features of +the OpenERP Server. It provides additional and essential functionalities +on top of PostgreSQL server. Data models are described in Python and OpenERP +creates the underlying database tables using this ORM. All the benefits of +RDBMS such as unique constraints, relational integrity or efficient querying +are used and completed by Python flexibility. For instance, arbitrary constraints +written in Python can be added to any model. Different modular extensibility +mechanisms are also afforded by OpenERP. -A module is usually composed of data models, together with some initial data, -views definitions (i.e. how data from specific data models should be displayed -to the user), wizards (specialized screens to help the user for specific -interactions), workflows definitions, and reports. +It is important to understand the ORM responsibility before attempting to +by-pass it and to access directly the underlying database via raw SQL queries. +When using the ORM, OpenERP can make sure the data remains free of any corruption. +For instance, a module can react to data creation in a particular table. +This behavior can occur only if queries go through the ORM. + +The services granted by the ORM are among other : + + - consistency validation by powerful validity checks, + - providing an interface on objects (methods, references, ...) allowing + to design and implement efficient modules, + - row-level security per user and group; more details about users and user + groups are given in the section Users and User Roles, + - complex actions on a group of resources, + - inheritance service allowing fine modeling of new resources + +**Server - Web** + +The web layer offers an interface to communicate with standard browsers. +In the 6.1 version of OpenERP, the web-client has been rewritten and integrated +into the OpenERP server tier. This layer relies on CherryPy for the routing +layer of communications, especially for session and cookies management. + +**Modules** + +By itself, the OpenERP server is a core. For any enterprise, the value of +OpenERP lies in its different modules. The role of the modules is to implement +any business requirement. The server is the only necessary component to +add modules. Any official OpenERP release includes a lot of modules, and +hundreds of modules are available thanks to the community. Examples of +such modules are Account, CRM, HR, Marketing, MRP, Sale, etc. Clients -------- ++++++++ -Clients can communicate with an OpenERP server using XML-RPC. A custom, faster -protocol called NET-RPC is also provided but will shortly disappear, replaced -by JSON-RPC. XML-RPC, as JSON-RPC in the future, makes it possible to write -clients for OpenERP in a variety of programming languages. OpenERP S.A. -develops two different clients: a desktop client, written with the widely used -`GTK+ `_ graphical toolkit, and a web client that should -run in any modern web browser. +As the application logic is mainly contained server-side, the client is +conceptually simple. It issues a request to the server, gets data back +and display the result (e.g. a list of customers) in different ways +(as forms, lists, calendars, ...). Upon user actions, it sends queries +to modify data to the server. -As the logic of OpenERP should entirely reside on the server, the client is -conceptually very simple; it issues a request to the server and display the result -(e.g. a list of customers) in different manners (as forms, lists, calendars, -...). Upon user actions, it will send modified data to the server. +Two clients can be used for user access to OpenERP, a GTK client and a +browser-based client. The GTK client communicates directly with the server. +Using the GTK client requires the client to be installed on the workstation +of each user. -Relational database server and ORM ----------------------------------- +The browser-based client holds an OpenERP application that handles communications +between the browser and the Web layer of the server. The static code of the web +application is minimal. It consists of a minimal flow of HTML that is in charge +of loading the application code in Javascript. This client-side OpenERP application +sends user requests to the server, and gets data back. Data management is +done dynamically in this client. Using this client is therefore easy for +users, but also for administrators because it does not require any software +installation on the user machine. -The data tier of OpenERP is provided by a PostgreSQL relational database. While -direct SQL queries can be executed from OpenERP modules, most database access -to the relational database is done through the `Object-Relational Mapping -`_. -The ORM is one of the salient features mentioned above. The data models are -described in Python and OpenERP creates the underlying database tables. All the -benefits of RDBMS (unique constraints, relational integrity, efficient -querying, ...) are used when possible and completed by Python flexibility. For -instance, arbitrary constraints written in Python can be added to any model. -Different modular extensibility mechanisms are also afforded by OpenERP[#]. +MVC architecture in OpenERP +=========================== -.. [#] It is important to understand the ORM responsibility before attempting to by-pass it and access directly the underlying database via raw SQL queries. When using the ORM, OpenERP can make sure the data remains free of any corruption. For instance, a module can react to data creation in a particular table. This reaction can only happen if the ORM is used to create that data. +According to `Wikipedia `_, +"a Model-view-controller (MVC) is an architectural pattern used in software +engineering". In complex computer applications presenting lots of data to +the user, one often wishes to separate data (model) and user interface (view) +concerns. Changes to the user interface does therefore not impact data +management, and data can be reorganized without changing the user interface. +The model-view-controller solves this problem by decoupling data access +and business logic from data presentation and user interaction, by +introducing an intermediate component: the controller. -Models ------- +.. _`Figure 3`: +.. figure:: _static/02_mvc_diagram.png + :width: 35% + :alt: Model-View-Controller diagram + :align: center + + Model-View-Controller diagram -To define data models and otherwise pursue any work with the associated data, -OpenERP as many ORMs uses the concept of 'model'. A model is the authoritative -specification of how some data are structured, constrained, and manipulated. In -practice, a model is written as a Python class. The class encapsulates anything -there is to know about the model: the different fields composing the model, -default values to be used when creating new records, constraints, and so on. It -also holds the dynamic aspect of the data it controls: methods on the class can -be written to implement any business needs (for instance, what to do upon user -action, or upon workflow transitions). +For example in the diagram above, the solid lines for the arrows starting +from the controller and going to both the view and the model mean that the +controller has a complete access to both the view and the model. The dashed +line for the arrow going from the view to the controller means that the view +has a limited access to the controller. The reasons of this design are : -There are two different models. One is simply called 'model', and the second is -called 'transient model'. The two models provide the same capabilities with a -single difference: transient models are automatically cleared from the -database (they can be cleaned when some limit on the number of records is -reached, or when they are untouched for some time). + - From **View** to **Model** : the model sends notification to the view + when its data has been modified in order the view to redraw its content. + The model doesn't need to know the inner workings of the view to perform + this operation. However, the view needs to access the internal parts of the model. + - From **View** to **Controller** : the reason why the view has limited + access to the controller is because the dependencies from the view to + the controller need to be minimal: the controller can be replaced at + any moment. -To describe the data model per se, OpenERP offers a range of different kind of -fields. There are basic fields such as integer, or text fields. There are -relational fields to implement one-to-many, many-to-one, and many-to-many -relationships. There are so-called function fields, which are dynamically -computed and are not necessarily available in database, and more. +OpenERP follows the MVC semantic with -Access to data is controlled by OpenERP and configured by different mechanisms. -This ensures that different users can have read and/or write access to only the -relevant data. Access can be controlled with respect to user groups and rules -based on the value of the data themselves. + - model : The PostgreSQL tables. + - view : views are defined in XML files in OpenERP. + - controller : The objects of OpenERP. -Modules -------- -OpenERP supports a modular approach both from a development perspective and a -deployment point of view. In essence, a module groups everything related to a -single concern in one meaningful entity. It is comprised of models, views, -workflows, and wizards. +Network communications +====================== + +GTK clients communicate with the OpenERP server using XML-RPC protocol by +default. However, using a secured version XML-RPCS is possible when configurating +your OpenERP instance. In previous versions of OpenERP, a custom protocol +called NET-RPC was used. It was a binary version of the XML-RPC protocol, +allowing faster communications. However, this protocol will no longer be +used in OpenERP. The use of JSON-RPC is also planned for the 6.1 version +of OpenERP. + +Web-based clients communicate using HTTP protocol. As for XML-RPC, it is +possible to configure OpenERP to use secured HTTPS connections. Services and WSGI ------------------ - -Everything in OpenERP, and models methods in particular, are exposed via the -network and a security layer. Access to the data model is in fact a 'service' -and it is possible to expose new services. For instance, a WebDAV service and a -FTP service are available. - -While not mandatory, the services can make use of the `WSGI -`_ stack. -WSGI is a standard solution in the Python ecosystem to write HTTP servers, -applications, and middleware which can be used in a mix-and-match fashion. -By using WSGI, it is possible to run OpenERP in any WSGI-compliant server, but -also to use OpenERP to host a WSGI application. - -A striking example of this possibility is the OpenERP Web project. OpenERP Web -is the server-side counter part to the web clients. It is OpenERP Web which -provides the web pages to the browser and manages web sessions. OpenERP Web is -a WSGI-compliant application. As such, it can be run as a stand-alone HTTP -server or embedded inside OpenERP. - -XML-RPC, JSON-RPC ------------------ - -The access to the models makes also use of the WSGI stack. This can be done -using the XML-RPC protocol, and JSON-RPC will be added soon. - - -Explanation of modules: - -**Server - Base distribution** - -We use a distributed communication mechanism inside the OpenERP server. Our engine supports most commonly distributed patterns: request/reply, publish/subscribe, monitoring, triggers/callback, ... - -Different business objects can be in different computers or the same objects can be on multiple computers to perform load-balancing. - -**Server - Object Relational Mapping (ORM)** - -This layer provides additional object functionality on top of PostgreSQL: - - * Consistency: powerful validity checks, - * Work with objects (methods, references, ...) - * Row-level security (per user/group/role) - * Complex actions on a group of resources - * Inheritance - -**Server - Web-Services** - -The web-service module offer a common interface for all web-services - - * SOAP - * XML-RPC - * NET-RPC - -Business objects can also be accessed via the distributed object mechanism. They can all be modified via the client interface with contextual views. - -**Server - Workflow Engine** - -Workflows are graphs represented by business objects that describe the dynamics of the company. Workflows are also used to track processes that evolve over time. - -An example of workflow used in OpenERP: - -A sales order generates an invoice and a shipping order - -**Server - Report Engine** - -Reports in OpenERP can be rendered in different ways: - - * Custom reports: those reports can be directly created via the client interface, no programming required. Those reports are represented by business objects (ir.report.custom) - * High quality personalized reports using openreport: no programming required but you have to write 2 small XML files: - - - a template which indicates the data you plan to report - - an XSL:RML stylesheet - * Hard coded reports - * OpenOffice Writer templates - -Nearly all reports are produced in PDF. - -**Server - Business Objects** - -Almost everything is a business object in OpenERP, they describe all data of the program (workflows, invoices, users, customized reports, ...). Business objects are described using the ORM module. They are persistent and can have multiple views (described by the user or automatically calculated). - -Business objects are structured in the /module directory. - -**Client - Wizards** - -Wizards are graphs of actions/windows that the user can perform during a session. - -**Client - Widgets** - -Widgets are probably, although the origin of the term seems to be very difficult to trace, "WIndow gaDGETS" in the IT world, which mean they are gadgets before anything, which implement elementary features through a portable visual tool. - -All common widgets are supported: - - * entries - * textboxes - * floating point numbers - * dates (with calendar) - * checkboxes - * ... - -And also all special widgets: - - * buttons that call actions - * references widgets - - - one2one - - - many2one - - - many2many - - - one2many in list - - - ... - -Widget have different appearances in different views. For example, the date widget in the search dialog represents two normal dates for a range of date (from...to...). - -Some widgets may have different representations depending on the context. For example, the one2many widget can be represented as a form with multiple pages or a multi-columns list. - -Events on the widgets module are processed with a callback mechanism. A callback mechanism is a process whereby an element defines the type of events he can handle and which methods should be called when this event is triggered. Once the event is triggered, the system knows that the event is bound to a specific method, and calls that method back. Hence callback. - - -Module Integrations -=================== - -The are many different modules available for OpenERP and suited for different business models. Nearly all of these are optional (except ModulesAdminBase), making it easy to customize OpenERP to serve specific business needs. All the modules are in a directory named addons/ on the server. You simply need to copy or delete a module directory in order to either install or delete the module on the OpenERP platform. - -Some modules depend on other modules. See the file addons/module/__openerp__.py for more information on the dependencies. - -Here is an example of __openerp__.py: - -.. code-block:: python - - { - "name" : "Open TERP Accounting", - "version" : "1.0", - "author" : "Bob Gates - Not So Tiny", - "website" : "http://www.openerp.com/", - "category" : "Generic Modules/Others", - "depends" : ["base"], - "description" : """A - Multiline - Description - """, - "init_xml" : ["account_workflow.xml", "account_data.xml", "account_demo.xml"], - "demo_xml" : ["account_demo.xml"], - "update_xml" : ["account_view.xml", "account_report.xml", "account_wizard.xml"], - "active": False, - "installable": True - } - -When initializing a module, the files in the init_xml list are evaluated in turn and then the files in the update_xml list are evaluated. When updating a module, only the files from the **update_xml** list are evaluated. - - -Inheritance -=========== - -Traditional Inheritance ------------------------ - -Introduction -++++++++++++ - -Objects may be inherited in some custom or specific modules. It is better to inherit an object to add/modify some fields. - -It is done with:: - - _inherit='object.name' - -Extension of an object -++++++++++++++++++++++ - -There are two possible ways to do this kind of inheritance. Both ways result in a new class of data, which holds parent fields and behaviour as well as additional fields and behaviour, but they differ in heavy programatical consequences. - -While Example 1 creates a new subclass "custom_material" that may be "seen" or "used" by any view or tree which handles "network.material", this will not be the case for Example 2. - -This is due to the table (other.material) the new subclass is operating on, which will never be recognized by previous "network.material" views or trees. - -Example 1:: - - class custom_material(osv.osv): - _name = 'network.material' - _inherit = 'network.material' - _columns = { - 'manuf_warranty': fields.boolean('Manufacturer warranty?'), - } - _defaults = { - 'manuf_warranty': lambda *a: False, - } - custom_material() - -.. tip:: Notice - - _name == _inherit - -In this example, the 'custom_material' will add a new field 'manuf_warranty' to the object 'network.material'. New instances of this class will be visible by views or trees operating on the superclasses table 'network.material'. - -This inheritancy is usually called "class inheritance" in Object oriented design. The child inherits data (fields) and behavior (functions) of his parent. - - -Example 2:: - - class other_material(osv.osv): - _name = 'other.material' - _inherit = 'network.material' - _columns = { - 'manuf_warranty': fields.boolean('Manufacturer warranty?'), - } - _defaults = { - 'manuf_warranty': lambda *a: False, - } - other_material() - -.. tip:: Notice - - _name != _inherit - -In this example, the 'other_material' will hold all fields specified by 'network.material' and it will additionally hold a new field 'manuf_warranty'. All those fields will be part of the table 'other.material'. New instances of this class will therefore never been seen by views or trees operating on the superclasses table 'network.material'. - -This type of inheritancy is known as "inheritance by prototyping" (e.g. Javascript), because the newly created subclass "copies" all fields from the specified superclass (prototype). The child inherits data (fields) and behavior (functions) of his parent. - -Inheritance by Delegation -------------------------- - - **Syntax :**:: - - class tiny_object(osv.osv) - _name = 'tiny.object' - _table = 'tiny_object' - _inherits = { 'tiny.object_a' : 'name_col_a', 'tiny.object_b' : 'name_col_b', - ..., 'tiny.object_n' : 'name_col_n' } - (...) - - -The object 'tiny.object' inherits from all the columns and all the methods from the n objects 'tiny.object_a', ..., 'tiny.object_n'. - -To inherit from multiple tables, the technique consists in adding one column to the table tiny_object per inherited object. This column will store a foreign key (an id from another table). The values *'name_col_a' 'name_col_b' ... 'name_col_n'* are of type string and determine the title of the columns in which the foreign keys from 'tiny.object_a', ..., 'tiny.object_n' are stored. - -This inheritance mechanism is usually called " *instance inheritance* " or " *value inheritance* ". A resource (instance) has the VALUES of its parents. +================= + +Everything in OpenERP, and objects methods in particular, are exposed via +the network and a security layer. Access to the data model is in fact a ‘service’ +and it is possible to expose new services. For instance, a WebDAV service and +a FTP service are available. + +While not mandatory, the services can make use of the `WSGI +`_ stack. WSGI is +a standard solution in the Python ecosystem to write HTTP servers, applications, +and middleware which can be used in a mix-and-match fashion. By using WSGI, +it is possible to run OpenERP in any WSGI compliant server. It is also +possible to use OpenERP to host a WSGI application. + +A striking example of this possibility is the OpenERP Web layer that is +the server-side counter part to the web clients. It provides the requested +data to the browser and manages web sessions. It is a WSGI-compliant application. +As such, it can be run as a stand-alone HTTP server or embedded inside OpenERP. diff --git a/doc/index.rst.inc b/doc/index.rst.inc index e36bccd79d5..670ffd7f53d 100644 --- a/doc/index.rst.inc +++ b/doc/index.rst.inc @@ -3,9 +3,10 @@ OpenERP Server Documentation ''''''''''''''''''''''''''''' .. toctree:: - :maxdepth: 1 + :maxdepth: 2 01_getting_started + 02_architecture 99_test_framework Main revisions and new features From 7ceabb818d266458c4e52502e40ce03bca67c961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 17 Apr 2012 15:40:34 +0200 Subject: [PATCH 007/841] [DOC] [ADD] Added module development chapter from developer book. bzr revid: tde@openerp.com-20120417134034-dqrgog0nxhz3d10e --- doc/03_module_dev.rst | 12 + doc/03_module_dev_01.rst | 597 ++++++++++++++++ doc/03_module_dev_02.rst | 959 +++++++++++++++++++++++++ doc/03_module_dev_03.rst | 1428 ++++++++++++++++++++++++++++++++++++++ doc/03_module_dev_04.rst | 365 ++++++++++ doc/03_module_dev_05.rst | 91 +++ doc/api/startup.rst | 1 - doc/index.rst | 1 + doc/index.rst.inc | 15 +- 9 files changed, 3466 insertions(+), 3 deletions(-) create mode 100644 doc/03_module_dev.rst create mode 100644 doc/03_module_dev_01.rst create mode 100644 doc/03_module_dev_02.rst create mode 100644 doc/03_module_dev_03.rst create mode 100644 doc/03_module_dev_04.rst create mode 100644 doc/03_module_dev_05.rst diff --git a/doc/03_module_dev.rst b/doc/03_module_dev.rst new file mode 100644 index 00000000000..a019af94601 --- /dev/null +++ b/doc/03_module_dev.rst @@ -0,0 +1,12 @@ +======= +Modules +======= + +.. toctree:: + :maxdepth: 2 + + 03_module_dev_01 + 03_module_dev_02 + 03_module_dev_03 + 03_module_dev_04 + 03_module_dev_05 diff --git a/doc/03_module_dev_01.rst b/doc/03_module_dev_01.rst new file mode 100644 index 00000000000..2da148fe1ca --- /dev/null +++ b/doc/03_module_dev_01.rst @@ -0,0 +1,597 @@ +Module development +================== + +Module Structure ++++++++++++++++++ + +All the modules are located in the source/addons directory. The following +steps are necessary to create a new module: + + * create a subdirectory in the source/addons directory + * create the import **__init__.py** file + * create a module description file: **__openerp__.py** + * create the **Python** file containing the **objects** + * create **.xml files** that create the data (views, menu entries, demo data, ...) + * optionally create **reports**, **wizards** or **workflows**. + +Python Module Descriptor File __init__.py +----------------------------------------- + +The ``__init__.py`` file is, like any Python module, executed at the start +of the program. It needs to import the Python files that need to be loaded. + +So, if you create a "module.py" file, containing the description of your +objects, you have to write one line in __init__.py:: + + import module + +OpenERP Module Descriptor File __openerp__.py +--------------------------------------------- + +In the created module directory, you must add a **__openerp__.py** file. +This file, which must be in Python format, is responsible to + + 1. determine the *XML files that will be parsed* during the initialization + of the server, and also to + 2. determine the *dependencies* of the created module. + +This file must contain a Python dictionary with the following values: + +**name** + + The (Plain English) name of the module. + +**version** + + The version of the module. + +**description** + + The module description (text). + +**author** + + The author of the module. + +**website** + + The website of the module. + +**license** + + The license of the module (default:GPL-2). + +**depends** + + List of modules on which this module depends. The base module must + almost always be in the dependencies because some necessary data for + the views, reports, ... are in the base module. + +**init_xml** + + List of .xml files to load when the server is launched with the "--init=module" + argument. Filepaths must be relative to the directory where the module is. + OpenERP XML File Format is detailed in this section. + +**update_xml** + + List of .xml files to load when the server is launched with the "--update=module" + launched. Filepaths must be relative to the directory where the module is. + OpenERP XML File Format is detailed in this section. The files in **update_xml** + concern: views, reports and wizards. + +**installable** + + True or False. Determines if the module is installable or not. + +**active** + + True or False (default: False). Determines the modules that are installed + on the database creation. + +**Example** + +Here is an example of __openerp__.py file for the product module + +.. code-block:: python + + { + "name" : "Products & Pricelists", + "version" : "1.1", + "author" : "Open", + "category" : "Generic Modules/Inventory Control", + "depends" : ["base", "account"], + "init_xml" : [], + "demo_xml" : ["product_demo.xml"], + "update_xml" : ["product_data.xml", "product_report.xml", "product_wizard.xml", + "product_view.xml", "pricelist_view.xml"], + "installable": True, + "active": True + } + +The files that must be placed in init_xml are the ones that relate to the +workflow definition, data to load at the installation of the software and +the data for the demonstrations. + + +XML Files ++++++++++ + +XML files located in the module directory are used to modify the structure of +the database. They are used for many purposes, among which we can cite : + + * initialization and demonstration data declaration, + * views declaration, + * reports declaration, + * wizards declaration, + * workflows declaration. + +General structure of OpenERP XML files is more detailed in the +:ref:`xml-serialization` section. Look here if you are interested in learning +more about *initialization* and *demonstration data declaration* XML files. The +following section are only related to XML specific to *actions, menu entries, +reports, wizards* and *workflows* declaration. + + +Objects ++++++++ + +All OpenERP resources are objects: menus, actions, reports, invoices, partners, ... OpenERP is based on an object relational mapping of a database to control the information. Object names are hierarchical, as in the following examples: + + * account.transfer : a money transfer + * account.invoice : an invoice + * account.invoice.line : an invoice line + +Generally, the first word is the name of the module: account, stock, sale. + +Other advantages of an ORM; + + * simpler relations : invoice.partner.address[0].city + * objects have properties and methods: invoice.pay(3400 EUR), + * inheritance, high level constraints, ... + +It is easier to manipulate one object (example, a partner) than several tables (partner address, categories, events, ...) + + +.. figure:: images/pom_3_0_3.png + :scale: 50 + :align: center + + *The Physical Objects Model of [OpenERP version 3.0.3]* + + +PostgreSQL and ORM +------------------ + +The ORM of OpenERP is constructed over PostgreSQL. It is thus possible to +query the object used by OpenERP using the object interface or by directly +using SQL statements. + +But it is dangerous to write or read directly in the PostgreSQL database, as +you will shortcut important steps like constraints checking or workflow +modification. + +.. note:: + + The Physical Database Model of OpenERP + +Pre-Installed Data +------------------ + +Data can be inserted or updated into the PostgreSQL tables corresponding to the +OpenERP objects using XML files. The general structure of an OpenERP XML file +is as follows: + +.. code-block:: xml + + + + + + + "field1 content" + + + "field2 content" + + (...) + + + (...) + + (...) + + + +Fields content are strings that must be encoded as *UTF-8* in XML files. + +Let's review an example taken from the OpenERP source (base_demo.xml in the base module): + +.. code-block:: xml + + + Tiny sprl + + + + +.. code-block:: xml + + + admin + admin + Administrator + Administrator + + + + + + + +This last record defines the admin user : + + * The fields login, password, etc are straightforward. + * The ref attribute allows to fill relations between the records : + +.. code-block:: xml + + + +The field **company_id** is a many-to-one relation from the user object to the company object, and **main_company** is the id of to associate. + + * The **eval** attribute allows to put some python code in the xml: here the groups_id field is a many2many. For such a field, "[(6,0,[group_admin])]" means : Remove all the groups associated with the current user and use the list [group_admin] as the new associated groups (and group_admin is the id of another record). + + * The **search** attribute allows to find the record to associate when you do not know its xml id. You can thus specify a search criteria to find the wanted record. The criteria is a list of tuples of the same form than for the predefined search method. If there are several results, an arbitrary one will be chosen (the first one): + +.. code-block:: xml + + + +This is a classical example of the use of **search** in demo data: here we do not really care about which partner we want to use for the test, so we give an empty list. Notice the **model** attribute is currently mandatory. + +Record Tag +////////// + +**Description** + +The addition of new data is made with the record tag. This one takes a mandatory attribute : model. Model is the object name where the insertion has to be done. The tag record can also take an optional attribute: id. If this attribute is given, a variable of this name can be used later on, in the same file, to make reference to the newly created resource ID. + +A record tag may contain field tags. They indicate the record's fields value. If a field is not specified the default value will be used. + +**Example** + +.. code-block:: xml + + + account.invoice + Invoices List + account.invoice.list + account/report/invoice.xsl + account/report/invoice.xml + + +Field tag +///////// + +The attributes for the field tag are the following: + +name : mandatory + the field name + +eval : optional + python expression that indicating the value to add + +ref + reference to an id defined in this file + +model + model to be looked up in the search + +search + a query + +Function tag +//////////// + +A function tag can contain other function tags. + +model : mandatory + The model to be used + +name : mandatory + the function given name + +eval + should evaluate to the list of parameters of the method to be called, excluding cr and uid + +**Example** + +.. code-block:: xml + + + +Getitem tag +/////////// + +Takes a subset of the evaluation of the last child node of the tag. + +type : mandatory + int or list + +index : mandatory + int or string (a key of a dictionary) + +**Example** + +Evaluates to the first element of the list of ids returned by the function node + +.. code-block:: xml + + + + + +i18n +"""" + +Improving Translations +////////////////////// + +.. describe:: Translating in launchpad + +Translations are managed by +the `Launchpad Web interface `_. Here, you'll +find the list of translatable projects. + +Please read the `FAQ `_ before asking questions. + +.. describe:: Translating your own module + +.. versionchanged:: 5.0 + +Contrary to the 4.2.x version, the translations are now done by module. So, +instead of an unique ``i18n`` folder for the whole application, each module has +its own ``i18n`` folder. In addition, OpenERP can now deal with ``.po`` [#f_po]_ +files as import/export format. The translation files of the installed languages +are automatically loaded when installing or updating a module. OpenERP can also +generate a .tgz archive containing well organised ``.po`` files for each selected +module. + +.. [#f_po] http://www.gnu.org/software/autoconf/manual/gettext/PO-Files.html#PO-Files + +Process +""""""" + +Defining the process +//////////////////// + +Through the interface and module recorder. +Then, put the generated XML in your own module. + +Views +""""" + +Technical Specifications - Architecture - Views +/////////////////////////////////////////////// + +Views are a way to represent the objects on the client side. They indicate to the client how to lay out the data coming from the objects on the screen. + +There are two types of views: + + * form views + * tree views + +Lists are simply a particular case of tree views. + +A same object may have several views: the first defined view of a kind (*tree, form*, ...) will be used as the default view for this kind. That way you can have a default tree view (that will act as the view of a one2many) and a specialized view with more or less information that will appear when one double-clicks on a menu item. For example, the products have several views according to the product variants. + +Views are described in XML. + +If no view has been defined for an object, the object is able to generate a view to represent itself. This can limit the developer's work but results in less ergonomic views. + + +Usage example +///////////// + +When you open an invoice, here is the chain of operations followed by the client: + + * An action asks to open the invoice (it gives the object's data (account.invoice), the view, the domain (e.g. only unpaid invoices) ). + * The client asks (with XML-RPC) to the server what views are defined for the invoice object and what are the data it must show. + * The client displays the form according to the view + +.. figure:: images/arch_view_use.png + :scale: 50 + :align: center + +To develop new objects +////////////////////// + +The design of new objects is restricted to the minimum: create the objects and optionally create the views to represent them. The PostgreSQL tables do not have to be written by hand because the objects are able to automatically create them (or adapt them in case they already exist). + +Reports +""""""" + +OpenERP uses a flexible and powerful reporting system. Reports are generated either in PDF or in HTML. Reports are designed on the principle of separation between the data layer and the presentation layer. + +Reports are described more in details in the `Reporting `_ chapter. + +Wizards +""""""" + +Here's an example of a .XML file that declares a wizard. + +.. code-block:: xml + + + + + + + + +A wizard is declared using a wizard tag. See "Add A New Wizard" for more information about wizard XML. + +also you can add wizard in menu using following xml entry + +.. code-block:: xml + + + + + + + + + +Workflow +"""""""" + +The objects and the views allow you to define new forms very simply, lists/trees and interactions between them. But that is not enough, you must define the dynamics of these objects. + +A few examples: + + * a confirmed sale order must generate an invoice, according to certain conditions + * a paid invoice must, only under certain conditions, start the shipping order + +The workflows describe these interactions with graphs. One or several workflows may be associated to the objects. Workflows are not mandatory; some objects don't have workflows. + +Below is an example workflow used for sale orders. It must generate invoices and shipments according to certain conditions. + +.. figure:: images/arch_workflow_sale.png + :scale: 85 + :align: center + + +In this graph, the nodes represent the actions to be done: + + * create an invoice, + * cancel the sale order, + * generate the shipping order, ... + +The arrows are the conditions; + + * waiting for the order validation, + * invoice paid, + * click on the cancel button, ... + +The squared nodes represent other Workflows; + + * the invoice + * the shipping + + +Profile Module +++++++++++++++ + +The purpose of a profile is to initialize OpenERP with a set of modules directly after the database has been created. A profile is a special kind of module that contains no code, only *dependencies on other modules*. + +In order to create a profile, you only have to create a new directory in server/addons (you *should* call this folder profile_modulename), in which you put an *empty* __init__.py file (as every directory Python imports must contain an __init__.py file), and a __openerp__.py whose structure is as follows : + +.. code-block:: python + + { + "name":"''Name of the Profile'', + "version":"''Version String''", + "author":"''Author Name''", + "category":"Profile", + "depends":[''List of the modules to install with the profile''], + "demo_xml":[], + "update_xml":[], + "active":False, + "installable":True, + } + +Here's the code of the file source/addons/profile_tools/__openerp__.py, +which corresponds to the tools profile in OpenERP. + +.. code-block:: python + + { + "name" : "Miscellaneous Tools", + "version" : "1.0", + "depends" : ["base", "base_setup"], + "author" : "OpenERP SA", + "category" : "Hidden/Dependency", + 'complexity': "easy", + "description": """ + Installer for extra Hidden like lunch, survey, idea, share, etc. + ================================================================ + + Makes the Extra Hidden Configuration available from where you can install + modules like share, lunch, pad, idea, survey and subscription. + """, + 'website': 'http://www.openerp.com', + 'init_xml': [], + 'update_xml': [ + ], + 'demo_xml': [], + 'installable': True, + 'auto_install': False, + 'certificate' : '00557100228403879621', + 'images': ['images/config_extra_Hidden.jpeg'], + } + + + + + +Action creation +--------------- + +Linking events to action +++++++++++++++++++++++++ + +The available type of events are: + + * **client_print_multi** (print from a list or form) + * **client_action_multi** (action from a list or form) + * **tree_but_open** (double click on the item of a tree, like the menu) + * **tree_but_action** (action on the items of a tree) + +To map an events to an action: + +.. code-block:: xml + + + tree_but_open + account.journal.period + Open Journal + + + + +If you double click on a journal/period (object: account.journal.period), this will open the selected wizard. (id="action_move_journal_line_form_select"). + +You can use a res_id field to allow this action only if the user click on a specific object. + +.. code-block:: xml + + + tree_but_open + account.journal.period + Open Journal + + + + + +The action will be triggered if the user clicks on the account.journal.period n°3. + +When you declare wizard, report or menus, the ir.values creation is automatically made with these tags: + + * + * + * + +So you usually do not need to add the mapping by yourself. diff --git a/doc/03_module_dev_02.rst b/doc/03_module_dev_02.rst new file mode 100644 index 00000000000..c7075a8f7ae --- /dev/null +++ b/doc/03_module_dev_02.rst @@ -0,0 +1,959 @@ +Objects, Fields and Methods +=========================== + +OpenERP Objects +--------------- + +.. This chapter is dedicated to detailed objects definition: + all fields + all objects + inheritancies + +All the ERP's pieces of data are accessible through "objects". As an example, there is a res.partner object to access the data concerning the partners, an account.invoice object for the data concerning the invoices, etc... + +Please note that there is an object for every type of resource, and not an +object per resource. We have thus a res.partner object to manage all the +partners and not a *res.partner* object per partner. If we talk in "object +oriented" terms, we could also say that there is an object per level. + +The direct consequences is that all the methods of objects have a common parameter: the "ids" parameter. This specifies on which resources (for example, on which partner) the method must be applied. Precisely, this parameter contains a list of resource ids on which the method must be applied. + +For example, if we have two partners with the identifiers 1 and 5, and we want to call the res_partner method "send_email", we will write something like:: + + res_partner.send_email(... , [1, 5], ...) + +We will see the exact syntax of object method calls further in this document. + +In the following section, we will see how to define a new object. Then, we will check out the different methods of doing this. + +For developers: + +* OpenERP "objects" are usually called classes in object oriented programming. +* A OpenERP "resource" is usually called an object in OO programming, instance of a class. + +It's a bit confusing when you try to program inside OpenERP, because the language used is Python, and Python is a fully object oriented language, and has objects and instances ... + +Luckily, an OpenERP "resource" can be converted magically into a nice Python object using the "browse" class method (OpenERP object method). + + +The ORM - Object-relational mapping - Models +-------------------------------------------- + +The ORM, short for Object-Relational Mapping, is a central part of OpenERP. + +In OpenERP, the data model is described and manipulated through Python classes +and objects. It is the ORM job to bridge the gap -- as transparently as +possible for the developer -- between Python and the underlying relational +database (PostgreSQL), which will provide the persistence we need for our +objects. + + +OpenERP Object Attributes +------------------------- + +Objects Introduction +++++++++++++++++++++ + +To define a new object, you must define a new Python class then instantiate it. This class must inherit from the osv class in the osv module. + +Object definition ++++++++++++++++++ + +The first line of the object definition will always be of the form:: + + class name_of_the_object(osv.osv): + _name = 'name.of.the.object' + _columns = { ... } + ... + name_of_the_object() + +An object is defined by declaring some fields with predefined names in the +class. Two of them are required (_name and _columns), the rest are optional. +The predefined fields are: + +Predefined fields ++++++++++++++++++ + +`_auto` + Determines whether a corresponding PostgreSQL table must be generated + automatically from the object. Setting _auto to False can be useful in case + of OpenERP objects generated from PostgreSQL views. See the "Reporting From + PostgreSQL Views" section for more details. + +`_columns (required)` + The object fields. See the :ref:`fields ` section for further details. + +`_constraints` + The constraints on the object. See the constraints section for details. + +`_sql_constraints` + The SQL Constraint on the object. See the SQL constraints section for further details. + +`_defaults` + The default values for some of the object's fields. See the default value section for details. + +`_inherit` + The name of the osv object which the current object inherits from. See the :ref:`object inheritance section` + (first form) for further details. + +`_inherits` + The list of osv objects the object inherits from. This list must be given in + a python dictionary of the form: {'name_of_the_parent_object': + 'name_of_the_field', ...}. See the :ref:`object inheritance section` + (second form) for further details. Default value: {}. + +`_log_access` + Determines whether or not the write access to the resource must be logged. + If true, four fields will be created in the SQL table: create_uid, + create_date, write_uid, write_date. Those fields represent respectively the + id of the user who created the record, the creation date of record, the id + of the user who last modified the record, and the date of that last + modification. This data may be obtained by using the perm_read method. + +`_name (required)` + Name of the object. Default value: None. + +`_order` + Name of the fields used to sort the results of the search and read methods. + + Default value: 'id'. + + Examples:: + + _order = "name" + _order = "date_order desc" + +`_rec_name` + Name of the field in which the name of every resource is stored. Default + value: 'name'. Note: by default, the name_get method simply returns the + content of this field. + +`_sequence` + Name of the SQL sequence that manages the ids for this object. Default value: None. + +`_sql` + SQL code executed upon creation of the object (only if _auto is True). It means this code gets executed after the table is created. + +`_table` + Name of the SQL table. Default value: the value of the _name field above + with the dots ( . ) replaced by underscores ( _ ). + + +.. _inherit-link: + +Object Inheritance - _inherit +----------------------------- + +Introduction +++++++++++++ + +Objects may be inherited in some custom or specific modules. It is better to +inherit an object to add/modify some fields. + +It is done with:: + + _inherit='object.name' + +Extension of an object +++++++++++++++++++++++ + +There are two possible ways to do this kind of inheritance. Both ways result in +a new class of data, which holds parent fields and behaviour as well as +additional fields and behaviour, but they differ in heavy programatical +consequences. + +While Example 1 creates a new subclass "custom_material" that may be "seen" or +"used" by any view or tree which handles "network.material", this will not be +the case for Example 2. + +This is due to the table (other.material) the new subclass is operating on, +which will never be recognized by previous "network.material" views or trees. + +Example 1:: + + class custom_material(osv.osv): + _name = 'network.material' + _inherit = 'network.material' + _columns = { + 'manuf_warranty': fields.boolean('Manufacturer warranty?'), + } + _defaults = { + 'manuf_warranty': lambda *a: False, + } + custom_material() + +.. tip:: Notice + + _name == _inherit + +In this example, the 'custom_material' will add a new field 'manuf_warranty' to +the object 'network.material'. New instances of this class will be visible by +views or trees operating on the superclasses table 'network.material'. + +This inheritancy is usually called "class inheritance" in Object oriented +design. The child inherits data (fields) and behavior (functions) of his +parent. + + +Example 2:: + + class other_material(osv.osv): + _name = 'other.material' + _inherit = 'network.material' + _columns = { + 'manuf_warranty': fields.boolean('Manufacturer warranty?'), + } + _defaults = { + 'manuf_warranty': lambda *a: False, + } + other_material() + +.. tip:: Notice + + _name != _inherit + +In this example, the 'other_material' will hold all fields specified by +'network.material' and it will additionally hold a new field 'manuf_warranty'. +All those fields will be part of the table 'other.material'. New instances of +this class will therefore never been seen by views or trees operating on the +superclasses table 'network.material'. + +This type of inheritancy is known as "inheritance by prototyping" (e.g. +Javascript), because the newly created subclass "copies" all fields from the +specified superclass (prototype). The child inherits data (fields) and behavior +(functions) of his parent. + + +.. _inherits-link: + +Inheritance by Delegation - _inherits +------------------------------------- + + **Syntax :**:: + + class tiny_object(osv.osv) + _name = 'tiny.object' + _table = 'tiny_object' + _inherits = { + 'tiny.object_a': 'object_a_id', + 'tiny.object_b': 'object_b_id', + ... , + 'tiny.object_n': 'object_n_id' + } + (...) + +The object 'tiny.object' inherits from all the columns and all the methods from +the n objects 'tiny.object_a', ..., 'tiny.object_n'. + +To inherit from multiple tables, the technique consists in adding one column to +the table tiny_object per inherited object. This column will store a foreign +key (an id from another table). The values *'object_a_id' 'object_b_id' ... +'object_n_id'* are of type string and determine the title of the columns in +which the foreign keys from 'tiny.object_a', ..., 'tiny.object_n' are stored. + +This inheritance mechanism is usually called " *instance inheritance* " or " +*value inheritance* ". A resource (instance) has the VALUES of its parents. + + +.. _fields-link: + +Fields Introduction +------------------- + +Objects may contain different types of fields. Those types can be divided into +three categories: simple types, relation types and functional fields. The +simple types are integers, floats, booleans, strings, etc ... ; the relation +types are used to represent relations between objects (one2one, one2many, +many2one). Functional fields are special fields because they are not stored in +the database but calculated in real time given other fields of the view. + +Here's the header of the initialization method of the class any field defined +in OpenERP inherits (as you can see in server/bin/osv/fields.py):: + + def __init__(self, string='unknown', required=False, readonly=False, + domain=None, context="", states=None, priority=0, change_default=False, size=None, + ondelete="set null", translate=False, select=False, **args) : + +There are a common set of optional parameters that are available to most field +types: + +:change_default: + Whether or not the user can define default values on other fields depending + on the value of this field. Those default values need to be defined in + the ir.values table. +:help: + A description of how the field should be used: longer and more descriptive + than `string`. It will appear in a tooltip when the mouse hovers over the + field. +:ondelete: + How to handle deletions in a related record. Allowable values are: + 'restrict', 'no action', 'cascade', 'set null', and 'set default'. +:priority: Not used? +:readonly: `True` if the user cannot edit this field, otherwise `False`. +:required: + `True` if this field must have a value before the object can be saved, + otherwise `False`. +:size: The size of the field in the database: number characters or digits. +:states: + Lets you override other parameters for specific states of this object. + Accepts a dictionary with the state names as keys and a list of name/value + tuples as the values. For example: `states={'posted':[('readonly',True)]}` +:string: + The field name as it should appear in a label or column header. Strings + containing non-ASCII characters must use python unicode objects. + For example: `'tested': fields.boolean(u'Testé')` +:translate: + `True` if the *content* of this field should be translated, otherwise + `False`. + +There are also some optional parameters that are specific to some field types: + +:context: + Define a variable's value visible in the view's context or an on-change + function. Used when searching child table of `one2many` relationship? +:domain: + Domain restriction on a relational field. + + Default value: []. + + Example: domain=[('field','=',value)]) +:invisible: Hide the field's value in forms. For example, a password. +:on_change: + Default value for the `on_change` attribute in the view. This will launch + a function on the server when the field changes in the client. For example, + `on_change="onchange_shop_id(shop_id)"`. +:relation: + Used when a field is an id reference to another table. This is the name of + the table to look in. Most commonly used with related and function field + types. +:select: + Default value for the `select` attribute in the view. 1 means basic search, + and 2 means advanced search. + + +Type of Fields +-------------- + +Basic Types ++++++++++++ + +:boolean: + + A boolean (true, false). + + Syntax:: + + fields.boolean('Field Name' [, Optional Parameters]), + +:integer: + + An integer. + + Syntax:: + + fields.integer('Field Name' [, Optional Parameters]), + +:float: + + A floating point number. + + Syntax:: + + fields.float('Field Name' [, Optional Parameters]), + + .. note:: + + The optional parameter digits defines the precision and scale of the + number. The scale being the number of digits after the decimal point + whereas the precision is the total number of significant digits in the + number (before and after the decimal point). If the parameter digits is + not present, the number will be a double precision floating point number. + Warning: these floating-point numbers are inexact (not any value can be + converted to its binary representation) and this can lead to rounding + errors. You should always use the digits parameter for monetary amounts. + + Example:: + + 'rate': fields.float( + 'Relative Change rate', + digits=(12,6) [, + Optional Parameters]), + +:char: + + A string of limited length. The required size parameter determines its size. + + Syntax:: + + fields.char( + 'Field Name', + size=n [, + Optional Parameters]), # where ''n'' is an integer. + + Example:: + + 'city' : fields.char('City Name', size=30, required=True), + +:text: + + A text field with no limit in length. + + Syntax:: + + fields.text('Field Name' [, Optional Parameters]), + +:date: + + A date. + + Syntax:: + + fields.date('Field Name' [, Optional Parameters]), + +:datetime: + + Allows to store a date and the time of day in the same field. + + Syntax:: + + fields.datetime('Field Name' [, Optional Parameters]), + +:binary: + + A binary chain + +:selection: + + A field which allows the user to make a selection between various predefined values. + + Syntax:: + + fields.selection((('n','Unconfirmed'), ('c','Confirmed')), + 'Field Name' [, Optional Parameters]), + + .. note:: + + Format of the selection parameter: tuple of tuples of strings of the form:: + + (('key_or_value', 'string_to_display'), ... ) + + .. note:: + You can specify a function that will return the tuple. Example :: + + def _get_selection(self, cursor, user_id, context=None): + return ( + ('choice1', 'This is the choice 1'), + ('choice2', 'This is the choice 2')) + + _columns = { + 'sel' : fields.selection( + _get_selection, + 'What do you want ?') + } + + *Example* + + Using relation fields **many2one** with **selection**. In fields definitions add:: + + ..., + 'my_field': fields.many2one( + 'mymodule.relation.model', + 'Title', + selection=_sel_func), + ..., + + And then define the _sel_func like this (but before the fields definitions):: + + def _sel_func(self, cr, uid, context=None): + obj = self.pool.get('mymodule.relation.model') + ids = obj.search(cr, uid, []) + res = obj.read(cr, uid, ids, ['name', 'id'], context) + res = [(r['id'], r['name']) for r in res] + return res + +Relational Types +++++++++++++++++ + +:one2one: + + A one2one field expresses a one:to:one relation between two objects. It is + deprecated. Use many2one instead. + + Syntax:: + + fields.one2one('other.object.name', 'Field Name') + +:many2one: + + Associates this object to a parent object via this Field. For example + Department an Employee belongs to would Many to one. i.e Many employees will + belong to a Department + + Syntax:: + + fields.many2one( + 'other.object.name', + 'Field Name', + optional parameters) + + Optional parameters: + + - ondelete: What should happen when the resource this field points to is deleted. + + Predefined value: "cascade", "set null", "restrict", "no action", "set default" + + Default value: "set null" + - required: True + - readonly: True + - select: True - (creates an index on the Foreign Key field) + + *Example* :: + + 'commercial': fields.many2one( + 'res.users', + 'Commercial', + ondelete='cascade'), + +:one2many: + + TODO + + Syntax:: + + fields.one2many( + 'other.object.name', + 'Field relation id', + 'Fieldname', + optional parameter) + + Optional parameters: + - invisible: True/False + - states: ? + - readonly: True/False + + *Example* :: + + 'address': fields.one2many( + 'res.partner.address', + 'partner_id', + 'Contacts'), + +:many2many: + + TODO + + Syntax:: + + fields.many2many('other.object.name', + 'relation object', + 'actual.object.id', + 'other.object.id', + 'Field Name') + + Where: + - other.object.name is the other object which belongs to the relation + - relation object is the table that makes the link + - actual.object.id and other.object.id are the fields' names used in the relation table + + Example:: + + 'category_ids': + fields.many2many( + 'res.partner.category', + 'res_partner_category_rel', + 'partner_id', + 'category_id', + 'Categories'), + + To make it bidirectional (= create a field in the other object):: + + class other_object_name2(osv.osv): + _inherit = 'other.object.name' + _columns = { + 'other_fields': fields.many2many( + 'actual.object.name', + 'relation object', + 'actual.object.id', + 'other.object.id', + 'Other Field Name'), + } + other_object_name2() + + Example:: + + class res_partner_category2(osv.osv): + _inherit = 'res.partner.category' + _columns = { + 'partner_ids': fields.many2many( + 'res.partner', + 'res_partner_category_rel', + 'category_id', + 'partner_id', + 'Partners'), + } + res_partner_category2() + +:related: + + Sometimes you need to refer to the relation of a relation. For example, + supposing you have objects: City -> State -> Country, and you need to refer to + the Country from a City, you can define a field as below in the City object:: + + 'country_id': fields.related( + 'state_id', + 'country_id', + type="many2one", + relation="res.country", + string="Country", + store=False) + + Where: + - The first set of parameters are the chain of reference fields to + follow, with the desired field at the end. + - :guilabel:`type` is the type of that desired field. + - Use :guilabel:`relation` if the desired field is still some kind of + reference. :guilabel:`relation` is the table to look up that + reference in. + + +Functional Fields ++++++++++++++++++ + +A functional field is a field whose value is calculated by a function (rather +than being stored in the database). + +**Parameters:** :: + + fnct, arg=None, fnct_inv=None, fnct_inv_arg=None, type="float", + fnct_search=None, obj=None, method=False, store=False, multi=False + +where + + * :guilabel:`fnct` is the function or method that will compute the field + value. It must have been declared before declaring the functional field. + * :guilabel:`fnct_inv` is the function or method that will allow writing + values in that field. + * :guilabel:`type` is the field type name returned by the function. It can + be any field type name except function. + * :guilabel:`fnct_search` allows you to define the searching behaviour on + that field. + * :guilabel:`method` whether the field is computed by a method (of an + object) or a global function + * :guilabel:`store` If you want to store field in database or not. Default + is False. + * :guilabel:`multi` is a group name. All fields with the same `multi` + parameter will be calculated in a single function call. + +fnct parameter +"""""""""""""" +If *method* is True, the signature of the method must be:: + + def fnct(self, cr, uid, ids, field_name, arg, context): + +otherwise (if it is a global function), its signature must be:: + + def fnct(cr, table, ids, field_name, arg, context): + +Either way, it must return a dictionary of values of the form +**{id'_1_': value'_1_', id'_2_': value'_2_',...}.** + +The values of the returned dictionary must be of the type specified by the type +argument in the field declaration. + +If *multi* is set, then *field_name* is replaced by *field_names*: a list +of the field names that should be calculated. Each value in the returned +dictionary is also a dictionary from field name to value. For example, if the +fields `'name'`, and `'age'` are both based on the `vital_statistics` function, +then the return value of `vital_statistics` might look like this when `ids` is +`[1, 2, 5]`:: + + { + 1: {'name': 'Bob', 'age': 23}, + 2: {'name': 'Sally', 'age', 19}, + 5: {'name': 'Ed', 'age': 62} + } + +fnct_inv parameter +"""""""""""""""""" +If *method* is true, the signature of the method must be:: + + def fnct(self, cr, uid, ids, field_name, field_value, arg, context): + + +otherwise (if it is a global function), it should be:: + + def fnct(cr, table, ids, field_name, field_value, arg, context): + +fnct_search parameter +""""""""""""""""""""" +If method is true, the signature of the method must be:: + + def fnct(self, cr, uid, obj, name, args, context): + +otherwise (if it is a global function), it should be:: + + def fnct(cr, uid, obj, name, args, context): + +The return value is a list containing 3-part tuples which are used in search function:: + + return [('id','in',[1,3,5])] + +*obj* is the same as *self*, and *name* receives the field name. *args* is a list +of 3-part tuples containing search criteria for this field, although the search +function may be called separately for each tuple. + +Example +""""""" +Suppose we create a contract object which is : + +.. code-block:: python + + class hr_contract(osv.osv): + _name = 'hr.contract' + _description = 'Contract' + _columns = { + 'name' : fields.char('Contract Name', size=30, required=True), + 'employee_id' : fields.many2one('hr.employee', 'Employee', required=True), + 'function' : fields.many2one('res.partner.function', 'Function'), + } + hr_contract() + +If we want to add a field that retrieves the function of an employee by looking its current contract, we use a functional field. The object hr_employee is inherited this way: + +.. code-block:: python + + class hr_employee(osv.osv): + _name = "hr.employee" + _description = "Employee" + _inherit = "hr.employee" + _columns = { + 'contract_ids' : fields.one2many('hr.contract', 'employee_id', 'Contracts'), + 'function' : fields.function( + _get_cur_function_id, + type='many2one', + obj="res.partner.function", + method=True, + string='Contract Function'), + } + hr_employee() + +.. note:: three points + + * :guilabel:`type` ='many2one' is because the function field must create + a many2one field; function is declared as a many2one in hr_contract also. + * :guilabel:`obj` ="res.partner.function" is used to specify that the + object to use for the many2one field is res.partner.function. + * We called our method :guilabel:`_get_cur_function_id` because its role + is to return a dictionary whose keys are ids of employees, and whose + corresponding values are ids of the function of those employees. The + code of this method is: + +.. code-block:: python + + def _get_cur_function_id(self, cr, uid, ids, field_name, arg, context): + for i in ids: + #get the id of the current function of the employee of identifier "i" + sql_req= """ + SELECT f.id AS func_id + FROM hr_contract c + LEFT JOIN res_partner_function f ON (f.id = c.function) + WHERE + (c.employee_id = %d) + """ % (i,) + + cr.execute(sql_req) + sql_res = cr.dictfetchone() + + if sql_res: #The employee has one associated contract + res[i] = sql_res['func_id'] + else: + #res[i] must be set to False and not to None because of XML:RPC + # "cannot marshal None unless allow_none is enabled" + res[i] = False + return res + +The id of the function is retrieved using a SQL query. Note that if the query +returns no result, the value of sql_res['func_id'] will be None. We force the +False value in this case value because XML:RPC (communication between the server +and the client) doesn't allow to transmit this value. + +store Parameter +""""""""""""""" +It will calculate the field and store the result in the table. The field will be +recalculated when certain fields are changed on other objects. It uses the +following syntax: + +.. code-block:: python + + store = { + 'object_name': ( + function_name, + ['field_name1', 'field_name2'], + priority) + } + +It will call function function_name when any changes are written to fields in the +list ['field1','field2'] on object 'object_name'. The function should have the +following signature:: + + def function_name(self, cr, uid, ids, context=None): + +Where `ids` will be the ids of records in the other object's table that have +changed values in the watched fields. The function should return a list of ids +of records in its own table that should have the field recalculated. That list +will be sent as a parameter for the main function of the field. + +Here's an example from the membership module: + +.. code-block:: python + + 'membership_state': + fields.function( + _membership_state, + method=True, + string='Current membership state', + type='selection', + selection=STATE, + store={ + 'account.invoice': (_get_invoice_partner, ['state'], 10), + 'membership.membership_line': (_get_partner_id,['state'], 10), + 'res.partner': ( + lambda self, cr, uid, ids, c={}: ids, + ['free_member'], + 10) + }), + +Property Fields ++++++++++++++++ + +.. describe:: Declaring a property + +A property is a special field: fields.property. + +.. code-block:: python + + class res_partner(osv.osv): + _name = "res.partner" + _inherit = "res.partner" + _columns = { + 'property_product_pricelist': + fields.property( + 'product.pricelist', + type='many2one', + relation='product.pricelist', + string="Sale Pricelist", + method=True, + view_load=True, + group_name="Pricelists Properties"), + } + + +Then you have to create the default value in a .XML file for this property: + +.. code-block:: xml + + + property_product_pricelist + + + + +.. + +.. tip:: + + if the default value points to a resource from another module, you can use the ref function like this: + + + +**Putting properties in forms** + +To add properties in forms, just put the tag in your form. This will automatically add all properties fields that are related to this object. The system will add properties depending on your rights. (some people will be able to change a specific property, others won't). + +Properties are displayed by section, depending on the group_name attribute. (It is rendered in the client like a separator tag). + +**How does this work ?** + +The fields.property class inherits from fields.function and overrides the read and write method. The type of this field is many2one, so in the form a property is represented like a many2one function. + +But the value of a property is stored in the ir.property class/table as a complete record. The stored value is a field of type reference (not many2one) because each property may point to a different object. If you edit properties values (from the administration menu), these are represented like a field of type reference. + +When you read a property, the program gives you the property attached to the instance of object you are reading. If this object has no value, the system will give you the default property. + +The definition of a property is stored in the ir.model.fields class like any other fields. In the definition of the property, you can add groups that are allowed to change to property. + +**Using properties or normal fields** + +When you want to add a new feature, you will have to choose to implement it as a property or as normal field. Use a normal field when you inherit from an object and want to extend this object. Use a property when the new feature is not related to the object but to an external concept. + + +Here are a few tips to help you choose between a normal field or a property: + +Normal fields extend the object, adding more features or data. + +A property is a concept that is attached to an object and have special features: + +* Different value for the same property depending on the company +* Rights management per field +* It's a link between resources (many2one) + +**Example 1: Account Receivable** + +The default "Account Receivable" for a specific partner is implemented as a property because: + + * This is a concept related to the account chart and not to the partner, so it is an account property that is visible on a partner form. Rights have to be managed on this fields for accountants, these are not the same rights that are applied to partner objects. So you have specific rights just for this field of the partner form: only accountants may change the account receivable of a partner. + + * This is a multi-company field: the same partner may have different account receivable values depending on the company the user belongs to. In a multi-company system, there is one account chart per company. The account receivable of a partner depends on the company it placed the sale order. + + * The default account receivable is the same for all partners and is configured from the general property menu (in administration). + +.. note:: + One interesting thing is that properties avoid "spaghetti" code. The account module depends on the partner (base) module. But you can install the partner (base) module without the accounting module. If you add a field that points to an account in the partner object, both objects will depend on each other. It's much more difficult to maintain and code (for instance, try to remove a table when both tables are pointing to each others.) + +**Example 2: Product Times** + +The product expiry module implements all delays related to products: removal date, product usetime, ... This module is very useful for food industries. + +This module inherits from the product.product object and adds new fields to it: + +.. code-block:: python + + class product_product(osv.osv): + + _inherit = 'product.product' + _name = 'product.product' + _columns = { + + 'life_time': fields.integer('Product lifetime'), + 'use_time': fields.integer('Product usetime'), + 'removal_time': fields.integer('Product removal time'), + 'alert_time': fields.integer('Product alert time'), + } + + product_product() + +.. + +This module adds simple fields to the product.product object. We did not use properties because: + + * We extend a product, the life_time field is a concept related to a product, not to another object. + * We do not need a right management per field, the different delays are managed by the same people that manage all products. + + +ORM methods +----------- + +Keeping the context in ORM methods +++++++++++++++++++++++++++++++++++ + +In OpenObject, the context holds very important data such as the language in +which a document must be written, whether function field needs updating or not, +etc. + +When calling an ORM method, you will probably already have a context - for +example the framework will provide you with one as a parameter of almost +every method. +If you do have a context, it is very important that you always pass it through +to every single method you call. + +This rule also applies to writing ORM methods. You should expect to receive a +context as parameter, and always pass it through to every other method you call.. diff --git a/doc/03_module_dev_03.rst b/doc/03_module_dev_03.rst new file mode 100644 index 00000000000..975ebbb3064 --- /dev/null +++ b/doc/03_module_dev_03.rst @@ -0,0 +1,1428 @@ +Views and Events +================ + +Introduction to Views +--------------------- + +As all data of the program is stored in objects, as explained in the Objects section, how are these objects exposed to the user ? We will try to answer this question in this section. + +First of all, let's note that every resource type uses its own interface. For example, the screen to modify a partner's data is not the same as the one to modify an invoice. + +Then, you have to know that the OpenERP user interface is dynamic, it means that it is not described "statically" by some code, but dynamically built from XML descriptions of the client screens. + +From now on, we will call these screen descriptions views. + +A notable characteristic of these views is that they can be edited at any moment (even during the program execution). After a modification to a displayed view has occurred, you simply need to close the tab corresponding to that 'view' and re-open it for the changes to appear. + +Views principles +++++++++++++++++ + +Views describe how each object (type of resource) is displayed. More precisely, for each object, we can define one (or several) view(s) to describe which fields should be drawn and how. + +There are two types of views: + + #. form views + #. tree views + +.. note:: Since OpenERP 4.1, form views can also contain graphs. + + +Form views +---------- + +The field disposition in a form view always follows the same principle. Fields are distributed on the screen following the rules below: + + * By default, each field is preceded by a label, with its name. + * Fields are placed on the screen from left to right, and from top to bottom, according to the order in which they are declared in the view. + * Every screen is divided into 4 columns, each column being able to contain either a label, or an "edition" field. As every edition field is preceded (by default) by a label with its name, there will be two fields (and their respective labels) on each line of the screen. The green and red zones on the screen-shot below, illustrate those 4 columns. They designate respectively the labels and their corresponding fields. + +.. figure:: images/sale_order.png + :scale: 50 + :align: center + + +Views also support more advanced placement options: + + * A view field can use several columns. For example, on the screen-shot below, the zone in the blue frame is, in fact, the only field of a "one to many". We will come back later on this note, but let's note that it uses the whole width of the screen and not only one column. + + .. figure:: images/sale_order_sale_order_lines.png + :scale: 50 + :align: center + + * We can also make the opposite operation: take a columns group and divide it in as many columns as desired. The surrounded green zones of the screen above are good examples. Precisely, the green framework up and on the right side takes the place of two columns, but contains 4 columns. + +As we can see below in the purple zone of the screen, there is also a way to distribute the fields of an object on different tabs. + +.. figure:: images/sale_order_notebook.png + :scale: 50 + :align: center + + +Tree views +----------- + +These views are used when we work in list mode (in order to visualize several resources at once) and in the search screen. These views are simpler than the form views and thus have less options. + +.. figure:: images/tree_view.png + :scale: 50 + :align: center + +Graph views +-------------- + +A graph is a new mode of view for all views of type form. If, for example, a sale order line must be visible as list or as graph, define it like this in the action that open this sale order line. Do not set the view mode as "tree,form,graph" or "form,graph" - it must be "graph,tree" to show the graph first or "tree,graph" to show the list first. (This view mode is extra to your "form,tree" view and should have a separate menu item): + +.. code-block:: xml + + form + tree,graph + +view_type:: + + tree = (tree with shortcuts at the left), form = (switchable view form/list) + +view_mode:: + + tree,graph : sequences of the views when switching + +Then, the user will be able to switch from one view to the other. Unlike forms and trees, OpenERP is not able to automatically create a view on demand for the graph type. So, you must define a view for this graph: + + +.. code-block:: xml + + + sale.order.line.graph + sale.order.line + graph + + + + + + + + + +The graph view + +A view of type graph is just a list of fields for the graph. + +Graph tag +++++++++++ + +The default type of the graph is a pie chart - to change it to a barchart change **** to **** You also may change the orientation. + +:Example : + +.. code-block:: xml + + + +Field tag ++++++++++ + +The first field is the X axis. The second one is the Y axis and the optional third one is the Z axis for 3 dimensional graphs. You can apply a few attributes to each field/axis: + + * **group**: if set to true, the client will group all item of the same value for this field. For each other field, it will apply an operator + * **operator**: the operator to apply is another field is grouped. By default it's '+'. Allowed values are: + + + +: addition + + \*: multiply + + \**: exponent + + min: minimum of the list + + max: maximum of the list + +:Defining real statistics on objects: + +The easiest method to compute real statistics on objects is: + + 1. Define a statistic object which is a postgresql view + 2. Create a tree view and a graph view on this object + +You can get en example in all modules of the form: report\_.... Example: report_crm. + + +Search views +-------------- + +Search views are a new feature of OpenERP supported as of version 6.0 +It creates a customized search panel, and is declared quite similarly to a form view, +except that the view type and root element change to ``search`` instead of ``form``. + +.. image:: images/search.png + :scale: 50 + :align: center + +Following is the list of new elements and features supported in search views. + +Group tag ++++++++++ + +Unlike form group elements, search view groups support unlimited number of widget(fields or filters) +in a row (no automatic line wrapping), and only use the following attributes: + + + ``expand``: turns on the expander icon on the group (1 for expanded by default, 0 for collapsed) + + ``string``: label for the group + +.. code-block:: xml + + + + + + + + +In the screenshot above the green area is an expandable group. + +Filter tag ++++++++++++ +Filters are displayed as a toggle button on search panel +Filter elements can add new values in the current domain or context of the search view. +Filters can be added as a child element of field too, to indicate that they apply specifically +to that field (in this case the button's icon will smaller) + +In the picture above the red area contains filters at the top of the form while +the blue area highlights a field and it's child filter. + +.. code-block:: xml + + + + + + +Group By +++++++++ + +.. code-block:: xml + + + +Above filters groups records sharing the same ``project_id`` value. Groups are loaded +lazily, so the inner records are only loaded when the group is expanded. +The group header lines contain the common values for all records in that group, and all numeric +fields currently displayed in the view are replaced by the sum of the values in that group. + +It is also possible to group on multiple values by specifying a list of fields instead of a single string. +In this case nested groups will be displayed:: + + + +Fields +++++++ + +Field elements in search views are used to get user-provided values +for searches. As a result, as for group elements, they are quite +different than form view's fields: + +* a search field can contain filters, which generally indicate that + both field and filter manage the same field and are related. + + Those inner filters are rendered as smaller buttons, right next to + the field, and *must not* have a ``string`` attribute. + +* a search field really builds a domain composed of ``[(field_name, + operator, field_value)]``. This domain can be overridden in two + ways: + + * ``@operator`` replaces the default operator for the field (which + depends on its type) + + * ``@filter_domain`` lets you provide a fully custom domain, which + will replace the default domain creation + +* a search field does not create a context by default, but you can + provide an ``@context`` which will be evaluated and merged into the + wider context (as with a ``filter`` element). + +To get the value of the field in your ``@context`` or +``@filter_domain``, you can use the variable ``self``: + +.. code-block:: xml + + + +or + +.. code-block:: xml + + + +Range fields (date, datetime, time) +""""""""""""""""""""""""""""""""""" + +The range fields are composed of two input widgets (from and two) +instead of just one. + +This leads to peculiarities (compared to non-range search fields): + +* It is not possible to override the operator of a range field via + ``@operator``, as the domain is built of two sections and each + section uses a different operator. + +* Instead of being a simple value (integer, string, float) ``self`` + for use in ``@filter_domain`` and ``@context`` is a ``dict``. + + Because each input widget of a range field can be empty (and the + field itself will still be valid), care must be taken when using + ``self``: it has two string keys ``"from"`` and ``"to"``, but any of + these keys can be either missing entirely or set to the value + ``False``. + +Actions for Search view ++++++++++++++++++++++++ + +After declaring a search view, it will be used automatically for all tree views on the same model. +If several search views exist for a single model, the one with the highest priority (lowest sequence) will +be used. Another option is to explicitly select the search view you want to use, by setting the +``search_view_id`` field of the action. + +In addition to being able to pass default form values in the context of the action, OpenERP 6.0 now +supports passing initial values for search views too, via the context. The context keys need to match the +``search_default_XXX`` format. ``XXX`` may refer to the ``name`` of a ```` or ```` +in the search view (as the ``name`` attribute is not required on filters, this only works for filters that have +an explicit ``name`` set). The value should be either the initial value for search fields, or +simply a boolean value for filters, to toggle them + +.. code-block:: xml + + + Tasks + project.task + form + tree,form,calendar,gantt,graph + + + {"search_default_current":1,"search_default_user_id":uid} + + + +Custom Filters +++++++++++++++ + +As of v6.0, all search views also features custom search filters, as show below. +Users can define their own custom filters using any of the fields available on the current model, +combining them with AND/OR operators. It is also possible to save any search context (the combination +of all currently applied domain and context values) as a personal filter, which can be recalled +at any time. Filters can also be turned into Shortcuts directly available in the User's homepage. + +.. image:: images/filter.png + :scale: 50 + :align: center + + +In above screenshot we filter Partner where Salesman = Demo user and Country = Belgium, +We can save this search criteria as a Shortcut or save as Filter. + +Filters are user specific and can be modified via the Manage Filters option in the filters drop-down. + + +Calendar Views +-------------- + +Calendar view provides timeline/schedule view for the data. + +View Specification +++++++++++++++++++ + +Here is an example view: + +.. code-block:: xml + + + + + + +Here is the list of supported attributes for ``calendar`` tag: + + ``string`` + The title string for the view. + + ``date_start`` + A ``datetime`` field to specify the starting date for the calendar item. This + attribute is required. + + ``date_stop`` + A ``datetime`` field to specify the end date. Ignored if ``date_delay`` + attribute is specified. + + ``date_delay`` + A ``numeric`` field to specify time in hours for a record. This attribute + will get preference over ``date_stop`` and ``date_stop`` will be ignored. + + ``day_length`` + An ``integer`` value to specify working day length. Default is ``8`` hours. + + ``color`` + A field, generally ``many2one``, to colorize calendar/gantt items. + + ``mode`` + A string value to set default view/zoom mode. For ``calendar`` view, this can be + one of following (default is ``month``): + + * ``day`` + * ``week`` + * ``month`` + +Screenshots ++++++++++++ + +Month Calendar: + +.. figure:: images/calendar_month.png + :scale: 50% + :align: center + +Week Calendar: + +.. figure:: images/calendar_week.png + :scale: 50% + :align: center + + +Gantt Views +----------- + +Gantt view provides timeline view for the data. Generally, it can be used to display +project tasks and resource allocation. + +A Gantt chart is a graphical display of all the tasks that a project is composed of. +Each bar on the chart is a graphical representation of the length of time the task is +planned to take. + +A resource allocation summary bar is shown on top of all the grouped tasks, +representing how effectively the resources are allocated among the tasks. + +Color coding of the summary bar is as follows: + + * `Gray` shows that the resource is not allocated to any task at that time + * `Blue` shows that the resource is fully allocated at that time. + * `Red` shows that the resource is overallocated + +View Specification +++++++++++++++++++ + +Here is an example view: + +.. code-block:: xml + + + + + + + +The ``attributes`` accepted by the ``gantt`` tag are similar to ``calendar`` view tag. The +``level`` tag is used to group the records by some ``many2one`` field. Currently, only +one level is supported. + +Here is the list of supported attributes for ``gantt`` tag: + + ``string`` + The title string for the view. + + ``date_start`` + A ``datetime`` field to specify the starting date for the gantt item. This + attribute is required. + + ``date_stop`` + A ``datetime`` field to specify the end date. Ignored if ``date_delay`` + attribute is specified. + + ``date_delay`` + A ``numeric`` field to specify time in hours for a record. This attribute + will get preference over ``date_stop`` and ``date_stop`` will be ignored. + + ``day_length`` + An ``integer`` value to specify working day length. Default is ``8`` hours. + + ``color`` + A field, generally ``many2one``, to colorize calendar/gantt items. + + ``mode`` + A string value to set default view/zoom mode. For ``gantt`` view, this can be + one of following (default is ``month``): + + * ``day`` + * ``3days`` + * ``week`` + * ``3weeks`` + * ``month`` + * ``3months`` + * ``year`` + * ``3years`` + * ``5years`` + +The ``level`` tag supports following attributes: + + ``object`` + An openerp object having many2one relationship with view object. + + ``link`` + The field name in current object that links to the given ``object``. + + ``domain`` + The domain to be used to filter the given ``object`` records. + +Drag and Drop ++++++++++++++ + +The left side pane displays list of the tasks grouped by the given ``level`` field. +You can reorder or change the group of any records by dragging them. + +The main content pane displays horizontal bars plotted on a timeline grid. A group +of bars are summarized with a top summary bar displaying resource allocation of all +the underlying tasks. + +You can change the task start time by dragging the tasks horizontally. While +end time can be changed by dragging right end of a bar. + +.. note:: + + The time is calculated considering ``day_length`` so a bar will span more + then one day if total time for a task is greater then ``day_length`` value. + +Screenshots ++++++++++++ + +.. figure:: images/gantt.png + :scale: 50% + :align: center + + +Design Elements +--------------- + +The files describing the views are of the form: + +:Example: + +.. code-block:: xml + + + + + [view definitions] + + + +The view definitions contain mainly three types of tags: + + * **** tags with the attribute model="ir.ui.view", which contain the view definitions themselves + * **** tags with the attribute model="ir.actions.act_window", which link actions to these views + * **** tags, which create entries in the menu, and link them with actions + +New : You can specify groups for whom the menu is accessible using the groups +attribute in the `menuitem` tag. + +New : You can now add shortcut using the `shortcut` tag. + +:Example: + +.. code-block:: xml + + + +Note that you should add an id attribute on the `menuitem` which is referred by +menu attribute. + +.. code-block:: xml + + + sale.order.form + sale.order + + +
+ ......... +
+ + + +Default value for the priority field : 16. When not specified the system will use the view with the lower priority. + +View Types +++++++++++ + +Tree View +""""""""" +You can specify the columns to include in the list, along with some details of +the list's appearance. The search fields aren't specified here, they're +specified by the `select` attribute in the form view fields. + +.. code-block:: xml + + + stock.location.tree + stock.location + tree + + + + + + + + + + + + +That example is just a flat list, but you can also display a real tree structure +by specifying a `field_parent`. The name is a bit misleading, though; the field +you specify must contain a list of all **child** entries. + +.. code-block:: xml + + + stock.location.tree + stock.location + tree + child_ids + + + + + + + + +On the `tree` element, the following attributes are supported: + +colors + Conditions for applying different colors to items in the list. The default + is black. +toolbar + Set this to 1 if you want a tree structure to list the top level entries + in a separate toolbar area. When you click on an entry in the toolbar, all + its descendants will be displayed in the main tree. The value is ignored + for flat lists. + +Grouping Elements ++++++++++++++++++ + +Separator +""""""""" + +Adds a separator line + +:Example: + +.. code-block:: xml + + + +The string attribute defines its label and the colspan attribute defines his horizontal size (in number of columns). + +Notebook +"""""""" + +: With notebooks you can distribute the view fields on different tabs (each one defined by a page tag). You can use the tabpos properties to set tab at: up, down, left, right. + +:Example: + +.. code-block:: xml + + .... + +Group +""""" + +: groups several columns and split the group in as many columns as desired. + + * **colspan**: the number of columns to use + * **rowspan**: the number of rows to use + * **expand**: if we should expand the group or not + * **col**: the number of columns to provide (to its children) + * **string**: (optional) If set, a frame will be drawn around the group of fields, with a label containing the string. Otherwise, the frame will be invisible. + +:Example: + +.. code-block:: xml + + + +
+ +
From 4a8e00cac7ba39a99f2a4fac9cdd4a4f171370ed Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Mon, 25 Jun 2012 12:21:09 +0530 Subject: [PATCH 022/841] [FIX]base:fix the issue convert to quote is not working via Scheduled Calls lp bug: https://launchpad.net/bugs/1017353 fixed bzr revid: mma@tinyerp.com-20120625065109-5ciy82syodgtbcg9 --- addons/sale_crm/wizard/crm_make_sale.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py index 9484b87652e..fd84e33610f 100644 --- a/addons/sale_crm/wizard/crm_make_sale.py +++ b/addons/sale_crm/wizard/crm_make_sale.py @@ -64,7 +64,9 @@ class crm_make_sale(osv.osv_memory): """ if context is None: context = {} - + # update context: if come from phonecall, default state values can make the quote crash lp:1017353 + context.pop('default_state', False) + case_obj = self.pool.get('crm.lead') sale_obj = self.pool.get('sale.order') partner_obj = self.pool.get('res.partner') From eab2e225a223d0919ee4dde65f4dfe7e269fa01c Mon Sep 17 00:00:00 2001 From: "Nimesh (Open ERP)" Date: Fri, 6 Jul 2012 14:46:08 +0530 Subject: [PATCH 023/841] [FIX]: add date validation. bzr revid: nco@tinyerp.com-20120706091608-f5o08ke6z84oilui --- addons/membership/membership.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/membership/membership.py b/addons/membership/membership.py index dc4eadbada9..f7007ac28e7 100644 --- a/addons/membership/membership.py +++ b/addons/membership/membership.py @@ -478,7 +478,14 @@ class Product(osv.osv): 'membership_date_from': fields.date('Date from', help='Date from which membership becomes active.'), 'membership_date_to': fields.date('Date to', help='Date until which membership remains active.'), } - + def _check_end_date(self, cr, uid, ids, context=None): + for membership in self.browse(cr, uid, ids, context=context): + if membership.membership_date_to < membership.membership_date_from: + return False + return True + _constraints = [ + (_check_end_date, 'Error ! Ending Date cannot be set before Beginning Date.', ['membership_date_to']), + ] _defaults = { 'membership': False, } From e46502580a5c9e19c31e15dd308e99307bbb68ed Mon Sep 17 00:00:00 2001 From: "Bharat Devnani (OpenERP)" Date: Wed, 25 Jul 2012 16:43:27 +0530 Subject: [PATCH 024/841] [IMP] changed the condition in def create_move of account_asset/account_asset.py bzr revid: bde@tinyerp.com-20120725111327-rd1se9de0yoj8wgg --- addons/account_asset/account_asset.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 8cd73c60aa7..fe0ee8b3922 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -366,8 +366,6 @@ class account_asset_depreciation_line(osv.osv): currency_obj = self.pool.get('res.currency') created_move_ids = [] for line in self.browse(cr, uid, ids, context=context): - if currency_obj.is_zero(cr, uid, line.asset_id.currency_id, line.remaining_value): - can_close = True depreciation_date = line.asset_id.prorata and line.asset_id.purchase_date or time.strftime('%Y-%m-%d') period_ids = period_obj.find(cr, uid, depreciation_date, context=context) company_currency = line.asset_id.company_id.currency_id.id @@ -419,6 +417,8 @@ class account_asset_depreciation_line(osv.osv): }) self.write(cr, uid, line.id, {'move_id': move_id}, context=context) created_move_ids.append(move_id) + if currency_obj.is_zero(cr, uid, line.asset_id.currency_id, line.asset_id.value_residual): + can_close = True if can_close: asset_obj.write(cr, uid, [line.asset_id.id], {'state': 'close'}, context=context) return created_move_ids From b54a4164ce20782bab62523f262e6b7d0895af34 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Tue, 18 Sep 2012 18:51:41 +0200 Subject: [PATCH 025/841] [ADD]Project initialization bzr revid: dle@openerp.com-20120918165141-15gqir34wwa2lein --- addons/hr_fleet_management/__init.py__ | 1 + addons/hr_fleet_management/__openerp__.py | 17 +++++++++++++++++ .../hr_fleet_management/hr_fleet_management.py | 10 ++++++++++ .../view/hr_fleet_management_view.xml | 14 ++++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 addons/hr_fleet_management/__init.py__ create mode 100644 addons/hr_fleet_management/__openerp__.py create mode 100644 addons/hr_fleet_management/hr_fleet_management.py create mode 100644 addons/hr_fleet_management/view/hr_fleet_management_view.xml diff --git a/addons/hr_fleet_management/__init.py__ b/addons/hr_fleet_management/__init.py__ new file mode 100644 index 00000000000..4fe53db08ca --- /dev/null +++ b/addons/hr_fleet_management/__init.py__ @@ -0,0 +1 @@ +import hr_fleet_management diff --git a/addons/hr_fleet_management/__openerp__.py b/addons/hr_fleet_management/__openerp__.py new file mode 100644 index 00000000000..c701d545707 --- /dev/null +++ b/addons/hr_fleet_management/__openerp__.py @@ -0,0 +1,17 @@ +{ + "name": "Fleet Management", + "version": "0.1", + "depends": ["base"], + "author": "Denis Ledoux", + "category": "Test", + "description": """ + Fleet management module for managing company vehicles: + - managing cars + - managing cars insurance + - remind insurance renewing + """, + 'data': [’hr_fleet_management_view.xml’], + 'demo': [], + 'installable': True, + 'auto_install': False, +} diff --git a/addons/hr_fleet_management/hr_fleet_management.py b/addons/hr_fleet_management/hr_fleet_management.py new file mode 100644 index 00000000000..fb6cda1da39 --- /dev/null +++ b/addons/hr_fleet_management/hr_fleet_management.py @@ -0,0 +1,10 @@ +from osv import osv, fields + +class Car (osv.Model): + + _name = ’hr_fleet_management.car’ + + _columns = { + ’name’ : fields.char(’Car name’, 128, required = True), + ’description’ : fields.text(’Description’), + } diff --git a/addons/hr_fleet_management/view/hr_fleet_management_view.xml b/addons/hr_fleet_management/view/hr_fleet_management_view.xml new file mode 100644 index 00000000000..95eb0c046ff --- /dev/null +++ b/addons/hr_fleet_management/view/hr_fleet_management_view.xml @@ -0,0 +1,14 @@ + + + + + + + Cars + car_fleet_management.car + form + tree,form + + + + From 6821ec7b869b9e96f6e1865fb616bca7f4f85989 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Wed, 19 Sep 2012 10:02:42 +0200 Subject: [PATCH 026/841] [FIX]Syntax Errors bzr revid: dle@openerp.com-20120919080242-cdwzf8n2r5z6r47j --- addons/hr_fleet_management/__openerp__.py | 14 +++++++------- .../view/hr_fleet_management_view.xml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/hr_fleet_management/__openerp__.py b/addons/hr_fleet_management/__openerp__.py index c701d545707..9e35814f5d4 100644 --- a/addons/hr_fleet_management/__openerp__.py +++ b/addons/hr_fleet_management/__openerp__.py @@ -1,16 +1,16 @@ { - "name": "Fleet Management", - "version": "0.1", - "depends": ["base"], - "author": "Denis Ledoux", - "category": "Test", - "description": """ + 'name': 'Fleet Management', + 'version': '0.1', + 'depends': ['base'], + 'author': 'OpenERP SA', + 'category': 'Test', + 'description': """ Fleet management module for managing company vehicles: - managing cars - managing cars insurance - remind insurance renewing """, - 'data': [’hr_fleet_management_view.xml’], + 'data': ['hr_fleet_management_view.xml'], 'demo': [], 'installable': True, 'auto_install': False, diff --git a/addons/hr_fleet_management/view/hr_fleet_management_view.xml b/addons/hr_fleet_management/view/hr_fleet_management_view.xml index 95eb0c046ff..963c339a1bb 100644 --- a/addons/hr_fleet_management/view/hr_fleet_management_view.xml +++ b/addons/hr_fleet_management/view/hr_fleet_management_view.xml @@ -9,6 +9,6 @@ form tree,form - + From e12222d2afa4acfb18a81c2a20a5125e5b0015f3 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Wed, 19 Sep 2012 11:02:51 +0200 Subject: [PATCH 027/841] [FIX]init.py name issue bzr revid: dle@openerp.com-20120919090251-1yr44930z25nfh5j --- addons/hr_fleet_management/{__init.py__ => __init__.py} | 0 addons/hr_fleet_management/__openerp__.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename addons/hr_fleet_management/{__init.py__ => __init__.py} (100%) diff --git a/addons/hr_fleet_management/__init.py__ b/addons/hr_fleet_management/__init__.py similarity index 100% rename from addons/hr_fleet_management/__init.py__ rename to addons/hr_fleet_management/__init__.py diff --git a/addons/hr_fleet_management/__openerp__.py b/addons/hr_fleet_management/__openerp__.py index 9e35814f5d4..a38e815e364 100644 --- a/addons/hr_fleet_management/__openerp__.py +++ b/addons/hr_fleet_management/__openerp__.py @@ -1,7 +1,7 @@ { 'name': 'Fleet Management', 'version': '0.1', - 'depends': ['base'], + 'depends': ['base','hr'], 'author': 'OpenERP SA', 'category': 'Test', 'description': """ From b659893dbcd707078b98754a94b412e10b3eb2d1 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Wed, 19 Sep 2012 11:26:30 +0200 Subject: [PATCH 028/841] [FIX]Encodage declared bzr revid: dle@openerp.com-20120919092630-jistvpazjete84fm --- addons/hr_fleet_management/__openerp__.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/addons/hr_fleet_management/__openerp__.py b/addons/hr_fleet_management/__openerp__.py index a38e815e364..1a3acb9b742 100644 --- a/addons/hr_fleet_management/__openerp__.py +++ b/addons/hr_fleet_management/__openerp__.py @@ -1,3 +1,24 @@ +# -*- 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 . +# +############################################################################## + { 'name': 'Fleet Management', 'version': '0.1', From acc87133f4a78686694dbe4344d8a5b1fe9fb595 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Wed, 19 Sep 2012 13:22:55 +0200 Subject: [PATCH 029/841] [FIX]XML Syntax Error bzr revid: dle@openerp.com-20120919112255-uyel7xe66ghj294k --- addons/hr_fleet_management/__init__.py | 2 ++ addons/hr_fleet_management/__openerp__.py | 2 +- .../hr_fleet_management.py | 18 ++++++++--- .../view/hr_fleet_management_view.xml | 32 +++++++++++++++---- 4 files changed, 43 insertions(+), 11 deletions(-) diff --git a/addons/hr_fleet_management/__init__.py b/addons/hr_fleet_management/__init__.py index 4fe53db08ca..4da53d5adab 100644 --- a/addons/hr_fleet_management/__init__.py +++ b/addons/hr_fleet_management/__init__.py @@ -1 +1,3 @@ +# -*- coding: utf-8 -*- + import hr_fleet_management diff --git a/addons/hr_fleet_management/__openerp__.py b/addons/hr_fleet_management/__openerp__.py index 1a3acb9b742..7823e967699 100644 --- a/addons/hr_fleet_management/__openerp__.py +++ b/addons/hr_fleet_management/__openerp__.py @@ -31,7 +31,7 @@ - managing cars insurance - remind insurance renewing """, - 'data': ['hr_fleet_management_view.xml'], + 'data': ['view/hr_fleet_management_view.xml'], 'demo': [], 'installable': True, 'auto_install': False, diff --git a/addons/hr_fleet_management/hr_fleet_management.py b/addons/hr_fleet_management/hr_fleet_management.py index fb6cda1da39..46efcdfd46e 100644 --- a/addons/hr_fleet_management/hr_fleet_management.py +++ b/addons/hr_fleet_management/hr_fleet_management.py @@ -1,10 +1,20 @@ +# -*- coding: utf-8 -*- from osv import osv, fields -class Car (osv.Model): +class fleet_vehicle_model (osv.Model): - _name = ’hr_fleet_management.car’ + _name = 'fleet.vehicle.model' + _description = '...' _columns = { - ’name’ : fields.char(’Car name’, 128, required = True), - ’description’ : fields.text(’Description’), + 'name' : fields.char('Car name', 128, required = True), + } + +class fleet_vehicle(osv.Model): + _name = 'fleet.vehicle' + _description = 'Fleet Vehicle' + + _columns = { + 'name' : fields.char('Name', size=32, required=True), + 'model_id' : fields.many2one('fleet.vehicle.model','Model', required=True), } diff --git a/addons/hr_fleet_management/view/hr_fleet_management_view.xml b/addons/hr_fleet_management/view/hr_fleet_management_view.xml index 963c339a1bb..9deb8786382 100644 --- a/addons/hr_fleet_management/view/hr_fleet_management_view.xml +++ b/addons/hr_fleet_management/view/hr_fleet_management_view.xml @@ -1,14 +1,34 @@ - - - - Cars - car_fleet_management.car + + + fleet.vehicle.model.form + fleet.vehicle.model + +
+ + +
+ + + + fleet.vehicle.model.tree + fleet.vehicle.model + + + + + + + + Vehicle Model + fleet.vehicle.model form tree,form - + + + From 3637d57127dd4cbdefd3f11d86d742f8a5c8fecb Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Wed, 19 Sep 2012 18:13:27 +0200 Subject: [PATCH 030/841] [ADD]Stephane classes and views bzr revid: dle@openerp.com-20120919161327-u72nqktzmowzdjg9 --- addons/hr_car/__init__.py | 2 + addons/hr_car/__openerp__.py | 18 ++++ addons/hr_car/hr_car.py | 76 +++++++++++++++++ addons/hr_car/hr_car_view.xml | 154 ++++++++++++++++++++++++++++++++++ 4 files changed, 250 insertions(+) create mode 100644 addons/hr_car/__init__.py create mode 100644 addons/hr_car/__openerp__.py create mode 100644 addons/hr_car/hr_car.py create mode 100644 addons/hr_car/hr_car_view.xml diff --git a/addons/hr_car/__init__.py b/addons/hr_car/__init__.py new file mode 100644 index 00000000000..ec344119076 --- /dev/null +++ b/addons/hr_car/__init__.py @@ -0,0 +1,2 @@ +# import the hr_car code +import hr_car \ No newline at end of file diff --git a/addons/hr_car/__openerp__.py b/addons/hr_car/__openerp__.py new file mode 100644 index 00000000000..f24d0efc758 --- /dev/null +++ b/addons/hr_car/__openerp__.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +{ + 'name' : 'Car Management', + 'version' : '0.1', + 'depends' : [ + 'base', + 'hr', + ], + 'author' : 'OpenERP S.A.', + 'description' : """ + I'm a good module and I will handle the cars of your company ! + """, + 'installable' : True, + 'application' : True, + 'data' : [ + 'hr_car_view.xml', + ] +} \ No newline at end of file diff --git a/addons/hr_car/hr_car.py b/addons/hr_car/hr_car.py new file mode 100644 index 00000000000..74dcb123af1 --- /dev/null +++ b/addons/hr_car/hr_car.py @@ -0,0 +1,76 @@ +from osv import osv, fields + +class fleet_vehicle_model(osv.Model): + _name = 'fleet.vehicle.model' + _description = '...' + + _columns = { + 'name' : fields.char('Name', size=32, required=True), + } + +class fleet_vehicle(osv.Model): + _name = 'fleet.vehicle' + _description = 'Fleet Vehicle' + + _columns = { + 'name' : fields.char('Name', size=32, required=True), + 'model_id' : fields.many2one('fleet.vehicle.model', 'Model', required=True), + 'log_ids' : fields.one2many('fleet.vehicle.log', 'vehicle_id', 'Logs'), + + 'next_repair_km' : fields.integer('Next Repair Km'), + 'message' : fields.char('Message', size=128, readonly=True), + } + + def on_change_model(self, cr, uid, ids, model_id, context=None): + # print "ids: %r" % (ids,) + # print "model_id: %r" % (model_id,) + # print "context: %r" % (context,) + # import logging + # logger = logging.getLogger('fleet.vehicle') + # logger.info('Hello') + + # import ipdb + # ipdb.set_trace() + + if not model_id: + return {} + + model = self.pool.get('fleet.vehicle.model').browse(cr, uid, model_id, context=context) + + print "model: %r" % (model.name,) + + return { + 'value' : { + 'message' : "You have selected this %s model" % (model.name,), + } + } + +class fleet_vehicle_log_type(osv.Model): + _name = 'fleet.vehicle.log.type' + + _columns = { + 'name' : fields.char('Name', size=32, required=True), + } + +class fleet_vehicle_log(osv.Model): + _name = 'fleet.vehicle.log' + + _columns = { + 'employee_id' : fields.many2one('hr.employee', 'Employee', required=True), + 'vehicle_id' : fields.many2one('fleet.vehicle', 'Vehicle', required=True), + + 'create_date' : fields.datetime('Creation Date', readonly=True), + + 'description' : fields.text('Description'), + 'type' : fields.many2one('fleet.vehicle.log.type', 'Type', required=True), + + + } + +class hr_employee(osv.Model): + _inherit = 'hr.employee' + + _columns = { + 'vehicle_id' : fields.many2one('fleet.vehicle', 'Vehicle', required=True), + 'log_ids' : fields.one2many('fleet.vehicle.log', 'employee_id', 'Logs'), + } \ No newline at end of file diff --git a/addons/hr_car/hr_car_view.xml b/addons/hr_car/hr_car_view.xml new file mode 100644 index 00000000000..eff345d7b90 --- /dev/null +++ b/addons/hr_car/hr_car_view.xml @@ -0,0 +1,154 @@ + + + + + fleet.vehicle.model.form + fleet.vehicle.model + +
+ + +
+ + + fleet.vehicle.model.tree + fleet.vehicle.model + + + + + + + + + Vehicle Model + fleet.vehicle.model + form + tree,form + + + + + + + + fleet.vehicle.form + fleet.vehicle + +
+ + + + + + + + + + + + + + + + + + + + + + +
+ + + + + fleet.vehicle.tree + fleet.vehicle + + + + + + + + + + Vehicles + fleet.vehicle + form + tree,form + + + + + + + fleet.vehicle.log.form + fleet.vehicle.log + +
+ + + + + + + + + +
+ + + + + fleet.vehicle.log.tree + fleet.vehicle.log + + + + + + + + + + + + + Vehicle Logs + fleet.vehicle.log + form + tree,form + + + + + + + fleet.hr.employee.form + hr.employee + form + + + + + + + + + + + + + + + From a3c51b5e7ca72b00271c988f14d5d854f4ae0fdf Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Thu, 20 Sep 2012 10:26:38 +0200 Subject: [PATCH 031/841] [ADD][REM]Renaming of the folder module bzr revid: dle@openerp.com-20120920082638-3kfu4qt1ebh5ccub --- addons/{hr_car => fleet}/__init__.py | 0 addons/{hr_car => fleet}/__openerp__.py | 0 addons/{hr_car => fleet}/hr_car.py | 0 addons/{hr_car => fleet}/hr_car_view.xml | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename addons/{hr_car => fleet}/__init__.py (100%) rename addons/{hr_car => fleet}/__openerp__.py (100%) rename addons/{hr_car => fleet}/hr_car.py (100%) rename addons/{hr_car => fleet}/hr_car_view.xml (100%) diff --git a/addons/hr_car/__init__.py b/addons/fleet/__init__.py similarity index 100% rename from addons/hr_car/__init__.py rename to addons/fleet/__init__.py diff --git a/addons/hr_car/__openerp__.py b/addons/fleet/__openerp__.py similarity index 100% rename from addons/hr_car/__openerp__.py rename to addons/fleet/__openerp__.py diff --git a/addons/hr_car/hr_car.py b/addons/fleet/hr_car.py similarity index 100% rename from addons/hr_car/hr_car.py rename to addons/fleet/hr_car.py diff --git a/addons/hr_car/hr_car_view.xml b/addons/fleet/hr_car_view.xml similarity index 100% rename from addons/hr_car/hr_car_view.xml rename to addons/fleet/hr_car_view.xml From a491f75c5c2ab7d74095b51b3a9fb94a72886048 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 20 Sep 2012 11:08:46 +0200 Subject: [PATCH 032/841] rename files to match module name bzr revid: csn@openerp.com-20120920090846-obht1omarbvlt38o --- addons/fleet/__init__.py | 2 +- addons/fleet/__openerp__.py | 2 +- addons/fleet/{hr_car.py => fleet.py} | 0 addons/fleet/{hr_car_view.xml => fleet_view.xml} | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename addons/fleet/{hr_car.py => fleet.py} (100%) rename addons/fleet/{hr_car_view.xml => fleet_view.xml} (100%) diff --git a/addons/fleet/__init__.py b/addons/fleet/__init__.py index ec344119076..a09fca549ce 100644 --- a/addons/fleet/__init__.py +++ b/addons/fleet/__init__.py @@ -1,2 +1,2 @@ # import the hr_car code -import hr_car \ No newline at end of file +import fleet \ No newline at end of file diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py index f24d0efc758..4c144090af0 100644 --- a/addons/fleet/__openerp__.py +++ b/addons/fleet/__openerp__.py @@ -13,6 +13,6 @@ 'installable' : True, 'application' : True, 'data' : [ - 'hr_car_view.xml', + 'fleet_view.xml', ] } \ No newline at end of file diff --git a/addons/fleet/hr_car.py b/addons/fleet/fleet.py similarity index 100% rename from addons/fleet/hr_car.py rename to addons/fleet/fleet.py diff --git a/addons/fleet/hr_car_view.xml b/addons/fleet/fleet_view.xml similarity index 100% rename from addons/fleet/hr_car_view.xml rename to addons/fleet/fleet_view.xml From 2019d656e982cd28f7a60a4cbbcd74df0317500e Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 20 Sep 2012 13:52:04 +0200 Subject: [PATCH 033/841] add a submodel field to vehicule model bzr revid: csn@openerp.com-20120920115204-6ip6c3gvh84o6b14 --- addons/fleet/fleet.py | 1 + addons/fleet/fleet_view.xml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 74dcb123af1..e807bb82998 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -6,6 +6,7 @@ class fleet_vehicle_model(osv.Model): _columns = { 'name' : fields.char('Name', size=32, required=True), + 'submodel' : fields.char('Submodel',size=32,required=True), } class fleet_vehicle(osv.Model): diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index eff345d7b90..cc41662459c 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -7,6 +7,7 @@
+ @@ -16,6 +17,7 @@ + From 460bed1f3a47d311b4d24f22c7591760ece8fb2b Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Thu, 20 Sep 2012 13:57:55 +0200 Subject: [PATCH 034/841] [ADD]Fields bzr revid: dle@openerp.com-20120920115755-l2ta12vdttcfu71t --- addons/fleet/fleet.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index e807bb82998..40ac85b501a 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -5,6 +5,8 @@ class fleet_vehicle_model(osv.Model): _description = '...' _columns = { + 'type' : fields.char('Type', size=32, required=True), + 'brand' : fields.char('Brand', size=32, required=True), 'name' : fields.char('Name', size=32, required=True), 'submodel' : fields.char('Submodel',size=32,required=True), } @@ -14,7 +16,8 @@ class fleet_vehicle(osv.Model): _description = 'Fleet Vehicle' _columns = { - 'name' : fields.char('Name', size=32, required=True), + 'registration' : fields.char('registration', size=32, required=True), + 'driver' : fields.many2one('fleet.vehicle', 'employee_id', required=False), 'model_id' : fields.many2one('fleet.vehicle.model', 'Model', required=True), 'log_ids' : fields.one2many('fleet.vehicle.log', 'vehicle_id', 'Logs'), From 3fabc8ef5a777036c1074ad35d506925a9da24b8 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Thu, 20 Sep 2012 14:16:36 +0200 Subject: [PATCH 035/841] [ADD]Add vendor field in vehicle model bzr revid: dle@openerp.com-20120920121636-dhz39kuvtiw9rxuo --- addons/fleet/fleet.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 40ac85b501a..439a938d2a9 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -8,7 +8,8 @@ class fleet_vehicle_model(osv.Model): 'type' : fields.char('Type', size=32, required=True), 'brand' : fields.char('Brand', size=32, required=True), 'name' : fields.char('Name', size=32, required=True), - 'submodel' : fields.char('Submodel',size=32,required=True), + 'make' : fields.char('Make',size=32,required=True), + 'vendors': fields.many2many('fleet.vehicle.model','fleet.vehicle.model.vendors','partner_id','Vendors'); } class fleet_vehicle(osv.Model): @@ -16,7 +17,7 @@ class fleet_vehicle(osv.Model): _description = 'Fleet Vehicle' _columns = { - 'registration' : fields.char('registration', size=32, required=True), + 'registration' : fields.char('Registration', size=32, required=True), 'driver' : fields.many2one('fleet.vehicle', 'employee_id', required=False), 'model_id' : fields.many2one('fleet.vehicle.model', 'Model', required=True), 'log_ids' : fields.one2many('fleet.vehicle.log', 'vehicle_id', 'Logs'), From 2f35d71a26391c0596c3831e4188b58f852e5ceb Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Thu, 20 Sep 2012 14:24:35 +0200 Subject: [PATCH 036/841] [FIX]Rename errors bzr revid: dle@openerp.com-20120920122435-jwweq52c8f82eo9d --- addons/fleet/fleet.py | 2 +- addons/fleet/fleet_view.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 439a938d2a9..d003adb3447 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -9,7 +9,7 @@ class fleet_vehicle_model(osv.Model): 'brand' : fields.char('Brand', size=32, required=True), 'name' : fields.char('Name', size=32, required=True), 'make' : fields.char('Make',size=32,required=True), - 'vendors': fields.many2many('fleet.vehicle.model','fleet.vehicle.model.vendors','partner_id','Vendors'); + 'vendors': fields.many2many('fleet.vehicle.model','fleet_vehicle_model_vendors','partner_id','Vendors'), } class fleet_vehicle(osv.Model): diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index cc41662459c..2b8fccb5659 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -7,7 +7,7 @@
- + @@ -17,7 +17,7 @@ - + @@ -40,7 +40,7 @@
- + @@ -69,7 +69,7 @@ fleet.vehicle - + From 2c03c650a1f78e254ce23f51679b649a7772fe7e Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Thu, 20 Sep 2012 14:49:37 +0200 Subject: [PATCH 037/841] [FIX]Many2many vendors arguments issue bzr revid: dle@openerp.com-20120920124937-npuspa3ge4oyn2eg --- addons/fleet/__openerp__.py | 2 +- addons/fleet/fleet.py | 2 +- addons/fleet/fleet_view.xml | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py index 4c144090af0..34cc89514a9 100644 --- a/addons/fleet/__openerp__.py +++ b/addons/fleet/__openerp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- { - 'name' : 'Car Management', + 'name' : 'Fleet Management', 'version' : '0.1', 'depends' : [ 'base', diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index d003adb3447..771767c117d 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -9,7 +9,7 @@ class fleet_vehicle_model(osv.Model): 'brand' : fields.char('Brand', size=32, required=True), 'name' : fields.char('Name', size=32, required=True), 'make' : fields.char('Make',size=32,required=True), - 'vendors': fields.many2many('fleet.vehicle.model','fleet_vehicle_model_vendors','partner_id','Vendors'), + 'partner_id': fields.many2many('fleet.vehicle.model','fleet_vehicle_model_vendors','model_id', 'partner_id',string='Vendors',required=False), } class fleet_vehicle(osv.Model): diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 2b8fccb5659..823170356d7 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -6,8 +6,11 @@ fleet.vehicle.model + + + @@ -16,8 +19,11 @@ fleet.vehicle.model + + + From a476b48b94540ba82742977638ce3aaf1bc1446c Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Thu, 20 Sep 2012 14:56:21 +0200 Subject: [PATCH 038/841] [FIX]Many2many vendors wrong resource id fixed bzr revid: dle@openerp.com-20120920125621-uc6uqnksvayub0ei --- addons/fleet/fleet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 771767c117d..328814bd810 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -9,7 +9,7 @@ class fleet_vehicle_model(osv.Model): 'brand' : fields.char('Brand', size=32, required=True), 'name' : fields.char('Name', size=32, required=True), 'make' : fields.char('Make',size=32,required=True), - 'partner_id': fields.many2many('fleet.vehicle.model','fleet_vehicle_model_vendors','model_id', 'partner_id',string='Vendors',required=False), + 'partner_id': fields.many2many('res.partner','fleet_vehicle_model_vendors','model_id', 'partner_id',string='Vendors',required=False), } class fleet_vehicle(osv.Model): From d42f3d1627e6344b68113385c010a2e105f2ccba Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Thu, 20 Sep 2012 15:07:14 +0200 Subject: [PATCH 039/841] [ADD]Vehicle Type object bzr revid: dle@openerp.com-20120920130714-3ebx1yi23653vnty --- addons/fleet/fleet.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 328814bd810..ce30f82b611 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -1,11 +1,18 @@ from osv import osv, fields +class fleet_vehicle_model(osv.Model): + _name = 'fleet.vehicle.type' + _description = 'Type of the vehicle' + _columns = { + 'name' : fields.char('Name', size=32, required=True), + } + class fleet_vehicle_model(osv.Model): _name = 'fleet.vehicle.model' _description = '...' _columns = { - 'type' : fields.char('Type', size=32, required=True), + 'type' : fields.many2one('fleet.vehicle.type', 'Vehicle Type', required=True), 'brand' : fields.char('Brand', size=32, required=True), 'name' : fields.char('Name', size=32, required=True), 'make' : fields.char('Make',size=32,required=True), From 586914863f88e654662b8b5e1ba41d3258fdb2c7 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 20 Sep 2012 15:11:32 +0200 Subject: [PATCH 040/841] [MERGE]add object brand bzr revid: csn@openerp.com-20120920131132-i3eq3et5y3x0cyuk --- addons/fleet/fleet.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index ce30f82b611..a02e26aa64d 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -9,16 +9,23 @@ class fleet_vehicle_model(osv.Model): class fleet_vehicle_model(osv.Model): _name = 'fleet.vehicle.model' - _description = '...' + _description = '' _columns = { + 'brand' : fields.many2one('fleet.vehicle.model.brand', 'brand', required=True), 'type' : fields.many2one('fleet.vehicle.type', 'Vehicle Type', required=True), - 'brand' : fields.char('Brand', size=32, required=True), 'name' : fields.char('Name', size=32, required=True), 'make' : fields.char('Make',size=32,required=True), 'partner_id': fields.many2many('res.partner','fleet_vehicle_model_vendors','model_id', 'partner_id',string='Vendors',required=False), } +class fleet_vehicle_model_brand(osv.Model): + _name = 'fleet.vehicle.model.brand' + _description = 'Brand model of the vehicle' + _columns = { + 'name' : fields.char('Brand Name',size=32, required=True), + } + class fleet_vehicle(osv.Model): _name = 'fleet.vehicle' _description = 'Fleet Vehicle' From 0b9d4cd9735044d65c441659b577db18b7ccbac0 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 20 Sep 2012 15:18:04 +0200 Subject: [PATCH 041/841] [add]add object for model name and model make bzr revid: csn@openerp.com-20120920131804-sieluxv9tnz8qlhp --- addons/fleet/fleet.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index a02e26aa64d..ffee441c858 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -12,10 +12,10 @@ class fleet_vehicle_model(osv.Model): _description = '' _columns = { - 'brand' : fields.many2one('fleet.vehicle.model.brand', 'brand', required=True), + 'brand' : fields.many2one('fleet.vehicle.model.brand', 'Model brand', required=True), 'type' : fields.many2one('fleet.vehicle.type', 'Vehicle Type', required=True), - 'name' : fields.char('Name', size=32, required=True), - 'make' : fields.char('Make',size=32,required=True), + 'name' : fields.many2one('fleet.vehicle.model.name', 'Model name', required=True), + 'make' : fields.many2one('fleet.vehicle.model.make', 'Model make', required=True), 'partner_id': fields.many2many('res.partner','fleet_vehicle_model_vendors','model_id', 'partner_id',string='Vendors',required=False), } @@ -26,6 +26,20 @@ class fleet_vehicle_model_brand(osv.Model): 'name' : fields.char('Brand Name',size=32, required=True), } +class fleet_vehicle_model_name(osv.Model): + _name = 'fleet.vehicle.model.name' + _description = 'Name model of the vehicle' + _columns = { + 'name' : fields.char('Name',size=32, required=True), + } + +class fleet_vehicle_model_make(osv.Model): + _name = 'fleet.vehicle.model.make' + _description = 'Make model of the vehicle' + _columns = { + 'name' : fields.char('Make',size=32, required=True), + } + class fleet_vehicle(osv.Model): _name = 'fleet.vehicle' _description = 'Fleet Vehicle' From ee0be8846b78ac2eaf3f757dafb8e90e1cbe720d Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 20 Sep 2012 15:48:53 +0200 Subject: [PATCH 042/841] [add]add some fields in vehicle object and associated view bzr revid: csn@openerp.com-20120920134853-tq1e7b58opf93a06 --- addons/fleet/fleet.py | 8 +++++++- addons/fleet/fleet_view.xml | 21 +++++++++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index ffee441c858..b219c702636 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -45,10 +45,16 @@ class fleet_vehicle(osv.Model): _description = 'Fleet Vehicle' _columns = { - 'registration' : fields.char('Registration', size=32, required=True), + 'registration' : fields.char('Registration', size=32, required=False), + 'vin_sn' : fields.char('VIN SN', size=32, required=False), 'driver' : fields.many2one('fleet.vehicle', 'employee_id', required=False), 'model_id' : fields.many2one('fleet.vehicle.model', 'Model', required=True), 'log_ids' : fields.one2many('fleet.vehicle.log', 'vehicle_id', 'Logs'), + 'acquisition_date' : fields.date('Acquisition date', required=False), + 'acquisition_price' : fields.integer('Price'), + 'color' : fields.char('Color',size=32), + 'status' : fields.char('Status',size=32), + 'location' : fields.char('Location',size=32), 'next_repair_km' : fields.integer('Next Repair Km'), 'message' : fields.char('Message', size=128, readonly=True), diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 823170356d7..c46d8b4afa6 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -45,10 +45,21 @@
- - - - + + + + + + + + + + + + + + + @@ -77,6 +88,8 @@ + + From ea636eb033cc62516282fd73c4c431404e83d315 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 20 Sep 2012 17:21:21 +0200 Subject: [PATCH 043/841] [CHANGE]Correct some mistakes in an object name bzr revid: csn@openerp.com-20120920152121-24nlyjripej2v502 --- addons/fleet/fleet.py | 9 +++++---- addons/fleet/fleet_view.xml | 6 ++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index b219c702636..51e4e92d874 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -1,6 +1,6 @@ from osv import osv, fields -class fleet_vehicle_model(osv.Model): +class fleet_vehicle_model_type(osv.Model): _name = 'fleet.vehicle.type' _description = 'Type of the vehicle' _columns = { @@ -9,12 +9,13 @@ class fleet_vehicle_model(osv.Model): class fleet_vehicle_model(osv.Model): _name = 'fleet.vehicle.model' - _description = '' + _description = 'Model of a vehicle' _columns = { + 'name' : fields.char('Name',size=32, required=True), 'brand' : fields.many2one('fleet.vehicle.model.brand', 'Model brand', required=True), 'type' : fields.many2one('fleet.vehicle.type', 'Vehicle Type', required=True), - 'name' : fields.many2one('fleet.vehicle.model.name', 'Model name', required=True), + 'modelname' : fields.many2one('fleet.vehicle.model.name', 'Model name', required=True), 'make' : fields.many2one('fleet.vehicle.model.make', 'Model make', required=True), 'partner_id': fields.many2many('res.partner','fleet_vehicle_model_vendors','model_id', 'partner_id',string='Vendors',required=False), } @@ -47,7 +48,7 @@ class fleet_vehicle(osv.Model): _columns = { 'registration' : fields.char('Registration', size=32, required=False), 'vin_sn' : fields.char('VIN SN', size=32, required=False), - 'driver' : fields.many2one('fleet.vehicle', 'employee_id', required=False), + 'driver' : fields.many2one('hr.employee', 'Driver',required=False), 'model_id' : fields.many2one('fleet.vehicle.model', 'Model', required=True), 'log_ids' : fields.one2many('fleet.vehicle.log', 'vehicle_id', 'Logs'), 'acquisition_date' : fields.date('Acquisition date', required=False), diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index c46d8b4afa6..ec242704053 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -6,9 +6,10 @@ fleet.vehicle.model + - + @@ -19,9 +20,10 @@ fleet.vehicle.model + - + From 05172d18d73d9d425f6ef9d710589bad627dc549 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Fri, 21 Sep 2012 10:28:25 +0200 Subject: [PATCH 044/841] [ADD]Sheet style to view for models and new models fields bzr revid: dle@openerp.com-20120921082825-somoslhvu78fnafg --- addons/fleet/fleet.py | 6 ++++++ addons/fleet/fleet_view.xml | 38 ++++++++++++++++++++++++++++++------- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 51e4e92d874..c4d21777d30 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -18,6 +18,12 @@ class fleet_vehicle_model(osv.Model): 'modelname' : fields.many2one('fleet.vehicle.model.name', 'Model name', required=True), 'make' : fields.many2one('fleet.vehicle.model.make', 'Model make', required=True), 'partner_id': fields.many2many('res.partner','fleet_vehicle_model_vendors','model_id', 'partner_id',string='Vendors',required=False), + + 'transmission' : fields.selection([('manual', 'Manual'),('automatic','Automatic')], 'Transmission', help='Transmission Used by the vehicle',required=False), + 'fuel_type' : fields.selection([('gasoline', 'Gasoline'),('diesel','Diesel'),('electric','Electric'),('hybrid','Hybrid')], 'Fuel Type', help='Fuel Used by the vehicle',required=False), + 'horses' : fields.integer('Horses',required=False), + 'power' : fields.integer('Power',required=False,help='Power in kW of the vehicle'), + 'co2' : fields.float('CO2 Emissions',required=False,help='CO2 emissions of the vehicle'), } class fleet_vehicle_model_brand(osv.Model): diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index ec242704053..81a4aa96138 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -5,13 +5,37 @@ fleet.vehicle.model.form fleet.vehicle.model -
- - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 7f581c3193720432e42b471c9f19a875ef88dcce Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Fri, 21 Sep 2012 10:33:26 +0200 Subject: [PATCH 045/841] [ADD]Year fields for vehicle model and renaming power (kW) label bzr revid: dle@openerp.com-20120921083326-eciail9u934t1o81 --- addons/fleet/fleet.py | 13 +++++++------ addons/fleet/fleet_view.xml | 3 ++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index c4d21777d30..2c36eb86c92 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -12,17 +12,18 @@ class fleet_vehicle_model(osv.Model): _description = 'Model of a vehicle' _columns = { - 'name' : fields.char('Name',size=32, required=True), - 'brand' : fields.many2one('fleet.vehicle.model.brand', 'Model brand', required=True), - 'type' : fields.many2one('fleet.vehicle.type', 'Vehicle Type', required=True), - 'modelname' : fields.many2one('fleet.vehicle.model.name', 'Model name', required=True), - 'make' : fields.many2one('fleet.vehicle.model.make', 'Model make', required=True), + 'name' : fields.char('Name',size=32, required=False), + 'brand' : fields.many2one('fleet.vehicle.model.brand', 'Model brand', required=False), + 'type' : fields.many2one('fleet.vehicle.type', 'Vehicle Type', required=False), + 'modelname' : fields.many2one('fleet.vehicle.model.name', 'Model name', required=False), + 'make' : fields.many2one('fleet.vehicle.model.make', 'Model make', required=False), + 'year' : fields.integer('Year', required=False), 'partner_id': fields.many2many('res.partner','fleet_vehicle_model_vendors','model_id', 'partner_id',string='Vendors',required=False), 'transmission' : fields.selection([('manual', 'Manual'),('automatic','Automatic')], 'Transmission', help='Transmission Used by the vehicle',required=False), 'fuel_type' : fields.selection([('gasoline', 'Gasoline'),('diesel','Diesel'),('electric','Electric'),('hybrid','Hybrid')], 'Fuel Type', help='Fuel Used by the vehicle',required=False), 'horses' : fields.integer('Horses',required=False), - 'power' : fields.integer('Power',required=False,help='Power in kW of the vehicle'), + 'power' : fields.integer('Power (kW)',required=False,help='Power in kW of the vehicle'), 'co2' : fields.float('CO2 Emissions',required=False,help='CO2 emissions of the vehicle'), } diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 81a4aa96138..f1a8ea81815 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -14,7 +14,8 @@
- + + From bf589e6a24b3ec2c9c3a0e83980149610431710c Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Fri, 21 Sep 2012 11:57:15 +0200 Subject: [PATCH 046/841] [ADD]Complete model name function bzr revid: dle@openerp.com-20120921095715-q3wl2w7wnemv0vc9 --- addons/fleet/fleet.py | 25 ++++++++++++++++++++++++- addons/fleet/fleet_view.xml | 1 - 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 2c36eb86c92..1ef220e9537 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -8,11 +8,34 @@ class fleet_vehicle_model_type(osv.Model): } class fleet_vehicle_model(osv.Model): + + def name_get(self, cr, uid, ids, context=None): + if not ids: + return [] + reads = self.read(cr, uid, ids, ['brand','modelname','make','year'], context=context) + res = [] + for record in reads: + name = '' + if record['modelname']: + name = name+ ' / ' +record['modelname'][1] + if record['modelname']: + name = name+ ' / ' +record['modelname'][1] + if record['make']: + name = name+ ' / ' +record['make'][1] + if record['year']: + name = name+ ' / ' +str(record['year']) + res.append((record['id'], name)) + return res + + def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None): + res = self.name_get(cr, uid, ids, context=context) + return dict(res) + _name = 'fleet.vehicle.model' _description = 'Model of a vehicle' _columns = { - 'name' : fields.char('Name',size=32, required=False), + 'name' : fields.function(_name_get_fnc, type="char", string='Name'), 'brand' : fields.many2one('fleet.vehicle.model.brand', 'Model brand', required=False), 'type' : fields.many2one('fleet.vehicle.type', 'Vehicle Type', required=False), 'modelname' : fields.many2one('fleet.vehicle.model.name', 'Model name', required=False), diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index f1a8ea81815..dcbc1ba39f9 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -45,7 +45,6 @@ fleet.vehicle.model - From 1ab5e7e100d16ecc0992839169ac02e056ef903c Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Fri, 21 Sep 2012 12:56:43 +0200 Subject: [PATCH 047/841] [CORRECT]correction of the name computation field in model object bzr revid: csn@openerp.com-20120921105643-j1hatbzx3odrqazo --- addons/fleet/fleet.py | 14 ++++++++------ addons/fleet/fleet_view.xml | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 1ef220e9537..7b602406882 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -6,18 +6,20 @@ class fleet_vehicle_model_type(osv.Model): _columns = { 'name' : fields.char('Name', size=32, required=True), } - +#comment to delete class fleet_vehicle_model(osv.Model): def name_get(self, cr, uid, ids, context=None): if not ids: return [] - reads = self.read(cr, uid, ids, ['brand','modelname','make','year'], context=context) + reads = self.read(cr, uid, ids, ['type','brand','modelname','make','year'], context=context) res = [] for record in reads: name = '' - if record['modelname']: - name = name+ ' / ' +record['modelname'][1] + if record['type']: + name = record['type'][1] + " - " + if record['brand']: + name = name + record['brand'][1] if record['modelname']: name = name+ ' / ' +record['modelname'][1] if record['make']: @@ -36,8 +38,8 @@ class fleet_vehicle_model(osv.Model): _columns = { 'name' : fields.function(_name_get_fnc, type="char", string='Name'), - 'brand' : fields.many2one('fleet.vehicle.model.brand', 'Model brand', required=False), - 'type' : fields.many2one('fleet.vehicle.type', 'Vehicle Type', required=False), + 'brand' : fields.many2one('fleet.vehicle.model.brand', 'Model brand', required=True), + 'type' : fields.many2one('fleet.vehicle.type', 'Vehicle Type', required=True), 'modelname' : fields.many2one('fleet.vehicle.model.name', 'Model name', required=False), 'make' : fields.many2one('fleet.vehicle.model.make', 'Model make', required=False), 'year' : fields.integer('Year', required=False), diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index dcbc1ba39f9..d4043fa0628 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -197,5 +197,6 @@ --> + From 52c00df8d239f6a96b68a1dac86134d0036c6973 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Fri, 21 Sep 2012 13:20:51 +0200 Subject: [PATCH 048/841] [ADD]Add horsepower_tax field bzr revid: dle@openerp.com-20120921112051-qmv79v6v0r0eumuc --- addons/fleet/fleet.py | 4 +++- addons/fleet/fleet_view.xml | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 7b602406882..68408580155 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -47,7 +47,8 @@ class fleet_vehicle_model(osv.Model): 'transmission' : fields.selection([('manual', 'Manual'),('automatic','Automatic')], 'Transmission', help='Transmission Used by the vehicle',required=False), 'fuel_type' : fields.selection([('gasoline', 'Gasoline'),('diesel','Diesel'),('electric','Electric'),('hybrid','Hybrid')], 'Fuel Type', help='Fuel Used by the vehicle',required=False), - 'horses' : fields.integer('Horses',required=False), + 'horsepower' : fields.integer('Horsepower',required=False), + 'horsepower_tax': fields.float('Horsepower Taxation'), 'power' : fields.integer('Power (kW)',required=False,help='Power in kW of the vehicle'), 'co2' : fields.float('CO2 Emissions',required=False,help='CO2 emissions of the vehicle'), } @@ -71,6 +72,7 @@ class fleet_vehicle_model_make(osv.Model): _description = 'Make model of the vehicle' _columns = { 'name' : fields.char('Make',size=32, required=True), + 'country_id': fields.many2one('res.country', 'Country', required=False), } class fleet_vehicle(osv.Model): diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index d4043fa0628..59e38bdc7fd 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -27,11 +27,12 @@ + - + + - From 185530153085c415879195b32a87353a9b03ba18 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Fri, 21 Sep 2012 13:32:28 +0200 Subject: [PATCH 049/841] [ADD]add help messages to each field and removed the message field in vehicle object bzr revid: csn@openerp.com-20120921113228-75qsgqfyenpzegll --- addons/fleet/fleet.py | 36 +++++++++++++++++++++--------------- addons/fleet/fleet_view.xml | 4 ++-- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 68408580155..a124eb969df 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -38,11 +38,11 @@ class fleet_vehicle_model(osv.Model): _columns = { 'name' : fields.function(_name_get_fnc, type="char", string='Name'), - 'brand' : fields.many2one('fleet.vehicle.model.brand', 'Model brand', required=True), - 'type' : fields.many2one('fleet.vehicle.type', 'Vehicle Type', required=True), - 'modelname' : fields.many2one('fleet.vehicle.model.name', 'Model name', required=False), - 'make' : fields.many2one('fleet.vehicle.model.make', 'Model make', required=False), - 'year' : fields.integer('Year', required=False), + 'brand' : fields.many2one('fleet.vehicle.model.brand', 'Model brand', required=True, help='Brand of the vehicle'), + 'type' : fields.many2one('fleet.vehicle.type', 'Vehicle Type', required=True, help='Type of vehicle (car, bike, ...)'), + 'modelname' : fields.many2one('fleet.vehicle.model.name', 'Model name', required=False, help='Model name of the vehicle'), + 'make' : fields.many2one('fleet.vehicle.model.make', 'Model make', required=False, help='Make of the vehicle'), + 'year' : fields.integer('Year', required=False, help='Year of fabrication of the vehicle'), 'partner_id': fields.many2many('res.partner','fleet_vehicle_model_vendors','model_id', 'partner_id',string='Vendors',required=False), 'transmission' : fields.selection([('manual', 'Manual'),('automatic','Automatic')], 'Transmission', help='Transmission Used by the vehicle',required=False), @@ -80,19 +80,25 @@ class fleet_vehicle(osv.Model): _description = 'Fleet Vehicle' _columns = { - 'registration' : fields.char('Registration', size=32, required=False), - 'vin_sn' : fields.char('VIN SN', size=32, required=False), - 'driver' : fields.many2one('hr.employee', 'Driver',required=False), - 'model_id' : fields.many2one('fleet.vehicle.model', 'Model', required=True), + 'registration' : fields.char('Registration', size=32, required=False, help='Registration number of the vehicle (ie: plate number for a car)'), + 'vin_sn' : fields.char('Chassis Number', size=32, required=False, help='Unique number written on the vehicle motor (VIN/SN number)'), + 'driver' : fields.many2one('hr.employee', 'Driver',required=False, help='Driver of the vehicle'), + 'model_id' : fields.many2one('fleet.vehicle.model', 'Model', required=True, help='Model of the vehicle'), 'log_ids' : fields.one2many('fleet.vehicle.log', 'vehicle_id', 'Logs'), - 'acquisition_date' : fields.date('Acquisition date', required=False), - 'acquisition_price' : fields.integer('Price'), - 'color' : fields.char('Color',size=32), - 'status' : fields.char('Status',size=32), - 'location' : fields.char('Location',size=32), + 'acquisition_date' : fields.date('Acquisition date', required=False, help='Date when the vehicle has been bought'), + 'acquisition_price' : fields.integer('Price', help='Price of the bought vehicle'), + 'color' : fields.char('Color',size=32, help='Color of the vehicle'), + 'status' : fields.char('Status',size=32, help='Status of the vehicle (in repair, active, ...)'), + 'location' : fields.char('Location',size=32, help='Location of the vehicle (garage, ...)'), 'next_repair_km' : fields.integer('Next Repair Km'), - 'message' : fields.char('Message', size=128, readonly=True), + + 'transmission' : fields.selection([('manual', 'Manual'),('automatic','Automatic')], 'Transmission', help='Transmission Used by the vehicle',required=False), + 'fuel_type' : fields.selection([('gasoline', 'Gasoline'),('diesel','Diesel'),('electric','Electric'),('hybrid','Hybrid')], 'Fuel Type', help='Fuel Used by the vehicle',required=False), + 'horses' : fields.integer('Horses',required=False), + 'power' : fields.integer('Power (kW)',required=False,help='Power in kW of the vehicle'), + 'co2' : fields.float('CO2 Emissions',required=False,help='CO2 emissions of the vehicle'), + } def on_change_model(self, cr, uid, ids, model_id, context=None): diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 59e38bdc7fd..c746a9e6b16 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -50,6 +50,7 @@ + @@ -76,9 +77,8 @@ - + - From 80b84053d9a14c6a2b6b6a1e863f0ea829db2626 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Fri, 21 Sep 2012 14:12:37 +0200 Subject: [PATCH 050/841] [ADD]view for configuration menu bzr revid: csn@openerp.com-20120921121237-dh09b3gh9c6b8is6 --- addons/fleet/fleet_view.xml | 76 ++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-) diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index c746a9e6b16..bce81274543 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -63,9 +63,83 @@ tree,form + + fleet.vehicle.type.tree + fleet.vehicle.type + + + + + + + + + Type of Vehicle + fleet.vehicle.type + form + tree,form + + + + + fleet.vehicle.model.brand.tree + fleet.vehicle.model.brand + + + + + + + + + Model brand of Vehicle + fleet.vehicle.model.brand + form + tree,form + + + + fleet.vehicle.model.name.tree + fleet.vehicle.model.name + + + + + + + + + Model name of Vehicle + fleet.vehicle.model.name + form + tree,form + + + + fleet.vehicle.model.make.tree + fleet.vehicle.model.make + + + + + + + + + Model make of Vehicle + fleet.vehicle.model.make + form + tree,form + + - + + + + + + fleet.vehicle.form From 73400dac7bd985444860c7759a1d92705f4cd212 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Fri, 21 Sep 2012 15:16:02 +0200 Subject: [PATCH 051/841] [IMP] Make term changed to version, and change of relationship between version and its model bzr revid: dle@openerp.com-20120921131602-5rtzewizms4c353j --- addons/fleet/fleet.py | 32 ++++++++-------- addons/fleet/fleet_view.xml | 73 ++++++++++++++++++++++++------------- 2 files changed, 64 insertions(+), 41 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index a124eb969df..4e2cb890d1d 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -12,7 +12,7 @@ class fleet_vehicle_model(osv.Model): def name_get(self, cr, uid, ids, context=None): if not ids: return [] - reads = self.read(cr, uid, ids, ['type','brand','modelname','make','year'], context=context) + reads = self.read(cr, uid, ids, ['type','brand','modelname','version','year'], context=context) res = [] for record in reads: name = '' @@ -22,8 +22,8 @@ class fleet_vehicle_model(osv.Model): name = name + record['brand'][1] if record['modelname']: name = name+ ' / ' +record['modelname'][1] - if record['make']: - name = name+ ' / ' +record['make'][1] + if record['version']: + name = name+ ' / ' +record['version'][1] if record['year']: name = name+ ' / ' +str(record['year']) res.append((record['id'], name)) @@ -41,16 +41,9 @@ class fleet_vehicle_model(osv.Model): 'brand' : fields.many2one('fleet.vehicle.model.brand', 'Model brand', required=True, help='Brand of the vehicle'), 'type' : fields.many2one('fleet.vehicle.type', 'Vehicle Type', required=True, help='Type of vehicle (car, bike, ...)'), 'modelname' : fields.many2one('fleet.vehicle.model.name', 'Model name', required=False, help='Model name of the vehicle'), - 'make' : fields.many2one('fleet.vehicle.model.make', 'Model make', required=False, help='Make of the vehicle'), + 'version' : fields.one2many('fleet.vehicle.model.version', 'model_version_id', 'Versions'), 'year' : fields.integer('Year', required=False, help='Year of fabrication of the vehicle'), 'partner_id': fields.many2many('res.partner','fleet_vehicle_model_vendors','model_id', 'partner_id',string='Vendors',required=False), - - 'transmission' : fields.selection([('manual', 'Manual'),('automatic','Automatic')], 'Transmission', help='Transmission Used by the vehicle',required=False), - 'fuel_type' : fields.selection([('gasoline', 'Gasoline'),('diesel','Diesel'),('electric','Electric'),('hybrid','Hybrid')], 'Fuel Type', help='Fuel Used by the vehicle',required=False), - 'horsepower' : fields.integer('Horsepower',required=False), - 'horsepower_tax': fields.float('Horsepower Taxation'), - 'power' : fields.integer('Power (kW)',required=False,help='Power in kW of the vehicle'), - 'co2' : fields.float('CO2 Emissions',required=False,help='CO2 emissions of the vehicle'), } class fleet_vehicle_model_brand(osv.Model): @@ -67,12 +60,19 @@ class fleet_vehicle_model_name(osv.Model): 'name' : fields.char('Name',size=32, required=True), } -class fleet_vehicle_model_make(osv.Model): - _name = 'fleet.vehicle.model.make' - _description = 'Make model of the vehicle' +class fleet_vehicle_model_version(osv.Model): + _name = 'fleet.vehicle.model.version' + _description = 'version model of the vehicle' _columns = { - 'name' : fields.char('Make',size=32, required=True), - 'country_id': fields.many2one('res.country', 'Country', required=False), + 'name' : fields.char('name',size=32, required=True), + 'model_version_id' : fields.many2one('fleet.vehicle.model', 'Associated model', required=True, help='Model name of the vehicle associated to this version'), + + 'transmission' : fields.selection([('manual', 'Manual'),('automatic','Automatic')], 'Transmission', help='Transmission Used by the vehicle',required=False), + 'fuel_type' : fields.selection([('gasoline', 'Gasoline'),('diesel','Diesel'),('electric','Electric'),('hybrid','Hybrid')], 'Fuel Type', help='Fuel Used by the vehicle',required=False), + 'horsepower' : fields.integer('Horsepower',required=False), + 'horsepower_tax': fields.float('Horsepower Taxation'), + 'power' : fields.integer('Power (kW)',required=False,help='Power in kW of the vehicle'), + 'co2' : fields.float('CO2 Emissions',required=False,help='CO2 emissions of the vehicle'), } class fleet_vehicle(osv.Model): diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index bce81274543..53109f23336 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -13,29 +13,18 @@ - - + + + + - - - - - - - - - - - - - - +
@@ -49,7 +38,7 @@ - + @@ -115,19 +104,53 @@ tree,form - - fleet.vehicle.model.make.tree - fleet.vehicle.model.make + + fleet.vehicle.model.version.tree + fleet.vehicle.model.version - + + + - - Model make of Vehicle - fleet.vehicle.model.make + + fleet.vehicle.model.version.form + fleet.vehicle.model.version + +
+ + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + Model version of Vehicle + fleet.vehicle.model.version form tree,form @@ -139,7 +162,7 @@ - + fleet.vehicle.form From 0582e611407bd917d7ffceac92f1c3f52108d844 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Fri, 21 Sep 2012 16:34:15 +0200 Subject: [PATCH 052/841] [REM]Removing of models type, versions and engine. Too much complexity. bzr revid: dle@openerp.com-20120921143415-6fiuv49wanwhc75v --- addons/fleet/fleet.py | 59 ++--------------- addons/fleet/fleet_view.xml | 128 +++++++----------------------------- 2 files changed, 28 insertions(+), 159 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 4e2cb890d1d..5cb01797e48 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -9,41 +9,13 @@ class fleet_vehicle_model_type(osv.Model): #comment to delete class fleet_vehicle_model(osv.Model): - def name_get(self, cr, uid, ids, context=None): - if not ids: - return [] - reads = self.read(cr, uid, ids, ['type','brand','modelname','version','year'], context=context) - res = [] - for record in reads: - name = '' - if record['type']: - name = record['type'][1] + " - " - if record['brand']: - name = name + record['brand'][1] - if record['modelname']: - name = name+ ' / ' +record['modelname'][1] - if record['version']: - name = name+ ' / ' +record['version'][1] - if record['year']: - name = name+ ' / ' +str(record['year']) - res.append((record['id'], name)) - return res - - def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None): - res = self.name_get(cr, uid, ids, context=context) - return dict(res) - _name = 'fleet.vehicle.model' _description = 'Model of a vehicle' _columns = { - 'name' : fields.function(_name_get_fnc, type="char", string='Name'), + 'name' : fields.char('Brand Name',size=32, required=True), 'brand' : fields.many2one('fleet.vehicle.model.brand', 'Model brand', required=True, help='Brand of the vehicle'), - 'type' : fields.many2one('fleet.vehicle.type', 'Vehicle Type', required=True, help='Type of vehicle (car, bike, ...)'), - 'modelname' : fields.many2one('fleet.vehicle.model.name', 'Model name', required=False, help='Model name of the vehicle'), - 'version' : fields.one2many('fleet.vehicle.model.version', 'model_version_id', 'Versions'), - 'year' : fields.integer('Year', required=False, help='Year of fabrication of the vehicle'), - 'partner_id': fields.many2many('res.partner','fleet_vehicle_model_vendors','model_id', 'partner_id',string='Vendors',required=False), + 'vendors': fields.many2many('res.partner','fleet_vehicle_model_vendors','model_id', 'partner_id',string='Vendors',required=False), } class fleet_vehicle_model_brand(osv.Model): @@ -53,28 +25,6 @@ class fleet_vehicle_model_brand(osv.Model): 'name' : fields.char('Brand Name',size=32, required=True), } -class fleet_vehicle_model_name(osv.Model): - _name = 'fleet.vehicle.model.name' - _description = 'Name model of the vehicle' - _columns = { - 'name' : fields.char('Name',size=32, required=True), - } - -class fleet_vehicle_model_version(osv.Model): - _name = 'fleet.vehicle.model.version' - _description = 'version model of the vehicle' - _columns = { - 'name' : fields.char('name',size=32, required=True), - 'model_version_id' : fields.many2one('fleet.vehicle.model', 'Associated model', required=True, help='Model name of the vehicle associated to this version'), - - 'transmission' : fields.selection([('manual', 'Manual'),('automatic','Automatic')], 'Transmission', help='Transmission Used by the vehicle',required=False), - 'fuel_type' : fields.selection([('gasoline', 'Gasoline'),('diesel','Diesel'),('electric','Electric'),('hybrid','Hybrid')], 'Fuel Type', help='Fuel Used by the vehicle',required=False), - 'horsepower' : fields.integer('Horsepower',required=False), - 'horsepower_tax': fields.float('Horsepower Taxation'), - 'power' : fields.integer('Power (kW)',required=False,help='Power in kW of the vehicle'), - 'co2' : fields.float('CO2 Emissions',required=False,help='CO2 emissions of the vehicle'), - } - class fleet_vehicle(osv.Model): _name = 'fleet.vehicle' _description = 'Fleet Vehicle' @@ -90,15 +40,16 @@ class fleet_vehicle(osv.Model): 'color' : fields.char('Color',size=32, help='Color of the vehicle'), 'status' : fields.char('Status',size=32, help='Status of the vehicle (in repair, active, ...)'), 'location' : fields.char('Location',size=32, help='Location of the vehicle (garage, ...)'), + 'doors' : fields.integer('Number of doors', help='Number of doors of the vehicle'), 'next_repair_km' : fields.integer('Next Repair Km'), 'transmission' : fields.selection([('manual', 'Manual'),('automatic','Automatic')], 'Transmission', help='Transmission Used by the vehicle',required=False), 'fuel_type' : fields.selection([('gasoline', 'Gasoline'),('diesel','Diesel'),('electric','Electric'),('hybrid','Hybrid')], 'Fuel Type', help='Fuel Used by the vehicle',required=False), - 'horses' : fields.integer('Horses',required=False), + 'horsepower' : fields.integer('Horsepower',required=False), + 'horsepower_tax': fields.float('Horsepower Taxation'), 'power' : fields.integer('Power (kW)',required=False,help='Power in kW of the vehicle'), 'co2' : fields.float('CO2 Emissions',required=False,help='CO2 emissions of the vehicle'), - } def on_change_model(self, cr, uid, ids, model_id, context=None): diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 53109f23336..6e3a045cfab 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -9,22 +9,17 @@ - - + + - - + - - - - + - @@ -35,12 +30,9 @@ fleet.vehicle.model - + - - - - + @@ -51,25 +43,7 @@ form tree,form - - - fleet.vehicle.type.tree - fleet.vehicle.type - - - - - - - - - Type of Vehicle - fleet.vehicle.type - form - tree,form - - - + fleet.vehicle.model.brand.tree fleet.vehicle.model.brand @@ -87,82 +61,11 @@ tree,form - - fleet.vehicle.model.name.tree - fleet.vehicle.model.name - - - - - - - - - Model name of Vehicle - fleet.vehicle.model.name - form - tree,form - - - - fleet.vehicle.model.version.tree - fleet.vehicle.model.version - - - - - - - - - - - fleet.vehicle.model.version.form - fleet.vehicle.model.version - -
- - - - - - - - - - - - - - - - - - - - - - -
- - - - - - Model version of Vehicle - fleet.vehicle.model.version - form - tree,form - - - - - fleet.vehicle.form @@ -176,9 +79,10 @@ + - + @@ -199,6 +103,20 @@ + + + + + + + + + + + + + +
From 059f36dd890f571e66e9abc9309ce59f00821fa0 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Fri, 21 Sep 2012 16:47:44 +0200 Subject: [PATCH 053/841] [FIX]correct bug when trying to create a new vehicle and add its log, remove the vehicle field bzr revid: csn@openerp.com-20120921144744-c9h5t2dq129rt3yr --- addons/fleet/fleet_view.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 6e3a045cfab..3b2f7a41923 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -101,6 +101,16 @@ +
+ + + + + + + + +
From 70b5da11839eb57d9006dd53e5a122805b10f614 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Fri, 21 Sep 2012 17:10:22 +0200 Subject: [PATCH 054/841] [ADD]add log object for fuel, insurance, services bzr revid: csn@openerp.com-20120921151022-yjp2vtpic6vl18kl --- addons/fleet/fleet.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 5cb01797e48..316d2e69733 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -98,6 +98,27 @@ class fleet_vehicle_log(osv.Model): } +class fleet_vehicle_log_fuel(osv.Model): + _inherit = 'fleet.vehicle.log' + _name = 'fleet.vehicle.log.fuel' + _columns = { + 'description' : fields.text('Description'), + } + +class fleet_vehicle_log_insurance(osv.Model): + _inherit = 'fleet.vehicle.log' + _name = 'fleet.vehicle.log.insurance' + _columns = { + 'description' : fields.text('Description'), + } + +class fleet_vehicle_log_services(osv.Model): + _inherit = 'fleet.vehicle.log' + _name = 'fleet.vehicle.log.services' + _columns = { + 'description' : fields.text('Description'), + } + class hr_employee(osv.Model): _inherit = 'hr.employee' From a4b56f7455bfdc7f44c8133368d62e8b29475468 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Fri, 21 Sep 2012 17:42:44 +0200 Subject: [PATCH 055/841] [ADD]Concatenate function to give Brand + model as complete name bzr revid: dle@openerp.com-20120921154244-g7hv96uljkfvyevz --- addons/fleet/fleet.py | 25 ++++++++++++++++++++++--- addons/fleet/fleet_view.xml | 5 ++--- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 316d2e69733..b95e4288c18 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -6,15 +6,34 @@ class fleet_vehicle_model_type(osv.Model): _columns = { 'name' : fields.char('Name', size=32, required=True), } -#comment to delete +#comment to delete#comment to delete class fleet_vehicle_model(osv.Model): + def name_get(self, cr, uid, ids, context=None): + if context is None: + context = {} + if not ids: + return [] + reads = self.browse(cr, uid, ids, context=context) + res = [] + for record in reads: + name = record.modelname + if record.brand: + name = record.brand.name+' / '+name + res.append((record.id, name)) + return res + + def _model_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None): + res = self.name_get(cr, uid, ids, context=context) + return dict(res) + _name = 'fleet.vehicle.model' _description = 'Model of a vehicle' _columns = { - 'name' : fields.char('Brand Name',size=32, required=True), - 'brand' : fields.many2one('fleet.vehicle.model.brand', 'Model brand', required=True, help='Brand of the vehicle'), + 'name' : fields.function(_model_name_get_fnc, type="char", string='Name', store=True), + 'modelname' : fields.char('Model name', size=32, required=True), + 'brand' : fields.many2one('fleet.vehicle.model.brand', 'Model brand', required=False, help='Brand of the vehicle'), 'vendors': fields.many2many('res.partner','fleet_vehicle_model_vendors','model_id', 'partner_id',string='Vendors',required=False), } diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 3b2f7a41923..e54462c19ff 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -9,11 +9,10 @@ - - + - + From 45e76287a2a39e5f0b724e98a33d1a01ba179d87 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Mon, 24 Sep 2012 09:42:39 +0200 Subject: [PATCH 056/841] [ADD]add some fields for fuel logs and also create the form bzr revid: csn@openerp.com-20120924074239-862w7lqvkkafd48e --- addons/fleet/fleet.py | 5 ++++- addons/fleet/fleet_view.xml | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index b95e4288c18..78dae6c7b60 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -54,6 +54,7 @@ class fleet_vehicle(osv.Model): 'driver' : fields.many2one('hr.employee', 'Driver',required=False, help='Driver of the vehicle'), 'model_id' : fields.many2one('fleet.vehicle.model', 'Model', required=True, help='Model of the vehicle'), 'log_ids' : fields.one2many('fleet.vehicle.log', 'vehicle_id', 'Logs'), + 'log_fuel' : fields.one2many('fleet.vehicle.log.fuel','vehicle_id', 'Fuel Logs'), 'acquisition_date' : fields.date('Acquisition date', required=False, help='Date when the vehicle has been bought'), 'acquisition_price' : fields.integer('Price', help='Price of the bought vehicle'), 'color' : fields.char('Color',size=32, help='Color of the vehicle'), @@ -109,7 +110,7 @@ class fleet_vehicle_log(osv.Model): 'employee_id' : fields.many2one('hr.employee', 'Employee', required=True), 'vehicle_id' : fields.many2one('fleet.vehicle', 'Vehicle', required=True), - 'create_date' : fields.datetime('Creation Date', readonly=True), + 'create_date' : fields.datetime('Creation Date'), 'description' : fields.text('Description'), 'type' : fields.many2one('fleet.vehicle.log.type', 'Type', required=True), @@ -122,6 +123,8 @@ class fleet_vehicle_log_fuel(osv.Model): _name = 'fleet.vehicle.log.fuel' _columns = { 'description' : fields.text('Description'), + 'liter' : fields.integer('Liter'), + 'price_per_liter' : fields.float('Price per liter'), } class fleet_vehicle_log_insurance(osv.Model): diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index e54462c19ff..2204e8b937f 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -92,6 +92,28 @@ + + + + + + + + +
+ + + + + + + + + + +
+ + From 87673678ada0b4fd86ac1e1bda2a19e54f2f5467 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Mon, 24 Sep 2012 11:14:26 +0200 Subject: [PATCH 057/841] [RESOLVED]solved conflicts in log object and removed log type object bzr revid: csn@openerp.com-20120924091426-i57amm2p6t1fskc1 --- addons/fleet/fleet.py | 20 ++++++-------------- addons/fleet/fleet_view.xml | 2 ++ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index c2e233b12f7..e5e84550797 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -117,13 +117,6 @@ class fleet_vehicle(osv.Model): } } -class fleet_vehicle_log_type(osv.Model): - _name = 'fleet.vehicle.log.type' - - _columns = { - 'name' : fields.char('Name', size=32, required=True), - } - class fleet_vehicle_log(osv.Model): _name = 'fleet.vehicle.log' @@ -131,11 +124,12 @@ class fleet_vehicle_log(osv.Model): 'employee_id' : fields.many2one('hr.employee', 'Employee', required=True), 'vehicle_id' : fields.many2one('fleet.vehicle', 'Vehicle', required=True), - 'create_date' : fields.datetime('Creation Date'), + 'create_date' : fields.date('Creation Date'), 'description' : fields.text('Description'), - 'type' : fields.char('Type', size=32, required=False), - } + 'type' : fields.char('Type',size=32), + } + _defaults = { 'type' : 'Log', } @@ -147,11 +141,9 @@ class fleet_vehicle_log_fuel(osv.Model): 'description' : fields.text('Description'), 'liter' : fields.integer('Liter'), 'price_per_liter' : fields.float('Price per liter'), - 'type' : fields.char('Type', size=32, required=False), - } - _defaults = { - 'type' : 'Fuel', + 'type' : fields.char('Type',size=32), } + _defaults = {'type': 'Refueling',} class fleet_vehicle_log_insurance(osv.Model): _inherit = 'fleet.vehicle.log' diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index c19d9760197..9c611c9cea8 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -97,6 +97,8 @@ + +
From c94b5016a57edf0cc8a9784a5372d67936d3cdca Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Mon, 24 Sep 2012 11:20:48 +0200 Subject: [PATCH 058/841] [ADD]Invoice link for fuel log bzr revid: dle@openerp.com-20120924092048-ux61kn6howa0yaoe --- addons/fleet/__openerp__.py | 1 + addons/fleet/fleet.py | 3 ++- addons/fleet/fleet_view.xml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py index 34cc89514a9..b91071a575e 100644 --- a/addons/fleet/__openerp__.py +++ b/addons/fleet/__openerp__.py @@ -5,6 +5,7 @@ 'depends' : [ 'base', 'hr', + 'account', ], 'author' : 'OpenERP S.A.', 'description' : """ diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index e5e84550797..82702e5ca19 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -141,7 +141,8 @@ class fleet_vehicle_log_fuel(osv.Model): 'description' : fields.text('Description'), 'liter' : fields.integer('Liter'), 'price_per_liter' : fields.float('Price per liter'), - 'type' : fields.char('Type',size=32), + 'type' : fields.char('Type', size=32), + 'invoice' : fields.many2one('account.invoice', 'Invoice', required=False, help='Invoice of the refueling log'), } _defaults = {'type': 'Refueling',} diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 9c611c9cea8..2c2eda08eac 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -100,6 +100,7 @@ + @@ -109,6 +110,7 @@ + From 9d4d16263ecf8af81f92594473323c36e22bb26b Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Mon, 24 Sep 2012 12:17:20 +0200 Subject: [PATCH 059/841] [ADD] Amount field for fuel log, with get_price function and associated on_change bzr revid: dle@openerp.com-20120924101720-69eqj01p39irbj09 --- addons/fleet/fleet.py | 24 ++++++++++++++++++++++++ addons/fleet/fleet_view.xml | 6 ++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 82702e5ca19..5fcbd54f20a 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -135,12 +135,36 @@ class fleet_vehicle_log(osv.Model): } class fleet_vehicle_log_fuel(osv.Model): + _inherit = 'fleet.vehicle.log' + + def _get_price(self, cr, uid, ids, fields, args, context=None): + result = {} + for record in self.browse(cr, uid, ids, context=None): + res = record.liter * record.price_per_liter + result[record.id] = { + 'amount' : res, + } + return result + + def on_change_fuel(self, cr, uid, ids, liter, price_per_liter, context=None): + + print 'Amount : ' + str(liter * price_per_liter) + + return { + 'value' : { + 'amount' : liter * price_per_liter, + } + } + + + _name = 'fleet.vehicle.log.fuel' _columns = { 'description' : fields.text('Description'), 'liter' : fields.integer('Liter'), 'price_per_liter' : fields.float('Price per liter'), + 'amount': fields.function(_get_price, type='float', multi='fuel', string='Fuel Amount'), 'type' : fields.char('Type', size=32), 'invoice' : fields.many2one('account.invoice', 'Invoice', required=False, help='Invoice of the refueling log'), } diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 2c2eda08eac..85a0472f8c6 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -99,6 +99,7 @@ +
@@ -107,8 +108,9 @@ - - + + + From 5e30915ed2d3f5d728a4f4d23adc1307c30f1638 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Mon, 24 Sep 2012 13:57:39 +0200 Subject: [PATCH 060/841] [ADD]OpenChatter and replace account.invoice by a simple reference number bzr revid: dle@openerp.com-20120924115739-nbpo80ugq6w0dl32 --- addons/fleet/__openerp__.py | 1 - addons/fleet/fleet.py | 4 +++- addons/fleet/fleet_view.xml | 8 ++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py index b91071a575e..34cc89514a9 100644 --- a/addons/fleet/__openerp__.py +++ b/addons/fleet/__openerp__.py @@ -5,7 +5,6 @@ 'depends' : [ 'base', 'hr', - 'account', ], 'author' : 'OpenERP S.A.', 'description' : """ diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 5fcbd54f20a..162e2bada36 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -46,6 +46,8 @@ class fleet_vehicle_model_brand(osv.Model): class fleet_vehicle(osv.Model): + _inherit = 'mail.thread' + def name_get(self, cr, uid, ids, context=None): if context is None: context = {} @@ -166,7 +168,7 @@ class fleet_vehicle_log_fuel(osv.Model): 'price_per_liter' : fields.float('Price per liter'), 'amount': fields.function(_get_price, type='float', multi='fuel', string='Fuel Amount'), 'type' : fields.char('Type', size=32), - 'invoice' : fields.many2one('account.invoice', 'Invoice', required=False, help='Invoice of the refueling log'), + 'inv_ref' : fields.char('Invoice Ref.', size=32), } _defaults = {'type': 'Refueling',} diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 85a0472f8c6..f9b63fc4fbe 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -101,7 +101,7 @@ - +
@@ -112,7 +112,7 @@ - +
@@ -154,6 +154,10 @@ +
+ + +
From 3d2607669f964f0ab5b1acdf1a548061a3595e7d Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Mon, 24 Sep 2012 14:51:11 +0200 Subject: [PATCH 061/841] [ADD][FIX]Add services logs and fix relation between driver and his vehicles bzr revid: dle@openerp.com-20120924125111-7g3wheu0689pw4nv --- addons/fleet/fleet.py | 23 +++++++++++++++++++---- addons/fleet/fleet_view.xml | 30 +++++++++++++++++++++++++++--- 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 162e2bada36..da3ecec63a7 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -78,6 +78,7 @@ class fleet_vehicle(osv.Model): 'model_id' : fields.many2one('fleet.vehicle.model', 'Model', required=True, help='Model of the vehicle'), 'log_ids' : fields.one2many('fleet.vehicle.log', 'vehicle_id', 'Logs'), 'log_fuel' : fields.one2many('fleet.vehicle.log.fuel','vehicle_id', 'Fuel Logs'), + 'log_services' : fields.one2many('fleet.vehicle.log.services','vehicle_id', 'Services Logs'), 'acquisition_date' : fields.date('Acquisition date', required=False, help='Date when the vehicle has been bought'), 'acquisition_price' : fields.integer('Price', help='Price of the bought vehicle'), 'color' : fields.char('Color',size=32, help='Color of the vehicle'), @@ -85,8 +86,6 @@ class fleet_vehicle(osv.Model): 'location' : fields.char('Location',size=32, help='Location of the vehicle (garage, ...)'), 'doors' : fields.integer('Number of doors', help='Number of doors of the vehicle'), - 'next_repair_km' : fields.integer('Next Repair Km'), - 'transmission' : fields.selection([('manual', 'Manual'),('automatic','Automatic')], 'Transmission', help='Transmission Used by the vehicle',required=False), 'fuel_type' : fields.selection([('gasoline', 'Gasoline'),('diesel','Diesel'),('electric','Electric'),('hybrid','Hybrid')], 'Fuel Type', help='Fuel Used by the vehicle',required=False), 'horsepower' : fields.integer('Horsepower',required=False), @@ -179,17 +178,33 @@ class fleet_vehicle_log_insurance(osv.Model): 'description' : fields.text('Description'), } +class service_type(osv.Model): + _name = 'fleet.service.type' + _columns = { + 'name': fields.char('Name', required=True, translate=True), + } + class fleet_vehicle_log_services(osv.Model): + def _compute_complete_service(self, cr, uid, ids, field, arg, context=None): + return dict( + (record.id, " ".join(service.name for service in record.service_ids)) + for record in self.browse(cr, uid, ids, context=context) + ) _inherit = 'fleet.vehicle.log' _name = 'fleet.vehicle.log.services' _columns = { - 'description' : fields.text('Description'), + 'vehicle_id' :fields.many2one('fleet.vehicle', 'Vehicle', required=True), + 'vendor_id' :fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"), + 'amount' :fields.float('Amount', help="Total cost of the service"), + 'reference' :fields.char('Reference',size=128), + 'service_ids' :fields.many2many('fleet.service.type','vehicle_service_type_rel','vehicle_service_type_id','service_id','Services completed'), + 'complete_service': fields.function(_compute_complete_service, type="char", string='Services completed'), } class hr_employee(osv.Model): _inherit = 'hr.employee' _columns = { - 'vehicle_id' : fields.many2one('fleet.vehicle', 'Vehicle', required=True), + 'vehicle_id' : fields.one2many('fleet.vehicle','driver', 'Vehicle',type="char"), 'log_ids' : fields.one2many('fleet.vehicle.log', 'employee_id', 'Logs'), } \ No newline at end of file diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index f9b63fc4fbe..330c4b61d62 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -89,8 +89,31 @@ - - + + + + + + + + + + + +
+ + + + + + + + + + + +
+ @@ -169,6 +192,7 @@ + @@ -236,7 +260,7 @@ - + From a9d4bf30bb55acf889538ab715dba1c682d2d38a Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Mon, 24 Sep 2012 15:03:35 +0200 Subject: [PATCH 062/841] [MERGE]removed some conflicts in view bzr revid: csn@openerp.com-20120924130335-vvkhdz9jexcnsqrq --- addons/fleet/fleet_view.xml | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 330c4b61d62..f758ce680b6 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -228,17 +228,21 @@ - fleet.vehicle.log.tree - fleet.vehicle.log - - - - - - - - - + + fleet.vehicle.log.tree + fleet.vehicle.log + + + + + + + + + + + + From 0efec5d0047773bbdf3be92cf5ef63a4f2ae50c3 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Mon, 24 Sep 2012 15:08:43 +0200 Subject: [PATCH 063/841] [REM]Complete services fields bzr revid: dle@openerp.com-20120924130843-tpnhes50q7rryg5l --- addons/fleet/fleet.py | 6 ------ addons/fleet/fleet_view.xml | 4 +--- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index da3ecec63a7..425c1d4db00 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -185,11 +185,6 @@ class service_type(osv.Model): } class fleet_vehicle_log_services(osv.Model): - def _compute_complete_service(self, cr, uid, ids, field, arg, context=None): - return dict( - (record.id, " ".join(service.name for service in record.service_ids)) - for record in self.browse(cr, uid, ids, context=context) - ) _inherit = 'fleet.vehicle.log' _name = 'fleet.vehicle.log.services' _columns = { @@ -198,7 +193,6 @@ class fleet_vehicle_log_services(osv.Model): 'amount' :fields.float('Amount', help="Total cost of the service"), 'reference' :fields.char('Reference',size=128), 'service_ids' :fields.many2many('fleet.service.type','vehicle_service_type_rel','vehicle_service_type_id','service_id','Services completed'), - 'complete_service': fields.function(_compute_complete_service, type="char", string='Services completed'), } class hr_employee(osv.Model): diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index f758ce680b6..c82e326587d 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -97,8 +97,7 @@ - - +
@@ -109,7 +108,6 @@ -
From c36fa305777ba408a0fb03a60ccd4ef8a858c939 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Mon, 24 Sep 2012 15:11:23 +0200 Subject: [PATCH 064/841] [FIX]services widget at wrong place bzr revid: dle@openerp.com-20120924131123-sfs73lkgb5ef7a3f --- addons/fleet/fleet_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index c82e326587d..fc63fd75f95 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -97,7 +97,7 @@ - +
@@ -107,7 +107,7 @@ - +
From 63f67de14ed658272aa366ea9f85afa36d5fcc97 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Mon, 24 Sep 2012 16:49:27 +0200 Subject: [PATCH 065/841] [ADD]demo file, + openchatter fixes bzr revid: dle@openerp.com-20120924144927-ukw5wbvpazj4a4ea --- addons/fleet/__openerp__.py | 1 + addons/fleet/demo.xml | 67 +++++++++++++++++++++++++++++++++++++ addons/fleet/fleet.py | 18 +++++++--- 3 files changed, 82 insertions(+), 4 deletions(-) create mode 100644 addons/fleet/demo.xml diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py index 34cc89514a9..36294c4086b 100644 --- a/addons/fleet/__openerp__.py +++ b/addons/fleet/__openerp__.py @@ -6,6 +6,7 @@ 'base', 'hr', ], + 'demo': ['demo.xml'], 'author' : 'OpenERP S.A.', 'description' : """ I'm a good module and I will handle the cars of your company ! diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml new file mode 100644 index 00000000000..e2cb94a18aa --- /dev/null +++ b/addons/fleet/demo.xml @@ -0,0 +1,67 @@ + + + + + + Opel + + + + BMW + + + + Audi + + + + Mercedes + + + + Corsa + + + + + Astra + + + + + 1-ACK-205 + 5454541 + + Black + Grand-Rosiere + 5 + + + + + + 1-SYN-404 + 1337 + + Red + Grand-Rosiere + 5 + + + + + + Oil change + + + + + + + Services + 500.0 + + + + + diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 425c1d4db00..c3dffa41f0a 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -48,6 +48,12 @@ class fleet_vehicle(osv.Model): _inherit = 'mail.thread' + def create_send_note(self, cr, uid, ids, context=None): + for id in ids: + message = _("%s has been created.")% (self.case_get_note_msg_prefix(cr, uid, id, context=context)) + self.message_post(cr, uid, [id], body=message, context=context) + return True + def name_get(self, cr, uid, ids, context=None): if context is None: context = {} @@ -137,7 +143,9 @@ class fleet_vehicle_log(osv.Model): class fleet_vehicle_log_fuel(osv.Model): - _inherit = 'fleet.vehicle.log' + + _inherit = ['fleet.vehicle.log','mail.thread'] + def _get_price(self, cr, uid, ids, fields, args, context=None): result = {} @@ -185,15 +193,16 @@ class service_type(osv.Model): } class fleet_vehicle_log_services(osv.Model): - _inherit = 'fleet.vehicle.log' + _inherit = ['fleet.vehicle.log'] + _name = 'fleet.vehicle.log.services' _columns = { - 'vehicle_id' :fields.many2one('fleet.vehicle', 'Vehicle', required=True), 'vendor_id' :fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"), 'amount' :fields.float('Amount', help="Total cost of the service"), 'reference' :fields.char('Reference',size=128), 'service_ids' :fields.many2many('fleet.service.type','vehicle_service_type_rel','vehicle_service_type_id','service_id','Services completed'), } + _defaults = {'type': 'Services'} class hr_employee(osv.Model): _inherit = 'hr.employee' @@ -201,4 +210,5 @@ class hr_employee(osv.Model): _columns = { 'vehicle_id' : fields.one2many('fleet.vehicle','driver', 'Vehicle',type="char"), 'log_ids' : fields.one2many('fleet.vehicle.log', 'employee_id', 'Logs'), - } \ No newline at end of file + } + From 4fe5d8c18da7f5047730a619e84885cbaa4d7a24 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Mon, 24 Sep 2012 17:29:37 +0200 Subject: [PATCH 066/841] [ADD]view for repair log and services log bzr revid: csn@openerp.com-20120924152937-xt6axiw64d47eky1 --- addons/fleet/fleet.py | 5 +- addons/fleet/fleet_view.xml | 91 ++++++++++++++++++++++++++++++++++++- 2 files changed, 92 insertions(+), 4 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index c3dffa41f0a..f30728c0043 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -170,10 +170,9 @@ class fleet_vehicle_log_fuel(osv.Model): _name = 'fleet.vehicle.log.fuel' _columns = { - 'description' : fields.text('Description'), 'liter' : fields.integer('Liter'), 'price_per_liter' : fields.float('Price per liter'), - 'amount': fields.function(_get_price, type='float', multi='fuel', string='Fuel Amount'), + 'amount': fields.function(_get_price, type='float', multi='fuel', string='Total Price'), 'type' : fields.char('Type', size=32), 'inv_ref' : fields.char('Invoice Ref.', size=32), } @@ -198,7 +197,7 @@ class fleet_vehicle_log_services(osv.Model): _name = 'fleet.vehicle.log.services' _columns = { 'vendor_id' :fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"), - 'amount' :fields.float('Amount', help="Total cost of the service"), + 'amount' :fields.float('Cost', help="Total cost of the service"), 'reference' :fields.char('Reference',size=128), 'service_ids' :fields.many2many('fleet.service.type','vehicle_service_type_rel','vehicle_service_type_id','service_id','Services completed'), } diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index fc63fd75f95..d741a57e093 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -240,7 +240,6 @@ - @@ -252,6 +251,96 @@ + + fleet.vehicle.log.fuel.form + fleet.vehicle.log.fuel + +
+ + + + + + + + + + + +
+ + + + + + fleet.vehicle.log.fuel.tree + fleet.vehicle.log.fuel + + + + + + + + + + + + + + + Vehicle Fuel Logs + fleet.vehicle.log.fuel + form + tree,form + + + + + + fleet.vehicle.log.services.form + fleet.vehicle.log.services + +
+ + + + + + + + + + + +
+ + + + + + fleet.vehicle.log.services.tree + fleet.vehicle.log.services + + + + + + + + + + + + + + Vehicle Services Logs + fleet.vehicle.log.services + form + tree,form + + + fleet.hr.employee.form From abc69034311024a38e565e84dd577f381b943067 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Mon, 24 Sep 2012 17:38:26 +0200 Subject: [PATCH 067/841] [ADD] Vehicle insurances fields bzr revid: dle@openerp.com-20120924153826-9wuc7f7e16e5q722 --- addons/fleet/fleet.py | 13 +++++++++++++ addons/fleet/fleet_view.xml | 31 ++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index f30728c0043..9b31120ebc6 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -85,6 +85,7 @@ class fleet_vehicle(osv.Model): 'log_ids' : fields.one2many('fleet.vehicle.log', 'vehicle_id', 'Logs'), 'log_fuel' : fields.one2many('fleet.vehicle.log.fuel','vehicle_id', 'Fuel Logs'), 'log_services' : fields.one2many('fleet.vehicle.log.services','vehicle_id', 'Services Logs'), + 'log_insurances' : fields.one2many('fleet.vehicle.log.insurance','vehicle_id', 'Insurances'), 'acquisition_date' : fields.date('Acquisition date', required=False, help='Date when the vehicle has been bought'), 'acquisition_price' : fields.integer('Price', help='Price of the bought vehicle'), 'color' : fields.char('Color',size=32, help='Color of the vehicle'), @@ -178,12 +179,24 @@ class fleet_vehicle_log_fuel(osv.Model): } _defaults = {'type': 'Refueling',} +class fleet_insurance_type(osv.Model): + _name = 'fleet.insurance.type' + _columns = { + 'name': fields.char('Name', required=True, translate=True), + } + class fleet_vehicle_log_insurance(osv.Model): _inherit = 'fleet.vehicle.log' _name = 'fleet.vehicle.log.insurance' _columns = { + 'insurance_type' : fields.many2one('fleet.insurance.type', 'Type', required=False, help='Type of the insurance'), + 'start_date' : fields.date('Start date', required=False, help='Date when the coverage of the insurance begins'), + 'expiration_date' : fields.date('Expiration date', required=False, help='Date when the coverage of the insurance expirates'), + 'price' : fields.float('Price', help="Cost of the insurance for the specified period"), + 'insurer_id' :fields.many2one('res.partner', 'Insurer', domain="[('supplier','=',True)]"), 'description' : fields.text('Description'), } + _defaults = {'type': 'Insurance',} class service_type(osv.Model): _name = 'fleet.service.type' diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index d741a57e093..f5e94e519ce 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -89,6 +89,35 @@ + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + @@ -99,7 +128,7 @@ -
+ From a4d644cd33fb3747064bcbaee5b780e13fb80be8 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Mon, 24 Sep 2012 17:58:24 +0200 Subject: [PATCH 068/841] [IMP]Logs views improvement, various logs concatened in one view. Add demo data for fuel logs bzr revid: dle@openerp.com-20120924155824-v78fhhjfwm07oa27 --- addons/fleet/demo.xml | 9 +++ addons/fleet/fleet.py | 5 +- addons/fleet/fleet_view.xml | 137 ++++++++++++++++++------------------ 3 files changed, 80 insertions(+), 71 deletions(-) diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml index e2cb94a18aa..2e8f3f02b48 100644 --- a/addons/fleet/demo.xml +++ b/addons/fleet/demo.xml @@ -63,5 +63,14 @@ + + + + + Fuel + 40.0 + 1.45 + + diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 9b31120ebc6..c17fc0a1fcd 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -82,7 +82,7 @@ class fleet_vehicle(osv.Model): 'vin_sn' : fields.char('Chassis Number', size=32, required=False, help='Unique number written on the vehicle motor (VIN/SN number)'), 'driver' : fields.many2one('hr.employee', 'Driver',required=False, help='Driver of the vehicle'), 'model_id' : fields.many2one('fleet.vehicle.model', 'Model', required=True, help='Model of the vehicle'), - 'log_ids' : fields.one2many('fleet.vehicle.log', 'vehicle_id', 'Logs'), + 'log_ids' : fields.one2many('fleet.vehicle.log', 'vehicle_id', 'Other Logs'), 'log_fuel' : fields.one2many('fleet.vehicle.log.fuel','vehicle_id', 'Fuel Logs'), 'log_services' : fields.one2many('fleet.vehicle.log.services','vehicle_id', 'Services Logs'), 'log_insurances' : fields.one2many('fleet.vehicle.log.insurance','vehicle_id', 'Insurances'), @@ -171,10 +171,9 @@ class fleet_vehicle_log_fuel(osv.Model): _name = 'fleet.vehicle.log.fuel' _columns = { - 'liter' : fields.integer('Liter'), + 'liter' : fields.float('Liter'), 'price_per_liter' : fields.float('Price per liter'), 'amount': fields.function(_get_price, type='float', multi='fuel', string='Total Price'), - 'type' : fields.char('Type', size=32), 'inv_ref' : fields.char('Invoice Ref.', size=32), } _defaults = {'type': 'Refueling',} diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index f5e94e519ce..9955e931112 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -118,75 +118,76 @@
- - - - - - - - - - -
- - - - - - - - - - -
- - - - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - - -
- - - - - - - - -
- + + + + + + + + + + +
+ + + + + + + + + + +
+ + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + +
+ + + + + + + + +
+ + From 33de7c58320735d0ee79428188fe5ccd61fb7373 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Tue, 25 Sep 2012 09:47:20 +0200 Subject: [PATCH 069/841] [FIX]bug getname when brand deleted bzr revid: dle@openerp.com-20120925074720-fosudvzez8lanhul --- addons/fleet/fleet.py | 8 +++++--- addons/fleet/fleet_view.xml | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index c17fc0a1fcd..d4c6607d2e1 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -18,7 +18,7 @@ class fleet_vehicle_model(osv.Model): res = [] for record in reads: name = record.modelname - if record.brand: + if record.brand.name: name = record.brand.name+' / '+name res.append((record.id, name)) return res @@ -64,8 +64,10 @@ class fleet_vehicle(osv.Model): for record in reads: if record.registration: name = record.registration - if record.model_id: - name = record.model_id.brand.name+' / '+record.model_id.modelname + ' / ' + name + if record.model_id.modelname: + name = record.model_id.modelname + ' / ' + name + if record.model_id.brand.name: + name = record.model_id.brand.name+' / '+ name res.append((record.id, name)) return res diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 9955e931112..0ee708ca38e 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -29,8 +29,8 @@ fleet.vehicle.model - + From 3fdd614cc8256c623f35ef57d5aaeaf270d68a43 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Tue, 25 Sep 2012 10:35:00 +0200 Subject: [PATCH 070/841] [UPDATE]changes create_date fields in log by creation_date to remove a warning - create_date is a reserved fields bzr revid: csn@openerp.com-20120925083500-lihupfbu5y9ycq7b --- addons/fleet/demo.xml | 4 ++-- addons/fleet/fleet.py | 17 +++++++++++++---- addons/fleet/fleet_view.xml | 26 +++++++++++++------------- 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml index 2e8f3f02b48..e7377705447 100644 --- a/addons/fleet/demo.xml +++ b/addons/fleet/demo.xml @@ -57,7 +57,7 @@ - + Services 500.0 @@ -66,7 +66,7 @@ - + Fuel 40.0 1.45 diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index d4c6607d2e1..9826b08e792 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -131,16 +131,18 @@ class fleet_vehicle_log(osv.Model): _name = 'fleet.vehicle.log' _columns = { + 'name' : fields.char('Log',size=32), 'employee_id' : fields.many2one('hr.employee', 'Employee', required=True), 'vehicle_id' : fields.many2one('fleet.vehicle', 'Vehicle', required=True), - 'create_date' : fields.date('Creation Date'), + 'date_creation' : fields.date('Creation Date'), 'description' : fields.text('Description'), 'type' : fields.char('Type',size=32), } _defaults = { + 'name' : 'Log', 'type' : 'Log', } @@ -178,7 +180,10 @@ class fleet_vehicle_log_fuel(osv.Model): 'amount': fields.function(_get_price, type='float', multi='fuel', string='Total Price'), 'inv_ref' : fields.char('Invoice Ref.', size=32), } - _defaults = {'type': 'Refueling',} + _defaults = { + 'name': 'Fuel log', + 'type': 'Refueling', + } class fleet_insurance_type(osv.Model): _name = 'fleet.insurance.type' @@ -197,7 +202,9 @@ class fleet_vehicle_log_insurance(osv.Model): 'insurer_id' :fields.many2one('res.partner', 'Insurer', domain="[('supplier','=',True)]"), 'description' : fields.text('Description'), } - _defaults = {'type': 'Insurance',} + _defaults = { + 'name': 'Insurance log', + 'type': 'Insurance',} class service_type(osv.Model): _name = 'fleet.service.type' @@ -215,7 +222,9 @@ class fleet_vehicle_log_services(osv.Model): 'reference' :fields.char('Reference',size=128), 'service_ids' :fields.many2many('fleet.service.type','vehicle_service_type_rel','vehicle_service_type_id','service_id','Services completed'), } - _defaults = {'type': 'Services'} + _defaults = { + 'name': 'Service log', + 'type': 'Services'} class hr_employee(osv.Model): _inherit = 'hr.employee' diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 0ee708ca38e..0ded1d69d71 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -109,7 +109,7 @@ - + @@ -127,12 +127,12 @@ - +
- + @@ -151,12 +151,12 @@ - + - + @@ -174,13 +174,13 @@ - + - + @@ -245,7 +245,7 @@ - + @@ -263,7 +263,7 @@ - + @@ -288,7 +288,7 @@ - + @@ -307,7 +307,7 @@ fleet.vehicle.log.fuel - + @@ -334,7 +334,7 @@ - + @@ -353,7 +353,7 @@ fleet.vehicle.log.services - + From 10cd8374b83b445124de5a70becf2a95d4c10a82 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Tue, 25 Sep 2012 10:40:05 +0200 Subject: [PATCH 071/841] [FIX]Fuel price computation bzr revid: dle@openerp.com-20120925084005-b037jpy4xg6d0ev6 --- addons/fleet/fleet.py | 50 +++++++++++++++++++++++++------------ addons/fleet/fleet_view.xml | 18 ++++++++----- 2 files changed, 46 insertions(+), 22 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 9826b08e792..3ed8c426581 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -151,33 +151,51 @@ class fleet_vehicle_log_fuel(osv.Model): _inherit = ['fleet.vehicle.log','mail.thread'] + def on_change_liter(self, cr, uid, ids, liter, price_per_liter, amount, context=None): - def _get_price(self, cr, uid, ids, fields, args, context=None): - result = {} - for record in self.browse(cr, uid, ids, context=None): - res = record.liter * record.price_per_liter - result[record.id] = { - 'amount' : res, - } - return result + print 'Debug :' + str(liter) + ' | ' + str(price_per_liter) + ' | ' + str(amount) - def on_change_fuel(self, cr, uid, ids, liter, price_per_liter, context=None): + if liter > 0 and price_per_liter > 0: + return {'value' : {'liter': liter,'price_per_liter': price_per_liter, 'amount' : liter * price_per_liter,}} + elif liter > 0 and amount > 0: + return {'value' : {'liter' : liter, 'amount' : amount, 'price_per_liter' : float(amount / liter),}} + elif price_per_liter > 0 and amount > 0: + return {'value' : {'price_per_liter' : price_per_liter, 'amount' : amount, 'liter' : float(amount / price_per_liter),}} + else : + return {} - print 'Amount : ' + str(liter * price_per_liter) + def on_change_price_per_liter(self, cr, uid, ids, liter, price_per_liter, amount, context=None): - return { - 'value' : { - 'amount' : liter * price_per_liter, - } - } + print 'Debug :' + str(liter) + ' | ' + str(price_per_liter) + ' | ' + str(amount) + if price_per_liter > 0 and liter > 0: + return {'value' : {'liter' : liter, 'price_per_liter' : price_per_liter, 'amount' : liter * price_per_liter,}} + elif price_per_liter > 0 and amount > 0: + return {'value' : {'price_per_liter' : price_per_liter, 'amount' : amount, 'liter' : float(amount / price_per_liter),}} + elif liter > 0 and amount > 0: + return {'value' : {'liter' : liter, 'amount' : amount, 'price_per_liter' : float(amount / liter),}} + else : + return {} + + def on_change_amount(self, cr, uid, ids, liter, price_per_liter, amount, context=None): + + print 'Debug :' + str(liter) + ' | ' + str(price_per_liter) + ' | ' + str(amount) + + if amount > 0 and liter > 0: + return {'value' : {'liter' : liter, 'amount' : amount, 'price_per_liter' : float(amount / liter),}} + elif amount > 0 and price_per_liter > 0: + return {'value' : {'price_per_liter' : price_per_liter, 'amount' : amount, 'liter' : float(amount / price_per_liter),}} + elif liter > 0 and price_per_liter > 0: + return {'value' : {'liter' : liter, 'price_per_liter' : price_per_liter, 'amount' : liter * price_per_liter,}} + else : + return {} _name = 'fleet.vehicle.log.fuel' _columns = { 'liter' : fields.float('Liter'), 'price_per_liter' : fields.float('Price per liter'), - 'amount': fields.function(_get_price, type='float', multi='fuel', string='Total Price'), + 'amount': fields.float('Total price'), 'inv_ref' : fields.char('Invoice Ref.', size=32), } _defaults = { diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 0ded1d69d71..0164037a6e0 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -155,14 +155,20 @@ + + + + + + + + + + + + - - - - - - From 9d2dfd6d2e75954d4e4ffe0c3ac2e8ae1bea3d61 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Tue, 25 Sep 2012 11:20:22 +0200 Subject: [PATCH 072/841] [FIX]Fuel price computation bugs, missing float casts bzr revid: dle@openerp.com-20120925092022-vpwh5likl1ul37qm --- addons/fleet/fleet.py | 28 +++++++++++++--------------- addons/fleet/fleet_view.xml | 2 ++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 3ed8c426581..087efc67002 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -153,40 +153,37 @@ class fleet_vehicle_log_fuel(osv.Model): def on_change_liter(self, cr, uid, ids, liter, price_per_liter, amount, context=None): - print 'Debug :' + str(liter) + ' | ' + str(price_per_liter) + ' | ' + str(amount) - if liter > 0 and price_per_liter > 0: - return {'value' : {'liter': liter,'price_per_liter': price_per_liter, 'amount' : liter * price_per_liter,}} + return {'value' : {'amount' : float(liter) * float(price_per_liter),}} elif liter > 0 and amount > 0: - return {'value' : {'liter' : liter, 'amount' : amount, 'price_per_liter' : float(amount / liter),}} + return {'value' : {'price_per_liter' : float(amount) / float(liter),}} elif price_per_liter > 0 and amount > 0: - return {'value' : {'price_per_liter' : price_per_liter, 'amount' : amount, 'liter' : float(amount / price_per_liter),}} + return {'value' : {'liter' : float(amount) / float(price_per_liter),}} else : return {} def on_change_price_per_liter(self, cr, uid, ids, liter, price_per_liter, amount, context=None): - print 'Debug :' + str(liter) + ' | ' + str(price_per_liter) + ' | ' + str(amount) - + liter = float(liter); + price_per_liter = float(price_per_liter); if price_per_liter > 0 and liter > 0: - return {'value' : {'liter' : liter, 'price_per_liter' : price_per_liter, 'amount' : liter * price_per_liter,}} + print 'Debug :' + str(liter) + ' | ' + str(price_per_liter) + ' | ' + str(amount) + return {'value' : {'amount' : float(liter) * float(price_per_liter),}} elif price_per_liter > 0 and amount > 0: - return {'value' : {'price_per_liter' : price_per_liter, 'amount' : amount, 'liter' : float(amount / price_per_liter),}} + return {'value' : {'liter' : float(amount) / float(price_per_liter),}} elif liter > 0 and amount > 0: - return {'value' : {'liter' : liter, 'amount' : amount, 'price_per_liter' : float(amount / liter),}} + return {'value' : {'price_per_liter' : float(amount) / float(liter),}} else : return {} def on_change_amount(self, cr, uid, ids, liter, price_per_liter, amount, context=None): - print 'Debug :' + str(liter) + ' | ' + str(price_per_liter) + ' | ' + str(amount) - if amount > 0 and liter > 0: - return {'value' : {'liter' : liter, 'amount' : amount, 'price_per_liter' : float(amount / liter),}} + return {'value' : {'price_per_liter' : float(amount) / float(liter),}} elif amount > 0 and price_per_liter > 0: - return {'value' : {'price_per_liter' : price_per_liter, 'amount' : amount, 'liter' : float(amount / price_per_liter),}} + return {'value' : {'liter' : float(amount) / float(price_per_liter),}} elif liter > 0 and price_per_liter > 0: - return {'value' : {'liter' : liter, 'price_per_liter' : price_per_liter, 'amount' : liter * price_per_liter,}} + return {'value' : {'amount' : float(liter) * float(price_per_liter),}} else : return {} @@ -197,6 +194,7 @@ class fleet_vehicle_log_fuel(osv.Model): 'price_per_liter' : fields.float('Price per liter'), 'amount': fields.float('Total price'), 'inv_ref' : fields.char('Invoice Ref.', size=32), + 'vendor_id' :fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"), } _defaults = { 'name': 'Fuel log', diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 0164037a6e0..7d0c6f737f7 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -150,6 +150,7 @@ + @@ -165,6 +166,7 @@ + From 81f5b7c64b45d020d82a04d38d571d35e5f97eff Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Tue, 25 Sep 2012 12:40:57 +0200 Subject: [PATCH 073/841] [FIX]Odometer logs bzr revid: dle@openerp.com-20120925104057-ztuns0n60pycg64z --- addons/fleet/fleet.py | 29 +++++++++++++++++++- addons/fleet/fleet_view.xml | 53 +++++++++++++++++++++++++++---------- 2 files changed, 67 insertions(+), 15 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 087efc67002..6bc74d40191 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -88,6 +88,7 @@ class fleet_vehicle(osv.Model): 'log_fuel' : fields.one2many('fleet.vehicle.log.fuel','vehicle_id', 'Fuel Logs'), 'log_services' : fields.one2many('fleet.vehicle.log.services','vehicle_id', 'Services Logs'), 'log_insurances' : fields.one2many('fleet.vehicle.log.insurance','vehicle_id', 'Insurances'), + 'log_odometer' : fields.one2many('fleet.vehicle.log.odometer','vehicle_id', 'Odometer'), 'acquisition_date' : fields.date('Acquisition date', required=False, help='Date when the vehicle has been bought'), 'acquisition_price' : fields.integer('Price', help='Price of the bought vehicle'), 'color' : fields.char('Color',size=32, help='Color of the vehicle'), @@ -195,6 +196,7 @@ class fleet_vehicle_log_fuel(osv.Model): 'amount': fields.float('Total price'), 'inv_ref' : fields.char('Invoice Ref.', size=32), 'vendor_id' :fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"), + 'log_odometer_id' :fields.many2one('fleet.vehicle.log.odometer', 'Odometer Log'), } _defaults = { 'name': 'Fuel log', @@ -222,7 +224,7 @@ class fleet_vehicle_log_insurance(osv.Model): 'name': 'Insurance log', 'type': 'Insurance',} -class service_type(osv.Model): +class fleet_service_type(osv.Model): _name = 'fleet.service.type' _columns = { 'name': fields.char('Name', required=True, translate=True), @@ -242,6 +244,31 @@ class fleet_vehicle_log_services(osv.Model): 'name': 'Service log', 'type': 'Services'} +class fleet_vehicle_log_services(osv.Model): + _inherit = ['fleet.vehicle.log'] + + _name = 'fleet.vehicle.log.services' + _columns = { + 'vendor_id' :fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"), + 'amount' :fields.float('Cost', help="Total cost of the service"), + 'reference' :fields.char('Reference',size=128), + 'service_ids' :fields.many2many('fleet.service.type','vehicle_service_type_rel','vehicle_service_type_id','service_id','Services completed'), + } + _defaults = { + 'name': 'Service log', + 'type': 'Services'} + +class fleet_vehicle_log_odometer(osv.Model): + _inherit = ['fleet.vehicle.log'] + + _name = 'fleet.vehicle.log.odometer' + _columns = { + 'value' : fields.float('Value', required=True, help="Meter reading at service, fuel up and others"), + } + _defaults = { + 'name': 'Odometer Log', + 'type': 'Odometer'} + class hr_employee(osv.Model): _inherit = 'hr.employee' diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 7d0c6f737f7..9ea77645379 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -119,6 +119,30 @@
+ + + + + + + + +
+ + + + + + + + + + + + +
+ + @@ -153,6 +177,7 @@ +
@@ -161,6 +186,7 @@ + @@ -315,13 +341,12 @@ fleet.vehicle.log.fuel - - - - - - - + + + + + + @@ -342,13 +367,13 @@ - - - - - - - + + + + + + + From b7a600f5de1b4b6346e25b6d48d0a46e98179671 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Tue, 25 Sep 2012 13:47:14 +0200 Subject: [PATCH 074/841] [ADD]Openchatter posts bzr revid: dle@openerp.com-20120925114714-z9yghyym20xcmhah --- addons/fleet/fleet.py | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 6bc74d40191..e6dd18cbd29 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -48,12 +48,6 @@ class fleet_vehicle(osv.Model): _inherit = 'mail.thread' - def create_send_note(self, cr, uid, ids, context=None): - for id in ids: - message = _("%s has been created.")% (self.case_get_note_msg_prefix(cr, uid, id, context=context)) - self.message_post(cr, uid, [id], body=message, context=context) - return True - def name_get(self, cr, uid, ids, context=None): if context is None: context = {} @@ -127,6 +121,14 @@ class fleet_vehicle(osv.Model): 'message' : "You have selected this %s model" % (model.name,), } } + def create(self, cr, uid, data, context=None): + vehicle_id = super(fleet_vehicle, self).create(cr, uid, data, context=context) + try: + vehicle = self.browse(cr, uid, vehicle_id, context=context) + self.message_post(cr, uid, [vehicle_id], body='Vehicle %s has been added to the fleet!' % (vehicle.name), context=context) + except: + pass # group deleted: do not push a message + return vehicle_id class fleet_vehicle_log(osv.Model): _name = 'fleet.vehicle.log' @@ -244,20 +246,6 @@ class fleet_vehicle_log_services(osv.Model): 'name': 'Service log', 'type': 'Services'} -class fleet_vehicle_log_services(osv.Model): - _inherit = ['fleet.vehicle.log'] - - _name = 'fleet.vehicle.log.services' - _columns = { - 'vendor_id' :fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"), - 'amount' :fields.float('Cost', help="Total cost of the service"), - 'reference' :fields.char('Reference',size=128), - 'service_ids' :fields.many2many('fleet.service.type','vehicle_service_type_rel','vehicle_service_type_id','service_id','Services completed'), - } - _defaults = { - 'name': 'Service log', - 'type': 'Services'} - class fleet_vehicle_log_odometer(osv.Model): _inherit = ['fleet.vehicle.log'] From 7df4da3c4a0d2279a9f04f6ab236dcfa47c72d8a Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Tue, 25 Sep 2012 14:09:42 +0200 Subject: [PATCH 075/841] [ADD]security access rules for each object bzr revid: csn@openerp.com-20120925120942-rdaiucpwmt4jl8v3 --- addons/fleet/__openerp__.py | 3 ++- addons/fleet/security/ir.model.access.csv | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 addons/fleet/security/ir.model.access.csv diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py index 36294c4086b..bcf63662081 100644 --- a/addons/fleet/__openerp__.py +++ b/addons/fleet/__openerp__.py @@ -15,5 +15,6 @@ 'application' : True, 'data' : [ 'fleet_view.xml', - ] + ], + 'update_xml' : ['security/ir.model.access.csv'], } \ No newline at end of file diff --git a/addons/fleet/security/ir.model.access.csv b/addons/fleet/security/ir.model.access.csv new file mode 100644 index 00000000000..3a1b3808642 --- /dev/null +++ b/addons/fleet/security/ir.model.access.csv @@ -0,0 +1,12 @@ +id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink +fleet_vehicle_model_access_right,fleet_vehicle_model_access_right,model_fleet_vehicle_model,,1,1,1,1 +fleet_vehicle_type_access_right,fleet_vehicle_type_access_right,model_fleet_vehicle_type,,1,1,1,1 +fleet_vehicle_model_brand_access_right,fleet_vehicle_model_brand_access_right,model_fleet_vehicle_model_brand,,1,1,1,1 +fleet_vehicle_access_right,fleet_vehicle_access_right,model_fleet_vehicle,,1,1,1,1 +fleet_vehicle_log_access_right,fleet_vehicle_log_access_right,model_fleet_vehicle_log,,1,1,1,1 +fleet_vehicle_log_fuel_access_right,fleet_vehicle_log_fuel_access_right,model_fleet_vehicle_log_fuel,,1,1,1,1 +fleet_vehicle_log_services_access_right,fleet_vehicle_log_services_access_right,model_fleet_vehicle_log_services,,1,1,1,1 +fleet_vehicle_log_insurance_access_right,fleet_vehicle_log_insurance_access_right,model_fleet_vehicle_log_insurance,,1,1,1,1 +fleet_vehicle_log_odometer_access_right,fleet_vehicle_log_odometer_access_right,model_fleet_vehicle_log_odometer,,1,1,1,1 +fleet_insurance_type_access_right,fleet_insurance_type_access_right,model_fleet_insurance_type,,1,1,1,1 +fleet_service_type_access_right,fleet_service_type_access_right,model_fleet_service_type,,1,1,1,1 \ No newline at end of file From b0cd93db7584f22cd8041d89f74af3e57ecc0611 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Tue, 25 Sep 2012 15:48:39 +0200 Subject: [PATCH 076/841] [ADD]button to show log in vehicle view and change field registration to be required=true bzr revid: csn@openerp.com-20120925134839-gpfbt3betm0f65u3 --- addons/fleet/fleet.py | 19 ++++++++++++++++++- addons/fleet/fleet_view.xml | 3 +++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index e6dd18cbd29..7debd38d25c 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -69,12 +69,29 @@ class fleet_vehicle(osv.Model): res = self.name_get(cr, uid, ids, context=context) return dict(res) + + def action_showLog(self, cr, uid, ids, context=None): + """ This opens log view to view and add new log for this vehicle + @return: + """ + print 'HELLO YOU--------------------------------------------' + res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','fleet_vehicle_log_act', context) + return res + #res['context'] = { + # 'default_partner_ids': applicant.partner_id and [applicant.partner_id.id] or False, + # 'default_user_id': uid, + # 'default_state': 'open', + # 'default_name': applicant.name, + # 'default_categ_ids': category and [category.id] or False, + #} + #return res + _name = 'fleet.vehicle' _description = 'Fleet Vehicle' _columns = { 'name' : fields.function(_vehicle_name_get_fnc, type="char", string='Name', store=True), - 'registration' : fields.char('Registration', size=32, required=False, help='Registration number of the vehicle (ie: plate number for a car)'), + 'registration' : fields.char('Registration', size=32, required=True, help='Registration number of the vehicle (ie: plate number for a car)'), 'vin_sn' : fields.char('Chassis Number', size=32, required=False, help='Unique number written on the vehicle motor (VIN/SN number)'), 'driver' : fields.many2one('hr.employee', 'Driver',required=False, help='Driver of the vehicle'), 'model_id' : fields.many2one('fleet.vehicle.model', 'Model', required=True, help='Model of the vehicle'), diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 9ea77645379..02910111571 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -72,6 +72,9 @@
+
+
From 87a949c8ba92964f8d3913daf5d8c32231ee3b4a Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Tue, 25 Sep 2012 15:49:41 +0200 Subject: [PATCH 077/841] [ADD]Odometer views + change message_post args + rename log_odometer of fuel log bzr revid: dle@openerp.com-20120925134941-utrgip0vprhgtoxz --- addons/fleet/fleet.py | 12 +++- addons/fleet/fleet_view.xml | 109 +++++++++++++++++++++++++++--------- 2 files changed, 91 insertions(+), 30 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 7debd38d25c..999eeb72a6e 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -142,11 +142,19 @@ class fleet_vehicle(osv.Model): vehicle_id = super(fleet_vehicle, self).create(cr, uid, data, context=context) try: vehicle = self.browse(cr, uid, vehicle_id, context=context) - self.message_post(cr, uid, [vehicle_id], body='Vehicle %s has been added to the fleet!' % (vehicle.name), context=context) + self.message_post(cr, uid, [vehicle_id], body='Vehicle %s has been added to the fleet!' % (vehicle.registration), context=context) except: pass # group deleted: do not push a message return vehicle_id + def write(self, cr, uid, ids, vals, context=None): + vehicle_id = super(fleet_vehicle,self).write(cr, uid, ids, vals, context) + try: + self.message_post(cr, uid, [vehicle_id], body='Vehicle edited', context=context) + except: + pass + return vehicle_id + class fleet_vehicle_log(osv.Model): _name = 'fleet.vehicle.log' @@ -215,7 +223,7 @@ class fleet_vehicle_log_fuel(osv.Model): 'amount': fields.float('Total price'), 'inv_ref' : fields.char('Invoice Ref.', size=32), 'vendor_id' :fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"), - 'log_odometer_id' :fields.many2one('fleet.vehicle.log.odometer', 'Odometer Log'), + 'log_odometer' :fields.many2one('fleet.vehicle.log.odometer', 'Odometer Log'), } _defaults = { 'name': 'Fuel log', diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 02910111571..3da7fa629ac 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -180,7 +180,7 @@ - + @@ -189,7 +189,7 @@ - + @@ -298,13 +298,11 @@ fleet.vehicle.log - - - - - - - + + + + + @@ -324,13 +322,22 @@ + + + + + + + + + + + + + + + - - - - - - @@ -339,19 +346,18 @@ - - fleet.vehicle.log.fuel.tree - fleet.vehicle.log.fuel - - - - - - - - - - + fleet.vehicle.log.fuel.tree + fleet.vehicle.log.fuel + + + + + + + + + + @@ -363,6 +369,53 @@ + + fleet.vehicle.log.odometer.form + fleet.vehicle.log.odometer + + + + + + + + + + + + + + + + + + + + + + + fleet.vehicle.log.odometer.tree + fleet.vehicle.log.odometer + + + + + + + + + + + + + Vehicle Odometer Logs + fleet.vehicle.log.odometer + form + tree,form + + + + fleet.vehicle.log.services.form fleet.vehicle.log.services From 5cfb4d3a0c4d911846742fc7ddb5363b7a255c0c Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Tue, 25 Sep 2012 16:39:30 +0200 Subject: [PATCH 078/841] [REM]Odometer field for fuel log bzr revid: dle@openerp.com-20120925143930-ezhre39jw27zj7ji --- addons/fleet/fleet.py | 2 +- addons/fleet/fleet_view.xml | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 999eeb72a6e..4224d7ad2c1 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -223,7 +223,7 @@ class fleet_vehicle_log_fuel(osv.Model): 'amount': fields.float('Total price'), 'inv_ref' : fields.char('Invoice Ref.', size=32), 'vendor_id' :fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"), - 'log_odometer' :fields.many2one('fleet.vehicle.log.odometer', 'Odometer Log'), + } _defaults = { 'name': 'Fuel log', diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 3da7fa629ac..480560735b6 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -180,7 +180,6 @@ -
@@ -189,7 +188,6 @@ - @@ -328,7 +326,6 @@ - @@ -350,11 +347,12 @@ fleet.vehicle.log.fuel - - + + + From be9558576924f572452584cc463efa42912f348a Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Tue, 25 Sep 2012 16:53:39 +0200 Subject: [PATCH 079/841] [ADD]demo example for odometer log bzr revid: dle@openerp.com-20120925145339-ibwkf9kr0ec60ada --- addons/fleet/demo.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml index e7377705447..b83d0a49160 100644 --- a/addons/fleet/demo.xml +++ b/addons/fleet/demo.xml @@ -71,6 +71,15 @@ 40.0 1.45 + + + + + + Odometer + 1579.5 + Odometer value when vehicle retrieved from partner + From ab1044c0ff823b792cc9fb764afee41129fa745e Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Tue, 25 Sep 2012 17:14:50 +0200 Subject: [PATCH 080/841] [FIX]fix button in vehicle edition to point to log bzr revid: csn@openerp.com-20120925151450-y898trkc4bkb7b00 --- addons/fleet/fleet.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 999eeb72a6e..8bdb8df4290 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -74,17 +74,22 @@ class fleet_vehicle(osv.Model): """ This opens log view to view and add new log for this vehicle @return: """ - print 'HELLO YOU--------------------------------------------' + #print 'HELLO YOU--------------------------------------------' + #print ids[0] + + #vehicle = self.browse(cr, uid, ids[0], context) + #logids = self.browse(cr,uid,log_ids,context) + #print vehicle + #print vehicle.name + #print vehicle.registration + #print logids + #print logids.type res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','fleet_vehicle_log_act', context) - return res - #res['context'] = { - # 'default_partner_ids': applicant.partner_id and [applicant.partner_id.id] or False, - # 'default_user_id': uid, - # 'default_state': 'open', - # 'default_name': applicant.name, - # 'default_categ_ids': category and [category.id] or False, - #} #return res + #res['context'] = { + # 'default_type': 'log', + #} + return res _name = 'fleet.vehicle' _description = 'Fleet Vehicle' From b766b84e1fc9c5b0a8565211234b21c08732a0d7 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Wed, 26 Sep 2012 09:49:15 +0200 Subject: [PATCH 081/841] [ADD]Odometer logs in fuel and services log bzr revid: dle@openerp.com-20120926074915-v0y98pr167p3hew1 --- addons/fleet/fleet.py | 7 +++++-- addons/fleet/fleet_view.xml | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 4224d7ad2c1..02ff58b06f3 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -222,8 +222,8 @@ class fleet_vehicle_log_fuel(osv.Model): 'price_per_liter' : fields.float('Price per liter'), 'amount': fields.float('Total price'), 'inv_ref' : fields.char('Invoice Ref.', size=32), - 'vendor_id' :fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"), - + 'vendor_id' : fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"), + 'odometer_log' : fields.one2many('fleet.vehicle.log.odometer','fuel_log', 'Odometer',type="char"), } _defaults = { 'name': 'Fuel log', @@ -266,6 +266,7 @@ class fleet_vehicle_log_services(osv.Model): 'amount' :fields.float('Cost', help="Total cost of the service"), 'reference' :fields.char('Reference',size=128), 'service_ids' :fields.many2many('fleet.service.type','vehicle_service_type_rel','vehicle_service_type_id','service_id','Services completed'), + 'odometer_log' : fields.one2many('fleet.vehicle.log.odometer','fuel_log', 'Odometer',type="char"), } _defaults = { 'name': 'Service log', @@ -277,6 +278,8 @@ class fleet_vehicle_log_odometer(osv.Model): _name = 'fleet.vehicle.log.odometer' _columns = { 'value' : fields.float('Value', required=True, help="Meter reading at service, fuel up and others"), + 'fuel_log' :fields.many2one('fleet.vehicle.log.fuel', 'Fuel log'), + 'service_log' :fields.many2one('fleet.vehicle.log.services', 'Services log'), } _defaults = { 'name': 'Odometer Log', diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 480560735b6..e8cd4532020 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -165,6 +165,7 @@ +
@@ -198,6 +199,7 @@ +
@@ -336,6 +338,7 @@ +
@@ -354,6 +357,7 @@ + @@ -428,6 +432,7 @@ + @@ -446,6 +451,7 @@ + From 91c4c5cee35a25d89476c4bf3c0227b7e930ed80 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Wed, 26 Sep 2012 10:07:10 +0200 Subject: [PATCH 082/841] [FIX]Fuel log demo amount value missing & odometer_log view fields remove widget bzr revid: dle@openerp.com-20120926080710-zx5815d0dhwodtwz --- addons/fleet/demo.xml | 1 + addons/fleet/fleet_view.xml | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml index b83d0a49160..123b85f847a 100644 --- a/addons/fleet/demo.xml +++ b/addons/fleet/demo.xml @@ -70,6 +70,7 @@ Fuel 40.0 1.45 + 58 diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index e8cd4532020..13e8e112fc4 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -165,7 +165,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -338,7 +338,7 @@ - + @@ -357,7 +357,7 @@ - + @@ -432,7 +432,7 @@ - + @@ -451,7 +451,7 @@ - + From 25690457a54206f6ab0aeeda184794808fa87bff Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Wed, 26 Sep 2012 10:36:49 +0200 Subject: [PATCH 083/841] [ADD]odometer log views in fields of fuel log, service log, and vehicle views bzr revid: dle@openerp.com-20120926083649-1yd3wmxp5eop1vy4 --- addons/fleet/fleet_view.xml | 94 ++++++++++++++++++++++++++++++++----- 1 file changed, 83 insertions(+), 11 deletions(-) diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 13e8e112fc4..bba87629940 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -165,7 +165,25 @@ - + + + + + + +
+ + + + + + + + + + +
+ @@ -199,7 +217,25 @@ - + + + + + + +
+ + + + + + + + + + +
+ @@ -338,7 +374,25 @@ - + + + + + + +
+ + + + + + + + + + +
+ @@ -432,7 +486,25 @@ - + + + + + + +
+ + + + + + + + + + +
+ @@ -445,13 +517,13 @@ fleet.vehicle.log.services - - - - - - - + + + + + + + From fa2c2af8b48c7722d8c861c8a1d3888ba0cbeca7 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Wed, 26 Sep 2012 11:28:58 +0200 Subject: [PATCH 084/841] [ADD]Message post when registration or driver changed for a vehicle bzr revid: dle@openerp.com-20120926092858-k10gxe8kqfekku5s --- addons/fleet/fleet.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 32bd7d56573..fbdcad60f7f 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -1,3 +1,4 @@ +from itertools import chain from osv import osv, fields class fleet_vehicle_model_type(osv.Model): @@ -155,8 +156,15 @@ class fleet_vehicle(osv.Model): def write(self, cr, uid, ids, vals, context=None): vehicle_id = super(fleet_vehicle,self).write(cr, uid, ids, vals, context) try: - self.message_post(cr, uid, [vehicle_id], body='Vehicle edited', context=context) - except: + changes = {} + for key,value in vals.items(): + if key == 'registration' or key == 'driver': + changes[key] = value + if len(changes) > 0: + self.message_post(cr, uid, [vehicle_id], body='Vehicle edited. Changes : '+ str(changes), context=context) + #self.message_post(cr, uid, [vehicle_id], body='Vehicle edited. Changes : '+ ','.join(chain(*str(changes.items()))), context=context) + except Exception as e: + print e pass return vehicle_id From 6002e6abd0ed0ce7940e5397261a54bf81d4fb37 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Wed, 26 Sep 2012 11:34:38 +0200 Subject: [PATCH 085/841] [ADD]add function to compute name of different logs bzr revid: csn@openerp.com-20120926093438-u4n824s5ckfaqxdp --- addons/fleet/fleet.py | 31 +++++++++++++++++++++++++------ addons/fleet/fleet_view.xml | 2 +- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index fbdcad60f7f..bfc67be7beb 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -171,8 +171,27 @@ class fleet_vehicle(osv.Model): class fleet_vehicle_log(osv.Model): _name = 'fleet.vehicle.log' + def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None): + if context is None: + context = {} + if not ids: + return {} + reads = self.browse(cr, uid, ids, context=context) + res = [] + for record in reads: + name = record.type + if record.employee_id.name: + name = name+ ' / '+ record.employee_id.name + if record.vehicle_id.name: + name = name+ ' / '+ record.vehicle_id.name + if record.date_creation: + name = name+ ' / '+record.date_creation + res.append((record.id, name)) + + return dict(res) + _columns = { - 'name' : fields.char('Log',size=32), + 'name' : fields.function(_name_get_fnc, type="text", string='Log', store=True), 'employee_id' : fields.many2one('hr.employee', 'Employee', required=True), 'vehicle_id' : fields.many2one('fleet.vehicle', 'Vehicle', required=True), @@ -183,7 +202,7 @@ class fleet_vehicle_log(osv.Model): } _defaults = { - 'name' : 'Log', + #'name' : 'Log', 'type' : 'Log', } @@ -239,7 +258,7 @@ class fleet_vehicle_log_fuel(osv.Model): 'odometer_log' : fields.one2many('fleet.vehicle.log.odometer','fuel_log', 'Odometer',type="char"), } _defaults = { - 'name': 'Fuel log', + # 'name': 'Fuel log', 'type': 'Refueling', } @@ -261,7 +280,7 @@ class fleet_vehicle_log_insurance(osv.Model): 'description' : fields.text('Description'), } _defaults = { - 'name': 'Insurance log', + #'name': 'Insurance log', 'type': 'Insurance',} class fleet_service_type(osv.Model): @@ -282,7 +301,7 @@ class fleet_vehicle_log_services(osv.Model): 'odometer_log' : fields.one2many('fleet.vehicle.log.odometer','fuel_log', 'Odometer',type="char"), } _defaults = { - 'name': 'Service log', + # 'name': 'Service log', 'type': 'Services'} class fleet_vehicle_log_odometer(osv.Model): @@ -295,7 +314,7 @@ class fleet_vehicle_log_odometer(osv.Model): 'service_log' :fields.many2one('fleet.vehicle.log.services', 'Services log'), } _defaults = { - 'name': 'Odometer Log', + # 'name': 'Odometer Log', 'type': 'Odometer'} class hr_employee(osv.Model): diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index bba87629940..41eaa22254f 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -73,7 +73,7 @@
-
From 18833a0397e13dfabd92ac0cd43972aa8422656a Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Wed, 26 Sep 2012 14:35:12 +0200 Subject: [PATCH 086/841] [ADD]description and other fields in the manifest __openerp__.py, need to change picture with one of a car bzr revid: csn@openerp.com-20120926123512-9rwkpr0zo8qwb83g --- addons/fleet/__openerp__.py | 26 +++++++++++++++++++------- addons/fleet/fleet.py | 4 ++-- addons/fleet/static/src/img/icon.png | Bin 0 -> 20448 bytes 3 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 addons/fleet/static/src/img/icon.png diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py index bcf63662081..ff903419efc 100644 --- a/addons/fleet/__openerp__.py +++ b/addons/fleet/__openerp__.py @@ -2,19 +2,31 @@ { 'name' : 'Fleet Management', 'version' : '0.1', + 'author' : 'OpenERP S.A.', + 'category': 'Fleet Management', + 'website' : 'http://www.openerp.com', + 'summary' : 'Manage your fleet of vehicle', + 'description' : """ +Easy way to manage your fleet +=============================== + +With this easy to use module, you can in a few clicks manage your entire vehicle fleet. + +Managing a single vehicle or thousands of them has never been easier. + +Encode your vehicle, group them with tags, view the ones that interest you with the search function. + +Add insurance and services reminder that will help you by sending you a mail when you need to renew the insurance of a vehicle or do the next maintenance. +""", 'depends' : [ 'base', 'hr', ], - 'demo': ['demo.xml'], - 'author' : 'OpenERP S.A.', - 'description' : """ - I'm a good module and I will handle the cars of your company ! - """, - 'installable' : True, - 'application' : True, 'data' : [ 'fleet_view.xml', ], 'update_xml' : ['security/ir.model.access.csv'], + 'demo': ['demo.xml'], + 'installable' : True, + 'application' : True, } \ No newline at end of file diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index bfc67be7beb..6da7e6d68ae 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -34,7 +34,7 @@ class fleet_vehicle_model(osv.Model): _columns = { 'name' : fields.function(_model_name_get_fnc, type="char", string='Name', store=True), 'modelname' : fields.char('Model name', size=32, required=True), - 'brand' : fields.many2one('fleet.vehicle.model.brand', 'Model brand', required=False, help='Brand of the vehicle'), + 'brand' : fields.many2one('fleet.vehicle.model.brand', 'Model brand', required=True, help='Brand of the vehicle'), 'vendors': fields.many2many('res.partner','fleet_vehicle_model_vendors','model_id', 'partner_id',string='Vendors',required=False), } @@ -192,7 +192,7 @@ class fleet_vehicle_log(osv.Model): _columns = { 'name' : fields.function(_name_get_fnc, type="text", string='Log', store=True), - 'employee_id' : fields.many2one('hr.employee', 'Employee', required=True), + 'employee_id' : fields.many2one('hr.employee', 'Employee'), 'vehicle_id' : fields.many2one('fleet.vehicle', 'Vehicle', required=True), 'date_creation' : fields.date('Creation Date'), diff --git a/addons/fleet/static/src/img/icon.png b/addons/fleet/static/src/img/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8600d565da54d27a7e01690aca37113b6203d2a1 GIT binary patch literal 20448 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 b^}7ET(hk%2fpqe100000NkvXXu0mjfr$i~8 literal 0 HcmV?d00001 From f7372cc5eab3161b36dfcd2a4002578b6ad648f1 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Wed, 26 Sep 2012 15:09:01 +0200 Subject: [PATCH 087/841] [ADD]Logo of brand bzr revid: dle@openerp.com-20120926130901-xri7y3dsl76n9o7n --- addons/fleet/demo.xml | 1 + addons/fleet/fleet.py | 4 ++++ addons/fleet/fleet_view.xml | 9 +++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml index 123b85f847a..50604d76624 100644 --- a/addons/fleet/demo.xml +++ b/addons/fleet/demo.xml @@ -4,6 +4,7 @@ Opel + diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 6da7e6d68ae..17abf800cbd 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -36,6 +36,7 @@ class fleet_vehicle_model(osv.Model): 'modelname' : fields.char('Model name', size=32, required=True), 'brand' : fields.many2one('fleet.vehicle.model.brand', 'Model brand', required=True, help='Brand of the vehicle'), 'vendors': fields.many2many('res.partner','fleet_vehicle_model_vendors','model_id', 'partner_id',string='Vendors',required=False), + 'image': fields.related('brand','image',type="binary",string="Logo",store=False) } class fleet_vehicle_model_brand(osv.Model): @@ -43,6 +44,7 @@ class fleet_vehicle_model_brand(osv.Model): _description = 'Brand model of the vehicle' _columns = { 'name' : fields.char('Brand Name',size=32, required=True), + 'image': fields.binary("Logo",help="This field holds the image used as logo for the brand, limited to 128x128px."), } class fleet_vehicle(osv.Model): @@ -119,6 +121,8 @@ class fleet_vehicle(osv.Model): 'horsepower_tax': fields.float('Horsepower Taxation'), 'power' : fields.integer('Power (kW)',required=False,help='Power in kW of the vehicle'), 'co2' : fields.float('CO2 Emissions',required=False,help='CO2 emissions of the vehicle'), + + 'image': fields.related('model_id','image',type="binary",string="Logo",store=False) } def on_change_model(self, cr, uid, ids, model_id, context=None): diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 41eaa22254f..92d557ea69c 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -7,6 +7,7 @@ + @@ -49,6 +50,7 @@ + @@ -75,11 +77,14 @@
+ + + + + - - From 971f1a66ce4305b95829b50b3946088cde1037a1 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Wed, 26 Sep 2012 16:13:52 +0200 Subject: [PATCH 088/841] [IMP]Deleting generic logs and inherits from odometer part 1 bzr revid: dle@openerp.com-20120926141352-nfsrwmibms0xg0dg --- addons/fleet/demo.xml | 19 +------- addons/fleet/fleet.py | 31 ++++++++++--- addons/fleet/fleet_view.xml | 87 ++++++++++++++----------------------- 3 files changed, 58 insertions(+), 79 deletions(-) diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml index 50604d76624..fa81e8f26c1 100644 --- a/addons/fleet/demo.xml +++ b/addons/fleet/demo.xml @@ -64,24 +64,9 @@ - - - - - Fuel - 40.0 - 1.45 - 58 - + + - - - - - Odometer - 1579.5 - Odometer value when vehicle retrieved from partner - diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 17abf800cbd..192160e1c38 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -1,5 +1,7 @@ from itertools import chain from osv import osv, fields +import time + class fleet_vehicle_model_type(osv.Model): _name = 'fleet.vehicle.type' @@ -172,6 +174,23 @@ class fleet_vehicle(osv.Model): pass return vehicle_id +class fleet_vehicle_odometer(osv.Model): + _name='fleet.vehicle.odometer' + _description='Odometer log for a vehicle' + + _columns = { + 'name' : fields.char('Name',size=64), + + 'date' : fields.date('Date'), + 'value' : fields.float('Odometer Value'), + 'unit' : fields.selection([('kilometers', 'Kilometers'),('miles','Miles')], 'Odometer Unit', help='Unit of the measurement',required=False), + 'vehicle_id' : fields.many2one('fleet.vehicle', 'Vehicle', required=True), + 'notes' : fields.text('Notes'), + } + _defaults = { + 'date' : time.strftime('%Y-%m-%d') + } + class fleet_vehicle_log(osv.Model): _name = 'fleet.vehicle.log' @@ -212,8 +231,7 @@ class fleet_vehicle_log(osv.Model): class fleet_vehicle_log_fuel(osv.Model): - - _inherit = ['fleet.vehicle.log','mail.thread'] + _inherits = {'fleet.vehicle.odometer': 'request_id'} def on_change_liter(self, cr, uid, ids, liter, price_per_liter, amount, context=None): @@ -253,18 +271,17 @@ class fleet_vehicle_log_fuel(osv.Model): _name = 'fleet.vehicle.log.fuel' + _columns = { + 'name' : fields.char('Name',size=64), 'liter' : fields.float('Liter'), 'price_per_liter' : fields.float('Price per liter'), 'amount': fields.float('Total price'), + 'purchaser_id' : fields.many2one('res.partner', 'Purchaser'), 'inv_ref' : fields.char('Invoice Ref.', size=32), 'vendor_id' : fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"), - 'odometer_log' : fields.one2many('fleet.vehicle.log.odometer','fuel_log', 'Odometer',type="char"), + #'odometer_id': fields.many2one('fleet.vehicle.odometer','Odometer', ondelete='cascade', required=False), } - _defaults = { - # 'name': 'Fuel log', - 'type': 'Refueling', - } class fleet_insurance_type(osv.Model): _name = 'fleet.insurance.type' diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 92d557ea69c..962d7309ee7 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -200,47 +200,34 @@ - + - + - - + + - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + @@ -363,41 +350,30 @@
- - + + + + - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - +
@@ -413,10 +389,11 @@ - - + + + + - From 49bae040aa8899e06b14547a668055756f051559 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Wed, 26 Sep 2012 16:56:03 +0200 Subject: [PATCH 089/841] [IMP]Deleting generic logs and inherits from odometer part 2 + Fix demos values bzr revid: dle@openerp.com-20120926145603-m7dkh9mf320i31uj --- addons/fleet/demo.xml | 23 +++++++--- addons/fleet/fleet.py | 39 ++++++++-------- addons/fleet/fleet_view.xml | 91 ++++++++++++------------------------- 3 files changed, 65 insertions(+), 88 deletions(-) diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml index fa81e8f26c1..33e2491890c 100644 --- a/addons/fleet/demo.xml +++ b/addons/fleet/demo.xml @@ -1,6 +1,6 @@ - + Opel @@ -56,17 +56,26 @@ - - - Services + + 5 + 500.0 + 4574.2321 - - - + + + + 6 + + 20 + 1.4 + 28 + + 67458 + diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 192160e1c38..3db8c38db30 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -231,7 +231,7 @@ class fleet_vehicle_log(osv.Model): class fleet_vehicle_log_fuel(osv.Model): - _inherits = {'fleet.vehicle.odometer': 'request_id'} + _inherits = {'fleet.vehicle.odometer': 'odometer_id'} def on_change_liter(self, cr, uid, ids, liter, price_per_liter, amount, context=None): @@ -249,7 +249,6 @@ class fleet_vehicle_log_fuel(osv.Model): liter = float(liter); price_per_liter = float(price_per_liter); if price_per_liter > 0 and liter > 0: - print 'Debug :' + str(liter) + ' | ' + str(price_per_liter) + ' | ' + str(amount) return {'value' : {'amount' : float(liter) * float(price_per_liter),}} elif price_per_liter > 0 and amount > 0: return {'value' : {'liter' : float(amount) / float(price_per_liter),}} @@ -274,13 +273,30 @@ class fleet_vehicle_log_fuel(osv.Model): _columns = { 'name' : fields.char('Name',size=64), + 'liter' : fields.float('Liter'), 'price_per_liter' : fields.float('Price per liter'), 'amount': fields.float('Total price'), 'purchaser_id' : fields.many2one('res.partner', 'Purchaser'), - 'inv_ref' : fields.char('Invoice Ref.', size=32), + 'inv_ref' : fields.char('Invoice Reference', size=64), 'vendor_id' : fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"), - #'odometer_id': fields.many2one('fleet.vehicle.odometer','Odometer', ondelete='cascade', required=False), + } + +class fleet_vehicle_log_services(osv.Model): + + _inherits = {'fleet.vehicle.odometer': 'odometer_id'} + + _name = 'fleet.vehicle.log.services' + _columns = { + + 'name' : fields.char('Name',size=64), + + 'amount' :fields.float('Cost', help="Total cost of the service"), + + 'service_ids' :fields.many2many('fleet.service.type','vehicle_service_type_rel','vehicle_service_type_id','service_id','Services completed'), + 'purchaser_id' : fields.many2one('res.partner', 'Purchaser'), + 'inv_ref' : fields.char('Invoice Reference', size=64), + 'vendor_id' :fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"), } class fleet_insurance_type(osv.Model): @@ -310,21 +326,6 @@ class fleet_service_type(osv.Model): 'name': fields.char('Name', required=True, translate=True), } -class fleet_vehicle_log_services(osv.Model): - _inherit = ['fleet.vehicle.log'] - - _name = 'fleet.vehicle.log.services' - _columns = { - 'vendor_id' :fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"), - 'amount' :fields.float('Cost', help="Total cost of the service"), - 'reference' :fields.char('Reference',size=128), - 'service_ids' :fields.many2many('fleet.service.type','vehicle_service_type_rel','vehicle_service_type_id','service_id','Services completed'), - 'odometer_log' : fields.one2many('fleet.vehicle.log.odometer','fuel_log', 'Odometer',type="char"), - } - _defaults = { - # 'name': 'Service log', - 'type': 'Services'} - class fleet_vehicle_log_odometer(osv.Model): _inherit = ['fleet.vehicle.log'] diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 962d7309ee7..885c48a602f 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -154,41 +154,22 @@ - - + - - - + + + +
- - - - - - - - - - - - - - - - - - - - - - - - - + + + + + +
@@ -394,6 +375,7 @@ + @@ -460,33 +442,18 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + +
@@ -499,13 +466,13 @@ fleet.vehicle.log.services - - + - - - + + + + From 39ecef851c9df2e57a6b28eeeff5dcc239df9083 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Wed, 26 Sep 2012 17:11:50 +0200 Subject: [PATCH 090/841] [IMP]Deleting generic logs and inherits from odometer part 3. Final. bzr revid: dle@openerp.com-20120926151150-c8wp3yeduzte6omx --- addons/fleet/fleet.py | 63 ++------------ addons/fleet/fleet_view.xml | 159 ++++-------------------------------- 2 files changed, 23 insertions(+), 199 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 3db8c38db30..c10b7680901 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -191,44 +191,6 @@ class fleet_vehicle_odometer(osv.Model): 'date' : time.strftime('%Y-%m-%d') } -class fleet_vehicle_log(osv.Model): - _name = 'fleet.vehicle.log' - - def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None): - if context is None: - context = {} - if not ids: - return {} - reads = self.browse(cr, uid, ids, context=context) - res = [] - for record in reads: - name = record.type - if record.employee_id.name: - name = name+ ' / '+ record.employee_id.name - if record.vehicle_id.name: - name = name+ ' / '+ record.vehicle_id.name - if record.date_creation: - name = name+ ' / '+record.date_creation - res.append((record.id, name)) - - return dict(res) - - _columns = { - 'name' : fields.function(_name_get_fnc, type="text", string='Log', store=True), - 'employee_id' : fields.many2one('hr.employee', 'Employee'), - 'vehicle_id' : fields.many2one('fleet.vehicle', 'Vehicle', required=True), - - 'date_creation' : fields.date('Creation Date'), - - 'description' : fields.text('Description'), - 'type' : fields.char('Type',size=32), - } - - _defaults = { - #'name' : 'Log', - 'type' : 'Log', - } - class fleet_vehicle_log_fuel(osv.Model): _inherits = {'fleet.vehicle.odometer': 'odometer_id'} @@ -292,7 +254,6 @@ class fleet_vehicle_log_services(osv.Model): 'name' : fields.char('Name',size=64), 'amount' :fields.float('Cost', help="Total cost of the service"), - 'service_ids' :fields.many2many('fleet.service.type','vehicle_service_type_rel','vehicle_service_type_id','service_id','Services completed'), 'purchaser_id' : fields.many2one('res.partner', 'Purchaser'), 'inv_ref' : fields.char('Invoice Reference', size=64), @@ -306,19 +267,20 @@ class fleet_insurance_type(osv.Model): } class fleet_vehicle_log_insurance(osv.Model): - _inherit = 'fleet.vehicle.log' + _inherits = {'fleet.vehicle.odometer': 'odometer_id'} + _name = 'fleet.vehicle.log.insurance' _columns = { + + 'name' : fields.char('Name',size=64), + 'insurance_type' : fields.many2one('fleet.insurance.type', 'Type', required=False, help='Type of the insurance'), 'start_date' : fields.date('Start date', required=False, help='Date when the coverage of the insurance begins'), 'expiration_date' : fields.date('Expiration date', required=False, help='Date when the coverage of the insurance expirates'), 'price' : fields.float('Price', help="Cost of the insurance for the specified period"), 'insurer_id' :fields.many2one('res.partner', 'Insurer', domain="[('supplier','=',True)]"), - 'description' : fields.text('Description'), + 'ins_ref' : fields.char('Insurance Reference', size=64), } - _defaults = { - #'name': 'Insurance log', - 'type': 'Insurance',} class fleet_service_type(osv.Model): _name = 'fleet.service.type' @@ -326,19 +288,6 @@ class fleet_service_type(osv.Model): 'name': fields.char('Name', required=True, translate=True), } -class fleet_vehicle_log_odometer(osv.Model): - _inherit = ['fleet.vehicle.log'] - - _name = 'fleet.vehicle.log.odometer' - _columns = { - 'value' : fields.float('Value', required=True, help="Meter reading at service, fuel up and others"), - 'fuel_log' :fields.many2one('fleet.vehicle.log.fuel', 'Fuel log'), - 'service_log' :fields.many2one('fleet.vehicle.log.services', 'Services log'), - } - _defaults = { - # 'name': 'Odometer Log', - 'type': 'Odometer'} - class hr_employee(osv.Model): _inherit = 'hr.employee' diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 885c48a602f..50952f8c57e 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -100,26 +100,34 @@ - + - + +
- + - - - - - - + + + + + + + + + + + + + @@ -127,30 +135,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -214,26 +198,6 @@ - - - - - - - - -
- - - - - - - - -
- -
@@ -283,48 +247,6 @@ - - fleet.vehicle.log.form - fleet.vehicle.log - -
- - - - - - - - - -
- - - - - - fleet.vehicle.log.tree - fleet.vehicle.log - - - - - - - - - - - - - Vehicle Logs - fleet.vehicle.log - form - tree,form - - - - fleet.vehicle.log.fuel.form fleet.vehicle.log.fuel @@ -389,53 +311,6 @@ - - fleet.vehicle.log.odometer.form - fleet.vehicle.log.odometer - -
- - - - - - - - - - - - - - - -
- - - - - fleet.vehicle.log.odometer.tree - fleet.vehicle.log.odometer - - - - - - - - - - - - - Vehicle Odometer Logs - fleet.vehicle.log.odometer - form - tree,form - - - - fleet.vehicle.log.services.form fleet.vehicle.log.services From b3a470b0bb81b377681937ae350bd8f9e433fe83 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Wed, 26 Sep 2012 17:18:49 +0200 Subject: [PATCH 091/841] [IMP]Deleting generic logs and inherits from odometer part 4. Removing Access Rights bzr revid: dle@openerp.com-20120926151849-5mjlb5qyxj6j8d5x --- addons/fleet/fleet_view.xml | 2 +- addons/fleet/security/ir.model.access.csv | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 50952f8c57e..30ab6d04b22 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -77,7 +77,7 @@
- + diff --git a/addons/fleet/security/ir.model.access.csv b/addons/fleet/security/ir.model.access.csv index 3a1b3808642..89932e92e15 100644 --- a/addons/fleet/security/ir.model.access.csv +++ b/addons/fleet/security/ir.model.access.csv @@ -3,10 +3,8 @@ fleet_vehicle_model_access_right,fleet_vehicle_model_access_right,model_fleet_ve fleet_vehicle_type_access_right,fleet_vehicle_type_access_right,model_fleet_vehicle_type,,1,1,1,1 fleet_vehicle_model_brand_access_right,fleet_vehicle_model_brand_access_right,model_fleet_vehicle_model_brand,,1,1,1,1 fleet_vehicle_access_right,fleet_vehicle_access_right,model_fleet_vehicle,,1,1,1,1 -fleet_vehicle_log_access_right,fleet_vehicle_log_access_right,model_fleet_vehicle_log,,1,1,1,1 fleet_vehicle_log_fuel_access_right,fleet_vehicle_log_fuel_access_right,model_fleet_vehicle_log_fuel,,1,1,1,1 fleet_vehicle_log_services_access_right,fleet_vehicle_log_services_access_right,model_fleet_vehicle_log_services,,1,1,1,1 fleet_vehicle_log_insurance_access_right,fleet_vehicle_log_insurance_access_right,model_fleet_vehicle_log_insurance,,1,1,1,1 -fleet_vehicle_log_odometer_access_right,fleet_vehicle_log_odometer_access_right,model_fleet_vehicle_log_odometer,,1,1,1,1 fleet_insurance_type_access_right,fleet_insurance_type_access_right,model_fleet_insurance_type,,1,1,1,1 fleet_service_type_access_right,fleet_service_type_access_right,model_fleet_service_type,,1,1,1,1 \ No newline at end of file From c88f379ea06ae2da595a03e593d319d03d584e2a Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Wed, 26 Sep 2012 17:35:21 +0200 Subject: [PATCH 092/841] [ADD]Brand Image value for demo bzr revid: dle@openerp.com-20120926153521-orkwag7fikyxua5u --- addons/fleet/demo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml index 33e2491890c..b4e819f558e 100644 --- a/addons/fleet/demo.xml +++ b/addons/fleet/demo.xml @@ -4,7 +4,7 @@ Opel - + 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 From 545e3c98c350a5d1cf43b16ebc0cf959d58abd6e Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 27 Sep 2012 09:48:17 +0200 Subject: [PATCH 093/841] [ADD]solved conflicts and add working buttons in vehicle view to show log bzr revid: csn@openerp.com-20120927074817-g1t6oxf0dt3d5o1l --- addons/fleet/fleet.py | 12 +++++++----- addons/fleet/fleet_view.xml | 17 +++++++++++++++-- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index c10b7680901..aa2a580eb56 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -75,7 +75,7 @@ class fleet_vehicle(osv.Model): return dict(res) - def action_showLog(self, cr, uid, ids, context=None): + def act_show_log(self, cr, uid, ids, context=None): """ This opens log view to view and add new log for this vehicle @return: """ @@ -89,11 +89,13 @@ class fleet_vehicle(osv.Model): #print vehicle.registration #print logids #print logids.type - res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','fleet_vehicle_log_act', context) + category = self.pool.get('ir.model.data').get_object(cr, uid, 'fleet', 'fleet_vehicle_form', context) + res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','act_show_log', context) #return res - #res['context'] = { - # 'default_type': 'log', - #} + res['context'] = { + 'default_vehicle_id': ids[0]#'Corsa',#category and category.id or False, + } + res['domain']=[('vehicle_id','=', ids[0])] return res _name = 'fleet.vehicle' diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 30ab6d04b22..3d7c16048fe 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -74,14 +74,17 @@
-
-
+ + @@ -237,6 +240,16 @@ + + + Vehicles fleet.vehicle From 92c99faf6efbf9c714ac786abc0776c0cef53d64 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 27 Sep 2012 09:57:26 +0200 Subject: [PATCH 094/841] [ADD]working buttons and removed log tab from vehicle view bzr revid: csn@openerp.com-20120927075726-kdimd6ru0g1fysph --- addons/fleet/fleet.py | 32 ++++++++++++++++---------------- addons/fleet/fleet_view.xml | 20 +++++++++++++++----- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index aa2a580eb56..6c5f5ab27f8 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -75,29 +75,29 @@ class fleet_vehicle(osv.Model): return dict(res) - def act_show_log(self, cr, uid, ids, context=None): + def act_show_log_services(self, cr, uid, ids, context=None): """ This opens log view to view and add new log for this vehicle - @return: + @return: the service log view """ - #print 'HELLO YOU--------------------------------------------' - #print ids[0] - - #vehicle = self.browse(cr, uid, ids[0], context) - #logids = self.browse(cr,uid,log_ids,context) - #print vehicle - #print vehicle.name - #print vehicle.registration - #print logids - #print logids.type - category = self.pool.get('ir.model.data').get_object(cr, uid, 'fleet', 'fleet_vehicle_form', context) - res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','act_show_log', context) - #return res + res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','act_show_log_services', context) res['context'] = { - 'default_vehicle_id': ids[0]#'Corsa',#category and category.id or False, + 'default_vehicle_id': ids[0] } res['domain']=[('vehicle_id','=', ids[0])] return res + def act_show_log_fuel(self, cr, uid, ids, context=None): + """ This opens log view to view and add new log for this vehicle + @return: the service log view + """ + res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','act_show_log_fuel', context) + res['context'] = { + 'default_vehicle_id': ids[0] + } + res['domain']=[('vehicle_id','=', ids[0])] + return res + + _name = 'fleet.vehicle' _description = 'Fleet Vehicle' diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 3d7c16048fe..893ceff493d 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -76,7 +76,8 @@
-
@@ -137,7 +138,7 @@
- + @@ -242,12 +243,21 @@ + + From 7fbe02004fc1088829a97b5b90a3b966ee5ce0a8 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Thu, 27 Sep 2012 10:00:59 +0200 Subject: [PATCH 095/841] [FIX]vehicle registration>license plate, doors > default : 5, company_id + groups bzr revid: dle@openerp.com-20120927080059-h4409j15qiiq8isi --- addons/fleet/demo.xml | 4 ++-- addons/fleet/fleet.py | 16 +++++++++------- addons/fleet/fleet_view.xml | 5 +++-- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml index b4e819f558e..d88cab40bd0 100644 --- a/addons/fleet/demo.xml +++ b/addons/fleet/demo.xml @@ -30,7 +30,7 @@ - 1-ACK-205 + 1-ACK-205 5454541 Black @@ -41,7 +41,7 @@ - 1-SYN-404 + 1-SYN-404 1337 Red diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 6c5f5ab27f8..bff36d6ac45 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -61,8 +61,8 @@ class fleet_vehicle(osv.Model): reads = self.browse(cr, uid, ids, context=context) res = [] for record in reads: - if record.registration: - name = record.registration + if record.license_plate: + name = record.license_plate if record.model_id.modelname: name = record.model_id.modelname + ' / ' + name if record.model_id.brand.name: @@ -74,7 +74,6 @@ class fleet_vehicle(osv.Model): res = self.name_get(cr, uid, ids, context=context) return dict(res) - def act_show_log_services(self, cr, uid, ids, context=None): """ This opens log view to view and add new log for this vehicle @return: the service log view @@ -97,13 +96,13 @@ class fleet_vehicle(osv.Model): res['domain']=[('vehicle_id','=', ids[0])] return res - _name = 'fleet.vehicle' _description = 'Fleet Vehicle' _columns = { 'name' : fields.function(_vehicle_name_get_fnc, type="char", string='Name', store=True), - 'registration' : fields.char('Registration', size=32, required=True, help='Registration number of the vehicle (ie: plate number for a car)'), + 'company_id': fields.many2one('res.company', 'Company'), + 'license_plate' : fields.char('License plate', size=32, required=True, help='License plate number of the vehicle (ie: plate number for a car)'), 'vin_sn' : fields.char('Chassis Number', size=32, required=False, help='Unique number written on the vehicle motor (VIN/SN number)'), 'driver' : fields.many2one('hr.employee', 'Driver',required=False, help='Driver of the vehicle'), 'model_id' : fields.many2one('fleet.vehicle.model', 'Model', required=True, help='Model of the vehicle'), @@ -128,6 +127,9 @@ class fleet_vehicle(osv.Model): 'image': fields.related('model_id','image',type="binary",string="Logo",store=False) } + _defaults = { + 'doors' : 5, + } def on_change_model(self, cr, uid, ids, model_id, context=None): # print "ids: %r" % (ids,) @@ -156,7 +158,7 @@ class fleet_vehicle(osv.Model): vehicle_id = super(fleet_vehicle, self).create(cr, uid, data, context=context) try: vehicle = self.browse(cr, uid, vehicle_id, context=context) - self.message_post(cr, uid, [vehicle_id], body='Vehicle %s has been added to the fleet!' % (vehicle.registration), context=context) + self.message_post(cr, uid, [vehicle_id], body='Vehicle %s has been added to the fleet!' % (vehicle.license_plate), context=context) except: pass # group deleted: do not push a message return vehicle_id @@ -166,7 +168,7 @@ class fleet_vehicle(osv.Model): try: changes = {} for key,value in vals.items(): - if key == 'registration' or key == 'driver': + if key == 'license_plate' or key == 'driver': changes[key] = value if len(changes) > 0: self.message_post(cr, uid, [vehicle_id], body='Vehicle edited. Changes : '+ str(changes), context=context) diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 893ceff493d..8b473dd9051 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -83,7 +83,8 @@ - + + @@ -232,7 +233,7 @@ fleet.vehicle - + From 5f9b6e5702773ed40078eceea1cb3c750791d898 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Thu, 27 Sep 2012 10:09:12 +0200 Subject: [PATCH 096/841] [ADD]Vehicle tags bzr revid: dle@openerp.com-20120927080912-3v0gaakcc9nle89w --- addons/fleet/fleet.py | 10 ++++++++-- addons/fleet/fleet_view.xml | 14 +++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index bff36d6ac45..92fb48067c4 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -9,7 +9,13 @@ class fleet_vehicle_model_type(osv.Model): _columns = { 'name' : fields.char('Name', size=32, required=True), } -#comment to delete#comment to delete + +class fleet_vehicle_tag(osv.Model): + _name = 'fleet.vehicle.tag' + _columns = { + 'name': fields.char('Name', required=True, translate=True), + } + class fleet_vehicle_model(osv.Model): def name_get(self, cr, uid, ids, context=None): @@ -110,13 +116,13 @@ class fleet_vehicle(osv.Model): 'log_fuel' : fields.one2many('fleet.vehicle.log.fuel','vehicle_id', 'Fuel Logs'), 'log_services' : fields.one2many('fleet.vehicle.log.services','vehicle_id', 'Services Logs'), 'log_insurances' : fields.one2many('fleet.vehicle.log.insurance','vehicle_id', 'Insurances'), - 'log_odometer' : fields.one2many('fleet.vehicle.log.odometer','vehicle_id', 'Odometer'), 'acquisition_date' : fields.date('Acquisition date', required=False, help='Date when the vehicle has been bought'), 'acquisition_price' : fields.integer('Price', help='Price of the bought vehicle'), 'color' : fields.char('Color',size=32, help='Color of the vehicle'), 'status' : fields.char('Status',size=32, help='Status of the vehicle (in repair, active, ...)'), 'location' : fields.char('Location',size=32, help='Location of the vehicle (garage, ...)'), 'doors' : fields.integer('Number of doors', help='Number of doors of the vehicle'), + 'tag_ids' :fields.many2many('fleet.vehicle.tag','vehicle_vehicle_tag_rel','vehicle_tag_id','tag_id','Tags'), 'transmission' : fields.selection([('manual', 'Manual'),('automatic','Automatic')], 'Transmission', help='Transmission Used by the vehicle',required=False), 'fuel_type' : fields.selection([('gasoline', 'Gasoline'),('diesel','Diesel'),('electric','Electric'),('hybrid','Hybrid')], 'Fuel Type', help='Fuel Used by the vehicle',required=False), diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 8b473dd9051..bc64161bdb3 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -79,12 +79,16 @@
- - - - - + + + + + + + + + From 3bf35c4651d1b74a58e19f21ca79a82626594ef3 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Thu, 27 Sep 2012 15:24:50 +0200 Subject: [PATCH 097/841] [ADD]States with statusbar. TOCHANGE : useless domain in vehicle view, cause of domain evaluation bug for widget statusbar bzr revid: dle@openerp.com-20120927132450-bmzt6hf3rsny0ewo --- addons/fleet/demo.xml | 27 +++++++++++++++++++++++++++ addons/fleet/fleet.py | 13 ++++++++++--- addons/fleet/fleet_view.xml | 25 +++++++++++++++++++++++-- addons/survey/survey_view.xml | 4 +--- 4 files changed, 61 insertions(+), 8 deletions(-) diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml index d88cab40bd0..ddd21708af7 100644 --- a/addons/fleet/demo.xml +++ b/addons/fleet/demo.xml @@ -29,6 +29,31 @@ + + In shop + 1 + + + + Inactive + 2 + + + + Active + 3 + + + + Out of order + 4 + + + + Sold + 5 + + 1-ACK-205 5454541 @@ -38,6 +63,7 @@ 5 + @@ -49,6 +75,7 @@ 5 + diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 92fb48067c4..0077b4f4634 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -2,7 +2,6 @@ from itertools import chain from osv import osv, fields import time - class fleet_vehicle_model_type(osv.Model): _name = 'fleet.vehicle.type' _description = 'Type of the vehicle' @@ -16,6 +15,14 @@ class fleet_vehicle_tag(osv.Model): 'name': fields.char('Name', required=True, translate=True), } +class fleet_vehicle_state(osv.Model): + _name = 'fleet.vehicle.state' + _columns = { + 'name': fields.char('Name', required=True), + 'sequence': fields.integer('Order',help="Used to order the note stages") + } + _order = 'sequence asc' + class fleet_vehicle_model(osv.Model): def name_get(self, cr, uid, ids, context=None): @@ -100,7 +107,7 @@ class fleet_vehicle(osv.Model): 'default_vehicle_id': ids[0] } res['domain']=[('vehicle_id','=', ids[0])] - return res + return res _name = 'fleet.vehicle' _description = 'Fleet Vehicle' @@ -119,7 +126,7 @@ class fleet_vehicle(osv.Model): 'acquisition_date' : fields.date('Acquisition date', required=False, help='Date when the vehicle has been bought'), 'acquisition_price' : fields.integer('Price', help='Price of the bought vehicle'), 'color' : fields.char('Color',size=32, help='Color of the vehicle'), - 'status' : fields.char('Status',size=32, help='Status of the vehicle (in repair, active, ...)'), + 'state': fields.many2one('fleet.vehicle.state', 'State', help='Current state of the vehicle', domain='[]'), 'location' : fields.char('Location',size=32, help='Location of the vehicle (garage, ...)'), 'doors' : fields.integer('Number of doors', help='Number of doors of the vehicle'), 'tag_ids' :fields.many2many('fleet.vehicle.tag','vehicle_vehicle_tag_rel','vehicle_tag_id','tag_id','Tags'), diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index bc64161bdb3..2d49c2cf659 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -62,19 +62,40 @@ tree,form + + fleet.vehicle.state.tree + fleet.vehicle.state + + + + + + + + + + States of Vehicle + fleet.vehicle.state + form + tree,form + + + fleet.vehicle.form fleet.vehicle
+
+ +
-
@@ -322,7 +324,7 @@
+ + + + @@ -383,8 +404,8 @@ - - + + - + @@ -406,11 +427,11 @@ - - - + + + - + - - @@ -454,6 +457,17 @@ + + + fleet.vehicle.log.contract.tree fleet.vehicle.log.contract @@ -467,7 +481,6 @@ - From 183646f3df0ab079686d91c77beff441cba7ef61 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Mon, 22 Oct 2012 17:27:19 +0200 Subject: [PATCH 207/841] [ADD]wizard for renewing contracts bzr revid: csn@openerp.com-20121022152719-jywhocuqj9sxnv5x --- addons/fleet/__init__.py | 3 ++- addons/fleet/__openerp__.py | 3 ++- addons/fleet/fleet.py | 42 ++++++++++++++++++++++++------------- 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/addons/fleet/__init__.py b/addons/fleet/__init__.py index a09fca549ce..369c7f372c6 100644 --- a/addons/fleet/__init__.py +++ b/addons/fleet/__init__.py @@ -1,2 +1,3 @@ # import the hr_car code -import fleet \ No newline at end of file +import fleet +import wizard \ No newline at end of file diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py index 3689040bef4..74f1df2e336 100644 --- a/addons/fleet/__openerp__.py +++ b/addons/fleet/__openerp__.py @@ -20,7 +20,8 @@ Vehicle, leasing, insurances, cost 'data' : [ 'fleet_view.xml', 'data.xml', - 'board_fleet_view.xml' + 'board_fleet_view.xml', + 'wizard/renew_contract_view.xml', ], 'update_xml' : ['security/ir.model.access.csv'], diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 59af1d77d79..66e8cfcfe48 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -944,21 +944,35 @@ class fleet_vehicle_log_contract(osv.Model): def act_renew_contract(self,cr,uid,ids,context=None): contracts = self.browse(cr,uid,ids,context=context) - res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','act_renew_contract', context) + res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','act_renew_contract_wizard', context) for element in contracts: - print '--------------------------' - print element.vehicle_id.id - print element.cost_type.id - print element.amount - print element.odometer - print element.insurer_id - res['context'] = { - 'default_vehicle_id': element.vehicle_id.id, - 'default_cost_type': element.cost_type.id, - 'default_amount': element.amount, - 'default_odometer': element.odometer, - #'default_insurer_id': element.insurer_id, - } + temp = [] + temp.append(('default_vehicle_id',element.vehicle_id.id)) + temp.append(('default_cost_type',element.cost_type.id)) + temp.append(('default_amount',element.amount)) + temp.append(('default_odometer_id',element.odometer_id.id)) + temp.append(('default_odometer_unit',element.odometer_unit)) + temp.append(('default_insurer_id',element.insurer_id.id)) + cost_temp = [] + for costs in element.cost_ids: + cost_temp.append(costs.id) + temp.append(('default_cost_ids',cost_temp)) + temp.append(('default_date',time.strftime('%Y-%m-%d'))) + temp.append(('default_start_date',element.expiration_date)) + temp.append(('default_purchaser_id',element.purchaser_id.id)) + temp.append(('default_ins_ref',element.ins_ref)) + temp.append(('default_state','open')) + temp.append(('default_notes',element.notes)) + + res['context'] = dict(temp) + #res['context']['default_vehicle_id'] = element.vehicle_id.id + #res['context'] = { + # 'default_vehicle_id': element.vehicle_id.id, + # 'default_cost_type': element.cost_type.id, + # 'default_amount': element.amount, + # 'default_odometer': element.odometer, + # 'default_insurer_id': element.insurer_id.id, + #} #res['domain']=[('vehicle_id','=', ids[0])] return res #return None From a1da4c7fad24dfdc4faceb1f0dcc5d00a5e0d246 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Mon, 22 Oct 2012 17:27:36 +0200 Subject: [PATCH 208/841] [ADD]wizard for renewing contracts bzr revid: csn@openerp.com-20121022152736-fiqiyp2sh1pr3lbw --- addons/fleet/wizard/__init__.py | 1 + addons/fleet/wizard/renew_contract.py | 140 ++++++++++++++++++++ addons/fleet/wizard/renew_contract_view.xml | 70 ++++++++++ 3 files changed, 211 insertions(+) create mode 100644 addons/fleet/wizard/__init__.py create mode 100644 addons/fleet/wizard/renew_contract.py create mode 100644 addons/fleet/wizard/renew_contract_view.xml diff --git a/addons/fleet/wizard/__init__.py b/addons/fleet/wizard/__init__.py new file mode 100644 index 00000000000..bc7dae97d56 --- /dev/null +++ b/addons/fleet/wizard/__init__.py @@ -0,0 +1 @@ +import renew_contract \ No newline at end of file diff --git a/addons/fleet/wizard/renew_contract.py b/addons/fleet/wizard/renew_contract.py new file mode 100644 index 00000000000..04f21227eb3 --- /dev/null +++ b/addons/fleet/wizard/renew_contract.py @@ -0,0 +1,140 @@ +from osv import osv, fields +import datetime + +class renew_contract(osv.TransientModel): + _name = "fleet.vehicle.contract.renew" + _description = "wizard to renew a contract" + + def name_get(self, cr, uid, ids, context=None): + if context is None: + context = {} + if not ids: + return [] + reads = self.browse(cr, uid, ids, context=context) + res = [] + for record in reads: + if record.vehicle_id.name: + name = str(record.vehicle_id.name) + if record.cost_type.name: + name = name+ ' / '+ str(record.cost_type.name) + if record.date: + name = name+ ' / '+ record.date + res.append((record.id, name)) + return res + + def _vehicle_contract_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None): + res = self.name_get(cr, uid, ids, context=context) + return dict(res) + + def _get_odometer(self, cr, uid, ids, odometer_id, arg, context): + res = dict.fromkeys(ids, False) + for record in self.browse(cr,uid,ids,context=context): + if record.odometer_id: + res[record.id] = record.odometer_id.value + return res + + def _set_odometer(self, cr, uid, id, name, value, args=None, context=None): + if value: + try: + value = float(value) + except ValueError: + #_logger.exception(value+' is not a correct odometer value. Please, fill a float for this field') + raise except_orm(_('Error!'), value+' is not a correct odometer value. Please, fill a float for this field') + + date = self.browse(cr, uid, id, context=context).date + if not(date): + date = time.strftime('%Y-%m-%d') + vehicle_id = self.browse(cr, uid, id, context=context).vehicle_id + data = {'value' : value,'date' : date,'vehicle_id' : vehicle_id.id} + odometer_id = self.pool.get('fleet.vehicle.odometer').create(cr, uid, data, context=context) + self.write(cr, uid, id, {'odometer_id': odometer_id}) + return value + self.write(cr, uid, id, {'odometer_id': ''}) + return False + + def on_change_vehicle(self, cr, uid, ids, vehicle_id, context=None): + + if not vehicle_id: + return {} + + odometer_unit = self.pool.get('fleet.vehicle').browse(cr, uid, vehicle_id, context=context).odometer_unit + + return { + 'value' : { + 'odometer_unit' : odometer_unit, + } + } + + def compute_next_year_date(self, strdate): + oneyear=datetime.timedelta(days=365) + curdate = self.str_to_date(strdate) + nextyear=curdate+oneyear#int(strdate[:4])+1 + return str(nextyear)#+strdate[4:] + + #def on_change_start_date(self, cr, uid, ids, strdate, context=None): + # if (strdate): + + # return {'value' : {'expiration_date' : self.compute_next_year_date(strdate),}} + # else: + # return {} + + def str_to_date(self,strdate): + return datetime.datetime(int(strdate[:4]),int(strdate[5:7]),int(strdate[8:])) + + def get_warning_date(self,cr,uid,ids,prop,unknow_none,context=None): + if context is None: + context={} + if not ids: + return dict([]) + reads = self.browse(cr,uid,ids,context=context) + res=[] + for record in reads: + #if (record.reminder==True): + if (record.expiration_date and record.state=='open'): + today=self.str_to_date(time.strftime('%Y-%m-%d')) + renew_date = self.str_to_date(record.expiration_date) + diff_time=int((renew_date-today).days) + if (diff_time<=0): + res.append((record.id,0)) + else: + res.append((record.id,diff_time)) + else: + res.append((record.id,-1)) + #else: + # res.append((record.id,-1)) + return dict(res) + + _columns = { + 'name' : fields.function(_vehicle_contract_name_get_fnc, type="text", string='Name', store=True), + 'vehicle_id': fields.many2one('fleet.vehicle', 'Vehicle', required=True, help='Vehicle concerned by this fuel log'), + 'cost_type': fields.many2one('fleet.service.type', 'Service type', required=False, help='Service type purchased with this cost'), + 'amount': fields.float('Total Price'), + + 'parent_id': fields.many2one('fleet.vehicle.cost', 'Parent', required=False, help='Parent cost to this current cost'), + 'cost_ids' : fields.one2many('fleet.vehicle.cost', 'parent_id', 'Included Services'), + + 'date' :fields.date('Date',help='Date when the cost has been executed'), + + 'start_date' : fields.date('Contract Start Date', required=False, help='Date when the coverage of the contract begins'), + 'expiration_date' : fields.date('Contract Expiration Date', required=False, help='Date when the coverage of the contract expirates (by default, one year after begin date)'), + 'warning_date' : fields.function(get_warning_date,type='integer',string='Warning Date',store=False), + + 'insurer_id' :fields.many2one('res.partner', 'Supplier', domain="[('supplier','=',True)]"), + 'purchaser_id' : fields.many2one('res.partner', 'Contractor',domain="['|',('customer','=',True),('employee','=',True)]",help='Person to which the contract is signed for'), + 'ins_ref' : fields.char('Contract Reference', size=64), + 'state' : fields.selection([('open', 'In Progress'), ('closed', 'Terminated')], 'Status', readonly=True, help='Choose wheter the contract is still valid or not'), + #'reminder' : fields.boolean('Renewal Reminder', help="Warn the user a few days before the expiration date of this contract"), + 'notes' : fields.text('Terms and Conditions', help='Write here all supplementary informations relative to this contract'), + 'odometer_id' : fields.many2one('fleet.vehicle.odometer', 'Odometer', required=False, help='Odometer measure of the vehicle at the moment of this log'), + 'odometer' : fields.function(_get_odometer,fnct_inv=_set_odometer,type='char',string='Odometer Value',store=False,help='Odometer measure of the vehicle at the moment of this log'), + 'odometer_unit': fields.related('vehicle_id','odometer_unit',type="char",string="Unit",store=False, readonly=True), + #'cost_amount': fields.related('cost_id','amount',type="float",string="Amount",store=True, readonly=True), + } + + + + def renew(self, cr, uid, ids, context=None): + print '-------------------------------' + print 'renew contract' + print '-------------------------------' + return {} \ No newline at end of file diff --git a/addons/fleet/wizard/renew_contract_view.xml b/addons/fleet/wizard/renew_contract_view.xml new file mode 100644 index 00000000000..9113ebb595e --- /dev/null +++ b/addons/fleet/wizard/renew_contract_view.xml @@ -0,0 +1,70 @@ + + + + + fleet.vehicle.contract.wizard.form + fleet.vehicle.contract.renew + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + \ No newline at end of file From ae95cab5332fe3730381329bf31d0baf668cd721 Mon Sep 17 00:00:00 2001 From: Vijaykumar Baladaniya Date: Tue, 23 Oct 2012 10:57:15 +0530 Subject: [PATCH 209/841] [FIX] point_of_sale: Add a context on launch_payment() method. bzr revid: vba@tinyerp.com-20121023052715-78d4sykmrrpzult0 --- addons/point_of_sale/wizard/pos_payment.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py index ca9331012b7..6dd02179f30 100644 --- a/addons/point_of_sale/wizard/pos_payment.py +++ b/addons/point_of_sale/wizard/pos_payment.py @@ -85,6 +85,7 @@ class pos_make_payment(osv.osv_memory): 'target': 'new', 'views': False, 'type': 'ir.actions.act_window', + 'context': context, } def print_report(self, cr, uid, ids, context=None): From 507b632e41fff52f9097c3ed2592c5ec46b8b3c9 Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Tue, 23 Oct 2012 11:31:26 +0530 Subject: [PATCH 210/841] [IMP] Improved code the kanban image which cuts from upper side. bzr revid: psa@tinyerp.com-20121023060126-k6m0o0bfk9gnqf2s --- addons/hr/static/src/css/hr.css | 2 +- addons/mail/static/src/css/mail_group.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr/static/src/css/hr.css b/addons/hr/static/src/css/hr.css index e0eb8c198a5..f395f9939e5 100644 --- a/addons/hr/static/src/css/hr.css +++ b/addons/hr/static/src/css/hr.css @@ -22,7 +22,7 @@ -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); -o-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); - box-shadow: 0 1px 4px 1px rgba(0, 0, 0, 0.4); + box-shadow: 0 1px 4px 3px rgba(0, 0, 0, 0.4); } .oe_employee_picture { diff --git a/addons/mail/static/src/css/mail_group.css b/addons/mail/static/src/css/mail_group.css index 9ca0055c17f..78467245557 100644 --- a/addons/mail/static/src/css/mail_group.css +++ b/addons/mail/static/src/css/mail_group.css @@ -51,7 +51,7 @@ border-collapse: separate; -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); - box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); + box-shadow: 0 1px 4px 3px rgba(0, 0, 0, 0.4); -o-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); } From 23d286ef524c7993c8416bcea52a1a80b62e5616 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Tue, 23 Oct 2012 09:53:28 +0200 Subject: [PATCH 211/841] [ADD]Generated costs for contracts bzr revid: dle@openerp.com-20121023075328-63q25k9iqigc1izf --- addons/fleet/demo.xml | 5 +++++ addons/fleet/fleet.py | 9 +++++++++ addons/fleet/fleet_view.xml | 40 ++++++++++++++++++++++++++----------- 3 files changed, 42 insertions(+), 12 deletions(-) diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml index 7c6e1c5ab0a..1603c2ee654 100644 --- a/addons/fleet/demo.xml +++ b/addons/fleet/demo.xml @@ -732,6 +732,7 @@ 450 + monthly 2012-01-01 @@ -768,6 +769,7 @@ 400 + monthly 2012-01-01 @@ -804,6 +806,7 @@ 400 + monthly 2012-01-01 @@ -840,6 +843,7 @@ 400 + monthly 2012-01-01 @@ -876,6 +880,7 @@ 400 + monthly 2012-01-01 diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 66e8cfcfe48..7fed70f6752 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -48,6 +48,8 @@ class fleet_vehicle_cost(osv.Model): 'cost_ids' : fields.one2many('fleet.vehicle.cost', 'parent_id', 'Included Services'), 'date' :fields.date('Date',help='Date when the cost has been executed'), + + 'contract_id' : fields.many2one('fleet.vehicle.log.contract', 'Contract', required=False, help='Contract attached to this cost'), } _default ={ @@ -60,6 +62,11 @@ class fleet_vehicle_cost(osv.Model): if 'parent_id' in data and data['parent_id']: data['vehicle_id'] = self.browse(cr, uid, data['parent_id'], context=context).vehicle_id.id data['date'] = self.browse(cr, uid, data['parent_id'], context=context).date + if 'contract_id' in data and data['contract_id']: + print str(data) + data['vehicle_id'] = self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, data['contract_id'], context=context).vehicle_id.id + data['cost_type'] = self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, data['contract_id'], context=context).cost_type.id + print 'Contract : '+ str(data['contract_id']) + ' Add generated cost for vehicle ' + str(data['vehicle_id']) + ' with cost type : ' + str(data['cost_type']) cost_id = super(fleet_vehicle_cost, self).create(cr, uid, data, context=context) return cost_id @@ -999,6 +1006,8 @@ class fleet_vehicle_log_contract(osv.Model): 'odometer' : fields.function(_get_odometer,fnct_inv=_set_odometer,type='char',string='Odometer Value',store=False,help='Odometer measure of the vehicle at the moment of this log'), 'odometer_unit': fields.related('vehicle_id','odometer_unit',type="char",string="Unit",store=False, readonly=True), 'cost_amount': fields.related('cost_id','amount',type="float",string="Amount",store=True, readonly=True), + 'cost_frequency': fields.selection([('daily', 'Daily'),('weekly','Weekly'),('monthly','Monthly'),('yearly','Yearly')], 'Cost Frequency', help='Frequency of the costs',required=True), + 'generated_cost_ids' : fields.one2many('fleet.vehicle.cost', 'contract_id', 'Generated Costs',ondelete='cascade'), } _defaults = { 'purchaser_id': lambda self, cr, uid, ctx: uid, diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index e58ed5bb5d5..9b172e9904c 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -419,7 +419,11 @@ - + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -481,6 +499,7 @@ + @@ -719,11 +738,8 @@ - - - From 603a3030591988a6825bb263759756b15d99d5cd Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Tue, 23 Oct 2012 14:54:57 +0530 Subject: [PATCH 212/841] [IMP]bom_lines=False added in duplicating BOM bzr revid: kbh@tinyerp.com-20121023092457-o6d2ubyb7mzslwtp --- addons/mrp/mrp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 3ae27bf2c41..fb3ad899c88 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -371,7 +371,7 @@ class mrp_bom(osv.osv): if default is None: default = {} bom_data = self.read(cr, uid, id, [], context=context) - default.update(name=_("%s (copy)") % (bom_data['name']), bom_id=False) + default.update(name=_("%s (copy)") % (bom_data['name']), bom_id=False, bom_lines=False) return super(mrp_bom, self).copy_data(cr, uid, id, default, context=context) def create(self, cr, uid, vals, context=None): From c8f0bfc68cdf4b0c6d1d3036e373c6de0b496474 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Tue, 23 Oct 2012 15:57:34 +0530 Subject: [PATCH 213/841] [REM]remove suffix copy from duplicating BOM bzr revid: kbh@tinyerp.com-20121023102734-1d0upye19ps64be1 --- addons/mrp/mrp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index fb3ad899c88..f760087d872 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -371,7 +371,7 @@ class mrp_bom(osv.osv): if default is None: default = {} bom_data = self.read(cr, uid, id, [], context=context) - default.update(name=_("%s (copy)") % (bom_data['name']), bom_id=False, bom_lines=False) + default.update(name=_("%s") % (bom_data['name']), bom_id=False) return super(mrp_bom, self).copy_data(cr, uid, id, default, context=context) def create(self, cr, uid, vals, context=None): From 3bde64f49c3c5d04b92cdf3cb0d0b67da9655149 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Tue, 23 Oct 2012 17:44:07 +0530 Subject: [PATCH 214/841] [IMP]hr_expense:fields are readonly when expense is apporved bzr revid: kbh@tinyerp.com-20121023121407-6qarpm3ppdmgm8cu --- addons/hr_expense/hr_expense.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index 487e4f58782..ee79e03fa77 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -64,22 +64,22 @@ class hr_expense_expense(osv.osv): _description = "Expense" _order = "id desc" _columns = { - 'name': fields.char('Description', size=128, required=True), + 'name': fields.char('Description', size=128, required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}), 'id': fields.integer('Sheet ID', readonly=True), - 'date': fields.date('Date', select=True), + 'date': fields.date('Date', select=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}), 'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is done."), - 'employee_id': fields.many2one('hr.employee', "Employee", required=True), + 'employee_id': fields.many2one('hr.employee', "Employee", required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}), 'user_id': fields.many2one('res.users', 'User', required=True), 'date_confirm': fields.date('Confirmation Date', select=True, help = "Date of the confirmation of the sheet expense. It's filled when the button Confirm is pressed."), 'date_valid': fields.date('Validation Date', select=True, help = "Date of the acceptation of the sheet expense. It's filled when the button Accept is pressed."), - 'user_valid': fields.many2one('res.users', 'Validation User'), + 'user_valid': fields.many2one('res.users', 'Validation User', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}), 'account_move_id': fields.many2one('account.move', 'Ledger Posting'), 'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ), 'note': fields.text('Note'), 'amount': fields.function(_amount, string='Total Amount', digits_compute= dp.get_precision('Account')), 'voucher_id': fields.many2one('account.voucher', "Employee's Receipt"), - 'currency_id': fields.many2one('res.currency', 'Currency', required=True), - 'department_id':fields.many2one('hr.department','Department'), + 'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}), + 'department_id':fields.many2one('hr.department','Department', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}), 'company_id': fields.many2one('res.company', 'Company', required=True), 'state': fields.selection([ ('draft', 'New'), From d4f970ff9ccb21d6e31982e70f8d41f9075b6cbd Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Tue, 23 Oct 2012 18:09:10 +0530 Subject: [PATCH 215/841] [IMP]hr_expense:delete only those expense which are in draft states bzr revid: kbh@tinyerp.com-20121023123910-v1sd0wtgis9cn0w6 --- addons/hr_expense/hr_expense.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index ee79e03fa77..06852e08e96 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -100,6 +100,12 @@ class hr_expense_expense(osv.osv): 'currency_id': _get_currency, } + def unlink(self, cr, uid, ids, context=None): + for rec in self.browse(cr, uid, ids, context=context): + if rec.state != 'draft': + raise osv.except_osv(_('Warning!'),_('You cannot delete an expense which is in %s state!')%(rec.state)) + return super(hr_expense_expense, self).unlink(cr, uid, ids, context) + def onchange_currency_id(self, cr, uid, ids, currency_id=False, company_id=False, context=None): res = {'value': {'journal_id': False}} journal_ids = self.pool.get('account.journal').search(cr, uid, [('type','=','purchase'), ('currency','=',currency_id), ('company_id', '=', company_id)], context=context) From 24635aae19b3a1faab455dbbfa8b8cc547013876 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Tue, 23 Oct 2012 15:01:52 +0200 Subject: [PATCH 216/841] [ADD]add renew contract bzr revid: csn@openerp.com-20121023130152-51hd311rn0prj3oq --- addons/fleet/fleet.py | 35 +++++++++++++++++++++-------------- addons/fleet/fleet_view.xml | 8 ++++---- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 7fed70f6752..3cc7d5f6284 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -916,7 +916,8 @@ class fleet_vehicle_log_contract(osv.Model): nextyear=curdate+oneyear#int(strdate[:4])+1 return str(nextyear)#+strdate[4:] - def on_change_start_date(self, cr, uid, ids, strdate, context=None): + def on_change_start_date(self, cr, uid, ids, strdate, enddate, context=None): + if (strdate): return {'value' : {'expiration_date' : self.compute_next_year_date(strdate),}} @@ -951,7 +952,7 @@ class fleet_vehicle_log_contract(osv.Model): def act_renew_contract(self,cr,uid,ids,context=None): contracts = self.browse(cr,uid,ids,context=context) - res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','act_renew_contract_wizard', context) + res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','act_renew_contract', context) for element in contracts: temp = [] temp.append(('default_vehicle_id',element.vehicle_id.id)) @@ -965,24 +966,29 @@ class fleet_vehicle_log_contract(osv.Model): cost_temp.append(costs.id) temp.append(('default_cost_ids',cost_temp)) temp.append(('default_date',time.strftime('%Y-%m-%d'))) - temp.append(('default_start_date',element.expiration_date)) + temp.append(('default_start_date',str(self.str_to_date(element.expiration_date)+datetime.timedelta(days=1)))) temp.append(('default_purchaser_id',element.purchaser_id.id)) temp.append(('default_ins_ref',element.ins_ref)) temp.append(('default_state','open')) temp.append(('default_notes',element.notes)) + temp.append(('default_cost_frequency',element.cost_frequency)) + generated_cost = [] + for gen_cost in element.generated_cost_ids: + generated_cost.append(gen_cost.id) + temp.append(('default_generated_cost_ids',generated_cost)) + + #compute end date + startdate = self.str_to_date(element.start_date) + enddate = self.str_to_date(element.expiration_date) + diffdate = (enddate-startdate) + newenddate = enddate+diffdate + temp.append(('default_expiration_date',str(newenddate))) res['context'] = dict(temp) - #res['context']['default_vehicle_id'] = element.vehicle_id.id - #res['context'] = { - # 'default_vehicle_id': element.vehicle_id.id, - # 'default_cost_type': element.cost_type.id, - # 'default_amount': element.amount, - # 'default_odometer': element.odometer, - # 'default_insurer_id': element.insurer_id.id, - #} - #res['domain']=[('vehicle_id','=', ids[0])] + return res - #return None + + _name = 'fleet.vehicle.log.contract' _order='state,expiration_date' @@ -1014,13 +1020,14 @@ class fleet_vehicle_log_contract(osv.Model): 'date' : time.strftime('%Y-%m-%d'), 'start_date' : time.strftime('%Y-%m-%d'), 'state':'open', - #'expiration_date' : self.compute_next_year_date(time.strftime('%Y-%m-%d')), + 'expiration_date' : lambda self,cr,uid,ctx: self.compute_next_year_date(time.strftime('%Y-%m-%d')), } def copy(self, cr, uid, id, default=None, context=None): default = default or {} current_object = self.browse(cr,uid,id,context) + default['date'] = time.strftime('%Y-%m-%d') default['start_date'] = time.strftime('%Y-%m-%d') default['expiration_date'] = self.compute_next_year_date(time.strftime('%Y-%m-%d')) #default['name'] = current_object.name diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 9b172e9904c..6ca53514e1f 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -45,8 +45,8 @@

Click to create a new model.

- Here you can add the different model for a - particular brand of vehicle. Like Audi A3, + Specify the different model for a particular + brand of vehicle. For example Audi A3, Audi A4, ...

@@ -147,7 +147,6 @@

Click to create a new state.

- Here you can create and organize the state for a vehicle. A state can help you knowing in what condition your vehicle is. In reparation, Sold, Active, ...

@@ -258,6 +257,7 @@ + @@ -436,7 +436,7 @@ - + From ceec3ec123c5303cef2e1b6182eea8d182e8359b Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Tue, 23 Oct 2012 15:46:54 +0200 Subject: [PATCH 217/841] [ADD]Cron for generated costs bzr revid: dle@openerp.com-20121023134654-xbvm5egnc44ro8k8 --- addons/fleet/data.xml | 15 ++++++++++++++- addons/fleet/demo.xml | 6 +++--- addons/fleet/fleet.py | 38 +++++++++++++++++++++++++++++++++++--- 3 files changed, 52 insertions(+), 7 deletions(-) diff --git a/addons/fleet/data.xml b/addons/fleet/data.xml index 07cf8062cde..f6da343abf0 100644 --- a/addons/fleet/data.xml +++ b/addons/fleet/data.xml @@ -2,7 +2,7 @@ - Creation ofVehicle services and Services renewals reminders + Creation of Vehicle services and Services renewals reminders 1 @@ -14,6 +14,19 @@ + + Generation of contracts costs based on the costs frequency + + + 1 + minutes + -1 + + + + + + Calculation Benefit In Kind service diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml index 1603c2ee654..f58bc5a9159 100644 --- a/addons/fleet/demo.xml +++ b/addons/fleet/demo.xml @@ -769,7 +769,7 @@ 400 - monthly + weekly 2012-01-01 @@ -806,7 +806,7 @@ 400 - monthly + daily 2012-01-01 @@ -843,7 +843,7 @@ 400 - monthly + yearly 2012-01-01 diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 3cc7d5f6284..7feda666814 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -1,8 +1,9 @@ +# -*- coding: utf-8 -*- from itertools import chain from osv import osv, fields import time -import tools import datetime +import tools from osv.orm import except_orm from tools.translate import _ ############################ @@ -63,10 +64,8 @@ class fleet_vehicle_cost(osv.Model): data['vehicle_id'] = self.browse(cr, uid, data['parent_id'], context=context).vehicle_id.id data['date'] = self.browse(cr, uid, data['parent_id'], context=context).date if 'contract_id' in data and data['contract_id']: - print str(data) data['vehicle_id'] = self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, data['contract_id'], context=context).vehicle_id.id data['cost_type'] = self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, data['contract_id'], context=context).cost_type.id - print 'Contract : '+ str(data['contract_id']) + ' Add generated cost for vehicle ' + str(data['vehicle_id']) + ' with cost type : ' + str(data['cost_type']) cost_id = super(fleet_vehicle_cost, self).create(cr, uid, data, context=context) return cost_id @@ -849,6 +848,39 @@ class fleet_service_type(osv.Model): class fleet_vehicle_log_contract(osv.Model): _inherits = {'fleet.vehicle.cost': 'cost_id'} + + def run_scheduler(self,cr,uid,context=None): + + d = datetime.datetime.now() + #d = datetime.date(2001, 01, 01) + + frequencies = [] + if d.day == 1 and d.month == 1: + frequencies.append(('cost_frequency','=','yearly')) + if d.day == 1: + frequencies.append(('cost_frequency','=','monthly')) + if d.isoweekday() == 1: + frequencies.append(('cost_frequency','=','weekly')) + frequencies.append(('cost_frequency','=','daily')) + + frequencies_size = len(frequencies) + for i in range(frequencies_size-1): + frequencies.insert(0,'|') + + condition = ['&','&','&',('state','=','open',),('start_date','<=',d),('expiration_date','>=',d)] + condition.extend(frequencies) + + print str(condition) + contract_ids = self.pool.get('fleet.vehicle.log.contract').search(cr, uid, condition, offset=0, limit=None, order=None,context=None, count=False) + for contract_id in contract_ids: + + nbr = self.pool.get('fleet.vehicle.cost').search(cr,uid,['&',('contract_id','=',contract_id),('date','=',d)],context=context,count=True) + + if not nbr: + contract = self.pool.get('fleet.vehicle.log.contract').browse(cr,uid,contract_id,context=context) + data = {'amount' : contract.amount,'date' : d,'vehicle_id' : contract.vehicle_id.id,'cost_type' : contract.cost_type.id,'contract_id' : contract_id} + cost_id = self.pool.get('fleet.vehicle.cost').create(cr, uid, data, context=context) + return True def name_get(self, cr, uid, ids, context=None): if context is None: From 5a929ccd14c12970f401e74e79dbb729d488e8e2 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Tue, 23 Oct 2012 15:59:01 +0200 Subject: [PATCH 218/841] [ADD]Distinction in contracts for generated costs and activation costs bzr revid: dle@openerp.com-20121023135901-cpsrbry9uwl84bg2 --- addons/fleet/demo.xml | 15 ++++++++++----- addons/fleet/fleet.py | 6 ++---- addons/fleet/fleet_view.xml | 5 +++-- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml index f58bc5a9159..5db21ef9298 100644 --- a/addons/fleet/demo.xml +++ b/addons/fleet/demo.xml @@ -731,7 +731,8 @@ - 450 + 0 + 450 monthly 2012-01-01 @@ -768,7 +769,8 @@ - 400 + 0 + 400 weekly 2012-01-01 @@ -805,7 +807,8 @@ - 400 + 0 + 400 daily 2012-01-01 @@ -842,7 +845,8 @@ - 400 + 0 + 400 yearly 2012-01-01 @@ -879,7 +883,8 @@ - 400 + 0 + 400 monthly 2012-01-01 diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 7feda666814..d2d59adef1e 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -878,7 +878,7 @@ class fleet_vehicle_log_contract(osv.Model): if not nbr: contract = self.pool.get('fleet.vehicle.log.contract').browse(cr,uid,contract_id,context=context) - data = {'amount' : contract.amount,'date' : d,'vehicle_id' : contract.vehicle_id.id,'cost_type' : contract.cost_type.id,'contract_id' : contract_id} + data = {'amount' : contract.cost_generated,'date' : d,'vehicle_id' : contract.vehicle_id.id,'cost_type' : contract.cost_type.id,'contract_id' : contract_id} cost_id = self.pool.get('fleet.vehicle.cost').create(cr, uid, data, context=context) return True @@ -1026,9 +1026,6 @@ class fleet_vehicle_log_contract(osv.Model): _order='state,expiration_date' _columns = { 'name' : fields.function(_vehicle_contract_name_get_fnc, type="text", string='Name', store=True), - #'name' : fields.char('Name',size=64), - - #'cost_type': fields.many2one('fleet.service.type', 'Service type', required=False, help='Service type purchased with this cost', domain="[('category','=','contract')]"), 'start_date' : fields.date('Contract Start Date', required=False, help='Date when the coverage of the contract begins'), 'expiration_date' : fields.date('Contract Expiration Date', required=False, help='Date when the coverage of the contract expirates (by default, one year after begin date)'), @@ -1044,6 +1041,7 @@ class fleet_vehicle_log_contract(osv.Model): 'odometer' : fields.function(_get_odometer,fnct_inv=_set_odometer,type='char',string='Odometer Value',store=False,help='Odometer measure of the vehicle at the moment of this log'), 'odometer_unit': fields.related('vehicle_id','odometer_unit',type="char",string="Unit",store=False, readonly=True), 'cost_amount': fields.related('cost_id','amount',type="float",string="Amount",store=True, readonly=True), + 'cost_generated': fields.float('Generated costs amount'), 'cost_frequency': fields.selection([('daily', 'Daily'),('weekly','Weekly'),('monthly','Monthly'),('yearly','Yearly')], 'Cost Frequency', help='Frequency of the costs',required=True), 'generated_cost_ids' : fields.one2many('fleet.vehicle.cost', 'contract_id', 'Generated Costs',ondelete='cascade'), } diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 6ca53514e1f..11dcf3a6420 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -419,9 +419,10 @@ - From 5663bd8335aa576f4c9a4e11268d5efc6299d96c Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Tue, 23 Oct 2012 16:06:14 +0200 Subject: [PATCH 219/841] [ADD]Different vehicle tree view for dashboard bzr revid: dle@openerp.com-20121023140614-pl4153el0xej3i43 --- addons/fleet/board_fleet_view.xml | 18 +++++++++++++++++- addons/fleet/fleet_view.xml | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/addons/fleet/board_fleet_view.xml b/addons/fleet/board_fleet_view.xml index 1f38985c29e..09a670b5d13 100644 --- a/addons/fleet/board_fleet_view.xml +++ b/addons/fleet/board_fleet_view.xml @@ -1,6 +1,22 @@ + + fleet.vehicle.tree.board + fleet.vehicle + + + + + + + + + + + + + Fuel Costs by Month fleet.vehicle.log.fuel @@ -39,7 +55,7 @@ Vehicles which need contracts renewal fleet.vehicle - + form tree ['|',('contract_renewal_due_soon','>',0),('contract_renewal_overdue','>',0)] diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 11dcf3a6420..2f96e34cfd0 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -231,6 +231,7 @@ fleet.vehicle.tree fleet.vehicle + 1 From ba1adaef65362ab45e38be1adc6ff746438fcca6 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Tue, 23 Oct 2012 16:31:08 +0200 Subject: [PATCH 220/841] [ADD]Demo values and optimize date comparaison for generation of contracts costs bzr revid: dle@openerp.com-20121023143108-3gq57w6l0fzmdv01 --- addons/fleet/board_fleet_view.xml | 4 +-- addons/fleet/demo.xml | 50 +++++++++++++++++++++++++++++-- addons/fleet/fleet.py | 6 ++-- 3 files changed, 51 insertions(+), 9 deletions(-) diff --git a/addons/fleet/board_fleet_view.xml b/addons/fleet/board_fleet_view.xml index 09a670b5d13..3ef597733bb 100644 --- a/addons/fleet/board_fleet_view.xml +++ b/addons/fleet/board_fleet_view.xml @@ -28,9 +28,7 @@ Services Costs by Month fleet.vehicle.log.services - - - + form tree diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml index 5db21ef9298..359ad8a3b48 100644 --- a/addons/fleet/demo.xml +++ b/addons/fleet/demo.xml @@ -729,6 +729,50 @@ + + + 513 + + 2012-10-15 + + 124 + + Maintenance + + + + + 412 + + 2012-10-08 + + 20984 + + Maintenance + + + + + 275 + + 2012-09-25 + + 241 + + Maintenance + + + + + 302 + + 2012-09-15 + + 22513 + + Maintenance + + 0 @@ -771,7 +815,7 @@ 0 400 - weekly + monthly 2012-01-01 @@ -809,7 +853,7 @@ 0 400 - daily + monthly 2012-01-01 @@ -847,7 +891,7 @@ 0 400 - yearly + monthly 2012-01-01 diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index d2d59adef1e..a85b1dd8ad8 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -851,8 +851,8 @@ class fleet_vehicle_log_contract(osv.Model): def run_scheduler(self,cr,uid,context=None): - d = datetime.datetime.now() - #d = datetime.date(2001, 01, 01) + #d = datetime.datetime.now() + d = datetime.date(2012, 8, 01) frequencies = [] if d.day == 1 and d.month == 1: @@ -867,7 +867,7 @@ class fleet_vehicle_log_contract(osv.Model): for i in range(frequencies_size-1): frequencies.insert(0,'|') - condition = ['&','&','&',('state','=','open',),('start_date','<=',d),('expiration_date','>=',d)] + condition = ['&','&','&',('state','=','open',),('start_date','<=',d.strftime('%Y-%m-%d')),('expiration_date','>=',d.strftime('%Y-%m-%d'))] condition.extend(frequencies) print str(condition) From 6ea4181244579279fde119a79ac214531922870d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 23 Oct 2012 17:56:31 +0200 Subject: [PATCH 221/841] [FIX] mail: incoming emails are not correctly set with email type. bzr revid: tde@openerp.com-20121023155631-h7gbhrmgpg3mwj0f --- addons/mail/mail_thread.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 04da686b49d..273e0edaa36 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -554,7 +554,7 @@ class mail_thread(osv.AbstractModel): ('file2', 'bytes')} } """ - msg_dict = {} + msg_dict = {'type': 'email'} if not isinstance(message, Message): if isinstance(message, unicode): # Warning: message_from_string doesn't always work correctly on unicode, From a8da0fbef74cf71d934140c3b9a27b2846b1ebc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 23 Oct 2012 17:57:10 +0200 Subject: [PATCH 222/841] [IMP] mail: res_partner override: incoming emails are set as private, by setting thread_id to False. In message_post, this will set model and res_id of the message to False, leading to a private message. bzr revid: tde@openerp.com-20121023155710-j6ugemc60khdqk74 --- addons/mail/res_partner.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py index 6b13fe6ad20..46b250328f8 100644 --- a/addons/mail/res_partner.py +++ b/addons/mail/res_partner.py @@ -42,4 +42,21 @@ class res_partner_mail(osv.Model): 'notification_email_send': lambda *args: 'comment' } + def message_post(self, cr, uid, thread_id, body='', subject=None, type='notification', + subtype=None, parent_id=False, attachments=None, context=None, **kwargs): + """ Override related to res.partner. In case of email message, set it as + private: + - add the target partner in the message partner_ids + - set thread_id as None, because this will trigger the 'private' + aspect of the message (model=False, res_is=False) + """ + if isinstance(thread_id, (list, tuple)): + thread_id = thread_id[0] + if type == 'email': + partner_ids = kwargs.get('partner_ids', []) + partner_ids.append(thread_id) + kwargs['partner_ids'] = partner_ids + return super(res_partner_mail, self).message_post(cr, uid, False, body=body, subject=subject, + type=type, subtype=subtype, parent_id=parent_id, attachments=attachments, context=context, **kwargs) + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 2bf0904440bf4a38eacc4454627b42c05a22a1ae Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Tue, 23 Oct 2012 19:25:36 +0200 Subject: [PATCH 223/841] [FIX]Cron not though correctly bzr revid: dle@openerp.com-20121023172536-y843yfdjb2tar188 --- addons/fleet/fleet.py | 75 +++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 28 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index a85b1dd8ad8..5ee2509b531 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -6,6 +6,7 @@ import datetime import tools from osv.orm import except_orm from tools.translate import _ +from dateutil.relativedelta import relativedelta ############################ ############################ #Vehicle.cost class @@ -51,10 +52,12 @@ class fleet_vehicle_cost(osv.Model): 'date' :fields.date('Date',help='Date when the cost has been executed'), 'contract_id' : fields.many2one('fleet.vehicle.log.contract', 'Contract', required=False, help='Contract attached to this cost'), + 'auto_generated' : fields.boolean('automatically generated',readonly=True,required=True) } _default ={ 'parent_id':None, + 'auto_generated' : False, } @@ -851,40 +854,56 @@ class fleet_vehicle_log_contract(osv.Model): def run_scheduler(self,cr,uid,context=None): - #d = datetime.datetime.now() - d = datetime.date(2012, 8, 01) + d = datetime.datetime.now() + #d = datetime.datetime(2012, 12, 01) - frequencies = [] - if d.day == 1 and d.month == 1: - frequencies.append(('cost_frequency','=','yearly')) - if d.day == 1: - frequencies.append(('cost_frequency','=','monthly')) - if d.isoweekday() == 1: - frequencies.append(('cost_frequency','=','weekly')) - frequencies.append(('cost_frequency','=','daily')) + contract_ids = self.pool.get('fleet.vehicle.log.contract').search(cr, uid, [('state','=','open')], offset=0, limit=None, order=None,context=None, count=False) + for contract in self.pool.get('fleet.vehicle.log.contract').browse(cr,uid,contract_ids,context=context): + if contract.generated_cost_ids != []: + last_cost_id = self.pool.get('fleet.vehicle.cost').search(cr, uid, ['&',('contract_id','=',contract.id),('auto_generated','=',True)], offset=0, limit=1, order='date desc',context=None, count=False) + last_cost_date = self.pool.get('fleet.vehicle.cost').browse(cr,uid,last_cost_id[0],context=None).date + else : + last_cost_date = False - frequencies_size = len(frequencies) - for i in range(frequencies_size-1): - frequencies.insert(0,'|') - - condition = ['&','&','&',('state','=','open',),('start_date','<=',d.strftime('%Y-%m-%d')),('expiration_date','>=',d.strftime('%Y-%m-%d'))] - condition.extend(frequencies) - - print str(condition) - contract_ids = self.pool.get('fleet.vehicle.log.contract').search(cr, uid, condition, offset=0, limit=None, order=None,context=None, count=False) - for contract_id in contract_ids: - - nbr = self.pool.get('fleet.vehicle.cost').search(cr,uid,['&',('contract_id','=',contract_id),('date','=',d)],context=context,count=True) - - if not nbr: - contract = self.pool.get('fleet.vehicle.log.contract').browse(cr,uid,contract_id,context=context) - data = {'amount' : contract.cost_generated,'date' : d,'vehicle_id' : contract.vehicle_id.id,'cost_type' : contract.cost_type.id,'contract_id' : contract_id} - cost_id = self.pool.get('fleet.vehicle.cost').create(cr, uid, data, context=context) + if contract.cost_frequency == 'yearly': + delta = relativedelta(years=+1) + if last_cost_date: + startdate = datetime.datetime(int(last_cost_date[:4]),1,1) + relativedelta(years=+1) + else: + startdate = datetime.datetime(int(contract.start_date[:4]),1,1) + enddate = datetime.datetime(d.year,1,1) + if contract.cost_frequency == 'monthly': + delta = relativedelta(months=+1) + if last_cost_date: + startdate = datetime.datetime(int(last_cost_date[:4]),int(last_cost_date[5:7]),1) + relativedelta(months=+1) + else: + startdate = datetime.datetime(int(contract.start_date[:4]),int(contract.start_date[5:7]),1) + enddate = datetime.datetime(d.year,d.month,1) + if contract.cost_frequency == 'weekly': + delta = relativedelta(weeks=+1) + if last_cost_date: + startdate = datetime.datetime.strptime(last_cost_date[:4]+'-'+last_cost_date[5:7]+'-'+str(self.str_to_date(last_cost_date).weekday()),'%Y-%m-%w') + relativedelta(weeks=+1) + else: + startdate = datetime.datetime.strptime(contract.start_date[:4]+'-'+contract.start_date[5:7]+'-'+str(self.str_to_date(contract.start_date).weekday()),'%Y-%m-%w') + enddate = datetime.datetime.strptime(d.year+'-'+d.month+'-'+d.weekday(),'%Y-%m-%w') + if contract.cost_frequency == 'daily': + delta = relativedelta(days=+1) + if last_cost_date: + startdate = datetime.datetime.strptime(last_cost_date,'%Y-%m-%d') + relativedelta(days=+1) + else: + startdate = datetime.datetime.strptime(contract.start_date,'%Y-%m-%d') + enddate = d + print 'Start : '+str(startdate)+', End : '+str(enddate) + while startdate <= enddate: + data = {'amount' : contract.cost_generated,'date' : startdate,'vehicle_id' : contract.vehicle_id.id,'cost_type' : contract.cost_type.id,'contract_id' : contract.id,'auto_generated' : True} + print data + cost_id = self.pool.get('fleet.vehicle.cost').create(cr, uid, data, context=context) + startdate += delta return True def name_get(self, cr, uid, ids, context=None): if context is None: - context = {} + context = {} if not ids: return [] reads = self.browse(cr, uid, ids, context=context) From 0ddd32f68f11c5dd0875c1697f4098293070d3bd Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Tue, 23 Oct 2012 19:44:47 +0200 Subject: [PATCH 224/841] [FIX]Contracts cost cron weekly fixed bzr revid: dle@openerp.com-20121023174447-imj5zsc3we4jlasb --- addons/fleet/fleet.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 5ee2509b531..ff08d360fea 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -872,21 +872,21 @@ class fleet_vehicle_log_contract(osv.Model): else: startdate = datetime.datetime(int(contract.start_date[:4]),1,1) enddate = datetime.datetime(d.year,1,1) - if contract.cost_frequency == 'monthly': + elif contract.cost_frequency == 'monthly': delta = relativedelta(months=+1) if last_cost_date: startdate = datetime.datetime(int(last_cost_date[:4]),int(last_cost_date[5:7]),1) + relativedelta(months=+1) else: startdate = datetime.datetime(int(contract.start_date[:4]),int(contract.start_date[5:7]),1) enddate = datetime.datetime(d.year,d.month,1) - if contract.cost_frequency == 'weekly': + elif contract.cost_frequency == 'weekly': delta = relativedelta(weeks=+1) if last_cost_date: startdate = datetime.datetime.strptime(last_cost_date[:4]+'-'+last_cost_date[5:7]+'-'+str(self.str_to_date(last_cost_date).weekday()),'%Y-%m-%w') + relativedelta(weeks=+1) else: startdate = datetime.datetime.strptime(contract.start_date[:4]+'-'+contract.start_date[5:7]+'-'+str(self.str_to_date(contract.start_date).weekday()),'%Y-%m-%w') - enddate = datetime.datetime.strptime(d.year+'-'+d.month+'-'+d.weekday(),'%Y-%m-%w') - if contract.cost_frequency == 'daily': + enddate = datetime.datetime.strptime(str(d.year)+'-'+d.strftime('%W')+'-'+d.strftime('%w'),'%Y-%W-%w') + elif contract.cost_frequency == 'daily': delta = relativedelta(days=+1) if last_cost_date: startdate = datetime.datetime.strptime(last_cost_date,'%Y-%m-%d') + relativedelta(days=+1) From c144f3e183935b148d09f116e3d609b26a34ff18 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Wed, 24 Oct 2012 10:24:28 +0200 Subject: [PATCH 225/841] [IMP]Cron dates bzr revid: dle@openerp.com-20121024082428-230yvc0prch4d7wf --- addons/fleet/fleet.py | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index ff08d360fea..ec3d9ccae96 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -854,7 +854,7 @@ class fleet_vehicle_log_contract(osv.Model): def run_scheduler(self,cr,uid,context=None): - d = datetime.datetime.now() + d = datetime.date.today() #d = datetime.datetime(2012, 12, 01) contract_ids = self.pool.get('fleet.vehicle.log.contract').search(cr, uid, [('state','=','open')], offset=0, limit=None, order=None,context=None, count=False) @@ -864,38 +864,37 @@ class fleet_vehicle_log_contract(osv.Model): last_cost_date = self.pool.get('fleet.vehicle.cost').browse(cr,uid,last_cost_id[0],context=None).date else : last_cost_date = False - if contract.cost_frequency == 'yearly': delta = relativedelta(years=+1) if last_cost_date: - startdate = datetime.datetime(int(last_cost_date[:4]),1,1) + relativedelta(years=+1) + startdate = datetime.date(int(last_cost_date[:4]),1,1) + relativedelta(years=+1) else: - startdate = datetime.datetime(int(contract.start_date[:4]),1,1) - enddate = datetime.datetime(d.year,1,1) + startdate = datetime.date(int(contract.start_date[:4]),1,1) + enddate = datetime.date(d.year,1,1) elif contract.cost_frequency == 'monthly': delta = relativedelta(months=+1) if last_cost_date: - startdate = datetime.datetime(int(last_cost_date[:4]),int(last_cost_date[5:7]),1) + relativedelta(months=+1) + startdate = datetime.date(int(last_cost_date[:4]),int(last_cost_date[5:7]),1) + relativedelta(months=+1) else: - startdate = datetime.datetime(int(contract.start_date[:4]),int(contract.start_date[5:7]),1) - enddate = datetime.datetime(d.year,d.month,1) + startdate = datetime.date(int(contract.start_date[:4]),int(contract.start_date[5:7]),1) + enddate = datetime.date(d.year,d.month,1) elif contract.cost_frequency == 'weekly': delta = relativedelta(weeks=+1) if last_cost_date: - startdate = datetime.datetime.strptime(last_cost_date[:4]+'-'+last_cost_date[5:7]+'-'+str(self.str_to_date(last_cost_date).weekday()),'%Y-%m-%w') + relativedelta(weeks=+1) + startdate = datetime.datetime.strptime(last_cost_date[:4]+'-'+self.str_to_date(last_cost_date[5:7]).strftime('%W')+'-'+str(self.str_to_date(last_cost_date).weekday()),'%Y-%W-%w').date() + relativedelta(weeks=+1) else: - startdate = datetime.datetime.strptime(contract.start_date[:4]+'-'+contract.start_date[5:7]+'-'+str(self.str_to_date(contract.start_date).weekday()),'%Y-%m-%w') - enddate = datetime.datetime.strptime(str(d.year)+'-'+d.strftime('%W')+'-'+d.strftime('%w'),'%Y-%W-%w') + startdate = datetime.date.strptime(contract.start_date[:4]+'-'+self.str_to_date(contract.start_date[5:7]).strftime('%W')+'-'+str(self.str_to_date(contract.start_date).weekday()).date(),'%Y-%W-%w') + enddate = datetime.date.strptime(str(d.year)+'-'+d.strftime('%W')+'-'+d.strftime('%w'),'%Y-%W-%w') elif contract.cost_frequency == 'daily': delta = relativedelta(days=+1) if last_cost_date: - startdate = datetime.datetime.strptime(last_cost_date,'%Y-%m-%d') + relativedelta(days=+1) + startdate = datetime.datetime.strptime(last_cost_date,'%Y-%m-%d').date() + relativedelta(days=+1) else: - startdate = datetime.datetime.strptime(contract.start_date,'%Y-%m-%d') + startdate = datetime.datetime.strptime(contract.start_date,'%Y-%m-%d').date() enddate = d print 'Start : '+str(startdate)+', End : '+str(enddate) while startdate <= enddate: - data = {'amount' : contract.cost_generated,'date' : startdate,'vehicle_id' : contract.vehicle_id.id,'cost_type' : contract.cost_type.id,'contract_id' : contract.id,'auto_generated' : True} + data = {'amount' : contract.cost_generated,'date' : startdate.strftime('%Y-%m-%d'),'vehicle_id' : contract.vehicle_id.id,'cost_type' : contract.cost_type.id,'contract_id' : contract.id,'auto_generated' : True} print data cost_id = self.pool.get('fleet.vehicle.cost').create(cr, uid, data, context=context) startdate += delta From 22b8f785466c89078c230b2d7601d3a85a71a54c Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Wed, 24 Oct 2012 11:11:31 +0200 Subject: [PATCH 226/841] [ADD]Unique frequency for contracts costs frequency + [FIX]Week interval bugs + replace title and help messages bzr revid: dle@openerp.com-20121024091131-j1o5kf2klt0827be --- addons/fleet/demo.xml | 40 ++++++++++++++++++------------------- addons/fleet/fleet.py | 19 +++++++++++++----- addons/fleet/fleet_view.xml | 3 ++- 3 files changed, 36 insertions(+), 26 deletions(-) diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml index 359ad8a3b48..8b4275dd4bf 100644 --- a/addons/fleet/demo.xml +++ b/addons/fleet/demo.xml @@ -776,15 +776,15 @@ 0 - 450 - monthly + 20 + daily - 2012-01-01 + - Usual leasing contract + Daily leasing contract @@ -814,15 +814,15 @@ 0 - 400 - monthly + 150 + weekly - 2012-01-01 + - Usual leasing contract + Weekly leasing contract @@ -855,12 +855,12 @@ 400 monthly - 2012-01-01 + - Usual leasing contract + Monthly leasing contract @@ -890,15 +890,15 @@ 0 - 400 - monthly + 4000 + yearly - 2012-01-01 + - Usual leasing contract + Yearly leasing contract @@ -928,15 +928,15 @@ 0 - 400 - monthly + 17000 + unique - 2012-01-01 - - + + + - Usual leasing contract + Unique leasing contract diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index ec3d9ccae96..eaebbf9398a 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -859,6 +859,8 @@ class fleet_vehicle_log_contract(osv.Model): contract_ids = self.pool.get('fleet.vehicle.log.contract').search(cr, uid, [('state','=','open')], offset=0, limit=None, order=None,context=None, count=False) for contract in self.pool.get('fleet.vehicle.log.contract').browse(cr,uid,contract_ids,context=context): + if not contract.start_date: + break; if contract.generated_cost_ids != []: last_cost_id = self.pool.get('fleet.vehicle.cost').search(cr, uid, ['&',('contract_id','=',contract.id),('auto_generated','=',True)], offset=0, limit=1, order='date desc',context=None, count=False) last_cost_date = self.pool.get('fleet.vehicle.cost').browse(cr,uid,last_cost_id[0],context=None).date @@ -881,10 +883,10 @@ class fleet_vehicle_log_contract(osv.Model): elif contract.cost_frequency == 'weekly': delta = relativedelta(weeks=+1) if last_cost_date: - startdate = datetime.datetime.strptime(last_cost_date[:4]+'-'+self.str_to_date(last_cost_date[5:7]).strftime('%W')+'-'+str(self.str_to_date(last_cost_date).weekday()),'%Y-%W-%w').date() + relativedelta(weeks=+1) + startdate = datetime.datetime.strptime(last_cost_date[:4]+'-'+self.str_to_date(last_cost_date).strftime('%W')+'-'+str(self.str_to_date(last_cost_date).weekday()),'%Y-%W-%w').date() + relativedelta(weeks=+1) else: - startdate = datetime.date.strptime(contract.start_date[:4]+'-'+self.str_to_date(contract.start_date[5:7]).strftime('%W')+'-'+str(self.str_to_date(contract.start_date).weekday()).date(),'%Y-%W-%w') - enddate = datetime.date.strptime(str(d.year)+'-'+d.strftime('%W')+'-'+d.strftime('%w'),'%Y-%W-%w') + startdate = datetime.datetime.strptime(contract.start_date[:4]+'-'+self.str_to_date(contract.start_date).strftime('%W')+'-'+str(self.str_to_date(contract.start_date).weekday()),'%Y-%W-%w').date() + enddate = datetime.datetime.strptime(str(d.year)+'-'+d.strftime('%W')+'-'+d.strftime('%w'),'%Y-%W-%w').date() elif contract.cost_frequency == 'daily': delta = relativedelta(days=+1) if last_cost_date: @@ -892,6 +894,13 @@ class fleet_vehicle_log_contract(osv.Model): else: startdate = datetime.datetime.strptime(contract.start_date,'%Y-%m-%d').date() enddate = d + elif contract.cost_frequency == 'unique': + delta = relativedelta(days=+1) + if not last_cost_date: + enddate = startdate = datetime.datetime.strptime(contract.start_date,'%Y-%m-%d').date() + else: + startdate = 1 + enddate = 0 print 'Start : '+str(startdate)+', End : '+str(enddate) while startdate <= enddate: data = {'amount' : contract.cost_generated,'date' : startdate.strftime('%Y-%m-%d'),'vehicle_id' : contract.vehicle_id.id,'cost_type' : contract.cost_type.id,'contract_id' : contract.id,'auto_generated' : True} @@ -1059,8 +1068,8 @@ class fleet_vehicle_log_contract(osv.Model): 'odometer' : fields.function(_get_odometer,fnct_inv=_set_odometer,type='char',string='Odometer Value',store=False,help='Odometer measure of the vehicle at the moment of this log'), 'odometer_unit': fields.related('vehicle_id','odometer_unit',type="char",string="Unit",store=False, readonly=True), 'cost_amount': fields.related('cost_id','amount',type="float",string="Amount",store=True, readonly=True), - 'cost_generated': fields.float('Generated costs amount'), - 'cost_frequency': fields.selection([('daily', 'Daily'),('weekly','Weekly'),('monthly','Monthly'),('yearly','Yearly')], 'Cost Frequency', help='Frequency of the costs',required=True), + 'cost_generated': fields.float('Recuring Costs Amount',help="Costs paid at regular intervals, depending on the cost frequency. If the cost frequency is set to unique, the cost will be logged at the start date"), + 'cost_frequency': fields.selection([('unique','Unique'),('daily', 'Daily'),('weekly','Weekly'),('monthly','Monthly'),('yearly','Yearly')], 'Cost Frequency', help='Frequency of the costs',required=True), 'generated_cost_ids' : fields.one2many('fleet.vehicle.cost', 'contract_id', 'Generated Costs',ondelete='cascade'), } _defaults = { diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 2f96e34cfd0..07ea7eec78d 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -500,7 +500,8 @@ - + + From 92528bd5101d95a0fd69f0a83ac96644f5b75fd0 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Wed, 24 Oct 2012 11:55:10 +0200 Subject: [PATCH 227/841] [IMP]Vehicles list in dashboard now in kanban view bzr revid: dle@openerp.com-20121024095510-hzmfg1gjcfr5sazs --- addons/fleet/board_fleet_view.xml | 22 +++------------------- addons/fleet/fleet_view.xml | 2 +- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/addons/fleet/board_fleet_view.xml b/addons/fleet/board_fleet_view.xml index 3ef597733bb..f0ada104dbb 100644 --- a/addons/fleet/board_fleet_view.xml +++ b/addons/fleet/board_fleet_view.xml @@ -1,22 +1,6 @@ - - fleet.vehicle.tree.board - fleet.vehicle - - - - - - - - - - - - - Fuel Costs by Month fleet.vehicle.log.fuel @@ -50,10 +34,10 @@ [('parent_id','=',False)] - + Vehicles which need contracts renewal fleet.vehicle - + form tree ['|',('contract_renewal_due_soon','>',0),('contract_renewal_overdue','>',0)] @@ -71,7 +55,7 @@
- + diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 07ea7eec78d..9a450c0c2d7 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -500,7 +500,7 @@ - + From f579cc927f2a392e9db3772f1fbc3f0f81cf9a23 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 24 Oct 2012 12:54:54 +0200 Subject: [PATCH 228/841] [FIX] files filtering when loading... stuff. also, cleanup module file (remove extra imports, extra default key in manifest) bzr revid: xmo@openerp.com-20121024105454-nqw9taxladjofz2v --- openerp/modules/loading.py | 5 ++++- openerp/modules/module.py | 10 ---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py index 57fb92a6ee0..ceb87afc67f 100644 --- a/openerp/modules/loading.py +++ b/openerp/modules/loading.py @@ -113,6 +113,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules= if kind in ('demo', 'demo_xml'): noupdate = True try: + ext = ext.lower() if ext == '.csv': if kind in ('init', 'init_xml'): noupdate = True @@ -121,8 +122,10 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules= process_sql_file(cr, fp) elif ext == '.yml': tools.convert_yaml_import(cr, module_name, fp, kind, idref, mode, noupdate, report) - else: + elif ext == '.xml': tools.convert_xml_import(cr, module_name, fp, idref, mode, noupdate, report) + else: + _logger.debug("Ignoring %s due to unknown type", filename) finally: fp.close() diff --git a/openerp/modules/module.py b/openerp/modules/module.py index 6ec9e86340c..39c9817a878 100644 --- a/openerp/modules/module.py +++ b/openerp/modules/module.py @@ -28,15 +28,9 @@ import sys import types import zipimport -import openerp - -import openerp.osv as osv import openerp.tools as tools import openerp.tools.osutil as osutil from openerp.tools.safe_eval import safe_eval as eval -from openerp.tools.translate import _ - -import openerp.netsvc as netsvc import zipfile import openerp.release as release @@ -48,9 +42,6 @@ from cStringIO import StringIO import logging -import openerp.modules.db -import openerp.modules.graph - _logger = logging.getLogger(__name__) _ad = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'addons') # default addons path (base) @@ -335,7 +326,6 @@ def load_information_from_description_file(module): 'description': '', 'icon': get_module_icon(module), 'installable': True, - 'auto_install': False, 'license': 'AGPL-3', 'name': False, 'post_load': None, From 124480d095c0c8559eab7f7ea134b0bc106d590a Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 24 Oct 2012 12:55:31 +0200 Subject: [PATCH 229/841] [FIX] reference to invalid and non-existant js file bzr revid: xmo@openerp.com-20121024105531-c0uou49k828wc01t --- addons/base_setup/__openerp__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py index de2d8236ece..e74238ba59c 100644 --- a/addons/base_setup/__openerp__.py +++ b/addons/base_setup/__openerp__.py @@ -44,7 +44,6 @@ Shows you a list of applications features to install from. 'installable': True, 'auto_install': False, 'images': ['images/base_setup1.jpeg','images/base_setup2.jpeg','images/base_setup3.jpeg','images/base_setup4.jpeg',], - 'js': ['static/src/js/base_setup.js'], 'css': ['static/src/css/base_setup.css'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 403d2ec6d1952a5b846ed8e4c9422893ec0574fd Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 24 Oct 2012 12:55:48 +0200 Subject: [PATCH 230/841] [FIX] process: dependencies bzr revid: xmo@openerp.com-20121024105548-tmcpidjteuf2uwei --- addons/process/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/process/__openerp__.py b/addons/process/__openerp__.py index fcae18c5490..c998288a614 100644 --- a/addons/process/__openerp__.py +++ b/addons/process/__openerp__.py @@ -35,7 +35,7 @@ This module shows the basic processes involved in the selected modules and in th """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', - 'depends': ['base'], + 'depends': ['web'], 'data': [ 'security/ir.model.access.csv', 'process_view.xml' From b2e32b21faf1362a718d9e07106394c5eef77b40 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 24 Oct 2012 12:56:12 +0200 Subject: [PATCH 231/841] [FIX] base_import: dummy test file bzr revid: xmo@openerp.com-20121024105612-84fb2gav0jpp2hkc --- addons/base_import/__openerp__.py | 3 ++- addons/base_import/static/test/states.js | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 addons/base_import/static/test/states.js diff --git a/addons/base_import/__openerp__.py b/addons/base_import/__openerp__.py index f5a707650d8..559031f4b4f 100644 --- a/addons/base_import/__openerp__.py +++ b/addons/base_import/__openerp__.py @@ -24,7 +24,7 @@ Re-implement openerp's file import system: 'category': 'Uncategorized', 'website': 'http://www.openerp.com', 'author': 'OpenERP SA', - 'depends': ['base'], + 'depends': ['web'], 'installable': True, 'auto_install': True, 'css': [ @@ -37,4 +37,5 @@ Re-implement openerp's file import system: 'static/src/js/import.js', ], 'qweb': ['static/src/xml/import.xml'], + 'test': ['static/test/states.js'], } diff --git a/addons/base_import/static/test/states.js b/addons/base_import/static/test/states.js new file mode 100644 index 00000000000..3e349907a6f --- /dev/null +++ b/addons/base_import/static/test/states.js @@ -0,0 +1,6 @@ +$(document).ready(function () { + module('foo'); + test('dummy', function () { + ok(42); + }); +}); From 1cf9b2a60da502de27aa67e8318f41ad6692e5a9 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 24 Oct 2012 13:01:46 +0200 Subject: [PATCH 232/841] [REM] test_support controller bzr revid: xmo@openerp.com-20121024110146-bzuf19sfptew0dn0 --- addons/web/test_support/__init__.py | 37 ----------------------- addons/web/test_support/controllers.py | 42 -------------------------- 2 files changed, 79 deletions(-) delete mode 100644 addons/web/test_support/__init__.py delete mode 100644 addons/web/test_support/controllers.py diff --git a/addons/web/test_support/__init__.py b/addons/web/test_support/__init__.py deleted file mode 100644 index 59f6cc67ca2..00000000000 --- a/addons/web/test_support/__init__.py +++ /dev/null @@ -1,37 +0,0 @@ -# -*- coding: utf-8 -*- -import xmlrpclib -from ..common.openerplib.main import Connector - -execute_map = {} - -class TestConnector(Connector): - def db_list_lang(self): - return [('en_US', u'Test Language')] - - def common_authenticate(self, db, login, password, environment): - return 87539319 - - def common_login(self, db, login, password): - return self.common_authenticate(db, login, password, {}) - - def object_execute_kw(self, db, uid, password, model, method, args, kwargs): - if model in execute_map and hasattr(execute_map[model], method): - return getattr(execute_map[model], method)(*args, **kwargs) - - raise xmlrpclib.Fault({ - 'model': model, - 'method': method, - 'args': args, - 'kwargs': kwargs - }, '') - - def send(self, service_name, method, *args): - method_name = '%s_%s' % (service_name, method) - if hasattr(self, method_name): - return getattr(self, method_name)(*args) - - raise xmlrpclib.Fault({ - 'service': service_name, - 'method': method, - 'args': args - }, '') diff --git a/addons/web/test_support/controllers.py b/addons/web/test_support/controllers.py deleted file mode 100644 index f1013fbaaf8..00000000000 --- a/addons/web/test_support/controllers.py +++ /dev/null @@ -1,42 +0,0 @@ -# -*- coding: utf-8 -*- - -from ..common import http, nonliterals -from ..controllers.main import Session - -UID = 87539319 -DB = 'test_db' -LOGIN = 'test_login' -PASSWORD = 'test_password' -CONTEXT = {'lang': 'en_US', 'tz': 'UTC', 'uid': UID} - -def bind(session): - session.bind(DB, UID, LOGIN, PASSWORD) - session.context = CONTEXT - session.build_connection().set_login_info(DB, LOGIN, PASSWORD, UID) - -class TestController(http.Controller): - _cp_path = '/tests' - - @http.jsonrequest - def add_nonliterals(self, req, domains, contexts): - return { - 'domains': [nonliterals.Domain(req.session, domain) - for domain in domains], - 'contexts': [nonliterals.Context(req.session, context) - for context in contexts] - } - -class TestSession(Session): - _cp_path = '/web/session' - - def session_info(self, req): - if not req.session._uid: - bind(req.session) - - return { - "session_id": req.session_id, - "uid": req.session._uid, - "context": CONTEXT, - "db": req.session._db, - "login": req.session._login, - } From 97654d6767c697ca5303a3eb76c19cd9a85d5d1a Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Wed, 24 Oct 2012 13:58:49 +0200 Subject: [PATCH 233/841] [ADD]help messages and correct a bug on vehicle kanban view when the car had no contract bzr revid: csn@openerp.com-20121024115849-orxkd2pyctl1f2fz --- addons/fleet/fleet.py | 10 ++- addons/fleet/fleet_view.xml | 171 ++++++++++++++++++++++++------------ 2 files changed, 120 insertions(+), 61 deletions(-) diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index eaebbf9398a..a8d0370408e 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -406,11 +406,13 @@ class fleet_vehicle(osv.Model): return dict([]) reads = self.browse(cr,uid,ids,context=context) res=[] - for record in reads: - ids = self.pool.get('fleet.vehicle.log.contract').search(cr,uid,[('vehicle_id','=',record.id),('state','=','open')],limit=1,order='expiration_date asc') - if len(ids) > 0: - res.append((record.id,self.pool.get('fleet.vehicle.log.contract').browse(cr,uid,ids[0],context=context).cost_type.name)) + if (record.log_contracts): + ids = self.pool.get('fleet.vehicle.log.contract').search(cr,uid,[('vehicle_id','=',record.id),('state','=','open')],limit=1,order='expiration_date asc') + if len(ids) > 0: + res.append((record.id,self.pool.get('fleet.vehicle.log.contract').browse(cr,uid,ids[0],context=context).cost_type.name)) + else: + res.append((record.id,'')) return dict(res) def get_total_contract_reminder(self,cr,uid,ids,prop,unknow_none,context=None): diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 9a450c0c2d7..462c201c7ff 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -335,51 +335,95 @@ - - + + Services Logs + fleet.vehicle.log.services + fleet.vehicle + form + tree,form + +

+ Click to create a new service entry. +

+ OpenERP helps you keeping track of all the services done + on your vehicle. Services can be of many type, occasional + repair, fixed maintenance, etc. +

+ + - + + Fuel Logs + fleet.vehicle.log.fuel + fleet.vehicle + form + tree,form,graph + +

+ Click to create a new fuel log. +

+ Here you can add refuelling entries for all vehicles. + You can also show the log for a particular vehicle using + the search field. +

+ + - + + Contract + fleet.vehicle.log.contract + fleet.vehicle + form + tree,form + +

+ Click to create a new contract. +

+ OpenERP helps you managing all the contracts for your + vehicle, leasing, insurance, or any other type of contract. +

+ The contract form includes all sort of details, like the + activation cost, recurrent cost, the services included in + the contract, beginning and possibly ending date, etc. +

+ + - + + Costs + fleet.vehicle.cost + fleet.vehicle + form + tree,form,graph + {"search_default_parent_false" : True} + +

+ Click to create a new cost. +

+ OpenERP helps you managing the costs for your different vehicles + Costs are generally created from services and contract and appears here. +

+ Thanks to the different filters, OpenERP can only print the effective + costs, sort them by type and by vehicle. +

+ + + + + Odometer + fleet.vehicle.odometer + fleet.vehicle + form + tree,form,graph + +

+ Here you can add various odometer entries for all vehicles. + You can also show odometer value for a particular vehicle using + the search field. +

+ + @@ -391,10 +435,12 @@

Click to create a new vehicle.

- Here you can create and add new vehicles to your fleet. - You can associate a driver, add tags, contracts, services - and other informations to a vehicle. You can also sort - them by brand, plate number, driver, location, tags, status. + OpenERP will help you manage your fleet by keeping + track of the contracts, services, costs, fuel logs associated + to a particular vehicle. +

+ When a contract arrives near expiration date, a visual warning + will show you that you need to renew that particular contract.

@@ -530,10 +576,12 @@

Click to create a new contract.

- Here you can create new contracts and show all existing - contracts. Contracts can be of various type, from insurance - contracts to leasing contracts. Each contract is associated - to an existing vehicle and can also be associated to a user. + OpenERP helps you managing all the contracts for your + vehicle, leasing, insurance, or any other type of contract. +

+ The contract form includes all sort of details, like the + activation cost, recurrent cost, the services included in + the contract, beginning and possibly ending date, etc.

@@ -787,12 +835,11 @@ tree,form,graph

- Click to create a new service log entry. + Click to create a new service entry.

- Here you can create new services entries and show all past and - future services. A service can be an occasional repair on a - vehicle or a fixed maintenance. A service is associated to - an existing vehicle. + OpenERP helps you keeping track of all the services done + on your vehicle. Services can be of many type, occasional + repair, fixed maintenance, etc.

@@ -819,10 +866,9 @@

Click to create a new type of service.

- Here you can add new services, each service - belong to a category.
+ Each service belongs to a category.
- contract if this service is used in a contract (ie: leasing, ...).
- - service if it is used as a service (ie: repair, ...).
+ - service if it is used as a service (ie: repair, change tire...).
- both if it is used in both case.

@@ -901,6 +947,17 @@ form tree,form,graph {"search_default_parent_false" : True} + +

+ Click to create a new cost. +

+ OpenERP helps you managing the costs for your different vehicles + Costs are generally created from services and contract and appears here. +

+ Thanks to the different filters, OpenERP can only print the effective + costs, sort them by type and by vehicle. +

+ From 757328b2fee078edf9c99e78f9ab083195e44c0a Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Wed, 24 Oct 2012 14:17:19 +0200 Subject: [PATCH 234/841] [FIX]removed useless code in view as well as wizard class bzr revid: csn@openerp.com-20121024121719-jp3wfyz2v7oaaxgr --- addons/fleet/__init__.py | 3 +- addons/fleet/__openerp__.py | 1 - addons/fleet/fleet.py | 13 +- addons/fleet/fleet_view.xml | 90 ------------- addons/fleet/wizard/__init__.py | 1 - addons/fleet/wizard/renew_contract.py | 140 -------------------- addons/fleet/wizard/renew_contract_view.xml | 70 ---------- 7 files changed, 8 insertions(+), 310 deletions(-) delete mode 100644 addons/fleet/wizard/__init__.py delete mode 100644 addons/fleet/wizard/renew_contract.py delete mode 100644 addons/fleet/wizard/renew_contract_view.xml diff --git a/addons/fleet/__init__.py b/addons/fleet/__init__.py index 369c7f372c6..a09fca549ce 100644 --- a/addons/fleet/__init__.py +++ b/addons/fleet/__init__.py @@ -1,3 +1,2 @@ # import the hr_car code -import fleet -import wizard \ No newline at end of file +import fleet \ No newline at end of file diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py index 74f1df2e336..953b63ae82f 100644 --- a/addons/fleet/__openerp__.py +++ b/addons/fleet/__openerp__.py @@ -21,7 +21,6 @@ Vehicle, leasing, insurances, cost 'fleet_view.xml', 'data.xml', 'board_fleet_view.xml', - 'wizard/renew_contract_view.xml', ], 'update_xml' : ['security/ir.model.access.csv'], diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index a8d0370408e..e912066c669 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -232,7 +232,7 @@ class fleet_vehicle(osv.Model): """ This opens log view to view and add new log for this vehicle @return: the service log view """ - res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','act_show_log_services', context) + res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','fleet_vehicle_log_services_act', context) res['context'] = { 'default_vehicle_id': ids[0] } @@ -243,7 +243,7 @@ class fleet_vehicle(osv.Model): """ This opens log view to view and add new log for this vehicle @return: the contract log view """ - res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','act_show_log_contract', context) + res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','fleet_vehicle_log_contract_act', context) res['context'] = { 'default_vehicle_id': ids[0] } @@ -254,7 +254,7 @@ class fleet_vehicle(osv.Model): """ This opens log view to view and add new log for this vehicle @return: the fuel log view """ - res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','act_show_log_fuel', context) + res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','fleet_vehicle_log_fuel_act', context) res['context'] = { 'default_vehicle_id': ids[0] } @@ -265,9 +265,10 @@ class fleet_vehicle(osv.Model): """ This opens log view to view and add new log for this vehicle @return: the costs log view """ - res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','act_show_log_cost', context) + res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','fleet_vehicle_costs_act', context) res['context'] = { - 'default_vehicle_id': ids[0] + 'default_vehicle_id': ids[0], + 'search_default_parent_false' : True } res['domain']=[('vehicle_id','=', ids[0])] return res @@ -276,7 +277,7 @@ class fleet_vehicle(osv.Model): """ This opens log view to view and add new log for this vehicle @return: the odometer log view """ - res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','act_show_log_odometer', context) + res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','fleet_vehicle_odometer_act', context) res['context'] = { 'default_vehicle_id': ids[0] } diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 462c201c7ff..b978a3f7f8a 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -334,96 +334,6 @@ - - - - Services Logs - fleet.vehicle.log.services - fleet.vehicle - form - tree,form - -

- Click to create a new service entry. -

- OpenERP helps you keeping track of all the services done - on your vehicle. Services can be of many type, occasional - repair, fixed maintenance, etc. -

- - - - - Fuel Logs - fleet.vehicle.log.fuel - fleet.vehicle - form - tree,form,graph - -

- Click to create a new fuel log. -

- Here you can add refuelling entries for all vehicles. - You can also show the log for a particular vehicle using - the search field. -

- - - - - Contract - fleet.vehicle.log.contract - fleet.vehicle - form - tree,form - -

- Click to create a new contract. -

- OpenERP helps you managing all the contracts for your - vehicle, leasing, insurance, or any other type of contract. -

- The contract form includes all sort of details, like the - activation cost, recurrent cost, the services included in - the contract, beginning and possibly ending date, etc. -

- - - - - Costs - fleet.vehicle.cost - fleet.vehicle - form - tree,form,graph - {"search_default_parent_false" : True} - -

- Click to create a new cost. -

- OpenERP helps you managing the costs for your different vehicles - Costs are generally created from services and contract and appears here. -

- Thanks to the different filters, OpenERP can only print the effective - costs, sort them by type and by vehicle. -

- - - - - Odometer - fleet.vehicle.odometer - fleet.vehicle - form - tree,form,graph - -

- Here you can add various odometer entries for all vehicles. - You can also show odometer value for a particular vehicle using - the search field. -

- - diff --git a/addons/fleet/wizard/__init__.py b/addons/fleet/wizard/__init__.py deleted file mode 100644 index bc7dae97d56..00000000000 --- a/addons/fleet/wizard/__init__.py +++ /dev/null @@ -1 +0,0 @@ -import renew_contract \ No newline at end of file diff --git a/addons/fleet/wizard/renew_contract.py b/addons/fleet/wizard/renew_contract.py deleted file mode 100644 index 04f21227eb3..00000000000 --- a/addons/fleet/wizard/renew_contract.py +++ /dev/null @@ -1,140 +0,0 @@ -from osv import osv, fields -import datetime - -class renew_contract(osv.TransientModel): - _name = "fleet.vehicle.contract.renew" - _description = "wizard to renew a contract" - - def name_get(self, cr, uid, ids, context=None): - if context is None: - context = {} - if not ids: - return [] - reads = self.browse(cr, uid, ids, context=context) - res = [] - for record in reads: - if record.vehicle_id.name: - name = str(record.vehicle_id.name) - if record.cost_type.name: - name = name+ ' / '+ str(record.cost_type.name) - if record.date: - name = name+ ' / '+ record.date - res.append((record.id, name)) - return res - - def _vehicle_contract_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None): - res = self.name_get(cr, uid, ids, context=context) - return dict(res) - - def _get_odometer(self, cr, uid, ids, odometer_id, arg, context): - res = dict.fromkeys(ids, False) - for record in self.browse(cr,uid,ids,context=context): - if record.odometer_id: - res[record.id] = record.odometer_id.value - return res - - def _set_odometer(self, cr, uid, id, name, value, args=None, context=None): - if value: - try: - value = float(value) - except ValueError: - #_logger.exception(value+' is not a correct odometer value. Please, fill a float for this field') - raise except_orm(_('Error!'), value+' is not a correct odometer value. Please, fill a float for this field') - - date = self.browse(cr, uid, id, context=context).date - if not(date): - date = time.strftime('%Y-%m-%d') - vehicle_id = self.browse(cr, uid, id, context=context).vehicle_id - data = {'value' : value,'date' : date,'vehicle_id' : vehicle_id.id} - odometer_id = self.pool.get('fleet.vehicle.odometer').create(cr, uid, data, context=context) - self.write(cr, uid, id, {'odometer_id': odometer_id}) - return value - self.write(cr, uid, id, {'odometer_id': ''}) - return False - - def on_change_vehicle(self, cr, uid, ids, vehicle_id, context=None): - - if not vehicle_id: - return {} - - odometer_unit = self.pool.get('fleet.vehicle').browse(cr, uid, vehicle_id, context=context).odometer_unit - - return { - 'value' : { - 'odometer_unit' : odometer_unit, - } - } - - def compute_next_year_date(self, strdate): - oneyear=datetime.timedelta(days=365) - curdate = self.str_to_date(strdate) - nextyear=curdate+oneyear#int(strdate[:4])+1 - return str(nextyear)#+strdate[4:] - - #def on_change_start_date(self, cr, uid, ids, strdate, context=None): - # if (strdate): - - # return {'value' : {'expiration_date' : self.compute_next_year_date(strdate),}} - # else: - # return {} - - def str_to_date(self,strdate): - return datetime.datetime(int(strdate[:4]),int(strdate[5:7]),int(strdate[8:])) - - def get_warning_date(self,cr,uid,ids,prop,unknow_none,context=None): - if context is None: - context={} - if not ids: - return dict([]) - reads = self.browse(cr,uid,ids,context=context) - res=[] - for record in reads: - #if (record.reminder==True): - if (record.expiration_date and record.state=='open'): - today=self.str_to_date(time.strftime('%Y-%m-%d')) - renew_date = self.str_to_date(record.expiration_date) - diff_time=int((renew_date-today).days) - if (diff_time<=0): - res.append((record.id,0)) - else: - res.append((record.id,diff_time)) - else: - res.append((record.id,-1)) - #else: - # res.append((record.id,-1)) - return dict(res) - - _columns = { - 'name' : fields.function(_vehicle_contract_name_get_fnc, type="text", string='Name', store=True), - 'vehicle_id': fields.many2one('fleet.vehicle', 'Vehicle', required=True, help='Vehicle concerned by this fuel log'), - 'cost_type': fields.many2one('fleet.service.type', 'Service type', required=False, help='Service type purchased with this cost'), - 'amount': fields.float('Total Price'), - - 'parent_id': fields.many2one('fleet.vehicle.cost', 'Parent', required=False, help='Parent cost to this current cost'), - 'cost_ids' : fields.one2many('fleet.vehicle.cost', 'parent_id', 'Included Services'), - - 'date' :fields.date('Date',help='Date when the cost has been executed'), - - 'start_date' : fields.date('Contract Start Date', required=False, help='Date when the coverage of the contract begins'), - 'expiration_date' : fields.date('Contract Expiration Date', required=False, help='Date when the coverage of the contract expirates (by default, one year after begin date)'), - 'warning_date' : fields.function(get_warning_date,type='integer',string='Warning Date',store=False), - - 'insurer_id' :fields.many2one('res.partner', 'Supplier', domain="[('supplier','=',True)]"), - 'purchaser_id' : fields.many2one('res.partner', 'Contractor',domain="['|',('customer','=',True),('employee','=',True)]",help='Person to which the contract is signed for'), - 'ins_ref' : fields.char('Contract Reference', size=64), - 'state' : fields.selection([('open', 'In Progress'), ('closed', 'Terminated')], 'Status', readonly=True, help='Choose wheter the contract is still valid or not'), - #'reminder' : fields.boolean('Renewal Reminder', help="Warn the user a few days before the expiration date of this contract"), - 'notes' : fields.text('Terms and Conditions', help='Write here all supplementary informations relative to this contract'), - 'odometer_id' : fields.many2one('fleet.vehicle.odometer', 'Odometer', required=False, help='Odometer measure of the vehicle at the moment of this log'), - 'odometer' : fields.function(_get_odometer,fnct_inv=_set_odometer,type='char',string='Odometer Value',store=False,help='Odometer measure of the vehicle at the moment of this log'), - 'odometer_unit': fields.related('vehicle_id','odometer_unit',type="char",string="Unit",store=False, readonly=True), - #'cost_amount': fields.related('cost_id','amount',type="float",string="Amount",store=True, readonly=True), - } - - - - def renew(self, cr, uid, ids, context=None): - print '-------------------------------' - print 'renew contract' - print '-------------------------------' - return {} \ No newline at end of file diff --git a/addons/fleet/wizard/renew_contract_view.xml b/addons/fleet/wizard/renew_contract_view.xml deleted file mode 100644 index 9113ebb595e..00000000000 --- a/addons/fleet/wizard/renew_contract_view.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - fleet.vehicle.contract.wizard.form - fleet.vehicle.contract.renew - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 70a7d80de0709c2d3553b0425a724ce7fdf57cd3 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Wed, 24 Oct 2012 17:33:11 +0200 Subject: [PATCH 235/841] [FIX]Cron + Techincal features + begin of hide cost generated when cost frequency = no bzr revid: dle@openerp.com-20121024153311-0vcjcp12zfz2um5m --- addons/fleet/demo.xml | 6 ++--- addons/fleet/fleet.py | 48 +++++++++++++------------------------ addons/fleet/fleet_view.xml | 11 +++++---- 3 files changed, 26 insertions(+), 39 deletions(-) diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml index 8b4275dd4bf..f0d250e41fe 100644 --- a/addons/fleet/demo.xml +++ b/addons/fleet/demo.xml @@ -927,9 +927,9 @@ - 0 - 17000 - unique + 17000 + 0 + no diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index e912066c669..4396f21181c 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -867,45 +867,24 @@ class fleet_vehicle_log_contract(osv.Model): if contract.generated_cost_ids != []: last_cost_id = self.pool.get('fleet.vehicle.cost').search(cr, uid, ['&',('contract_id','=',contract.id),('auto_generated','=',True)], offset=0, limit=1, order='date desc',context=None, count=False) last_cost_date = self.pool.get('fleet.vehicle.cost').browse(cr,uid,last_cost_id[0],context=None).date + found = True else : - last_cost_date = False + found = False + last_cost_date = contract.start_date + startdate = datetime.datetime.strptime(last_cost_date,'%Y-%m-%d').date() if contract.cost_frequency == 'yearly': delta = relativedelta(years=+1) - if last_cost_date: - startdate = datetime.date(int(last_cost_date[:4]),1,1) + relativedelta(years=+1) - else: - startdate = datetime.date(int(contract.start_date[:4]),1,1) - enddate = datetime.date(d.year,1,1) elif contract.cost_frequency == 'monthly': delta = relativedelta(months=+1) - if last_cost_date: - startdate = datetime.date(int(last_cost_date[:4]),int(last_cost_date[5:7]),1) + relativedelta(months=+1) - else: - startdate = datetime.date(int(contract.start_date[:4]),int(contract.start_date[5:7]),1) - enddate = datetime.date(d.year,d.month,1) elif contract.cost_frequency == 'weekly': delta = relativedelta(weeks=+1) - if last_cost_date: - startdate = datetime.datetime.strptime(last_cost_date[:4]+'-'+self.str_to_date(last_cost_date).strftime('%W')+'-'+str(self.str_to_date(last_cost_date).weekday()),'%Y-%W-%w').date() + relativedelta(weeks=+1) - else: - startdate = datetime.datetime.strptime(contract.start_date[:4]+'-'+self.str_to_date(contract.start_date).strftime('%W')+'-'+str(self.str_to_date(contract.start_date).weekday()),'%Y-%W-%w').date() - enddate = datetime.datetime.strptime(str(d.year)+'-'+d.strftime('%W')+'-'+d.strftime('%w'),'%Y-%W-%w').date() elif contract.cost_frequency == 'daily': delta = relativedelta(days=+1) - if last_cost_date: - startdate = datetime.datetime.strptime(last_cost_date,'%Y-%m-%d').date() + relativedelta(days=+1) - else: - startdate = datetime.datetime.strptime(contract.start_date,'%Y-%m-%d').date() - enddate = d - elif contract.cost_frequency == 'unique': - delta = relativedelta(days=+1) - if not last_cost_date: - enddate = startdate = datetime.datetime.strptime(contract.start_date,'%Y-%m-%d').date() - else: - startdate = 1 - enddate = 0 - print 'Start : '+str(startdate)+', End : '+str(enddate) - while startdate <= enddate: + elif contract.cost_frequency == 'no': + break; + if found: + startdate += delta + while startdate < d: data = {'amount' : contract.cost_generated,'date' : startdate.strftime('%Y-%m-%d'),'vehicle_id' : contract.vehicle_id.id,'cost_type' : contract.cost_type.id,'contract_id' : contract.id,'auto_generated' : True} print data cost_id = self.pool.get('fleet.vehicle.cost').create(cr, uid, data, context=context) @@ -972,6 +951,12 @@ class fleet_vehicle_log_contract(osv.Model): } } + def _hide_generated_cost(self, cursor, user, ids, name, arg, context=None): + res = {} + for contract in self.browse(cursor, user, ids, context=context): + res[contract.id] = (contract.cost_frequency == 'no') + return res + def compute_next_year_date(self, strdate): oneyear=datetime.timedelta(days=365) curdate = self.str_to_date(strdate) @@ -1072,8 +1057,9 @@ class fleet_vehicle_log_contract(osv.Model): 'odometer_unit': fields.related('vehicle_id','odometer_unit',type="char",string="Unit",store=False, readonly=True), 'cost_amount': fields.related('cost_id','amount',type="float",string="Amount",store=True, readonly=True), 'cost_generated': fields.float('Recuring Costs Amount',help="Costs paid at regular intervals, depending on the cost frequency. If the cost frequency is set to unique, the cost will be logged at the start date"), - 'cost_frequency': fields.selection([('unique','Unique'),('daily', 'Daily'),('weekly','Weekly'),('monthly','Monthly'),('yearly','Yearly')], 'Cost Frequency', help='Frequency of the costs',required=True), + 'cost_frequency': fields.selection([('no','No'),('daily', 'Daily'),('weekly','Weekly'),('monthly','Monthly'),('yearly','Yearly')], 'Cost Frequency', help='Frequency of the costs',required=True), 'generated_cost_ids' : fields.one2many('fleet.vehicle.cost', 'contract_id', 'Generated Costs',ondelete='cascade'), + 'hide_generated_cost': fields.function(_hide_generated_cost, string='Frequency', type='boolean', help='This field is for internal purpose. It is used to decide if the field generated_cost lot has to be shown on the moves or not.'), } _defaults = { 'purchaser_id': lambda self, cr, uid, ctx: uid, diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index b978a3f7f8a..76f7b8e0713 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -155,8 +155,8 @@ - - + + @@ -379,8 +379,9 @@
@@ -784,7 +785,7 @@ - + From 3c503cb0632090ea181518cc65a6371625b7dfd7 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Wed, 24 Oct 2012 17:56:02 +0200 Subject: [PATCH 236/841] [ADD]Cost category in vehicle cost, which contains contract, services, fuel or other bzr revid: dle@openerp.com-20121024155602-lwtp0aic6osw9sq6 --- addons/fleet/board_fleet_view.xml | 15 +++++++++------ addons/fleet/fleet.py | 29 ++++++++++++++++++++++++----- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/addons/fleet/board_fleet_view.xml b/addons/fleet/board_fleet_view.xml index f0ada104dbb..51e0b2d1ac9 100644 --- a/addons/fleet/board_fleet_view.xml +++ b/addons/fleet/board_fleet_view.xml @@ -3,26 +3,29 @@ Fuel Costs by Month - fleet.vehicle.log.fuel - + fleet.vehicle.cost + form tree + ['&',('parent_id','=',False),('cost_category','=','fuel')] Services Costs by Month - fleet.vehicle.log.services - + fleet.vehicle.cost + form tree + ['&',('parent_id','=',False),('cost_category','=','services')] Contracts Costs by Month - fleet.vehicle.log.contract - + fleet.vehicle.cost + form tree + ['&',('parent_id','=',False),('cost_category','=','contract')] diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 4396f21181c..fa5624314b5 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -45,7 +45,7 @@ class fleet_vehicle_cost(osv.Model): 'vehicle_id': fields.many2one('fleet.vehicle', 'Vehicle', required=True, help='Vehicle concerned by this fuel log'), 'cost_type': fields.many2one('fleet.service.type', 'Service type', required=False, help='Service type purchased with this cost'), 'amount': fields.float('Total Price'), - + 'cost_category' : fields.selection([('contract', 'Contract'),('services','Services'),('fuel','Fuel'),('other','Other')], 'Category of the cost', help='For internal purpose only',required=True), 'parent_id': fields.many2one('fleet.vehicle.cost', 'Parent', required=False, help='Parent cost to this current cost'), 'cost_ids' : fields.one2many('fleet.vehicle.cost', 'parent_id', 'Included Services'), @@ -58,17 +58,24 @@ class fleet_vehicle_cost(osv.Model): _default ={ 'parent_id':None, 'auto_generated' : False, + 'cost_category' : 'other', } def create(self, cr, uid, data, context=None): if 'parent_id' in data and data['parent_id']: - data['vehicle_id'] = self.browse(cr, uid, data['parent_id'], context=context).vehicle_id.id - data['date'] = self.browse(cr, uid, data['parent_id'], context=context).date + parent = self.browse(cr, uid, data['parent_id'], context=context) + data['vehicle_id'] = parent.vehicle_id.id + data['date'] = parent.date + data['cost_category'] = parent.cost_category if 'contract_id' in data and data['contract_id']: - data['vehicle_id'] = self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, data['contract_id'], context=context).vehicle_id.id - data['cost_type'] = self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, data['contract_id'], context=context).cost_type.id + contract = self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, data['contract_id'], context=context) + data['vehicle_id'] = contract.vehicle_id.id + data['cost_type'] = contract.cost_type.id + data['cost_category'] = contract.cost_category + if not('cost_category' in data and data['cost_category']): + data['cost_category'] = 'other' cost_id = super(fleet_vehicle_cost, self).create(cr, uid, data, context=context) return cost_id @@ -758,6 +765,10 @@ class fleet_vehicle_log_fuel(osv.Model): 'date' : time.strftime('%Y-%m-%d'), 'cost_type': _get_default_service_type, } + def create(self, cr, uid, data, context=None): + data['cost_category'] = 'fuel' + cost_id = super(fleet_vehicle_log_fuel, self).create(cr, uid, data, context=context) + return cost_id ############################ ############################ @@ -828,6 +839,10 @@ class fleet_vehicle_log_services(osv.Model): 'purchaser_id': lambda self, cr, uid, ctx: uid, 'date' : time.strftime('%Y-%m-%d'), } + def create(self, cr, uid, data, context=None): + data['cost_category'] = 'services' + cost_id = super(fleet_vehicle_log_services, self).create(cr, uid, data, context=context) + return cost_id ############################ ############################ @@ -1093,6 +1108,10 @@ class fleet_vehicle_log_contract(osv.Model): def contract_open(self, cr, uid, ids, *args): self.write(cr, uid, ids, {'state': 'open'}) return True + def create(self, cr, uid, data, context=None): + data['cost_category'] = 'contract' + cost_id = super(fleet_vehicle_log_contract, self).create(cr, uid, data, context=context) + return cost_id ############################ From a356d849b09316c8b4719283da8e16a389112d39 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Wed, 24 Oct 2012 18:20:18 +0200 Subject: [PATCH 237/841] [FIX]Dashboard in reporting, added group groupby for filters bzr revid: dle@openerp.com-20121024162018-uj7moreco8kvwlyy --- addons/fleet/board_fleet_view.xml | 8 +++----- addons/fleet/fleet.py | 7 ------- addons/fleet/fleet_view.xml | 9 +++++---- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/addons/fleet/board_fleet_view.xml b/addons/fleet/board_fleet_view.xml index 51e0b2d1ac9..6ef00075e3a 100644 --- a/addons/fleet/board_fleet_view.xml +++ b/addons/fleet/board_fleet_view.xml @@ -55,7 +55,7 @@ board.fleet.form board.board -
+ @@ -72,7 +72,7 @@ - Dashboard + Fleet board.board form form @@ -93,11 +93,9 @@ - - diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index fa5624314b5..110ec7597bb 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -966,12 +966,6 @@ class fleet_vehicle_log_contract(osv.Model): } } - def _hide_generated_cost(self, cursor, user, ids, name, arg, context=None): - res = {} - for contract in self.browse(cursor, user, ids, context=context): - res[contract.id] = (contract.cost_frequency == 'no') - return res - def compute_next_year_date(self, strdate): oneyear=datetime.timedelta(days=365) curdate = self.str_to_date(strdate) @@ -1074,7 +1068,6 @@ class fleet_vehicle_log_contract(osv.Model): 'cost_generated': fields.float('Recuring Costs Amount',help="Costs paid at regular intervals, depending on the cost frequency. If the cost frequency is set to unique, the cost will be logged at the start date"), 'cost_frequency': fields.selection([('no','No'),('daily', 'Daily'),('weekly','Weekly'),('monthly','Monthly'),('yearly','Yearly')], 'Cost Frequency', help='Frequency of the costs',required=True), 'generated_cost_ids' : fields.one2many('fleet.vehicle.cost', 'contract_id', 'Generated Costs',ondelete='cascade'), - 'hide_generated_cost': fields.function(_hide_generated_cost, string='Frequency', type='boolean', help='This field is for internal purpose. It is used to decide if the field generated_cost lot has to be shown on the moves or not.'), } _defaults = { 'purchaser_id': lambda self, cr, uid, ctx: uid, diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 76f7b8e0713..0d23c04caac 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -379,8 +379,7 @@
- Leasing + Employee Car @@ -435,4 +435,4 @@ Break - \ No newline at end of file + diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 49ecb81bd21..cbc41d4f973 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -45,9 +45,7 @@

Click to create a new model.

- Specify the different model for a particular - brand of vehicle. For example Audi A3, - Audi A4, ... + You can define several models (e.g. A3, A4) for each brand (Audi).

@@ -120,8 +118,6 @@

Click to create a new brand. -

- Here you can add vehicle's brands (BMW, Opel, ...)

@@ -145,10 +141,10 @@ tree,form

- Click to create a new state. + Click to create a vehicule status.

- A state can help you knowing in what condition your - vehicle is. In reparation, Sold, Active, ... + You can customize available status to track the evolution of + each vehicule. Example: Active, Being Repaired, Sold.

@@ -347,12 +343,12 @@

Click to create a new vehicle.

- OpenERP will help you manage your fleet by keeping - track of the contracts, services, costs, fuel logs associated - to a particular vehicle. + You will be able to manage your fleet by keeping track of the + contracts, services, fixed and recurring costs, odometers and + fuel logs associated to each vehicle.

- When a contract arrives near expiration date, a visual warning - will show you that you need to renew that particular contract. + OpenERP will warn you when services or contract have to be + renewed.

@@ -487,12 +483,12 @@

Click to create a new contract.

- OpenERP helps you managing all the contracts for your - vehicle, leasing, insurance, or any other type of contract. -

- The contract form includes all sort of details, like the - activation cost, recurrent cost, the services included in - the contract, beginning and possibly ending date, etc. + Manage all your contracts (leasing, insurances, etc.) with + their related services, costs. OpenERP will automatically warn + you when some contracts have to be renewed. +

+ Each contract (e.g.: leasing) may include several services + (reparation, insurances, periodic maintenance).

@@ -656,9 +652,9 @@

Click to create a new fuel log.

- Here you can add refuelling entries for all vehicles. - You can also show the log for a particular vehicle using - the search field. + Here you can add refuelling entries for all vehicles. You can + also filter logs of a particular vehicle using the search + field.

@@ -749,7 +745,7 @@ Click to create a new service entry.

OpenERP helps you keeping track of all the services done - on your vehicle. Services can be of many type, occasional + on your vehicle. Services can be of many type: occasional repair, fixed maintenance, etc.

@@ -777,10 +773,7 @@

Click to create a new type of service.

- Each service belongs to a category.
- - contract if this service is used in a contract (ie: leasing, ...).
- - service if it is used as a service (ie: repair, change tire...).
- - both if it is used in both case. + Each service can used in contracts, as a standalone service or both.

@@ -869,11 +862,9 @@

Click to create a new cost.

- OpenERP helps you managing the costs for your different vehicles - Costs are generally created from services and contract and appears here. -

- Thanks to the different filters, OpenERP can only print the effective - costs, sort them by type and by vehicle. + OpenERP helps you managing the costs for your different + vehicles. Costs are created automatically from services, + contracts (fixed or recurring) and fuel logs.

From f992b688bb268a03957e2b4f936715cc145c2864 Mon Sep 17 00:00:00 2001 From: "Jalpesh Patel (OpenERP)" Date: Mon, 29 Oct 2012 15:48:50 +0530 Subject: [PATCH 266/841] [IMP]solve problem don't save or confirm or confirm & receive manually creating incoming shipments bzr revid: pja@tinyerp.com-20121029101850-78iq489ut29q7w62 --- addons/stock/stock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index eb667b53c09..e7b3cf1e041 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -618,7 +618,7 @@ class stock_picking(osv.osv): def create(self, cr, user, vals, context=None): if ('name' not in vals) or (vals.get('name')=='/'): - seq_obj_name = 'stock.picking.' + vals.get('type','in') + seq_obj_name = 'stock.picking.' + context.get('default_type','internal') vals['name'] = self.pool.get('ir.sequence').get(cr, user, seq_obj_name) new_id = super(stock_picking, self).create(cr, user, vals, context) if new_id: From bf4a26d3e8613c24b3a360013525cfef28458176 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 29 Oct 2012 12:01:54 +0100 Subject: [PATCH 267/841] [ADD] actual-RPC tests, with UI. Bump QUnit timeout to 10s so RPC can run at all bzr revid: xmo@openerp.com-20121029110154-5927gaix8k0ijl0c --- addons/web/controllers/testing.py | 2 +- addons/web/doc/images/db-query.png | Bin 0 -> 7142 bytes addons/web/doc/images/tests2.png | Bin 37769 -> 20114 bytes addons/web/doc/images/tests3.png | Bin 37827 -> 20382 bytes addons/web/doc/testing.rst | 86 +++++++++- addons/web/static/src/js/testing.js | 182 ++++++++++++++++------ addons/web_tests_demo/__init__.py | 14 ++ addons/web_tests_demo/static/test/demo.js | 15 ++ 8 files changed, 242 insertions(+), 57 deletions(-) create mode 100644 addons/web/doc/images/db-query.png diff --git a/addons/web/controllers/testing.py b/addons/web/controllers/testing.py index 0cfc633a492..9947f1e1ed5 100644 --- a/addons/web/controllers/testing.py +++ b/addons/web/controllers/testing.py @@ -53,7 +53,7 @@ TESTING = Template(u""" diff --git a/addons/web/doc/images/db-query.png b/addons/web/doc/images/db-query.png new file mode 100644 index 0000000000000000000000000000000000000000..e063b724001871f3846ead587810069347a8eab6 GIT binary patch literal 7142 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 U?IK$f`NBkzl~#}{kudW8FIjHf#{d8T literal 0 HcmV?d00001 diff --git a/addons/web/doc/images/tests2.png b/addons/web/doc/images/tests2.png index 59835b257b5e18f236303a34c66ede42f0bbc29e..c8a6f8ae9eefbeff46a9b45e3a9948676d820714 100644 GIT binary patch literal 20114 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 diff --git a/addons/web/doc/images/tests3.png b/addons/web/doc/images/tests3.png index 10b45eddedcbaf300d54245b85134efb2736c3cb..247f70716af614d48ed6255832cb2d71dce5d9f2 100644 GIT binary patch literal 20382 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 diff --git a/addons/web/doc/testing.rst b/addons/web/doc/testing.rst index 582960846e4..61077072ad2 100644 --- a/addons/web/doc/testing.rst +++ b/addons/web/doc/testing.rst @@ -297,8 +297,8 @@ test architecture was not warned about asynchronous operations. .. note:: - asynchronous test cases also have a 2 seconds timeout: if the test - does not finish within 2 seconds, it will be considered + asynchronous test cases also have a 10 seconds timeout: if the + test does not finish within 10 seconds, it will be considered failed. This pretty much always means the test will not resolve. .. note:: @@ -328,8 +328,8 @@ a test case (or its containing test suite) through Mock RPC ++++++++ -The preferred (and most fastest from a setup and execution time point -of view) way to do RPC during tests is to mock the RPC calls: while +The preferred (and fastest from a setup and execution time point of +view) way to do RPC during tests is to mock the RPC calls: while setting up the test case, provide what the RPC responses "should" be, and only test the code between the "user" (the test itself) and the RPC call, before the call is effectively done. @@ -412,7 +412,83 @@ To do this, set the :js:attr:`rpc option <~TestOptions.rpc>` to Actual RPC ++++++++++ -.. TODO:: rpc to database (implement & document) +A more realistic (but significantly slower and more expensive) way to +perform RPC calls is to perform actual calls to an actually running +OpenERP server. To do this, set the :js:attr:`rpc option +<~TestOptions.rpc>` to ``rpc``, it will not provide any new parameter +but will enable actual RPC, and the automatic creation and destruction +of databases (from a specified source) around tests. + +First, create a basic model we can test stuff with: + +.. code-block:: javascript + + from openerp.osv import orm, fields + + class TestObject(orm.Model): + _name = 'web_tests_demo.model' + + _columns = { + 'name': fields.char("Name", required=True), + 'thing': fields.char("Thing"), + 'other': fields.char("Other", required=True) + } + _defaults = { + 'other': "bob" + } + +then the actual test:: + + test('actual RPC', {rpc: 'rpc', asserts: 4}, function (instance) { + var Model = new instance.web.Model('web_tests_demo.model'); + return Model.call('create', [{name: "Bob"}]) + .pipe(function (id) { + return Model.call('read', [[id]]); + }).pipe(function (records) { + strictEqual(records.length, 1); + var record = records[0]; + strictEqual(record.name, "Bob"); + strictEqual(record.thing, false); + // default value + strictEqual(record.other, 'bob'); + }); + }); + +This test looks like a "mock" RPC test but for the lack of mock +response (and the different ``rpc`` type), however it has further +ranging consequences in that it will copy an existing database to a +new one, run the test in full on that temporary database and destroy +the database, to simulate an isolated and transactional context and +avoid affecting other tests. One of the consequences is that it takes +a *long* time to run (5~10s, most of that time being spent waiting for +a database duplication). + +Furthermore, as the test needs to clone a database, it also has to ask +which database to clone, the database/super-admin password and the +password of the ``admin`` user (in order to authenticate as said +user). As a result, the first time the test runner encounters an +``rpc: "rpc"`` test configuration it will produce the following +prompt: + +.. image:: ./images/db-query.png + :align: center + +and stop the testing process until the necessary information has been +provided. + +The prompt will only appear once per test run, all tests will use the +same "source" database. + +.. note:: + + The handling of that information is currently rather brittle and + unchecked, incorrect values will likely crash the runner. + +.. note:: + + The runner does not currently store this information (for any + longer than a test run that is), the prompt will have to be filled + every time. Testing API ----------- diff --git a/addons/web/static/src/js/testing.js b/addons/web/static/src/js/testing.js index 45728902e7f..744bd9fa2cd 100644 --- a/addons/web/static/src/js/testing.js +++ b/addons/web/static/src/js/testing.js @@ -85,6 +85,7 @@ openerp.testing = {}; }; }; + var db = window['oe_db_info'] || undefined; testing.section = function (name, options, body) { if (_.isFunction(options)) { body = options; @@ -115,32 +116,69 @@ openerp.testing = {}; // returns -1 -> index becomes 0 -> replace with ``undefined`` so // Array#slice returns a full copy 0, module_index + 1 || undefined); + + // Serialize options for this precise test case + // WARNING: typo is from jquery, do not fix! + var env = QUnit.config.currentModuleTestEnviroment; + var opts = _.defaults({ + // section setup + // case setup + // test + // case teardown + // section teardown + setup: function () { + var args = [].slice.call(arguments); + return $.when(env._oe.setup.apply(null, args)) + .pipe(function () { + return options.setup.apply(null, args); + }); + }, + teardown: function () { + var args = [].slice.call(arguments); + return $.when(options.teardown.apply(null, args)) + .pipe(function () { + return env._oe.teardown.apply(null, args); + }); + } + }, options, env._oe); + // FIXME: if this test is ignored, will still query + if (opts.rpc === 'rpc' && !db) { + QUnit.config.autostart = false; + db = { + source: null, + supadmin: null, + password: null + }; + var $msg = $('

') + .append('

A test needs to clone a database

') + .append('

Please provide the source clone information

') + .append(' Source DB: ').append('').append('
') + .append(' DB Password: ').append('').append('
') + .append('Admin Password: ').append('').append('
') + .append('') + .submit(function (e) { + e.preventDefault(); + e.stopPropagation(); + db.source = $msg.find('input[name=source]').val(); + db.supadmin = $msg.find('input[name=supadmin]').val(); + db.password = $msg.find('input[name=password]').val(); + QUnit.start(); + $.unblockUI(); + }); + $.blockUI({ + message: $msg, + css: { + fontFamily: 'monospace', + textAlign: 'left', + whiteSpace: 'pre-wrap', + cursor: 'default' + } + }); + } + QUnit.test(name, function () { // module testing environment var self = this; - var opts = _.defaults({ - // section setup - // case setup - // test - // case teardown - // section teardown - setup: function () { - if (self._oe.setup.apply(null, arguments)) { - throw new Error("Asynchronous setup not implemented"); - } - if (options.setup.apply(null, arguments)) { - throw new Error("Asynchronous setup not implemented"); - } - }, - teardown: function () { - if (options.teardown.apply(null, arguments)) { - throw new Error("Asynchronous teardown not implemented"); - } - if (self._oe.teardown(null, arguments)) { - throw new Error("Asynchronous teardown not implemented"); - } - } - }, options, this._oe); var instance; if (!opts.dependencies) { @@ -202,38 +240,80 @@ openerp.testing = {}; break; case 'rpc': async = true; + (function (setup, teardown) { + // Bunch of random base36 characters + var dbname = 'test_' + Math.random().toString(36).slice(2); + opts.setup = function (instance, $s) { + // FIXME hack: don't want the session to go through shitty loading process of everything + instance.session.session_init = testing.noop; + instance.session.load_modules = testing.noop; + instance.session.session_bind(); + return instance.session.rpc('/web/database/duplicate', { + fields: [ + {name: 'super_admin_pwd', value: db.supadmin}, + {name: 'db_original_name', value: db.source}, + {name: 'db_name', value: dbname} + ] + }).pipe(function (result) { + if (result.error) { + return $.Deferred().reject(result.error).promise(); + } + return instance.session.session_authenticate( + dbname, 'admin', db.password, true); + }).pipe(function () { + return setup(instance, $s); + }); + }; + opts.teardown = function (instance, $s) { + return $.when(teardown(instance, $s)).pipe(function () { + return instance.session.session_logout() + }).pipe(function () { + return instance.session.rpc('/web/database/drop', { + fields: [ + {name: 'drop_pwd', value: db.supadmin}, + {name: 'drop_db', value: db.dbname} + ] + }); + }).pipe(function (result) { + if (result.error) { + return $.Deferred().reject(result.error).promise(); + } + return result; + }); + }; + })(opts.setup, opts.teardown); } - // TODO: async setup/teardown - opts.setup(instance, $fixture, mock); - - var result = callback(instance, $fixture, mock); - - // TODO: cleanup which works on errors - if (!(result && _.isFunction(result.then))) { - if (async) { - ok(false, "asynchronous test cases must return a promise"); - } - opts.teardown(instance, $fixture, mock); - return; - } - + // Always execute tests asynchronously stop(); - if (!_.isNumber(opts.asserts)) { - ok(false, "asynchronous test cases must specify the " - + "number of assertions they expect"); - } - result.always(function () { - start(); - opts.teardown(instance, $fixture, mock); - }).fail(function (error) { - if (options.fail_on_rejection === false) { - return; + $.when(opts.setup(instance, $fixture, mock)) + .pipe(function () { + var result = callback(instance, $fixture, mock); + if (!(result && _.isFunction(result.then))) { + if (async) { + ok(false, "asynchronous test cases must return a promise"); + } + } else { + if (!_.isNumber(opts.asserts)) { + ok(false, "asynchronous test cases must specify the " + + "number of assertions they expect"); + } } - ok(false, typeof error === 'object' && error.message - ? error.message - : JSON.stringify([].slice.call(arguments))); - }) + return $.when(result).fail(function (error) { + if (options.fail_on_rejection === false) { + return; + } + ok(false, typeof error === 'object' && error.message + ? error.message + : JSON.stringify([].slice.call(arguments))); + }) + }).pipe(function () { + return opts.teardown(instance, $fixture, mock); + }, function () { + return opts.teardown(instance, $fixture, mock); + }).always(function () { + start(); + }); }); }; })(openerp.testing); diff --git a/addons/web_tests_demo/__init__.py b/addons/web_tests_demo/__init__.py index e69de29bb2d..137d472ec74 100644 --- a/addons/web_tests_demo/__init__.py +++ b/addons/web_tests_demo/__init__.py @@ -0,0 +1,14 @@ +from openerp.osv import orm, fields + +class TestObject(orm.Model): + _name = 'web_tests_demo.model' + + _columns = { + 'name': fields.char("Name", required=True), + 'thing': fields.char("Thing"), + 'other': fields.char("Other", required=True) + } + _defaults = { + 'other': "bob" + } + diff --git a/addons/web_tests_demo/static/test/demo.js b/addons/web_tests_demo/static/test/demo.js index 0bf5a1a58b6..62cecf6f088 100644 --- a/addons/web_tests_demo/static/test/demo.js +++ b/addons/web_tests_demo/static/test/demo.js @@ -84,4 +84,19 @@ openerp.testing.section('basic section', function (test) { deepEqual(dbm.db_list, ['foo', 'bar', 'baz']); }); }); + + test('actual RPC', {rpc: 'rpc', asserts: 4}, function (instance) { + var Model = new instance.web.Model('web_tests_demo.model'); + return Model.call('create', [{name: "Bob"}]) + .pipe(function (id) { + return Model.call('read', [[id]]); + }).pipe(function (records) { + strictEqual(records.length, 1); + var record = records[0]; + strictEqual(record.name, "Bob"); + strictEqual(record.thing, false); + // default value + strictEqual(record.other, 'bob'); + }); + }); }); From 21e776a56b9fedb25c48b1ea362227ed76de6321 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 29 Oct 2012 12:09:02 +0100 Subject: [PATCH 268/841] [IMP] document test runner global conf keys bzr revid: xmo@openerp.com-20121029110902-ob21050di74vcyqc --- addons/web/doc/testing.rst | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/addons/web/doc/testing.rst b/addons/web/doc/testing.rst index 61077072ad2..4760f0780eb 100644 --- a/addons/web/doc/testing.rst +++ b/addons/web/doc/testing.rst @@ -409,6 +409,8 @@ To do this, set the :js:attr:`rpc option <~TestOptions.rpc>` to handler containing assertions, it multiplies the effective number of assertions) +.. _testing-rpc-rpc: + Actual RPC ++++++++++ @@ -568,6 +570,19 @@ Testing API should be loaded into QWeb before starting the test. A boolean, ``false`` by default. +The test runner can also use two global configuration values set +directly on the ``window`` object: + +* ``oe_all_dependencies`` is an ``Array`` of all modules with a web + component, ordered by dependency (for a module ``A`` with + dependencies ``A'``, any module of ``A'`` must come before ``A`` in + the array) + +* ``oe_db_info`` is an object with 3 keys ``source``, ``supadmin`` and + ``password``. It is used to pre-configure :ref:`actual RPC + ` tests, to avoid a prompt being displayed + (especially for headless situations). + Running through Python ---------------------- From 90d58d13752946b57fbb22c04dadfbc7eb8a3ac9 Mon Sep 17 00:00:00 2001 From: "Nimesh (Open ERP)" Date: Mon, 29 Oct 2012 16:58:05 +0530 Subject: [PATCH 269/841] [IMP] change button attr. bzr revid: nco@tinyerp.com-20121029112805-xppvo5fgswhq0ete --- addons/purchase/stock_view.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml index 0651cf5db90..c78439e98f6 100644 --- a/addons/purchase/stock_view.xml +++ b/addons/purchase/stock_view.xml @@ -59,9 +59,8 @@ From 97208c971b9155cffa57f403109bc92104af9938 Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Mon, 29 Oct 2012 18:37:14 +0100 Subject: [PATCH 289/841] [IMP] avoid tabs (4 spaces) in the middle of help text bzr revid: abo@openerp.com-20121029173714-qpr4rrhll576jxmm --- addons/crm/crm_lead.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index da0a3f7d756..0366045b90f 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -224,11 +224,7 @@ class crm_lead(base_stage, format_address, osv.osv): multi='day_close', type="float", store=True), 'state': fields.related('stage_id', 'state', type="selection", store=True, selection=crm.AVAILABLE_STATES, string="Status", readonly=True, - help='The Status is set to \'Draft\', when a case is created.\ - If the case is in progress the Status is set to \'Open\'.\ - When the case is over, the Status is set to \'Done\'.\ - If the case needs to be reviewed then the Status is \ - set to \'Pending\'.'), + help='The Status is set to \'Draft\', when a case is created. If the case is in progress the Status is set to \'Open\'. When the case is over, the Status is set to \'Done\'. If the case needs to be reviewed then the Status is set to \'Pending\'.'), # Only used for type opportunity 'probability': fields.float('Success Rate (%)',group_operator="avg"), From 7a8d6753021ea86f72ab2a7aca374e70620aa03c Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Mon, 29 Oct 2012 19:11:56 +0100 Subject: [PATCH 290/841] [IMP] code style remove mutable default remove useless whitespaces bzr revid: abo@openerp.com-20121029181156-ao52q3uun3ilp2qk --- addons/crm/crm_lead.py | 4 ++- addons/crm/crm_lead_view.xml | 66 ++++++++++++++++++------------------ 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 0366045b90f..4074856ad81 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -324,7 +324,7 @@ class crm_lead(base_stage, format_address, osv.osv): cases = self.browse(cr, uid, ids2, context=context) return self._action(cr, uid, cases, False, context=context) - def stage_find(self, cr, uid, cases, section_id, domain=[], order='sequence', context=None): + def stage_find(self, cr, uid, cases, section_id, domain=None, order='sequence', context=None): """ Override of the base.stage method Parameter of the stage search taken from the lead: - type: stage type must be the same or 'both' @@ -332,6 +332,8 @@ class crm_lead(base_stage, format_address, osv.osv): be a default stage; if not set, stages must be default stages """ + if domain == None: + domain = [] if isinstance(cases, (int, long)): cases = self.browse(cr, uid, cases, context=context) # collect all section_ids diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index b6890a7de07..a05af900bb9 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -14,9 +14,9 @@ action_crm_lead_unread - + action - + crm.lead client_action_multi @@ -32,9 +32,9 @@ action_crm_lead_read - + action - + crm.lead client_action_multi @@ -143,7 +143,7 @@
- @@ -253,12 +253,12 @@ - + - + @@ -276,8 +276,8 @@ - - + + @@ -354,14 +354,14 @@ - + - + - - + + @@ -415,7 +415,7 @@ name="action_makeMeeting" type="object" context="{'search_default_attendee_id': active_id, 'default_attendee_id' : active_id}" - /> + />