Commit Graph

59945 Commits

Author SHA1 Message Date
Divyesh Makwana (Open ERP) c5c6c289a9 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121004044022-fqrhpeb37jdpid5t
2012-10-04 10:10:22 +05:30
Frédéric van der Essen 9080645525 [MERGE] css fixes
bzr revid: fva@openerp.com-20121003165721-ztkitnbtjrjs11ix
2012-10-03 18:57:21 +02:00
Olivier Dony fa194c3666 [MERGE] Unify PO extraction system between server/addons and web + minor cleanup
bzr revid: odo@openerp.com-20121003165507-hmrhqgf2gxvx1xx1
2012-10-03 18:55:07 +02:00
Olivier Dony 2514a56451 [FIX] coresetup: avoid losing whitespace after qweb translations
bzr revid: odo@openerp.com-20121003163504-64piei7sjv0b41wx
2012-10-03 18:35:04 +02:00
Olivier Dony d2f3bbf4bc [REV] Undo header template extraction
bzr revid: odo@openerp.com-20121003161641-9zodo9ks2bqjjjfd
2012-10-03 18:16:41 +02:00
Frédéric van der Essen f354405b1b [MERGE] from trunk
bzr revid: fva@openerp.com-20121003160602-lvvltt5kehkw3mo4
2012-10-03 18:06:02 +02:00
Olivier Dony 3744f5c402 [REV] Revert last commit, breaks tests
bzr revid: odo@openerp.com-20121003153306-e2ugphdyijvq8x6l
2012-10-03 17:33:06 +02:00
Antonin Bourguignon 267f6717c2 [MERGE] trunk-bug-953006-abo: fix project's task work editing
also add a few comments and improve code style

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

bzr revid: abo@openerp.com-20121003152940-q619od8qqpsl3p3d
2012-10-03 17:29:40 +02:00
Olivier Dony a09b2fdff1 [REM] cleanup leftover debug logging
bzr revid: odo@openerp.com-20121003152121-yeg4vhph4cy7xgpp
2012-10-03 17:21:21 +02:00
Frédéric van der Essen 15671a1a94 [MERGE] from trunk
bzr revid: fva@openerp.com-20121003151003-kcpdjp56bajylp0a
2012-10-03 17:10:03 +02:00
Antonin Bourguignon 1786beefa0 [IMP] add a few comments
bzr revid: abo@openerp.com-20121003143809-621gfqzcc2099ph2
2012-10-03 16:38:09 +02:00
Fabien Pinckaers 75c52c520c [FIX] open chatter
bzr revid: fp@tinyerp.com-20121003143019-ua3128jpufzcie5k
2012-10-03 16:30:19 +02:00
Antonin Bourguignon 19a70c9d2c [IMP] code style
bzr revid: abo@openerp.com-20121003142859-tdskhyqzfwthy9sl
2012-10-03 16:28:59 +02:00
Christophe Matthieu 27d3070220 [IMP] mail: private message
bzr revid: chm@openerp.com-20121003142712-rkadw5oii3tt5o1u
2012-10-03 16:27:12 +02:00
Fabien Pinckaers 866b1c19fa [FIX] notofy -> _notify
bzr revid: fp@tinyerp.com-20121003141611-wjqy6sr1jidp0wzt
2012-10-03 16:16:11 +02:00
Antonin Bourguignon 77b29a2493 [IMP] variable name and code style
lp bug: https://launchpad.net/bugs/953006 fixed

bzr revid: abo@openerp.com-20121003133639-pd1dhlbdwg5fltya
2012-10-03 15:36:39 +02:00
Olivier Dony a606742693 [REM] Remove scripts for extracting web translations. The addons extractor now manages JS/qweb translations as well
bzr revid: odo@openerp.com-20121003131238-a94aye8jl3y17e3g
2012-10-03 15:12:38 +02:00
Antonin Bourguignon 1de8b63e9d [IMP] variable name, remove unused variables
bzr revid: abo@openerp.com-20121003130840-33cf4seornv3jxq6
2012-10-03 15:08:40 +02:00
Christophe Matthieu 121836232a [FIX]mail: attachment
bzr revid: chm@openerp.com-20121003130318-os2ybnics3zvrsed
2012-10-03 15:03:18 +02:00
Antonin Bourguignon e9571326e2 [IMP] variable name
bzr revid: abo@openerp.com-20121003130155-s5xw33xcix8pthgc
2012-10-03 15:01:55 +02:00
Fabien Pinckaers 2295cbc26d [IMP] reconciliation empty screen
bzr revid: fp@tinyerp.com-20121003125619-ifowx4gg446wznhf
2012-10-03 14:56:19 +02:00
Fabien Pinckaers 415cde94fe [IMP] remove empty list msg as it's alreayd in the help
bzr revid: fp@tinyerp.com-20121003124741-wcatpxuyda3xddy6
2012-10-03 14:47:41 +02:00
Antonin Bourguignon c0cc5b01d7 [IMP] code style
bzr revid: abo@openerp.com-20121003121639-uv0x4n8j9vyinbrc
2012-10-03 14:16:39 +02:00
Olivier Dony aa258fc7f0 [FIX] product.uom: use proper ratio for uoms bigger than the reference
Bigger UoMs should logically be specified using the
`factor_inv` column, similarly to what is done in
the form view when you select the Bigger type.
This also fixes the rounding issue of Dozen, which
was erroneously specified as .083, which is far
from 1/12.

