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
Antony Lesuisse
dbe58b7dde
qweb t-field
...
bzr revid: al@openerp.com-20130702164805-df3a03szrrx114r1
2013-07-02 18:48:05 +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
Christophe Simonis
5a58a48ef5
[MERGE] forward port of branch saas-1 up to revid 4893 chs@openerp.com-20130701153735-xnbb8zauabf1k63u
...
bzr revid: chs@openerp.com-20130702144745-763n9cdphkppshxl
2013-07-02 16:47:45 +02:00
Martin Trigaux
d2d72d8416
[MERGE] forward port of saas-1 up to revision 8749 (mat@openerp.com-20130702135856-kmg7d8anw17nkbd8)
...
bzr revid: mat@openerp.com-20130702144646-y1wqs5mz4rzoh50g
2013-07-02 16:46:46 +02:00
Christophe Simonis
bf29a2ebc7
[MERGE] forward port of branch 7.0 up to revid 9302 chs@openerp.com-20130718111616-apacuhc2qhquobtc
...
bzr revid: dle@openerp.com-20130627104833-b9zgtu8urj43f12b
bzr revid: mat@openerp.com-20130702135856-kmg7d8anw17nkbd8
bzr revid: chs@openerp.com-20130718115928-wpa84dqh8tcq31zt
2013-07-18 13:59:28 +02:00
Christophe Simonis
1e9789baf8
[FIX] base_report_designer: correct "Export To RML" on OSX
...
bzr revid: chs@openerp.com-20130718111616-apacuhc2qhquobtc
2013-07-18 13:16:16 +02:00
dc5b5228db
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130717072519-9772wyvh9z6e4g8n
bzr revid: launchpad_translations_on_behalf_of_openerp-20130718071434-7x6sozvlnl6qhb2i
bzr revid: launchpad_translations_on_behalf_of_openerp-20130717072525-qqiq08bh7teas3sh
bzr revid: launchpad_translations_on_behalf_of_openerp-20130718071444-zxeebb2ub7nv2zqq
2013-07-18 07:14:44 +00:00
f3e128cb89
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130706061657-5n94hzrjw9qy5efq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130710055130-0m6p2gfsn1tod5bq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063420-lu76zka6n8deodkk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055831-4f7mdp0hocv4r25l
bzr revid: launchpad_translations_on_behalf_of_openerp-20130717072430-94onks9pjgbvbsgb
2013-07-17 07:24:30 +00:00
niv-openerp
3885ee3330
[FIX] some more problems with werkzeug 0.9.1
...
bzr revid: nicolas.vanhoren@openerp.com-20130716131548-aa60tcfn3zwchqd0
2013-07-16 15:15:48 +02:00
Denis Ledoux
f8480b69be
[FIX]email_template: generate_email_for_composer, clean context before find or create partner, to avoid default values for partner
...
bzr revid: dle@openerp.com-20130716095928-z79ipwgjxw5ypg3y
2013-07-16 11:59:28 +02:00
niv-openerp
b00689306c
[FIX] problem with werkzeug 0.9.1 that makes the code crash when we generate a report
...
bzr revid: nicolas.vanhoren@openerp.com-20130715122835-4gtyu2xle8y7fls1
2013-07-15 14:28:35 +02:00
d1a4e0aef0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130711062622-v4muic3uqckueux5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063505-m63repwd0zokfibu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063525-b30s09rh63t3zox4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055943-xf6jvk2dpoemt6qx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051357-59o0nkhplh3e58mi
bzr revid: launchpad_translations_on_behalf_of_openerp-20130704054706-ace1fcr1vtruoc4s
bzr revid: launchpad_translations_on_behalf_of_openerp-20130705061311-4735gtnj7xjmuprg
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063510-g2yq0kxqgrx9x1df
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063533-7mjj5a7226xhtob6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055945-h6jn755mtdcubvei
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051400-rra06yzfd7zw4bt0
2013-07-15 05:14:00 +00:00
Quentin (OpenERP)
84a134c46d
[FIX] account_anglo_saxon: backport of revision 8787 of trunk
...
bzr revid: qdp-launchpad@openerp.com-20130710215655-5ym1u4ecsmqdw30n
2013-07-10 23:56:55 +02:00
f15f706313
[FIX] monodb: correct behaviour in no-db-list mode (manual forward port of 7.0 rev 3991 mat@openerp.com-20130702122014-6l79a748lb946hkq)
...
bzr revid: mat@openerp.com-20130702122404-sngh0g283tuvj8ll
2013-07-02 14:24:04 +02:00
Christophe Matthieu
f34b894b22
[FIX] qweb.py: t-set t-value
...
bzr revid: chm@openerp.com-20130702120018-w9llyk8indqyywmo
2013-07-02 14:00:18 +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
Martin Trigaux
85d568184c
[FIX] http: db_monodb returns a result when only one db is available
...
bzr revid: mat@openerp.com-20130702103331-2f2vkz12sp385ldt
2013-07-02 12:33:31 +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
Christophe Simonis
955eaca4fa
[FIX] multicorn: terminate long-polling process via SIGKILL
...
bzr revid: chs@openerp.com-20130701153735-xnbb8zauabf1k63u
2013-07-01 17:37:35 +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
Antony Lesuisse
b0a348d24e
fields_view_get view_id
...
bzr revid: al@openerp.com-20130701130258-52nvw8aj6s8bcjaf
2013-07-01 15:02:58 +02:00
Christophe Simonis
ac8dc26c65
[IMP] WorkerCron: renice process
...
bzr revid: chs@openerp.com-20130701125548-sgcaf71avwpleml1
2013-07-01 14:55:48 +02:00
Antony Lesuisse
3b0935325e
fields_view_get apply post processing even for default views
...
bzr revid: al@openerp.com-20130701122626-9g2uo6ox3p74e55q
2013-07-01 14:26:26 +02:00
Christophe Simonis
ad8fcbffa2
[IMP] WorkerCron: make the cron workers not all starting at the first database. Better repartition of work
...
bzr revid: chs@openerp.com-20130701120345-4687avu7re5pw6sf
2013-07-01 14:03:45 +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
447895839f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130630055614-i718kdmoni3huadm
bzr revid: launchpad_translations_on_behalf_of_openerp-20130701051425-zqxi4fg6t39pxx0m
2013-07-01 05:14:25 +00: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
Christophe Simonis