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

Quentin (OpenERP) [Wed, 7 Nov 2012 11:10:43 +0000 (12:10 +0100)]

[MERGE] staging branch with new version of lunch module, made by api

bzr revid: qdp-launchpad@openerp.com-20121107111043-hoxenf5bsl0dmxfl

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 7 Nov 2012 10:43:48 +0000 (11:43 +0100)]

[REN] lunch: renamed security/groups.xml to meet OpenERP standards and conventions

bzr revid: qdp-launchpad@openerp.com-20121107104348-9xkt13jmscamgy34

commit | commitdiff | tree

Launchpad Translations on behalf of openerp [Wed, 7 Nov 2012 04:55:49 +0000 (04:55 +0000)]

Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121107043841-l0evnkldw3r700x5
bzr revid: launchpad_translations_on_behalf_of_openerp-20121107045549-xo24icru3zmufl8e

commit | commitdiff | tree

Antony Lesuisse [Wed, 7 Nov 2012 01:57:08 +0000 (02:57 +0100)]

[IMP] improve experience on for openerp developers on windows, notes in setup.py and fix some imports

bzr revid: al@openerp.com-20121107015708-o9l893ll9f32wjcy

commit | commitdiff | tree

Fabien Pinckaers [Tue, 6 Nov 2012 23:05:28 +0000 (00:05 +0100)]

[IMP] CSS small improvement

bzr revid: fp@openerp.com-20121106230528-1rq72g0n0okde870

commit | commitdiff | tree

Fabien Pinckaers [Tue, 6 Nov 2012 23:04:16 +0000 (00:04 +0100)]

[IMP] note CSS

bzr revid: fp@openerp.com-20121106230416-xi6ddk7ll02wii7i

commit | commitdiff | tree

Fabien Pinckaers [Tue, 6 Nov 2012 22:39:12 +0000 (23:39 +0100)]

[FIX] css

bzr revid: fp@openerp.com-20121106223912-yz8yyjpbd6d1kjn0

commit | commitdiff | tree

Fabien Pinckaers [Tue, 6 Nov 2012 22:05:08 +0000 (23:05 +0100)]

[IMP] typo

bzr revid: fp@openerp.com-20121106220508-2fojaq6021v2i2jt

commit | commitdiff | tree

Fabien Pinckaers [Tue, 6 Nov 2012 21:28:18 +0000 (22:28 +0100)]

[IMP] Expenses configuration menu simplified

bzr revid: fp@openerp.com-20121106212818-hlq7s697ww3y3kbq

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 6 Nov 2012 19:35:50 +0000 (20:35 +0100)]

[MERGE] trunk

bzr revid: qdp-launchpad@openerp.com-20121106193550-8ewwpdh90lmlzjt2

commit | commitdiff | tree

Olivier Dony [Tue, 6 Nov 2012 18:16:36 +0000 (19:16 +0100)]

[FIX] l10n_*: ensure install wizard triggers are in `noupdate` blocks, to avoid spurious wizards at update

bzr revid: odo@openerp.com-20121106181636-i3oqcyg10ysxf012

commit | commitdiff | tree

Olivier Dony [Tue, 6 Nov 2012 18:15:07 +0000 (19:15 +0100)]

[FIX] orm,web_services: properly return results of workflow triggers

bzr revid: odo@openerp.com-20121106181507-ss1w425c1omsn3sb

commit | commitdiff | tree

Olivier Dony [Tue, 6 Nov 2012 18:15:02 +0000 (19:15 +0100)]

[FIX] res.partner: read image files in binary mode

lp bug: https://launchpad.net/bugs/1048040 fixed

bzr revid: odo@openerp.com-20121106181502-tzqmrhs0u8odngvz

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 6 Nov 2012 17:25:44 +0000 (18:25 +0100)]

[MERGE] lunch from api

bzr revid: qdp-launchpad@openerp.com-20121106172544-i6rfqhslrbqf60v7

commit | commitdiff | tree

