Fabien Pinckaers
1ae6bd0bd5
[MERGE] typo
...
bzr revid: fp@openerp.com-20121024202948-x1nbbin2j4mk4us5
2012-10-24 22:29:48 +02:00
Fabien Pinckaers
a334d1ebea
[MERGE] typo
...
bzr revid: fp@openerp.com-20121024201859-aljpjevofisrt9o3
2012-10-24 22:18:59 +02:00
Fabien Pinckaers
a7368145ca
[MERGE] typo
...
bzr revid: fp@openerp.com-20121024201424-98la8f2wkhfjrtae
2012-10-24 22:14:24 +02:00
Fabien Pinckaers
65c2193e33
[MERGE] fix breadcrum bouncing issue
...
bzr revid: fp@tinyerp.com-20121022173520-zr373cyq3nvrhvrv
2012-10-22 19:35:20 +02:00
Fabien Pinckaers
101c6096e6
[MERGE] open chatter fix message read/unread
...
bzr revid: fp@tinyerp.com-20121022080251-9plcyik4ag328m0z
2012-10-22 10:02:51 +02:00
Divyesh Makwana (Open ERP)
d3f99be6f7
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121016043915-jj52ndvtvtry8wtn
bzr revid: mdi@tinyerp.com-20121017044114-rx20qcnmj0h2di9m
bzr revid: mdi@tinyerp.com-20121018040816-rldo7d3wvdarhrrn
bzr revid: mdi@tinyerp.com-20121019043918-ajzdhughbwm3j859
bzr revid: mdi@tinyerp.com-20121022041308-wczx6ppb8id1100g
2012-10-22 09:43:08 +05:30
5bfa3c5a7d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121019053933-51d6oob5aw0ujz40
2012-10-19 05:39:33 +00:00
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
Mayur Maheshwari (OpenERP)
7295442de8
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20121016051445-r8q5f1ueuja66q5h
bzr revid: mma@tinyerp.com-20121018052148-1k463zktexttldb2
bzr revid: mma@tinyerp.com-20121019045120-t8ee1fyz84fe751c
2012-10-19 10:21:20 +05:30
Atul Patel (OpenERP)
94bca52631
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121016171502-ldl0i75wv50sgdyy
2012-10-16 22:45:02 +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
Fabien Pinckaers
a48589b72b
[MERGE] date_end computed on events
...
bzr revid: fp@tinyerp.com-20121015152852-nndcg6ekd8i0punb
2012-10-15 17:28:52 +02:00
Mayur Maheshwari (OpenERP)
3a38ecd3c2
[IMP]event : improve kanaban button condition
...
bzr revid: mma@tinyerp.com-20121015113022-um8ursgf4mzwvskl
2012-10-15 17:00:22 +05:30
Mayur Maheshwari (OpenERP)
e479d6a05d
[IMP]event : improve kanaban button condition
...
bzr revid: mma@tinyerp.com-20121015111110-wvbw3rg54s2c6u3k
2012-10-15 16:41:10 +05:30
Mayur Maheshwari (OpenERP)
66f4943ab6
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20121012051141-ng6om6vdys0j0tnj
bzr revid: mma@tinyerp.com-20121015090009-hlximum1k8l55ec8
2012-10-15 14:30:09 +05:30
Divyesh Makwana (Open ERP)
ad24f7026b
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121015053217-06u3fa6yyybpartw
2012-10-15 11:02:17 +05:30
Nimesh (Open ERP)
99bf2fb663
[MERGE] merge with lp:openobject-addons
...
bzr revid: nco@tinyerp.com-20121015045434-kp7a7h2l1mqa1x01
2012-10-15 10:24:34 +05:30
Fabien Pinckaers
3bb88076e1
[MERGE] events improvements
...
bzr revid: fp@tinyerp.com-20121013104045-w552j40hzvqv9d89
2012-10-13 12:40:45 +02:00
Nimesh (Open ERP)
199db0e73f
[ADD] set bouce effect by stting groups on button in event/event_view.xml.
...
bzr revid: nco@tinyerp.com-20121012132623-j4ae12wq3un36xzj
2012-10-12 18:56:23 +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
Saurang Suthar
40c43f21d3
[MERGE]:merged with latest addons
...
bzr revid: ssu@tinyerp.com-20121012062337-4cjzskoxb77d5dme
2012-10-12 11:53:37 +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
Divyesh Makwana (Open ERP)
fb87569289
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121011045301-ttt0tzlrk8ge06db
bzr revid: mdi@tinyerp.com-20121012052424-z2toltq0vw0pnyk9
2012-10-12 10:54:24 +05:30
Antonin Bourguignon
9f296a8005
[MERGE] trunk-bug-1024145-abo: fix an issue in event reporting due to a missing outer join in the psql view
...
lp bug: https://launchpad.net/bugs/1024145 fixed
bzr revid: abo@openerp.com-20121011145427-m8ol0yo980kz5j9k
2012-10-11 16:54:27 +02:00
Antonin Bourguignon
90ff5bf65a
[IMP] properly fetch events that have no registration
...
in order to achieve that, remove the previous patch which was too exclusive (WHERE r.id IS NOT NULL) and use 'virtual' ids instead
the unicity is guaranteed by concatenating the event id and the registration id (if any)
bzr revid: abo@openerp.com-20121011135809-fag9br23hthrwy1s
2012-10-11 15:58:09 +02:00
Amit Patel
97fee20fee
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121011054902-ccq559x2j0sivhwu
2012-10-11 11:19:02 +05:30
Fabien Pinckaers
20fefed4c7
[MERGE] create=false
...
bzr revid: fp@openerp.com-20121010200511-yjmajwybmf3yfitm
2012-10-10 22:05:11 +02:00
Fabien Pinckaers
98adf3f87a
[FIX] event crashes
...
bzr revid: fp@openerp.com-20121010191320-z5j6tkza4p76ud44
2012-10-10 21:13:20 +02:00
Antonin Bourguignon
4079c1e4b4
[IMP] add a tofix in the comments
...
bzr revid: abo@openerp.com-20121010164523-hl70trg3txylev93
2012-10-10 18:45:23 +02:00
Antonin Bourguignon
79e52172f4
[IMP] remove duplicated fields from the GROUP BY statement
...
bzr revid: abo@openerp.com-20121010164016-7s3y43yubhwc5g1w
2012-10-10 18:40:16 +02:00
Antonin Bourguignon
f7528e87bb
[IMP] code style
...
bzr revid: abo@openerp.com-20121010163625-ybklx8alceyo1qaa
2012-10-10 18:36:25 +02:00
Antonin Bourguignon
cdc7ee2fba
[MERGE] trunk
...
bzr revid: abo@openerp.com-20121010135629-ywtajjsopoo5jvv0
2012-10-10 15:56:29 +02:00
Saurang Suthar
229758122d
[IMP]event:improved code as per suggestion
...
bzr revid: ssu@tinyerp.com-20121010062204-gna6c83qfhqhr4zy
2012-10-10 11:52:04 +05:30
Mayur Maheshwari (OpenERP)
2e0c40cb4f
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20121010051757-7rsv5orjcj6x18kg
2012-10-10 10:47:57 +05:30
Divyesh Makwana (Open ERP)
4d9676104f
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121010043116-5avckqse0rfsgl3g
2012-10-10 10:01:16 +05:30
Divyesh Makwana (Open ERP)
f5a719cf6c
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121010042834-woiqdv1nmxwp17le
2012-10-10 09:58:34 +05:30
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
Saurang Suthar
86950ea301
[MERGE]:merged with main addons
...
bzr revid: ssu@tinyerp.com-20121009120018-4w4k5k6uysdesj2q
2012-10-09 17:30:18 +05:30
Saurang Suthar
971a4045f6
[IMP]event:removed unnecessary imports and updated code for onchange start date
...
bzr revid: ssu@tinyerp.com-20121009110429-r5uyknqc61eqmd81
2012-10-09 16:34:29 +05:30
Quentin (OpenERP)
602dc1c38d
[MERGE] review search view view
...
bzr revid: qdp-launchpad@openerp.com-20121009101027-v0mi91r3s76bygr6
2012-10-09 12:10:27 +02:00
Amit Patel
cc4dd77093
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121009091007-3gbnwdvtlfq5v6y3
2012-10-09 14:40:07 +05:30
Mayur Maheshwari (OpenERP)
91b257b0e8
[IMP]event : improve kanban view tickets condition
...
bzr revid: mma@tinyerp.com-20121009090158-btfq6ypk6f7wio41
2012-10-09 14:31:58 +05:30
Mayur Maheshwari (OpenERP)
a4fe575abc
[IMP]event : improve string
...
bzr revid: mma@tinyerp.com-20121009060137-tuaclaj2dm8vr8x0
2012-10-09 11:31:37 +05:30
Divyesh Makwana (Open ERP)
b30bd8da25
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121009042752-0om3u8ds9utyvqq1
2012-10-09 09:57:52 +05:30
Divyesh Makwana (Open ERP)
4ca0eeac11
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20121004043446-x8r7402jk8n25zry
bzr revid: mdi@tinyerp.com-20121005044410-vay9tplkxoh1x0in
bzr revid: mdi@tinyerp.com-20121008044218-55v153woqeg90uqc
bzr revid: mdi@tinyerp.com-20121009042428-14ags7vpw5yqca6p
2012-10-09 09:54:28 +05:30
Divyesh Makwana (Open ERP)
9a264c3369
[IMP] There is no consistency throughout OpenERP with 'Source document', 'Source', 'Origin'. It should always be 'Source document'.
...
bzr revid: mdi@tinyerp.com-20121008104151-opvu1mig2xbxxpli
2012-10-08 16:11:51 +05:30
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
Saurang Suthar
c94193d460
[MERGE]:merged with main addons
...
bzr revid: ssu@tinyerp.com-20121008063357-c7d8yhbrivtu98j1
2012-10-08 12:03:57 +05:30
Antonin Bourguignon
b0bf2f9603
[MERGE] trunk
...
bzr revid: abo@openerp.com-20121005142029-anrpd7tx1zx9ke1m
2012-10-05 16:20:29 +02:00
Fabien Pinckaers