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
Antony Lesuisse
814fdf3d2b
make oe_editable visible
...
bzr revid: al@openerp.com-20130701142840-s1pz9s2qwbf6o9yj
2013-07-01 16:28:40 +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
Nimesh Contractor (OpenERP)
102e8a188b
[IMP] improve code.
...
bzr revid: nco@tinyerp.com-20130701125116-2b8mqhlbw7gn3861
2013-07-01 18:21:16 +05:30
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
9349ba8484
[IMP]define context to yml function
...
bzr revid: sgo@tinyerp.com-20130701114625-vshpugzujnvgdf5x
2013-07-01 17:16:25 +05:30
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
Amit Bhavsar (Open ERP)
399c5c046b
[MERGE] merge with latest trunk
...
bzr revid: amb@tinyerp.com-20130701112922-xw2tqyun5qmh7s8r
2013-07-01 16:59:22 +05:30
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
Martin Trigaux
b5f7ed13ff
add event layout for example with xpath
...
bzr revid: mat@openerp.com-20130701112013-fozyneayrte7jo31
2013-07-01 13:20:13 +02:00
0bed10fa7f
[FIX] fix the translation issue
...
bzr revid: psi@tinyerp.com-20130701111543-7lgfuf230088gce2
2013-07-01 16:45:43 +05:30
Purnendu Singh (OpenERP)
a7bd882bbb
[MERGE] merge with main branch
...
bzr revid: psi@tinyerp.com-20130701111446-xm1ebxa5hskgqiu2
2013-07-01 16:44:46 +05:30
Amit Bhavsar (Open ERP)
98f39f9d22
[MERGE] merge with latest trunk
...
bzr revid: amb@tinyerp.com-20130701111430-t5qp9hm97rkmjpsp
2013-07-01 16:44:30 +05:30
Amit Bhavsar (Open ERP)
d7e416f9b5
[MERGE] merge with latest trunk
...
bzr revid: amb@tinyerp.com-20130701110915-2tuac4fnmuc8jxh0
2013-07-01 16:39:15 +05:30
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
7ec16a69c4
[IMP]only manager can create issue
...
bzr revid: sgo@tinyerp.com-20130701104229-2xq8pyxkbymhdtfh
2013-07-01 16:12:29 +05:30
Christophe Matthieu
1bee14a0c3
[IMP] ecommerce use new website framework
...
bzr revid: chm@openerp.com-20130701095843-19s2w92qu364aox1
2013-07-01 11:58:43 +02:00
d134cd6080
[FIX] line should break if url link is too long for readonly etherpad
...
bzr revid: rgaopenerp-20130701095502-c6pgr2dz7i7zmdop
2013-07-01 15:25:02 +05:30
Foram Katharotiya (OpenERP)
0b5a213906
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20130701092811-95ydrph81zy1pvat
2013-07-01 14:58:11 +05:30
Foram Katharotiya (OpenERP)
bc6e053aa9
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20130701091949-e5ecgx5wxqjl1yfq
2013-07-01 14:49:49 +05:30
Turkesh Patel (Open ERP)
6bd65ef84d
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20130701091934-k9k82mhk7n25fs37
2013-07-01 14:49:34 +05:30
daec1fa011
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130701090959-ddkktnp3asn6qqj1
2013-07-01 14:39:59 +05:30
Turkesh Patel (Open ERP)
e4efdf89b5
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20130701090727-0p2cvyb4b5ssmsj8
2013-07-01 14:37:27 +05:30
7ad238f443
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130701090207-hlgixfvfls3f3xxo
2013-07-01 14:32:07 +05:30
Bharat R. Devnani (OpenERP)
e92a18ee0b
[MERGE] merged with main addons
...
bzr revid: bde@tinyerp.com-20130701085739-94uxqowz623wudp4
2013-07-01 14:27:39 +05:30
Bharat R. Devnani (OpenERP)
a835ba0f8a
[MERGE] merged with main addons
...
bzr revid: bde@tinyerp.com-20130701085113-f3u2fwuvpqqihc87
2013-07-01 14:21:13 +05:30
Paramjit Singh Sahota
b1162e09bd
[MERGE] Sync with lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20130701055016-el0ebw1ohd9d0j4l
2013-07-01 11:20:16 +05:30
Nimesh Contractor (OpenERP)
14988a5a91
[MERGE] with trunk.
...
bzr revid: nco@tinyerp.com-20130701052659-obvk8qh9bolsw7k7
2013-07-01 10:56:59 +05:30
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
6b38eac5d9
website layout, contactus, homepage
...
bzr revid: al@openerp.com-20130701002054-wggvlsjfxjcza3o6
2013-07-01 02:20:54 +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
f585a2d457
[MERGE] trunk
...
bzr revid: al@openerp.com-20130629230038-9bfrcmlpspcwbf2z
2013-06-30 01:00:38 +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
Christophe Simonis
e1ad4d49e9
[FIX] crm: copy() of partners must return id of new partner
...
bzr revid: chs@openerp.com-20130628174508-di66pnu139ora9j6
2013-06-28 19:45:08 +02:00
Christophe Matthieu
ffb4119120
[IMP] ecommerce
...
bzr revid: chm@openerp.com-20130628162804-l6aejjkzwprg932r
2013-06-28 18:28:04 +02:00
Antony Lesuisse
aa2a854af7
[MERGE] icon moved to description
...
bzr revid: al@openerp.com-20130628150755-2z42ct0p819ajtyq
2013-06-28 17:07:55 +02:00
Paramjit Singh Sahota
39151ca2af
[IMP] Improved code for the followers which are visually duplicated when you click on a follower's name and get back to the sales order form.
...
bzr revid: psa@tinyerp.com-20130628133712-tcfoaisr3o9wdv7x
2013-06-28 19:07:12 +05:30
Christophe Simonis