Fabien Meghazi [Tue, 6 Nov 2012 17:20:36 +0000 (18:20 +0100)]

[IMP] Binary Image: warn user when selected image could not be displayed. Also use placeholder

bzr revid: fme@openerp.com-20121106172036-d9jkebo9mj45thft

commit | commitdiff | tree

Arnaud Pineux [Tue, 6 Nov 2012 16:29:07 +0000 (17:29 +0100)]

[REF]English demo, fix report, clear security

bzr revid: api@openerp.com-20121106162907-ir7ujoxowlrqouyt

commit | commitdiff | tree

Fabien Meghazi [Tue, 6 Nov 2012 16:27:53 +0000 (17:27 +0100)]

[IMP] ir.translation, raise exception when trying to translate fields when no extra language is installed.

bzr revid: fme@openerp.com-20121106162753-6eqbhnwqhjgeun78

commit | commitdiff | tree

Xavier Morel [Tue, 6 Nov 2012 16:17:15 +0000 (17:17 +0100)]

[FIX] disable advanced search apply button in search view when there are no propositions

avoids locking up the browser by entering an infinite loop when unshifting ors on domains

bzr revid: xmo@openerp.com-20121106161715-7vc55kps8gi8h3lb

commit | commitdiff | tree

niv-openerp [Tue, 6 Nov 2012 16:25:25 +0000 (17:25 +0100)]

[FIX] rare problem in m2mtags, when the form view is destroyed just after a reload

lp bug: https://launchpad.net/bugs/1075543 fixed

bzr revid: nicolas.vanhoren@openerp.com-20121106162525-c835kdpjpj66e714

commit | commitdiff | tree

Thibault Delavallée [Tue, 6 Nov 2012 16:16:03 +0000 (17:16 +0100)]

[MERGE] Introducing the Many2Many Email Widget, based on Many2Many Tags. This widget designed for many2many fields on partners checks that partners added in the widget have an email address defined; if not, a popup is opened to enter an email.

The widget is defined in the mail addons module, but this web-side revision adds a trigger when destroying a popup, because this event is used in the widget.

bzr revid: tde@openerp.com-20121106161603-gybjhsjavwe5bgd2

commit | commitdiff | tree

Thibault Delavallée [Tue, 6 Nov 2012 16:15:49 +0000 (17:15 +0100)]

[MERGE] Introducing the Many2Many Email Widget, based on Many2Many Tags. This widget designed for many2many fields on partners checks that partners added in the widget have an email address defined; if not, a popup is opened to enter an email.

Also featuring in a 'by the way' fashion:
- the 'Compose' button now opens a mail.compose.message wizard, without using further Chatter values.

bzr revid: tde@openerp.com-20121106161549-qzmvmu96c5ony0zr

commit | commitdiff | tree

Thibault Delavallée [Tue, 6 Nov 2012 15:58:13 +0000 (16:58 +0100)]

[REVIEW] Some code cleaning in js.

bzr revid: tde@openerp.com-20121106155813-h2zswqc16z6ev2k9

commit | commitdiff | tree

Thibault Delavallée [Tue, 6 Nov 2012 15:57:02 +0000 (16:57 +0100)]

[CLEAN] mail.js: removed unnecessary default values in context.

bzr revid: tde@openerp.com-20121106155702-bq5xg7z6qmwqjema

commit | commitdiff | tree

Arnaud Pineux [Tue, 6 Nov 2012 15:55:23 +0000 (16:55 +0100)]

[FIX]some changes

bzr revid: api@openerp.com-20121106155523-vhpbuw6lfniqqgeu

commit | commitdiff | tree

Christophe Matthieu [Tue, 6 Nov 2012 15:50:24 +0000 (16:50 +0100)]

[IMP] web: many2many_tags_email: convert read id by search for load all ID with only one request

bzr revid: chm@openerp.com-20121106155024-x3buowqrlnlcv160

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 6 Nov 2012 15:47:31 +0000 (16:47 +0100)]

[REF] lunch: review of wizards

