Amit Patel (OpenERP)
d7efca419a
[MERGE]
...
bzr revid: apa@tinyerp.com-20120330131647-cjrt9u4d3i3jwz9o
2012-03-30 18:46:47 +05:30
Amit Patel (OpenERP)
22ff6fd7f9
[IMP]
...
bzr revid: apa@tinyerp.com-20120330131252-zxfp4oy7p0bli5my
2012-03-30 18:42:52 +05:30
Amit Patel (OpenERP)
955169f260
[IMP]
...
bzr revid: apa@tinyerp.com-20120330130020-d9bv300ur5x8e40z
2012-03-30 18:30:20 +05:30
Sanjay Gohel (Open ERP)
87319499be
[MERGE]
...
bzr revid: sgo@tinyerp.com-20120330115251-wmlkj3hn351x2m2v
bzr revid: sgo@tinyerp.com-20120330124921-ph493qxfnqr3cb5j
bzr revid: sgo@tinyerp.com-20120330125449-evtqfju15ldrl6pc
2012-03-30 18:24:49 +05:30
Amit Patel (OpenERP)
0cb9be23dd
[MERGE]
...
bzr revid: apa@tinyerp.com-20120330125407-bg6200dekqzvnvhh
2012-03-30 18:24:07 +05:30
Khushboo Bhatt (Open ERP)
f782026d24
[IMP]default project_id added.
...
bzr revid: kbh@tinyerp.com-20120330124312-loiwpuur2hq8nivz
2012-03-30 18:13:12 +05:30
Amit Patel (OpenERP)
c3651820db
[IMP]
...
bzr revid: apa@tinyerp.com-20120330122029-gjnf3yz2za24n939
2012-03-30 17:50:29 +05:30
Khushboo Bhatt (Open ERP)
3d4276503d
[IMP]
...
bzr revid: kbh@tinyerp.com-20120330121714-4zfmeow3dg9q634q
2012-03-30 17:47:14 +05:30
Amit Patel (OpenERP)
590e529d65
[IMP]
...
bzr revid: apa@tinyerp.com-20120330120941-e7emkrpt6mzxyxu3
2012-03-30 17:39:41 +05:30
Amit Patel (OpenERP)
53e1f2a427
[IMP]
...
bzr revid: apa@tinyerp.com-20120330120411-ddorwd83ocdb2qsw
2012-03-30 17:34:11 +05:30
Amit Patel (OpenERP)
e88de50eb8
[MERGE]
...
bzr revid: apa@tinyerp.com-20120330115152-lj292dxh9ie12zj7
2012-03-30 17:21:52 +05:30
Amit Patel (OpenERP)
e7db374b45
[IMP]
...
bzr revid: apa@tinyerp.com-20120330114909-3goa78ghbwtudsf1
2012-03-30 17:19:09 +05:30
Amit Patel (OpenERP)
573342ec06
[IMP]
...
bzr revid: apa@tinyerp.com-20120330114723-0jkanie1x1vn148y
2012-03-30 17:17:23 +05:30
Sanjay Gohel (Open ERP)
d0214c4e45
[IMP]calculate amt to invoice and display on kanban view
...
bzr revid: sgo@tinyerp.com-20120330114705-kgecxihkih0ftmvj
2012-03-30 17:17:05 +05:30
Amit Patel (OpenERP)
225911cfb0
[MERGE]
...
bzr revid: apa@tinyerp.com-20120330114152-yz7zzrpynxa6muyj
2012-03-30 17:11:52 +05:30
Amit Patel (OpenERP)
45a71c9c35
[IMP]
...
bzr revid: apa@tinyerp.com-20120330111440-fcrsgemdp53e8ocs
2012-03-30 16:44:40 +05:30
Amit Patel (OpenERP)
da2e47979e
[IMP]
...
bzr revid: apa@tinyerp.com-20120330110214-gy1g9fwt03dydcoh
2012-03-30 16:32:14 +05:30
Khushboo Bhatt (Open ERP)
115a65dcc4
[IMP]total issue count
...
bzr revid: kbh@tinyerp.com-20120330055747-zwrd8seqafjxotwc
bzr revid: kbh@tinyerp.com-20120330060523-npm8ujwskqj0x70m
bzr revid: kbh@tinyerp.com-20120330083437-pm3azv3r9nn7et5b
bzr revid: kbh@tinyerp.com-20120330095321-5vn1owb54tdrmk6f
2012-03-30 15:23:21 +05:30
Amit Patel (OpenERP)
67255539f9
[IMP]
...
bzr revid: apa@tinyerp.com-20120330091603-c46u2zcdjiddpogq
2012-03-30 14:46:03 +05:30
Amit Patel (OpenERP)
1a7f595bb2
[MERGE]
...
bzr revid: apa@tinyerp.com-20120330084619-erxlcdabcchzzeux
2012-03-30 14:16:19 +05:30
Thibault Delavallée
914fab60e3
[MERGE] Merged with branch propagating the use of user avatars instead of gravatars in crm and project. This branch also improve the photo management in hr. This revision modifies the photo for HR employees. Two fields now exist in the hr.employee model:
...
- photo_big, a binary field holding the image. It is base-64 encoded, and PIL-supported. It is automatically resized as an 540x450 px image.
- photo, a functional binary field holding an automatically resized version of the photo. Dimensions of the resized photo are 180x150. This field is used as an inteface to get and set the employee photo.
When changing the photo through the photo function field, the new image is automatically resized to 540x450, and stored in the photo_big field. This triggers the function field, that will compute a 180x150 resized version of the image.
Employee photo should be used only when dealing with employees, using the photo field. When dealing with users, use the res.users avatar field instead.
bzr revid: tde@openerp.com-20120330084612-1225fmm6bx595mea
2012-03-30 10:46:12 +02:00
Sanjay Gohel (Open ERP)
c39ec15984
[IMP]
...
bzr revid: sgo@tinyerp.com-20120330084059-d0vfd8s1c4sw0got
2012-03-30 14:10:59 +05:30
Thibault Delavallée
b6bb8bf533
[MERGE] Merged branch adding an avatar to users. This avatar will replace the use of gravatars in various addons. For more info, please refer to the included documentation.
...
bzr revid: tde@openerp.com-20120330083725-n4k8hex92ezxq6wg
2012-03-30 10:37:25 +02:00
Thibault Delavallée
49d8f42586
[IMP] Typo in comment
...
bzr revid: tde@openerp.com-20120330083420-5swr4h9ihayi7vpu
2012-03-30 10:34:20 +02:00
Sanjay Gohel (Open ERP)
5d4b8c2e58
[MERGE]
...
bzr revid: sgo@tinyerp.com-20120330055738-pyik91wj6hpnm2ru
bzr revid: sgo@tinyerp.com-20120330083402-dc3vu8w5l887rs5q
2012-03-30 14:04:02 +05:30
Amit Patel (OpenERP)
f9398e1384
[IMP]
...
bzr revid: apa@tinyerp.com-20120330082948-d0wl0n1f64j80lo3
2012-03-30 13:59:48 +05:30
Thibault Delavallée
fa131c2559
[CLEAN] Cleaned imports in hr.py
...
bzr revid: tde@openerp.com-20120330082650-k0b62c0cpmrcsq2r
2012-03-30 10:26:50 +02:00
Thibault Delavallée
80ed6ba706
[REM] Removed doc as the documentation udpate methodology is not clear enough
...
bzr revid: tde@openerp.com-20120330081120-6eu5nhsx11dhy6h2
2012-03-30 10:11:20 +02:00
Thibault Delavallée
0204b5f1a9
[IMP]: added new default avatars in png, allowing to avoid compression defaults in resized avatars
...
bzr revid: tde@openerp.com-20120330081016-d6j2yd7ii86nhqzk
2012-03-30 10:10:16 +02:00
Thibault Delavallée
6a029d69f4
[MERGE] Merged with main server
...
bzr revid: tde@openerp.com-20120330073008-x3i7dsprvmjnsjmp
2012-03-30 09:30:08 +02:00
Amit Patel (OpenERP)
a5542944f9
[IMP]
...
bzr revid: apa@tinyerp.com-20120330072933-syjdkqs7excirqtn
2012-03-30 12:59:33 +05:30
Thibault Delavallée
fe1631cac3
[MERGE] Merged with main addons
...
bzr revid: tde@openerp.com-20120330072911-yf0azg7a6x2251ow
2012-03-30 09:29:11 +02:00
Amit Patel (OpenERP)
5d628773b9
[IMP]
...
bzr revid: apa@tinyerp.com-20120330072639-rum5zrqdskny157t
2012-03-30 12:56:39 +05:30
Amit Patel (OpenERP)
47ab29c93c
[IMP]
...
bzr revid: apa@tinyerp.com-20120330072425-7tf4uffzmxak8k19
2012-03-30 12:54:25 +05:30
Amit Patel (OpenERP)
25268a28ab
[IMP]
...
bzr revid: apa@tinyerp.com-20120330071144-5xrfdzdx27342hxq
2012-03-30 12:41:44 +05:30
Amit Patel (OpenERP)
21196f57ed
[IMP]
...
bzr revid: apa@tinyerp.com-20120330071000-pbdqqj6pylvrghx6
2012-03-30 12:40:00 +05:30
Amit Patel (OpenERP)
7b2b46b741
[IMP]
...
bzr revid: apa@tinyerp.com-20120330062413-9i7xyo9yh63zrdst
2012-03-30 11:54:13 +05:30
Amit Patel (OpenERP)
2ba790b37e
[IMP]
...
bzr revid: apa@tinyerp.com-20120330060038-701xyjxjaqmg1v6t
2012-03-30 11:30:38 +05:30
Amit Patel (OpenERP)
f499855684
[IMP]
...
bzr revid: apa@tinyerp.com-20120330055511-q20cwqvs6w4owroy
2012-03-30 11:25:11 +05:30
Sanjay Gohel (Open ERP)
355f15b456
[IMP]
...
bzr revid: sgo@tinyerp.com-20120330055419-0h6vm6szysfn3fez
2012-03-30 11:24:19 +05:30
Amit Patel (OpenERP)
90065c1a88
[IMP]
...
bzr revid: apa@tinyerp.com-20120330055312-b48taam1vr3l0d6s
2012-03-30 11:23:12 +05:30
Sanjay Gohel (Open ERP)
f3a8bde5d3
[]
...
bzr revid: sgo@tinyerp.com-20120330055250-xes9bxbfen1i9rzx
2012-03-30 11:22:50 +05:30
Amit Patel (OpenERP)
2a6092590d
[MERGE]
...
bzr revid: apa@tinyerp.com-20120330054306-j6dhfoe7sukujkk3
2012-03-30 11:13:06 +05:30
fa4f3cde2f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120330043433-fqgc4p517mcf553r
2012-03-30 04:34:33 +00:00
33b209251e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120330043417-eq9swtywff8tm13v
2012-03-30 04:34:17 +00:00
Amit Patel (OpenERP)
299d0463e9
[IMP]
...
bzr revid: apa@tinyerp.com-20120329133304-v225x3lbowhqyoad
2012-03-29 19:03:04 +05:30
Amit Patel (OpenERP)
60db095a88
[IMP]
...
bzr revid: apa@tinyerp.com-20120329131030-vjfix4ygwcyrs90w
2012-03-29 18:40:30 +05:30
Amit Patel (OpenERP)
acdc33fdb5
[MERGE]
...
bzr revid: apa@tinyerp.com-20120329130411-0ol0av33in71h6y1
2012-03-29 18:34:11 +05:30
Khushboo Bhatt (Open ERP)
6439f4cba7
[IMP]css
...
bzr revid: kbh@tinyerp.com-20120329130038-2phw98jzf4arxxsk
2012-03-29 18:30:38 +05:30
Khushboo Bhatt (Open ERP)
adbc6474a4
[IMP]css
...
bzr revid: kbh@tinyerp.com-20120329125527-8ljx3njrkjvdes8c
2012-03-29 18:25:27 +05:30
Amit Patel (OpenERP)