git.inspyration.org Git - odoo/odoo.git/log

projects / odoo / odoo.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Amit Patel (OpenERP) [Mon, 23 Jul 2012 05:09:02 +0000 (10:39 +0530)]

[MERGE]

bzr revid: apa@tinyerp.com-20120723050902-rdyc4vajv36lcbi8

commit | commitdiff | tree

Launchpad Translations on behalf of openerp [Tue, 24 Jul 2012 04:52:30 +0000 (04:52 +0000)]

Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120722044557-vi2dy3u2aq5y09v7
bzr revid: launchpad_translations_on_behalf_of_openerp-20120723051751-qjxz39bz1gs3fi6f
bzr revid: launchpad_translations_on_behalf_of_openerp-20120724045230-9oi8x0xfvobpqjab

commit | commitdiff | tree

Antony Lesuisse [Mon, 23 Jul 2012 17:43:41 +0000 (19:43 +0200)]

[MERGE] overlay editable list a la rache

bzr revid: al@openerp.com-20120723174341-byh5ep8pg15kpeg9

commit | commitdiff | tree

Antony Lesuisse [Mon, 23 Jul 2012 17:34:50 +0000 (19:34 +0200)]

[MERGE] trunk

bzr revid: al@openerp.com-20120723173450-2yxayvyoiiiw9tcw

commit | commitdiff | tree

Olivier Dony [Mon, 23 Jul 2012 17:22:29 +0000 (19:22 +0200)]

[MERGE] orm,fields: fields.char's argument now all optional (especially @size) + minor cleanup

The size limit on fields.char is entirely cosmetics,
as it makes no difference in performance or size for
PostgreSQL storage. The size only has to be specified
when the field needs to be size-constrained for
business reasons, like fixed-length references, EAN, etc.

bzr revid: odo@openerp.com-20120723172229-vyzrgzhugsd17rao

commit | commitdiff | tree

Christophe Simonis [Mon, 23 Jul 2012 16:22:23 +0000 (18:22 +0200)]

[FIX] hide topbar on login page

bzr revid: chs@openerp.com-20120723162223-amclassz6dzneayq

commit | commitdiff | tree

Antony Lesuisse [Mon, 23 Jul 2012 15:30:39 +0000 (17:30 +0200)]

[IMP] m2o no tabindex=-! for open button will be handled by a keyboard shortcut

bzr revid: al@openerp.com-20120723153039-3xstwq2a1pcc67gh

commit | commitdiff | tree

niv-openerp [Mon, 23 Jul 2012 15:22:24 +0000 (17:22 +0200)]

[FIX] another problem with translation wizard

bzr revid: nicolas.vanhoren@openerp.com-20120723152224-pmll06c6j3hk1hjd

commit | commitdiff | tree

niv-openerp [Mon, 23 Jul 2012 15:11:13 +0000 (17:11 +0200)]

[FIX] problem with translate dialog

bzr revid: nicolas.vanhoren@openerp.com-20120723151113-nvh8l72duewcotvx

commit | commitdiff | tree

Xavier Morel [Mon, 23 Jul 2012 14:05:02 +0000 (16:05 +0200)]

[IMP] coerce 'falsy' char sizes to None

Otherwise users using fields.char(size=False) will see their content disappear without warning, not cool

bzr revid: xmo@openerp.com-20120723140502-nrtgw0o47ewj25qa

commit | commitdiff | tree

niv-openerp [Mon, 23 Jul 2012 13:59:37 +0000 (15:59 +0200)]

[IMP] Modified loading message

bzr revid: nicolas.vanhoren@openerp.com-20120723135937-3tuwpzdhn3311mg1

commit | commitdiff | tree

Xavier Morel [Mon, 23 Jul 2012 13:52:15 +0000 (15:52 +0200)]

[IMP] replace equality None test by identity test

bzr revid: xmo@openerp.com-20120723135215-7n63uh4ikulsdc6r

commit | commitdiff | tree