bzr revid: odo@openerp.com-20121003115732-ws73com9prpt5trx
2012-10-03 13:57:32 +02:00
Xavier Morel 10513dc524 [IMP] client actions: allow functions, not just widgets
bzr revid: xmo@openerp.com-20121003114258-vp3mg1yqps4qfkyp
2012-10-03 13:42:58 +02:00
Fabien Pinckaers 0b0bce6b01 [IMP] renamed task default stage
bzr revid: fp@tinyerp.com-20121003113341-3q445o37b1qequ35
2012-10-03 13:33:41 +02:00
Divyesh Makwana (Open ERP) fd6da42e30 [IMP] project_timesheet : Click on timesheet button from a new project. You will get this 'Record your timesheets for the project '%s''.Instead of name of the project.
bzr revid: mdi@tinyerp.com-20121003112319-ancbub1h7u5mtylk
2012-10-03 16:53:19 +05:30
Xavier Morel b0d1ba9c00 [IMP] split code specific to resp. client and window action out of action_common
there's little reason to have this absolutely-non-common code shoved
into common. And it makes common less specific to boot.

So pass that stuff in from the caller, which is the actual action
handler.

bzr revid: xmo@openerp.com-20121003110112-y57quir59xj838ju
2012-10-03 13:01:12 +02:00
Antonin Bourguignon 6ce2edb54b [MERGE] trunk
bzr revid: abo@openerp.com-20121003104416-r2qxoe8vbbg9zqps
2012-10-03 12:44:16 +02:00
Xavier Morel 96e26073e5 [REM] weird al stuff nobody understands
again

bzr revid: xmo@openerp.com-20121003103544-wjhkyjjcasu5n6i6
2012-10-03 12:35:44 +02:00
Xavier Morel a83724caae [REM] weird al stuff nobody understands
not even him

bzr revid: xmo@openerp.com-20121003102955-rkqo31dmb575bvf1
2012-10-03 12:29:55 +02:00
Christophe Matthieu fa777f727b [IMP]mail: private message begin
bzr revid: chm@openerp.com-20121003102220-4979eb3qt5e1sbps
2012-10-03 12:22:20 +02:00
Christophe Matthieu 40f04361c0 fixes
bzr revid: chm@openerp.com-20121003100952-e5v8ncgshra3uitc
2012-10-03 12:09:52 +02:00
Olivier Dony f6314c0907 [FIX] doc: use relative path for image::, doc root is different on our doc builder
bzr revid: odo@openerp.com-20121003091937-vse9xdptdgdtoblf
2012-10-03 11:19:37 +02:00
Christophe Matthieu d653b76e5d [FIX] mail thread follower: follow/unfollow
bzr revid: chm@openerp.com-20121003085110-du30higfqr9x0n26
2012-10-03 10:51:10 +02:00
Christophe Matthieu 775f0d32de [IMP]mail: domain/search
bzr revid: chm@openerp.com-20121003084029-jc184upr1i1bmk4l
2012-10-03 10:40:29 +02:00
Stephane Wirtel 2d3d478784 [MERGE] Fix some bugs of the point of sale
bzr revid: stw@openerp.com-20121003080934-7viber8ldyrjgaqg
2012-10-03 10:09:34 +02:00
Christophe Matthieu 1110b77e66 [MERGE] from trunk-openchatter-chm
bzr revid: chm@openerp.com-20121003073322-jr83ey2nqa10yar8
2012-10-03 09:33:22 +02:00
Christophe Matthieu c28a29c44c [IMP]mail: expandable py
bzr revid: chm@openerp.com-20121003072845-64bufx2dj3qdpjm2
2012-10-03 09:28:45 +02:00
Fabien Pinckaers 9b25dbd2b2 merge
bzr revid: fp@openerp.com-20121003064158-hrjcm389496um4un
2012-10-03 08:41:58 +02:00
Launchpad Translations on behalf of openerp b79e554eea Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121003050932-l6luo27r3daf9m7c
bzr revid: launchpad_translations_on_behalf_of_openerp-20121003052827-dlr8pm4fze13wz01
2012-10-03 05:28:27 +00:00
Fabien Pinckaers fc3edda719 [FIX] some fixes
bzr revid: fp@openerp.com-20121002233602-0k7ommk5dkikvt1l
2012-10-03 01:36:02 +02:00
Fabien Pinckaers 21fb8c4370 [FIX] access rights
bzr revid: fp@openerp.com-20121002221804-2mdhpkmyno2nfgvr
2012-10-03 00:18:04 +02:00
Fabien Pinckaers 4dba044109 [FIX] access rights
bzr revid: fp@openerp.com-20121002221231-vtqfgu536tgs00n4
2012-10-03 00:12:31 +02:00
Antony Lesuisse 4f299e1b1b [MERGE] trunk
bzr revid: al@openerp.com-20121002220720-z0rjvmjx8kvy52zh
2012-10-03 00:07:20 +02:00
Antony Lesuisse 49956d869e restore monodb mode, disabled until we split translation/code loading
bzr revid: al@openerp.com-20121002220258-51w0lm0cn12l74p5
2012-10-03 00:02:58 +02:00
Fabien Pinckaers e275f37d16 [FIX] access rights
bzr revid: fp@openerp.com-20121002214302-kk4ewbwadsme084w
2012-10-02 23:43:02 +02:00
Fabien Pinckaers 55ae1c8b4b [FIX]
bzr revid: fp@openerp.com-20121002211234-z6rlmxjwf762zvjb
2012-10-02 23:12:34 +02:00
Fabien Pinckaers 641b4875bf [FIX]
bzr revid: fp@openerp.com-20121002205805-7v9am4avytue8gcg
2012-10-02 22:58:05 +02:00
Fabien Pinckaers 1eedc0bad9 merge
bzr revid: fp@openerp.com-20121002204137-a6oj38hivv7y9ig4
2012-10-02 22:41:37 +02:00