Commit Graph

3521 Commits

Author SHA1 Message Date
Fabien Meghazi 81ec0dbc1e [REM] Removed arch_file from ir.ui.view
bzr revid: fme@openerp.com-20130718170314-f6g6topynizgnwl6
2013-07-18 19:03:14 +02:00
Christophe Matthieu 247d14708f [MERGE] from trunk
bzr revid: chm@openerp.com-20130710151752-glrwklmz25xq7oh0
2013-07-10 17:17:52 +02:00
Launchpad Translations on behalf of openerp b2d18bb876 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130706055328-0sowfultip6m4cbf
2013-07-06 05:53:28 +00:00
Christophe Simonis 5a5d9d5941 merge upstream
bzr revid: chs@openerp.com-20130702191613-djzicmgpvrhh05zi
2013-07-02 21:16:13 +02:00
Fabien Pinckaers 726b333148 [FIX] copy() on ir.ui.view
bzr revid: fp@tinyerp.com-20130702190301-oh7kj8iatbij3bm1
2013-07-02 21:03:01 +02:00
Christophe Simonis 0a5b3c9fd7 [FIX] views: correct distribute branding
bzr revid: chs@openerp.com-20130702181439-4ghn4ciz5efmzumk
2013-07-02 20:14:39 +02:00
Christophe Simonis 906da9b7ef [FIX] views: correct distribute branding
bzr revid: chs@openerp.com-20130702173648-96mxveli0eh1hzcj
2013-07-02 19:36:48 +02:00
Christophe Simonis 25388630cc [FIX] views: distribute branding only if not t-* attributes
bzr revid: chs@openerp.com-20130702164157-nsfq9xpswj0r56ry
2013-07-02 18:41:57 +02:00
Antony Lesuisse 2bac4d24c4 distribute branding take care of call and t
bzr revid: al@openerp.com-20130702160750-0yv4g6bcnh4v80rp
2013-07-02 18:07:50 +02:00
Antony Lesuisse d346320699 distribute branding for fields
bzr revid: al@openerp.com-20130702154446-7fpel212amdwmmjz
2013-07-02 17:44:46 +02:00
Antony Lesuisse 8f25c9bdae be xml in the db
bzr revid: al@openerp.com-20130702145605-nkzjall1msp6ggsa
2013-07-02 16:56:05 +02:00
Martin Trigaux 641c4fe784 ir_ui_view: parse using lxml.html instead of etree
bzr revid: mat@openerp.com-20130702125916-ahk6jkim08j2voam
2013-07-02 14:59:16 +02:00
Fabien Meghazi 1e303767ee m
bzr revid: fme@openerp.com-20130702124313-cuehsln93w7mzhqx
2013-07-02 14:43:13 +02:00
Vo Minh Thu a1f70b171b [MERGE] company form view: display "Click to set your company logo." in edit mode only.
bzr revid: vmt@openerp.com-20130702113155-cqxun8m1f04jn60o
2013-07-02 13:31:55 +02:00
Vo Minh Thu fac1397945 [MERGE] Estonia currecny is EUR since 2011.
bzr revid: vmt@openerp.com-20130702111017-qn7v4vwdsgvvgla6
2013-07-02 13:10:17 +02:00
Vo Minh Thu 2692e127f9 [MERGE] ir_model_data: add `module` field to tree view (to allow group by modul).
bzr revid: vmt@openerp.com-20130702092232-d1gry5wnfcet2p06
2013-07-02 11:22:32 +02:00
Martin Trigaux e372cbbce4 add t-field and t-record in rendering
bzr revid: mat@openerp.com-20130701155541-20plkar9a89qosij
2013-07-01 17:55:41 +02:00
Vo Minh Thu 7786d96095 [FIX] ir_ui_view: restore the inheritance mechanism for model-specific inheritance:
A view for a given model can inherit from a root view specified for
another model. When applying the modifying views to the root view,
only the views with the same model as the child view must be
considered. This patch restore that behavior.

bzr revid: vmt@openerp.com-20130701145334-ojp1plqjveym7cj7
2013-07-01 16:53:34 +02:00
Martin Trigaux a7b0a0379c add save method for javascript call
bzr revid: mat@openerp.com-20130701135313-absej6vq16aztrc8
2013-07-01 15:53:13 +02:00
Vo Minh Thu f42bcfa0f8 [FIX] ir_ui_view: does no longer provide root_ancestor(), so removed corresponding test.
bzr revid: vmt@openerp.com-20130701114129-03jtrx0g6abk6xev
2013-07-01 13:41:29 +02:00
Vo Minh Thu 3b4ecbf033 [FIX] ir_ui_view: it seems the iter() method is no longer there, removed the test..
bzr revid: vmt@openerp.com-20130701112930-k8rhlvgbaj1y1zl5
2013-07-01 13:29:30 +02:00
Vo Minh Thu aba5593f01 [FIX] ir_ui_view: get_inheriting_views_arch() does no longer take a model.
bzr revid: vmt@openerp.com-20130701112726-600dsa9udm0rt4uj
2013-07-01 13:27:26 +02:00
Martin Trigaux b4e6c6e22d add count for inherit_branding
bzr revid: mat@openerp.com-20130701112309-hf3rarslfc2hhvr4
2013-07-01 13:23:09 +02:00
Vo Minh Thu bd4f503b9b [FIX] ir_ui_view: __view_look_dom_arch() was renamed into postprocess_and_fields().
bzr revid: vmt@openerp.com-20130701110521-muec7xyt7op7bhql
2013-07-01 13:05:21 +02:00
Vo Minh Thu 9ad26be680 [FIX] ir_ui_view: accomodate previously changed apply_inheritance_specs() signature.
bzr revid: vmt@openerp.com-20130701105107-thsi2o2pmeifo338
2013-07-01 12:51:07 +02:00
Antony Lesuisse df01c096ec branding temp fix for comment in xml
main company demo data

