71443ad49f
[MERGE] trunk
...
bzr revid: al@openerp.com-20110827211948-kmap692ves3ixo4k
2011-08-27 23:19:48 +02:00
42b36f710e
[MERGE] remove stage type ksa, and MASSIVE crm_lead cleanup
...
bzr revid: al@openerp.com-20110825041037-0jerocl9x8psve2c
2011-08-25 06:10:37 +02:00
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
81a1eb18a1
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20110718083424-kdaesx3gflza142a
2011-07-18 10:34:24 +02:00
d8eba087d2
[FIX] base_setup fix dependencies fixes runbot tests
...
bzr revid: al@openerp.com-20110711110958-q75h3jpw33z874jo
2011-07-11 13:09:58 +02:00
292b4683b6
[MERGE] add field 'complexity' in modules
...
bzr revid: rco@openerp.com-20110708100307-5axn5hnn92qm8qiw
2011-07-08 12:03:07 +02:00
1f5aa0643f
[IMP]: module is defined by its complexity
...
bzr revid: han@tinyerp.com-20110706122928-xvcpdu5inpkganfy
2011-07-06 17:59:28 +05:30
e217bb0e39
[REM] crm: removed crm_send_email.py as it is unused
...
bzr revid: rha@tinyerp.com-20110420120459-f2ek7ifx0x0lgzhe
2011-04-20 17:34:59 +05:30
cf5132a148
[ADD] crm: Added a yaml for recurrent meetings with different options.
...
bzr revid: uco@tinyerp.com-20110413091135-6s6przqok2rjhsnq
2011-04-13 14:41:35 +05:30
47a85e9f8f
[IMP] mail: rename module email to mail because of parsing error
...
bzr revid: rha@tinyerp.com-20110404094552-j2rdq2sbeqrbffgn
2011-04-04 15:15:52 +05:30
cf7c73310d
[MERGE] merged with trunk addods development branch
...
bzr revid: hmo@tinyerp.com-20110329122736-78igudbed2jz7lf4
2011-03-29 17:57:36 +05:30
55a226ef3a
[MERGE] Resynchronized with trunk.
...
bzr revid: nicolas.vanhoren@openerp.com-20110325102413-7xjgusazsow7nwaf
2011-03-25 11:24:13 +01:00
1b7854503d
[IMP] Improvements to the screenshots for some modules.
...
bzr revid: nicolas.vanhoren@openerp.com-20110322131214-g4h9rzpam67k2ym9
2011-03-22 14:12:14 +01:00
1ea7f3bd99
[IMP]: Images & Descriptions.
...
bzr revid: vro@tinyerp.com-20110321133747-k7z4yistfi19rplm
2011-03-21 19:07:47 +05:30
cf07e58016
[MERGE] Other improvements of descriptions in module manifests.
...
bzr revid: nicolas.vanhoren@openerp.com-20110318140618-jg2jumv3gyacfb74
2011-03-18 15:06:18 +01:00
437ed909c2
[IMP]: Module descriptions.
...
bzr revid: vro@tinyerp.com-20110318114737-znh9wtipt84hc5jd
2011-03-18 17:17:37 +05:30
a898038b47
[MERGE] Merged module screenshots and improvements to module descriptions.
...
bzr revid: nicolas.vanhoren@openerp.com-20110318110816-f8bnmmlfzc9eqyu7
2011-03-18 12:08:16 +01:00
1d44b37405
[ADD]: Images: crm, crm_claim
...
bzr revid: vro@tinyerp.com-20110317094156-mxev83bf0cae52ju
2011-03-17 15:11:56 +05:30
e1afe5828a
[IMP] change module name emails to email and related to changes in addons all module. move email_gateway module file in email module and also related changes in related module..
...
bzr revid: ysa@tinyerp.com-20110310073900-ivesygpb7cdwpp43
2011-03-10 13:09:00 +05:30
a69c473f52
[IMP] Changed all module categories, limited number of categories
...
bzr revid: evv@openerp.com-20110309100505-mwxe08davyzdkfis
2011-03-09 11:05:05 +01:00
d1dcd5a16f
[IMP] remove duplicate code in crm, crm_claim. crm_helpdesk, event, hr_recruitment, project_issu relate to send mail wizard.and improve email.message.send wizard.
...
bzr revid: ysa@tinyerp.com-20110218124509-srcrk6lz4p4f3wlw
2011-02-18 18:15:09 +05:30
ab8194f033
[IMP] improve dependancy in module.
...
bzr revid: ysa@tinyerp.com-20110209085921-se3a0q463u1z1e6t
2011-02-09 14:29:21 +05:30
26447d3f50
[MOV] change module name email to emails
...
bzr revid: ysa@tinyerp.com-20110208085311-yepv15l0pskvrmc2
2011-02-08 14:23:11 +05:30
7d9d3c5611
[IMP] replace mail_gateway to email_gateway module in dependancy of module.
...
bzr revid: ysa@tinyerp.com-20110204065627-sfir225ag1bzwgay
2011-02-04 12:26:27 +05:30
5140ae0d98
[IMP] add email module depedancy in related module.
...
bzr revid: ysa@tinyerp.com-20110204062934-yf8in8dzu15vdmeh
2011-02-04 11:59:34 +05:30
25341b78cb
[MERGE] merged with main addons branch
...
bzr revid: qdp-launchpad@tinyerp.com-20110117080048-h0e64af48ru2bkvp
2011-01-17 09:00:48 +01:00
d74281c300
FIX] shortcuts remove in view file and create data in separate file and set noupdate='1'.
...
bzr revid: ysa@tinyerp.com-20110111090720-d65ynsn07d52fobg
2011-01-11 14:37:20 +05:30
e280af96b4
[ADD] crm: Added a yaml for changes in stages for leads/opportunity.
...
bzr revid: uco@tinyerp.com-20110110125113-js0bqdeoxl0nlxd8
2011-01-10 18:21:13 +05:30
b5b7511057
[ADD] crm: Added a yaml for recurrent meeting.
...
bzr revid: uco@tinyerp.com-20110106105632-5jw1vfgrmz05e8pd
2011-01-06 16:26:32 +05:30
4988819428
[IMP] removed board on users
...
bzr revid: fp@tinyerp.com-20101005075922-d0n6h4g0kz25p0bn
2010-10-05 09:59:22 +02:00
c9635b3f03
Partner Assignation Improvement
...
bzr revid: fp@tinyerp.com-20100921101544-kn582esckm4ekzps
2010-09-21 12:15:44 +02:00
edc394a66b
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: rpa@tinyerp.com-20100915053125-s1shvfyx8ro7s53h
2010-09-15 11:01:25 +05:30
04308844b8
[IMP] remove unused menu
...
bzr revid: fp@tinyerp.com-20100914222612-fs1b1dzegizkqnf5
2010-09-15 00:26:12 +02:00
c5c5d8b0f4
Initial 'Add Note' functionality.
...
bzr revid: daniel.watkins@credativ.co.uk-20100831150921-gc7d0yfr0s034wmg
2010-08-31 16:09:21 +01:00
092d59adff
[REF] Corrections of OpenERP instead of Open ERP
...
bzr revid: jvo@tinyerp.com-20100810113506-hm4ocvh4rd68dmu2
2010-08-10 17:05:06 +05:30
1976ff509a
[FIX]: crm: Fixed warning in yml test
...
bzr revid: rpa@tinyerp.com-20100730104754-v27a8nvv00iv9ffy
2010-07-30 16:17:54 +05:30
9637ab6a49
[ADD]: crm: Added new wizard to merge Opportunity with Other Opportunities of the same partner
...
bzr revid: rpa@tinyerp.com-20100729070549-snt3yy0507xmxtfd
2010-07-29 12:35:49 +05:30
c860708a9c
[RENAME] Tiny ERP to OpenERP SA in all places
...
bzr revid: vir@tinyerp.com-20100728114344-u2cm97mk6gnfpp13
2010-07-28 17:13:44 +05:30
24945daabb
[IMP]: crm: Improvement in forward to partner and send email wizard
...
bzr revid: rpa@tinyerp.com-20100715073313-29e4qbtpk9np9sot
2010-07-15 13:03:13 +05:30
dc0b929b09
[ADD]: crm: * Added new objects for custom crm case and sections
...
* Added a wizard to create Menus for custom cases
bzr revid: rpa@tinyerp.com-20100710100016-n1tjsrvfnjgmifig
2010-07-10 15:30:16 +05:30
811b1092e8
[FIX] caldav: minor problem
...
bzr revid: hmo@tinyerp.com-20100709084451-e2y0nb7i1k6ksj35
2010-07-09 14:14:51 +05:30
da453c68ad
[IMP]: crm, base_calendar: Improvements for proper access rights
...
bzr revid: rpa@tinyerp.com-20100628073232-kgt1l6imvjxgaipv
2010-06-28 13:02:32 +05:30
3058bf6bb2
[IMP] misc
...
bzr revid: fp@tinyerp.com-20100624064029-hkd1dnap74a6rolc
2010-06-24 08:40:29 +02:00
d22735f5ba
[ADD]: Add description for All module where dashboards are added
...
bzr revid: sbh@tinyerp.com-20100609085435-ga581uf4dgg2st9h
2010-06-09 14:24:35 +05:30
6f2cb3e336
[IMP]: Move the board of crm and move the auction board into auction
...
bzr revid: sbh@tinyerp.com-20100608050238-ich41bnhch1ch31t
2010-06-08 10:32:38 +05:30
e29b1f00e7
Task-ID:919 merge board_crm into crm
...
bzr revid: sbh@tinyerp.com-20100607104934-7z3xjjh6mbknw44n
2010-06-07 16:19:34 +05:30
5f936d961c
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: rpa@tinyerp.com-20100526050851-lodfvwj5ruw6rbs0
bzr revid: rpa@tinyerp.com-20100526122202-vp53qayvu46vvkve
bzr revid: rpa@tinyerp.com-20100527051402-mrkzkwazlhosynk2
2010-05-27 10:44:02 +05:30
110b37954d
[MERGE] Merged from main branch
...
bzr revid: vra@tinyerp.com-20100526051022-ylqotlgwi95j6mvm
2010-05-26 10:40:22 +05:30
bd50a157c9
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: rpa@tinyerp.com-20100524050031-t7begh13c1x2r5ap
bzr revid: rpa@tinyerp.com-20100525050319-vw5dl9sdizcfugaq
bzr revid: rpa@tinyerp.com-20100525122710-5orcyh0m2zj7rbg9
2010-05-25 17:57:10 +05:30
8cd3caab57
[IMP]: crm: Improvement for putting crm information in partner, made separate file for partner info
...
bzr revid: rpa@tinyerp.com-20100525122358-z1e5qeb2c7glcdwd
2010-05-25 17:53:58 +05:30
Antony Lesuisse
Olivier Dony
Raphael Collet
Hardik Ansodariy (OpenERP)
Rifakat Haradwala (Open ERP)
Ujjvala Collins (OpenERP)
Harry (OpenERP)
niv-openerp
vro
Yogesh (OpenERP)
Els Van Vossel
qdp-launchpad@tinyerp.com
Fabien Pinckaers
rpa (Open ERP)
Daniel Watkins
sbh (Open ERP)
vra