odoo/odoo.git
11 years ago[Merge] Merge with lp:openobject-addons
Jalpesh Patel (OpenERP) [Fri, 12 Oct 2012 08:52:35 +0000 (14:22 +0530)]
[Merge] Merge with lp:openobject-addons

bzr revid: pja@tinyerp.com-20121010050854-jl6pyydhr7un9pp6
bzr revid: pja@tinyerp.com-20121012085235-dy62vb0q5xbwy2cm

11 years ago[MERGE] use of formatLAng(amount, currency_obj=...) and use of display_address()...
Quentin (OpenERP) [Fri, 12 Oct 2012 07:16:40 +0000 (09:16 +0200)]
[MERGE] use of formatLAng(amount, currency_obj=...) and use of display_address() in reports

bzr revid: qdp-launchpad@openerp.com-20121012071640-sxhy9xnat65r8158

11 years agoLaunchpad automatic translations update.
Launchpad Translations on behalf of openerp [Fri, 12 Oct 2012 05:09:42 +0000 (05:09 +0000)]
Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121012050942-nfure19k43lzib3e

11 years ago[FIX] dont show errors on reload
Antony Lesuisse [Thu, 11 Oct 2012 20:15:23 +0000 (22:15 +0200)]
[FIX] dont show errors on reload

bzr revid: al@openerp.com-20121011201523-d4t500g4nnfq9ce6

11 years ago[FIX] view_form copy
Antony Lesuisse [Thu, 11 Oct 2012 20:03:46 +0000 (22:03 +0200)]
[FIX] view_form copy

bzr revid: al@openerp.com-20121011200346-p0gq5tq1wsoqyx0a

11 years ago[MERGE] staging branch with several small fixes
Quentin (OpenERP) [Thu, 11 Oct 2012 17:13:28 +0000 (19:13 +0200)]
[MERGE] staging branch with several small fixes

bzr revid: qdp-launchpad@openerp.com-20121011171328-an6udr3wulgza86c

11 years ago[FIX] revert client action params in url
Antony Lesuisse [Thu, 11 Oct 2012 16:41:14 +0000 (18:41 +0200)]
[FIX] revert client action params in url

bzr revid: al@openerp.com-20121011164114-3y7rfbdrg5hdg39c

11 years ago[FIX] restrict set_default values to the current user's company, courtesy of Guewen...
Xavier Morel [Thu, 11 Oct 2012 16:35:18 +0000 (18:35 +0200)]
[FIX] restrict set_default values to the current user's company, courtesy of Guewen Baconnier

bzr revid: xmo@openerp.com-20121011163518-iyewcncrfvqm6o7a

11 years ago[FIX] push_state of client actions: push also params
Christophe Simonis [Thu, 11 Oct 2012 15:19:48 +0000 (17:19 +0200)]
[FIX] push_state of client actions: push also params

bzr revid: chs@openerp.com-20121011151948-82zk0icmw8zoyfis

11 years ago[IMP] project: usability small imp
Quentin (OpenERP) [Thu, 11 Oct 2012 15:15:25 +0000 (17:15 +0200)]
[IMP] project: usability small imp

bzr revid: qdp-launchpad@openerp.com-20121011151525-wnnk2p88yjhy9snd

11 years ago[FIX] project: default type of analytic account must be 'contract'
Quentin (OpenERP) [Thu, 11 Oct 2012 15:03:11 +0000 (17:03 +0200)]
[FIX] project: default type of analytic account must be 'contract'

bzr revid: qdp-launchpad@openerp.com-20121011150311-ycxbxe38930o6hl5

11 years ago[MERGE] trunk-bug-1024145-abo: fix an issue in event reporting due to a missing outer...
Antonin Bourguignon [Thu, 11 Oct 2012 14:54:27 +0000 (16:54 +0200)]
[MERGE] trunk-bug-1024145-abo: fix an issue in event reporting due to a missing outer join in the psql view

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

bzr revid: abo@openerp.com-20121011145427-m8ol0yo980kz5j9k

11 years ago[FIX] mail: more typos
Olivier Dony [Thu, 11 Oct 2012 14:38:04 +0000 (16:38 +0200)]
[FIX] mail: more typos

bzr revid: odo@openerp.com-20121011143804-dqtc64p9fb2ixqr7