Xavier Morel [Mon, 23 Jul 2012 13:51:13 +0000 (15:51 +0200)]

[REM] redundant code: a field of type one2many will always have _type one2many

bzr revid: xmo@openerp.com-20120723135113-6x3s5lmljk8cdpf0

commit | commitdiff | tree

Xavier Morel [Mon, 23 Jul 2012 13:50:22 +0000 (15:50 +0200)]

[REM] orm: pointless character replacement of quotes by spaces in field strings

bzr revid: xmo@openerp.com-20120723135022-9lh5yyk0au5xag3l

commit | commitdiff | tree

Xavier Morel [Mon, 23 Jul 2012 13:49:31 +0000 (15:49 +0200)]

[IMP] field.char: make string and size optional

* Increases coherence with other fields (default string is 'unknown')
* Char fields defaut to unbounded, bounds are optional

bzr revid: xmo@openerp.com-20120723134931-b5moeenk0db5m2ss

commit | commitdiff | tree

niv-openerp [Mon, 23 Jul 2012 13:49:14 +0000 (15:49 +0200)]

[FIX] problem with wizards

bzr revid: nicolas.vanhoren@openerp.com-20120723134914-4rrmeysncsancwfq

commit | commitdiff | tree

Launchpad Translations on behalf of openerp [Mon, 23 Jul 2012 05:21:34 +0000 (05:21 +0000)]

Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120723052134-owmld5p3oqmn3nol

commit | commitdiff | tree

Antony Lesuisse [Sat, 21 Jul 2012 19:59:00 +0000 (21:59 +0200)]

[MERGE] etherpad

bzr revid: al@openerp.com-20120721195900-04o3e4oibe5pt9m1

commit | commitdiff | tree

Antony Lesuisse [Sat, 21 Jul 2012 19:34:59 +0000 (21:34 +0200)]

[FIX] pad fix bzr ignore

bzr revid: al@openerp.com-20120721193459-gxs3fs21nfel9enr

commit | commitdiff | tree

Antony Lesuisse [Sat, 21 Jul 2012 19:25:51 +0000 (21:25 +0200)]

[FIX] pad everything, remove unused api

bzr revid: al@openerp.com-20120721192551-q6nbqn4xxau0e64x

commit | commitdiff | tree

Antony Lesuisse [Sat, 21 Jul 2012 18:23:18 +0000 (20:23 +0200)]

[MERGE] trunk

bzr revid: al@openerp.com-20120721182318-zjkw85mrxf1f9b8s

commit | commitdiff | tree

Antony Lesuisse [Sat, 21 Jul 2012 18:09:41 +0000 (20:09 +0200)]

[MERGE] client singleton

bzr revid: al@openerp.com-20120721180941-rkqg6gqml8do49wl

commit | commitdiff | tree

Launchpad Translations on behalf of openerp [Sat, 21 Jul 2012 05:08:32 +0000 (05:08 +0000)]

Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120721050832-zkzeqskzl40kn2b8

commit | commitdiff | tree

Antonin Bourguignon [Fri, 20 Jul 2012 16:36:48 +0000 (18:36 +0200)]

[MERGE] fix Sale's top menu item sequence number

bzr revid: abo@openerp.com-20120720163648-wpx4drdldzeufz46

commit | commitdiff | tree

Antonin Bourguignon [Fri, 20 Jul 2012 16:36:42 +0000 (18:36 +0200)]

[MERGE] fix Sale's top menu item sequence number

bzr revid: abo@openerp.com-20120720163642-pbnugg1lyg7zrly2

commit | commitdiff | tree

Antonin Bourguignon [Fri, 20 Jul 2012 15:35:58 +0000 (17:35 +0200)]

[MERGE] latest trunk

bzr revid: abo@openerp.com-20120720153558-v2t3ywn5k6iujmy6

commit | commitdiff | tree

Antonin Bourguignon [Fri, 20 Jul 2012 15:35:39 +0000 (17:35 +0200)]

[MERGE] latest trunk

