Sanjay Gohel (Open ERP) [Thu, 28 Jun 2012 06:26:14 +0000 (11:56 +0530)]
[IMP]remove quick_create
bzr revid: sgo@tinyerp.com-
20120628062614-a1yk9d54s3ipneu8
Sanjay Gohel (Open ERP) [Thu, 28 Jun 2012 06:23:43 +0000 (11:53 +0530)]
[IMP]remove layout option from sheet
bzr revid: sgo@tinyerp.com-
20120628062343-7xbs4bvyivnhergs
Sanjay Gohel (Open ERP) [Thu, 28 Jun 2012 06:17:36 +0000 (11:47 +0530)]
[IMP]remove all select=1 and select=2
bzr revid: sgo@tinyerp.com-
20120628061736-ujwe0swulvrcrkjt
Launchpad Translations on behalf of openerp [Thu, 28 Jun 2012 04:41:01 +0000 (04:41 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120628044101-cehvpv9yfm3xfsr3
niv-openerp [Wed, 27 Jun 2012 15:31:31 +0000 (17:31 +0200)]
[FACTM] kanban opens records in page mode
bzr revid: nicolas.vanhoren@openerp.com-
20120627153131-uxp6d2l4ri8xjoz5
niv-openerp [Wed, 27 Jun 2012 15:29:22 +0000 (17:29 +0200)]
[FIX] email and url display 'false'
bzr revid: nicolas.vanhoren@openerp.com-
20120627152922-x1wp96wcu0zbdqyk
niv-openerp [Wed, 27 Jun 2012 15:25:35 +0000 (17:25 +0200)]
[IMP] added placeholder in m2m_tags
bzr revid: nicolas.vanhoren@openerp.com-
20120627152535-kg6yk3htw3ex7gq0
niv-openerp [Wed, 27 Jun 2012 15:22:34 +0000 (17:22 +0200)]
[IMP] small modif in textfield
bzr revid: nicolas.vanhoren@openerp.com-
20120627152234-e3zc1qrtjwqtkinf
niv-openerp [Wed, 27 Jun 2012 15:17:59 +0000 (17:17 +0200)]
[FIX] problem with float_time
bzr revid: nicolas.vanhoren@openerp.com-
20120627151759-5hewg29y0cbo6221
Fabien Meghazi [Wed, 27 Jun 2012 15:17:33 +0000 (17:17 +0200)]
[IMP] Support for @class in views definitions
bzr revid: fme@openerp.com-
20120627151733-cgtfminjoqoxix11
Raphael Collet [Wed, 27 Jun 2012 14:58:58 +0000 (16:58 +0200)]
[MERGE] trunk-improve-purchase-requisition-view-atp (purchase requisition form view, and chatter)
bzr revid: rco@openerp.com-
20120627145858-mt086phe9kl65q1q
Raphael Collet [Wed, 27 Jun 2012 14:48:36 +0000 (16:48 +0200)]
[IMP] purchase_requisition: code simplifications and small bug fix
bzr revid: rco@openerp.com-
20120627144836-kf0zvnfn63cpkcjs
niv-openerp [Wed, 27 Jun 2012 14:47:31 +0000 (16:47 +0200)]
[FIX] problem with textext
bzr revid: nicolas.vanhoren@openerp.com-
20120627144731-5w113pyvk1f9ohpv
Raphael Collet [Wed, 27 Jun 2012 14:38:49 +0000 (16:38 +0200)]
[IMP] purchase_requisition: small improvement of form view
bzr revid: rco@openerp.com-
20120627143849-rqql9upyy6t9yshr
Fabien Meghazi [Wed, 27 Jun 2012 14:38:28 +0000 (16:38 +0200)]
[IMP] Major improvement to kitten mode
bzr revid: fme@openerp.com-
20120627143828-90jf8wppgl0gpgj4
niv-openerp [Wed, 27 Jun 2012 14:27:12 +0000 (16:27 +0200)]
[FIX] problem with textext
bzr revid: nicolas.vanhoren@openerp.com-
20120627142712-i2mssrib0y9rcww2
Fabien Meghazi [Wed, 27 Jun 2012 14:13:52 +0000 (16:13 +0200)]
[CHG] Ashes to ashes, dashes to underscores.
bzr revid: fme@openerp.com-
20120627141352-7a6d23iebv03rcv3
Fabien Meghazi [Wed, 27 Jun 2012 14:12:49 +0000 (16:12 +0200)]
[CHG] Ashes to ashes, dashes to underscores.
bzr revid: fme@openerp.com-
20120627141249-o10e2htxqtio72l7
Antony Lesuisse [Wed, 27 Jun 2012 13:15:28 +0000 (15:15 +0200)]
[MERGE] Use Email everywhere
bzr revid: al@openerp.com-
20120627131528-u97jw0m7cq2825ll
Raphael Collet [Wed, 27 Jun 2012 13:04:41 +0000 (15:04 +0200)]
[MERGE] trunk-first_10_clicks-mrp-mma (usability improvements in mrp)
bzr revid: rco@openerp.com-
20120627130441-cxcpvjpdykzwrc49
Antony Lesuisse [Wed, 27 Jun 2012 10:58:20 +0000 (12:58 +0200)]
[MERGE] Use Email everywhere
bzr revid: al@openerp.com-
20120627105820-2mfwdvym27y0v9ex
Antony Lesuisse [Wed, 27 Jun 2012 10:52:28 +0000 (12:52 +0200)]
[MERGE] module uninstall improvements
bzr revid: al@openerp.com-
20120627105228-hlukr4iykq97zqwp
Antony Lesuisse [Wed, 27 Jun 2012 10:39:00 +0000 (12:39 +0200)]
[MERGE] trunk
bzr revid: vmt@openerp.com-
20120620122005-2rghps6qjjkozt3n
bzr revid: al@openerp.com-
20120627103900-0kgtskgipdazmgy9
Antony Lesuisse [Wed, 27 Jun 2012 10:32:09 +0000 (12:32 +0200)]
[MERGE] placeholder translation
bzr revid: al@openerp.com-
20120627103209-er9lv03jeb9usu3m
Antony Lesuisse [Wed, 27 Jun 2012 10:31:06 +0000 (12:31 +0200)]
[MERGE] placeholder translation
bzr revid: al@openerp.com-
20120627103106-wclqfoesq9b2subb
Raphael Collet [Wed, 27 Jun 2012 09:57:18 +0000 (11:57 +0200)]
[IMP] mrp: improve titles in form views of BoM and Manufacturing order
bzr revid: rco@openerp.com-
20120627095718-tetbrm2s3dd6pimu
Fabien Meghazi [Wed, 27 Jun 2012 09:41:42 +0000 (11:41 +0200)]
[IMP] opportunity2phonecall wizard, use oe_link on cancel button
bzr revid: fme@openerp.com-
20120627094142-nut1pqe4vzevvu4z
Fabien Meghazi [Wed, 27 Jun 2012 09:41:06 +0000 (11:41 +0200)]
[ADD] Added oe_link css class
bzr revid: fme@openerp.com-
20120627094106-sg0nk89obcjtlzpl
Raphael Collet [Wed, 27 Jun 2012 09:40:06 +0000 (11:40 +0200)]
[IMP] mrp: improve form view of manufacturing order
bzr revid: rco@openerp.com-
20120627094006-i8oo3zqnefmwvizc
Vo Minh Thu [Wed, 27 Jun 2012 09:25:35 +0000 (11:25 +0200)]
[FIX] analytic_contract_expense_project: removed empty certificate entry from descriptor file (which cause the unique constraint to be impossible to add).
bzr revid: vmt@openerp.com-
20120627092535-va6fuhc3o65te8u9
Raphael Collet [Wed, 27 Jun 2012 09:20:12 +0000 (11:20 +0200)]
[IMP] mrp: improve field labels
bzr revid: rco@openerp.com-
20120627092012-ovt8xreeeq6al83q
Raphael Collet [Wed, 27 Jun 2012 09:19:41 +0000 (11:19 +0200)]
[IMP] mrp, procurement: clean up views
bzr revid: rco@openerp.com-
20120627091941-j80e2cid54bpv4ym
Raphael Collet [Wed, 27 Jun 2012 09:17:46 +0000 (11:17 +0200)]
[FIX] stock: revert a change that does not belong to this branch
bzr revid: rco@openerp.com-
20120627091746-r7ev3h0a5avm3rjd
Raphael Collet [Wed, 27 Jun 2012 08:40:04 +0000 (10:40 +0200)]
[FIX] mrp: fix classes in form views
bzr revid: rco@openerp.com-
20120627084004-1sppr5fzjg0mucgx
Raphael Collet [Wed, 27 Jun 2012 08:30:39 +0000 (10:30 +0200)]
[MERGE] from trunk
bzr revid: rco@openerp.com-
20120627083039-ndn1p9f18dz2hkcw
Jigar Amin - OpenERP [Wed, 27 Jun 2012 06:50:23 +0000 (12:20 +0530)]
lp:~openerp-dev/openobject-addons/trunk-ren-email-follow-up-tch
bzr revid: jam@tinyerp.com-
20120627065023-eairdm8sp2fg06bm
Twinkle (OpenERP) [Wed, 27 Jun 2012 06:28:21 +0000 (11:58 +0530)]
[IMP]Replace Follow-Up to Follow-up string
bzr revid: tch@tinyerp.com-
20120627062821-g0k2qfo6r2d3f1a3
Launchpad Translations on behalf of openerp [Wed, 27 Jun 2012 05:28:31 +0000 (05:28 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120627052831-0lkrh7ucdhhpwet0
Launchpad Translations on behalf of openerp [Wed, 27 Jun 2012 05:28:11 +0000 (05:28 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120627052811-ys23myfrh25w9zzr
Antony Lesuisse [Tue, 26 Jun 2012 21:06:12 +0000 (23:06 +0200)]
[MERGE] fix warnings and logging
bzr revid: al@openerp.com-
20120626210612-o47a2v6tlb9k4212
Antony Lesuisse [Tue, 26 Jun 2012 20:42:50 +0000 (22:42 +0200)]
[FIX] typo
bzr revid: al@openerp.com-
20120626204250-ez6v0cyrjg30h521
Antony Lesuisse [Tue, 26 Jun 2012 20:23:24 +0000 (22:23 +0200)]
[MERGE] trunk
bzr revid: al@openerp.com-
20120626202324-g3q9tc9uee49lg28
Antony Lesuisse [Tue, 26 Jun 2012 20:19:46 +0000 (22:19 +0200)]
[FIX] revert ir_values on document
bzr revid: al@openerp.com-
20120626201946-44c5odspvbttqyv1
Antony Lesuisse [Tue, 26 Jun 2012 20:09:09 +0000 (22:09 +0200)]
[FIX] minor fixes before merge
bzr revid: al@openerp.com-
20120626200909-rnriwjhsvr8u7i7w
Quentin (OpenERP) [Tue, 26 Jun 2012 16:00:03 +0000 (18:00 +0200)]
[MERGE] contract management branch
bzr revid: qdp-launchpad@openerp.com-
20120626160003-tqetwa3tqcvpxciv
Quentin (OpenERP) [Tue, 26 Jun 2012 15:33:25 +0000 (17:33 +0200)]
[FIX] hr_timesheet_invoice: class oe_form_button_hi -> oe_highlight
bzr revid: qdp-launchpad@openerp.com-
20120626153325-hoziu8cy7q4sdd80
Quentin (OpenERP) [Tue, 26 Jun 2012 15:26:34 +0000 (17:26 +0200)]
[MERGE] merged with main trunk
bzr revid: qdp-launchpad@openerp.com-
20120626152634-jsufymnj3i5biar0
Quentin (OpenERP) [Tue, 26 Jun 2012 15:12:40 +0000 (17:12 +0200)]
[REV] analytic: removal of the 'need action' feature on analytic accounts, which is finally not wanted
bzr revid: qdp-launchpad@openerp.com-
20120626151240-fu2inbyo1mz4dqbs
niv-openerp [Tue, 26 Jun 2012 14:54:45 +0000 (16:54 +0200)]
[FIX] put back the "Add to Dashboard" feature
bzr revid: nicolas.vanhoren@openerp.com-
20120626145445-kym37wuxkaapdwe6
niv-openerp [Tue, 26 Jun 2012 14:37:35 +0000 (16:37 +0200)]
[FIX] problem with view editor and html views
bzr revid: nicolas.vanhoren@openerp.com-
20120626143735-xqx663t9bsvfo0mh
Raphael Collet [Tue, 26 Jun 2012 14:15:49 +0000 (16:15 +0200)]
[MERGE] trunk-first_10_clicks_einvoicing-psi (usability improvements in account and account_voucher)
bzr revid: rco@openerp.com-
20120626141549-3c2xac2t5m7i9bjw
Raphael Collet [Tue, 26 Jun 2012 14:11:26 +0000 (16:11 +0200)]
[IMP] account_voucher: clean up xml file
bzr revid: rco@openerp.com-
20120626141126-z7wp3jq8b0sj6xh9
Raphael Collet [Tue, 26 Jun 2012 14:02:30 +0000 (16:02 +0200)]
[IMP] account_voucher: simplify code
bzr revid: rco@openerp.com-
20120626140230-lk4mr4q1w0h4a0mm
Quentin (OpenERP) [Tue, 26 Jun 2012 13:07:02 +0000 (15:07 +0200)]
[IMP] hr_timesheet_invoice: better help tooltip on timesheet invoice rate
bzr revid: qdp-launchpad@openerp.com-
20120626130702-9kzbrz6mlvxlxpul
Quentin (OpenERP) [Tue, 26 Jun 2012 13:01:25 +0000 (15:01 +0200)]
[MERGE] usability changes
bzr revid: qdp-launchpad@openerp.com-
20120626130125-jqjjjk83fad4dzcn
Antony Lesuisse [Tue, 26 Jun 2012 12:50:57 +0000 (14:50 +0200)]
[MERGE] check custom filters when selected
bzr revid: al@openerp.com-
20120626125057-enrxguzrdshzvbm7
Fabien Meghazi [Tue, 26 Jun 2012 12:32:58 +0000 (14:32 +0200)]
[FIX] Niv forgot to tell me to add jQuery. Tsss tsss tsss
bzr revid: fme@openerp.com-
20120626123258-881lnxligq88zctn
niv-openerp [Tue, 26 Jun 2012 12:24:25 +0000 (14:24 +0200)]
[FIX] problem with textext and ie8
bzr revid: nicolas.vanhoren@openerp.com-
20120626122425-itwo2ol6b8zjt35g
Raphael Collet [Tue, 26 Jun 2012 12:06:08 +0000 (14:06 +0200)]
[IMP] account_voucher: improve inherited views (make xpath match a single element)
bzr revid: rco@openerp.com-
20120626120608-pt8l10aliz1moap7
Raphael Collet [Tue, 26 Jun 2012 12:00:34 +0000 (14:00 +0200)]
[IMP] account: improve list tooltips
bzr revid: rco@openerp.com-
20120626120034-fow5lhoj7wglq2ta
Sanjay Gohel (Open ERP) [Tue, 26 Jun 2012 11:08:10 +0000 (16:38 +0530)]
[IMP]when contracts to renew it should be bold and contracts to renew shows number of contract to renew
bzr revid: sgo@tinyerp.com-
20120626110810-fnd83hdm77ghcbzm
Quentin (OpenERP) [Tue, 26 Jun 2012 11:02:35 +0000 (13:02 +0200)]
[IMP] contract management: oe_form_inline -> oe_inline
bzr revid: qdp-launchpad@openerp.com-
20120626110235-et4y4m25k8u3fex4
Sanjay Gohel (Open ERP) [Tue, 26 Jun 2012 10:23:23 +0000 (15:53 +0530)]
[IMP]change color whrn its on to renew state
bzr revid: sgo@tinyerp.com-
20120626102323-bgu92k6xpk7yymsz
Fabien Meghazi [Tue, 26 Jun 2012 10:06:13 +0000 (12:06 +0200)]
[IMP] Updated jQuery to version 1.7.2 stable
bzr revid: fme@openerp.com-
20120626100613-d29ayxivda1f4lzf
Raphael Collet [Tue, 26 Jun 2012 10:01:34 +0000 (12:01 +0200)]
[FIX] account, account_voucher: use new conventions in definition of form views
bzr revid: rco@openerp.com-
20120626100134-wzxjqtivex1fsg81
Raphael Collet [Tue, 26 Jun 2012 09:50:15 +0000 (11:50 +0200)]
[MERGE] from trunk
bzr revid: rco@openerp.com-
20120626095015-9vzixhyb69ns17yz
Sanjay Gohel (Open ERP) [Tue, 26 Jun 2012 09:48:43 +0000 (15:18 +0530)]
[IMP]add tooltip on type and add date,date_Start in on change template
bzr revid: sgo@tinyerp.com-
20120626094843-ubz386g7f42jc2d2
Raphael Collet [Tue, 26 Jun 2012 09:43:14 +0000 (11:43 +0200)]
[FIX] account_voucher: fix XML header
bzr revid: rco@openerp.com-
20120626094314-bokx6f22opk9whky
Fabien Meghazi [Tue, 26 Jun 2012 09:03:33 +0000 (11:03 +0200)]
[IMP] Improved default style for inputs
bzr revid: fme@openerp.com-
20120626090333-ewm2hovhy7lg19v0
Xavier Morel [Tue, 26 Jun 2012 08:24:13 +0000 (10:24 +0200)]
[FIX] merge mistake breaking button widgets of form view
bzr revid: xmo@openerp.com-
20120626082413-3tnrq8nm3koactn1
Xavier Morel [Tue, 26 Jun 2012 08:10:55 +0000 (10:10 +0200)]
[FIX] correctly deselect custom filter when removing it from search
bzr revid: xmo@openerp.com-
20120626081055-x1j3em2v8zf54m4o
Xavier Morel [Tue, 26 Jun 2012 08:06:33 +0000 (10:06 +0200)]
[IMP] check custom filter when selecting it
bzr revid: xmo@openerp.com-
20120626080633-i8z8xvxqszt6yo2v
Raphael Collet [Tue, 26 Jun 2012 07:52:08 +0000 (09:52 +0200)]
[MERGE] trunk-application_setting_cleanup-atp (fix for cancel button on config wizards)
bzr revid: rco@openerp.com-
20120626075208-y10gd5kb8qre8hzt
Raphael Collet [Tue, 26 Jun 2012 07:51:18 +0000 (09:51 +0200)]
[MERGE] trunk-application_setting_cleanup-atp (fix for cancel button)
bzr revid: rco@openerp.com-
20120626075118-6ryztze32z5jqu6s
Raphael Collet [Tue, 26 Jun 2012 07:49:46 +0000 (09:49 +0200)]
[IMP] config wizards: add an action on button 'Cancel' to get the expected behavior
bzr revid: rco@openerp.com-
20120626074946-a1tzebh85ta6v75l
Raphael Collet [Tue, 26 Jun 2012 07:47:46 +0000 (09:47 +0200)]
[IMP] res.config.settings: add method 'cancel' to reload the view
bzr revid: rco@openerp.com-
20120626074746-1x5x47rm01klx2hp
Jigar Amin - OpenERP [Tue, 26 Jun 2012 07:19:19 +0000 (12:49 +0530)]
[REN] followup to follow-up
bzr revid: jam@tinyerp.com-
20120626071919-w8ml54gdtinocv2u
Jigar Amin - OpenERP [Tue, 26 Jun 2012 07:10:44 +0000 (12:40 +0530)]
[REN] followup to follow-up account_follow
bzr revid: jam@tinyerp.com-
20120626071044-e8a6r5zpwcaynfhg
Jigar Amin - OpenERP [Tue, 26 Jun 2012 06:46:21 +0000 (12:16 +0530)]
[REN] followup to follow-up markerting*
bzr revid: jam@tinyerp.com-
20120626064621-6nhwjs9olqlgcbrc
Jigar Amin - OpenERP [Tue, 26 Jun 2012 06:27:37 +0000 (11:57 +0530)]
[FIX] email typo
bzr revid: jam@tinyerp.com-
20120626062737-amvhjyvjrtig3rb8
Jigar Amin - OpenERP [Tue, 26 Jun 2012 06:24:28 +0000 (11:54 +0530)]
[FIX] followup to follow-up
bzr revid: jam@tinyerp.com-
20120626062428-d42lj4sf4a4almja
Sanjay Gohel (Open ERP) [Tue, 26 Jun 2012 06:08:58 +0000 (11:38 +0530)]
[MERGE]merge with parent branch
bzr revid: sgo@tinyerp.com-
20120626060858-7ef6rratc7s4pvov
Launchpad Translations on behalf of openerp [Tue, 26 Jun 2012 05:36:24 +0000 (05:36 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120626052217-ejijeif40inxummm
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120626053624-27gc1r3gtzgs227c
Fabien Meghazi [Mon, 25 Jun 2012 20:27:10 +0000 (22:27 +0200)]
[IMP] Improved oe_highlight_on_dirty
bzr revid: fme@openerp.com-
20120625202710-97ggelivandevbwj
Fabien Meghazi [Mon, 25 Jun 2012 19:52:25 +0000 (21:52 +0200)]
[ADD] Added oe_highlight_on_dirty
bzr revid: fme@openerp.com-
20120625195225-ehts5hyuscmpxeyy
Fabien Pinckaers [Mon, 25 Jun 2012 18:22:29 +0000 (20:22 +0200)]
[IMP] show_address in context of partners for multi-line addresses
bzr revid: fp@tinyerp.com-
20120625182229-otj1409i3qk7zgm0
Quentin (OpenERP) [Mon, 25 Jun 2012 16:20:40 +0000 (18:20 +0200)]
[MERGE] merged few changes made in sgo branch, related to apr's review
bzr revid: qdp-launchpad@openerp.com-
20120625162040-i1956oyhj10wolca
Quentin (OpenERP) [Mon, 25 Jun 2012 16:15:30 +0000 (18:15 +0200)]
[REV] reverted revision 6996 and 6997.... wtf???
bzr revid: qdp-launchpad@openerp.com-
20120625161530-csputpf82i8yp5ua
Quentin (OpenERP) [Mon, 25 Jun 2012 15:55:40 +0000 (17:55 +0200)]
[REF] code review
bzr revid: qdp-launchpad@openerp.com-
20120625155540-n0e5lm0rhytsk22t
Fabien Meghazi [Mon, 25 Jun 2012 15:24:45 +0000 (17:24 +0200)]
[FIX] Field chars broken since merge 6.1
bzr revid: fme@openerp.com-
20120625152445-qpmoz6hpxqi2nfrz
Fabien Meghazi [Mon, 25 Jun 2012 15:01:50 +0000 (17:01 +0200)]
[FIX] Fixed kanban view global click
bzr revid: fme@openerp.com-
20120625150150-pn4hdhccr6rqlvhp
Xavier Morel [Mon, 25 Jun 2012 14:51:03 +0000 (16:51 +0200)]
[FIX] usage of retarded API
bzr revid: xmo@openerp.com-
20120625145103-bgbll0d9bcco0ikp
Xavier Morel [Mon, 25 Jun 2012 14:50:52 +0000 (16:50 +0200)]
[FIX] annoying events API
bzr revid: xmo@openerp.com-
20120625145052-ngqmfhsr1g33utql
Xavier Morel [Mon, 25 Jun 2012 14:40:13 +0000 (16:40 +0200)]
[IMP] use widget events instead of jquery events for form widget focus/blur management
bzr revid: xmo@openerp.com-
20120625144013-0brsx0s4unar6cvg
Raphael Collet [Mon, 25 Jun 2012 14:23:42 +0000 (16:23 +0200)]
[MERGE] trunk-application_setting_cleanup-atp (clean up config wizards, and adapt forms to new style)
bzr revid: rco@openerp.com-
20120625142342-59tc4d9ycozzxalg
Raphael Collet [Mon, 25 Jun 2012 14:21:53 +0000 (16:21 +0200)]
[MERGE] trunk-application_setting_cleanup-atp (let config wizards deinstall modules)
bzr revid: rco@openerp.com-
20120625142153-jzpic4detyauc0z9
Raphael Collet [Mon, 25 Jun 2012 13:55:04 +0000 (15:55 +0200)]
[IMP] in all config wizards, add class 'oe_highlight_on_dirty' on button 'Apply'
bzr revid: rco@openerp.com-
20120625135504-0f03j2j6p7d1pp7l
Xavier Morel [Mon, 25 Jun 2012 13:53:35 +0000 (15:53 +0200)]
[MERGE] from 6.1
bzr revid: xmo@openerp.com-
20120625135335-t7qv6h23m440dk68
Xavier Morel [Mon, 25 Jun 2012 13:52:15 +0000 (15:52 +0200)]
[MERGE] 6.1 changes and trunk
bzr revid: xmo@openerp.com-
20120625135215-az1927llmk0vw655
Jigar Amin - OpenERP [Mon, 25 Jun 2012 13:44:14 +0000 (19:14 +0530)]
[FIX] usa fix
bzr revid: jam@tinyerp.com-
20120625134414-jfztjo8by5kbgqg0