Olivier Dony
2621b707e0
[MERGE] merged latest fixes from 6.0 branch up to rev 3348
...
Rev 3348 is odo@openerp.com-20110221101549-vp0ha2g91yl30cmk .
bzr revid: odo@openerp.com-20110221103235-6tdy5tpb6zvkbzs3
2011-02-21 11:32:35 +01:00
Harry (OpenERP)
5e65a44d19
[MERGE] merged from trunk-server-development branch
...
bzr revid: hmo@tinyerp.com-20110215101923-nh0t5cgf9y4n4fmz
2011-02-15 15:49:23 +05:30
Harry (OpenERP)
67f8f91945
[REVIEW+IMP] email_service: add argument for message_id in email_send and remove argument: openoject_id into _email_send
...
bzr revid: hmo@tinyerp.com-20110215063729-6x9gijb9zb24lk8a
2011-02-15 12:07:29 +05:30
Harry (OpenERP)
8d37539d5c
[REVIEW] emails_service: remove smtp_email_from argument from email_send method
...
bzr revid: hmo@tinyerp.com-20110215061922-i61uyl2lniv7rkbe
2011-02-15 11:49:22 +05:30
Olivier Dony
e1d2a87fc9
[FIX] tools.config: expansion of user and path should work with multiple addons path too
...
lp bug: https://launchpad.net/bugs/716710 fixed
bzr revid: odo@openerp.com-20110214102914-98gdvyx5y4v2kysx
2011-02-14 11:29:14 +01:00
Harry (OpenERP)
ed13fcdd62
[MERGE] merged ysa-email-server branch
...
bzr revid: hmo@tinyerp.com-20110214091053-14vrxy08ibq6jlku
2011-02-14 14:40:53 +05:30
Olivier Ligot
bafa90b716
[IMP] The command line option --i18n-overwrite can also be used when updating modules
...
bzr revid: olivier.ligot@groupes.be-20110209100845-ldgoxolfz98k3mnu
2011-02-09 11:08:45 +01:00
Julien Thewys
6a11b89e17
[FIX] ensures no illegitimate cli argument is silently discarded
...
This avoids an insidious behavior: when copy-pasting a command from a
Microsoft document to the cmd terminal, one might not see that a hyphen ('-')
preceding an option has been converted to a dash (u'\u2012') which is then
interpreted as a normal cli argument (i.e. not an option) and thus silently
discarded.
bzr revid: jth@openerp.com-20110209100735-jaschhlv3cfqjry5
2011-02-09 11:07:35 +01:00
Olivier Dony
14ebc46e3a
[FIX] tools.translate: add missing imports after previous merge
...
bzr revid: odo@openerp.com-20110209090231-odqbf8leyurdh945
2011-02-09 10:02:31 +01:00
Olivier Dony
d31260e8a8
[FIX] tools.config: override root_path in config, and avoid saving it
...
This should help avoid common issues with an obsolete root_path saved in
the config file. We also expand the path on-the-fly, and do the same for
addons_path.
bzr revid: odo@openerp.com-20110208170927-3kqk0c06qmxu2ko5
2011-02-08 18:09:27 +01:00
Olivier Dony
cfc6d831df
[MERGE] merged latest 6.0 fixes up to rev 3339
...
Revision 3339 = odo@openerp.com-20110208140924-0bgxqgt1oyrxwz3z
bzr revid: odo@openerp.com-20110208164923-u7mzknc0b3avb9i0
2011-02-08 17:49:23 +01:00
Vo Minh Thu
6713d57ab1
[MERGE] merge of the openerp python module branch.
...
bzr revid: vmt@openerp.com-20110208150149-x4vu09aj42ezma5a
2011-02-08 16:01:49 +01:00
Vo Minh Thu
3613935c53
[FIX] addons.__init__: make sure ad_paths is initialized before using it.
...
bzr revid: vmt@openerp.com-20110208132719-qhlqqjkcyg3j9hv8
2011-02-08 14:27:19 +01:00
Vo Minh Thu
45239ae493
[IMP] openerp.__init__ can imports all its submodules.
...
- The config parser is given sys.args explicitely
- addons.__init__ changed so it can be imported in openerp.__init__
bzr revid: vmt@openerp.com-20110208092923-42mj8sb8mkfbiytw
2011-02-08 10:29:23 +01:00
Vo Minh Thu
ec17bb9e74
[IMP] forgot to add loglevels.py and reexport 3 functions in tools.misc.
...
bzr revid: vmt@openerp.com-20110208092458-qjfvf1vgflervdpm
2011-02-08 10:24:58 +01:00
Vo Minh Thu
f8572e5c60
[IMP] openerp python module.
...
- Some logging code moved from netsvc.py to loglevels.py
- Changed imports to use the new openerp module
- config and netsvc initialization calls move to openerp-server.py
- Moved openerp-server.py outside the old bin directory
- Some imports in tools moved inside the methods to break mutual-dependencies
bzr revid: vmt@openerp.com-20110207125723-ooee7d7ng5elmkso
2011-02-07 13:57:23 +01:00