bzr revid: abo@openerp.com-20120720153539-4itf3wphf2bztrqh

commit | commitdiff | tree

Antonin Bourguignon [Fri, 20 Jul 2012 15:35:20 +0000 (17:35 +0200)]

[FIX] 'Sales' top menu items sequence

bzr revid: abo@openerp.com-20120720153520-gahyk0uj6il3ia0h

commit | commitdiff | tree

Antonin Bourguignon [Fri, 20 Jul 2012 15:34:25 +0000 (17:34 +0200)]

[FIX] 'Sales' top menu items sequence

bzr revid: abo@openerp.com-20120720153425-56h62eyju9g5fo3n

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 15:32:37 +0000 (17:32 +0200)]

[MERGE] Merged OpenChatter part3: The Return of the Composer Reloaded Strikes Back. Addons-side branch of OpenChatter part 3, holdling the new composer. This revision adds a new composer for chatter :
      - now based on mail.compose.message form view
      - comment mode / email mode, allowing to add partners in CC (with autocomplete for some models using an improved version of mail.compose.message such as crm.lead)
      - plain / HTML composition mode, with a rich HTML composition form
      - email.template support
      - EDI support
      Other modifications :
      - mail.group improved, with linked groups to automatically subscribe users
      - welcome message for a new user and a new employee
      - mail.message subtype is renamed to content_subtype.
      - crm.add_note is deleted
      - some doc ... but not as much as expected

bzr revid: tde@openerp.com-20120720153237-nk50okkpg1kju9fb

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 15:28:04 +0000 (17:28 +0200)]

[MERGE] Merged OpenChatter part3: The Return of the Composer Reloaded Strikes Back. Server-side part of OpenChatter part 3, holding the new message composer. This revision adds an override of res.partner name_create method to support custom creation: info@openerp.com (name and email info@openerp.com), and Raoul <raoul@raoul.fr> (name Raoul, email raoul@raoul.fr).

bzr revid: tde@openerp.com-20120720152804-lan1wwjbd60rt9ko

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 15:25:54 +0000 (17:25 +0200)]

[REVIEW] IMproved regex.

bzr revid: tde@openerp.com-20120720152554-j6x7ilroxhivggj3

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 20 Jul 2012 15:15:54 +0000 (17:15 +0200)]

[MERGE] label VAT to Tax

bzr revid: qdp-launchpad@openerp.com-20120720151554-fp5t5nsddjyb81jr

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 15:15:42 +0000 (17:15 +0200)]

[MERGE] Merged OpenChatter part3: The Return of the Composer Reloaded Strikes Back. Web-side branch of OpenChatter part 3, holding the new message composer. This revision adds a rich HTML composer for text fields. To use it, just use the text_html widget in forms.

bzr revid: tde@openerp.com-20120720151542-vj447vhcth4kacly

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 14:35:42 +0000 (16:35 +0200)]

[MERGE] Merged with web/trunk.

bzr revid: tde@openerp.com-20120720143542-i30g07waybug8cts

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 14:35:30 +0000 (16:35 +0200)]

[MERGE] Merged with addons/trunk.

bzr revid: tde@openerp.com-20120720143530-5dddw99ggts6v2j8

commit | commitdiff | tree

niv-openerp [Fri, 20 Jul 2012 14:20:23 +0000 (16:20 +0200)]

[FIX] small problem with m2o

bzr revid: nicolas.vanhoren@openerp.com-20120720142023-8a1m5b30yvoywnbs

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 20 Jul 2012 14:18:30 +0000 (16:18 +0200)]

[IMP] usability: partner form view

bzr revid: qdp-launchpad@openerp.com-20120720141830-htjstvlkqikv4d0z

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 14:17:54 +0000 (16:17 +0200)]

[CLEAN] email_template: removed print statements.

bzr revid: tde@openerp.com-20120720141754-dlbl78znso8dzyz2

commit | commitdiff | tree

niv-openerp [Fri, 20 Jul 2012 14:13:04 +0000 (16:13 +0200)]

