Mayur Maheshwari (OpenERP)
333ca9b09e
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20121010051648-ym3il22g091ofr33
2012-10-10 10:46:48 +05:30
Mayur Maheshwari (OpenERP)
df9e56d33d
[IMP]sale: improve priority og quotation tree view
...
bzr revid: mma@tinyerp.com-20121010051522-9spi85rv30vwibr7
2012-10-10 10:45:22 +05:30
Mayur Maheshwari (OpenERP)
a324e70fc5
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20121010050840-t8ngznb3lhz1m1xf
2012-10-10 10:38:40 +05:30
Amit Patel
a69672c38a
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121010045510-fbv8rzz39mze1057
2012-10-10 10:25:10 +05:30
49b102b54a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121010044451-x88fqu2rrhax9fq4
2012-10-10 04:44:51 +00:00
Divyesh Makwana (Open ERP)
1c31287162
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121010043229-bqz4gq67ix25jww2
2012-10-10 10:02:29 +05:30
Divyesh Makwana (Open ERP)
1014600a28
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121010043137-p51c9n0y5vmdi79f
2012-10-10 10:01:37 +05:30
Divyesh Makwana (Open ERP)
4d9676104f
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121010043116-5avckqse0rfsgl3g
2012-10-10 10:01:16 +05:30
Divyesh Makwana (Open ERP)
a1c855f705
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121010043006-lxykvum2bdzuvfsi
2012-10-10 10:00:06 +05:30
Divyesh Makwana (Open ERP)
428b4d4492
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121010042848-cvvtjmbk26uyb503
2012-10-10 09:58:48 +05:30
Divyesh Makwana (Open ERP)
f5a719cf6c
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121010042834-woiqdv1nmxwp17le
2012-10-10 09:58:34 +05:30
Olivier Dony
09135fc7ae
[MERGE] Multiple fixes for incoming email processing
...
bzr revid: odo@openerp.com-20121009164411-0fz0wlatm7qcd3jl
2012-10-09 18:44:11 +02:00
Olivier Dony
af24485be3
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20121009155456-03uqk5jwd9qayuj4
2012-10-09 17:54:56 +02:00
Olivier Dony
e9d314646d
[FIX] mail.thread subclasses: convert body to plaintext in message_new, as body is now HTML
...
Also disable the updating of the body when new messages
are received for project.issue records, because this
might discard important information that was manually
entered.
bzr revid: odo@openerp.com-20121009155420-72xvyhhiwd696upv
2012-10-09 17:54:20 +02:00
Quentin (OpenERP)
90fc4d6651
[IMP] use of literal_eval from ast instead of const_eval from tools, as per Olivier recommendation
...
bzr revid: qdp-launchpad@openerp.com-20121009152828-3bdxpatkrl1qmyfi
2012-10-09 17:28:28 +02:00
Christophe Matthieu
8b38e9d1cd
[IMP]mail: css
...
bzr revid: chm@openerp.com-20121009150647-srzt1t1ffkw97y5h
2012-10-09 17:06:47 +02:00
Quentin (OpenERP)
3c7844ddd5
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20121009150045-4fpk56p4s0l5brct
2012-10-09 17:00:45 +02:00
fe07dc2e6d
[FIX] Fixed on_switch_mode tirggering.
...
bzr revid: vta@openerp.com-20121009145113-8sazhfrp3xaan5cq
2012-10-09 16:51:13 +02:00
Quentin (OpenERP)
c26d3da687
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20121009144132-a1ijdnboxjmmhbvs
2012-10-09 16:41:32 +02:00
Christophe Matthieu
6630d57d5c
[IMP] mail: txt2html
...
bzr revid: chm@openerp.com-20121009143645-8mwnzatpox0wll2k
2012-10-09 16:36:45 +02:00
Quentin (OpenERP)
fbbc0bad19
[IMP] all: replaced 'true' by 'True' in 'options' attribute in views, because now the syntax of these options must be expressed in python instead of json
...
bzr revid: qdp-launchpad@openerp.com-20121009143433-s4y6isbewqdn2fu2
2012-10-09 16:34:33 +02:00
Quentin (OpenERP)
c98de15a09
[IMP] osv/orm.py: evaluate in python the 'options' attribute of a field in an xml view, before enclosing it in json. This allow to use python instead of json syntax in the definition of the options of a widget, which is a much more consistent behavior
...
bzr revid: qdp-launchpad@openerp.com-20121009142607-rk3l00atu3w3kksp
2012-10-09 16:26:07 +02:00
Christophe Matthieu
7df8ef5d37
[IMP] mail: sort messages
...
bzr revid: chm@openerp.com-20121009140354-3ozec5q42ckcg16w
2012-10-09 16:03:54 +02:00
Olivier Dony
7f516d2835
[FIX] mail.message: incorrect message-id generation, id/model were swapped
...
For backwards-compatibility reasons we need to stick
with this format: `res_id-model`, even if reversing
the values would look more logical
bzr revid: odo@openerp.com-20121009135040-spvejc1l4mos25yv
2012-10-09 15:50:40 +02:00
Olivier Dony
cb57169c97
[FIX] mail.mail: typo in previous commits
...
bzr revid: odo@openerp.com-20121009134414-923kv1ciw00pxh6v
2012-10-09 15:44:14 +02:00
Olivier Dony
0ce1ef32a8
[FIX] mail: typos -> message-id header is mapped to message_id column
...
bzr revid: odo@openerp.com-20121009134020-9wf96yszv8qcmbm1
2012-10-09 15:40:20 +02:00
Vishmita
884aecd5df
[IMP]replace callenabled for on_pager_action
...
bzr revid: vja@tinyerp.com-20121009133704-d2xzc6zssbzzmlwn
2012-10-09 19:07:04 +05:30
Olivier Dony
fac6e9246b
[FIX] mail: allow overriding message_post in threads + fix res.users' delegation to res.partner
...
bzr revid: odo@openerp.com-20121009133132-at5j8pm8engxqi10
2012-10-09 15:31:32 +02:00
Christophe Matthieu
2e4a6953c4
[IMP] mail: attachment
...
bzr revid: chm@openerp.com-20121009132824-dsl7f02hxfpypc0w
2012-10-09 15:28:24 +02:00
Atul Patel (OpenERP)
bea6f1bbf3
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121009132059-fd0jvi6nuh9jyrl7
2012-10-09 18:50:59 +05:30
Olivier Dony
099825109e
[FIX] mail.message: catch more error cases when trying to resolve msg author + lint cleanup
...
bzr revid: odo@openerp.com-20121009131911-6lo2knsrh2qgrxv8
2012-10-09 15:19:11 +02:00
Nimesh (Open ERP)
e16bd157d9
[IMP] improve help.
...
bzr revid: nco@tinyerp.com-20121009130943-n4ru1qa5fdo1b84r
2012-10-09 18:39:43 +05:30
Vidhin Mehta (OpenERP)
b8d7b8cb0a
[REM]one more console.
...
bzr revid: vme@tinyerp.com-20121009130030-8437spz1j1eogh8x
2012-10-09 18:30:30 +05:30
Fabien Meghazi
70ebec1cd6
[IMP] Do not update auth_oauth service providers
...
bzr revid: fme@openerp.com-20121009125653-p9i84663xygtb1r0
2012-10-09 14:56:53 +02:00
Vidhin Mehta (OpenERP)
91f9776979
[rem]console
...
bzr revid: vme@tinyerp.com-20121009125647-zwx4fj95fjs0y34u
2012-10-09 18:26:47 +05:30
Amit Patel
b0a95edda6
[MERGE]:solved warning problem while edit survey
...
bzr revid: apa@tinyerp.com-20121009125516-tzzjxsvh592luu2c
2012-10-09 18:25:16 +05:30
Vidhin Mehta (OpenERP)
5645a84a16
[IMP]replace add* method.
...
bzr revid: vme@tinyerp.com-20121009124908-r33qqpx15ea39p78
2012-10-09 18:19:08 +05:30
Vidhin Mehta (OpenERP)
abac1cae45
[IMP]improvements to record load event.
...
bzr revid: vme@tinyerp.com-20121009123532-bwlrg4ldtprd1w2d
2012-10-09 18:05:32 +05:30
Harry (OpenERP)
5e4ddf78da
[IMP] base_action_rule: action rule view should in sheet
...
bzr revid: hmo@tinyerp.com-20121009122739-89dolzmm73o1nar5
2012-10-09 17:57:39 +05:30
Antonin Bourguignon
fb3a8ca573
[REM] commented code
...
bzr revid: abo@openerp.com-20121009122349-ex5ypwulksc7ibx4
2012-10-09 14:23:49 +02:00
Harry (OpenERP)
1b319e527d
[IMP] base_action_rule: improve demo data
...
bzr revid: hmo@tinyerp.com-20121009121712-r6to5oia4ikiutpi
2012-10-09 17:47:12 +05:30
Foram Katharotiya (OpenERP)
2396902443
[IMP] improve code
...
bzr revid: fka@tinyerp.com-20121009120417-ncg1zoqfnfkyi8cx
2012-10-09 17:34:17 +05:30
Saurang Suthar
86950ea301
[MERGE]:merged with main addons
...
bzr revid: ssu@tinyerp.com-20121009120018-4w4k5k6uysdesj2q
2012-10-09 17:30:18 +05:30
Jalpesh Patel (OpenERP)
4b88980282
[IMP]hr dashboard and fix problem of creating timesheet lines (user is employee + partner manager + sales manager)
...
bzr revid: pja@tinyerp.com-20121009115928-t7cnt9pox8hy2cs6
2012-10-09 17:29:28 +05:30
pankita shah (Open ERP)
2ac0273835
[IMP] Packaging field
...
bzr revid: shp@tinyerp.com-20121009114952-2jlsxqi9popw12ny
2012-10-09 17:19:52 +05:30
Harry (OpenERP)
257b3974b5
[FIX] base_action_rule: argument in _action
...
bzr revid: hmo@tinyerp.com-20121009111221-dris93pcszjj11es
2012-10-09 16:42:21 +05:30
Divyesh Makwana (Open ERP)
2bacc70085
[IMP] project_timesheet : Improved the code.
...
bzr revid: mdi@tinyerp.com-20121009111124-sdii9no8mui4zopz
2012-10-09 16:41:24 +05:30
Saurang Suthar
971a4045f6
[IMP]event:removed unnecessary imports and updated code for onchange start date
...
bzr revid: ssu@tinyerp.com-20121009110429-r5uyknqc61eqmd81
2012-10-09 16:34:29 +05:30
Foram Katharotiya (OpenERP)
49e1adc122
[MERGE] merge with parent branch
...
bzr revid: fka@tinyerp.com-20121009110028-wreqy2z17fepuk9g
2012-10-09 16:30:28 +05:30
Atul Patel (OpenERP)
fbe1e7f913
[FIX]: analytic account onchange problem.
...
bzr revid: atp@tinyerp.com-20121009104842-njdr868dtc4ly1w9
2012-10-09 16:18:42 +05:30
Mayur Maheshwari (OpenERP)