bzr revid: qdp-launchpad@openerp.com-20121106154731-lgj5mpu9n29d8958

commit | commitdiff | tree

niv-openerp [Tue, 6 Nov 2012 15:39:29 +0000 (16:39 +0100)]

[FIX] Problem with list view and some references

lp bug: https://launchpad.net/bugs/1071491 fixed

bzr revid: nicolas.vanhoren@openerp.com-20121106153929-8705y9r3u2b27i8u

commit | commitdiff | tree

Xavier Morel [Tue, 6 Nov 2012 15:21:48 +0000 (16:21 +0100)]

[IMP] port searchview to helpers

bzr revid: xmo@openerp.com-20121106152148-33ctafxz5iy53nl1

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 6 Nov 2012 15:08:13 +0000 (16:08 +0100)]

[MERGE] trunk

bzr revid: qdp-launchpad@openerp.com-20121106150813-dhzzro2ld455gvry

commit | commitdiff | tree

Xavier Morel [Tue, 6 Nov 2012 15:04:49 +0000 (16:04 +0100)]

[IMP] convert searchview to DOM events hash

bzr revid: xmo@openerp.com-20121106150449-1sxybk8jml7xa2ji

commit | commitdiff | tree

Vo Minh Thu [Tue, 6 Nov 2012 15:04:31 +0000 (16:04 +0100)]

[MERGE] removed a few warnings.

bzr revid: vmt@openerp.com-20121106150431-rem9us13kevan8y0

commit | commitdiff | tree

Thibault Delavallée [Tue, 6 Nov 2012 14:59:58 +0000 (15:59 +0100)]

[REVIEW] trigger closing -> closed, to match the code guidelines.

bzr revid: tde@openerp.com-20121106145958-zg11plyzeo5rz6ao

commit | commitdiff | tree

Thibault Delavallée [Tue, 6 Nov 2012 14:59:40 +0000 (15:59 +0100)]

[REVIEW] trigger closing -> trigger closed, to match the code guidelines.

bzr revid: tde@openerp.com-20121106145940-cji6varovqtgneiz

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 6 Nov 2012 14:55:56 +0000 (15:55 +0100)]

[MERGE] fix in account_voucher (bug spotted by nel)

bzr revid: qdp-launchpad@openerp.com-20121106145556-x95mzg8fukkvoxcs

commit | commitdiff | tree

Thibault Delavallée [Tue, 6 Nov 2012 14:53:46 +0000 (15:53 +0100)]

[MERGE] Sync with addons/trunk.

bzr revid: tde@openerp.com-20121106145346-twr7rg31q2za5bx9

commit | commitdiff | tree

Thibault Delavallée [Tue, 6 Nov 2012 14:53:36 +0000 (15:53 +0100)]

[MERGE] Sync with web/trunk.

bzr revid: tde@openerp.com-20121106145336-vm8vxzd9baui7iih

commit | commitdiff | tree

Xavier Morel [Tue, 6 Nov 2012 14:47:36 +0000 (15:47 +0100)]

[FIX] searchview drawer closing when clicking advanced proposition

handler for "global click filtered by whether click target is outside
of search view" executed after prop deletion handler has executed =>
the whole proposition has already been removed from the document and
thus isn't a descendent of the searchview anymore => test matches and
drawer closes.

Altered handler to stop propagation so does not reach global handler.

bzr revid: xmo@openerp.com-20121106144736-l0pde7phf3nake4t

commit | commitdiff | tree

Xavier Morel [Tue, 6 Nov 2012 14:18:35 +0000 (15:18 +0100)]

[FIX] width of progress bars in list view

bzr revid: xmo@openerp.com-20121106141835-fd8spbm93h3etjps

commit | commitdiff | tree

Xavier Morel [Tue, 6 Nov 2012 14:05:19 +0000 (15:05 +0100)]

[FIX] double html-escaping of group titles in grouped lists (eg analysis)

bzr revid: xmo@openerp.com-20121106140519-0qnq934rr44l6kgt