[FIX] rare problem during save

bzr revid: nicolas.vanhoren@openerp.com-20120720141304-dpmw02lx7u2ureia

commit | commitdiff | tree

Stephane Wirtel [Fri, 20 Jul 2012 13:46:54 +0000 (15:46 +0200)]

[FIX] base_calendar: remove pdb

bzr revid: stw@openerp.com-20120720134654-2mzht44jvteayuen

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 13:37:12 +0000 (15:37 +0200)]

[IMP] demo data: made them noupdate.

bzr revid: tde@openerp.com-20120720133712-p6gd58nndabsit14

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 13:29:52 +0000 (15:29 +0200)]

[IMP] hr_employee: now sends a message on All employee mail.group to welcome the new employee.

bzr revid: tde@openerp.com-20120720132952-y0j1d4n7qaywbrrl

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 13:29:31 +0000 (15:29 +0200)]

[IMP] res_partner in mail: also look messages related to the partner.

bzr revid: tde@openerp.com-20120720132931-lf19b1v3ambao30p

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 13:29:04 +0000 (15:29 +0200)]

[IMP] res_users in mail: Welcome message posted on its wall at creation.

bzr revid: tde@openerp.com-20120720132904-v7f8876p87c74wxe

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 13:28:46 +0000 (15:28 +0200)]

[REM] mail_thread: removed broadcast.

bzr revid: tde@openerp.com-20120720132846-s1ad623e60pyejeb

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 13:01:27 +0000 (15:01 +0200)]

[CLEAN] mail.js: removed debug data.

bzr revid: tde@openerp.com-20120720130127-7kquweauwh4bv7zi

commit | commitdiff | tree

niv-openerp [Fri, 20 Jul 2012 13:01:00 +0000 (15:01 +0200)]

[IMP] debug mode

bzr revid: nicolas.vanhoren@openerp.com-20120720130100-olttd8ovamdtywtt

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 12:57:29 +0000 (14:57 +0200)]

[IMP] mail.message: added type in parameters. Default is email.

bzr revid: tde@openerp.com-20120720125729-4xq31w4o0qey6erl

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 12:57:09 +0000 (14:57 +0200)]

[FIX] mail.compos.message: outgoing state only for emails. Send only emails, also.

bzr revid: tde@openerp.com-20120720125709-rgfiwsy8qp3z5x1f

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 12:56:23 +0000 (14:56 +0200)]

[CLEAN] Removed some commented lines.

bzr revid: tde@openerp.com-20120720125623-rvoyta3kmbkkiwyy

commit | commitdiff | tree

niv-openerp [Fri, 20 Jul 2012 12:44:30 +0000 (14:44 +0200)]

[IMP] Changed some "Cancel" buttons to links

bzr revid: nicolas.vanhoren@openerp.com-20120720124430-gbhow8qcipsrieb4

commit | commitdiff | tree

niv-openerp [Fri, 20 Jul 2012 12:35:28 +0000 (14:35 +0200)]

[IMP] changed place of buttons in relation popups

bzr revid: nicolas.vanhoren@openerp.com-20120720123528-fpskc2r42d06z28r

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 12:24:18 +0000 (14:24 +0200)]

[MERGE] Merged with addons/trunk.

bzr revid: tde@openerp.com-20120720122418-yhiyx1c13dnpn1jj

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 12:23:54 +0000 (14:23 +0200)]

[MERGE] Merged with server/trunk.

bzr revid: tde@openerp.com-20120720082037-0dsd0ado0e1ogft4
bzr revid: tde@openerp.com-20120720122354-a0y7xcjfqnxu4u8x

commit | commitdiff | tree

Stephane Wirtel [Fri, 20 Jul 2012 12:14:11 +0000 (14:14 +0200)]

