Thibault Francois [Fri, 18 Feb 2011 10:16:55 +0000 (11:16 +0100)]
[MERGE] fix bug 715790
bzr revid: tfr@openerp.com-
20110218101655-zm438bcqgiz7m8w0
RME (OpenERP) [Fri, 18 Feb 2011 10:09:57 +0000 (15:39 +0530)]
[FIX] base_calendar : unknown type of event invitation creating problem and not showing list view with records
lp bug: https://launchpad.net/bugs/715790 fixed
bzr revid: rme@tinyerp.com-
20110218100957-ep77acwk5kgna885
Thibault Francois [Fri, 18 Feb 2011 10:04:13 +0000 (11:04 +0100)]
[MERGE] xrg webdav fix patch26
bzr revid: tfr@openerp.com-
20110218100413-srm6jo0xxfr4756q
Thibault Francois [Fri, 18 Feb 2011 09:54:19 +0000 (10:54 +0100)]
[MERGE, FIX] MERGE ADDONS 1, fix create user with a sales teams is member of the sales team
bzr revid: tfr@openerp.com-
20110218095419-8ukt8gmq4s4zbal9
Sbh (OpenERP) [Thu, 17 Feb 2011 10:03:36 +0000 (15:33 +0530)]
[MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-
20110216061002-q3lg8nxnrr013apm
bzr revid: sbh@tinyerp.com-
20110217100336-d78qfjz9vobeyvy2
Launchpad Translations on behalf of openerp [Thu, 17 Feb 2011 04:36:49 +0000 (04:36 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110216050027-qh55wef1rwb8hc9y
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110215043802-u5lpwzvi9tsp5qbj
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110216050338-aj0ab43kdrpgrh0r
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110217043649-3o2fe7rz274hzokb
Sbh (OpenERP) [Tue, 15 Feb 2011 12:50:01 +0000 (18:20 +0530)]
[MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-
20110215125001-kpuo69uh4hy7zdp1
Olivier Dony [Mon, 14 Feb 2011 11:45:07 +0000 (12:45 +0100)]
[MERGE] merged bugfixes from 6.0 up to revision 4401
bzr revid: odo@openerp.com-
20110214114507-8uwohpcblsfhgjae
Launchpad Translations on behalf of openerp [Tue, 15 Feb 2011 05:39:13 +0000 (05:39 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110209060136-nfjweh4nw0sfdtyb
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110210053441-nhro56vsok1xjorb
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110211062554-w9k6gkzfxorm7alk
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110211062659-b0a6mwp18ipvn64n
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110212060645-t8l1wzw8znrsi1ze
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110213053327-7uwmixbkd8pmy53a
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110214054817-4wgpcwobeghg1dht
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110215053913-nqwsr2zc5fhc1prr
Olivier Dony [Mon, 14 Feb 2011 10:29:14 +0000 (11:29 +0100)]
[FIX] tools.config: expansion of user and path should work with multiple addons path too
lp bug: https://launchpad.net/bugs/716710 fixed
bzr revid: odo@openerp.com-
20110214102914-98gdvyx5y4v2kysx
sma (Tiny) [Mon, 14 Feb 2011 06:49:33 +0000 (12:19 +0530)]
[FIX] base_module_record: returning of recording wizard with ir.actions.act_window_close.
bzr revid: sma@tinyerp.com-
20110214064933-pcor9k7ir043agvp
Sbh (OpenERP) [Mon, 14 Feb 2011 04:04:54 +0000 (09:34 +0530)]
[MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-
20110214040454-nmppvkbfmde5hfzw
Launchpad Translations on behalf of openerp [Sun, 13 Feb 2011 04:38:32 +0000 (04:38 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110212050059-ue5zqyqtbezt6fhi
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110213043832-py10651pr3tdp702
noz (OpenERP) [Fri, 11 Feb 2011 12:25:06 +0000 (17:55 +0530)]
[FIX] web_uservoice: update import to openobject.rpc instead of openerp.utils.rpc (package moved back into core).
bzr revid: noz@tinyerp.com-
20110211122506-82fvpswt1ntprva2
Launchpad Translations on behalf of openerp [Fri, 11 Feb 2011 04:59:58 +0000 (04:59 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110211045958-qw2uif8guhebh48q
Jay Vora (OpenERP) [Thu, 10 Feb 2011 18:48:06 +0000 (00:18 +0530)]
[FIX] Purchase : Destination address should not be restricted to be an address of any partner
lp bug: https://launchpad.net/bugs/710516 fixed
bzr revid: jvo@tinyerp.com-
20110210184806-qg3ivhwlcp69b39v
Jay Vora (OpenERP) [Thu, 10 Feb 2011 16:56:48 +0000 (22:26 +0530)]
[FIX] Base_module_record : Module creation should create a file called __openerp__.py instead of __terp__.py
[RENAME] Anonymization : __terp__.py file Renamed as __openerp__.py
[IMP] Point_of_sale : Improved menu name Cash Register Management
bzr revid: jvo@tinyerp.com-
20110210165648-8e83y3u7kxlnqayg
Xavier Morel [Thu, 10 Feb 2011 16:10:42 +0000 (17:10 +0100)]
[FIX] pad, share, wiki: update import to openobject.rpc instead of openerp.utils.rpc (package moved back into core)
Also removed a few unused imports
bzr revid: xmo@openerp.com-
20110210161042-aq414sd3i4p6abka
Sbh (OpenERP) [Thu, 10 Feb 2011 08:41:31 +0000 (14:11 +0530)]
[MERGE] MERGE fetchmail change
bzr revid: sbh@tinyerp.com-
20110210084131-5y759cywv7mf488j
Jay Vora (OpenERP) [Thu, 10 Feb 2011 07:34:53 +0000 (13:04 +0530)]
[FIX] Fetchmail: Unicode error corrected on exception
lp bug: https://launchpad.net/bugs/708616 fixed
bzr revid: jvo@tinyerp.com-
20110210073453-m13on9w8gxdur13u
Ujjvala Collins (OpenERP) [Thu, 10 Feb 2011 06:32:45 +0000 (12:02 +0530)]
[FIX] fetchmail: Fixed unicode character error on exception message.
bzr revid: uco@tinyerp.com-
20110210063245-fk271wzatojfab6x
Launchpad Translations on behalf of openerp [Thu, 10 Feb 2011 05:35:19 +0000 (05:35 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110210053519-lmorpyq5gfrpelk6
Sbh (OpenERP) [Thu, 10 Feb 2011 05:29:20 +0000 (10:59 +0530)]
[MERGE] Merge Bug fixed lp:715708
bzr revid: sbh@tinyerp.com-
20110210052920-dctk1irxqs6iytqh
Ujjvala Collins (OpenERP) [Thu, 10 Feb 2011 05:16:33 +0000 (10:46 +0530)]
[MERGE]
bzr revid: uco@tinyerp.com-
20110210051633-93zdjza9i5owduv7
Ujjvala Collins (OpenERP) [Thu, 10 Feb 2011 04:58:03 +0000 (10:28 +0530)]
[FIX] crm: Fixed problem of email field when meeting is scheduled from opportunity. Corrected separator string on meetings.
lp bug: https://launchpad.net/bugs/715708 fixed
bzr revid: uco@tinyerp.com-
20110210045803-48y5wl6am3gfihc5
Sbh (OpenERP) [Thu, 10 Feb 2011 04:51:43 +0000 (10:21 +0530)]
[MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-
20110208044605-wr3b2icgj1cazq1z
bzr revid: sbh@tinyerp.com-
20110210045143-lds9k7r4cbp37xtc
Launchpad Translations on behalf of openerp [Thu, 10 Feb 2011 04:36:10 +0000 (04:36 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110210043610-mqxp4vpb886lcdrj
Xavier Morel [Wed, 9 Feb 2011 15:43:26 +0000 (16:43 +0100)]
[IMP] pad: use get_session instead of session
bzr revid: xmo@openerp.com-
20110209154326-tvqohq851i0j6b0y
Xavier Morel [Wed, 9 Feb 2011 14:35:42 +0000 (15:35 +0100)]
[IMP] web_livechat: use rpc.RPCProxy instead of rpc.session.execute (as direct session access will probably get restricted soon on the web client)
bzr revid: xmo@openerp.com-
20110209143542-m5vp1smqev2xap48
Ujjvala Collins (OpenERP) [Wed, 9 Feb 2011 13:14:58 +0000 (18:44 +0530)]
[MERGE]
bzr revid: uco@tinyerp.com-
20110203102028-qs6ciid5h10u67kd
bzr revid: uco@tinyerp.com-
20110209131458-v8ico4qyytebpvif
Jay Vora (OpenERP) [Wed, 9 Feb 2011 12:17:19 +0000 (17:47 +0530)]
[FIX] Account/Multi-Company Environment :Configuration of consolidated type of account is not possible due to the _check_type constraints(Ref: Case 4006)
lp bug: https://launchpad.net/bugs/715695 fixed
bzr revid: jvo@tinyerp.com-
20110209121719-a6jqfug06syt5zdc
Olivier Dony [Wed, 9 Feb 2011 09:02:31 +0000 (10:02 +0100)]
[FIX] tools.translate: add missing imports after previous merge
bzr revid: odo@openerp.com-
20110209090231-odqbf8leyurdh945
Launchpad Translations on behalf of openerp [Wed, 9 Feb 2011 06:02:19 +0000 (06:02 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110209060219-7m8jy7svxb93mgkx
Launchpad Translations on behalf of openerp [Wed, 9 Feb 2011 04:55:56 +0000 (04:55 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110208043710-75bxojtr8ox15lgb
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110209045556-98ev5i679ddf25uu
Olivier Dony [Tue, 8 Feb 2011 17:09:27 +0000 (18:09 +0100)]
[FIX] tools.config: override root_path in config, and avoid saving it
This should help avoid common issues with an obsolete root_path saved in
the config file. We also expand the path on-the-fly, and do the same for
addons_path.
bzr revid: odo@openerp.com-
20110208170927-3kqk0c06qmxu2ko5
Olivier Dony [Tue, 8 Feb 2011 16:49:23 +0000 (17:49 +0100)]
[MERGE] merged latest 6.0 fixes up to rev 3339
Revision 3339 = odo@openerp.com-
20110208140924-0bgxqgt1oyrxwz3z
bzr revid: odo@openerp.com-
20110208164923-u7mzknc0b3avb9i0
Vo Minh Thu [Tue, 8 Feb 2011 15:01:49 +0000 (16:01 +0100)]
[MERGE] merge of the openerp python module branch.
bzr revid: vmt@openerp.com-
20110208150149-x4vu09aj42ezma5a
Olivier Dony [Tue, 8 Feb 2011 14:09:24 +0000 (15:09 +0100)]
[FIX] osv_memory: expire records only based on age by default + provide configurable settings
This revision introduces two new config parameters and the corresponding
server startup parameters:
- osv_memory_count_limit: limit on number or records in each osv_mem table
- osv_memory_age_limit: limit on maximum age of records in each osv_mem table
The default values have been changed to count=False (disabled), age=1 (hour),
so that in the default config the server will only expire osv_memory records
that are 1 hour old or more, avoiding problems related with some
osv_memory classes that instantiate a large number of short-lived objects.
A corresponding set of YAML tests has been added to test the proper behaviour
of the new parameters, and check the various use cases.
lp bug: https://launchpad.net/bugs/555271 fixed
lp bug: https://launchpad.net/bugs/709559 fixed
bzr revid: odo@openerp.com-
20110208140924-0bgxqgt1oyrxwz3z
Vo Minh Thu [Tue, 8 Feb 2011 13:27:19 +0000 (14:27 +0100)]
[FIX] addons.__init__: make sure ad_paths is initialized before using it.
bzr revid: vmt@openerp.com-
20110208132719-qhlqqjkcyg3j9hv8
Xavier Morel [Tue, 8 Feb 2011 12:32:41 +0000 (13:32 +0100)]
[FIX] share: share wizard would not open in some cases due to view_id not being found in ir_act_window
Switch to using the action_id itself instead of reverse-matching action_id from view_id
* Not all ir_act_window have a view_id, for some we're supposed to go through ir_act_window_view
* Multiple ir_act_window (or ir_act_window_view) may have the same view_id, and we don't really have enough information to select the right one
Keep the old resolution via view_id for now, in case users update their web client and their addons out of sync
bzr revid: xmo@openerp.com-
20110208123241-lj8v12ygz2a0jsgx
Vo Minh Thu [Tue, 8 Feb 2011 10:59:08 +0000 (11:59 +0100)]
[FIX] wrapper script: change the way we go in the upper directory.
bzr revid: vmt@openerp.com-
20110208105908-vpkcprw38ufz0x1e
Vo Minh Thu [Tue, 8 Feb 2011 10:21:02 +0000 (11:21 +0100)]
[IMP] added bin/openerp-server.py as a wrapper for backward compatibility.
bzr revid: vmt@openerp.com-
20110208102102-92rfpx6c5midjg5c
Vo Minh Thu [Tue, 8 Feb 2011 09:29:23 +0000 (10:29 +0100)]
[IMP] openerp.__init__ can imports all its submodules.
- The config parser is given sys.args explicitely
- addons.__init__ changed so it can be imported in openerp.__init__
bzr revid: vmt@openerp.com-
20110208092923-42mj8sb8mkfbiytw
Vo Minh Thu [Tue, 8 Feb 2011 09:24:58 +0000 (10:24 +0100)]
[IMP] forgot to add loglevels.py and reexport 3 functions in tools.misc.
bzr revid: vmt@openerp.com-
20110208092458-qjfvf1vgflervdpm
Launchpad Translations on behalf of openerp [Tue, 8 Feb 2011 05:59:33 +0000 (05:59 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110204141027-7fjkptadcn3xocbk
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110206061518-2d22gwew0c23msm1
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110207062348-rcrsq83p1141xqat
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110208055858-29gz4zyz9o39uv73
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110208055933-yutvcfmjc2d00l37
Launchpad Translations on behalf of openerp [Tue, 8 Feb 2011 04:35:54 +0000 (04:35 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110208043554-9906z613ss1lyfct
Olivier Dony [Mon, 7 Feb 2011 18:01:14 +0000 (19:01 +0100)]
[REL] release: bumped up trunk release to 6.1-dev
bzr revid: odo@openerp.com-
20110207180114-y8gw071d6ajf5e30
Olivier Dony [Mon, 7 Feb 2011 17:03:17 +0000 (18:03 +0100)]
[IMP] tools.config: reorganize some config options in groups
bzr revid: odo@openerp.com-
20110207170317-utx2hejesnr0iwr1
Olivier Dony [Mon, 7 Feb 2011 15:27:47 +0000 (16:27 +0100)]
[FIX] orm.write: parent_store updates must be processed in correct order to avoid edge cases
bzr revid: odo@openerp.com-
20110207152747-0qyu9aq55vb9ujj6
Vo Minh Thu [Mon, 7 Feb 2011 12:57:23 +0000 (13:57 +0100)]
[IMP] openerp python module.
- Some logging code moved from netsvc.py to loglevels.py
- Changed imports to use the new openerp module
- config and netsvc initialization calls move to openerp-server.py
- Moved openerp-server.py outside the old bin directory
- Some imports in tools moved inside the methods to break mutual-dependencies
bzr revid: vmt@openerp.com-
20110207125723-ooee7d7ng5elmkso
Jay Vora (OpenERP) [Mon, 7 Feb 2011 12:47:24 +0000 (18:17 +0530)]
[FIX] HR : Correction on List view definition for model hr.employee (Ref : SaaS Maintenance Case 3990)
bzr revid: jvo@tinyerp.com-
20110207124724-dgq10cawnyjidobz
jam [Mon, 7 Feb 2011 12:39:46 +0000 (13:39 +0100)]
[FIX] outlook use ssl
bzr revid: tfr@openerp.com-
20110207123946-ig5gyrky0cz3bqn8
jam [Mon, 7 Feb 2011 12:36:44 +0000 (13:36 +0100)]
[FIX] Backport bug solve in trunk + ssl implementation
bzr revid: tfr@openerp.com-
20110207123644-5315u97ogvcflbr3
Thibault Francois [Mon, 7 Feb 2011 12:31:53 +0000 (13:31 +0100)]
[FIX] avoid to have lead emails in cc when forward to partner with geo assign
bzr revid: tfr@openerp.com-
20110207123153-qig4thicpe3y855a
Thibault Francois [Mon, 7 Feb 2011 12:04:26 +0000 (13:04 +0100)]
[IMP] thunderbird SSL
bzr revid: tfr@openerp.com-
20110207120426-a0cm8uxkcdb8gt4t
Jay Vora (OpenERP) [Mon, 7 Feb 2011 11:38:37 +0000 (17:08 +0530)]
[FIX] Hr_Timesheet : Timesheet report should be available for those employees who have user associated with them.
bzr revid: jvo@tinyerp.com-
20110207113837-ajxt2kis1xpa6rk8
Jay Vora (OpenERP) [Mon, 7 Feb 2011 11:32:52 +0000 (17:02 +0530)]
[FIX] Email_template : Corrected context of action
lp bug: https://launchpad.net/bugs/688069 fixed
bzr revid: jvo@tinyerp.com-
20110207113252-o1n57152p85lqj0v
Olivier Dony [Mon, 7 Feb 2011 10:36:45 +0000 (11:36 +0100)]
[FIX] account.move.line: write() should support ids=int, to be consistent with super.
This shortcoming was made obvious by a recent server change: 3343
revision-id: odo@openerp.com-
20110205004316-zaw9qqfke1bcw0s7
bzr revid: odo@openerp.com-
20110207103645-nra55tbsakl4xrd7
Olivier Dony [Mon, 7 Feb 2011 10:26:52 +0000 (11:26 +0100)]
[FIX] fields.o2m.set(): typo in previous commit, should pass IDs as list to write()
bzr revid: odo@openerp.com-
20110207102652-gkgyp5uqo0nk454a
Sbh (OpenERP) [Mon, 7 Feb 2011 07:32:02 +0000 (13:02 +0530)]
[MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-
20110204044653-4tw2q32jt96g8gyk
bzr revid: sbh@tinyerp.com-
20110207073202-27z2vur01cl5d5dv
Launchpad Translations on behalf of openerp [Mon, 7 Feb 2011 06:24:04 +0000 (06:24 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110204141107-he2a4lqhpdj8brod
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110205061213-yh3zalefmhy3lnc8
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110206061534-04t2bl7s49p3e748
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110207062404-8ksdea8si79q51n2
Launchpad Translations on behalf of openerp [Mon, 7 Feb 2011 05:20:17 +0000 (05:20 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110205045946-ngssapvavvzymfc4
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110206045319-cjbcpcr7k0jw8v8f
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110205050201-5kxv4wvlb171y4ec
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110206045419-syxas10vfjwq4nw9
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110207052017-1qsba36kfnjc0zkj
Olivier Dony [Sat, 5 Feb 2011 00:43:16 +0000 (01:43 +0100)]
[IMP] osv: added test for parent_store computations + fix for another edge case
The yaml test create a tree structure and modifies it by copying nodes
around and then moving them, checking that the child_of operator keeps
working afterwards. This test caught another edge case, as a follow-up
to the case of bug 708603
lp bug: https://launchpad.net/bugs/708603 fixed
bzr revid: odo@openerp.com-
20110205004316-zaw9qqfke1bcw0s7
jam-openerp [Fri, 4 Feb 2011 09:19:22 +0000 (14:49 +0530)]
[IMP] thunderbird : implement https for thudnerbird
bzr revid: jam@tinyerp.com-
20110204091922-fuk3dqyf9ollth8y
Anup (OpenERP) [Fri, 4 Feb 2011 09:03:09 +0000 (14:33 +0530)]
[FIX] mrp : Corrected Quantity Calculation when having different UoM in MO
lp bug: https://launchpad.net/bugs/709055 fixed
bzr revid: ach@openerp.com-
20110204090309-4i0jjr2tfszrcdni
jam-openerp [Fri, 4 Feb 2011 07:45:07 +0000 (13:15 +0530)]
[MERGE] with trunk-dev-addons1
bzr revid: jam@tinyerp.com-
20110204074507-cd2kv0w1cwtdo444
Dhruti(OpenERP) [Fri, 4 Feb 2011 06:32:43 +0000 (12:02 +0530)]
[FIX] Sale_crm : Correction the inheritance of views,made by string. (Ref:SaaS maintenance Case 3974)
bzr revid: jvo@tinyerp.com-
20110204063243-33yu7bgb4271ox07
Olivier Dony [Thu, 3 Feb 2011 23:00:23 +0000 (00:00 +0100)]
[MERGE] merged latest fixes from 6.0, up to rev 3334
bzr revid: odo@openerp.com-
20110203230023-o2a0b5tovewu0ft2
Olivier Dony [Thu, 3 Feb 2011 22:51:02 +0000 (23:51 +0100)]
[FIX] orm.write: avoid miscalculation of parent_left/right when moving multiple records under same parent
This issue caused the parent_left and parent_right values to be correct
only for the first record being update as part of a batch update on several
children from the same parent. An example of the consequences is the linked
bug 708503.
lp bug: https://launchpad.net/bugs/708603 fixed
bzr revid: odo@openerp.com-
20110203225102-a7v8bv90l2ph5ujh
Olivier Dony [Thu, 3 Feb 2011 22:20:26 +0000 (23:20 +0100)]
[REVERT] account: reverted incorrect fix for bug 708603, this is in fact a server error
Commit reverted was merged in rev 3164.118.782 mra@mra-laptop-
20110131082002-xzx4v2adzdvv8nmg
lp bug: https://launchpad.net/bugs/708603 fixed
bzr revid: odo@openerp.com-
20110203222026-ln6hmyivaj9bo11g
Sbh (OpenERP) [Thu, 3 Feb 2011 13:26:39 +0000 (18:56 +0530)]
[MERGE] Merge lp:lp:710723
bzr revid: sbh@tinyerp.com-
20110203132639-psx4icipc0hnoesz
jam-openerp [Thu, 3 Feb 2011 11:28:37 +0000 (16:58 +0530)]
[MERGE] trunk-dev-addons1
bzr revid: jam@tinyerp.com-
20110203112837-6151hhwh81qgn3a9
jam-openerp [Thu, 3 Feb 2011 08:33:12 +0000 (14:03 +0530)]
[BUG/FIX] lp:710723
lp bug: https://launchpad.net/bugs/710723 fixed
bzr revid: jam@tinyerp.com-
20110203083312-3pad88mrh3pshhhl
Jay Vora (OpenERP) [Thu, 3 Feb 2011 07:44:15 +0000 (13:14 +0530)]
[FIX] setup.py : typo corrected
lp bug: https://launchpad.net/bugs/710813 fixed
bzr revid: jvo@tinyerp.com-
20110203074415-35mt5cl2bk5szzr4
Jay Vora (OpenERP) [Thu, 3 Feb 2011 07:29:43 +0000 (12:59 +0530)]
[FIX] setup.py : typo corrected
lp bug: https://launchpad.net/bugs/710813 fixed
bzr revid: jvo@tinyerp.com-
20110203072943-vfath4rqrxhqwvdi
Launchpad Translations on behalf of openerp [Thu, 3 Feb 2011 06:17:18 +0000 (06:17 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110203061642-vso4sr14t1g3p5sa
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110203061718-vr6gj90b3pov038j
Sbh (OpenERP) [Thu, 3 Feb 2011 05:01:10 +0000 (10:31 +0530)]
[MERGE] Merge bug fix lp:710558
bzr revid: sbh@tinyerp.com-
20110203050110-yf4l2b49sk8sbgqo
Sbh (OpenERP) [Thu, 3 Feb 2011 04:53:39 +0000 (10:23 +0530)]
[MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-
20110203045339-u28g78m5ei948692
Launchpad Translations on behalf of openerp [Thu, 3 Feb 2011 04:45:26 +0000 (04:45 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110202044205-3ws4pqp0lavgg5c5
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110203044526-s8t9nmtqd7do7yy4
Launchpad Translations on behalf of openerp [Thu, 3 Feb 2011 04:43:06 +0000 (04:43 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110203044306-8k55djcscwbpuis6
Jay Vora (OpenERP) [Wed, 2 Feb 2011 14:55:07 +0000 (20:25 +0530)]
[FIX] Document_ftp : Correction on ftp_browse wizard for URL (Ref : Maintenance case 3889)
bzr revid: jvo@tinyerp.com-
20110202145507-vqaoq77rjip164ga
Thibault Francois [Wed, 2 Feb 2011 14:35:57 +0000 (15:35 +0100)]
[FIX] base_calendar : timezone False sent to server for write
bzr revid: tfr@openerp.com-
20110202143557-9cefs1eyu2yekh04
Atul Patel (OpenERP) [Wed, 2 Feb 2011 13:24:29 +0000 (18:54 +0530)]
[FIX]l FIXED bug/710558 and document_ftp url for db name.
bzr revid: atp@tinyerp.com-
20110202132429-vuhub4kyusnenaag
Sbh (OpenERP) [Wed, 2 Feb 2011 09:49:47 +0000 (15:19 +0530)]
[Fix] Fix buildbot warning
bzr revid: sbh@tinyerp.com-
20110202094947-a90gv7cemgn6l4jn
Ujjvala Collins (OpenERP) [Wed, 2 Feb 2011 09:24:49 +0000 (14:54 +0530)]
[REVERT] crm_helpdesk: Reverted the search view changes on crm_helpdesk.
bzr revid: uco@tinyerp.com-
20110202092449-gnsqfevmwzxn65a0
Sbh (OpenERP) [Wed, 2 Feb 2011 09:01:43 +0000 (14:31 +0530)]
[MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-
20110202090143-fcrn5ma8jlutgszr
Sbh (OpenERP) [Wed, 2 Feb 2011 06:40:42 +0000 (12:10 +0530)]
[MERGE outlook and project improvement
bzr revid: sbh@tinyerp.com-
20110202064042-9884y705nkpavrwb
Launchpad Translations on behalf of openerp [Wed, 2 Feb 2011 05:44:08 +0000 (05:44 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110202054408-8b2iwfb5fgdibeom
Sbh (OpenERP) [Wed, 2 Feb 2011 05:28:36 +0000 (10:58 +0530)]
[FIX] crm :fix the browse error
bzr revid: sbh@tinyerp.com-
20110202052836-2idkatgyzds85gb0
Ujjvala Collins (OpenERP) [Wed, 2 Feb 2011 04:45:27 +0000 (10:15 +0530)]
[MERGE]
bzr revid: uco@tinyerp.com-
20110202044527-m61qnov3aspijdrn
Olivier Dony [Tue, 1 Feb 2011 21:01:40 +0000 (22:01 +0100)]
[REVERT] fields: revert previous fix, until tests and addons are checked for compatibility
bzr revid: odo@openerp.com-
20110201210140-gmr25730fiuvq7e5
Thibault Francois [Tue, 1 Feb 2011 16:06:22 +0000 (17:06 +0100)]
[FIX] widget selection replace by m2o because the domain is dynamic
bzr revid: tfr@openerp.com-
20110201160622-gc75h8fwp0c4vz7o
qdp-launchpad@tinyerp.com [Tue, 1 Feb 2011 15:56:35 +0000 (16:56 +0100)]
[MERGE] merged dev2 branch
bzr revid: qdp-launchpad@tinyerp.com-
20110201155635-1kfct183b9btdlnj
qdp-launchpad@tinyerp.com [Tue, 1 Feb 2011 15:50:23 +0000 (16:50 +0100)]
[MERGE] merged the dev3 branch
bzr revid: qdp-launchpad@tinyerp.com-
20110201155023-bhmz3wby39n868eq
Olivier Dony [Tue, 1 Feb 2011 14:25:28 +0000 (15:25 +0100)]
[MERGE] merged latest bugfixes from 6.0 into trunk (up to rev 4375)
bzr revid: odo@openerp.com-
20110201142528-5w9ns20flxmetf3i
Sbh (OpenERP) [Tue, 1 Feb 2011 13:37:34 +0000 (19:07 +0530)]
[Fix] project_planining: fix the demo data
bzr revid: sbh@tinyerp.com-
20110201133734-ebpyv6evoi1rf52f
Olivier Dony [Tue, 1 Feb 2011 13:07:21 +0000 (14:07 +0100)]
[REVERT] fields: revert previous fix, until tests and addons are checked for compatibility
bzr revid: odo@openerp.com-
20110201130721-q368qznven3vbmty
Mustufa Rangwala [Tue, 1 Feb 2011 12:58:56 +0000 (18:28 +0530)]
[MERGE] project_planning: corrected value of 'date_to' field in the demo data
bzr revid: mra@mra-laptop-
20110201125856-2xto32mgkwtptv13
Mustufa Rangwala [Tue, 1 Feb 2011 12:53:45 +0000 (18:23 +0530)]
[REVERT] Analytic: changes reverted for rev 4927 (act window on analytic form)
bzr revid: mra@mra-laptop-
20110201125345-t9jxwatp239l0w5w
mtr [Tue, 1 Feb 2011 12:46:51 +0000 (18:16 +0530)]
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: mtr@mtr-
20110201124651-lrhtpwo9jpgo7zd2