Commit Graph

1388 Commits

Author SHA1 Message Date
Vo Minh Thu 9822629548 [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
Rucha (Open ERP) 5fd7ad04c1 [REM]: hr: Removed duplicate employee and department from demo
bzr revid: rpa@tinyerp.com-20120813072738-temucs10vhcubepv
2012-08-13 12:57:38 +05:30
Rucha (Open ERP) dd7a2972d8 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120813051411-5no0xcudwbkw07c5
2012-08-13 10:44:11 +05:30
Antonin Bourguignon ee4fd16e94 [FIX] remove the option from the user_id fields
we want users to be openable !
also improve indentation and remove some useless whitespaces

bzr revid: abo@openerp.com-20120809163529-8adlpszt3n6lhszi
2012-08-09 18:35:29 +02:00
Antonin Bourguignon 24f6e09c45 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120809143919-qrn9nm5ut5vlm8hw
2012-08-09 16:39:19 +02:00
Twinkle Christian (OpenERP) 721adad01e [IMP]Remove type field from the whole hr module
bzr revid: tch@tinyerp.com-20120808124839-ecd1uic8mscg3s7f
2012-08-08 18:18:39 +05:30
Launchpad Translations on behalf of openerp e970ecd62c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120809050051-p6f437n80grsr5vz
2012-08-09 05:00:51 +00:00
Olivier Dony 3fd9a77c83 [REVERT] Cancel PO Template changes from rev.2702 - to be fully re-generated before next release
We'll also attempt to replace the master strings in the
translated .po files before replacing the master strings,
to avoid losing translations just because of mere typo fixes.

bzr revid: odo@openerp.com-20120808144613-wtz50tcz5n7kvcza
2012-08-08 16:46:13 +02:00
Rucha (Open ERP) 2347f44ab2 [FIX,IMP]: hr: Fixes and improvements for employee-user relation
bzr revid: rpa@tinyerp.com-20120808101305-dsqn337ngmcysm4z
2012-08-08 15:43:05 +05:30
Mayur Maheshwari (OpenERP) ff612f9d02 [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20120808094005-o7v0l6u15ide75za
2012-08-08 15:10:05 +05:30
Antonin Bourguignon 4388ace499 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120808091048-hr1r4vn9milozexf
2012-08-08 11:10:48 +02:00
Rucha (Open ERP) d597437dd7 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120808063503-ymsvwnerxakqbcbx
2012-08-08 12:05:03 +05:30
Fabien Pinckaers c6d06ad6df [IMP] small form improvements
bzr revid: fp@tinyerp.com-20120807171740-2ec2um8m9cpaduhn
2012-08-07 19:17:40 +02:00
Fabien Pinckaers f1ad3cfdee [IMP] employee view
bzr revid: fp@tinyerp.com-20120807162216-b1uemxzhcd9t2eto
2012-08-07 18:22:16 +02:00
Fabien Pinckaers c433498ef7 [IMP] config wizards, feedback from SAM's user testing
bzr revid: fp@tinyerp.com-20120807155552-eo88mb4ngysjd8n6
2012-08-07 17:55:52 +02:00
Antonin Bourguignon a97687a420 [MERGE] latest trunk
also replace the error message title 'Operation Not Permitted' by 'Invalid Action'

bzr revid: abo@openerp.com-20120807120451-zdrrecilfh82obhl
2012-08-07 14:04:51 +02:00
Thibault Delavallée 71d0000352 [REM] hr: removed a field that has probably been added by a copy-paste.
bzr revid: tde@openerp.com-20120807120300-l70tx73pobb4ofe1
2012-08-07 14:03:00 +02:00
Thibault Delavallée 023262e519 [IMP] product, hr, point of sale, mail_group: propagated function name change (now prefixed with image_) in image module.
bzr revid: tde@openerp.com-20120807111039-57cykhxurm2wj79k
2012-08-07 13:10:39 +02:00
Thibault Delavallée 6c4dda8441 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120807100920-mr0oc56qs2zntvu1
2012-08-07 12:09:20 +02:00
Launchpad Translations on behalf of openerp 3cfd65b43d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120807053928-8131c98edycpivlb
2012-08-07 05:39:28 +00:00
Thibault Delavallée c8c95d46f9 [IMP] product, hr, pos, mail_group: removed the onchange_image, updated used images and classes in views.
bzr revid: tde@openerp.com-20120806155354-sjkrmrffgb2ik4ba
2012-08-06 17:53:54 +02:00
Thibault Delavallée a814343ab7 [MERGE] Mergede with addons/trunk.
bzr revid: tde@openerp.com-20120806124445-hym9imdiqgeot8fu
2012-08-06 14:44:45 +02:00
Mayur Maheshwari (OpenERP) 7c51b1811d [FIX]all :set a no_open widget in this filed(country_id,state_id,title,context_id,timebox_id,user_id)
bzr revid: mma@tinyerp.com-20120806110307-nj7qipixr14puhub
2012-08-06 16:33:07 +05:30
pso (OpenERP) 389f8d6803 [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120806094234-1b145yrjixy5yrsg
2012-08-06 15:12:34 +05:30
Fabien Pinckaers 0869066f99 [IMP] improved modules message at installation --> to be reviewed later
bzr revid: fp@openerp.com-20120805201322-y8ghspcb69wmb3ut
2012-08-05 22:13:22 +02:00
Fabien Pinckaers 7aae117e84 [IMP] open right menu afte rmod installation
bzr revid: fp@openerp.com-20120804215742-x2xhzsm8agiv70w3
2012-08-04 23:57:42 +02:00
Fabien Pinckaers 7904580e60 [IMwP] open the right menu according to the installed application
bzr revid: fp@openerp.com-20120804215327-651jy6mn1w15x430
2012-08-04 23:53:27 +02:00
Fabien Pinckaers f601a5280f [IMP] removing unused ir.actions.todo.category object
bzr revid: fp@openerp.com-20120804203546-4fupnhxcvbub1kty
2012-08-04 22:35:46 +02:00
Fabien Pinckaers ea52cfae17 [IMP] introducing new file type: html
bzr revid: fp@openerp.com-20120804143556-457q040g6q30x3fu
2012-08-04 16:35:56 +02:00
Fabien Pinckaers b363b1f622 fix
bzr revid: fp@openerp.com-20120804135631-9qqfgcz9513qsyzp
2012-08-04 15:56:31 +02:00
Fabien Pinckaers 4e69bdd6fc [IMP] improved menu tips - 10 firsts clicks
bzr revid: fp@openerp.com-20120804132136-2b18cfkwv0njsglj
2012-08-04 15:21:36 +02:00
Antonin Bourguignon b12e606e18 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120803160951-4n7ckom9hyhgeio2
2012-08-03 18:09:51 +02:00
Antonin Bourguignon a8447abc9b [IMP] add proper XML headers to config views
bzr revid: abo@openerp.com-20120803131542-j37qwqb2wc7913k9
2012-08-03 15:15:42 +02:00
Thibault Delavallée 662e4944d9 [IMP] hr: image is not modified at display when choosing a new one; btu resized when saving. WIP, to be validated.
bzr revid: tde@openerp.com-20120803080357-s3kkjzm3n7cquvpf
2012-08-03 10:03:57 +02:00
Thibault Delavallée 8a408f2ff3 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120803071454-ictuwjq0y3gri4f8
2012-08-03 09:14:54 +02:00
Antonin Bourguignon ec5f2fe5d3 [FIX] several typos
rephrase some labels
fix capital letters
add missing spaces (mainly before parentheses)

bzr revid: abo@openerp.com-20120801154701-9jvsd9iyihx5phyn
2012-08-01 17:47:01 +02:00
pso (OpenERP) 773c2d5c63 [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120801064711-y90iik5ialfdnfft
2012-08-01 12:17:11 +05:30
Amit Patel (OpenERP) c5eae6dec7 [MERGE]:merged with trunk
bzr revid: apa@tinyerp.com-20120801054207-8cfqqna4wauzarkb
2012-08-01 11:12:07 +05:30
Antonin Bourguignon 8f1eb6a22c [IMP] set a normal font-weight for labels in config wizards
this CSS rule will only apply inside elements with the class "oe_form_configuration" (<elmt class="oe_form_configuration">)

bzr revid: abo@openerp.com-20120731163056-ctxf9z70joanxqez
2012-07-31 18:30:56 +02:00
Quentin (OpenERP) e1b50e304d [MEGUEZ] merged the clean search view branch
bzr revid: qdp-launchpad@openerp.com-20120731150358-jqd3eoz06imzlx01
2012-07-31 17:03:58 +02:00
Sanjay Gohel (Open ERP) 9378a11f02 [IMP]improve button name
bzr revid: sgo@tinyerp.com-20120731122125-lhr1qb3m2gd1c7bd
2012-07-31 17:51:25 +05:30
Sanjay Gohel (Open ERP) 7b29dc344a [IMP]improve hr view as per suggestion
bzr revid: sgo@tinyerp.com-20120731113042-ok4399xaxl0gzqvz
2012-07-31 17:00:42 +05:30
Twinkle Christian (OpenERP) cb1c6c08af [IMP]Improve search view in all modules
bzr revid: tch@tinyerp.com-20120731112804-a0akxtqr1z0uew6w
2012-07-31 16:58:04 +05:30
Antonin Bourguignon eb680a9a5b [MERGE] latest trunk
bzr revid: abo@openerp.com-20120731092318-ik7zu8lqpq299885
2012-07-31 11:23:18 +02:00
Amit Patel (OpenERP) 02ad31ff37 [MERGE]:hr config
bzr revid: apa@tinyerp.com-20120731065916-xrrwten6evmt3nbs
2012-07-31 12:29:16 +05:30
Randhir Mayatra (OpenERP) b48531d1da [MARGE] improvement in human resources wizard
bzr revid: rma@tinyerp.com-20120731061444-q5rec5genetc5ztg
2012-07-31 11:44:44 +05:30
Sanjay Gohel (Open ERP) 9c63ddb992 [MERGE]merge with trunk
bzr revid: sgo@tinyerp.com-20120731054300-j6ax39hs18svscgz
2012-07-31 11:13:00 +05:30
Thibault Delavallée febdd29d76 [MOV] hr: hr.png now icon.png, to be used in module kanban view.
bzr revid: tde@openerp.com-20120730141034-nyb8qcixcd72rdja
2012-07-30 16:10:34 +02:00
Thibault Delavallée a3820b4090 [IMP] hr: changed default user image and moved it (better image, and placed in static/src/img, better name).
bzr revid: tde@openerp.com-20120730141017-vn8s0ny3y022hd1c
2012-07-30 16:10:17 +02:00
Thibault Delavallée 81f6d43ee4 [CLEAN] images: cleaned typos.
bzr revid: tde@openerp.com-20120730133343-f1jofji7bl9u09zp
2012-07-30 15:33:43 +02:00