49597f0e66
[MERGE] *: improved english wording, suggestions courtesy of OpenERP Community
...
bzr revid: odo@openerp.com-20121221164808-kdjrtcbgma4dr3on
2012-12-21 17:48:08 +01:00
a7cb22562f
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20121221134810-t6z5bqi5ej6qflvq
2012-12-21 14:48:10 +01:00
375a5820ae
[MERGE] lp:~c2c/openobject-addons/trunk-trg_dates-base_action-rule-20120510
...
replace the field 'trg_date_type' by a many2one field to ir.model.fields
bzr revid: rco@openerp.com-20121221113957-gd1c80h4vszg1h4g
2012-12-21 12:39:57 +01:00
49b843d65f
[IMP] crm: remove inheritance on base.action.rule, and change demo action rules to use standard stuff
...
bzr revid: rco@openerp.com-20121221102151-fxepq652rkeba62z
2012-12-21 11:21:51 +01:00
b2864c4feb
[FIX] crm: adapt overridden method of base_action_rule
...
bzr revid: rco@openerp.com-20121220162615-zerev9bxpcqxtip1
2012-12-20 17:26:15 +01:00
e3c31cab9e
[IMP] track_visibility atribute: moved onto explicit strings.
...
bzr revid: tde@openerp.com-20121220114730-nip8qaaajr5mqw6s
2012-12-20 12:47:30 +01:00
fa36ac76ee
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121220091908-7qy8excmhe3ussi0
2012-12-20 10:19:08 +01:00
2315050bab
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121220044654-aygk0cmaxl26bs0f
bzr revid: launchpad_translations_on_behalf_of_openerp-20121220045947-8j22pe4nm62kzq22
2012-12-20 04:59:47 +00:00
8d26e78582
[IMP] Addons: removed bold in subtype descriptions.
...
bzr revid: tde@openerp.com-20121219212330-xfx3lykstl1nsa8m
2012-12-19 22:23:30 +01:00
83223c4200
[IMP] crm: res_partner: removed tracking of section_id.
...
bzr revid: tde@openerp.com-20121219205628-8xr8tijlp2h5uv2x
2012-12-19 21:56:28 +01:00
91e98f9d17
[CLEAN] crm: cleaned subtypes, removed auto following that will be added in mail_thread. Updated track_visility parameter.
...
bzr revid: tde@openerp.com-20121219164048-7q9xy3pjs3demtcf
2012-12-19 17:40:48 +01:00
143cba7f32
[FIX]crm:field string
...
bzr revid: kbh@tinyerp.com-20121219132253-dx4ceiw78ptgzvjc
2012-12-19 18:52:53 +05:30
87a7c9f8dd
[IMP] crm: remove unused import
...
bzr revid: rco@openerp.com-20121219131459-xtbfvfll740dq9rg
2012-12-19 14:14:59 +01:00
29ee76d744
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20121219130953-tq0e2mzw145j1ewx
2012-12-19 14:09:53 +01:00
fd8f0dfa65
[FIX] FIxed last fix. changed fields must include invisible fields that are in the _track structure.
...
bzr revid: tde@openerp.com-20121219113205-wa5dt7vpsxjmwav0
2012-12-19 12:32:05 +01:00
95897cf9ac
[FIX] crm: added a tracking on state, otherwise subtypes for won/lost were not activated.
...
bzr revid: tde@openerp.com-20121219111838-v80c932564zf3axl
2012-12-19 12:18:38 +01:00
cd290565a4
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121219093924-5rqmhb6ve7bv7qzl
2012-12-19 10:39:24 +01:00
56248183fc
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121219051749-jfkdv3ohgd61z9pq
bzr revid: launchpad_translations_on_behalf_of_openerp-20121219052238-gjyvmd0dp8pahk2c
2012-12-19 05:22:38 +00:00
e1be2b071a
[FIX] fix _track stuff
...
bzr revid: fp@tinyerp.com-20121219004222-x0gt6qhvwhcpdgld
2012-12-19 01:42:22 +01:00
065821dfd6
[MOD] use read() instead of browse
...
bzr revid: fp@tinyerp.com-20121218234907-j672neyvifmo4bur
2012-12-19 00:49:07 +01:00
3fe6987ce7
[MERGE] Harmonization of noupdate flag on security XML data, courtesy of Alexis de Lattre (Akretion)
...
ir.rule records are in noupdate data blocks to let the admin
alter them without fear of them being reset at next update.
Other records such as groups are in normal mode, so they
can be updated whenever necessary
bzr revid: odo@openerp.com-20121218232001-t425t4hi7qbmsip2
2012-12-19 00:20:01 +01:00
8e0c7f9781
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121218181852-j9qg1po5y4yw67ko
2012-12-18 19:18:52 +01:00
fc0c2942ba
[MERGE] Another batch of bugfixes from 6.1
...
bzr revid: odo@openerp.com-20121218175547-7c1uxq4ypbi314gx
2012-12-18 18:55:47 +01:00
81242cd1f3
[IMP] CRM: updated subtype for auto subscription.
...
bzr revid: tde@openerp.com-20121218153518-vzzrejipoxdcozkl
2012-12-18 16:35:18 +01:00
0e77d66989
[MERGE] staging branch with misc fixes
...
bzr revid: qdp-launchpad@openerp.com-20121218152005-a1gahm72g6wylrg3
2012-12-18 16:20:05 +01:00
50d0533939
[MERGE] Sync with trunk, to have last fixes about CRM.
...
bzr revid: tde@openerp.com-20121218140842-ctuzgms6dqr6c296
2012-12-18 15:08:42 +01:00
011b4f0045
[FIX] crm stage_id statusbar issues
...
bzr revid: vta@openerp.com-20121218134629-x0ygxo1hwer0m4jm
2012-12-18 14:46:29 +01:00
a513344bc1
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20121218134118-ixggega7sumgv6gq
2012-12-18 14:41:18 +01:00
13637c22b9
[IMP] crm: add a button to send emails on opportunities
...
bzr revid: qdp-launchpad@openerp.com-20121218133844-jjx5ebo122ovwmfg
2012-12-18 14:38:44 +01:00
899031fc30
[CLEAN] CRM: cleaned a bit message_post and fixed subtype names.
...
bzr revid: tde@openerp.com-20121218132113-588s3tfml01lmqpa
2012-12-18 14:21:13 +01:00
b95b32d644
[MERGE] Merged branch holding subtype work by APA.
...
bzr revid: tde@openerp.com-20121218131142-2jb6wac6y9q6dc7v
2012-12-18 14:11:42 +01:00
8bc665814d
[CLEAN] crm: removed unused imports.
...
bzr revid: tde@openerp.com-20121218125839-fs3l4b27s16lipsg
2012-12-18 13:58:39 +01:00
cf05dbf53a
[IMP] CRM: added tracked fields, removed now unnecessary message_post code.
...
bzr revid: tde@openerp.com-20121218125634-4mrml8xpb25u3oaw
2012-12-18 13:56:34 +01:00
2dbe4a696e
[MERGE] Sync wirth trunk.
...
bzr revid: tde@openerp.com-20121218093241-y0id5g1r1k6yok42
2012-12-18 10:32:41 +01:00
73980eba5f
[MERGE] trunk-import-openerp-thu (use strict naming convention when importing openerp stuff)
...
bzr revid: rco@openerp.com-20121218085914-qzr2upqfxmfbzfsx
2012-12-18 09:59:14 +01:00
b2bb3eafbd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218045907-df0xw1q7dgw696s1
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218050221-ab50rd40d94gd9a0
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218050832-5hvbj7p0bpsw6fp0
2012-12-18 05:08:32 +00:00
a972f0181d
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20121218045009-drt4gjkcnpl5hxxr
2012-12-18 10:20:09 +05:30
b67f73c327
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20121218025230-zig415ldtmazgbxt
2012-12-18 03:52:30 +01:00
84d7987f33
[MERGE] Bugfixes from 6.1 until revision 6900
...
rev.6900 = xal@openerp.com-20120720134532-t07xr3lp8ouhn2dv
bzr revid: odo@openerp.com-20121218021123-9ligpn7bkr9zo4n7
2012-12-18 03:11:23 +01:00
6a16fb2fde
[IMP] better domain for crm opportunities
...
bzr revid: fp@tinyerp.com-20121217173046-8w945atg1hxp2wum
2012-12-17 18:30:46 +01:00
baeefa6952
[FIX] replace from/import stuffs of openerp stuffs by from/import openerp.stuffs
...
bzr revid: cto@openerp.com-20121217154628-0c0i8y3389yz4dxd
2012-12-17 16:46:28 +01:00
15fe515601
[MERGE] From trunk
...
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
d5a38257ea
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20121217110601-z27qffjgh164jgxf
2012-12-17 12:06:01 +01:00
f9e227717e
[MERGE] addons-27 sale
...
bzr revid: qdp-launchpad@openerp.com-20121217110245-1rc9cl4x7r3l607j
2012-12-17 12:02:45 +01:00
6d2a0d270f
[MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-tracked-fields-chs, with some selective choices.
...
bzr revid: tde@openerp.com-20121217095510-8upbg071esk5hlk1
2012-12-17 10:55:10 +01:00
1f2f15c51d
[IMP] update followers
...
bzr revid: fka@tinyerp.com-20121217091402-pylrooffkzykcnu9
2012-12-17 14:44:02 +05:30
7608fe70de
[IMP] add generic method _subscribe_followers_subtype in mail_thread & remove method in all module
...
bzr revid: fka@tinyerp.com-20121217073817-8kmp0j3kn39gyrwg
2012-12-17 13:08:17 +05:30
6ebeb076c3
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20121217051643-o8j4hz7w8thwbymi
2012-12-17 10:46:43 +05:30
de45fd4fc1
[MERGE]with trunk
...
bzr revid: sgo@tinyerp.com-20121217050659-q5w6zwefizgjv4fd
2012-12-17 10:36:59 +05:30
a7ddf7c689
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121217044754-0kl222skaeva43lx
bzr revid: launchpad_translations_on_behalf_of_openerp-20121216050743-iza21869j5keaqi5
bzr revid: launchpad_translations_on_behalf_of_openerp-20121217045834-1f6wbi5gkmzotgsl
2012-12-17 04:58:34 +00:00
Olivier Dony
Raphael Collet
Thibault Delavallée
Launchpad Translations on behalf of openerp
Khushboo Bhatt (Open ERP)
Fabien Pinckaers
Quentin (OpenERP)
Foram Katharotiya (OpenERP)
Cecile Tonglet
Sanjay Gohel (Open ERP)