Jiten (OpenERP)
7facc34f31
[MERGE] Merged trunk.
...
bzr revid: jra@tinyerp.com-20121109051225-84fqg11sjo74vdo1
2012-11-09 10:42:25 +05:30
Atul Patel (OpenERP)
16d71823e4
[MERGE]:Merged wtih lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121109044947-n81qke33jp9p30af
2012-11-09 10:19:47 +05:30
Atul Patel (OpenERP)
aa6b1a9adc
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121109044350-byzd49uv4iwvmda6
2012-11-09 10:13:50 +05:30
Foram Katharotiya (OpenERP)
bb15290101
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20121108124535-sbv49f5mk4hz2tgi
bzr revid: fka@tinyerp.com-20121109044337-95db5zx4hlngqnof
2012-11-09 10:13:37 +05:30
0528e00788
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121109043946-6epxgg88lp1lykye
2012-11-09 04:39:46 +00:00
Divyesh Makwana (Open ERP)
4090f2fc90
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121109043703-d6jjc4hj8aaol9ip
2012-11-09 10:07:03 +05:30
Christophe Simonis
885880675a
[REM] fixed // FIXME
...
bzr revid: chs@openerp.com-20121108180026-vw2lg0thd9v0rivq
2012-11-08 19:00:26 +01:00
Christophe Simonis
28f7f46a5c
merge upstream
...
bzr revid: chs@openerp.com-20121108175940-az1qy7z66o6fn4hp
2012-11-08 18:59:40 +01:00
Christophe Simonis
a824da4be3
[FIX] do_load_state: propagate _push_me flag
...
bzr revid: chs@openerp.com-20121108175910-qd2xho4srhhbjs5q
2012-11-08 18:59:10 +01:00
Antonin Bourguignon
9c3aefeb02
[IMP] indentation
...
bzr revid: abo@openerp.com-20121108175841-mf5c1jhywj07cvvk
2012-11-08 18:58:41 +01:00
Christophe Simonis
deb730e562
[FIX] then -> done; pipe -> then
...
bzr revid: chs@openerp.com-20121108165608-e67f0dwwufdpfmzt
2012-11-08 17:56:08 +01:00
Christophe Simonis
c71f018440
merge upstream
...
bzr revid: chs@openerp.com-20121108164652-bpsb0h2dfla62jqo
2012-11-08 17:46:52 +01:00
Christophe Simonis
7ea98f28d7
[IMP] add TODO/FIXME comments
...
bzr revid: chs@openerp.com-20121108164611-34l07gsjer1lrqc2
2012-11-08 17:46:11 +01:00
Thibault Delavallée
acb1156ee5
[FIX] mail: fixed bug adding signature of partners without users, therefore without signature field; fixed message_id of mail.message without model,res_id, that were not granted a message_id, therefore generated when sending a mail.mail, therefore breaking parent relationship based on message_id. Also fixed content_subtype of message coming from message_process.
...
bzr revid: tde@openerp.com-20121108164138-8jp2340t6s2sa9hd
2012-11-08 17:41:38 +01:00
niv-openerp
edaa35737b
[FIX] hr_timesheet_sheet: typo in javascript code
...
bzr revid: nicolas.vanhoren@openerp.com-20121108164053-pcs8qq98ged4hyj7
2012-11-08 17:40:53 +01:00
Christophe Simonis
6436f75513
merge upstream
...
bzr revid: chs@openerp.com-20121108163458-wk7p4mf7fyh3winl
2012-11-08 17:34:58 +01:00
Christophe Matthieu
0baf4727ef
[FIX] followers: no confirm save message
...
bzr revid: chm@openerp.com-20121108162304-paevi0x5isyornd1
2012-11-08 17:23:04 +01:00
Christophe Matthieu
911d530e09
[FIX] mail: like/dislike
...
bzr revid: chm@openerp.com-20121108161726-ojgjep51upuutbxy
2012-11-08 17:17:26 +01:00
Christophe Matthieu
01c914e9c9
[FIX] mail: auto close big compose message
...
bzr revid: chm@openerp.com-20121108161200-s0coomd8td3xo94i
2012-11-08 17:12:00 +01:00
Thibault Delavallée
0d027a3f8b
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121108161124-au0kg2b4h2uzzf6c
2012-11-08 17:11:24 +01:00
Thibault Delavallée
95f07f7773
[FIX] demo data: moved email address of admin from data to demo.
...
bzr revid: tde@openerp.com-20121108161036-97lynkhqdhpjbfa8
2012-11-08 17:10:36 +01:00
Thibault Delavallée
7e1369cca8
[FIX] fetchmail: fixed a bug about fetchmail_server_id when sending an email.
...
bzr revid: tde@openerp.com-20121108160826-40dj27zvmqxf4im7
2012-11-08 17:08:26 +01:00
Christophe Matthieu
dece6c89ee
[IMP]mail: add text floowers of document, on compose message
...
bzr revid: chm@openerp.com-20121108155936-lvix1hf5o3pg8ym8
2012-11-08 16:59:36 +01:00
e93727ab01
[FIX] Many2OneButton, don't subscribe to write_complete event.
...
bzr revid: vta@openerp.com-20121108154339-o5r1wzr08x53g6c4
2012-11-08 16:43:39 +01:00
bbb5192346
[FIX] Many2OneButton, don't subscribe to write_complete event.
...
bzr revid: vta@openerp.com-20121108154215-4b3sk7nh41xfrl62
2012-11-08 16:42:15 +01:00
Christophe Matthieu
ac00728bf7
[IMP] mail: user avatar on compose message
...
bzr revid: chm@openerp.com-20121108154136-jw58ldfvmzmfud87
2012-11-08 16:41:36 +01:00
Xavier Morel
788e8edf81
[FIX] don't resize & reposition invisible or readonly fields in editable listview
...
the datetime field doesn't setup its internal widget if the field is readonly, so accessing it blows up
bzr revid: xmo@openerp.com-20121108153544-o2uvpfeoofu2tx12
2012-11-08 16:35:44 +01:00
Cedric Snauwaert
3b4b0c0f9f
[MERGE]merge with latest trunk
...
bzr revid: csn@openerp.com-20121108153355-6t80srntxmce4qyt
2012-11-08 16:33:55 +01:00
Christophe Matthieu
df1403d9b6
[FIX] mail/followers: set partner_id of uid on the root thread; No set_value in followers widget
...
bzr revid: chm@openerp.com-20121108153327-wopb6dscgnf1t4wp
2012-11-08 16:33:27 +01:00
Thibault Delavallée
d5d7dced4d
[FIX] mail: message_process now handles replies to messages without model, thread_id. Based on in-reply-to, it finds the parent message. mail_thread.message_post_user_api is called to create a new mail.message, bypassing message_new / message_update in this case. Some improvements added to partner_ids when using the chatter or message processing.
...
bzr revid: tde@openerp.com-20121108152502-aow7vhu4erx7fb9l
2012-11-08 16:25:02 +01:00
e0094e20de
[FIX] Issue when triggering 'write_completed' on AbstractFormPopup, argument not passed.
...
bzr revid: vta@openerp.com-20121108152231-cdtdxa1q9rl4eyre
2012-11-08 16:22:31 +01:00
Quentin (OpenERP)
7510aa1511
[MERGE] merged the branch with fleet module, made by csn and del
...
bzr revid: qdp-launchpad@openerp.com-20121108145918-lgzjnmy6hmvu44vc
2012-11-08 15:59:18 +01:00
Xavier Morel
3a5421309b
[FIX] breakage of m2m (tag) fields in editable (o2m) listviews
...
e.g. quotation form view, "Order Lines" table, add a tax (or more) to
a line, save, then try to edit the line.
Issue: the listview mostly uses a single-level structure for its
display, each record is a trivial map of {name: value}. For the M2O
the expected value can be complex-ish (a name_get which holds all the
interesting stuff) but not so for the m2m.
An m2m value is just a list of ids (Array<Integer>), the list view
would overwrite that with the concatenated name_get strings to get
something kind-of displayable. Except editable serializes the record
it has and passes that as-is to the embedded formview. The
corresponding widget (FieldMany2ManyTags) most definitely does not
expect a big string to be shoved up its fat ass.
So use a different but just as disgusting hack: instead of *replacing*
the ids array with the string, add the string to the record after very
slightly munging the original name, that way the form is happy because
it gets the value it expects, and the Many2Many column can override
_format to use the value of the munged/fake column as "stuff it passes
to whatever is in charge of formatting fields for display" when the
original field is asked for.
NOTE: redundant work is done as every line will do its own name_get,
potentially on the same ids over and over again. Having a
short-lived backend cache may allow not name_get-ing ids we've
already fetched during the same table display...
bzr revid: xmo@openerp.com-20121108145705-uphw76z4q4krcpnl
2012-11-08 15:57:05 +01:00
Fabien Meghazi
c6d4dcd2ab
[FIX] Fix form view bounce effect
...
bzr revid: fme@openerp.com-20121108151810-c5p3rsha9x8kg6lv
2012-11-08 16:18:10 +01:00
Christophe Simonis
eaa3da915b
[FIX] improve warning dialog css
...
bzr revid: chs@openerp.com-20121108145001-pswe7r5ss4nzgu00
2012-11-08 15:50:01 +01:00
Christophe Matthieu
b028b74ed0
[FIX] mail: res_model for wall
...
bzr revid: chm@openerp.com-20121108143923-10s9ng38thyqfu1a
2012-11-08 15:39:23 +01:00
Thibault Delavallée
4ec824ffe2
[FIX] mail: fixed set_message_read that was broken.
...
bzr revid: tde@openerp.com-20121108143545-evxm9kwq4re33ylk
2012-11-08 15:35:45 +01:00
Christophe Matthieu
da5d4ce664
[IMP] mail: pipe to then in js
...
bzr revid: chm@openerp.com-20121108142230-i1bk5hx2dx5x5tyh
2012-11-08 15:22:30 +01:00
Josse Colpaert
db75a65495
merge from trunk
...
bzr revid: jco@openerp.com-20121108141622-ype8e0no6f7xxfh5
2012-11-08 15:16:22 +01:00
Josse Colpaert
fe84b8610f
[IMP] Changed names, constraints per company
...
bzr revid: jco@openerp.com-20121108141457-2y81skjhq0ewaz3i
2012-11-08 15:14:57 +01:00
d68db69b42
[MERGE] trunk-saas_analytics.
...
bzr revid: vta@openerp.com-20121108140803-jhow00d9w5696yla
2012-11-08 15:08:03 +01:00
d0e307d12b
[MERGE] trunk-saas_analytics.
...
bzr revid: vta@openerp.com-20121108140650-j9en369nxlvlelny
2012-11-08 15:06:50 +01:00
Quentin (OpenERP)
21af7835e0
[FIX] base, res.partner.view: remove duplicated invisible attribute that was totally hiding the 'type' field
...
bzr revid: qdp-launchpad@openerp.com-20121108140551-lefrv5ndvyzw5tt9
2012-11-08 15:05:51 +01:00
Christophe Matthieu
590c4cf4ed
[FIX] mail: the test contain a get id for the expandable messages. The expandable messages don't have id. Message_read sort the message, we don't need id for expandables
...
bzr revid: chm@openerp.com-20121108140316-ffei9whh0k1r1uxt
2012-11-08 15:03:16 +01:00
Fabien Meghazi
d34b08d1bf
[FIX] Kanban: records fetched using "Show more" button can't be edited because their ids where not added to the dataset
...
bzr revid: fme@openerp.com-20121108140201-nah05a0bxogv0iqj
2012-11-08 15:02:01 +01:00
Antonin Bourguignon
fa8f714a59
[WIP] imp crm tests
...
bzr revid: abo@openerp.com-20121108140100-wmpa3ko8cpo840zq
2012-11-08 15:01:00 +01:00
niv-openerp
82ab87af5c
[IMP] Added documentation about on change methods.
...
bzr revid: nicolas.vanhoren@openerp.com-20121108135815-426n6529rc5b4wd2
2012-11-08 14:58:15 +01:00
Fabien Meghazi
8c52c70319
[FIX] Kanban: 'Show More' button is shown when column is folded
...
bzr revid: fme@openerp.com-20121108134703-g2icoizl44530fsi
2012-11-08 14:47:03 +01:00
2576cd9d5c
[MERGE] Latest trunk.
...
bzr revid: vta@openerp.com-20121108132049-7ape10oz1gvz4vi8
2012-11-08 14:20:49 +01:00
Fabien Meghazi
a8518622dd
[FIX] Check if console exists before using it
...
bzr revid: fme@openerp.com-20121108132001-jg5cuqszl2qemy92
2012-11-08 14:20:01 +01:00
Jiten (OpenERP)