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
Raphael Collet
b0847416f7
[IMP] sale.config.settings: improve fields that manage contracts
...
bzr revid: rco@openerp.com-20120330123833-kadf4www18jh2etc
2012-03-30 14:38:33 +02:00
Quentin (OpenERP)
843d77e0e7
[MERGE] merged with main addons trunk
...
bzr revid: qdp-launchpad@openerp.com-20120330122848-3h9x1nuocdyufr7m
2012-03-30 14:28:48 +02:00
Amit Patel (OpenERP)
c3651820db
[IMP]
...
bzr revid: apa@tinyerp.com-20120330122029-gjnf3yz2za24n939
2012-03-30 17:50:29 +05:30
Raphael Collet
041f98c318
[IMP] sale.config.settings: improve field labels
...
bzr revid: rco@openerp.com-20120330122008-1ty32ufqi2hsrg8u
2012-03-30 14:20:08 +02:00
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
Raphael Collet
082abfaa44
[IMP] sale, purchase: remove option 'taxes' from config wizards
...
bzr revid: rco@openerp.com-20120330120730-dilz5owc82s3yrl0
2012-03-30 14:07:30 +02:00
Amit Patel (OpenERP)
53e1f2a427
[IMP]
...
bzr revid: apa@tinyerp.com-20120330120411-ddorwd83ocdb2qsw
2012-03-30 17:34:11 +05:30
Thibault Delavallée
97655cc8d2
[MERGE] Merged with branch holding need_action mechanism
...
bzr revid: tde@openerp.com-20120330120359-gd5gnuico0vshw0v
2012-03-30 14:03:59 +02:00
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
Divyesh Makwana (Open ERP)
d4989fa070
[IMP] Improved the view open from Products Return.
...
bzr revid: mdi@tinyerp.com-20120330114111-u63i8ppy803dkgxw
2012-03-30 17:11:11 +05:30
Amit Patel (OpenERP)
45a71c9c35
[IMP]
...
bzr revid: apa@tinyerp.com-20120330111440-fcrsgemdp53e8ocs
2012-03-30 16:44:40 +05:30
Mayur Maheshwari (OpenERP)
4c62cb2086
[IMP]stock: Improve filed name
...
bzr revid: mma@tinyerp.com-20120330111000-6kdvit7ycmtuuk84
2012-03-30 16:40:00 +05:30
Amit Patel (OpenERP)
da2e47979e
[IMP]
...
bzr revid: apa@tinyerp.com-20120330110214-gy1g9fwt03dydcoh
2012-03-30 16:32:14 +05:30
Turkesh Patel (Open ERP)
f8510eee62
[IMP] Improved code to show need action counter
...
bzr revid: tpa@tinyerp.com-20120330105731-ss03y3l4fi5mq3jd
2012-03-30 16:27:31 +05:30
Thibault Delavallée
f57efbb152
[FIX] Too long model description
...
bzr revid: tde@openerp.com-20120330104936-p2cnbtua1znie6et
2012-03-30 12:49:36 +02:00
Thibault Delavallée
07b943bbdf
[MERGE] Merged with main server
...
bzr revid: tde@openerp.com-20120330104453-ceto9uwwb0n206jk
2012-03-30 12:44:53 +02:00
Thibault Delavallée
c2e1b6a384
[DOC] Improved documentation.
...
bzr revid: tde@openerp.com-20120330104242-h68fy7zsnueaod9m
2012-03-30 12:42:42 +02:00
Thibault Delavallée
3d726e1d4d
[DOC] Improved comments
...
bzr revid: tde@openerp.com-20120330103822-3esas0shsvoidb90
2012-03-30 12:38:22 +02:00
Sbh (Openerp)
a5644ecc63
[Fix] account_payment: fix argument of function
...
bzr revid: sbh@tinyerp.com-20120330103351-0ca0ngffi3shbzav
2012-03-30 16:03:51 +05:30
Thibault Delavallée
94075df78e
[DOC] Added comments.
...
bzr revid: tde@openerp.com-20120330102419-n2co6dwf00q0muue
2012-03-30 12:24:19 +02:00
Thibault Delavallée
3ee9f70343
[IMP] Renamed added fields. Added comments and improved help.
...
bzr revid: tde@openerp.com-20120330101929-18opxctcz1eeyl4u
2012-03-30 12:19:29 +02:00
Thibault Delavallée
42587a56a6
[MERGE] Merged with web branch holding user image update in topbar
...
bzr revid: tde@openerp.com-20120330101036-5pnnu0wgp6n0aren
2012-03-30 12:10:36 +02:00
Thibault Delavallée
2f97bcdf7d
[FIX] Removed the store=True (too much access to DB), as this is not necessary. Fixed dict of dict: inner dict instantiation is done for each iteration, because argument management in python made all dicts pointers to the same dict
...
bzr revid: tde@openerp.com-20120330100337-miqra4q5sjokt7en
2012-03-30 12:03:37 +02:00
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
Sbh (Openerp)
26c3e813b2
[Fix]hr_timesheet: fix the onchange
...
bzr revid: sbh@tinyerp.com-20120330095117-lsknoidjybywrsyc
2012-03-30 15:21:17 +05:30
Sbh (Openerp)
7a97b9c519
[Fix]purchase: fix the obj name
...
bzr revid: sbh@tinyerp.com-20120330093033-t36u7zhnzrp1hht3
2012-03-30 15:00:33 +05:30
Amit Patel (OpenERP)
67255539f9
[IMP]
...
bzr revid: apa@tinyerp.com-20120330091603-c46u2zcdjiddpogq
2012-03-30 14:46:03 +05:30
Thibault Delavallée
6f3bec4d7f
[MERGE] Merged with main addons, notably now holding the user_img branch
...
bzr revid: tde@openerp.com-20120330091231-tuh26f0z67rzm2u2
2012-03-30 11:12:31 +02:00
Quentin (OpenERP)
ffd0c86ec2
[FIX] a lot of fixes in several modules, as the result of the code review of the merge of the objects res.partner and res.partner.address
...
bzr revid: qdp-launchpad@openerp.com-20120330090837-s87z2qzsvynhlbwr
2012-03-30 11:08:37 +02:00
Sbh (Openerp)
eb1986a7df
[MERGE] rename address_id into parnter_id
...
bzr revid: sbh@tinyerp.com-20120330085848-2gmfjgadftc1a4bq
2012-03-30 14:28:48 +05:30
Thibault Delavallée
9a550056dc
[MERGE] Merged with main server, updated with trunk-user_img-tde branch.
...
bzr revid: tde@openerp.com-20120330085400-evsp4n9roisw11ot
2012-03-30 10:54:00 +02:00
Sbh (Openerp)
b2e6ba9417
[IMP] : rename address_id with parnter_id
...
bzr revid: sbh@tinyerp.com-20120330084951-2wwcl6w6fybo6gnu
2012-03-30 14:19:51 +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
Sbh (Openerp)
41c3643ea8
[IMP] : rename address_id with parnter_id
...
bzr revid: sbh@tinyerp.com-20120330083106-fym82cu48lx7j34s
2012-03-30 14:01:06 +05:30
Amit Patel (OpenERP)
f9398e1384
[IMP]
...
bzr revid: apa@tinyerp.com-20120330082948-d0wl0n1f64j80lo3
2012-03-30 13:59:48 +05:30
Sbh (Openerp)
0a28fafb75
[IMP] : rename address_id with parnter_id
...
bzr revid: sbh@tinyerp.com-20120330082751-3dsfrym5vr1sv2r0
2012-03-30 13:57:51 +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
Sbh (Openerp)
102dc53831
[IMP] : rename address_id with parnter_id
...
bzr revid: sbh@tinyerp.com-20120330082254-ohrl90qe5cr0zolw
2012-03-30 13:52:54 +05:30
Amit Patel (OpenERP)