niv-openerp
91c6cb6d8d
[IMP] replaced text_html widget by html field
...
bzr revid: nicolas.vanhoren@openerp.com-20120814131003-5iquqrl8g85v2otc
2012-08-14 15:10:03 +02:00
niv-openerp
1885387ace
[IMP] added html field
...
bzr revid: nicolas.vanhoren@openerp.com-20120814130656-4pa91mud8u30mqr5
2012-08-14 15:06:56 +02:00
Fabien Pinckaers
b60c51dc2d
[IMP] removing structure in partner tags
...
bzr revid: fp@openerp.com-20120814125611-16zayxxzha9213re
2012-08-14 14:56:11 +02:00
Antonin Bourguignon
e850c38b2f
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120814125315-7p70wxl91l8o1nv9
2012-08-14 14:53:15 +02:00
vta vta@openerp.com
ba5168192a
[FIX] main.py
...
bzr revid: vta@openerp.com-20120814124636-nhv4iurcc9phe3cm
2012-08-14 14:46:36 +02:00
Rucha (Open ERP)
06fb7b2c39
[MERGE]: Merge with latest trunk-server
...
bzr revid: rpa@tinyerp.com-20120814055431-ogg8zmdql8nk100k
bzr revid: rpa@tinyerp.com-20120814123833-kri45g87wa8of1i9
2012-08-14 18:08:33 +05:30
Mayur Maheshwari (OpenERP)
b5c6ed5197
[MERGE]Merge with parent branch
...
bzr revid: mma@tinyerp.com-20120814123614-36hf9mz1obl52mk7
2012-08-14 18:06:14 +05:30
Olivier Dony
11bdbfd183
[MERGE] Next batch of improvements/fixes for mail.alias
...
bzr revid: odo@openerp.com-20120814123050-xw3ltthoc9nld76r
2012-08-14 14:30:50 +02:00
Purnendu Singh (OpenERP)
b5fbb818f2
[IMP] small fix
...
bzr revid: psi@tinyerp.com-20120814122543-7o6hkxpy3ecap1m1
2012-08-14 17:55:43 +05:30
Antonin Bourguignon
c070b68d31
[IMP] portal: customize events menu tooltips
...
bzr revid: abo@openerp.com-20120814121512-0kmgpw5p31bi1mnw
2012-08-14 14:15:12 +02:00
niv-openerp
63ae87fb4c
Fixed encoding problems
...
bzr revid: nicolas.vanhoren@openerp.com-20120814121425-jq3ieebbsa7rcds5
2012-08-14 14:14:25 +02:00
Thibault Delavallée
89e404301b
[CLEAN] mail_group_menu: cleaned file, added some doc.
...
bzr revid: tde@openerp.com-20120814121202-zuhu88g95p78ggdc
2012-08-14 14:12:02 +02:00
Vo Minh Thu
2376fe0add
[MERGE] merged view changes: the `type` is now a functional field derived from the arch.
...
bzr revid: vmt@openerp.com-20120814121117-dent4ctz89kdcabi
2012-08-14 14:11:17 +02:00
Vo Minh Thu
9341a6f791
[MERGE] merged view changes: the `type` is now a functional field derived from the arch.
...
bzr revid: vmt@openerp.com-20120814121110-0wx4w6etkzspzpbh
2012-08-14 14:11:10 +02:00
vta vta@openerp.com
ebc010fd39
[FIX] Fixed auth_oauth method
...
bzr revid: vta@openerp.com-20120814115555-qyveeb9fibs598rh
2012-08-14 13:55:55 +02:00
Thibault Delavallée
19abc35ce6
[CLEAN] Cleaned mail_group and mail.js due to the merge of trunk.
...
bzr revid: tde@openerp.com-20120814115222-gxunwfuttejrock0
2012-08-14 13:52:22 +02:00
Thibault Delavallée
0eccca51d5
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120814114638-pkj3d70sg9mr2hkv
2012-08-14 13:46:38 +02:00
Thibault Delavallée
c9fda0b13a
[MERGE] Merged with server/trunk.
...
bzr revid: tde@openerp.com-20120813181359-s0hhsdp6ev7dtznr
bzr revid: tde@openerp.com-20120814114047-z3guxfe9zxmsrk46
2012-08-14 13:40:47 +02:00
Thibault Delavallée
4dd85980ec
[IMP] mail_group: removed fields now delegated to mail_thread; updated doc and kanban view accordingly.
...
bzr revid: tde@openerp.com-20120814114021-vwiz24yu2mo75jt7
2012-08-14 13:40:21 +02:00
Thibault Delavallée
70f8659e78
[IMP] mail_thread: method to calculate mail values is now _get_message_data; added message_is_follower field, with its computation; cleaned a bit the code.
...
bzr revid: tde@openerp.com-20120814113937-a7279ud2rj5fixl9
2012-08-14 13:39:37 +02:00
Purnendu Singh (OpenERP)
a6bd413462
[merge] merge with main addons
...
bzr revid: psi@tinyerp.com-20120814113447-3c20ay8rtvht373i
2012-08-14 17:04:47 +05:30
Purnendu Singh (OpenERP)
14e4696c0d
[IMP] hr_expense: update journal on currency change and improve the code for multicurrency
...
bzr revid: psi@tinyerp.com-20120814113320-wf5bnieerjo7yt86
2012-08-14 17:03:20 +05:30
Fabien Pinckaers
ff9cbe0673
[MERGE] mail groups improvements
...
better form view
security on groups: public, private, selected groups (for employees)
menu automatically created/filtered
action to open a specific group inline
small fix in composition: new msg not linked to current user
bzr revid: fp@openerp.com-20120814112942-8wo9owa14hk5xqbj
2012-08-14 13:29:42 +02:00
Fabien Pinckaers
85ca542ad0
[IMP] mail groups improvements: security
...
bzr revid: fp@openerp.com-20120814112204-hwamufqqz4qj9ptb
2012-08-14 13:22:04 +02:00
Thibault Delavallée
149c6f793f
[MERGE] 'My Second Not-Chatter Merge of the Day': add a deprecated attribute on fields.
...
This revision adds a string 'deprecated' attribute on fields. If not False, the ORM makes a warning when attempting to read the read, or write on it.
Use: 'my_field': fields.char('Old field', size=64, deprecated="This field will be removed with version 42 of OpenERP. Please yse 'my_new_field' instead.")
bzr revid: tde@openerp.com-20120814111143-9qha588hah5380fx
2012-08-14 13:11:43 +02:00
Thibault Delavallée
2edf42928b
[MERGE] 'My Second Not-Chatter Merge of the Day': add a deprecated attribute on fields.
...
This revision adds a string 'deprecated' attribute on fields. This addons-side merge is a small addition to be used as an example. The 'member_ids' field of mail.group is set as deprecated, as it will disappear when merging openchater-3-5-followers task, putting a real follower_ids fields on mail.thread objects.
bzr revid: tde@openerp.com-20120814111111-xq9ddv5w3favht93
2012-08-14 13:11:11 +02:00
Olivier Dony
0a22166f88
[FIX] mail.alias: fix constraint creation warnings + properly hide alias on creation form for inhering classes
...
bzr revid: odo@openerp.com-20120814105114-ei0qbgy71fyc8jtb
2012-08-14 12:51:14 +02:00
Thibault Delavallée
65f589dda5
[IMP] mail.gorup: added deprecated attribute on field that will trigger a warning.
...
bzr revid: tde@openerp.com-20120814104233-91qvv2bqc0d3mtc1
2012-08-14 12:42:33 +02:00
Christophe Simonis
b1e5c9e1ae
[FIX] auth_openid: use set_cookie_and_redirect + handle errors correctly
...
bzr revid: chs@openerp.com-20120814104052-tw5zgqu5nb12zj5c
2012-08-14 12:40:52 +02:00
Fabien Pinckaers
dcc24957bd
[IMP] small css improvement
...
bzr revid: fp@openerp.com-20120814103911-8l63u3bahy9w4xsj
2012-08-14 12:39:11 +02:00
Christophe Simonis
747374f98f
[FIX] hide/show topbar and leftbar on login page and db manager
...
bzr revid: chs@openerp.com-20120814103815-ajdku32ngf5eidrf
2012-08-14 12:38:15 +02:00
Thibault Delavallée
4cb99779ba
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120814103247-ft1lda03ud0rv62q
2012-08-14 12:32:47 +02:00
Olivier Dony
0b2118c10d
[FIX] project.issue: duplicate method, probably bad merge
...
bzr revid: odo@openerp.com-20120814102425-50sbp71muozamm61
2012-08-14 12:24:25 +02:00
Thibault Delavallée
15d997d37b
[RM] [CLEAN] auth_signup: removed unique constraint on email, because what is important is the login; added licence header in files.
...
bzr revid: tde@openerp.com-20120814101535-3fxb1w88qh33srbi
2012-08-14 12:15:35 +02:00
Thibault Delavallée
399119a073
[IMP] res_users form view: added partnre.
...
bzr revid: tde@openerp.com-20120814100829-usi8fu8auzf1c0le
2012-08-14 12:08:29 +02:00
Olivier Dony
d7a2131fd2
[FIX] mail.group: fix broken form view - still needs work!
...
bzr revid: odo@openerp.com-20120814100521-0dac576zzdfhi1mg
2012-08-14 12:05:21 +02:00
Olivier Dony
fcdd930396
[IMP] mail.alias: use hyphen instead of underscore for replacing invalid chars, looks better for mail aliases
...
bzr revid: odo@openerp.com-20120814100354-2sn0505046wv27ot
2012-08-14 12:03:54 +02:00
Olivier Dony
8fac3ae62e
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20120814100217-33qe1dyc3w6vfs0g
2012-08-14 12:02:17 +02:00
Vo Minh Thu
1534feb8f7
[IMP] ir_ui_view: somewhat better `type` functional field implementation.
...
bzr revid: vmt@openerp.com-20120814100049-dngykdg5l21q9vvp
2012-08-14 12:00:49 +02:00
Vo Minh Thu
1182be4291
[IMP] core: removed a filter on null IDs as it hides a possible problem (the very fact they are null).
...
bzr revid: vmt@openerp.com-20120814100007-cppdpazde5oe0khl
2012-08-14 12:00:07 +02:00
Christophe Simonis
a1d68fb739
[IMP] execute original action after login. also pass the current state to login (so the Widget can handle it)
...
bzr revid: chs@openerp.com-20120814094654-fmimm145mrgvznb0
2012-08-14 11:46:54 +02:00
niv-openerp
f111a51f10
Fixed problem when message is false (i think)
...
bzr revid: nicolas.vanhoren@openerp.com-20120814094401-uv548xbylkfq8bun
2012-08-14 11:44:01 +02:00
Thibault Delavallée
e4185c910f
[FIX] orm deprecated: added a list cast because we may receive tuples (as seen on runbot).
...
bzr revid: tde@openerp.com-20120814094142-b79hn5xgduhc7w15
2012-08-14 11:41:42 +02:00
Thibault Delavallée
988e04188a
[RM] Portal: removed res_users override, because partner_id is now in base. Removed view and update init and openerp files accordingly.
...
bzr revid: tde@openerp.com-20120814093202-7do78o1h9z44aj53
2012-08-14 11:32:02 +02:00
Thibault Delavallée
c057c5ec34
[IMP] mail.group: set member_ids as deprecated.
...
bzr revid: tde@openerp.com-20120814090857-2q6a1e9ovrijetea
2012-08-14 11:08:57 +02:00
Fabien Pinckaers
6f7b789f7a
[IMP] mail group in menu
...
bzr revid: fp@openerp.com-20120814090719-7dals8fzupv9cx4j
2012-08-14 11:07:19 +02:00
Thibault Delavallée
9463536724
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120814090341-2qvwriaa09mwn186
2012-08-14 11:03:41 +02:00
Thibault Delavallée
7c0a0a0158
[MERGE] Merged with server/trunk.
...
bzr revid: tde@openerp.com-20120810073318-gcgnj16e02qvg0y3
bzr revid: tde@openerp.com-20120814090328-seyvug8zdagbdm0o
2012-08-14 11:03:28 +02:00
Thibault Delavallée
bc7ad9c405
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120814084936-04v0hywe2drc9qum
2012-08-14 10:49:36 +02:00
Thibault Delavallée
ed9193d4b2
[MERGE] Merged with server/trunk.
...
bzr revid: tde@openerp.com-20120814084801-b01f3uy5o49m2dva
2012-08-14 10:48:01 +02:00