[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons_issue-stw

bzr revid: stw@openerp.com-20120720121411-qhxmzb66vht2m8ls

commit | commitdiff | tree

Stephane Wirtel [Fri, 20 Jul 2012 12:12:46 +0000 (14:12 +0200)]

[FIX] merge of lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-cha and fix

bzr revid: stw@openerp.com-20120720121246-ltdbylsj8aveiz13

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 11:50:46 +0000 (13:50 +0200)]

[IMP] cleditor: removed source link. Updated get_value to be more consistent.

bzr revid: tde@openerp.com-20120720115046-fp0do72zy3cs2p2w

commit | commitdiff | tree

Purnendu Singh (OpenERP) [Fri, 20 Jul 2012 11:44:02 +0000 (17:14 +0530)]

[IMP] update pot files

bzr revid: psi@tinyerp.com-20120720114402-yipigtjmk4j7qk1r

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 11:33:58 +0000 (13:33 +0200)]

[IMP] text_html widget: cleaned a bit the code.

bzr revid: tde@openerp.com-20120720113358-y5mt98w1ug9ljbvo

commit | commitdiff | tree

Amit Patel (OpenERP) [Fri, 20 Jul 2012 11:07:26 +0000 (16:37 +0530)]

[MERGE/IMP]:merged knowledge

bzr revid: apa@tinyerp.com-20120720110726-irl2l5kz4oj6k5t9

commit | commitdiff | tree

Amit Patel (OpenERP) [Fri, 20 Jul 2012 11:00:54 +0000 (16:30 +0530)]

[MERGE]:merged purchase config wizard.

bzr revid: apa@tinyerp.com-20120720110054-qya0mgox0acum6bj

commit | commitdiff | tree

Amit Patel (OpenERP) [Fri, 20 Jul 2012 10:59:04 +0000 (16:29 +0530)]

[IMP]:improved purchase config wizard.

bzr revid: apa@tinyerp.com-20120720105904-hz6l8qza9qd6dsll

commit | commitdiff | tree

Amit Patel (OpenERP) [Fri, 20 Jul 2012 10:44:51 +0000 (16:14 +0530)]

[MERGE]:merged manufacturing config wizard.

bzr revid: apa@tinyerp.com-20120720104451-bf6f21amdfuuplo6

commit | commitdiff | tree

Amit Patel (OpenERP) [Fri, 20 Jul 2012 10:43:08 +0000 (16:13 +0530)]

[IMP]:improved manufacturing config wizard.

bzr revid: apa@tinyerp.com-20120720104308-sdn4cbj8ei26a6o1

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 10:29:04 +0000 (12:29 +0200)]

[REM] [ADD] Removed old unused icons; added icons for composer.

bzr revid: tde@openerp.com-20120720102904-jkwhlt1fgvf1ywja

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 10:24:35 +0000 (12:24 +0200)]

[IMP] res.users, res.partner: chatter in correct 'footer' style.

bzr revid: tde@openerp.com-20120720102435-v20b8jnwum6uvm84

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 10:21:03 +0000 (12:21 +0200)]

[MOV] mail_demo moved to data/mail_demo.

bzr revid: tde@openerp.com-20120720102103-4ls3yb0s7z27m4t6

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 10:17:56 +0000 (12:17 +0200)]

[REM] mail.message: schedule with attach: removed type=email, because this is the default value.

bzr revid: tde@openerp.com-20120720101756-slv9kd6r5a3d9qrw

commit | commitdiff | tree

Raphael Collet [Fri, 20 Jul 2012 10:03:39 +0000 (12:03 +0200)]

[MERGE] trunk-module-summary (add field 'summary' on modules)

bzr revid: rco@openerp.com-20120720100339-sk3mx0qucujeqsxe

commit | commitdiff | tree

Raphael Collet [Fri, 20 Jul 2012 10:02:53 +0000 (12:02 +0200)]

[MERGE] trunk-module-summary (add field 'summary' on modules)

bzr revid: rco@openerp.com-20120720100253-ulll8tu221v14x1t

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 09:57:19 +0000 (11:57 +0200)]

[IMP] mail.mesage: scheduler: try to send only outgoing emails.