11 years ago[MERGE] Merge unsorted fixes from trunk-fp (+fix fp-style merge)
Fabien Pinckaers [Thu, 11 Oct 2012 14:36:35 +0000 (16:36 +0200)]
[MERGE] Merge unsorted fixes from trunk-fp (+fix fp-style merge)

bzr revid: odo@openerp.com-20121011143635-bba3q7gj8y9cx7k1

11 years ago[IMP] purchase workflow: highlight 'send RFQ button' when state is draft
Quentin (OpenERP) [Thu, 11 Oct 2012 14:35:33 +0000 (16:35 +0200)]
[IMP] purchase workflow: highlight 'send RFQ button' when state is draft

bzr revid: qdp-launchpad@openerp.com-20121011143533-p0aw2nkddcwgb1ze

11 years ago[MERGE] trunk-fp
Fabien Pinckaers [Thu, 11 Oct 2012 14:24:29 +0000 (16:24 +0200)]
[MERGE] trunk-fp

bzr revid: fp@tinyerp.com-20121011142429-sy751vrsz1xh7bx5

11 years ago[MERGE] trunk
Fabien Pinckaers [Thu, 11 Oct 2012 14:23:08 +0000 (16:23 +0200)]
[MERGE] trunk

bzr revid: fp@tinyerp.com-20121011142308-vdynmuonffi31yug

11 years ago[MERGE] Merge trunk-trigger-on_menu_logout.
vta vta@openerp.com [Thu, 11 Oct 2012 14:14:48 +0000 (16:14 +0200)]
[MERGE] Merge trunk-trigger-on_menu_logout.

bzr revid: vta@openerp.com-20121011141448-iqegsneg3dkesfqn

11 years ago[MERGE] Latest trunk.
vta vta@openerp.com [Thu, 11 Oct 2012 14:08:00 +0000 (16:08 +0200)]
[MERGE] Latest trunk.

bzr revid: vta@openerp.com-20121011140800-5xwywdedpopgj6au

11 years ago[IMP] make sure that the view is properly dropped before we re-create it
Antonin Bourguignon [Thu, 11 Oct 2012 14:04:30 +0000 (16:04 +0200)]
[IMP] make sure that the view is properly dropped before we re-create it
the REPLACE VIEW statement can generate type conflicts in case where the view's data types change between two updates

bzr revid: abo@openerp.com-20121011140430-0wgo70snzjhuxpyr

11 years ago[FIX] mail: Unagree is not a word
Olivier Dony [Thu, 11 Oct 2012 14:04:14 +0000 (16:04 +0200)]
[FIX] mail: Unagree is not a word

bzr revid: odo@openerp.com-20121011140414-b8nz90ww6nf9ln9j

11 years ago[IMP] properly fetch events that have no registration
Antonin Bourguignon [Thu, 11 Oct 2012 13:58:09 +0000 (15:58 +0200)]
[IMP] properly fetch events that have no registration
in order to achieve that, remove the previous patch which was too exclusive (WHERE r.id IS NOT NULL) and use 'virtual' ids instead
the unicity is guaranteed by concatenating the event id and the registration id (if any)

bzr revid: abo@openerp.com-20121011135809-fag9br23hthrwy1s

11 years ago[MERGE] trunk-trigger-on_prev_view.
vta vta@openerp.com [Thu, 11 Oct 2012 13:53:10 +0000 (15:53 +0200)]
[MERGE] trunk-trigger-on_prev_view.

bzr revid: vta@openerp.com-20121011135310-glkm2uag26hb740q

11 years ago[MERGE] Latest trunk.
vta vta@openerp.com [Thu, 11 Oct 2012 13:50:30 +0000 (15:50 +0200)]
[MERGE] Latest trunk.

bzr revid: vta@openerp.com-20121011135030-zb793i82jxqmg9us

11 years ago[MERGE] Merge trunk-trigger-on_select_elements.
vta vta@openerp.com [Thu, 11 Oct 2012 13:06:32 +0000 (15:06 +0200)]
[MERGE] Merge trunk-trigger-on_select_elements.

bzr revid: vta@openerp.com-20121011130632-0y4t5gmnnrj2fn0z

11 years ago[MERGE] Latest trunk.
vta vta@openerp.com [Thu, 11 Oct 2012 13:05:00 +0000 (15:05 +0200)]
[MERGE] Latest trunk.

bzr revid: vta@openerp.com-20121011130500-y8zhrjwv3g4j2pn3

