Commit Graph

7 Commits

Author SHA1 Message Date
Vo Minh Thu 7766fcca62 [REF] renamed openerp-server.py to openerp-server.
bzr revid: vmt@openerp.com-20110324095012-a5joofz60zrhbit5
2011-03-24 10:50:12 +01:00
Vo Minh Thu d02ffafe30 [MERGE] merged the 6.0 branch.
bzr revid: vmt@openerp.com-20110322140841-6lt7ky1ohxbrgx68
2011-03-22 15:08:41 +01:00
Olivier Dony 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
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
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 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