bzr revid: al@openerp.com-20130701002424-ojr6yzlr9m0xv6vi
2013-07-01 02:24:24 +02:00
Antony Lesuisse 05c9b607f8 fix rng validation, fields_view_get, qweb t-esc t-raw default
bzr revid: al@openerp.com-20130630213515-go5qr2dmo0xlazvr
2013-06-30 23:35:15 +02:00
Antony Lesuisse 54a41790a0 distribute branding xpath count
bzr revid: al@openerp.com-20130630015800-gln7j46ume1h536k
2013-06-30 03:58:00 +02:00
Antony Lesuisse 0963443691 correct distribution of branded tags
bzr revid: al@openerp.com-20130630010941-t922sz1smwi6jnni
2013-06-30 03:09:41 +02:00
Antony Lesuisse 4aa13cf591 correct inheritance branding
bzr revid: al@openerp.com-20130629234158-ttav8rypjrkxvctf
2013-06-30 01:41:58 +02:00
Antony Lesuisse b8adbbbce2 [MERGE] icon moved to description
bzr revid: al@openerp.com-20130629230615-nzpbsdvmb3in4khy
2013-06-30 01:06:15 +02:00
Antony Lesuisse 932efea388 untangle inheritance and postprocessing
bzr revid: al@openerp.com-20130629213516-pqcl6oz1g3o5tpgn
2013-06-29 23:35:16 +02:00
Antony Lesuisse ca98a61a3d [MERGE] trunk
bzr revid: al@openerp.com-20130629140148-r563wtev4078qiqf
2013-06-29 16:01:48 +02:00
Antony Lesuisse 3d6a073acb [MERGE] html module description
bzr revid: al@openerp.com-20130628100407-3k5wy3767lbc3788
2013-06-28 12:04:07 +02:00
Martin Trigaux ad9f8a9fa1 [ADD] ir_ui_view: add tags to tree
bzr revid: mat@openerp.com-20130627171027-j3t7l8dadm8cohvx
2013-06-27 19:10:27 +02:00
Christophe Simonis d84c90b41d [FIX] views: correct type detection
bzr revid: chs@openerp.com-20130627153758-1yhk7d79is5c707r
2013-06-27 17:37:58 +02:00
Christophe Simonis 0ed83c3cec [FIX] view creation
bzr revid: chs@openerp.com-20130627143639-nxurinzeqqjqdiam
2013-06-27 16:36:39 +02:00
Christophe Simonis 4efebc6fd0 [FIX] ir.ui.view:render() can render view by xmlid/path
bzr revid: chs@openerp.com-20130627142506-gdmre0jj36v5inc0
2013-06-27 16:25:06 +02:00
Antony Lesuisse 01c08e2ebc type is regular field
bzr revid: al@openerp.com-20130627131629-1au7xtdv2fdxtko0
2013-06-27 15:16:29 +02:00
Christophe Simonis 171819106a merge upstream
bzr revid: chs@openerp.com-20130627095135-43h3lamq2yh15xkv
2013-06-27 11:51:35 +02:00
Antony Lesuisse a93bc8bdb0 qweb templates
bzr revid: al@openerp.com-20130627091329-t3hjytf3gt0dmkvo
2013-06-27 11:13:29 +02:00
Launchpad Translations on behalf of openerp 45b769b480 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130627053623-0r6xfw895hy8xkyj
2013-06-27 05:36:23 +00:00
Antony Lesuisse f4332b9b60 [MERGE] trunk
bzr revid: al@openerp.com-20130625162755-d6552p98m5jiw941
2013-06-25 18:27:55 +02:00
Xavier Morel a65419b042 [IMP] add tests for apply_inheritance_specs error reporting (to improve later, eg by removing cr, uid, context, ...)
bzr revid: xmo@openerp.com-20130625102800-qpw6m9m5cib1qvu8
2013-06-25 12:28:00 +02:00
Xavier Morel b3ade05f11 [ADD] basic tests on application of inheritance specs
bzr revid: xmo@openerp.com-20130625084857-k72kpvdrvejfragb
2013-06-25 10:48:57 +02:00
Xavier Morel 65e95dae49 [FIX] view inheritance tests: generate valid architectures
bzr revid: xmo@openerp.com-20130625060041-pfgdrnawfwuts2rj
2013-06-25 08:00:41 +02:00
Antony Lesuisse ca163b58db fix check_xml, disable wrong tests
bzr revid: al@openerp.com-20130624160910-zp898ew6va3lergk
2013-06-24 18:09:10 +02:00
Thibault Delavallée 9f84cc4968 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130624160006-ndlo68bdmm3ndj21
2013-06-24 18:00:06 +02:00
Thibault Delavallée 853951a9d6 [IMP] res.users: improved form view to ease email, login and email preferences clarification
bzr revid: tde@openerp.com-20130624093841-6vi3zjcz260dzuig
2013-06-24 11:38:41 +02:00
Quentin (OpenERP) bcac5bd834 [FIX] ir_property: fixes in property fields related to multi company use cases
bzr revid: qdp-launchpad@openerp.com-20130624085731-fthhdpdm4ldi3220
2013-06-24 10:57:31 +02:00