11 years ago[IMP]replace callbackenable method.
Vidhin Mehta (OpenERP) [Thu, 11 Oct 2012 13:00:11 +0000 (18:30 +0530)]
[IMP]replace callbackenable method.

bzr revid: vme@tinyerp.com-20121011130011-haovxmxr3pj10unp

11 years ago[IMP] now uses py.eval for options
niv-openerp [Thu, 11 Oct 2012 12:57:48 +0000 (14:57 +0200)]
[IMP] now uses py.eval for options

bzr revid: nicolas.vanhoren@openerp.com-20121011125748-8au3gmss2436h5lw

11 years ago[REVERT] removed server-side evaluation of field options
niv-openerp [Thu, 11 Oct 2012 12:22:14 +0000 (14:22 +0200)]
[REVERT] removed server-side evaluation of field options

bzr revid: nicolas.vanhoren@openerp.com-20121011122214-ab1mqyz9h8jnq7ql

11 years ago[FIX] edi: correct import of web client
Christophe Simonis [Thu, 11 Oct 2012 11:44:01 +0000 (13:44 +0200)]
[FIX] edi: correct import of web client

bzr revid: chs@openerp.com-20121011114401-yw8pht7t1gn8bizp

11 years ago[FIX] auth_oauth: correct the constraint. How the heck did runbot still green?
Christophe Simonis [Thu, 11 Oct 2012 11:40:58 +0000 (13:40 +0200)]
[FIX] auth_oauth: correct the constraint. How the heck did runbot still green?

bzr revid: chs@openerp.com-20121011114058-svvb5fbz8dye12jk

11 years ago[FIX] web/tests: leftover import errors after removal of standalone web mode
Olivier Dony [Thu, 11 Oct 2012 11:04:10 +0000 (13:04 +0200)]
[FIX] web/tests: leftover import errors after removal of standalone web mode

bzr revid: odo@openerp.com-20121011110410-pzons7v1cqn4dywf

11 years ago[MERGE] from trunk-openchatter-private-message-chm
Christophe Matthieu [Thu, 11 Oct 2012 10:29:43 +0000 (12:29 +0200)]
[MERGE] from trunk-openchatter-private-message-chm

bzr revid: chm@openerp.com-20121011102943-9yg65edco1ofwx2b

11 years ago[IMP]change method on_selected_elements to elements_selected.
Vidhin Mehta (OpenERP) [Thu, 11 Oct 2012 10:28:49 +0000 (15:58 +0530)]
[IMP]change method on_selected_elements to elements_selected.

bzr revid: vme@tinyerp.com-20121011102849-yn9nldtgqszp70gq

11 years ago[IMP] Remove add in on_menu_logout method
ggh-openerp [Thu, 11 Oct 2012 09:45:38 +0000 (15:15 +0530)]
[IMP] Remove add in on_menu_logout method

bzr revid: ggh@tinyerp.com-20121011094538-d8xrxa0tygrhljdf

11 years ago[IMP] reports: use of FormatLang(amount, currency_obj=...) instead of printing curren...
Quentin (OpenERP) [Thu, 11 Oct 2012 09:40:02 +0000 (11:40 +0200)]
[IMP] reports: use of FormatLang(amount, currency_obj=...) instead of printing currency.symbol directly in the report

bzr revid: qdp-launchpad@openerp.com-20121011094002-7unxi6bi2hh2u6k5

11 years ago[FIX] google docs
Fabien Pinckaers [Thu, 11 Oct 2012 09:19:50 +0000 (11:19 +0200)]
[FIX] google docs

bzr revid: fp@tinyerp.com-20121011091950-yt0p6b8dcsrvlkfv

11 years agoPut back readme and license
niv-openerp [Thu, 11 Oct 2012 08:52:18 +0000 (10:52 +0200)]
Put back readme and license

bzr revid: nicolas.vanhoren@openerp.com-20121011085218-3vwfiujciex326yx

11 years agofix
Fabien Pinckaers [Thu, 11 Oct 2012 08:29:13 +0000 (10:29 +0200)]
fix

bzr revid: fp@tinyerp.com-20121011082913-82wifnn46sqg57ko

11 years ago[MERGE] trunk
Fabien Pinckaers [Thu, 11 Oct 2012 08:19:08 +0000 (10:19 +0200)]
[MERGE] trunk

