Commit Graph
68208 Commits
Author SHA1 Message Date
Xavier Morel ef5be74caa [FIX] disable sorting (column-click) in an editable listview being edited
To do so, extract sort handling to its own method (bound using the
events hash) and override-and-disable in editable.

bzr revid: xmo@openerp.com-20121127094109-mojnq50mzsrcj3q0
2012-11-27 10:41:09 +01:00
Raphael Collet 36059c6ffe [MERGE] from trunk
bzr revid: rco@openerp.com-20121127093915-6zupyre5jh2fxfd7
2012-11-27 10:39:15 +01:00
Randhir Mayatra (OpenERP) 03e20c4191 [IMP] improve the code
bzr revid: rma@tinyerp.com-20121127092948-mcfepfa7ftitm0zy
2012-11-27 14:59:48 +05:30
Tejas Tank 45993b0e14 Merged latest.
bzr revid: tta@openerp.com-20121127092125-s8ajvs1xa3q0tpq6
2012-11-27 14:51:25 +05:30
dhr 8705820fd7 [IMP]Solved the traceback issues of settings:From Incoming mail server options open messages
bzr revid: dhr@tinyerp.com-20121127091829-1z7e9fi5lh4icz5c
2012-11-27 14:48:29 +05:30
Arnaud Pineux a8f3510297 [TEST] automated action rule tests
bzr revid: api@openerp.com-20121127090755-03sfycnz8nw9ldnv
2012-11-27 10:07:55 +01:00
Christophe Matthieu ac7695e1c9 [FIX] web kanban: reset size-box
bzr revid: chm@openerp.com-20121127090015-anw60k3u4tc49x5s
2012-11-27 10:00:15 +01:00
Khushboo Bhatt (Open ERP) 6daa367cad [FIX] chatter message when we merge leads/opportunities is not well formatted
bzr revid: kbh@tinyerp.com-20121127085421-o4exf3xdcu1gt5e9
2012-11-27 14:24:21 +05:30
Christophe Matthieu fbb42640ea [FIX] web kanban: vertical-align: top. For bug : Hole on the kanban view like projects because the images is in vertical-align: bottom;
bzr revid: chm@openerp.com-20121127084917-npvir1lkgol5ysbk
2012-11-27 09:49:17 +01:00
Christophe Matthieu 7aeaabaa89 [FIX] web kanban: Remember all Ids dataset. For bug : click on Show More...(At Bottom of Kanban view). After, when you click on a record, it give : could not find id#x error.
bzr revid: chm@openerp.com-20121127083935-6tmbvee0ghuta00f
2012-11-27 09:39:35 +01:00
Paramjit Singh Sahota 77ac04efd8 [FIX][trunk] display dbname if len(db_list())>1 [chs]
lp bug: https://launchpad.net/bugs/1059320 fixed

