Commit Graph
34754 Commits
Author SHA1 Message Date
Mustufa Rangwala cb6176a892 [MERGE] merge
bzr revid: mra@mra-laptop-20110331102726-ouqn5sq5hur501nu
2011-03-31 15:57:26 +05:30
Mustufa Rangwala 71d2458390 [IMP] payroll improve code
bzr revid: mra@mra-laptop-20110331102436-h318f46xiwnm1u8m
2011-03-31 15:54:36 +05:30
Xavier Morel e5466507ec [ADD] Registry object to record extensible mappings of objects (e.g. views or widgets)
bzr revid: xmo@openerp.com-20110331102023-iovd7s7ktk6zgb45
2011-03-31 12:20:23 +02:00
Xavier Morel ab3a266640 [FIX] typo in object path
bzr revid: xmo@openerp.com-20110331101636-8m9sx42byclm8vgm
2011-03-31 12:16:36 +02:00
Rifakat Haradwala (Open ERP) 58e4d5a289 [IMP] email: improvements
bzr revid: rha@tinyerp.com-20110331101512-6sku1kg99ixy1bc0
2011-03-31 15:45:12 +05:30
Rifakat Haradwala (Open ERP) 57287158c8 [IMP] misc.py: send_email() corrected arguments
bzr revid: rha@tinyerp.com-20110331101329-sp7701d68d0u07zy
2011-03-31 15:43:29 +05:30
Quentin (OpenERP) ab529f999f [FIX] stock/mrp: when consuming partially a product without production lot defined (but with track production lot thicked), don't siplt automatically by 1 to assign production lots
bzr revid: qdp-launchpad@openerp.com-20110331100725-otnmej7r4a36rl4e
2011-03-31 12:07:25 +02:00
Harry (OpenERP) 008cfa5001 [REVIEW] review work
bzr revid: hmo@tinyerp.com-20110331095555-u6trhy2pquik1ixm
2011-03-31 15:25:55 +05:30
Rifakat Haradwala (Open ERP) 15eafc54e3 [IMP] ir_mail_server.py, misc.py: improvements for sending emails, created two differnt methods for creating email message and sending emails
bzr revid: rha@tinyerp.com-20110331095010-wgu4vl8ybeso3k6o
2011-03-31 15:20:10 +05:30
Rucha (Open ERP) 3a8ebfc1f7 [MERGE]: Merge with lp:~openerp-dev/openobject-server/trunk-rework-server-23-mar-aag
bzr revid: rpa@tinyerp.com-20110331093903-qey92sucwsq0rqwl
2011-03-31 15:09:03 +05:30
Rucha (Open ERP) ce2be48045 [IMP]: base: "choose your view type" should not come for every re-launching of the configuration wizard
bzr revid: rpa@tinyerp.com-20110331093752-gn87diunh30m1diu
2011-03-31 15:07:52 +05:30
Rucha (Open ERP) 32ce101897 [MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-rework-addons-23-march-aag
bzr revid: rpa@tinyerp.com-20110331093634-d0iokfbdyw95a5cv
2011-03-31 15:06:34 +05:30
Harry (OpenERP) 4dbdabe3d2 [REVIEW] review and refactor code
bzr revid: hmo@tinyerp.com-20110331093342-7glpwdwjko1px44h
2011-03-31 15:03:42 +05:30
mtr 14c6473473 [IMP] hr_payroll: improved code to avoid duplicate rules on payslip
bzr revid: mtr@mtr-20110331093109-0wq8bqq2q4t6y5bz
2011-03-31 15:01:09 +05:30
Ujjvala Collins (OpenERP) 0f93c2fa75 [MERGE]
bzr revid: uco@tinyerp.com-20110331092739-cuvmqywk7awatlrj
2011-03-31 14:57:39 +05:30
Mustufa Rangwala 352a3ec142 [FIX] payroll remove the tabs
bzr revid: mra@mra-laptop-20110331092325-vfsm4q487lh9dmo2
2011-03-31 14:53:25 +05:30
Mustufa Rangwala ab98d8809d [FIX] payroll
bzr revid: mra@mra-laptop-20110331092048-uivs7dxmh2o7fhp8
2011-03-31 14:50:48 +05:30
Rifakat Haradwala (Open ERP) dfb7539e98 [IMP]: improvements
bzr revid: rha@tinyerp.com-20110331090350-uud2kept28bs1xv0
2011-03-31 14:33:50 +05:30
Xavier Morel 3fc0ef57bb [IMP] remove useless files in tests, make setup of sections explicit
bzr revid: xmo@openerp.com-20110331085806-j5yd1syvvos47yfj
2011-03-31 10:58:06 +02:00
Xavier Morel 0add303a60 [FIX] datasets test suite
bzr revid: xmo@openerp.com-20110331085007-f9ln7eor2qbz60e0
2011-03-31 10:50:07 +02:00
Quentin (OpenERP) 0274e67b66 [IMP] base_update.xml: set restart=never and state=skip on the 'configure your interface' wizard
bzr revid: qdp-launchpad@openerp.com-20110331084853-d7hbgao5e242o23t
2011-03-31 10:48:53 +02:00
Quentin (OpenERP) 233084fdc6 [IMP] base_setup: set restart=never and state=skip on the 'configure your company' wizard
bzr revid: qdp-launchpad@openerp.com-20110331083919-01lwi0uxtbra167f
2011-03-31 10:39:19 +02:00
Thibault Francois 54f8d9fbc7 [MERGE] survey-fixes
bzr revid: tfr@openerp.com-20110331083523-emxu11uohjjltj2p
2011-03-31 10:35:23 +02:00
Fabien Meghazi e74ff91f19 [ADD] Put form widgets in instance.base.form{}
bzr revid: fme@openerp.com-20110331082838-d27ekbdfjtfahsmo
2011-03-31 10:28:38 +02:00
Fabien Meghazi 07eb4e005c [REV] Switch back to <script> tags until we find a clean solution for chrome's cache
bzr revid: fme@openerp.com-20110331082506-53xu93msz0exkjuu
2011-03-31 10:25:06 +02:00
Fabien Meghazi 386dd624ae [FIX] Updated jqGrid hardcoded path
bzr revid: fme@openerp.com-20110331082353-a5s9p6cgciedzm10
2011-03-31 10:23:53 +02:00
Xavier Morel 9979c52ac6 [FIX] warnings
bzr revid: xmo@openerp.com-20110331080335-u3vxmxr2cn7vx3nf
2011-03-31 10:03:35 +02:00
aag (OpenERP) 6298ed3d17 [IMP]base:Optimize Help
bzr revid: aag@tinyerp.co.in-20110331073807-vmp2n00bo4czap3a
2011-03-31 13:08:07 +05:30
Osenda f7777d457d [IMP] in payslip asked by qdp
bzr revid: osenda-20110331072504-pspga7znfo87dvl0
2011-03-31 09:25:04 +02:00
Raphael Collet fd51a28411 [MERGE] merge trunk changes
bzr revid: rco@openerp.com-20110331070135-ok910xbeofdosopq
2011-03-31 09:01:35 +02:00
aag (OpenERP) 527ba12809 [IMP]base_setup:Optimize Code
bzr revid: aag@tinyerp.co.in-20110331065242-hlr92ir0emadiyad
2011-03-31 12:22:42 +05:30
Ujjvala Collins (OpenERP) 8b114a48a2 [REF] sync_google_contact: Search for system's timezone if not specified on server.
bzr revid: uco@tinyerp.com-20110331065047-0e8o74zf9ue2p731
2011-03-31 12:20:47 +05:30
Launchpad Translations on behalf of openerp 2789420154 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110331063553-0h7syde9b0wkn9o8
2011-03-31 06:35:53 +00:00
aag (OpenERP) a961f815cb [MERGE]: Merge with lp:trunk-configuration-rework
bzr revid: aag@tinyerp.co.in-20110331053722-no95ook4u16a498h
2011-03-31 11:07:22 +05:30
aag (OpenERP) ae8423136f [MERGE]: Merge with lp:trunk-configuration-rework
bzr revid: aag@tinyerp.co.in-20110331053505-ze0yh0gt044x9e4e
2011-03-31 11:05:05 +05:30
Harry (OpenERP) bd8a37054e [MERGE] mergedlp:~openerp-dev/openobject-server/trunk-email-smtp-improvement-rha
bzr revid: hmo@tinyerp.com-20110331050935-9sj6nzmqvykygkd9
2011-03-31 10:39:35 +05:30
Harry (OpenERP) 34ad855373 [MERGE] merged lp:~openerp-dev/openobject-addons/trunk-email-cleanup-rha
bzr revid: hmo@tinyerp.com-20110331050907-sil9jlac1he5rr8p
2011-03-31 10:39:07 +05:30
Rifakat Haradwala (Open ERP) 29ffd4bdb8 [fix] base: fix arguments
bzr revid: rha@tinyerp.com-20110331045937-c92ifyjvuq0u5r4b
2011-03-31 10:29:37 +05:30
Launchpad Translations on behalf of openerp eb4fbd8551 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110331043544-4uod3qjraw8g3sk2
bzr revid: launchpad_translations_on_behalf_of_openerp-20110331043640-q2ujjqpmgkqifdeq
2011-03-31 04:36:40 +00:00
Antony Lesuisse affa119a48 playing with folding part2
bzr revid: al@openerp.com-20110330235743-7if1cog3dafmjtve
2011-03-31 01:57:43 +02:00
Antony Lesuisse e18bb959be playing with folding, lends will be removed (can be added by preprocessing)
bzr revid: al@openerp.com-20110330235552-06z58n5vcbzwmst5
2011-03-31 01:55:52 +02:00
Antony Lesuisse 850988f762 fix lib prefix for js in base.html
bzr revid: al@openerp.com-20110330230426-5skppswnnve4ceri
2011-03-31 01:04:26 +02:00
Quentin (OpenERP) 0e1ff44344 [REF] account_asset: code refactoring
bzr revid: qdp-launchpad@openerp.com-20110330202106-nhafsz4kkj0y227f
2011-03-30 22:21:06 +02:00
OpenERP d33e675009 [IMP] account fixed asset
bzr revid: openerp@ubuntu-20110330171702-5knjrrnbi5hsoicp
2011-03-30 10:17:02 -07:00
Vo Minh Thu 58cd48c7c4 [MERGE] merged 6.0 branch.
bzr revid: vmt@openerp.com-20110330170544-g760f1k8gcdha6fx
2011-03-30 19:05:44 +02:00
Vo Minh Thu 5728a70679 [FIX] setup.py: previous commit used unexisting variable.
bzr revid: vmt@openerp.com-20110330170432-knrders2xw9zh2k9
2011-03-30 19:04:32 +02:00
Xavier Morel b79b219cc3 [FIX] forgot duplicate variable declaration during merge
bzr revid: xmo@openerp.com-20110330155604-ohwaqadh9ibhfltd
2011-03-30 17:56:04 +02:00
Raphael Collet ebaaea7a94 remove menu form extension, it is now in a distinct branch
bzr revid: rco@openerp.com-20110330153629-dik99ng57unmhl8w
2011-03-30 17:36:29 +02:00
Raphael Collet edaae88606 add a page with submenus in edit_menu_access form
bzr revid: rco@openerp.com-20110330153321-bstnetdx7cg7q6ii
2011-03-30 17:33:21 +02:00
Vo Minh Thu 1e58ca70e0 [FIX] setup.py: copying pytz timezone data into the library.zip.
- This copy-pasted from the 5.0 setup.py.

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

bzr revid: vmt@openerp.com-20110330153316-zh440p3nrur0qbad
2011-03-30 17:33:16 +02:00