bzr revid: fp@tinyerp.com-20121011081908-fu1don49seb3loro

11 years ago[MERGE] trunk
Antonin Bourguignon [Thu, 11 Oct 2012 08:13:59 +0000 (10:13 +0200)]
[MERGE] trunk

bzr revid: abo@openerp.com-20121011081359-kusmupkqafxu64u3

11 years ago[MERGE] trunk
Quentin (OpenERP) [Thu, 11 Oct 2012 07:56:58 +0000 (09:56 +0200)]
[MERGE] trunk

bzr revid: qdp-launchpad@openerp.com-20121011075658-bf5ax000j74vi6ro

11 years ago[MERGE] from trunk
Christophe Matthieu [Thu, 11 Oct 2012 07:46:26 +0000 (09:46 +0200)]
[MERGE] from trunk

bzr revid: chm@openerp.com-20121011074626-rztxx7vnhg8sd72l

11 years ago[MERGE] from trunk
Christophe Matthieu [Thu, 11 Oct 2012 07:16:02 +0000 (09:16 +0200)]
[MERGE] from trunk

bzr revid: chm@openerp.com-20121011071602-u23xansbga1i41vs

11 years ago[IMP]replace callbackenable from on_select_elements.
Vidhin Mehta (OpenERP) [Thu, 11 Oct 2012 07:04:39 +0000 (12:34 +0530)]
[IMP]replace callbackenable from on_select_elements.

bzr revid: vme@tinyerp.com-20121011070439-vzcua4yoiwlz2evk

11 years agoLaunchpad automatic translations update.
Launchpad Translations on behalf of openerp [Thu, 11 Oct 2012 05:00:45 +0000 (05:00 +0000)]
Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121011050045-qe3vhe34wrjw1xb8

11 years ago[IMP] CrashManager use event dispatcher and cleanups
Antony Lesuisse [Thu, 11 Oct 2012 00:37:29 +0000 (02:37 +0200)]
[IMP] CrashManager use event dispatcher and cleanups

bzr revid: al@openerp.com-20121011003729-jjbh5se1cpsachvm

11 years ago[FIX] auth_signup pass on the state
Antony Lesuisse [Thu, 11 Oct 2012 00:05:34 +0000 (02:05 +0200)]
[FIX] auth_signup pass on the state

bzr revid: al@openerp.com-20121011000534-w3wa7m3mh1znylde

11 years ago[FIX] login always set params for potential redirection
Antony Lesuisse [Thu, 11 Oct 2012 00:02:17 +0000 (02:02 +0200)]
[FIX] login always set params for potential redirection

bzr revid: al@openerp.com-20121011000217-ck3xsquoain1z8ja

11 years ago[IMP]
Fabien Pinckaers [Wed, 10 Oct 2012 22:04:24 +0000 (00:04 +0200)]
[IMP]

bzr revid: fp@openerp.com-20121010220424-21gc23fsjcwi85iv

11 years ago[MERGE] trunk-export_terminology-mdi manually
Antony Lesuisse [Wed, 10 Oct 2012 21:23:52 +0000 (23:23 +0200)]
[MERGE] trunk-export_terminology-mdi manually

bzr revid: al@openerp.com-20121010212352-ulfyar0j2x2w2jbo

11 years ago[MERGE] company: reports are now printing the company address as per its country...
Quentin (OpenERP) [Wed, 10 Oct 2012 20:55:55 +0000 (22:55 +0200)]
[MERGE] company: reports are now printing the company address as per its country format

bzr revid: qdp-launchpad@openerp.com-20121010205555-fsgudcepuy153ye2

11 years agofix
Fabien Pinckaers [Wed, 10 Oct 2012 20:49:22 +0000 (22:49 +0200)]
fix

bzr revid: fp@openerp.com-20121010204922-1xorvxf43lscb84a

11 years ago[IMP] remove standalone web client, fix logging
Antony Lesuisse [Wed, 10 Oct 2012 20:48:29 +0000 (22:48 +0200)]
[IMP] remove standalone web client, fix logging

bzr revid: al@openerp.com-20121010204829-5vamumz9lhxpsgob

11 years ago[MERGE]
Fabien Pinckaers [Wed, 10 Oct 2012 20:47:33 +0000 (22:47 +0200)]
[MERGE]

bzr revid: fp@openerp.com-20121010204733-eqg9lhokufm387tr