bzr revid: tde@openerp.com-20120720095719-0qmigezuv7r6gr3d

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 09:49:29 +0000 (11:49 +0200)]

[IMP] mail.message view: cleaned short view for feeds.

bzr revid: tde@openerp.com-20120720094929-wite8l21xa60v33n

commit | commitdiff | tree

Raphael Collet [Fri, 20 Jul 2012 09:30:46 +0000 (11:30 +0200)]

[FIX] in summary of modules: typos

bzr revid: rco@openerp.com-20120720093046-92l51ts5aaee9etq

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 09:26:20 +0000 (11:26 +0200)]

[REF] mail: res.partner inheritance: removed unnecessary 'emails' column, as this is managed by Chatter. Also updated partner_id -> partner_ids.

bzr revid: tde@openerp.com-20120720092620-o94cxdi2hxthd5y1

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 09:25:45 +0000 (11:25 +0200)]

[CLEAN] mail.message: cleaned comments and formatting, added parent_id and child_ids to mail.message model; mail.message.common only have a parent_id field now.

bzr revid: tde@openerp.com-20120720092545-gouxtlg9b6frehm1

commit | commitdiff | tree

Raphael Collet [Fri, 20 Jul 2012 09:23:27 +0000 (11:23 +0200)]

[IMP] module kanban: remove unnecessary line break

bzr revid: rco@openerp.com-20120720092327-1j9777ss4n85c4og

commit | commitdiff | tree

Randhir Mayatra (OpenERP) [Fri, 20 Jul 2012 09:22:32 +0000 (14:52 +0530)]

[IMP] Make Changes into the Knowladge Wizard

bzr revid: rma@tinyerp.com-20120720092232-l0w6xlh95yv22i5n

commit | commitdiff | tree

Amit Patel (OpenERP) [Fri, 20 Jul 2012 08:52:43 +0000 (14:22 +0530)]

[MERGE]:marketing

bzr revid: apa@tinyerp.com-20120720085243-nowwhegcykak0slq

commit | commitdiff | tree

Amit Patel (OpenERP) [Fri, 20 Jul 2012 08:49:10 +0000 (14:19 +0530)]

[MERGE]:merged config wizard for company

bzr revid: apa@tinyerp.com-20120720084910-0f4v91nnmgjg2sx6

commit | commitdiff | tree

Amit Patel (OpenERP) [Fri, 20 Jul 2012 08:47:52 +0000 (14:17 +0530)]

[IMP]:improved config wizard for compmny

bzr revid: apa@tinyerp.com-20120720084752-xtjmfqbketk37zzl

commit | commitdiff | tree

Amit Patel (OpenERP) [Fri, 20 Jul 2012 08:30:00 +0000 (14:00 +0530)]

[MERGE]

bzr revid: apa@tinyerp.com-20120720083000-pzf6udwq54jnvphz

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 08:25:49 +0000 (10:25 +0200)]

[FIX] mail_compose_message: lost '{'.

bzr revid: tde@openerp.com-20120720082549-2z2feyuk37xrlqtw

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 08:20:55 +0000 (10:20 +0200)]

[MERGE] Merged with web/trunk.

bzr revid: tde@openerp.com-20120720082055-p04uzdmt8fm0xqne

commit | commitdiff | tree

Thibault Delavallée [Fri, 20 Jul 2012 08:20:47 +0000 (10:20 +0200)]

[MERGE] Merged with addons/trunk.

bzr revid: tde@openerp.com-20120720082047-5i1r9sslqqh0a9s8

commit | commitdiff | tree

Stephane Wirtel [Fri, 20 Jul 2012 07:34:59 +0000 (09:34 +0200)]

[REVERT] previous merge of lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-cha

bzr revid: stw@openerp.com-20120720073459-bhslng4t8qbigoka

commit | commitdiff | tree

Purnendu Singh (OpenERP) [Fri, 20 Jul 2012 07:30:38 +0000 (13:00 +0530)]

