Quentin (OpenERP)
16c02d8a2c
[MERGE] merged the branch that merges res.partner and res.partner.address objects
...
bzr revid: qdp-launchpad@openerp.com-20120330142501-vy7bsoxosrd606fr
2012-03-30 16:25:01 +02:00
Quentin (OpenERP)
144c463286
[MERGE] merged the branch that merges res.partner and res.partner.address objects
...
bzr revid: qdp-launchpad@openerp.com-20120330142429-bcdxfa4q6g7fsgbs
2012-03-30 16:24:29 +02:00
Raphael Collet
1aad2cd28d
[IMP] sale.config.settings: remove field module_base_contact
...
bzr revid: rco@openerp.com-20120330135757-4io21k8kizrpifl1
2012-03-30 15:57:57 +02:00
Raphael Collet
d56385b55f
[IMP] sale.config.settings: show the 'Emails' section only when crm is installed
...
bzr revid: rco@openerp.com-20120330135546-jnmi8nbdmdg42rt7
2012-03-30 15:55:46 +02:00
Olivier Dony
fd14556b8c
[MERGE] Latest trunk
...
bzr revid: odo@openerp.com-20120330135404-kio6nx50o2mzfmsy
2012-03-30 15:54:04 +02:00
Thibault Delavallée
7de9d2f52d
[MERGE] Merged with needaction branch
...
bzr revid: tde@openerp.com-20120330134244-hhtt90g9mgcs3iec
2012-03-30 15:42:44 +02:00
Thibault Delavallée
e4f218e995
[MERGE] Merged with last fixes from needaction web branch
...
bzr revid: tde@openerp.com-20120330120444-dl20z565akpdqgtu
bzr revid: tde@openerp.com-20120330134115-re34u23tko7b8d9f
2012-03-30 15:41:15 +02:00
Quentin (OpenERP)
5033b51973
[MERGE] merged with main trunk server
...
bzr revid: qdp-launchpad@openerp.com-20120330133250-o256z107s1hf8n8u
2012-03-30 15:32:50 +02:00
Thibault Delavallée
0f09c8eb91
[REF] Refactoring: moved from base to ir; renamed from base.needaction->ir.needaction; updated files accordingly
...
bzr revid: tde@openerp.com-20120330132452-ww57gzp8ggx1pfj2
2012-03-30 15:24:52 +02:00
Thibault Delavallée
519ebfdd49
[FIX] removed a '+' that probably came from outerspace
...
bzr revid: tde@openerp.com-20120330130232-u61vt96fl23ss69z
2012-03-30 15:02:32 +02:00
Thibault Delavallée
a3a5ea21ed
[IMP] Propagated ir.ui.menu new fields name change.
...
bzr revid: tde@openerp.com-20120330125928-ku9oqpb0pq4ehu6m
2012-03-30 14:59:28 +02:00
Thibault Delavallée
508d257bcf
[IMP] Renamed ir.ui.menu fields, uses_needaction -> needaction_enabled; needaction_uid_ctr -> needaction_counter
...
bzr revid: tde@openerp.com-20120330125900-0jtpztxk336ugae0
2012-03-30 14:59:00 +02:00
Quentin (OpenERP)
50bf6e4be6
[FIX] hr_timesheet_invoice: put back the onchange on partner_id
...
bzr revid: qdp-launchpad@openerp.com-20120330125702-bh1m2tfg3sdf4x3h
2012-03-30 14:57:02 +02:00
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
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
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
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
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
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
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
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
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
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
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
Sbh (Openerp)
d494230c87
[IMP] : rename address_id with parnter_id
...
bzr revid: sbh@tinyerp.com-20120330081136-gyllf3gx180clebd
2012-03-30 13:41:36 +05:30
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
Sbh (Openerp)
1078da6717
[IMP] purchase: rename address_id with parnter_id
...
bzr revid: sbh@tinyerp.com-20120330075638-81vq3papia6hitwu
2012-03-30 13:26:38 +05:30
Thibault Delavallée
2182f54fea
[IMP] user avatar: added user avatar in topbar
...
bzr revid: tde@openerp.com-20120330075317-n2q5qivu2rlnaeb8
2012-03-30 09:53:17 +02:00
Sbh (Openerp)
deedfe2034
[IMP] sale: rename address_id with parnter_id
...
bzr revid: sbh@tinyerp.com-20120330075032-wmbw3kv21h44u60i
2012-03-30 13:20:32 +05:30
Sbh (Openerp)
9460dd0b02
[IMP] stock: rename address_id with parnter_id
...
bzr revid: sbh@tinyerp.com-20120330074901-kawagjxlvwfnqx06
2012-03-30 13:19:01 +05:30
Thibault Delavallée
6a029d69f4
[MERGE] Merged with main server
...
bzr revid: tde@openerp.com-20120330073008-x3i7dsprvmjnsjmp
2012-03-30 09:30:08 +02:00
Thibault Delavallée
fe1631cac3
[MERGE] Merged with main addons
...
bzr revid: tde@openerp.com-20120330072911-yf0azg7a6x2251ow
2012-03-30 09:29:11 +02:00
Quentin (OpenERP)