Commit Graph

4454 Commits

Author SHA1 Message Date
Thibault Delavallée 373eb136cd [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20121029091455-9izbtivnnb2q5bpv
2012-10-29 10:14:55 +01:00
Christophe Matthieu 46a60cdac7 [MERGE] from trunk-mail-concreting-tde, TODO fix bug
bzr revid: chm@openerp.com-20121029090847-27h3tmyvsv9c8vej
2012-10-29 10:08:47 +01:00
Fabien Pinckaers ff918d5b2f fix
bzr revid: fp@openerp.com-20121026201332-jiujrnnxkomm58zs
2012-10-26 22:13:32 +02:00
Fabien Pinckaers baac47b473 fix
bzr revid: fp@tinyerp.com-20121026170904-uqvird49cqdykd2w
2012-10-26 19:09:04 +02:00
Frédéric van der Essen 7cdf99ade1 [IMP] mail: improved display of openchatter in form views
bzr revid: fva@openerp.com-20121026095821-c3idarsd5yi9fzso
2012-10-26 11:58:21 +02:00
Launchpad Translations on behalf of openerp 93be12ab1e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121026045553-t4k1bgsmirz090jr
bzr revid: launchpad_translations_on_behalf_of_openerp-20121026045641-3opz9ueu2crfb479
bzr revid: launchpad_translations_on_behalf_of_openerp-20121026051921-6vyyfhq3fpp22atu
2012-10-26 05:19:21 +00:00
Fabien Pinckaers 375d261e08 [FIX] misc fixes & useability ps week 41
bzr revid: fp@tinyerp.com-20121025083644-19mnzr6ktbpppgjg
2012-10-25 10:36:44 +02:00
Fabien Pinckaers a7368145ca [MERGE] typo
bzr revid: fp@openerp.com-20121024201424-98la8f2wkhfjrtae
2012-10-24 22:14:24 +02:00
Fabien Pinckaers cffa0d1ee4 [MERGE] misc fixes: expenses, products, crm, sale
bzr revid: fp@tinyerp.com-20121022172639-u4l0ed99wr6znjew
2012-10-22 19:26:39 +02:00
Fabien Pinckaers e08f2e5102 [IMP] base_action_rule rewritten using mail.message & followers instead
bzr revid: fp@tinyerp.com-20121022083021-zwd5q0ck85j367ky
2012-10-22 10:30:21 +02:00
Jigar Amin 02a2f69094 [MERGE] Sync with trunk
bzr revid: hmo@tinyerp.com-20121011115257-httrbpbtj3cmdill
bzr revid: hmo@tinyerp.com-20121011115740-mchi07zmrmngt30d
bzr revid: hmo@tinyerp.com-20121015074807-a1d81372bg16f8kk
bzr revid: hmo@tinyerp.com-20121019052244-r0css6nbvtrgkm6o
bzr revid: jam@tinyerp.com-20121022050159-nklz0b6su1nstkvm
2012-10-22 10:31:59 +05:30
Mayur Maheshwari (OpenERP) 1901cda266 [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121019052334-zgq8u774xdrns0pd
2012-10-19 10:53:34 +05:30
Atul Patel (OpenERP) 9b01d57864 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121016172329-23rl227ea0822ucr
2012-10-16 22:53:29 +05:30
Mayur Maheshwari (OpenERP) 8346293d72 [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121015090200-irfaskfn9i1p68j9
bzr revid: mma@tinyerp.com-20121016052513-vl56jxtp7xbpa2ry
2012-10-16 10:55:13 +05:30
Atul Patel (OpenERP) f57e32a0fe [REM]: Remove calendar invitaiton view and menu.
bzr revid: atp@tinyerp.com-20121014091346-9117rebnt86lbxk5
2012-10-14 14:43:46 +05:30
Atul Patel (OpenERP) b5317c514c [REM]: Remove calendar invitaiton view and menu.
bzr revid: atp@tinyerp.com-20121014090133-i50ibni56y7jf3b6
2012-10-14 14:31:33 +05:30
Fabien Pinckaers 1d1879e3a4 [MERGE] better views, fix on so lines
bzr revid: fp@tinyerp.com-20121013104805-wceo6x1dpqgigsuo
2012-10-13 12:48:05 +02:00
Fabien Pinckaers cf34e32f8c [MERGE]
bzr revid: fp@tinyerp.com-20121013103654-l2v059f12hpmt83u
2012-10-13 12:36:54 +02:00
Mayur Maheshwari (OpenERP) c18b907b49 [IMP]all: imporve string state to status
bzr revid: mma@tinyerp.com-20121012124513-u7jbhn39gm17y6tj
2012-10-12 18:15:13 +05:30
Mayur Maheshwari (OpenERP) 0b87880029 [IMP]all: imporve string state to status
bzr revid: mma@tinyerp.com-20121012114258-w2q3hg1wb5wlt8wi
2012-10-12 17:12:58 +05:30
pankita shah (Open ERP) 71dcfd4f35 [MERGED] merged with lp:openobject-addons
bzr revid: shp@tinyerp.com-20121012090649-oo3u11l9ompemgi7
2012-10-12 14:36:49 +05:30
pankita shah (Open ERP) 022a7c5de0 [IMP] move schedule meeting and convert to opportunity to the right of contact
bzr revid: shp@tinyerp.com-20121012072825-oplxmiuqnrszygfz
2012-10-12 12:58:25 +05:30
pankita shah (Open ERP) bf3dd9918d [IMP] partner tree view when group by company
bzr revid: shp@tinyerp.com-20121012060036-n91al0zj4qq0pt4p
2012-10-12 11:30:36 +05:30
Mayur Maheshwari (OpenERP) 3079bf9ce0 [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121012055106-eu39hyg4vt2mxr07
2012-10-12 11:21:06 +05:30
pankita shah (Open ERP) 17f1e6a12c [IMP] default value for Planned Date field
bzr revid: shp@tinyerp.com-20121012052927-y7njhusx5emlxf4j
2012-10-12 10:59:27 +05:30
pankita shah (Open ERP) 92c8da8d8c [MERGE] merged with lp:openobject-addons
bzr revid: shp@tinyerp.com-20121011085206-boirah1mq09o7r0e
2012-10-11 14:22:06 +05:30
Amit Patel 3a964f2761 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121011054252-6xmpsvyywgfpcwj0
2012-10-11 11:12:52 +05:30
Amit Patel cd07d25ffe [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121011045835-h9c7wdnni9emk2r5
2012-10-11 10:28:35 +05:30
Fabien Pinckaers 3814f8fcb5 [MERGE] config for after sale services
bzr revid: fp@openerp.com-20121010202828-k3vla8ejkhsczlp8
2012-10-10 22:28:28 +02:00
Fabien Pinckaers 20fefed4c7 [MERGE] create=false
bzr revid: fp@openerp.com-20121010200511-yjmajwybmf3yfitm
2012-10-10 22:05:11 +02:00
Amit Patel 93dc1c41b7 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121010113227-o0wsd7p5qxdujmxr
2012-10-10 17:02:27 +05:30
Quentin (OpenERP) 96cbbe9d59 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121010100111-vta17dz1vq6n6g9a
2012-10-10 12:01:11 +02:00
Harry (OpenERP) 2ad8ce52bf [MERGE]
bzr revid: hmo@tinyerp.com-20121010072320-gm4ea77wc62bm9bv
2012-10-10 12:53:20 +05:30
Harry (OpenERP) 4034afc923 [FIX] crm: fix
bzr revid: hmo@tinyerp.com-20121010072244-5wsnaqwpydx59dmg
2012-10-10 12:52:44 +05:30
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) 3c7844ddd5 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121009150045-4fpk56p4s0l5brct
2012-10-09 17:00: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
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
Harry (OpenERP) 76d93f251e [IMP] base_action_rule: clean _check function and demo data.
bzr revid: hmo@tinyerp.com-20121009104314-ers6tznkwiyeb3v1
2012-10-09 16:13:14 +05:30
Amit Patel c102086030 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121009085933-caavbeibc1gauiel
2012-10-09 14:29:33 +05:30
Harry (OpenERP) e84b3f2493 [IMP] crm: demo data of action rule
bzr revid: hmo@tinyerp.com-20121009075340-ogm51x9z2irmzijt
2012-10-09 13:23:40 +05:30
pankita shah (Open ERP) 917ae0ee85 [IMP] opportunity to the right of contact
bzr revid: shp@tinyerp.com-20121009070238-vyuen9nb8551p2ph
2012-10-09 12:32:38 +05:30
pankita shah (Open ERP) 18e59b6352 [IMP] massively instead of massicely
bzr revid: shp@tinyerp.com-20121009054105-5q25k6dq4b2wbhjk
2012-10-09 11:11:05 +05:30
Harry (OpenERP) cde1d85310 [MERGE]
bzr revid: hmo@tinyerp.com-20121009050628-27i0h894mff02zj6
2012-10-09 10:36:28 +05:30
Quentin (OpenERP) 5db1b37797 [IMP] crm: opportunity search view imp
bzr revid: qdp-launchpad@openerp.com-20121008144722-r6th49qhfzq8jmbf
2012-10-08 16:47:22 +02:00
Quentin (OpenERP) a9b9412f18 [IMP] crm: remove 'country_id' from res.partner search view
bzr revid: qdp-launchpad@openerp.com-20121008142619-mxqis0ubc8m3o4z9
2012-10-08 16:26:19 +02:00
Quentin (OpenERP) a369130a35 [IMP] crm: remove 'sale team' from res.partner search view
bzr revid: qdp-launchpad@openerp.com-20121008130831-hjm46vehb54tqc74
2012-10-08 15:08:31 +02:00
Quentin (OpenERP) 0cfb72791d [IMP] renamed filter 'Inbox' into 'Unread Messages' which is clearer
bzr revid: qdp-launchpad@openerp.com-20121008100032-mh7sd740fhsbjemr
2012-10-08 12:00:32 +02:00
Quentin (OpenERP) 3395215367 [IMP] crm: lead search view
bzr revid: qdp-launchpad@openerp.com-20121008091243-f0ktqoee67y6kb3x
2012-10-08 11:12:43 +02:00