commit | commitdiff | tree

Christophe Matthieu [Tue, 6 Nov 2012 12:52:06 +0000 (13:52 +0100)]

[IMP] web: trigger closing for popup

bzr revid: chm@openerp.com-20121106125206-icm2s8fvb13m40w9

commit | commitdiff | tree

Christophe Matthieu [Tue, 6 Nov 2012 12:51:33 +0000 (13:51 +0100)]

[IMP] web: FieldMany2ManyTagsEmail check id partner on change value. File inside mail addons folder

bzr revid: chm@openerp.com-20121106125133-udq68eyek9fhsw83

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 6 Nov 2012 12:37:59 +0000 (13:37 +0100)]

[FIX] account_voucher: using pay invoice wizard on customer refund was creating wrong entries

bzr revid: qdp-launchpad@openerp.com-20121106123759-rli58yp8lwyub59o

commit | commitdiff | tree

Vo Minh Thu [Tue, 6 Nov 2012 11:25:08 +0000 (12:25 +0100)]

[MERGE] Made the assertion report available on the registry.

bzr revid: vmt@openerp.com-20121106112508-1jeb6zgtg1g67h3k

commit | commitdiff | tree

Christophe Matthieu [Tue, 6 Nov 2012 09:57:00 +0000 (10:57 +0100)]

[IMP] web: field many2many_tags_email moved to mail addon

bzr revid: chm@openerp.com-20121106095700-q5gtxandi7o0jn6o

commit | commitdiff | tree

Christophe Matthieu [Tue, 6 Nov 2012 09:56:19 +0000 (10:56 +0100)]

[IMP] web: field many2many_tags_email moved to mail addon

bzr revid: chm@openerp.com-20121106095619-bl7xg1bhubweetpo

commit | commitdiff | tree

Xavier Morel [Tue, 6 Nov 2012 09:32:37 +0000 (10:32 +0100)]

[FIX] test data: duplicating existing demo data crimps my style

bzr revid: xmo@openerp.com-20121106093237-vsbo2l5pjup42frp

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 6 Nov 2012 09:08:25 +0000 (10:08 +0100)]

[IMP] lunch: demo data

bzr revid: qdp-launchpad@openerp.com-20121106090825-ebpcmfc8cpl0gkbn

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 6 Nov 2012 09:03:00 +0000 (10:03 +0100)]

[IMP] lunch: code review. usability / fixes

bzr revid: qdp-launchpad@openerp.com-20121106090300-bk9up9ugprfcyqn4

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 6 Nov 2012 08:52:41 +0000 (09:52 +0100)]

[FIX] lunch: extra argument removed in _default method

bzr revid: qdp-launchpad@openerp.com-20121106085241-vfo8mhmf20chwil8

commit | commitdiff | tree

Xavier Morel [Tue, 6 Nov 2012 08:43:53 +0000 (09:43 +0100)]

[FIX] base_import: only allow reloading the current file if there *is* a current file loaded

bzr revid: xmo@openerp.com-20121106084353-npwkbkg6r0wkwdrg

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 6 Nov 2012 08:43:21 +0000 (09:43 +0100)]

[IMP] lunch: usability

bzr revid: qdp-launchpad@openerp.com-20121106084321-04w7l72f8ocoeubw

commit | commitdiff | tree

Xavier Morel [Tue, 6 Nov 2012 08:42:06 +0000 (09:42 +0100)]

[FIX] recursive conversion of o2ms in import

added new test cases from gkr

bzr revid: xmo@openerp.com-20121106084206-1cckepflh9h4g1yv

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 6 Nov 2012 08:26:33 +0000 (09:26 +0100)]

[FIX] lunch: fixed bug introduced during code review, in previous revision

bzr revid: qdp-launchpad@openerp.com-20121106082633-5sysljeo47opkshj

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 6 Nov 2012 08:20:47 +0000 (09:20 +0100)]

[FIX] lunch: fixed bug introduced during code review, in previous revision

