Commit Graph
60339 Commits
Author SHA1 Message Date
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
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
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
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
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
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
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
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
Fabien Meghazi 94e4c0750e [IMP] auth_oauth2: log provider error
bzr revid: fme@openerp.com-20121010121919-cefodm7vzat5z321
2012-10-10 14:19:19 +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
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
vta vta@openerp.com 95aaa7f926 [MERGE] trunk-trigger-on_button_cancel.
bzr revid: vta@openerp.com-20121010114158-ktm6gbfdcsax4uxe
2012-10-10 13:41:58 +02:00
vta vta@openerp.com 46b5ac9a37 [FIX] Fixed on_button_cancel.
bzr revid: vta@openerp.com-20121010114007-3cw3qlxu2zwt1k0s
2012-10-10 13:40:07 +02:00
Quentin (OpenERP) a28d4b75bc [IMP] account_voucher: added monetary widget on customer/supplier payment form view
bzr revid: qdp-launchpad@openerp.com-20121010113147-8yxjj1kdx3j1i2ma
2012-10-10 13:31:47 +02:00
Antony Lesuisse 4c7f416dd4 [FIX] switch_view
bzr revid: al@openerp.com-20121010113025-qpz12d28uob7hab9
2012-10-10 13:30:25 +02:00
Xavier Morel f8a29989c8 [IMP] base_import: simplify styling of looks button
bzr revid: xmo@openerp.com-20121010112731-flw3bkijm229mr53
2012-10-10 13:27:31 +02:00
Antonin Bourguignon 550d7905b5 [FIX] domain in view
bzr revid: abo@openerp.com-20121010112553-no3nhdvaj5kun1a8
2012-10-10 13:25:53 +02:00
Quentin (OpenERP) 155680a158 [IMP] purchase: added monetary widget on purchase order form view
bzr revid: qdp-launchpad@openerp.com-20121010112013-d6z1iq6hpjgdle63
2012-10-10 13:20:13 +02:00
Antonin Bourguignon a297629286 [MERGE] trunk
bzr revid: abo@openerp.com-20121010111720-g9zzhyrywz1z9jdw
2012-10-10 13:17:20 +02:00
Antonin Bourguignon 9fa829ebca [FIX] replace the related field with a m2o field and adapt the requet in init() method
bzr revid: abo@openerp.com-20121010111649-11p1h305w6j7dwqf
2012-10-10 13:16:49 +02:00
Antonin Bourguignon 42b2412782 [REV] revert the previous 'bugfix' which is not a bugfix; removing a bugged feature doesn't fix anything
also remove whitespaces

bzr revid: abo@openerp.com-20121010111538-03xm67fpc3tljfd4
2012-10-10 13:15:38 +02:00
Quentin (OpenERP) 1bb568d22e [IMP] sale, sale_margin: added monetary widget on sale order form view
bzr revid: qdp-launchpad@openerp.com-20121010111205-eokyh1haa69tgrfl
2012-10-10 13:12:05 +02:00
Quentin (OpenERP) 7c6e893a39 [IMP] account: added monetary widget on account.move.line and cash registers
bzr revid: qdp-launchpad@openerp.com-20121010105619-fk13ba9ex0f0ihpv
2012-10-10 12:56:19 +02:00
Quentin (OpenERP) e2d3d617a9 [IMP] account: added monetary widget on invoices form view
bzr revid: qdp-launchpad@openerp.com-20121010104952-jxy17zagby2jp0w2
2012-10-10 12:49:52 +02:00
Frédéric van der Essen b1fdaa4356 [MERGE] checking for new operator on object instanciation
bzr revid: fva@openerp.com-20121010104634-m86qwtg96db204wx
2012-10-10 12:46:34 +02:00
Frédéric van der Essen 21dcc15a2c [FIX] previous 'forgot now' error message was a bit crappy
bzr revid: fva@openerp.com-20121010104433-cb03lb11fi15qrzd
2012-10-10 12:44:33 +02:00
Quentin (OpenERP) f4f3d6fa15 [REF] code review by odo
bzr revid: qdp-launchpad@openerp.com-20121010104220-nqi6c12ua7tnaejt
2012-10-10 12:42:20 +02:00
Frédéric van der Essen 41f16f85d6 [MERGE] from trunk
bzr revid: fva@openerp.com-20121010104202-gt1fxo4zzxs0pu1t
2012-10-10 12:42:02 +02:00
Xavier Morel 4dd9a0529e [ADD] reload file button next to the file input, as webkit browsers and MSIE don't trigger change when a file input is re-set to thee same file
Using other events (e.g. 'click') is not kosher as the event is
triggered long before the file is picked, the alternative is to use
the File API and regularly check the file in the input to see if it's
been altered (by storing a crc) and re-pushing it if the hash is
different. Of course this has other issues (risks catching the file
mid-edition...)

A third alternative is, once a file has been uploaded, to clear and
re-insert the corresponding file input. This means the file input will
*always* be empty

bzr revid: xmo@openerp.com-20121010101836-qtqmcc5n5zblgmcp
2012-10-10 12:18:36 +02:00
Quentin (OpenERP) 19c1422f5e [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121010101335-xt44hesaboq6nqg5
2012-10-10 12:13:35 +02:00
vta vta@openerp.com a8bf5bfbab [FIX] Fixed event name on_write_complete.
bzr revid: vta@openerp.com-20121010101246-1ht2npz6l75ah06e
2012-10-10 12:12:46 +02:00
vta vta@openerp.com bbbc6a304d [FIX] Fixed event name on_write_complete.
bzr revid: vta@openerp.com-20121010101200-1lwcqae44bb88ffa
2012-10-10 12:12:00 +02:00
Quentin (OpenERP) 00783bec57 [MERGE] refactoring branch that use the python syntax for 'options' attribute of widget, that used to be written in json
bzr revid: qdp-launchpad@openerp.com-20121010101044-5e72ezmi518mlyca
2012-10-10 12:10:44 +02:00