11 years ago[IMP] remove standalone web client, fix imports
Antony Lesuisse [Wed, 10 Oct 2012 20:46:17 +0000 (22:46 +0200)]
[IMP] remove standalone web client, fix imports

bzr revid: al@openerp.com-20121010204617-ah29rz616xo7i2dr

11 years ago[MERGE] remove standalone web client
Antony Lesuisse [Wed, 10 Oct 2012 20:44:51 +0000 (22:44 +0200)]
[MERGE] remove standalone web client

bzr revid: al@openerp.com-20121010204451-nq3eatsl1x9zi1cf

11 years ago[MERGE] staging branch
Quentin (OpenERP) [Wed, 10 Oct 2012 20:41:06 +0000 (22:41 +0200)]
[MERGE] staging branch

bzr revid: qdp-launchpad@openerp.com-20121010204106-93h2ltcok9cuk2mt

11 years ago[MERGE]
Fabien Pinckaers [Wed, 10 Oct 2012 20:38:18 +0000 (22:38 +0200)]
[MERGE]

bzr revid: fp@openerp.com-20121010203818-32otffomve5ifm16

11 years agoweb remove common, fix imports
Antony Lesuisse [Wed, 10 Oct 2012 20:37:53 +0000 (22:37 +0200)]
web remove common, fix imports

bzr revid: al@openerp.com-20121010203753-azrcz3k2kd44ni24

11 years ago[MERGE] config for after sale services
Fabien Pinckaers [Wed, 10 Oct 2012 20:28:28 +0000 (22:28 +0200)]
[MERGE] config for after sale services

bzr revid: fp@openerp.com-20121010202828-k3vla8ejkhsczlp8

11 years ago[MERGE] binary fields
Fabien Pinckaers [Wed, 10 Oct 2012 20:22:48 +0000 (22:22 +0200)]
[MERGE] binary fields

bzr revid: fp@openerp.com-20121010202248-xjg4bl3dolrjuder

11 years ago[MERGE] documents
Fabien Pinckaers [Wed, 10 Oct 2012 20:21:48 +0000 (22:21 +0200)]
[MERGE] documents

bzr revid: fp@openerp.com-20121010202148-hsisroe6a2tra2um

11 years ago[IMP] document names
Fabien Pinckaers [Wed, 10 Oct 2012 20:18:23 +0000 (22:18 +0200)]
[IMP] document names

bzr revid: fp@openerp.com-20121010201823-rgv2zv73urxz3ysh

11 years ago[MERGE] del on google doc icon in attachments
Fabien Pinckaers [Wed, 10 Oct 2012 20:13:35 +0000 (22:13 +0200)]
[MERGE] del on google doc icon in attachments

bzr revid: fp@openerp.com-20121010201335-xznfnvpp9272h3gb

11 years ago[MERGE] create=false
Fabien Pinckaers [Wed, 10 Oct 2012 20:05:11 +0000 (22:05 +0200)]
[MERGE] create=false

bzr revid: fp@openerp.com-20121010200511-yjmajwybmf3yfitm

11 years ago[MERGE] sale
Fabien Pinckaers [Wed, 10 Oct 2012 20:00:32 +0000 (22:00 +0200)]
[MERGE] sale

bzr revid: fp@openerp.com-20121010200032-p026szu3sys29cp0

11 years ago[MERGE] sale delivery invoice address
Fabien Pinckaers [Wed, 10 Oct 2012 19:58:11 +0000 (21:58 +0200)]
[MERGE] sale delivery invoice address

bzr revid: fp@openerp.com-20121010195811-tqsqxdjpapj8sbpd

11 years ago[IMP] stock misc
Fabien Pinckaers [Wed, 10 Oct 2012 19:47:10 +0000 (21:47 +0200)]
[IMP] stock misc

bzr revid: fp@openerp.com-20121010194710-m2wkdx5pvknk0hno

11 years ago[MERGE] conver tto quote useability
Fabien Pinckaers [Wed, 10 Oct 2012 19:43:25 +0000 (21:43 +0200)]
[MERGE] conver tto quote useability

bzr revid: fp@openerp.com-20121010194325-pisfvcf8664q78c1

11 years ago[MERGE]
Fabien Pinckaers [Wed, 10 Oct 2012 19:34:11 +0000 (21:34 +0200)]
[MERGE]

bzr revid: fp@openerp.com-20121010193411-78hf4ivhw7jiy6oc