bzr revid: qdp-launchpad@openerp.com-20121106082047-ob2e8k26dp0xthdi

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 6 Nov 2012 08:19:04 +0000 (09:19 +0100)]

[REF] lunch: code refactoring and improvements made during code review

bzr revid: qdp-launchpad@openerp.com-20121106081904-07wdsbas8grh4tz8

commit | commitdiff | tree

Launchpad Translations on behalf of openerp [Tue, 6 Nov 2012 05:12:57 +0000 (05:12 +0000)]

Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121106051257-ux0x5d6sa0vn0eha

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 5 Nov 2012 18:18:14 +0000 (19:18 +0100)]

[REF] lunch: code cleaning/refactoring made during code review

bzr revid: qdp-launchpad@openerp.com-20121105181814-s1kn2bkt9pxoildx

commit | commitdiff | tree

Arnaud Pineux [Mon, 5 Nov 2012 16:25:39 +0000 (17:25 +0100)]

[Lunch]

bzr revid: api@openerp.com-20121105162539-vramkfv3hq68tudk

commit | commitdiff | tree

Arnaud Pineux [Mon, 5 Nov 2012 16:05:41 +0000 (17:05 +0100)]

[Lunch]

bzr revid: api@openerp.com-20121105160541-t8x8t7de2fjt0sq3

commit | commitdiff | tree

Arnaud Pineux [Mon, 5 Nov 2012 13:55:48 +0000 (14:55 +0100)]

Lunch

bzr revid: api@openerp.com-20121105135548-nfrnj63a01tz61y9

commit | commitdiff | tree

Arnaud Pineux [Mon, 5 Nov 2012 13:47:01 +0000 (14:47 +0100)]

Lunch

bzr revid: api@openerp.com-20121105134701-0aiqbddpzd2zqsdd

commit | commitdiff | tree

Arnaud Pineux [Mon, 5 Nov 2012 11:01:47 +0000 (12:01 +0100)]

Lunch

bzr revid: api@openerp.com-20121105110147-mts2pt2b0vr29kfh

commit | commitdiff | tree

Xavier Morel [Mon, 5 Nov 2012 10:07:17 +0000 (11:07 +0100)]

[IMP] better logging during import failure

bzr revid: xmo@openerp.com-20121105100717-pqexs7j710s2ea2i

commit | commitdiff | tree

Launchpad Translations on behalf of openerp [Tue, 6 Nov 2012 04:50:08 +0000 (04:50 +0000)]

Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121106045008-xngylwi17dh211vm

commit | commitdiff | tree

Fabien Pinckaers [Mon, 5 Nov 2012 20:40:51 +0000 (21:40 +0100)]

[MERGE] fix POS

bzr revid: fp@openerp.com-20121105204051-g1kx1uf7ur2bj8ke

commit | commitdiff | tree

Fabien Meghazi [Mon, 5 Nov 2012 19:47:33 +0000 (20:47 +0100)]

[IMP] Upgraded dhtmlxscheduler

bzr revid: fme@openerp.com-20121105194733-5yy3zqmk8byfj3v6

commit | commitdiff | tree

Antonin Bourguignon [Mon, 5 Nov 2012 17:30:17 +0000 (18:30 +0100)]

[IMP] use tools.DEFAULT_SERVER_DATETIME_FORMAT

bzr revid: abo@openerp.com-20121105173017-ntxnedz2yffyo5kp

commit | commitdiff | tree

Antonin Bourguignon [Mon, 5 Nov 2012 17:03:18 +0000 (18:03 +0100)]

[IMP] use tools.DEFAULT_SERVER_DATETIME_FORMAT

bzr revid: abo@openerp.com-20121105170318-fmq31jsjf1xriqnh

commit | commitdiff | tree

Fabien Meghazi [Mon, 5 Nov 2012 15:19:14 +0000 (16:19 +0100)]

[MERGE] trunk

bzr revid: fme@openerp.com-20121105151914-tcxu1hn324cbts3l

commit | commitdiff | tree