[IMP, MERGE] merge rpa branch with few misc changes

bzr revid: psi@tinyerp.com-20120720073038-i5gv23jwkj3555wh

commit | commitdiff | tree

Randhir Mayatra (OpenERP) [Fri, 20 Jul 2012 07:25:41 +0000 (12:55 +0530)]

[IMP] Make Changes into the Marketing Wizard

bzr revid: rma@tinyerp.com-20120720072541-02e6uk0xv4j8pqm6

commit | commitdiff | tree

Amit Patel (OpenERP) [Fri, 20 Jul 2012 07:23:13 +0000 (12:53 +0530)]

[MERGE]:merged with parent

bzr revid: apa@tinyerp.com-20120720072313-1zgl21skbr4ezf1s

commit | commitdiff | tree

Amit Patel (OpenERP) [Fri, 20 Jul 2012 07:14:15 +0000 (12:44 +0530)]

[MERGE]:merged hr config wizard.

bzr revid: apa@tinyerp.com-20120720071415-vkbb894gsdjztrhs

commit | commitdiff | tree

Amit Patel (OpenERP) [Fri, 20 Jul 2012 07:12:50 +0000 (12:42 +0530)]

[IMP]:improved code

bzr revid: apa@tinyerp.com-20120720071250-1h5cmcaxdwkqmsju

commit | commitdiff | tree

Amit Patel (OpenERP) [Fri, 20 Jul 2012 06:57:49 +0000 (12:27 +0530)]

[MERGE]:merged with parent

bzr revid: apa@tinyerp.com-20120720065749-k1qlqbbatgypzbzv

commit | commitdiff | tree

Amit Patel (OpenERP) [Fri, 20 Jul 2012 06:45:46 +0000 (12:15 +0530)]

[MERGE/IMP]:merged and improved project config wizard.

bzr revid: apa@tinyerp.com-20120720064546-d2qop7n3zmsnjmf2

commit | commitdiff | tree

Amit Patel (OpenERP) [Fri, 20 Jul 2012 06:44:13 +0000 (12:14 +0530)]

[IMP]:improved project config wizard

bzr revid: apa@tinyerp.com-20120720064413-v3hk68x2o7jhuga7

commit | commitdiff | tree

Randhir Mayatra (OpenERP) [Fri, 20 Jul 2012 06:38:42 +0000 (12:08 +0530)]

[IMP] Make Changes into the Purchases Wizard and resubmit it

bzr revid: rma@tinyerp.com-20120720063842-w1lk7ea44qpawrvc

commit | commitdiff | tree

Stephane Wirtel [Fri, 20 Jul 2012 06:30:54 +0000 (08:30 +0200)]

[MERGE]

bzr revid: stw@openerp.com-20120720063054-0hnrk6674r91rxpc

commit | commitdiff | tree

Stephane Wirtel [Fri, 20 Jul 2012 06:16:34 +0000 (08:16 +0200)]

[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-cha

bzr revid: stw@openerp.com-20120720061634-yxo5y929pdmd1q2w

commit | commitdiff | tree

Randhir Mayatra (OpenERP) [Fri, 20 Jul 2012 06:12:03 +0000 (11:42 +0530)]

[IMP] Make Changes into the Manufacturing Wizard and resubmit it

bzr revid: rma@tinyerp.com-20120720061203-ff3efztoxqvhzhjg

commit | commitdiff | tree

Amit Patel (OpenERP) [Fri, 20 Jul 2012 06:05:23 +0000 (11:35 +0530)]

[MERGE]:merged with parent

bzr revid: apa@tinyerp.com-20120720060523-0t9dudh79qw1h3e8

commit | commitdiff | tree

Rajesh Prajapati (OpenERP) [Fri, 20 Jul 2012 05:54:01 +0000 (11:24 +0530)]

[MERGE] merge with parent branch

bzr revid: rpr@tinyerp.com-20120720055401-hu537f6dua4px1d3

Unnamed repository; edit this file 'description' to name the repository.