Commit Graph
51219 Commits
Author SHA1 Message Date
Thibault Delavallée 6f597fdbb0 [MERGE] Merged with main server.
bzr revid: tde@openerp.com-20120613153018-sr1ulyga0v3vonbc
bzr revid: tde@openerp.com-20120615081632-vlu4lzn00x6q9e7s
bzr revid: tde@openerp.com-20120619073448-x1uv6tb6kzz8mz42
bzr revid: tde@openerp.com-20120620073750-7elvul76g50r8ns3
bzr revid: tde@openerp.com-20120621081801-nu1laxm45g5xue8q
2012-06-21 10:18:01 +02:00
Thibault Delavallée cefce78cb6 [MERGE] Merged with main web.
bzr revid: tde@openerp.com-20120611083449-fjcy5injx0wydrlm
bzr revid: tde@openerp.com-20120612074745-zmfq9i0h3gcqz2z1
bzr revid: tde@openerp.com-20120613153033-8yhiis0mk7a91rfu
bzr revid: tde@openerp.com-20120614083859-eo4gpuvxuqhw9ob1
bzr revid: tde@openerp.com-20120615081833-tyv0wl56wcppwstp
bzr revid: tde@openerp.com-20120618075747-tvealk8do8h1sigb
bzr revid: tde@openerp.com-20120619073535-rgleb9j9g5xy2xeg
bzr revid: tde@openerp.com-20120620073852-xatt6u4855i5g681
bzr revid: tde@openerp.com-20120621081613-hfu05ia738euiarr
2012-06-21 10:16:13 +02:00
Thibault Delavallée 75611116b7 [MERGE] Merged with main addons.
bzr revid: tde@openerp.com-20120621081359-95hxqf77km2yc7m4
2012-06-21 10:13:59 +02:00
Raphael Collet 2d5185fd0f [MERGE] from trunk
bzr revid: rco@openerp.com-20120621075025-6xad90kzc07os6bp
2012-06-21 09:50:25 +02:00
Raphael Collet 040e6f5224 [IMP] purchase: improve menu tooltips
bzr revid: rco@openerp.com-20120621074717-n2nky2s6kmc2gewx
2012-06-21 09:47:17 +02:00
DBR (OpenERP) 68db5b043e [Merge]with: lp:~openerp-commiter/openobject-addons/trunk-review-purchase-form-dbr-po-line-hsa
bzr revid: dbr@tinyerp.com-20120621073127-sziqeczmfk6cah4g
2012-06-21 13:01:27 +05:30
Jigar Amin - OpenERP b9c5af4e7c [FIX] remove skip button
bzr revid: jam@tinyerp.com-20120621072951-wb35mdw40pvf3s1m
2012-06-21 12:59:51 +05:30
DBR (OpenERP) 9d19d51f1c [REM]purchase: remove all changes for purchase_order_line_form2
bzr revid: dbr@tinyerp.com-20120621072551-1baov2yznmoj1qyf
2012-06-21 12:55:51 +05:30
DBR (OpenERP) 2065b79013 [IMP]Purchase: set space instead of tab and some minore changes
bzr revid: dbr@tinyerp.com-20120621071516-wlhx0y6f8idkg0q2
2012-06-21 12:45:16 +05:30
Jigar Amin - OpenERP 501721883d [USB] removed useless class defination
bzr revid: jam@tinyerp.com-20120621070959-qrkmzuk1xg304kwa
2012-06-21 12:39:59 +05:30
Atul Patel (OpenERP) af8c698b46 [FIX]: FIX Warehouse_id problem
bzr revid: atp@tinyerp.com-20120621063620-613wzcje95x34v4o
2012-06-21 12:06:20 +05:30
Atul Patel (OpenERP) 7122b5722d [FIX]: Add missing arguments
bzr revid: atp@tinyerp.com-20120621062552-k476fitxgkv0h376
2012-06-21 11:55:52 +05:30
DBR (OpenERP) 6fa33e2164 [IMP]purchase: Remove Incoming Shipment from more
bzr revid: dbr@tinyerp.com-20120621060704-driru0f03yd23u9v
2012-06-21 11:37:04 +05:30
Atul Patel (OpenERP) 14a322a373 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120621060224-icwx1r0x5bdausvw
2012-06-21 11:32:24 +05:30
Atul Patel (OpenERP) f47748ccad [MERGE]: Merged with Improvement.
bzr revid: atp@tinyerp.com-20120621060034-o9zfb9e5d13yrsi8
2012-06-21 11:30:34 +05:30
Jigar Amin - OpenERP 908930c893 [FIX] removed the cancel button from res_config wizard
bzr revid: jam@tinyerp.com-20120621055231-k4c3tx125aemgpa2
2012-06-21 11:22:31 +05:30
Launchpad Translations on behalf of openerp 4d1eb70d75 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120621054841-fihpiv7cez9k1q2e
bzr revid: launchpad_translations_on_behalf_of_openerp-20120616051737-i1bgarydwo8sskwi
bzr revid: launchpad_translations_on_behalf_of_openerp-20120617045509-64kdpflg3qmi3ez5
bzr revid: launchpad_translations_on_behalf_of_openerp-20120619051316-yxaq2zd3lm3porh1
bzr revid: launchpad_translations_on_behalf_of_openerp-20120620051154-51v02ueneup3v9et
bzr revid: launchpad_translations_on_behalf_of_openerp-20120621054848-82s941upwtfrpo96
2012-06-21 05:48:48 +00:00
Launchpad Translations on behalf of openerp 8013bd76d0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120621054752-zau83g809c5n2h6f
2012-06-21 05:47:52 +00:00
Hardik 3f353e1e13 [IMP]Purchase Quotations : Changes Child view
bzr revid: hsa@tinyerp.com-20120621054651-wd2p078h3rf1491q
2012-06-21 11:16:51 +05:30
Hardik 2b90e61496 [Merge]with: lp:~openerp-dev/openobject-addons/trunk-review-purchase-form-dbr
bzr revid: hsa@tinyerp.com-20120621052902-0lict5v0yt3qfekn
2012-06-21 10:59:02 +05:30
Launchpad Translations on behalf of openerp 6e30c1323d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120621052527-r3t1oxcolviiii4x
2012-06-21 05:25:27 +00:00
Jigar Amin - OpenERP 383403f261 [MERGE] lp:openerp-web
bzr revid: jam@tinyerp.com-20120612044016-g2zn9h0jhue39a9t
bzr revid: jam@tinyerp.com-20120613041515-bi5iruz8nr71mbne
bzr revid: jam@tinyerp.com-20120614034843-38qz0xb7l2dxzcoy
bzr revid: jam@tinyerp.com-20120621050906-pwclunko11u7qxtw
2012-06-21 10:39:06 +05:30
Jigar Amin - OpenERP a2db2cc18f [MERGE] lp:opebobject-addons
bzr revid: jam@tinyerp.com-20120621050852-ob0sd5c97821gpso
2012-06-21 10:38:52 +05:30
DBR (OpenERP) 5aa0391f20 [Merge]with: lp:openobject-addons
bzr revid: dbr@tinyerp.com-20120621045440-6m3nhz5o0q39jpub
2012-06-21 10:24:40 +05:30
Jigar Amin - OpenERP f7db2ab215 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120621044348-3r8ur7izhjriing4
2012-06-21 10:13:48 +05:30
Jigar Amin - OpenERP 14c497777b [MERGE] lp:openobject-server
bzr revid: jam@tinyerp.com-20120621044220-rrey002skycvr97c
2012-06-21 10:12:20 +05:30
Jigar Amin - OpenERP d145817fb8 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120621043747-n4sjqa91q2xc3wl9
2012-06-21 10:07:47 +05:30
Antonin Bourguignon db6a717716 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120620174901-e0dqnrt4fwowbsy7
2012-06-20 19:49:01 +02:00
Antonin Bourguignon 86b2f33f71 [IMP] slightly refactor timeago.js for l18n's sake
bzr revid: abo@openerp.com-20120620174743-s603skiqcisu2yhm
2012-06-20 19:47:43 +02:00
Olivier Dony 86ec4e2636 [MERGE] l10n_ch: bugfixes from Camptocamp, courtesy of Yannick Vaucher
bzr revid: odo@openerp.com-20120620173200-3hxn1syumst7jdkz
2012-06-20 19:32:00 +02:00
Olivier Dony 3ca63b0b85 [MERGE] OPW 575500: correct importing invoices in bank statements in multi-currency context
bzr revid: odo@openerp.com-20120620170354-qszeal54k6zn7vjk
2012-06-20 19:03:54 +02:00
Antony Lesuisse da7c964068 [FIX] oe_right oe_title
bzr revid: al@openerp.com-20120620165157-ke4uneci6t0pmy9h
2012-06-20 18:51:57 +02:00
Olivier Dony 6bfb80c41b [MERGE] l10n_ch: bugfixes from Camptocamp, courtesy of Yannick Vaucher
bzr revid: odo@openerp.com-20120620164927-vxc3pz3o97oqfdc9
2012-06-20 18:49:27 +02:00
Antony Lesuisse 3939df18a2 [FIX] display form switch
bzr revid: al@openerp.com-20120620164144-xo8enp0i4hmqf50l
2012-06-20 18:41:44 +02:00
Olivier Dony 0c69035459 [FIX] OPW 575500: voucher: invoice_id must be passed when computing voucher lines, to properly reconcile
bzr revid: odo@openerp.com-20120620162735-7bkh0hsf60nn9hud
2012-06-20 18:27:35 +02:00
Olivier Dony 2c89678a0e [FIX] OPW 575500: voucher: multi-currency rate not properly set when importing invoice into bank statement
bzr revid: odo@openerp.com-20120620162647-exh5s98f5a9qrng3
2012-06-20 18:26:47 +02:00
Antony Lesuisse 855c4258a2 [FIX] typo
bzr revid: al@openerp.com-20120620162148-fkxz4fs9qd9iofee
2012-06-20 18:21:48 +02:00
Antonin Bourguignon 688ced2225 [ADD] introduce timeago.js (check the end of mail.js)
bzr revid: abo@openerp.com-20120620155434-8qos8oooxfwxkm6u
2012-06-20 17:54:34 +02:00
Fabien Meghazi e24cd18bab [MERGE] trunk-cssrefactor-fme
bzr revid: fme@openerp.com-20120620153025-qzo6tybwd1rxjxlb
2012-06-20 17:30:25 +02:00
Fabien Meghazi d94c255ded [MERGE] trunk-cssrefactor-fme
bzr revid: fme@openerp.com-20120620152951-z3dgkjm0iwnn56c0
2012-06-20 17:29:51 +02:00
Fabien Meghazi d33329e580 [MERGE] trunk
bzr revid: fme@openerp.com-20120620151625-dc0zbi10tf2fzr6q
2012-06-20 17:16:25 +02:00
Fabien Meghazi f1a2b708ac [WIP] Replaced cropdown by dropdown
bzr revid: fme@openerp.com-20120620151453-9g32rrbv3x0b1v8p
2012-06-20 17:14:53 +02:00
Fabien Meghazi 996e8e7079 [WIP] Replaced cropdown by dropdown
bzr revid: fme@openerp.com-20120620151414-ks1buw6smpsb9bk3
2012-06-20 17:14:14 +02:00
Fabien Meghazi d2bfcd85a3 [MERGE] trunk
bzr revid: fme@openerp.com-20120620150851-fi18faps8pp64obh
2012-06-20 17:08:51 +02:00
Fabien Meghazi 63fa49c18d [IMP] Move kanban dropdown offset to global dropdown handler
bzr revid: fme@openerp.com-20120620150304-muf0js0nu0cjhzk0
2012-06-20 17:03:04 +02:00
Fabien Meghazi 036a142b6d [REM] Desactivated global click for the moment
bzr revid: fme@openerp.com-20120620145902-dibck9d678bhrby7
2012-06-20 16:59:02 +02:00
Vidhin Mehta (OpenERP) 235cca3aab [MERGE]merge with trunk and remove conflicts.
bzr revid: vme@tinyerp.com-20120620144304-yr9zodv1skkrlccf
2012-06-20 20:13:04 +05:30
Antonin Bourguignon 231b8ca886 [IMP] better markup, remove some dead code
bzr revid: abo@openerp.com-20120620143222-oyw84qxbzlia7lb6
2012-06-20 16:32:22 +02:00
Vidhin Mehta (OpenERP) 596ebb826f [IMP]better variable name.
bzr revid: vme@tinyerp.com-20120620142746-c1k8612rkqickipw
2012-06-20 19:57:46 +05:30
Vidhin Mehta (OpenERP) f8fc7258b3 [IMP]varibale name.
bzr revid: vme@tinyerp.com-20120620141926-x4dx3krkio9fgw3k
2012-06-20 19:49:26 +05:30