bzr revid: psa@tinyerp.com-20121127083630-odwky5bdy24gxoa4
2012-11-27 14:06:30 +05:30
Randhir Mayatra (OpenERP) 38011c3b3f [IMP] make changes into manufacturing
bzr revid: rma@tinyerp.com-20121127083127-pqobf6n7z0kfihgz
2012-11-27 14:01:27 +05:30
Randhir Mayatra (OpenERP) 32380ffda2 [MERGE] merge with parent
bzr revid: rma@tinyerp.com-20121127051949-58wtrp5p7b8idg54
bzr revid: rma@tinyerp.com-20121127073838-0oee2zpeqdlbz35x
2012-11-27 13:08:38 +05:30
Hardik 3b5d70bf3b [IMP]Settings : view type and action typefield is select
bzr revid: hsa@tinyerp.com-20121127073012-f97e468x17mzzy1w
2012-11-27 13:00:12 +05:30
Hiral Patel (OpenERP) df4f922683 [MERGE] Merge with lp:openerp-web
bzr revid: hip@tinyerp.com-20121126044500-3elpfk2qcv3oo6pz
bzr revid: hip@tinyerp.com-20121127072837-v5419ybohenkfgeu
2012-11-27 12:58:37 +05:30
Hardik 0b4efe1c8c [MERGE]with latest trunk
bzr revid: hsa@tinyerp.com-20121127064731-4eca3yapd3a2fuzv
2012-11-27 12:17:31 +05:30
dhr f9cad34005 [MERGE]Merged with addons
bzr revid: dhr@tinyerp.com-20121127055912-ajt97e5653i83qev
2012-11-27 11:29:12 +05:30
Launchpad Translations on behalf of openerp e6d033755f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121127052458-7c24bjy09rqd8r8o
bzr revid: launchpad_translations_on_behalf_of_openerp-20121127054533-m8gqmer5k5jpcs65
2012-11-27 05:45:33 +00:00
Tejas Tank e1d07b67be [MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-misc-fixes-fleet-cha
bzr revid: tta@openerp.com-20121127053905-6nwmuuw1uxb3t2bm
2012-11-27 11:09:05 +05:30
Vidhin Mehta (OpenERP) ef30bed827 [FIX]use this.options. for show parent class.
bzr revid: vme@tinyerp.com-20121127052653-6l366vviftbdamkp
2012-11-27 10:56:53 +05:30
Launchpad Translations on behalf of openerp 94e0fad1a8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121127052250-spgrbo174dwp94rp
2012-11-27 05:22:50 +00:00
Jiten (OpenERP) cec3e542a6 [MERGE] Merged trunk.
bzr revid: jra@tinyerp.com-20121126110752-8mmm2c7iciw6jhp1
bzr revid: jra@tinyerp.com-20121127051603-q6y1bardiezruu1m
2012-11-27 10:46:03 +05:30
Randhir Mayatra (OpenERP) c87ab693a3 [MERGE] merge with parent
bzr revid: rma@tinyerp.com-20121127051533-kpy6m65bna2e1ncg
2012-11-27 10:45:33 +05:30
Khushboo Bhatt (Open ERP) 1ed24698ab [MERGE]merge with trunk
bzr revid: kbh@tinyerp.com-20121127051355-bc2iofgjh7pd39io
2012-11-27 10:43:55 +05:30
Randhir Mayatra (OpenERP) 12c111211b [MERGE] merge with parent
bzr revid: rma@tinyerp.com-20121127051342-f3awhnwanwjnkceb
2012-11-27 10:43:42 +05:30
Khushboo Bhatt (Open ERP) 4e033eeeef [MERGE]merge with trunk
bzr revid: kbh@tinyerp.com-20121127051100-09roh4c8kig67om3
2012-11-27 10:41:00 +05:30
Randhir Mayatra (OpenERP) 3b01af0ea8 [MERGE] merge with parent
bzr revid: rma@tinyerp.com-20121127051055-s57dyv5j8c0u2w4x
2012-11-27 10:40:55 +05:30
Randhir Mayatra (OpenERP) 15d87dde77 [IMP] make changes into mrp view
bzr revid: rma@tinyerp.com-20121127044521-wpy4pmdmjlr6ezwc
2012-11-27 10:15:21 +05:30
Antony Lesuisse 32e98d70ad [MERGE] trunk-minimal-bin-chs move openerp-server to cli/server needed by apps
and paving the way for for future independent subcommands.

bzr revid: al@openerp.com-20121127013558-wkfaam8ams81qql4
2012-11-27 02:35:58 +01:00
Antony Lesuisse 780ff72e6b openerp apps add Help
bzr revid: al@openerp.com-20121127010941-izoo14ms0ryf1f13
2012-11-27 02:09:41 +01:00
Antony Lesuisse e36c474bde openerp apps abstract Command fix
bzr revid: al@openerp.com-20121127010129-l0h604dla7hc7abd
2012-11-27 02:01:29 +01:00
Antony Lesuisse 13cdc34b65 openerp apps main moved to cli ready for new commands
bzr revid: al@openerp.com-20121127005513-vi9viu4oafbrze6y
2012-11-27 01:55:13 +01:00
Fabien Pinckaers 87931e9931 [IMP] case stage fix for actions
bzr revid: fp@tinyerp.com-20121126220235-t7xeq4m2pbdpml7t
2012-11-26 23:02:35 +01:00
Fabien Pinckaers 9f0e0cb0dd [IMP] small improvement translation tree view
bzr revid: fp@tinyerp.com-20121126215826-uw4gn2o4m9klz9ny
2012-11-26 22:58:26 +01:00
Fabien Pinckaers 4abc0be939 [MERGE] empty to close MP
bzr revid: fp@tinyerp.com-20121126215448-dogiqnvwglttuzc8
2012-11-26 22:54:48 +01:00
Fabien Pinckaers 6740c05cc4 [IMP] typo
bzr revid: fp@tinyerp.com-20121126215347-cd9vxrpmfjsv1kx9
2012-11-26 22:53:47 +01:00
Fabien Pinckaers c879cfe9aa [FIX] crm small fixes
bzr revid: fp@tinyerp.com-20121126215241-t5pmqg56oz5860wc
2012-11-26 22:52:41 +01:00
Fabien Pinckaers 129036ecc6 [FIX] size of company logo
bzr revid: fp@tinyerp.com-20121126214230-g4pb51v673la568i
2012-11-26 22:42:30 +01:00
Fabien Pinckaers c33c575201 [FIX] bug in repair, mo when creating a stock.move
bzr revid: fp@tinyerp.com-20121126213921-bi1ypv4x2hvs16hc
2012-11-26 22:39:21 +01:00
Fabien Pinckaers 44450f62e2 [IMP] wording, no default filter for archives
bzr revid: fp@tinyerp.com-20121126212903-jbd4kdqc4kcrgbhg
2012-11-26 22:29:03 +01:00
Fabien Pinckaers 1123f9809b [IMP] CSS fix
bzr revid: fp@tinyerp.com-20121126203154-ubkwzc1cpgur4nyf
2012-11-26 21:31:54 +01:00
Fabien Pinckaers 76680074cb [IMP] removed unused code
bzr revid: fp@tinyerp.com-20121126190356-1mfgmx5r6ls6md22
2012-11-26 20:03:56 +01:00
Fabien Pinckaers c603f69386 [FIX] better error message in sequences
bzr revid: fp@tinyerp.com-20121126185853-yq2aackwdi3fw1a5
2012-11-26 19:58:53 +01:00
Fabien Pinckaers 85d1b074ae [FIX] account multi-company & crm log call
bzr revid: fp@tinyerp.com-20121126185249-6jrwoxvbhcu1ueqd
2012-11-26 19:52:49 +01:00
Christophe Simonis 9432574fec [FIX] restart of server on windows when running as nt service
bzr revid: chs@openerp.com-20121126184733-i4blfoh0d57s5s4l
2012-11-26 19:47:33 +01:00
Fabien Pinckaers b9535b0f27 [IMP] Misc useability improvement in account
[MERGE] warehouse misc imp, receptions
[IMP] fixes in po

bzr revid: fp@tinyerp.com-20121126182811-kgqve7pzzqddx86g
2012-11-26 19:28:11 +01:00
Olivier Dony 7f5ad72429 [MERGE] Forward-port 6.1 bugfixes up to rev. 4307
rev.4307 = rev-id launchpad_translations_on_behalf_of_openerp-20121125065030-g5if5pybr61la4yj

bzr revid: odo@openerp.com-20121126160320-t2suuik6lhk6wl0x
bzr revid: odo@openerp.com-20121126161836-mv8yymzgbnmif4ve
bzr revid: odo@openerp.com-20121126162023-ejvsapwouyudw6c6
bzr revid: odo@openerp.com-20121126181527-d4yx15372bis77qj
2012-11-26 19:15:27 +01:00
Launchpad Translations on behalf of openerp c5824190e2 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121010053442-5dvlywts67whb0ga
bzr revid: launchpad_translations_on_behalf_of_openerp-20121011053848-xqvo133zqvi6lav0
bzr revid: launchpad_translations_on_behalf_of_openerp-20121020053602-ib4mxsnam8rmslwj
bzr revid: launchpad_translations_on_behalf_of_openerp-20121021051008-n90veedpesnq94kx
bzr revid: launchpad_translations_on_behalf_of_openerp-20121023051729-8sjake0lr1n26gxd
bzr revid: launchpad_translations_on_behalf_of_openerp-20121024054328-tp860moj6mqdg1b7
bzr revid: launchpad_translations_on_behalf_of_openerp-20121025061203-p8y91n88mjy76e9m
bzr revid: launchpad_translations_on_behalf_of_openerp-20121027052314-f90bsceov9k01rqp
bzr revid: launchpad_translations_on_behalf_of_openerp-20121030055204-436euno3dyza0p51
bzr revid: launchpad_translations_on_behalf_of_openerp-20121109050503-mgrl8ocesd906vih
bzr revid: launchpad_translations_on_behalf_of_openerp-20121110052352-q4ujvcidu3nsfyrr
bzr revid: launchpad_translations_on_behalf_of_openerp-20121113055159-xzfhilmz3obc6fpc
bzr revid: launchpad_translations_on_behalf_of_openerp-20121115051725-iaic04wbgacpg324
bzr revid: launchpad_translations_on_behalf_of_openerp-20121116045651-sy1d9dbnwr8rmqxk
bzr revid: launchpad_translations_on_behalf_of_openerp-20121119045933-ye2fj8s7tgirpibs
bzr revid: launchpad_translations_on_behalf_of_openerp-20121120051613-y75z34zsi45o98a5
bzr revid: launchpad_translations_on_behalf_of_openerp-20121121051212-nag94lh830sf0ixh
bzr revid: launchpad_translations_on_behalf_of_openerp-20121123052604-2w9jju4zbyx5j5yj
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124073818-jo09nfrzfth6mve8
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125065030-g5if5pybr61la4yj
bzr revid: launchpad_translations_on_behalf_of_openerp-20121130053149-vyzcs1s3vqn0qstn
bzr revid: launchpad_translations_on_behalf_of_openerp-20121203044916-t7h4npvt2hzv5sk1
2012-12-03 04:49:16 +00:00
Xavier ALT 2bf1eff2ce [MERGE] OPW 577037: account_voucher: 'import entries' wizard should allow selecting credit notes
cumulative forward-port of v6.0 revids:
  - ach@tinyerp.com-20110704105916-6toonyhlltu83h1d
  - ach@tinyerp.com-20110803092023-q16pwcco77tpomsz
  - xal@openerp.com-20121130161732-d37t8h7u4gqak4tx

bzr revid: xal@openerp.com-20121130172133-jxnrf7fi2i4s4g1a
2012-11-30 18:21:33 +01:00
Xavier ALT 4e784e16af [MERGE] OPW 581296: account_voucher: allow reconciling invoices with partially reconciled credit notes
bzr revid: xal@openerp.com-20121130152128-8ug42kg1qjyq3103
2012-11-30 16:21:28 +01:00