11 years agomerge_trunk
Fabien Pinckaers [Wed, 10 Oct 2012 19:33:15 +0000 (21:33 +0200)]
merge_trunk

bzr revid: fp@openerp.com-20121010193315-3l1tvk8by3p1hy2x

11 years ago[FIX] HR useability improvements
Fabien Pinckaers [Wed, 10 Oct 2012 19:29:27 +0000 (21:29 +0200)]
[FIX] HR useability improvements

bzr revid: fp@openerp.com-20121010192927-6ud5e3zvhp5gabip

11 years ago[MERGE] partner manager -> contact creation
Fabien Pinckaers [Wed, 10 Oct 2012 19:15:14 +0000 (21:15 +0200)]
[MERGE] partner manager -> contact creation

bzr revid: fp@openerp.com-20121010191514-2mtm2sfssyhqoe3c

11 years ago[FIX] event crashes
Fabien Pinckaers [Wed, 10 Oct 2012 19:13:20 +0000 (21:13 +0200)]
[FIX] event crashes

bzr revid: fp@openerp.com-20121010191320-z5j6tkza4p76ud44

11 years ago[MERGE]
Fabien Pinckaers [Wed, 10 Oct 2012 19:04:38 +0000 (21:04 +0200)]
[MERGE]

bzr revid: fp@openerp.com-20121010190438-x2o6jhuoknexa67k

11 years ago[MERGE] from trunk
Christophe Matthieu [Wed, 10 Oct 2012 18:57:21 +0000 (20:57 +0200)]
[MERGE] from trunk

bzr revid: chm@openerp.com-20121010185721-in3ab4mr8h72lect

11 years ago[MERGE] purchase: ps review
Quentin (OpenERP) [Wed, 10 Oct 2012 18:44:14 +0000 (20:44 +0200)]
[MERGE] purchase: ps review

bzr revid: qdp-launchpad@openerp.com-20121010184414-eys4z5k531qwx5ck

11 years ago[MERGE] trunk
Quentin (OpenERP) [Wed, 10 Oct 2012 18:42:05 +0000 (20:42 +0200)]
[MERGE] trunk

bzr revid: qdp-launchpad@openerp.com-20121010184205-7ujgszgtohgphhpg

11 years ago[IMP] chatter, follower: html/js for css imp
Christophe Matthieu [Wed, 10 Oct 2012 18:16:11 +0000 (20:16 +0200)]
[IMP] chatter, follower: html/js for css imp

bzr revid: chm@openerp.com-20121010181611-rl167r9h0ejz8zdu

11 years agoremove standalone
Antony Lesuisse [Wed, 10 Oct 2012 17:24:18 +0000 (19:24 +0200)]
remove standalone

bzr revid: al@openerp.com-20121010172418-27stgsd4w71cbxv4

11 years ago[IMP] add a tofix in the comments
Antonin Bourguignon [Wed, 10 Oct 2012 16:45:23 +0000 (18:45 +0200)]
[IMP] add a tofix in the comments

bzr revid: abo@openerp.com-20121010164523-hl70trg3txylev93

11 years ago[IMP] remove duplicated fields from the GROUP BY statement
Antonin Bourguignon [Wed, 10 Oct 2012 16:40:16 +0000 (18:40 +0200)]
[IMP] remove duplicated fields from the GROUP BY statement

bzr revid: abo@openerp.com-20121010164016-7s3y43yubhwc5g1w

11 years ago[IMP] code style
Antonin Bourguignon [Wed, 10 Oct 2012 16:36:25 +0000 (18:36 +0200)]
[IMP] code style

bzr revid: abo@openerp.com-20121010163625-ybklx8alceyo1qaa

11 years ago[MERGE] trunk
Antonin Bourguignon [Wed, 10 Oct 2012 16:06:29 +0000 (18:06 +0200)]
[MERGE] trunk

bzr revid: abo@openerp.com-20121010160629-av53hqj43b61kna3

11 years ago[MERGE] second and last phase of new import
Xavier Morel [Wed, 10 Oct 2012 15:51:01 +0000 (17:51 +0200)]
[MERGE] second and last phase of new import

bzr revid: xmo@openerp.com-20121010155101-fs38ceua1mp7rw6z

11 years ago[MERGE] from trunk
Xavier Morel [Wed, 10 Oct 2012 15:46:05 +0000 (17:46 +0200)]
[MERGE] from trunk

