6ddd345ee0
[MERGE] merged with main server branch
...
bzr revid: qdp-launchpad@openerp.com-20110316125510-fq9fz92zhlbypjfd
2011-03-16 13:55:10 +01:00
4b3c2c7514
[IMP]: res_config: Improvement for the main application: like HR, we want them to be able to re-thick an installed application
...
but in HRs configuration, if hr_holidays is already installed, the boolean "holidays management" should be thick and readonly
bzr revid: rpa@tinyerp.com-20110316120444-vqllngptthlfmeo5
2011-03-16 17:34:44 +05:30
ad2967d350
[MERGE] merged fix for osm_memory.read() of m2o fields with name - pending addons fix
...
bzr revid: odo@openerp.com-20110315132628-uhhpf95b9iyin482
2011-03-15 14:26:28 +01:00
189917c479
[FIX]: Fixed direct use of userID 1 in xml, used context on creation of group
...
bzr revid: rpa@tinyerp.com-20110315123444-ihprzymdmcmwhxuy
2011-03-15 18:04:44 +05:30
8fae3e7c6f
[FIX] sql_db: use the config values later than at import time.
...
lp bug: https://launchpad.net/bugs/716715 fixed
bzr revid: vmt@openerp.com-20110308140449-5v883yms1z8dy23k
2011-03-08 15:04:49 +01:00
375dff2b6d
[MERGE]: Merge with lp:~openerp-dev/openobject-server/trunk-rework-server-commited-aag
...
bzr revid: rpa@tinyerp.com-20110308133638-rsd2a6zgrehv91qo
2011-03-08 19:06:38 +05:30
5ec7f2a66d
[MERGE]: Merge with lp:~openerp-commiter/openobject-server/trunk-config-wizard-rework-sus
...
bzr revid: rpa@tinyerp.com-20110308132917-o02jlmgizzpy2fgb
2011-03-08 18:59:17 +05:30
2f343a6083
[IMP] REWORK-SERVERSIDE :Now skip wiz not Shown , ON SERVER SIDE
...
bzr revid: aag@tinyerp.co.in-20110304113327-wviumoee6o7n3n0u
2011-03-04 17:03:27 +05:30
dd1943c45e
[MERGE] merge 6.0 branch.
...
bzr revid: vmt@openerp.com-20110303133011-758wfx7zompu5ugq
2011-03-03 14:30:11 +01:00
6a165fd4a4
[IMP] REWORK-SERVERSIDE :Sale menu is not shown when Any appl not install , ON SERVER SIDE
...
bzr revid: aag@tinyerp.co.in-20110301132844-3w2q2czymhuyuvgb
2011-03-01 18:58:44 +05:30
7ddf04e324
[IMP] REWORK-SERVERSIDE :Add sale manager in Sale menu , ON SERVER SIDE
...
bzr revid: aag@tinyerp.co.in-20110301085443-5amgb5oh64469hwa
2011-03-01 14:24:43 +05:30
73378da514
[IMP] : Improvement in server(module.py file)
...
bzr revid: sus@sus-desktop-20110301074035-7fx0v3gv8889slbb
2011-03-01 13:10:35 +05:30
43690eb21f
[IMP] REWORK-SERVERSIDE :Improvement Config wiz , ON SERVER SIDE
...
bzr revid: aag@tinyerp.co.in-20110301072241-a8s1iialq6xeot23
2011-03-01 12:52:41 +05:30
5e19504a56
[MERGE] merged trunk-server-development branch
...
bzr revid: hmo@tinyerp.com-20110225075326-qv35g149vegd30h1
2011-02-25 13:23:26 +05:30
b7740b4f84
[FIX] act_window access: corrected the access for normal users to read-only.
...
lp bug: https://launchpad.net/bugs/720277 fixed
bzr revid: vmt@openerp.com-20110223145335-d39xu9nyasz8gi2o
2011-02-23 15:53:35 +01:00
3723536d5d
[IMP] add reference argument in email_send method for references of send email.
...
bzr revid: ysa@tinyerp.com-20110223122420-p6b1z9rglae6euwf
2011-02-23 17:54:20 +05:30
95de9e8cb4
[IMP] orm.fields_view_get: allow passing a view_id from a different model for creative inheritance
...
There are cases where several objects would like to use a single view, but
by default they cannot because a view belongs to only one model.
With this change, it becomes possible to do inheritance "by copy", reusing
a view from another model without having to redefine it, just by specifying
its view_id in the relevant actions. If the original view needs to be modified,
it is also possible to explicitly inherit the parent view from the other
model, and the effect will be what is expected: the child view can be
specified in an action, and will be the result of the inheritance applied
on the parent view; but on the other hande the parent view itself is
unaffected when used in the context of its own model.
bzr revid: odo@openerp.com-20110221172757-qepq5osjqgd9uf8x
2011-02-21 18:27:57 +01:00
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
5e65a44d19
[MERGE] merged from trunk-server-development branch
...
bzr revid: hmo@tinyerp.com-20110215101923-nh0t5cgf9y4n4fmz
2011-02-15 15:49:23 +05:30
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
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
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
ed13fcdd62
[MERGE] merged ysa-email-server branch
...
bzr revid: hmo@tinyerp.com-20110214091053-14vrxy08ibq6jlku
2011-02-14 14:40:53 +05:30
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
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
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
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
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
6713d57ab1
[MERGE] merge of the openerp python module branch.
...
bzr revid: vmt@openerp.com-20110208150149-x4vu09aj42ezma5a
2011-02-08 16:01:49 +01:00
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
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
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
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
Quentin (OpenERP)
Rucha (Open ERP)
Olivier Dony
Vo Minh Thu
aag (OpenERP)
sus
Harry (OpenERP)
Yogesh (OpenERP)
Olivier Ligot
Julien Thewys