Antonin Bourguignon [Mon, 5 Nov 2012 15:08:57 +0000 (16:08 +0100)]

[MERGE] trunk-10click-hr: hr modules improvements
regroup hr modules in the modules kanban view
improve onchanges in form views
- hr holidays: auto-fill in employee's department, auto-fill end date when possible, check if start date < end date
- hr recruitment: auto-fill in partner's phone, mobile and email

bzr revid: abo@openerp.com-20121105150857-or0b30opn9pdq123

commit | commitdiff | tree

Fabien Meghazi [Mon, 5 Nov 2012 15:04:12 +0000 (16:04 +0100)]

[FIX] Dirty workaround for dhtmlxscheduler bug

bzr revid: fme@openerp.com-20121105150412-7x0ah1mfuvffsipe

commit | commitdiff | tree

Raphael Collet [Mon, 5 Nov 2012 14:10:51 +0000 (15:10 +0100)]

[MERGE] trunk-bug-related-field-rco (fix and simplify related fields, to handle field chains of length 1)

bzr revid: rco@openerp.com-20121105141051-1333e5jdrfxulalj

commit | commitdiff | tree

Antonin Bourguignon [Mon, 5 Nov 2012 13:32:29 +0000 (14:32 +0100)]

[WIP] better management of start and end dates

bzr revid: abo@openerp.com-20121105133229-e3qge2pid9j6u4ck

commit | commitdiff | tree

Cedric Snauwaert [Mon, 5 Nov 2012 13:29:18 +0000 (14:29 +0100)]

[FIX]Correct the bug due to the name change of module mrp_subproduct to mrp_byproduct which caused an error when trying to access configuration menu of manufacturing in settings. Also add some typo fix

lp bug: https://launchpad.net/bugs/1071178 fixed

bzr revid: csn@openerp.com-20121105132918-pg6hn3l2h3dx8832

commit | commitdiff | tree

Raphael Collet [Mon, 5 Nov 2012 13:17:12 +0000 (14:17 +0100)]

[IMP] fields.related._fnct_read: small improvements

bzr revid: rco@openerp.com-20121105131712-sc70thn3wpyq6o7y

commit | commitdiff | tree

Fabien Meghazi [Mon, 5 Nov 2012 13:01:30 +0000 (14:01 +0100)]

[IMP] Client actions now takes the action as argument. Use action.params for options.

bzr revid: fme@openerp.com-20121105130130-dwkn8124zc6yq933

commit | commitdiff | tree

Fabien Meghazi [Mon, 5 Nov 2012 13:00:53 +0000 (14:00 +0100)]

[IMP] Client actions now takes the action as argument. Use action.params for options.

bzr revid: fme@openerp.com-20121105130053-6gdklt6ok4lst6ba

commit | commitdiff | tree

Cedric Snauwaert [Mon, 5 Nov 2012 12:39:13 +0000 (13:39 +0100)]

[MERGE]merge with latest addons_trunk

bzr revid: csn@openerp.com-20121105123913-cvrvkmgeoqtija71

commit | commitdiff | tree

Launchpad Translations on behalf of openerp [Mon, 5 Nov 2012 11:17:08 +0000 (12:17 +0100)]

Launchpad automatic translations update.

bzr revid: odo@openerp.com-20121105111708-086ye2o6s2a8i7sn

commit | commitdiff | tree

Fabien Pinckaers [Mon, 5 Nov 2012 11:16:09 +0000 (12:16 +0100)]

[MERGE] pos: fix multicompany bugs

(this is also an attempt to fix history breakage due to fp-style merge)

bzr revid: odo@openerp.com-20121105111609-yuaw6wu6jd1ar2a1

commit | commitdiff | tree

Sanjay Gohel (Open ERP) [Mon, 5 Nov 2012 10:43:57 +0000 (16:13 +0530)]

[IMP]pos does not calculate tax and touch screen does not gives actually quantity

bzr revid: sgo@tinyerp.com-20121105104357-6r59u4g20ojg0hlw