bzr revid: xmo@openerp.com-20121010154605-u16f57fnck148ued

11 years ago[MERGE] merged the branch with monetary widget on main objects
Quentin (OpenERP) [Wed, 10 Oct 2012 15:17:10 +0000 (17:17 +0200)]
[MERGE] merged the branch with monetary widget on main objects

bzr revid: qdp-launchpad@openerp.com-20121010151710-m0iyijgsym6tweq4

11 years ago[MERGE] purchase, PS review
Quentin (OpenERP) [Wed, 10 Oct 2012 14:40:59 +0000 (16:40 +0200)]
[MERGE] purchase, PS review

bzr revid: qdp-launchpad@openerp.com-20121010144059-vr7l0scq6u1ahr20

11 years ago[MERGE] trunk-trigger-on_unlink.
vta vta@openerp.com [Wed, 10 Oct 2012 14:36:53 +0000 (16:36 +0200)]
[MERGE] trunk-trigger-on_unlink.

bzr revid: vta@openerp.com-20121010143653-wi0yjq91l8ty43uj

11 years ago[FIX] on_unlink.
vta vta@openerp.com [Wed, 10 Oct 2012 14:36:07 +0000 (16:36 +0200)]
[FIX] on_unlink.

bzr revid: vta@openerp.com-20121010143607-nv3lhmy8r27m1ls9

11 years ago[MERGE] trunk
Quentin (OpenERP) [Wed, 10 Oct 2012 14:32:06 +0000 (16:32 +0200)]
[MERGE] trunk

bzr revid: qdp-launchpad@openerp.com-20121010143206-74p0k9xiojz2yc4z

11 years ago[FIX] auth_oauth: add unique constraint on (oauth_provide_id,oauth_uid) + do not...
Christophe Simonis [Wed, 10 Oct 2012 14:01:04 +0000 (16:01 +0200)]
[FIX] auth_oauth: add unique constraint on (oauth_provide_id,oauth_uid) + do not try to create user if signup is not installed

bzr revid: chs@openerp.com-20121010140104-4amqblnbu0es753x

11 years ago[MERGE] trunk
Antonin Bourguignon [Wed, 10 Oct 2012 13:56:29 +0000 (15:56 +0200)]
[MERGE] trunk

bzr revid: abo@openerp.com-20121010135629-ywtajjsopoo5jvv0

11 years ago[FIX] project: fixed error introduced in revision 7741
Quentin (OpenERP) [Wed, 10 Oct 2012 13:54:14 +0000 (15:54 +0200)]
[FIX] project: fixed error introduced in revision 7741

bzr revid: qdp-launchpad@openerp.com-20121010135414-q7hp9mu752j3z3rk

11 years ago[FIX] account_voucher: wrong accounting entry for supplier payment in foreign currency
Quentin (OpenERP) [Wed, 10 Oct 2012 13:53:59 +0000 (15:53 +0200)]
[FIX] account_voucher: wrong accounting entry for supplier payment in foreign currency

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

bzr revid: qdp-launchpad@openerp.com-20121010135359-0h0cxeyvk8lrtzni

11 years ago[MERGE] base_import: second phase; update to some addons
Xavier Morel [Wed, 10 Oct 2012 13:47:37 +0000 (15:47 +0200)]
[MERGE] base_import: second phase; update to some addons

bzr revid: xmo@openerp.com-20121010134737-u6zka0yas8sgawhz

11 years ago[MERGE] Merged trunk-trigger-on_saved.
vta vta@openerp.com [Wed, 10 Oct 2012 13:25:43 +0000 (15:25 +0200)]
[MERGE] Merged trunk-trigger-on_saved.

bzr revid: vta@openerp.com-20121010132543-1363lzujopqo0wo7

11 years ago[FIX] Fixed on_saved.
vta vta@openerp.com [Wed, 10 Oct 2012 13:20:49 +0000 (15:20 +0200)]
[FIX] Fixed on_saved.

bzr revid: vta@openerp.com-20121010132049-uuqru2c0k81s3o90

11 years ago[MERGE] from trunk
Xavier Morel [Wed, 10 Oct 2012 13:06:53 +0000 (15:06 +0200)]
[MERGE] from trunk

bzr revid: xmo@openerp.com-20121010130653-zjsc2kuhmbyb512s