d1c3269349
[IMP] slaughtering + Merge calendar_event to crm_meeting + debug + ...
...
bzr revid: jke@openerp.com-20131108160549-2q6snfpxvbq18l0h
2013-11-08 17:05:49 +01:00
b92220ea7d
[MERGE] Merge with base branch tempalte-aja
...
bzr revid: jke@openerp.com-20131107140448-kp3daxcqvymdfy7r
2013-11-07 15:04:48 +01:00
e6b54fa60b
[MERGE]0k/web_fullcalendar branch from github
...
bzr revid: jke@openerp.com-20131106164700-hiwisdcygno4sj17
2013-11-06 17:47:00 +01:00
2888b61f91
[IMP]: if opt_out is checked invitation mail is not send to attendee
...
bzr revid: aja@tinyerp.com-20131101091941-a0kj5m0wiebw3w4q
2013-11-01 14:49:41 +05:30
b1edaffa96
[FIX]: Traceback , create an recurrent meeting and then accept/decline from invitation tab
...
bzr revid: aja@tinyerp.com-20131022051755-peha2xvrr74zn6tv
2013-10-22 10:47:55 +05:30
6bace2ccfa
[IMP]: Fix trace back and improve emil template view
...
bzr revid: aja@tinyerp.com-20131017120530-g5fvr1qt53r9m2xp
2013-10-17 17:35:30 +05:30
790ade4a92
[MERGE]: with trunk
...
bzr revid: aja@tinyerp.com-20131011051716-2he5ix4xsgtv3ftc
2013-10-11 10:47:16 +05:30
ccfc03ccf5
[IMP]: method do_accept,do_decline and get_day
...
bzr revid: aja@tinyerp.com-20131010132100-t2e9mwxv1phzk1zw
2013-10-10 18:51:00 +05:30
086dbfa5cf
[REM]: unwanted argument from url and allow to add default state when new attendee is created
...
bzr revid: aja@tinyerp.com-20131008093830-b5wz38dlcll2ewuj
2013-10-08 15:08:30 +05:30
c30200fc9b
[IMP]: Handle accept,decline and view calendar url from controller and add new qweb template to allow a user to view and accept/decline without login
...
bzr revid: aja@tinyerp.com-20131008072841-ob47desoiwqzagoa
2013-10-08 12:58:41 +05:30
b8fd401199
[MERGE]: with trunk
...
bzr revid: aja@tinyerp.com-20131007050449-s1u4g8nyc39v1zf6
2013-10-07 10:34:49 +05:30
9757c08872
use referencable models instead of _get_links
...
bzr revid: al@openerp.com-20131006115808-etkyq34ar1pqh2pb
2013-10-06 13:58:08 +02:00
07c4f9b0b5
[PORT]: Forward-port from lp:~openerp-dev/openobject-addons/7.0-fix-calendar-recursive-chm
...
bzr revid: aja@tinyerp.com-20131001133042-umyfh6uf0lg66s2c
2013-10-01 19:00:42 +05:30
546a191f0a
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9459 rev-id: fva@openerp.com-20130918153347-fy4nuvbm82ngfb8x
...
bzr revid: mat@openerp.com-20130826135110-f9q4p65ds2aholcw
bzr revid: dle@openerp.com-20130828141129-ecxl2vlpb8vw0o9f
bzr revid: dle@openerp.com-20130828162659-n8a0ku9o3h01qaov
bzr revid: dle@openerp.com-20130830094205-q3itwd7x0246d9n6
bzr revid: dle@openerp.com-20130830133604-mfnfbscn5wdk4vi4
bzr revid: dle@openerp.com-20130902131244-v9uh0s8rg4889i7j
bzr revid: mat@openerp.com-20130903134105-68ziuaccreu6rs61
bzr revid: chs@openerp.com-20130906171851-jtfsf4au1k30wwlr
bzr revid: dle@openerp.com-20130909103120-k5oefxgebhyslac3
bzr revid: dle@openerp.com-20130909170047-pbzw4ernvcpivbhh
bzr revid: chs@openerp.com-20130910122113-171osvcukxffxcry
bzr revid: tde@openerp.com-20130912121059-k840pi4rwdzpez8g
bzr revid: dle@openerp.com-20130913085251-p906ci2divy82jur
bzr revid: tde@openerp.com-20130913092546-kzshg1a7sls566l8
bzr revid: mat@openerp.com-20130917122102-drf8fj9lrjj0fvju
bzr revid: mat@openerp.com-20130917161614-w8u2c1ayeb5kxm30
bzr revid: dle@openerp.com-20130918161305-7ep1642nxzyy3vhd
2013-09-18 18:13:05 +02:00
c0be2ae2a7
[MERGE] [FIX] base_calendar: Fix domain evaluation for calendar recursive and fix search method for recurrency date
...
bzr revid: mat@openerp.com-20130917093906-3oe3xr7zaoc1r80m
2013-09-17 11:39:06 +02:00
ebc3fd2755
[MERGE]: with lp:~openerp-dev/openobject-addons/trunk-meeting_attendees-nco
...
bzr revid: aja@tinyerp.com-20130916104551-0p3acubm9br3mzf2
2013-09-16 16:15:51 +05:30
a83eaf8413
[MERGE]: with trunk
...
bzr revid: rgaopenerp-20130906121341-kpt6wua2msig28f9
bzr revid: aja@tinyerp.com-20130911085322-kka2cltcpm002yxp
2013-09-11 14:23:22 +05:30
3fa90321e1
[MERGE] forward port of branch saas-1 up to revid 8772 chs@openerp.com-20130910122113-171osvcukxffxcry
...
bzr revid: chs@openerp.com-20130910124803-wxkb8gkz1tub5qjf
2013-09-10 14:48:03 +02:00
1f7f826a90
[FIX] base_calendar: add s after day, month, year into relativedelta
...
bzr revid: chm@openerp.com-20130910092501-gl9pmd3vk26q32tv
2013-09-10 11:25:01 +02:00
1e7bc245e9
[FIX]base_calender: pop default_state from context before creating attendees (context propagation problem)
...
bzr revid: dle@openerp.com-20130909165307-hb9sbsaeyqywegbp
2013-09-09 18:53:07 +02:00
b23587cce2
[FIX] base_calendar: avoid duplication of event on invitation acceptance (opw 586763)
...
bzr revid: mat@openerp.com-20130902082742-gm422qo1qzev9r35
2013-09-02 10:27:42 +02:00
93667065ae
[IMP]improved typo.
...
bzr revid: ishwarmalvi13@gmail.com-20130830114702-7ehvcpk9rjmwg71k
2013-08-30 17:17:02 +05:30
ff444b7040
[IMP]added chatter notification for email sent to attendee(s).
...
bzr revid: ishwarmalvi13@gmail.com-20130826131510-ab0sluzt0no6vr6h
2013-08-26 18:45:10 +05:30
f6b5d5879d
[IMP]improved typo of accept invitation.
...
bzr revid: ishwarmalvi13@gmail.com-20130826105930-cv3tpy3dsv1zivdx
2013-08-26 16:29:30 +05:30
3724e11aa6
[MERGE]: with trunk.
...
bzr revid: ishwarmalvi13@gmail.com-20130826100735-ie1wvf44j6ra2j40
2013-08-26 15:37:35 +05:30
0a9e09b6bf
Merge with trunk
...
bzr revid: rgaopenerp-20130826082915-6sgmv9t0yym8n13c
2013-08-26 13:59:15 +05:30
bad1a58eba
[FIX] base_calendar: change write, create and search method display recurrency date, and recurrency date with number of repetitions
...
bzr revid: chm@openerp.com-20130820123224-33bwr2gt9tp7x9qg
2013-08-20 14:32:24 +02:00
17620a2326
[IMP]: indentation
...
bzr revid: aja@tinyerp.com-20130816124741-6bk10d2z3eiwn3a4
2013-08-16 18:17:41 +05:30
23d2d1bb57
[IMP]: Create email template fot crm meeting instead of calender atttendee , and clean code
...
bzr revid: aja@tinyerp.com-20130802085607-pdnwpbqvycxm91di
2013-08-02 14:26:07 +05:30
a99b5786d1
[MERGE] Forward-port of 7.0 bugfixes up to rev. 9337 (dle@openerp.com-20130731153129-8hmqrgsg3e9d533f)
...
bzr revid: mat@openerp.com-20130726073123-6buqe3rg321gj5rw
bzr revid: odo@openerp.com-20130730110536-a74ea14pwb2y03ay
bzr revid: dle@openerp.com-20130801123703-frjhpeqwocsjo7ge
2013-08-01 14:37:03 +02:00
63b2e2c44c
[FIX] base_calendar: don't compute reccuring events if reccurency checkbox is disabled
...
bzr revid: mat@openerp.com-20130730081409-d84sz1e1w2201yqr
2013-07-30 10:14:09 +02:00
1b87cb77a9
[MERGE] with trunk.
...
bzr revid: nco@tinyerp.com-20130722070913-vqtwvk2ch696iw2g
2013-07-22 12:39:13 +05:30
bf29a2ebc7
[MERGE] forward port of branch 7.0 up to revid 9302 chs@openerp.com-20130718111616-apacuhc2qhquobtc
...
bzr revid: dle@openerp.com-20130627104833-b9zgtu8urj43f12b
bzr revid: mat@openerp.com-20130702135856-kmg7d8anw17nkbd8
bzr revid: chs@openerp.com-20130718115928-wpa84dqh8tcq31zt
2013-07-18 13:59:28 +02:00
8fa171aa0d
[FIX] crm_meeting: fix domain evaluation for calendar recursive. (see openerp-web/7.0/revision/3989). Todo: fix recursive when the begin date it's before the domain search date
...
bzr revid: chm@openerp.com-20130717142325-8lo9el6gk9kgos3d
2013-07-17 16:23:25 +02:00
0fc106106f
[IMP]: code
...
bzr revid: aja@tinyerp.com-20130715114818-h5vbfv6vncsvtrga
2013-07-15 17:18:18 +05:30
e9eceecf19
[IMP]: code for invitation template
...
bzr revid: aja@tinyerp.com-20130715101608-qd94u2vfi1qrok6x
2013-07-15 15:46:08 +05:30
f2a2a3eefc
[IMP]: current user will see as a you, his/her name will not seen in respective email template, when they got mail
...
bzr revid: aja@tinyerp.com-20130715094053-oiggvpb4k4qswoau
2013-07-15 15:10:53 +05:30
feef1f6b8f
[IMP]show circle according to state field in email.
...
bzr revid: vme@tinyerp.com-20130712115122-2nh946w44fagji18
2013-07-12 17:21:22 +05:30
6b91bc24d7
[ADD]:widget for invitation status on many2many field , will see the status of attendee if accepted then green, declined then red otherwise grey buttton
...
[IMP]: onclick accept/decline open form view of meeting and if click on direct to openerp will open calneder view of meeting
-> Message in chatter when accept/decline.
bzr revid: aja@tinyerp.com-20130711113624-baqko9b4b1fjoh8o
2013-07-11 17:06:24 +05:30
05544e1522
[REM][IMP]: Unwanted import statement and improve code
...
bzr revid: aja@tinyerp.com-20130705131928-1za77dhq23vtge53
2013-07-05 18:49:28 +05:30
ee1d46b470
[MERGE]: with trunk
...
bzr revid: aja@tinyerp.com-20130705094448-c23pabz3imy3cuti
2013-07-05 15:14:48 +05:30
e3e97c35d3
[IMP]: code for send invitation mail.
...
[REM]: copy of invitation when do_accept call ,instead that create a record rule loged in user only able to see his/her invitation line and can able to accept/decline that invitation
bzr revid: aja@tinyerp.com-20130705073436-qlbnomlfh1755c36
2013-07-05 13:04:36 +05:30
4276270bbb
[IMP]: code
...
bzr revid: aja@tinyerp.com-20130703110039-uq8g9jzeyhh6t8nz
2013-07-03 16:30:39 +05:30
17df44b67e
[REM]: code comment
...
bzr revid: aja@tinyerp.com-20130703071902-sxtu4n3mdqxi5e0w
2013-07-03 12:49:02 +05:30
055d01f69f
[IMP]: code and http request handler
...
bzr revid: aja@tinyerp.com-20130703060754-eky7zik1wskq9738
2013-07-03 11:37:54 +05:30
899a60b616
[ADD]: Make url for invitation
...
-> When session validate do_accept/do_reject
-> Make post in chatter accept/reject
-> Show calender view.
bzr revid: aja@tinyerp.com-20130627104206-t8eyclekx3f9mmia
2013-06-27 16:12:06 +05:30
a116468ccf
[IMP] if internal user than invitation state goes to accepted.
...
bzr revid: nco@tinyerp.com-20130621101535-01ds8rdbeof4tbbv
2013-06-21 15:45:35 +05:30
78619253d2
[IMP] set ids.
...
bzr revid: nco@tinyerp.com-20130621062345-4aqhvuzxn6godrym
2013-06-21 11:53:45 +05:30
1b5e51e2e8
[MERGE] lp:~openerp-dev/openobject-addons/trunk-meeting_attendees-cha
...
bzr revid: nco@tinyerp.com-20130621051218-cq0j9minq424yid8
2013-06-21 10:42:18 +05:30
e4fabbfedc
[MERGE] with trunk.
...
bzr revid: nco@tinyerp.com-20130620064937-uba0r8qyfc9hhv3l
2013-06-20 12:19:37 +05:30
jke-openerp
ajay javiya (OpenERP)
Antony Lesuisse
Denis Ledoux
Martin Trigaux
Christophe Simonis
Christophe Matthieu
ishwar.malvi-openerp
RGA(OpenERP)
Nimesh Contractor (OpenERP)
Vidhin Mehta
Mahendra Barad (OpenERP Trainee)