Xavier Morel [Tue, 7 Aug 2012 14:13:51 +0000 (16:13 +0200)]
[IMP] set an NS-resize cursor on handle
bzr revid: xmo@openerp.com-
20120807141351-6d9vtnjpwjsx7wmj
Xavier Morel [Tue, 7 Aug 2012 13:43:43 +0000 (15:43 +0200)]
[CHG] resequence on arbitrary field with @widget=handle
bzr revid: xmo@openerp.com-
20120807134343-ch16bcp5s7goqxsl
Fabien Meghazi [Wed, 8 Aug 2012 09:47:43 +0000 (11:47 +0200)]
[FIX] Restore translatable fields
bzr revid: fme@openerp.com-
20120808094743-gw5boichxy3ka737
niv-openerp [Wed, 8 Aug 2012 09:15:32 +0000 (11:15 +0200)]
[FIX] fixed problems with images in kanban o2m
bzr revid: nicolas.vanhoren@openerp.com-
20120808091532-zjnvgpx33nkwj1z8
Stephane Wirtel [Wed, 8 Aug 2012 09:08:46 +0000 (11:08 +0200)]
[IMP] crm: improve the on_change of the partner in the lead form view
bzr revid: stw@openerp.com-
20120808090846-uat120rr9ta5wtdt
Thibault Delavallée [Wed, 8 Aug 2012 08:25:29 +0000 (10:25 +0200)]
[MERGE] Merged small fix of email_template. It fixes a crash when using 'send by email' on a partner without email address. It also fixes a bug when using 'send by email' in create mode. It now falls back on the classic form view of mail.compose.message.
bzr revid: tde@openerp.com-
20120808082529-6cifcklh06hf1w11
Thibault Delavallée [Wed, 8 Aug 2012 07:56:00 +0000 (09:56 +0200)]
[IMP] mail Chatter: hack of 'send by mail': do not try to redirect to the chatter when in create mode.
bzr revid: tde@openerp.com-
20120808075600-wo2w2ojb0wjozsuy
Fabien Pinckaers [Wed, 8 Aug 2012 07:54:09 +0000 (09:54 +0200)]
[IMP] layout form SO
bzr revid: fp@tinyerp.com-
20120808075409-wrz9vv4zfir89gff
Fabien Pinckaers [Wed, 8 Aug 2012 07:44:36 +0000 (09:44 +0200)]
[IMP] layout form view wizard CoA
bzr revid: fp@tinyerp.com-
20120808074436-yg5t0ctdgiwn5ccz
Fabien Pinckaers [Wed, 8 Aug 2012 07:38:21 +0000 (09:38 +0200)]
[FIX] fixing bugs in bounce effects + cleaner effect
bzr revid: fp@tinyerp.com-
20120808073821-gxp4r9u12160lshy
Fabien Pinckaers [Wed, 8 Aug 2012 07:24:53 +0000 (09:24 +0200)]
[IMP] clean address format on leads
bzr revid: fp@tinyerp.com-
20120808072453-tnm2rkvn7djksxtm
Thibault Delavallée [Wed, 8 Aug 2012 07:20:02 +0000 (09:20 +0200)]
[MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-
20120807162849-8t8ebzkhsfgc4jg7
bzr revid: tde@openerp.com-
20120808072002-zmyyt0fxx0spaka7
Fabien Pinckaers [Wed, 8 Aug 2012 06:51:18 +0000 (08:51 +0200)]
[IMP] small CSS improvements
bzr revid: fp@tinyerp.com-
20120808065118-8sw6l6gmak1e48ld
Fabien Pinckaers [Wed, 8 Aug 2012 06:41:22 +0000 (08:41 +0200)]
[IMP] small improvement in opportunity view
bzr revid: fp@tinyerp.com-
20120808064122-wjz6ua224nb9mkoi
Launchpad Translations on behalf of openerp [Wed, 8 Aug 2012 04:46:44 +0000 (04:46 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120808043651-egwkmt6jun55wr8g
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120808044644-idxbpx3utx816s2p
Fabien Pinckaers [Tue, 7 Aug 2012 17:31:58 +0000 (19:31 +0200)]
[IMP] contact in partners
bzr revid: fp@tinyerp.com-
20120807173158-fwqoqhe7x09uzebt
Fabien Pinckaers [Tue, 7 Aug 2012 17:17:40 +0000 (19:17 +0200)]
[IMP] small form improvements
bzr revid: fp@tinyerp.com-
20120807171740-2ec2um8m9cpaduhn
Fabien Pinckaers [Tue, 7 Aug 2012 17:13:04 +0000 (19:13 +0200)]
[IMP] internal notes as first tab
bzr revid: fp@tinyerp.com-
20120807171304-j9bhr7ahm2so5r16
Fabien Pinckaers [Tue, 7 Aug 2012 17:11:01 +0000 (19:11 +0200)]
[IMP] subtotal visible on SO lines
bzr revid: fp@tinyerp.com-
20120807171101-4cg1ivz0dksug05t
Fabien Pinckaers [Tue, 7 Aug 2012 16:22:16 +0000 (18:22 +0200)]
[IMP] employee view
bzr revid: fp@tinyerp.com-
20120807162216-b1uemxzhcd9t2eto
Olivier Dony [Tue, 7 Aug 2012 16:12:02 +0000 (18:12 +0200)]
[IMP] tools.reference_re: support matching model name as well
bzr revid: odo@openerp.com-
20120807161202-jav73f2kj86pzil4
Thibault Delavallée [Tue, 7 Aug 2012 16:09:24 +0000 (18:09 +0200)]
[FIX] email_template: fixed an issue where no destination partner could be found.
bzr revid: tde@openerp.com-
20120807160924-hdnqudnwowkbmsem
Fabien Pinckaers [Tue, 7 Aug 2012 15:55:52 +0000 (17:55 +0200)]
[IMP] config wizards, feedback from SAM's user testing
bzr revid: fp@tinyerp.com-
20120807155552-eo88mb4ngysjd8n6
Stephane Wirtel [Tue, 7 Aug 2012 14:42:53 +0000 (16:42 +0200)]
[FIX] base: Allow the quick create for a partner
bzr revid: stw@openerp.com-
20120807144253-9isx2aohhm9z7g72
Stephane Wirtel [Tue, 7 Aug 2012 14:05:41 +0000 (16:05 +0200)]
[FIX] sale: Rename 'Open Invoice' to 'View Invoice'
bzr revid: stw@openerp.com-
20120807140541-tmuxxylhricygdx5
Stephane Wirtel [Tue, 7 Aug 2012 13:48:55 +0000 (15:48 +0200)]
[IMP] base: Add a wizard to install a list of modules
bzr revid: stw@openerp.com-
20120807134855-s7fejx88p5aklc73
Thibault Delavallée [Tue, 7 Aug 2012 13:13:00 +0000 (15:13 +0200)]
[MERGE] MyNotChatterTask: image resize.
This revision adds standard image field names and sizes (image: 1024x1024; image_medium: 180x180; image_small: 50x50, the last two being function fields). This web-side branch holds the field name change for the topbar avatar. It also adds 2 CSS classes when using images: oe_image_small and oe_image_medium, that fix the max-width and mex-height to respectively 50x50 and 180x180 px.
Misc :
- deleted oe_kanban_gravatar CSS class
- renamed oe_kanban_avatar_toto to oe_kanban_avatar_smallbox; this class is used only in res.partner form view, for child partners.
bzr revid: tde@openerp.com-
20120807131300-i6helnvao10o0go7
Thibault Delavallée [Tue, 7 Aug 2012 13:11:52 +0000 (15:11 +0200)]
[MERGE] MyNotChatterTask: image resize.
This revision adds standard image field names and sizes (image: 1024x1024; image_medium: 180x180; image_small: 50x50, the last two being function fields). This addons-side branch holds the update for mail.group, product, point of sale and hr. Default image for new hr employee has also been updated. Hr module now has its icon for the module kanban view.
bzr revid: tde@openerp.com-
20120807131152-qw0lw9s8s6lq5m2b
Thibault Delavallée [Tue, 7 Aug 2012 13:11:34 +0000 (15:11 +0200)]
[MERGE] MyNotChatterTask: image resize.
This revision adds standard image field names and sizes (image: 1024x1024; image_medium: 180x180; image_small: 50x50, the last two being function fields). This server-side branch holds the tools functions for image resizing (with aspect ratio preserved), and update for res.partner and res.users.
bzr revid: tde@openerp.com-
20120807131134-u574cer42aycd9na
Stephane Wirtel [Tue, 7 Aug 2012 13:07:51 +0000 (15:07 +0200)]
[MERGE] lp:~openerp-dev/openobject-server/trunk-addons-issues3-base
bzr revid: stw@openerp.com-
20120807130751-q3b0qh9et3jmlvzk
Stephane Wirtel [Tue, 7 Aug 2012 13:07:30 +0000 (15:07 +0200)]
[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons-issues3-crm
bzr revid: stw@openerp.com-
20120807130730-m48lble9h35e8v79
Thibault Delavallée [Tue, 7 Aug 2012 12:28:49 +0000 (14:28 +0200)]
[FIX] project.project: removed image_small field that is not on the project model.
bzr revid: tde@openerp.com-
20120807122849-jpy4w6koedfa97om
Thibault Delavallée [Tue, 7 Aug 2012 12:03:46 +0000 (14:03 +0200)]
[IMP] project_issue in portal: avatar -> image.
bzr revid: tde@openerp.com-
20120807120346-yhcsb3nne8eq0egs
Thibault Delavallée [Tue, 7 Aug 2012 12:03:35 +0000 (14:03 +0200)]
[IMP] mail_thread: read subscribers: fetches image_small, not avatar.
bzr revid: tde@openerp.com-
20120807120335-3i0f3hdwggcfizaw
Thibault Delavallée [Tue, 7 Aug 2012 12:03:00 +0000 (14:03 +0200)]
[REM] hr: removed a field that has probably been added by a copy-paste.
bzr revid: tde@openerp.com-
20120807120300-l70tx73pobb4ofe1
Thibault Delavallée [Tue, 7 Aug 2012 12:02:37 +0000 (14:02 +0200)]
[IMP] portal: demo portal user avatar -> image.
bzr revid: tde@openerp.com-
20120807120237-f4f6dn5s09rsbbp6
Thibault Delavallée [Tue, 7 Aug 2012 12:02:10 +0000 (14:02 +0200)]
[IMP] Added iamges as fields in kanban view where used.
bzr revid: tde@openerp.com-
20120807120210-kp0yrn6iiv61yu0o
Thibault Delavallée [Tue, 7 Aug 2012 12:01:35 +0000 (14:01 +0200)]
[IMP] project_issue: avatar -> image_small.
bzr revid: tde@openerp.com-
20120807120135-aygpseez16w6hs0z
Thibault Delavallée [Tue, 7 Aug 2012 11:29:14 +0000 (13:29 +0200)]
[REM] Removed a print statement.
bzr revid: tde@openerp.com-
20120807112914-tjehrwyts1g20woe
Thibault Delavallée [Tue, 7 Aug 2012 11:13:56 +0000 (13:13 +0200)]
[IMP] res.partner, res.user: removed oe_mail_group_footer css class on their chatter, because it should not be there. A good reason I think.
bzr revid: tde@openerp.com-
20120807111356-s304912xk71s346x
Thibault Delavallée [Tue, 7 Aug 2012 11:10:39 +0000 (13:10 +0200)]
[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
Thibault Delavallée [Tue, 7 Aug 2012 11:08:59 +0000 (13:08 +0200)]
[IMP] res.users, res.partner: updated image code to propagate cleaning of image module.
bzr revid: tde@openerp.com-
20120807110859-2osf4mf7y7by1zvm
Thibault Delavallée [Tue, 7 Aug 2012 11:08:34 +0000 (13:08 +0200)]
[CLEAN] [DOC] Pre-merge review: image: added comments. Also renamed functions, now prefixed with a image_* .
bzr revid: tde@openerp.com-
20120807110834-uk3ymnxb5qz4hr8e
Thibault Delavallée [Tue, 7 Aug 2012 11:02:02 +0000 (13:02 +0200)]
[IMP] Renamed oe_kanban_avatar_toto to oe_kanban_avatar_smallbox; this is used only for nested partners in partner form view. The name is a bit more clear now. Also removed dead class oe_kanban_gravatar.
bzr revid: tde@openerp.com-
20120807110202-f87n3068k89utq5k
Fabien Meghazi [Tue, 7 Aug 2012 10:58:13 +0000 (12:58 +0200)]
[FIX] Binary image controller should not crash on virtual ids
bzr revid: fme@openerp.com-
20120807105813-ybrsot6bco8ib36e
Xavier Morel [Tue, 7 Aug 2012 10:49:35 +0000 (12:49 +0200)]
[MERGE] various fixes and changes to editable list view after review
bzr revid: xmo@openerp.com-
20120807104935-k8i2iydxm5q2rt59
Fabien Meghazi [Tue, 7 Aug 2012 10:25:36 +0000 (12:25 +0200)]
[NMDT] Not my day today
bzr revid: fme@openerp.com-
20120807102536-8idyt0qotub4ythy
Fabien Meghazi [Tue, 7 Aug 2012 10:21:23 +0000 (12:21 +0200)]
[FIX] Fixed Revision: 2869 revid:fme@openerp.com-
20120806160922-d4b59jzsu2nx2yl7
bzr revid: fme@openerp.com-
20120807102123-wkpeipyvveufo556
pso (OpenERP) [Tue, 7 Aug 2012 10:13:26 +0000 (15:43 +0530)]
[MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-
20120807101326-xglo336vs6qwv12g
Thibault Delavallée [Tue, 7 Aug 2012 10:09:20 +0000 (12:09 +0200)]
[MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-
20120807100920-mr0oc56qs2zntvu1
Thibault Delavallée [Tue, 7 Aug 2012 10:09:02 +0000 (12:09 +0200)]
[MERGE] Merged with web/trunk.
bzr revid: tde@openerp.com-
20120807100902-plhjlmx7dry92fcj
pso (OpenERP) [Tue, 7 Aug 2012 10:08:41 +0000 (15:38 +0530)]
[IMP] base: Improvements
bzr revid: pso@tinyerp.com-
20120807100841-ab08m5gtapm1h2us
Thibault Delavallée [Tue, 7 Aug 2012 10:08:25 +0000 (12:08 +0200)]
[MERGE] Merged with server/trunk.
bzr revid: tde@openerp.com-
20120807100825-utqncwmp96iyspia
pso (OpenERP) [Tue, 7 Aug 2012 09:56:34 +0000 (15:26 +0530)]
[MERGE] Merged PNA's branch for Lead/Opportunity view improvements
bzr revid: pso@tinyerp.com-
20120807095634-d91bzmzsl4oledwg
Olivier Dony [Tue, 7 Aug 2012 09:38:02 +0000 (11:38 +0200)]
[MERGE] mail.alias implementation + mrp.repair improvement + placeholders review + misc bits
Attempt to fix previous fp-style merge breaking weeks
of history. Unfortunately this one will swallow a few
extra merges on top of the mail.alias merge, as well
as a few odd commits
bzr revid: odo@openerp.com-
20120807093802-f20mfq8a42rp84wp
Xavier Morel [Tue, 7 Aug 2012 09:31:07 +0000 (11:31 +0200)]
[FIX] remove margins from oe_form_nosheet in editable list view
Avoids list view moving around when edition starts (and form view is shown so fields can be used)
bzr revid: xmo@openerp.com-
20120807093107-2cqww3fmstd62to0
Xavier Morel [Tue, 7 Aug 2012 09:23:17 +0000 (11:23 +0200)]
[FIX] action button on row being *created* in editable list view
Altered action button workflow:
* Action callback (passed to ``do_button_action``) now *takes* a
record id instead of closing over it, in case the original list does
not have an id to start with
* ``handle_button`` partially applies the id *it* got to the callback
via ``_.bind``
* Editable list view override of ``do_button_action`` uses ``id`` it
got from ``ensure_saved`` in case it got id=false in
bzr revid: xmo@openerp.com-
20120807092317-wk0xyfzrhxc89t94
Pinakin Nayi (OpenERP) [Tue, 7 Aug 2012 08:59:14 +0000 (14:29 +0530)]
[IMP]crm-lead-category
bzr revid: pna@tinyerp.com-
20120807085914-4ufygn773tvl4j52
pso (OpenERP) [Tue, 7 Aug 2012 08:48:38 +0000 (14:18 +0530)]
[MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-
20120807084838-uf57y64sps1niszd
Xavier Morel [Tue, 7 Aug 2012 07:26:50 +0000 (09:26 +0200)]
[FIX] conflict between form autoblur thing and focus management in editable o2m
bzr revid: xmo@openerp.com-
20120807072650-ia0u56u8z20tgbfw
Launchpad Translations on behalf of openerp [Tue, 7 Aug 2012 05:39:28 +0000 (05:39 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120807053928-8131c98edycpivlb
Fabien Pinckaers [Mon, 6 Aug 2012 20:10:53 +0000 (22:10 +0200)]
[IMP] small chang ein module name to avoid two modules with same name
bzr revid: fp@openerp.com-
20120806201053-pz40hupmli82ixuv
Fabien Pinckaers [Mon, 6 Aug 2012 20:07:10 +0000 (22:07 +0200)]
[IMP] small fix
bzr revid: fp@openerp.com-
20120806200710-mkqimou9tdz8h6f2
Fabien Pinckaers [Mon, 6 Aug 2012 19:56:20 +0000 (21:56 +0200)]
[IMP] config wizards small improvements in layout
bzr revid: fp@openerp.com-
20120806195620-sozifrvbjockq33u
Fabien Pinckaers [Mon, 6 Aug 2012 19:33:35 +0000 (21:33 +0200)]
[merge] empty merge, just to set branch as merged
bzr revid: fp@openerp.com-
20120806193335-pz4y6n289cb5entc
Fabien Pinckaers [Mon, 6 Aug 2012 19:29:58 +0000 (21:29 +0200)]
[merge] mrp repair improvements
bzr revid: fp@openerp.com-
20120806192958-upqa3fxhtkwuw13e
Fabien Pinckaers [Mon, 6 Aug 2012 19:25:36 +0000 (21:25 +0200)]
[merge] mrp repair improvements
bzr revid: fp@openerp.com-
20120806192536-dhv3xz10xemy4zlb
Fabien Pinckaers [Mon, 6 Aug 2012 19:06:05 +0000 (21:06 +0200)]
[MERGE] improved placeholders
bzr revid: fp@openerp.com-
20120806190605-8qtg753ygug4l1cm
Fabien Pinckaers [Mon, 6 Aug 2012 19:05:27 +0000 (21:05 +0200)]
[MERGE] improvement placeholders
bzr revid: fp@openerp.com-
20120806190527-gb3gs4cexnijaezk
Olivier Dony [Mon, 6 Aug 2012 17:43:52 +0000 (19:43 +0200)]
[MERGE] Sync with trunk
bzr revid: odo@openerp.com-
20120806174352-bgv2lt8pwhoa07pa
Olivier Dony [Mon, 6 Aug 2012 17:35:09 +0000 (19:35 +0200)]
[FIX] improved visibility rules for inherited mail alias fields
bzr revid: odo@openerp.com-
20120806173509-zu57rxzhuksftyqc
Fabien Pinckaers [Mon, 6 Aug 2012 16:47:32 +0000 (18:47 +0200)]
[IMP] simplification of list views
bzr revid: fp@tinyerp.com-
20120806164732-tyeljfvy1ayhwjuz
Fabien Pinckaers [Mon, 6 Aug 2012 16:44:04 +0000 (18:44 +0200)]
[IMP] better views
bzr revid: fp@tinyerp.com-
20120806164404-nweyqbh3635e0ntv
Fabien Pinckaers [Mon, 6 Aug 2012 16:43:20 +0000 (18:43 +0200)]
[IMP] cleaning views, reduced summary and module name fields (to avoid crap in apps.openerp.com)
bzr revid: fp@tinyerp.com-
20120806164320-x3mc637dw809life
Fabien Meghazi [Mon, 6 Aug 2012 16:09:22 +0000 (18:09 +0200)]
[IMP] Don't display the many2one icon if it's value is empty.
bzr revid: fme@openerp.com-
20120806160922-d4b59jzsu2nx2yl7
Thibault Delavallée [Mon, 6 Aug 2012 15:54:18 +0000 (17:54 +0200)]
[IMP] Renamed css oe_form_field_image_small and _medium to oe_image_small and _medium.
bzr revid: tde@openerp.com-
20120806155418-33zkumr6t4ez8k6e
Fabien Meghazi [Mon, 6 Aug 2012 15:54:05 +0000 (17:54 +0200)]
[REV] Revert Revision: 2677 revid:fp@tinyerp.com-
20120705123259-okklz6m7nfziqaqf
bzr revid: fme@openerp.com-
20120806155405-vw1qgz5btqd6hzvp
Thibault Delavallée [Mon, 6 Aug 2012 15:53:54 +0000 (17:53 +0200)]
[IMP] product, hr, pos, mail_group: removed the onchange_image, updated used images and classes in views.
bzr revid: tde@openerp.com-
20120806155354-sjkrmrffgb2ik4ba
Thibault Delavallée [Mon, 6 Aug 2012 15:53:25 +0000 (17:53 +0200)]
[IMP] res_partner, res_users: removed the onchange_image, updated used images and classes in views.
bzr revid: tde@openerp.com-
20120806155325-198jhpc2chmufzu1
Fabien Meghazi [Mon, 6 Aug 2012 15:32:08 +0000 (17:32 +0200)]
[REV] Reverted Revision: 2636 revid:nicolas.vanhoren@openerp.com-
20120627153131-uxp6d2l4ri8xjoz5
bzr revid: fme@openerp.com-
20120806153208-fbet6xbs365ir6lm
Fabien Meghazi [Mon, 6 Aug 2012 15:02:48 +0000 (17:02 +0200)]
[FIX] Stuck in login when creating a new database
bzr revid: fme@openerp.com-
20120806150248-am7gql5pr1bfyunl
Xavier Morel [Mon, 6 Aug 2012 15:00:02 +0000 (17:00 +0200)]
[FIX] state of editor after cancelled cancel() (haha), handling of a record being edited during o2m deletion
bzr revid: xmo@openerp.com-
20120806150002-45c8mjq9dk5hck7y
Xavier Morel [Mon, 6 Aug 2012 14:34:10 +0000 (16:34 +0200)]
[CHG] delete o2m lines without warning
bzr revid: xmo@openerp.com-
20120806143410-ohzypxj3r8bbz08w
Stephane Wirtel [Mon, 6 Aug 2012 14:21:27 +0000 (16:21 +0200)]
[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons-issues3-accounting
bzr revid: stw@openerp.com-
20120806142127-cjlcxkt9eodikdwe
Fabien Meghazi [Mon, 6 Aug 2012 14:00:44 +0000 (16:00 +0200)]
[IMP] Improved m2o tooltip
bzr revid: fme@openerp.com-
20120806140044-mgo3git8zi9xrqbh
Xavier Morel [Mon, 6 Aug 2012 13:55:36 +0000 (15:55 +0200)]
[CHG] make 'add a row' a link
bzr revid: xmo@openerp.com-
20120806135536-4x6qacw8qp91le2g
Fabien Meghazi [Mon, 6 Aug 2012 13:53:12 +0000 (15:53 +0200)]
[FIX] Fixed openerp classname in jQuery Tipsy
The classname should be present before tipsy computes it's width/height !
bzr revid: fme@openerp.com-
20120806135312-b3xlvbba0m0rzr1a
Xavier Morel [Mon, 6 Aug 2012 13:52:48 +0000 (15:52 +0200)]
[CHG] insert the 'Add a row' link before the padding rows
bzr revid: xmo@openerp.com-
20120806135248-onwslw7ge72tolwn
pso (OpenERP) [Mon, 6 Aug 2012 13:24:40 +0000 (18:54 +0530)]
[IMP] account: Skipped set option wizard after installation of belgium COA
bzr revid: pso@tinyerp.com-
20120806132440-4w2fj0xyk99kno1s
Thibault Delavallée [Mon, 6 Aug 2012 12:44:54 +0000 (14:44 +0200)]
[MERGE] Merged with web/trunk.
bzr revid: tde@openerp.com-
20120806124454-hgdw4vjzjuhfsg2n
Thibault Delavallée [Mon, 6 Aug 2012 12:44:45 +0000 (14:44 +0200)]
[MERGE] Mergede with addons/trunk.
bzr revid: tde@openerp.com-
20120806124445-hym9imdiqgeot8fu
Thibault Delavallée [Mon, 6 Aug 2012 12:43:37 +0000 (14:43 +0200)]
[MERGE] Merged with server/trunk.
bzr revid: tde@openerp.com-
20120806124337-9z4ussrxn2uhli4i
pso (OpenERP) [Mon, 6 Aug 2012 12:40:51 +0000 (18:10 +0530)]
[MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-
20120806124051-ptqf16m0u7tj7f5u
Thibault Delavallée [Mon, 6 Aug 2012 12:28:35 +0000 (14:28 +0200)]
[MERGE] Fix of the customer portal wizard. Override of schedule_with_attach was wrong: 1-behavior specific to purchase.order was always executed; it is now ecexuted only for purchase.order objects, and the method checks that model and res_id are set; 2-subtype field was wrong, it is now named content_subtype.
bzr revid: tde@openerp.com-
20120806122835-fxzgmhogbh6do8bz
Pinakin Nayi (OpenERP) [Mon, 6 Aug 2012 12:17:22 +0000 (17:47 +0530)]
[IMP]accounting-option-wizard
bzr revid: pna@tinyerp.com-
20120806121722-w2r8givb32dl0mn3
Thibault Delavallée [Mon, 6 Aug 2012 11:50:18 +0000 (13:50 +0200)]
[MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-
20120806115018-jmhfqmw5vikjb3ow
Stephane Wirtel [Mon, 6 Aug 2012 11:00:35 +0000 (13:00 +0200)]
[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons-issues3-account-pso
bzr revid: stw@openerp.com-
20120806110035-mkegg0b6x5oom1mr
Thibault Delavallée [Mon, 6 Aug 2012 10:51:38 +0000 (12:51 +0200)]
[FIX] subtype -> content_subtype.
bzr revid: tde@openerp.com-
20120806105138-ipcsz8yscof5eg0f
Antony Lesuisse [Mon, 6 Aug 2012 10:45:14 +0000 (12:45 +0200)]
[REM] fields float integer useless warning, required can be used to color the field in blue on form view
bzr revid: al@openerp.com-
20120806104514-3cx1dm2bewhmlvbo
Fabien Meghazi [Mon, 6 Aug 2012 10:33:30 +0000 (12:33 +0200)]
[ADD] Added 'home' and 'history_back' client actions
[MOV] Moved client actions from coresetup.js to chrome.js
bzr revid: fme@openerp.com-
20120806103330-xt5gjcntaho4qq7k