Raphael Collet [Wed, 12 Sep 2012 09:28:26 +0000 (11:28 +0200)]
[IMP] mrp: make some fields on mrp.production readonly except in draft state
bzr revid: rco@openerp.com-
20120912092826-qfnhzzj5jgte474j
Raphael Collet [Tue, 11 Sep 2012 14:51:12 +0000 (16:51 +0200)]
[IMP] mrp: change deprecated '<>' operator to '!='
bzr revid: rco@openerp.com-
20120911145112-4ansycxt1o15b8fd
Jigar Amin - OpenERP [Tue, 11 Sep 2012 04:38:05 +0000 (10:08 +0530)]
Merge lp:openobject-addons
bzr revid: jam@tinyerp.com-
20120911043805-vi6x6xzlof65ejyw
Fabien Pinckaers [Mon, 10 Sep 2012 22:10:08 +0000 (00:10 +0200)]
fix
bzr revid: fp@tinyerp.com-
20120910221008-ri59mrpp269c6ia0
Fabien Pinckaers [Mon, 10 Sep 2012 22:07:26 +0000 (00:07 +0200)]
[IMP] demo data applicants
bzr revid: fp@tinyerp.com-
20120910220726-luv89p96xhuwi6e4
Fabien Pinckaers [Mon, 10 Sep 2012 21:58:41 +0000 (23:58 +0200)]
[IMP] colors in survey
bzr revid: fp@tinyerp.com-
20120910215841-upatvq46bx1b6k91
Fabien Pinckaers [Mon, 10 Sep 2012 21:55:16 +0000 (23:55 +0200)]
[IMP] Survey forms
bzr revid: fp@tinyerp.com-
20120910215516-8pbknwyk0ifeoku9
Fabien Pinckaers [Mon, 10 Sep 2012 20:38:12 +0000 (22:38 +0200)]
[IMP] survey layouts
bzr revid: fp@openerp.com-
20120910203812-9um0kgso8598t6jr
Fabien Pinckaers [Mon, 10 Sep 2012 20:14:08 +0000 (22:14 +0200)]
[MERGE] muti-currency group
bzr revid: fp@openerp.com-
20120910201408-paf7q0cj22i72k2n
Antonin Bourguignon [Mon, 10 Sep 2012 17:26:52 +0000 (19:26 +0200)]
[MERGE] trunk-bug-1024626-amp, portal url (char does not need size anymore)
lp bug: https://launchpad.net/bugs/1024626 fixed
bzr revid: abo@openerp.com-
20120910172652-0u9xkwk060pyplyp
Antonin Bourguignon [Mon, 10 Sep 2012 17:06:07 +0000 (19:06 +0200)]
[MERGE] trunk-bug-1041129-mdi, product list view missing column for group by
lp bug: https://launchpad.net/bugs/1041129 fixed
bzr revid: abo@openerp.com-
20120910170607-j7oywwya1d7bigd8
Antonin Bourguignon [Mon, 10 Sep 2012 17:02:02 +0000 (19:02 +0200)]
[MERGE] trunk-bug-988165-amp, hr departement copy
lp bug: https://launchpad.net/bugs/988165 fixed
bzr revid: abo@openerp.com-
20120910170202-tf7qrdusu86dbs1m
Antonin Bourguignon [Mon, 10 Sep 2012 16:35:01 +0000 (18:35 +0200)]
[MERGE] trunk
bzr revid: abo@openerp.com-
20120910163501-sro6hn6xvz4h244l
Olivier Dony [Mon, 10 Sep 2012 15:21:13 +0000 (17:21 +0200)]
[MERGE] Simplified report footer configuration per company (addons part, main work was in corresponding server branch)
bzr revid: odo@openerp.com-
20120910152113-b2tiw8d9gc19dr17
Olivier Dony [Mon, 10 Sep 2012 15:18:12 +0000 (17:18 +0200)]
[MERGE] Simplified report footer configuration per company - comes with corresponding addons branch
bzr revid: odo@openerp.com-
20120910151812-yb13t3pykirbrx7c
Olivier Dony [Mon, 10 Sep 2012 15:07:10 +0000 (17:07 +0200)]
[IMP] res.company: add tooltip for footer field + hide `auto` button in read-only mode
bzr revid: odo@openerp.com-
20120910150710-rqflowp3leu3lvn1
Olivier Dony [Mon, 10 Sep 2012 14:42:32 +0000 (16:42 +0200)]
[IMP] res.company: waste slightly less vertical space between bottom `horizontal rule` and footer content
bzr revid: odo@openerp.com-
20120910144232-61kywu125umwk7al
Olivier Dony [Mon, 10 Sep 2012 14:35:28 +0000 (16:35 +0200)]
[FIX] res.company: make write() override support cases where ids is a single id (the usual dumb boilerplate code)
bzr revid: odo@openerp.com-
20120910143528-g8dbt0l2rg2oq9sm
Olivier Dony [Mon, 10 Sep 2012 14:17:29 +0000 (16:17 +0200)]
[IMP] res.company: support true multiline report footer using RML <place> and <para>
bzr revid: odo@openerp.com-
20120910141729-22sk7ca5himljqni
niv-openerp [Mon, 10 Sep 2012 13:57:47 +0000 (15:57 +0200)]
[IMP] added arguments to widget html
bzr revid: nicolas.vanhoren@openerp.com-
20120910135747-azld1lovg6d7w23c
niv-openerp [Mon, 10 Sep 2012 13:57:08 +0000 (15:57 +0200)]
[IMP] added arguments to widget html usage
bzr revid: nicolas.vanhoren@openerp.com-
20120910135708-6wq2v7iet7i11624
Raphael Collet [Mon, 10 Sep 2012 13:45:33 +0000 (15:45 +0200)]
[IMP] res_company: compute footer in create/write (because it calls name_get on bank accounts)
bzr revid: rco@openerp.com-
20120910134533-xeqor09qld1rzqnx
Raphael Collet [Mon, 10 Sep 2012 12:56:16 +0000 (14:56 +0200)]
[MERGE] from trunk
bzr revid: rco@openerp.com-
20120910125616-9j8nj0spxr2wt83l
Raphael Collet [Mon, 10 Sep 2012 12:55:41 +0000 (14:55 +0200)]
[MERGE] from trunk
bzr revid: rco@openerp.com-
20120910125541-cnmz69n79ucviqe2
Stephane Wirtel [Mon, 10 Sep 2012 12:21:58 +0000 (14:21 +0200)]
[MERGE] account & sale_margin: fix somes bugs in the due date, check_total
bzr revid: stw@openerp.com-
20120910122158-cdpjuw0kq2s0dmsi
niv-openerp [Mon, 10 Sep 2012 12:10:46 +0000 (14:10 +0200)]
removed tags
bzr revid: nicolas.vanhoren@openerp.com-
20120910121046-kw91yopxo3ot0bf2
Fabien Meghazi [Mon, 10 Sep 2012 11:57:12 +0000 (13:57 +0200)]
[IMP] Improve the previous improvement
bzr revid: fme@openerp.com-
20120910115712-hdfs29wi8use3659
Fabien Meghazi [Mon, 10 Sep 2012 11:56:20 +0000 (13:56 +0200)]
[IMP] Improved kanban dropdown styling
bzr revid: fme@openerp.com-
20120910115620-o05fm0nw743ax1vt
Fabien Meghazi [Mon, 10 Sep 2012 11:51:38 +0000 (13:51 +0200)]
[FIX] Fixed dashboard layout selector styling
bzr revid: fme@openerp.com-
20120910115138-wy8w2exdi18jb489
Xavier Morel [Mon, 10 Sep 2012 11:48:46 +0000 (13:48 +0200)]
[IMP] better fixup to font mime types
bzr revid: xmo@openerp.com-
20120910114846-tkfvhoxbbqtn842g
Jigar Amin - OpenERP [Mon, 10 Sep 2012 11:13:59 +0000 (16:43 +0530)]
[FIX] Update the group of the stock locations on field prodlot
bzr revid: jam@tinyerp.com-
20120910111359-2odv1fq5bj6wpr46
Xavier Morel [Mon, 10 Sep 2012 10:51:29 +0000 (12:51 +0200)]
[FIX] integrate web tests into buildbot runner, fix broken tests
* Remove deprecated tests and dead code
* Fix usage of mock
* Moar fixes
bzr revid: xmo@openerp.com-
20120910105129-rxh3jqwkewh65rl3
Stephane Wirtel [Mon, 10 Sep 2012 10:37:47 +0000 (12:37 +0200)]
[MERGE] account: Fix a typo in the variable name
bzr revid: stw@openerp.com-
20120910103747-f2ar7jj4w8az2dya
Stephane Wirtel [Mon, 10 Sep 2012 10:34:38 +0000 (12:34 +0200)]
[MERGE] account: the due date and the check_total are not in readonly mode when the status of the invoice is draft
bzr revid: stw@openerp.com-
20120910103438-oy23hddp43h3e9ju
Stephane Wirtel [Mon, 10 Sep 2012 10:27:26 +0000 (12:27 +0200)]
[MERGE] sale_margin: fix a call to super
bzr revid: stw@openerp.com-
20120910102726-2j75q19epdk4k2od
niv-openerp [Mon, 10 Sep 2012 10:24:03 +0000 (12:24 +0200)]
[FIX] problem with mime types of fonts
bzr revid: nicolas.vanhoren@openerp.com-
20120910102403-qiazec8parg0i5gy
Stephane Wirtel [Mon, 10 Sep 2012 10:17:53 +0000 (12:17 +0200)]
[MERGE] point_of_sale: If there is no journal on the pos.config, use the cash journals by default
bzr revid: stw@openerp.com-
20120910101753-dq31cki2hm5wcehh
niv-openerp [Mon, 10 Sep 2012 10:01:52 +0000 (12:01 +0200)]
[FIX] hr_attendance: minor javascript bug
bzr revid: nicolas.vanhoren@openerp.com-
20120910100152-eru3fdxalv4lhqek
Jigar Amin - OpenERP [Mon, 10 Sep 2012 09:51:04 +0000 (15:21 +0530)]
[FIX] removed not needed states condition
bzr revid: jam@tinyerp.com-
20120910095104-sb0uco3gwzcr1vo3
Fabien Meghazi [Mon, 10 Sep 2012 09:31:52 +0000 (11:31 +0200)]
[REM] Dashboard: Removed creatable option (requested by fp)
bzr revid: fme@openerp.com-
20120910093152-r14olqa181obp7f2
Fabien Meghazi [Mon, 10 Sep 2012 09:28:02 +0000 (11:28 +0200)]
[FIX] Fix dashboard listview row click. Add support for kanban card click
bzr revid: fme@openerp.com-
20120910092802-k15c57p9371946ft
Thibault Delavallée [Mon, 10 Sep 2012 09:16:21 +0000 (11:16 +0200)]
[MERGE] Post 'mail-cleaning-fp merge' fixes
- fixed wrong parameters and var names changed during refactoring
- basically fixed message_post calling message_fetch with weird values; however, the reload will be fixed in another branch
- fixed related record links
- fixed Chatter on a document not using message_ids field value
- removed dead CSS code
- pre is now displayed using the usual OpenERP fonts
- fixed issue with user avatars
- res_users: added a hook so that already existing users follow themselves when installing Social
- fixed security rule based on follower_ids, that is now message_follower_ids
bzr revid: tde@openerp.com-
20120910091621-v4n2el4qz2de49d5
Stephane Wirtel [Mon, 10 Sep 2012 09:16:18 +0000 (11:16 +0200)]
[IMP] point_of_sale: If there is no journals for the pos.config, select the cash journals
bzr revid: stw@openerp.com-
20120910091618-nzv26m258xx64na5
Thibault Delavallée [Mon, 10 Sep 2012 08:36:24 +0000 (10:36 +0200)]
[FIX] mail.js: RecordThread now really using message_ids field.
bzr revid: tde@openerp.com-
20120910083624-wjdaqruoe42x33cq
Thibault Delavallée [Mon, 10 Sep 2012 08:32:00 +0000 (10:32 +0200)]
[FIX] mail.js: fixed links to related record in chatter, model and res_id were incorrect.
bzr revid: tde@openerp.com-
20120910083200-iqq5m9l1jxghfpr9
Thibault Delavallée [Mon, 10 Sep 2012 08:31:35 +0000 (10:31 +0200)]
[CLEAN] mail/res_users: cleaned comment in auto_init.
bzr revid: tde@openerp.com-
20120910083135-2tef7mn01kujtyvj
Thibault Delavallée [Mon, 10 Sep 2012 08:23:43 +0000 (10:23 +0200)]
[MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-
20120910082343-h272lkcl5tayi532
Thibault Delavallée [Mon, 10 Sep 2012 07:58:50 +0000 (09:58 +0200)]
[FIX] Project: fixed a security rule based on follower_ids, that is now message_follower_ids.
bzr revid: tde@openerp.com-
20120910075850-0b5sg1vljcc8gba9
Thibault Delavallée [Mon, 10 Sep 2012 07:49:46 +0000 (09:49 +0200)]
[MERGE] Small image cleaning
- propagated size change in image fields helps
- small cleaning of image fiels helps
- product: image_medium is not up-sized anymore, to avoid having a blank frame in POS
bzr revid: tde@openerp.com-
20120910074946-g00av41l3jr4s6f7
Thibault Delavallée [Mon, 10 Sep 2012 07:49:31 +0000 (09:49 +0200)]
[MERGE] Small image cleaning
- moved the avatar colorize part of the image code to tools/image.py, where it should have been placed at revs 4373-4375
- added the option for not up-sizing image smaller than the resize limits
- default image_small size is now 64x64 px
- default image_medium size is now 128x128 px
- overall code and comments cleaning
bzr revid: tde@openerp.com-
20120910074931-b7cqu46r9xx7obmm
Jigar Amin - OpenERP [Mon, 10 Sep 2012 07:42:58 +0000 (13:12 +0530)]
Merge lp:~openerp-dev/openobject-addons/trunk-addons7-update-aja
bzr revid: jam@tinyerp.com-
20120910074258-mg2tcxqdmclldo8o
Thibault Delavallée [Mon, 10 Sep 2012 07:29:57 +0000 (09:29 +0200)]
[MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-
20120910072957-jbu0w3rpr4stm3sf
Thibault Delavallée [Mon, 10 Sep 2012 07:18:45 +0000 (09:18 +0200)]
[MERGE] Merged withi addons/trunk.
bzr revid: tde@openerp.com-
20120910071845-2dioy0buibv55np5
Thibault Delavallée [Mon, 10 Sep 2012 07:18:29 +0000 (09:18 +0200)]
[MERGE] Merged with server/trunk.
bzr revid: tde@openerp.com-
20120910071829-8zyem0ix32m6u4n1
ajay javiya (OpenERP) [Mon, 10 Sep 2012 06:14:09 +0000 (11:44 +0530)]
[IMP]: Improve fields readonly-ness in mrp
bzr revid: aja@tinyerp.com-
20120910061409-g3ue25pqomfech3m
ajay javiya (OpenERP) [Mon, 10 Sep 2012 05:21:21 +0000 (10:51 +0530)]
[IMP]: Improve readonly-ness of field
bzr revid: aja@tinyerp.com-
20120910052121-73o2wk7v8yb0ydzd
ajay javiya (OpenERP) [Mon, 10 Sep 2012 04:58:47 +0000 (10:28 +0530)]
[MERGE]:Merge with main branch
bzr revid: aja@tinyerp.com-
20120910045847-f4fylwf3i4fshv6m
Launchpad Translations on behalf of openerp [Mon, 10 Sep 2012 04:41:18 +0000 (04:41 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120910044118-l9r2knhxlwtgg4eh
Jigar Amin - OpenERP [Mon, 10 Sep 2012 04:17:26 +0000 (09:47 +0530)]
Merge lp:openobject-addons
bzr revid: jam@tinyerp.com-
20120910041726-jmjdogjyn0dcv1ts
Antony Lesuisse [Sun, 9 Sep 2012 10:43:40 +0000 (12:43 +0200)]
[FIX] document_page wiki
bzr revid: al@openerp.com-
20120909104340-z4c85dcq6s11v83y
Launchpad Translations on behalf of openerp [Sun, 9 Sep 2012 04:53:00 +0000 (04:53 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120908045428-bfzum7jcffa1r8rd
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120909045300-ks25sg9ymy0igkrw
Thibault Delavallée [Fri, 7 Sep 2012 16:08:41 +0000 (18:08 +0200)]
[FIX] mail: res_users: fixed the previous hook, done directly in SQL, to avoid doing sunversive things in _auto_init.
bzr revid: tde@openerp.com-
20120907160841-f5ej19t7cdml10pr
Thibault Delavallée [Fri, 7 Sep 2012 15:17:19 +0000 (17:17 +0200)]
[FIX] mail.js: fixed issue with user avatars.
bzr revid: tde@openerp.com-
20120907151719-suopvkfbyzbb06ig
Raphael Collet [Fri, 7 Sep 2012 15:10:16 +0000 (17:10 +0200)]
[IMP] orm: simplify method definition
bzr revid: rco@openerp.com-
20120907151016-fj7l6nt6uffxmdgh
Thibault Delavallée [Fri, 7 Sep 2012 15:08:20 +0000 (17:08 +0200)]
[IMP] mail: css: removed dead CSS code; pre is now displayed using the regular fonts.
bzr revid: tde@openerp.com-
20120907150820-kw3c5vj99mcpffzg
Thibault Delavallée [Fri, 7 Sep 2012 15:06:29 +0000 (17:06 +0200)]
[IMP] mail: res_users: added a hook so that already existing users follow themselves when installing Social.
bzr revid: tde@openerp.com-
20120907150629-tme3hyijuzohy0r4
Raphael Collet [Fri, 7 Sep 2012 15:05:34 +0000 (17:05 +0200)]
[MERGE] from trunk
bzr revid: rco@openerp.com-
20120907150534-eyj92gtq40c83e3v
Raphael Collet [Fri, 7 Sep 2012 14:43:15 +0000 (16:43 +0200)]
[DUMMY] spaces
bzr revid: rco@openerp.com-
20120907144315-4hg1u16ineujjupp
Thibault Delavallée [Fri, 7 Sep 2012 14:40:13 +0000 (16:40 +0200)]
[FIX] mail.js: fixed wrong res_id passed into subthreads; fixed message_post using a wrong dataset; fixed message_post calling message_fetch after posting with a proxy that gave default values, use a then without args instead.
bzr revid: tde@openerp.com-
20120907144013-k7dfq1otoykuth96
niv-openerp [Fri, 7 Sep 2012 14:31:09 +0000 (16:31 +0200)]
[IMP] hr_attendance: more visual improvements
bzr revid: nicolas.vanhoren@openerp.com-
20120907143109-n7dw17g6ogtk2grj
niv-openerp [Fri, 7 Sep 2012 14:30:44 +0000 (16:30 +0200)]
[IMP] hr_attendance: visual improvements
bzr revid: nicolas.vanhoren@openerp.com-
20120907143044-czya93nj76yx2ofg
Raphael Collet [Fri, 7 Sep 2012 14:19:35 +0000 (16:19 +0200)]
[IMP] rml footer: small fixes in view and report template
bzr revid: rco@openerp.com-
20120907141935-gvy69gr2ms7avf3m
Fabien Pinckaers [Fri, 7 Sep 2012 13:55:38 +0000 (15:55 +0200)]
[MERGE] employee form view
bzr revid: fp@tinyerp.com-
20120907135538-pvr31vip94l7n5jc
Fabien Pinckaers [Fri, 7 Sep 2012 13:42:29 +0000 (15:42 +0200)]
[MERGE] currency from company
bzr revid: fp@tinyerp.com-
20120907134229-oblfauk8y435nwhz
Fabien Pinckaers [Fri, 7 Sep 2012 13:40:10 +0000 (15:40 +0200)]
[MERGE] currency
bzr revid: fp@tinyerp.com-
20120907134010-rql25x6eoj6svoc8
Raphael Collet [Fri, 7 Sep 2012 12:28:57 +0000 (14:28 +0200)]
[FIX] method resolve_2many_commands and its tests
bzr revid: rco@openerp.com-
20120907122857-4dro8up51ypx0cr5
niv-openerp [Fri, 7 Sep 2012 12:23:37 +0000 (14:23 +0200)]
[IMP] changed tooltip
bzr revid: nicolas.vanhoren@openerp.com-
20120907122337-pb8pia5e753zzi32
niv-openerp [Fri, 7 Sep 2012 11:51:20 +0000 (13:51 +0200)]
[IMP] hr_attendance: Changed style of sign in/sign out
bzr revid: nicolas.vanhoren@openerp.com-
20120907115120-dg8xn97oh9pek7k5
Amit Patel (OpenERP) [Fri, 7 Sep 2012 11:27:45 +0000 (16:57 +0530)]
[IMP]:typo
bzr revid: apa@tinyerp.com-
20120907112745-w5usrzo3lrtqeglv
Raphael Collet [Fri, 7 Sep 2012 10:44:48 +0000 (12:44 +0200)]
[FIX] orm: adapt tests of method resolve_2many_commands
bzr revid: rco@openerp.com-
20120907104448-9b9aeenmqz5m5du2
Raphael Collet [Fri, 7 Sep 2012 10:17:07 +0000 (12:17 +0200)]
[IMP] res_company: make report flag on bank accounts visible only from the company form
bzr revid: rco@openerp.com-
20120907101707-f2jiszy90yojbihf
Raphael Collet [Fri, 7 Sep 2012 10:00:30 +0000 (12:00 +0200)]
[IMP] company rml template: add greyed 'produced by OpenERP' in the left margin
bzr revid: rco@openerp.com-
20120907100030-1ss6k27t7vrncntb
Thibault Delavallée [Fri, 7 Sep 2012 09:51:55 +0000 (11:51 +0200)]
[IMP] mail_group, point of sale, hr: updated image fields help, as small and medium sizes are now 64x64 ans 128x128, to match more closely OpenERP image sizes. product: image_medium are not up-sized when resizing them. This means that images smaller than 128x128 won't be resized in image_medium. The purpose is to avoid having unwanted blank frame around images in POS.
bzr revid: tde@openerp.com-
20120907095155-i5hlmidnkq7r2r7b
Thibault Delavallée [Fri, 7 Sep 2012 09:49:57 +0000 (11:49 +0200)]
[IMP] tools: image: added the option to choose whether to upsize or not images when resizing them. Also cleaned a bit the comments and overall code. small and medium images are nos 64x64 ans 128x128, to be closer to iamge sized used through OpenERP.
bzr revid: tde@openerp.com-
20120907094957-clozwgu5qd3jh42h
Raphael Collet [Fri, 7 Sep 2012 09:36:43 +0000 (11:36 +0200)]
[FIX] res_company: fix method _get_rml_footer_by_line when rml_footer is empty
bzr revid: rco@openerp.com-
20120907093643-wec8s0wvmvc68rj4
Raphael Collet [Fri, 7 Sep 2012 09:33:37 +0000 (11:33 +0200)]
[FIX] orm: fix wrong method name
bzr revid: rco@openerp.com-
20120907093337-jvg72kp572dj110z
Thibault Delavallée [Fri, 7 Sep 2012 09:23:33 +0000 (11:23 +0200)]
[CLEAN] mail_group, product, point_of_sale, hr: cleaned help of image, because it was too technical-related. Added a comment in code instead about PIL and base64. By the way, small cleaning of the white spaces.
bzr revid: tde@openerp.com-
20120907092333-9f745210yr3p22ay
Thibault Delavallée [Fri, 7 Sep 2012 09:22:06 +0000 (11:22 +0200)]
[IMP] res_partner: moved the avatar colorize part of the image code to tools/image.py, where it should have been placed at revs 4373-4375.
bzr revid: tde@openerp.com-
20120907092206-1pgbcvt8tn23m114
Amit Patel (OpenERP) [Fri, 7 Sep 2012 08:47:36 +0000 (14:17 +0530)]
[IMP]:indentation
bzr revid: apa@tinyerp.com-
20120907084736-a5tctj9nnn8og1u5
niv-openerp [Fri, 7 Sep 2012 08:44:38 +0000 (10:44 +0200)]
[MERGE] hr_attendance: removed some wizard and added widget to sign in/sign out
bzr revid: nicolas.vanhoren@openerp.com-
20120907084438-bnxmscn1zt8u0aex
Amit Patel (OpenERP) [Fri, 7 Sep 2012 08:43:10 +0000 (14:13 +0530)]
[IMP]:improved code
bzr revid: apa@tinyerp.com-
20120907084310-nl68lqrpf7exzjls
Thibault Delavallée [Fri, 7 Sep 2012 07:59:22 +0000 (09:59 +0200)]
[MERGE] Merged with server/trunk.
bzr revid: tde@openerp.com-
20120907075922-kqd5q0u0couhbnas
Amit Patel (OpenERP) [Fri, 7 Sep 2012 07:36:48 +0000 (13:06 +0530)]
[MERGE/IMP]:portal_event:improved view and merged with trunk
bzr revid: apa@tinyerp.com-
20120907073648-z4pfduxmzh6gzn11
Antony Lesuisse [Fri, 7 Sep 2012 07:29:49 +0000 (09:29 +0200)]
[FIX] crm kanban
bzr revid: al@openerp.com-
20120907072949-vt87yih1mo1voazb
Amit Patel (OpenERP) [Fri, 7 Sep 2012 07:14:19 +0000 (12:44 +0530)]
[MERGE]:merged blocking point related hr view
bzr revid: apa@tinyerp.com-
20120907071419-yw37hc1f4r3259ha
Sanjay Gohel (Open ERP) [Fri, 7 Sep 2012 06:32:20 +0000 (12:02 +0530)]
[MERGE][IMP]merge with parent branch and change in employee form view as per suggestion
bzr revid: sgo@tinyerp.com-
20120907063220-2cu64hfk0rq8vwyh
Amit Patel (OpenERP) [Fri, 7 Sep 2012 05:14:57 +0000 (10:44 +0530)]
[MERGE]:trunk
bzr revid: apa@tinyerp.com-
20120907051457-30yc63nfla1vvwm1
Launchpad Translations on behalf of openerp [Fri, 7 Sep 2012 05:05:24 +0000 (05:05 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120907045929-grtx16xxp1c4m6rh
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120907050524-07x2fgbr194czqbs
Launchpad Translations on behalf of openerp [Fri, 7 Sep 2012 04:55:53 +0000 (04:55 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120907045553-mg1y2dezmwei1mqx
Antony Lesuisse [Thu, 6 Sep 2012 22:41:23 +0000 (00:41 +0200)]
[MERGE] process view (manual merge, moved the code from web_process)
bzr revid: al@openerp.com-
20120906224123-walwe4rc3x4wycsc