 Christophe Matthieu
|
76a257cd1b
|
[MERGE] from trunk
bzr revid: chm@openerp.com-20121010185721-in3ab4mr8h72lect
|
2012-10-10 20:57:21 +02:00 |
|
|
Quentin (OpenERP)
|
a8c6c4e34a
|
[MERGE] purchase: ps review
bzr revid: qdp-launchpad@openerp.com-20121010184414-eys4z5k531qwx5ck
|
2012-10-10 20:44:14 +02:00 |
|
|
Quentin (OpenERP)
|
e4f56c09b0
|
[MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121010184205-7ujgszgtohgphhpg
|
2012-10-10 20:42:05 +02:00 |
|
|
Christophe Matthieu
|
49a174df57
|
[IMP] chatter, follower: html/js for css imp
bzr revid: chm@openerp.com-20121010181611-rl167r9h0ejz8zdu
|
2012-10-10 20:16:11 +02:00 |
|
|
Antony Lesuisse
|
818fd9f67f
|
remove standalone
bzr revid: al@openerp.com-20121010172418-27stgsd4w71cbxv4
|
2012-10-10 19:24:18 +02:00 |
|
|
Antonin Bourguignon
|
4079c1e4b4
|
[IMP] add a tofix in the comments
bzr revid: abo@openerp.com-20121010164523-hl70trg3txylev93
|
2012-10-10 18:45:23 +02:00 |
|
|
Antonin Bourguignon
|
79e52172f4
|
[IMP] remove duplicated fields from the GROUP BY statement
bzr revid: abo@openerp.com-20121010164016-7s3y43yubhwc5g1w
|
2012-10-10 18:40:16 +02:00 |
|
|
Antonin Bourguignon
|
f7528e87bb
|
[IMP] code style
bzr revid: abo@openerp.com-20121010163625-ybklx8alceyo1qaa
|
2012-10-10 18:36:25 +02:00 |
|
|
Antonin Bourguignon
|
b834fd3252
|
[MERGE] trunk
bzr revid: abo@openerp.com-20121010160629-av53hqj43b61kna3
|
2012-10-10 18:06:29 +02:00 |
|
|
Xavier Morel
|
3351bb2167
|
[MERGE] second and last phase of new import
bzr revid: xmo@openerp.com-20121010155101-fs38ceua1mp7rw6z
|
2012-10-10 17:51:01 +02:00 |
|
|
Xavier Morel
|
7a7876d4a8
|
[MERGE] from trunk
bzr revid: xmo@openerp.com-20121010154605-u16f57fnck148ued
|
2012-10-10 17:46:05 +02:00 |
|
|
Benoit Guillot
|
f4ea0af205
|
[IMP] add docstring and fix refund_id arg. Add also a new prepare method _prepapre_cleanup_fields() to override the fields of the refund lines
bzr revid: benoit.guillot@akretion.com.br-20121010153724-rgjiluytvz3z7qju
|
2012-10-10 17:37:24 +02:00 |
|
|
Atul Patel (OpenERP)
|
23a0926efd
|
[FIX]: Fix for analytic account in hr timesheet sheet line.
bzr revid: atp@tinyerp.com-20121010152258-997mxrukpjeawcpb
|
2012-10-10 20:52:58 +05:30 |
|
|
Quentin (OpenERP)
|
e86e8433cd
|
[MERGE] merged the branch with monetary widget on main objects
bzr revid: qdp-launchpad@openerp.com-20121010151710-m0iyijgsym6tweq4
|
2012-10-10 17:17:10 +02:00 |
|
|
Atul Patel (OpenERP)
|
e2a28b011a
|
[FIX]: Fix on_change_analytic_id problem
bzr revid: atp@tinyerp.com-20121010150849-u4cldadvfjzmw8mj
|
2012-10-10 20:38:49 +05:30 |
|
|
Xavier Morel
|
1fa00288b2
|
[FIX] add 'context' free variable in evaluation contexts for domains and contexts
bzr revid: xmo@openerp.com-20121010145945-16shdry3udum0mn1
|
2012-10-10 16:59:45 +02:00 |
|
|
Quentin (OpenERP)
|
672cec8eda
|
[MERGE] purchase, PS review
bzr revid: qdp-launchpad@openerp.com-20121010144059-vr7l0scq6u1ahr20
|
2012-10-10 16:40:59 +02:00 |
|
|
vta vta@openerp.com
|
db919af452
|
[MERGE] trunk-trigger-on_unlink.
bzr revid: vta@openerp.com-20121010143653-wi0yjq91l8ty43uj
|
2012-10-10 16:36:53 +02:00 |
|
|
vta vta@openerp.com
|
6b509ab8ea
|
[FIX] on_unlink.
bzr revid: vta@openerp.com-20121010143607-nv3lhmy8r27m1ls9
|
2012-10-10 16:36:07 +02:00 |
|
|
Atul Patel (OpenERP)
|
d639f10dad
|
[MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121010143438-a8hnbiw80cfn8oay
|
2012-10-10 20:04:38 +05:30 |
|
|
Quentin (OpenERP)
|
1ec609f1a6
|
[MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121010143206-74p0k9xiojz2yc4z
|
2012-10-10 16:32:06 +02:00 |
|
|
Christophe Simonis
|
4436d11ad7
|
[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
|
2012-10-10 16:01:04 +02:00 |
|
|
Antonin Bourguignon
|
cdc7ee2fba
|
[MERGE] trunk
bzr revid: abo@openerp.com-20121010135629-ywtajjsopoo5jvv0
|
2012-10-10 15:56:29 +02:00 |
|
|
Quentin (OpenERP)
|
ec5b3b7e64
|
[FIX] project: fixed error introduced in revision 7741
bzr revid: qdp-launchpad@openerp.com-20121010135414-q7hp9mu752j3z3rk
|
2012-10-10 15:54:14 +02:00 |
|
|
Quentin (OpenERP)
|
cb89d2d842
|
[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
|
2012-10-10 15:53:59 +02:00 |
|
|
Xavier Morel
|
24c7e25b9b
|
[MERGE] base_import: second phase; update to some addons
bzr revid: xmo@openerp.com-20121010134737-u6zka0yas8sgawhz
|
2012-10-10 15:47:37 +02:00 |
|
|
vta vta@openerp.com
|
709eca0aa6
|
[MERGE] Merged trunk-trigger-on_saved.
bzr revid: vta@openerp.com-20121010132543-1363lzujopqo0wo7
|
2012-10-10 15:25:43 +02:00 |
|
|
ggh-openerp
|
6454fd1590
|
[IMP] Remove add_last in on_search method
bzr revid: ggh@tinyerp.com-20121010132349-n3gdg0jhtyjfufma
|
2012-10-10 18:53:49 +05:30 |
|
|
vta vta@openerp.com
|
94ac244a22
|
[FIX] Fixed on_saved.
bzr revid: vta@openerp.com-20121010132049-uuqru2c0k81s3o90
|
2012-10-10 15:20:49 +02:00 |
|
|
Xavier Morel
|
01f6099cd1
|
[MERGE] from trunk
bzr revid: xmo@openerp.com-20121010130653-zjsc2kuhmbyb512s
|
2012-10-10 15:06:53 +02:00 |
|
|
Antony Lesuisse
|
5775b402a7
|
[MERGE] trunk
bzr revid: al@openerp.com-20121010125833-1w3xgpxgol5x626h
|
2012-10-10 14:58:33 +02:00 |
|
|
Fabien Meghazi
|
7796ecaccf
|
[FIX] auth_oauth calling refactored method
bzr revid: fme@openerp.com-20121010125545-kolr1xcmgvtt1ouc
|
2012-10-10 14:55:45 +02:00 |
|
|
Quentin (OpenERP)
|
7162a62550
|
[IMP] account_asset: added monetary widget on asset form view
bzr revid: qdp-launchpad@openerp.com-20121010125231-q3pmc65m5ujz2anr
|
2012-10-10 14:52:31 +02:00 |
|
|
vta vta@openerp.com
|
6ef264339c
|
[FIX] Fixed conflicts in kanban.js. Thanks to VME.
bzr revid: vta@openerp.com-20121010125212-oy5m304knbifad52
|
2012-10-10 14:52:12 +02:00 |
|
|
Atul Patel (OpenERP)
|
f935c9e482
|
[FIX]: get sheet id using timesheet line user id
bzr revid: atp@tinyerp.com-20121010124716-hdaebwpsowpowhl7
|
2012-10-10 18:17:16 +05:30 |
|
|
Quentin (OpenERP)
|
5cae4f05bf
|
[IMP] hr_expense: added monetary widget on expense form view
bzr revid: qdp-launchpad@openerp.com-20121010124626-gw4inlqinqptubup
|
2012-10-10 14:46:26 +02:00 |
|
|
Amit Patel
|
2191382ce3
|
[IMP]:improved code
bzr revid: apa@tinyerp.com-20121010124115-cfsqfursxprfhgrx
|
2012-10-10 18:11:15 +05:30 |
|
|
Xavier Morel
|
b70d0dab52
|
[FIX] cases where options dict is decoded as unicode strings on windows: csv.reader kwargs *must* be strings
bzr revid: xmo@openerp.com-20121010123827-x76udyurqzgnqebg
|
2012-10-10 14:38:27 +02:00 |
|
|
vta vta@openerp.com
|
afd1a80620
|
[MERGE] trunk-trigger-on_created.
bzr revid: vta@openerp.com-20121010123729-vu3tdkrye78vjtph
|
2012-10-10 14:37:29 +02:00 |
|
|
vta vta@openerp.com
|
3195c02971
|
[FIX] Fixed on_created.
bzr revid: vta@openerp.com-20121010123351-gq8mr73z5avh79nd
|
2012-10-10 14:33:51 +02:00 |
|
|
Quentin (OpenERP)
|
aa4791450f
|
[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-20121010122008-sb3tgrccik1968ga
|
2012-10-10 14:20:08 +02:00 |
|
|
Fabien Meghazi
|
94e4c0750e
|
[IMP] auth_oauth2: log provider error
bzr revid: fme@openerp.com-20121010121919-cefodm7vzat5z321
|
2012-10-10 14:19:19 +02:00 |
|
|
Christophe Simonis
|
fe495942e7
|
merge upstream
bzr revid: chs@openerp.com-20121010121128-5a4axyc3jdekp6q6
|
2012-10-10 14:11:28 +02:00 |
|
|
vta vta@openerp.com
|
9acd1e6bf3
|
[FIX] Fixed on_created.
bzr revid: vta@openerp.com-20121010120917-8aah2jrats09jaol
|
2012-10-10 14:09:17 +02:00 |
|
|
Antony Lesuisse
|
f486bf1c9f
|
[FIX] o2m switch_view
bzr revid: al@openerp.com-20121010120849-8qekbmy570zozicn
|
2012-10-10 14:08:49 +02:00 |
|
|
Quentin (OpenERP)
|
5e3836c604
|
[MERGE] merged the branch that change the syntax to use in widget options to python instead of json
bzr revid: qdp-launchpad@openerp.com-20121010120143-peurgs2j9qthbpcw
|
2012-10-10 14:01:43 +02:00 |
|
|
Quentin (OpenERP)
|
454898d1ba
|
[MERGE] merged the branch that change the syntax to use in widget options to python instead of json
bzr revid: qdp-launchpad@openerp.com-20121010120048-7n3h1o779du2zmo1
|
2012-10-10 14:00:48 +02:00 |
|
|
Christophe Simonis
|
ba76751ea1
|
[FIX] file renamed on server
bzr revid: chs@openerp.com-20121010120026-lorll9na2ndt80py
|
2012-10-10 14:00:26 +02:00 |
|
|
Christophe Simonis
|
7d3f3d475b
|
merge upstream
bzr revid: chs@openerp.com-20121010115500-xz9oqr2g8vzr79jq
|
2012-10-10 13:55:00 +02:00 |
|
|
Antonin Bourguignon
|
69850d8c73
|
[MERGE] trunk-bug-1022509-mdi: fix a group by in project's reporting
lp bug: https://launchpad.net/bugs/1022509 fixed
bzr revid: abo@openerp.com-20121010114853-tv06bu1wglcx5iy2
|
2012-10-10 13:48:53 +02:00 |
|