Olivier Dony
1d3ff0e52f
[MERGE] sync with latest trunk
...
bzr revid: odo@openerp.com-20110927165219-ux50zxkszwpcfssd
2011-09-27 18:52:19 +02:00
Olivier Dony
3b1196867b
[FIX] crm_partner_assign: remove obsolete field from view
...
bzr revid: odo@openerp.com-20110925014842-d3rx8nhgizgmv8sp
2011-09-25 03:48:42 +02:00
Olivier Dony
d81837fac6
[MERGE] synch with latest trunk
...
bzr revid: odo@openerp.com-20110922162538-x7xucux66zma5bp8
2011-09-22 18:25:38 +02:00
DBR (OpenERP)
cd78f6ac16
Improve the statments
...
bzr revid: dbr@tinyerp.com-20110922114325-pdaf41uih8gcgrmz
2011-09-22 17:13:25 +05:30
DBR (OpenERP)
6d7fe80f9a
[Merge]with: lp:openobject-addons
...
bzr revid: dbr@tinyerp.com-20110921104455-yg1j8lu1yfoufeel
2011-09-21 16:14:55 +05:30
Fabien Pinckaers
05d6d35cc8
[Merge]
...
bzr revid: fp@tinyerp.com-20110917110317-34apz3spz1h9azjl
2011-09-17 13:03:17 +02:00
DBR (OpenERP)
3a4e53ab46
[Merge]with: lp:openobject-addons
...
bzr revid: dbr@tinyerp.com-20110915050724-kh73clbazpsq70dh
bzr revid: dbr@tinyerp.com-20110916045227-l5lte2twthfwbi7c
2011-09-16 10:22:27 +05:30
Antony Lesuisse
98962b0226
[MERGE] trunk-bug-828655 crm_partner_assign fix opportunity search view
...
lp bug: https://launchpad.net/bugs/828655 fixed
bzr revid: al@openerp.com-20110915104453-sn3kqh8agxs6usss
2011-09-15 12:44:53 +02:00
DBR (OpenERP)
e8c112c837
[Merge]with: lp:openobject-addons
...
bzr revid: dbr@tinyerp.com-20110914051815-eufzxqhse757el5w
2011-09-14 10:48:15 +05:30
DBR (OpenERP)
8e93d5a59c
[IMP]crm_* : Remove extra space
...
bzr revid: dbr@tinyerp.com-20110908102935-r3x7a03psb3j3bo0
2011-09-08 15:59:35 +05:30
DBR (OpenERP)
77b76c00db
[IMP]crm_partner_assign : Improve the test cases
...
bzr revid: dbr@tinyerp.com-20110907132733-61ubvbym34vk3oyr
2011-09-07 18:57:33 +05:30
Olivier Dony
f42126df0e
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110906080846-lyi3haucchsaz7uo
2011-09-06 10:08:46 +02:00
DBR (OpenERP)
f7abf1618e
[Merge]with: lp:openobject-addons
...
bzr revid: dbr@tinyerp.com-20110906050618-nmzuy802krxzsm8f
2011-09-06 10:36:18 +05:30
Launchpad Translations on behalf of openerp
752df5acbd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110905055933-cld0r3vv3jmiu5bx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110906044018-ajk9u7zfqoiatufs
2011-09-06 04:40:18 +00:00
DBR (OpenERP)
a4ef61b270
[Merge]crm_partner_assign : Improve the test case
...
bzr revid: dbr@tinyerp.com-20110902131551-t7rswimdkzj4e3r8
2011-09-02 18:45:51 +05:30
Antony Lesuisse
71443ad49f
[MERGE] trunk
...
bzr revid: al@openerp.com-20110827211948-kmap692ves3ixo4k
2011-08-27 23:19:48 +02:00
Vo Minh Thu
6d5b0edf34
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20110826073904-kpr0zvgmmcttimto
2011-08-26 09:39:04 +02:00
Vo Minh Thu
e28b8e56ba
[FIX] crm_partner_assign: added a required state in a test.
...
bzr revid: vmt@openerp.com-20110825093510-omqublx7hxzbvg5d
2011-08-25 11:35:10 +02:00
ksa (Open ERP)
87070c4952
[IMP]: for parter assign improve yml
...
bzr revid: ksa@tinyerp.co.in-20110819062346-n10tznuwcss79hxj
2011-08-19 11:53:46 +05:30
ksa (Open ERP)
a5cdde747e
[IMP]: remove stage type for crm partner assign
...
bzr revid: ksa@tinyerp.co.in-20110817093917-48x76ms56rwu3mdr
2011-08-17 15:09:17 +05:30
Olivier Dony
50507512cb
[MERGE] latest trunk
...
This was a helluva merge, with hundreds of conflicts resolved manually!!
I hope I did not break too many things, but a full review of the mail-related
features (where most of the conflicts occurred) must still be done before
this feature branch can be merged.
bzr revid: odo@openerp.com-20110809234428-3dsvxrt6t54ju0cf
2011-08-10 01:44:28 +02:00
Quentin (OpenERP)
f02dc603db
[FIX] crm_partner_assign: switch latitude and longitude fields
...
bzr revid: qdp-launchpad@openerp.com-20110808124110-vi2q17dbvsadale4
2011-08-08 14:41:10 +02:00
Olivier Dony
3e6b0297d0
[IMP] crm*: update crm modules to new mail module (wip)
...
bzr revid: odo@openerp.com-20110722182337-5irz3g2qva0cf45e
2011-07-22 20:23:37 +02:00
Raphael Collet
f24b3536fb
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20110722150257-3s6caa3c2mn5et4o
2011-07-22 17:02:57 +02:00
tfr@openerp.com
e4b1ae8c1a
[CLEAN] remove what
...
bzr revid: tfr@openerp.com-20110719080104-yay3vyv8ldk2hav5
2011-07-19 10:01:04 +02:00
Raphael Collet
81a1eb18a1
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20110718083424-kdaesx3gflza142a
2011-07-18 10:34:24 +02:00
niv-openerp
34f8f7fff7
[fix] some type correction in crm_lead_report
...
bzr revid: nicolas.vanhoren@openerp.com-20110714131724-m7ocv24z3j666ah2
2011-07-14 15:17:24 +02:00
Raphael Collet
292b4683b6
[MERGE] add field 'complexity' in modules
...
bzr revid: rco@openerp.com-20110708100307-5axn5hnn92qm8qiw
2011-07-08 12:03:07 +02:00
Hardik Ansodariy (OpenERP)
1f5aa0643f
[IMP]: module is defined by its complexity
...
bzr revid: han@tinyerp.com-20110706122928-xvcpdu5inpkganfy
2011-07-06 17:59:28 +05:30
tfr@openerp.com
37e5b6aa27
[MERGE] trunk
...
bzr revid: tfr@openerp.com-20110627094420-4hgyyo72orq3dp0u
2011-06-27 11:44:20 +02:00
Launchpad Translations on behalf of openerp
154addd6bb
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110607043551-4rpi9kkxnhsqxd0n
bzr revid: launchpad_translations_on_behalf_of_openerp-20110608043635-x9rtk2xkh75xlvq5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110609043554-qetee7pedmsdwjm8
bzr revid: launchpad_translations_on_behalf_of_openerp-20110610043735-3d5rff99pe1zho3w
2011-06-10 04:37:35 +00:00
Bhumika (OpenERP)
89a8933a1d
[MERGE ] Merge lp:~openerp-dev/openobject-addons/trunk-contact-google-sync
...
bzr revid: sbh@tinyerp.com-20110601093227-8eex1ulr086pmctm
2011-06-01 15:02:27 +05:30
Launchpad Translations on behalf of openerp
892034c97c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110513043534-1q8fovektkzgm1zw
2011-05-13 04:35:34 +00:00
Bhumika (OpenERP)
4b6fa91c17
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20110512050143-5tbc55oop00ksr4u
2011-05-12 10:31:43 +05:30
tfr@openerp.com
c79040b08e
[IMP] merge opp, merging data in the module responsible of those data
...
bzr revid: tfr@openerp.com-20110506081447-k6mglb3ipzfd1bns
2011-05-06 10:14:47 +02:00
Launchpad Translations on behalf of openerp
d553615695
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110429055618-q15rvfmlvfsl2im5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110430045341-qzlphdlvqf2aa1zx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110501045420-py2vl38b1o3mfs7o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110502043731-ym2tvgj2djoitk8f
2011-05-02 04:37:31 +00:00
Harry (OpenERP)
3ec3fdc5b7
[FIX] crm_partner_assign: fixed regression
...
bzr revid: hmo@tinyerp.com-20110428101250-l9au5ucweq4mkw8n
2011-04-28 15:42:50 +05:30
Harry (OpenERP)
0577796333
[MERGE] merged addons trunk development branch after resolving conflicts
...
bzr revid: hmo@tinyerp.com-20110421080156-3c8gg29i01089rgo
2011-04-21 13:31:56 +05:30
Launchpad Translations on behalf of openerp
ad0ececa4e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110412043500-p2dr3313fnqonqsm
bzr revid: launchpad_translations_on_behalf_of_openerp-20110413044003-7pujurdq9cldrqkm
bzr revid: launchpad_translations_on_behalf_of_openerp-20110415050633-iw3b088ogvp5c34f
2011-04-15 05:06:33 +00:00
Rifakat Haradwala (Open ERP)
dbf82a8fb4
[FIX] rename name, descrition field to subject and body to remaining modules
...
bzr revid: rha@tinyerp.com-20110408072853-bhoeuqdfgoqx3tyb
2011-04-08 12:58:53 +05:30
Rifakat Haradwala (Open ERP)
f53ee6053a
[IMP] email.message.common: implemented active_id and active_model in default_get() and fix reference of fields subject and body
...
bzr revid: rha@tinyerp.com-20110407125024-4354406jcb4ih2k9
2011-04-07 18:20:24 +05:30
Thibault Francois
1a45ff614d
[MERGE] crm improvement
...
bzr revid: tfr@openerp.com-20110407092730-bjm0pwq9mewpvzc0
2011-04-07 11:27:30 +02:00
Rifakat Haradwala (Open ERP)
afc74ed47f
[IMP] email.compose.message: removed method save_to_drafts() and did related changes for this
...
bzr revid: rha@tinyerp.com-20110407045607-tub41samcup20t5d
2011-04-07 10:26:07 +05:30
Rifakat Haradwala (Open ERP)
f3d727379e
[FIX] crm_partner_assign: fix name error
...
bzr revid: rha@tinyerp.com-20110405083248-ndrfn2tye6nkckob
2011-04-05 14:02:48 +05:30
Launchpad Translations on behalf of openerp
838512af0b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110401044755-ox0af9npzekocmtk
bzr revid: launchpad_translations_on_behalf_of_openerp-20110402045547-u88jxku3jz7ejycg
bzr revid: launchpad_translations_on_behalf_of_openerp-20110403044009-x9bqq57ukyqvp6ia
bzr revid: launchpad_translations_on_behalf_of_openerp-20110404044757-3uw7ib92gpv7ezu1
bzr revid: launchpad_translations_on_behalf_of_openerp-20110405044706-ew5moemiz1wxra7h
2011-04-05 04:47:06 +00:00
Thibault Francois
609d962b97
[CHANGE] change opp assign reporter with assign date instead of creation date + remove find similar partner with lead name
...
bzr revid: tfr@openerp.com-20110401122520-389zigbr34qe9u2m
2011-04-01 14:25:20 +02:00
Bhumika (OpenERP)
0b041bcbe6
[MERGE]
...
bzr revid: sbh@tinyerp.com-20110330051414-ty64ibstehhp3nnl
bzr revid: sbh@tinyerp.com-20110331105233-r4hdjjcodn3ljrkb
2011-03-31 16:22:33 +05:30
Harry (OpenERP)
cf7c73310d
[MERGE] merged with trunk addods development branch
...
bzr revid: hmo@tinyerp.com-20110329122736-78igudbed2jz7lf4
2011-03-29 17:57:36 +05:30
Launchpad Translations on behalf of openerp
d8ca559b5d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110329044041-qyy3q7u1em74acq9
2011-03-29 04:40:41 +00:00
Launchpad Translations on behalf of openerp
c5ca5a565f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110326050046-dq45skrem9w4mvec
bzr revid: launchpad_translations_on_behalf_of_openerp-20110327045332-0qk3wj2yahi6f7ty
bzr revid: launchpad_translations_on_behalf_of_openerp-20110328043636-fm3ded2ur36t8x6q
2011-03-28 04:36:36 +00:00