Christophe Simonis
236df95b22
merge upstream
...
bzr revid: chs@openerp.com-20121210132406-9ro3amw6s6pzeez4
2012-12-10 14:24:06 +01:00
Thibault Delavallée
733cb0d96a
[MERGE] Sync with trunk, because conflicting with ir_ui_menu lastly udpated.
...
bzr revid: tde@openerp.com-20121210132204-39p7chispvogelux
2012-12-10 14:22:04 +01:00
Nimesh (Open ERP)
d212d7b037
[REMOVE] filter date from.
...
bzr revid: nco@tinyerp.com-20121210132147-t0sm2vipu7jltn9r
2012-12-10 18:51:47 +05:30
Christophe Simonis
507c02aaa2
[REV] close_socket is back in netsvc.py
...
bzr revid: chs@openerp.com-20121210132133-m1z2hb72y1r1wsei
2012-12-10 14:21:33 +01:00
Thibault Delavallée
b0c9f525ce
[MERGE] Needaction loading update.
...
Server-side branch:
- needaction_enabled field on ir_ui_menu is now stored
- needaction_counter field on ir_ui_menu removed
- counters are accessible through get_needaction_data, called by the web client independently of the menu entries
bzr revid: tde@openerp.com-20121210131753-gtw4nyo5kosroq00
2012-12-10 14:17:53 +01:00
Thibault Delavallée
5d2d4dea2c
[MERGE] Needaction loading update.
...
This web revision modifies the way needaction are loaded. Now they are loaded independently of the menus. After having loaded and displayed the various menus, a call to the server is done to avoid a long latency between the login and the display of menus. Needaction counter will be displayed as soon as they are available.
bzr revid: tde@openerp.com-20121210131658-pgy3t9t71f0z2yd5
2012-12-10 14:16:58 +01:00
Sanjay Gohel (Open ERP)
8de8537c1e
[IMP]add tracked attribute on fields
...
bzr revid: sgo@tinyerp.com-20121210131100-v88knep1or2s5o03
2012-12-10 18:41:00 +05:30
54a39ac1b1
[ADD]Missing py
...
bzr revid: dle@openerp.com-20121210125517-z4ehmco5dkmdxhmf
2012-12-10 13:55:17 +01:00
Thibault Delavallée
1ca5e68b1f
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121130093732-i8y10ayjqiaq5t7p
bzr revid: tde@openerp.com-20121204142854-pauouyapnw7z8zwj
bzr revid: tde@openerp.com-20121205101544-k4ui6thr0ibzw0vx
bzr revid: tde@openerp.com-20121210125423-81wbh4af9sxdqjki
2012-12-10 13:54:23 +01:00
Thibault Delavallée
3446b35874
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121210125418-l8ntl5o5mnb2dq3h
2012-12-10 13:54:18 +01:00
Sanjay Gohel (Open ERP)
2386d334a3
[IMP]add test cases for tracking field
...
bzr revid: sgo@tinyerp.com-20121210125348-edca0z6jiudfgigc
2012-12-10 18:23:48 +05:30
07527e1503
[ADD]Check start balance option
...
bzr revid: dle@openerp.com-20121210122247-qb2sa1k183wrxh3d
2012-12-10 13:22:47 +01:00
94fbe1c356
[MERGE]Latest trunk
...
bzr revid: dle@openerp.com-20121210113258-ovn3ct84ayo7c04u
2012-12-10 12:32:58 +01:00
Christophe Matthieu
7b2bf84cfe
[IMP] mail: download attachment with the controler /web/binary/download_attachment
...
bzr revid: chm@openerp.com-20121210112830-gt1qs028p3cgp9dp
2012-12-10 12:28:30 +01:00
Christophe Matthieu
5944b6c6d6
[IMP] web: add controler /web/binary/download_attachment with arguments: model, id, method and attachment_id
...
bzr revid: chm@openerp.com-20121210112712-at23yy7kls6phu9v
2012-12-10 12:27:12 +01:00
Xavier Morel
70f8f99b35
[FIX] prevent propagation of [UP] and [DOWN] keydown events in form m2o
...
these events are used by the autocompletion widget internally, if they
bubble upwards they also get handled by the list view which interprets
them as going up/down the list.
Prevent the latter by suppressing bubbling of these events.
bzr revid: xmo@openerp.com-20121210112203-3mry0pvecri0pv9o
2012-12-10 12:22:03 +01:00
Goran Kliska
9ccf349b80
Translation
...
bzr revid: goran.kliska@slobodni-programi.hr-20121210111736-4mu0odxtubiv716y
2012-12-10 12:17:36 +01:00
Vo Minh Thu
6072fd11af
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n
2012-12-10 12:16:54 +01:00
Goran Kliska
afbb6ef717
merge from trunk
...
bzr revid: goran.kliska@slobodni-programi.hr-20121210111404-jcwlv3nsa16bu8zq
2012-12-10 12:14:04 +01:00
Rucha (Open ERP)
241bcfe85d
[IMP]: sale: Set current date as invoice date while creating invoice from SO lines
...
bzr revid: rpa@tinyerp.com-20121210105148-0vaen7se7o7dh6fd
2012-12-10 16:21:48 +05:30
Arnaud Pineux
9bf9f741b8
[MERGE] with trunk
...
bzr revid: api@openerp.com-20121210105144-uy0hk00s52rpj7r5
2012-12-10 11:51:44 +01:00
Tejas Tank
15e8533aa4
[FIX] Merged jquery selector and removed space from selector.
...
bzr revid: tta@openerp.com-20121210102259-y6bz503v9ucvgpcr
2012-12-10 15:22:59 +05:00
Xavier Morel
e972b6a5d4
[FIX] cancel list edition on search
...
Otherwise, if a search is performed while creating or editing a line
(e.g. in logged calls, create a line without saving then try to apply
a filter) the edition section (and new line) disappears but the list
remains in "edition" mode (e.g. save/discard button) even though
edition data is missing (trying to save or discard will error out).
bzr revid: xmo@openerp.com-20121210100914-delia5bhmtgrujpu
2012-12-10 11:09:14 +01:00
Xavier Morel
f9e610a890
[FIX] don't lose debug mode when clicking on logo
...
bzr revid: xmo@openerp.com-20121210100137-h2ydpz6b63c48b1z
2012-12-10 11:01:37 +01:00
Christophe Matthieu
695e177f1f
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20121210095444-zyxz07o93t14ziun
2012-12-10 10:54:44 +01:00
Christophe Matthieu
ab2792850f
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20121210095325-84gkwkzvg3pfz42d
2012-12-10 10:53:25 +01:00
Arnaud Pineux
7414ce209f
[FIX] Workflow clean uninstallation
...
bzr revid: api@openerp.com-20121210091841-42xxklcqfktl4le7
2012-12-10 10:18:41 +01:00
Cedric Snauwaert
b3cc67fabd
[FIX]traceback when duplicating vehicle
...
bzr revid: csn@openerp.com-20121210091502-zhai3ohp0hnbdr4f
2012-12-10 10:15:02 +01:00
Raphael Collet
590add54d4
[IMP] resource: improve ugly code in conversion function
...
bzr revid: rco@openerp.com-20121210090554-fb59bzz5ceogehms
2012-12-10 10:05:54 +01:00
Goran Kliska
1370e3c655
l10n_hr for 7.0
...
bzr revid: goran.kliska@slobodni-programi.hr-20121210085628-5ojrmijras80h0u1
2012-12-10 09:56:28 +01:00
Anand Patel (OpenERP)
b3ab5a63ae
[MERGE] Merged with latest trunk
...
bzr revid: pan@tinyerp.com-20121210084122-n7qyuh8hm6jvgmd9
2012-12-10 14:11:22 +05:30
Jiten (OpenERP)
fd1e69a638
[MER] Merged trunk.
...
bzr revid: jra@tinyerp.com-20121210083952-fhjlo40g55d7ngf4
2012-12-10 14:09:52 +05:30
Thibault Delavallée
f0abd6f49e
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121210083805-1t45n6xxmptpo28o
2012-12-10 09:38:05 +01:00
Thibault Delavallée
0e85b997ef
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121210083743-9xcv6bhxkh75ay66
2012-12-10 09:37:43 +01:00
Thibault Delavallée
a4083348d5
[FIX] Portal: portal inbox domain fixed, favorite_user_ids does not exist anymore.é
...
bzr revid: tde@openerp.com-20121210083718-idod6rjgaasz001y
2012-12-10 09:37:18 +01:00
Nimesh (Open ERP)
b969ecc49f
[MERGE] with trunk
...
bzr revid: nco@tinyerp.com-20121210072723-avqvehqgnpxwdimj
2012-12-10 12:57:23 +05:30
Nimesh (Open ERP)
480e116b40
[MERGE] with trunk
...
bzr revid: nco@tinyerp.com-20121210070332-6h5qnlcf4whjv7p5
2012-12-10 12:33:32 +05:30
Nimesh (Open ERP)
3eb8273b58
[MERGE] with trunk
...
bzr revid: nco@tinyerp.com-20121210064442-dun93jq0bxj4f56d
2012-12-10 12:14:42 +05:30
Anand Patel (OpenERP)
04f0c04569
[MERGE]Merged with latest trunk
...
bzr revid: pan@tinyerp.com-20121210062541-3x3edkucslg0pscw
2012-12-10 11:55:41 +05:30
Tejas Tank
b6cb0014b7
[FIX] Hide quick create box when drag and drop.
...
bzr revid: tta@openerp.com-20121210062444-n4ll8y9yoy5sabia
2012-12-10 11:24:44 +05:00
Nimesh (Open ERP)
dba2775b63
[MERGE] with trunk.
...
bzr revid: nco@tinyerp.com-20121210062135-ill9for9483axccz
2012-12-10 11:51:35 +05:30
Anand Patel (OpenERP)
524da44d8e
[MERGE]Merged with latest trunk
...
bzr revid: pan@tinyerp.com-20121210061420-38p68a9jg2u0vjrx
2012-12-10 11:44:20 +05:30
Paramjit Singh Sahota
ad14f6fad6
[MERGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20121210053145-btedzk00puvcry12
2012-12-10 11:01:45 +05:30
Paramjit Singh Sahota
4fd400982c
[IMP] Reverted the onchange_enddate functions code. And make it as was in previous.
...
bzr revid: psa@tinyerp.com-20121210052554-hw7ep3rvvi3fr7wg
2012-12-10 10:55:54 +05:30
Sanjay Gohel (Open ERP)
510af53747
[MERGE]with trunk
...
bzr revid: sgo@tinyerp.com-20121210050956-qie5jf94xvgogiaq
2012-12-10 10:39:56 +05:30
Sanjay Gohel (Open ERP)
ee756acff1
[MERGE]with trunk
...
bzr revid: sgo@tinyerp.com-20121210050740-m2tofymj14oqjohl
2012-12-10 10:37:40 +05:30
Foram Katharotiya (OpenERP)
955f2588a2
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20121210045724-sk2hk8mmi8iahfwn
2012-12-10 10:27:24 +05:30
7f1d5daf2f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121210043931-72a32pz7q282df45
bzr revid: launchpad_translations_on_behalf_of_openerp-20121210044428-d9bzm1dnqc26voci
2012-12-10 04:44:28 +00:00
798e44b1e4
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121210043632-9tdic74gwliyynmq
2012-12-10 04:36:32 +00:00
Antony Lesuisse
5356be186d
[FIX] deps for debian stable, python 2.6
...
bzr revid: al@openerp.com-20121210010213-v32y3cn5tgwknlj6
2012-12-10 02:02:13 +01:00
Christophe Simonis