commit | commitdiff | tree

Antonin Bourguignon [Mon, 5 Nov 2012 10:15:38 +0000 (11:15 +0100)]

[MERGE] trunk

bzr revid: abo@openerp.com-20121105101538-tdgu6bi8vp2lnqru

commit | commitdiff | tree

Raphael Collet [Mon, 5 Nov 2012 09:49:29 +0000 (10:49 +0100)]

[FIX] fields.related._fnct_read: fix handling of type many2one

bzr revid: rco@openerp.com-20121105094929-oz7trjzwlqw90499

commit | commitdiff | tree

Vo Minh Thu [Mon, 5 Nov 2012 09:01:23 +0000 (10:01 +0100)]

[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20121105090123-difc1iksbnb28mtv

commit | commitdiff | tree

Raphael Collet [Mon, 5 Nov 2012 08:37:56 +0000 (09:37 +0100)]

[MERGE] from trunk

bzr revid: rco@openerp.com-20121105083756-jdr9fxp32djpifqk

commit | commitdiff | tree

Raphael Collet [Mon, 5 Nov 2012 08:22:59 +0000 (09:22 +0100)]

[FIX] fields.related._fnct_write: handle the case where ids is a single id

bzr revid: rco@openerp.com-20121105082259-rcmcjs5n1eimtcpl

commit | commitdiff | tree

Launchpad Translations on behalf of openerp [Mon, 5 Nov 2012 04:40:53 +0000 (04:40 +0000)]

Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121105044053-iwdfmabj0neffc9o

commit | commitdiff | tree

Launchpad Translations on behalf of openerp [Sun, 4 Nov 2012 04:55:54 +0000 (04:55 +0000)]

Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121104045554-ygf95bxx3xy44tm1

commit | commitdiff | tree

Fabien Pinckaers [Sat, 3 Nov 2012 17:21:28 +0000 (18:21 +0100)]

[MERGE] fix multi-company for pos

bzr revid: fp@openerp.com-20121103172128-rx5lvo5xzmsj9ay1

commit | commitdiff | tree

Fabien Pinckaers [Sat, 3 Nov 2012 17:16:27 +0000 (18:16 +0100)]

[FIX] bug pos

bzr revid: fp@openerp.com-20121103171627-7mvvn13494ofbbh0

commit | commitdiff | tree

Fabien Pinckaers [Sat, 3 Nov 2012 17:12:25 +0000 (18:12 +0100)]

[FIX] POS close session without cash register

bzr revid: fp@openerp.com-20121103171225-nlp53s0aenamdhcg

commit | commitdiff | tree

Antony Lesuisse [Sat, 3 Nov 2012 15:34:06 +0000 (16:34 +0100)]

[MERGE] content-disposition fixes by Giedrius Slavinskas

lp bug: https://launchpad.net/bugs/1072803 fixed

bzr revid: al@openerp.com-20121103153406-m2xlwm9af2ekcdc7

commit | commitdiff | tree

Antony Lesuisse [Sat, 3 Nov 2012 15:27:24 +0000 (16:27 +0100)]

[MERGE] view_editor css fixes

bzr revid: al@openerp.com-20121103152724-ag7pq44gm8tmwsv5

commit | commitdiff | tree

Fabien Pinckaers [Sat, 3 Nov 2012 15:25:52 +0000 (16:25 +0100)]

[MERGE] trunk

bzr revid: fp@openerp.com-20121103152552-zlf761mkoxbgyxfh

commit | commitdiff | tree

Fabien Pinckaers [Sat, 3 Nov 2012 15:25:04 +0000 (16:25 +0100)]

[FIX] POS

bzr revid: fp@openerp.com-20121103152504-f3o6ce0e833hdibj

commit | commitdiff | tree

Antony Lesuisse [Sat, 3 Nov 2012 15:00:45 +0000 (16:00 +0100)]

[FIX] remove unsed minified files

bzr revid: al@openerp.com-20121103150045-pkx6ckvc9hp7vaz0