Commit Graph
37875 Commits
Author SHA1 Message Date
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
Xavier Morel 4b99639e32 [ADD] documenting the documentation, a bunch of JsDoc
bzr revid: xmo@openerp.com-20110330152736-iqcb533xgvzbnuq6
2011-03-30 17:27:36 +02:00
Vo Minh Thu 4944140a91 [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20110330152301-884qvxeg62ae633g
2011-03-30 17:23:01 +02:00
Vo Minh Thu b247657a6a [FIX] setup.py: add pytz timezone files as data_files.
- this is needed for the windows packaging as py2exe will leave them out.
- it was already done in the 5.0 branch, but implemented differently,
  by copying the files into the library.zip (which we dont use anymore in trunk).

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

bzr revid: vmt@openerp.com-20110330151943-gvl1zg2yawa4vx5x
2011-03-30 17:19:43 +02:00
niv-openerp 0519496d0a [FIX] Corrected tabs.
bzr revid: nicolas.vanhoren@openerp.com-20110330150421-7c7zc2n4mjv44tnh
2011-03-30 17:04:21 +02:00
Fabien Meghazi 0292b18dd1 renames part 7
bzr revid: fme@openerp.com-20110330144436-vh6tc9tl4r52d3e3
2011-03-30 16:44:36 +02:00
Antony Lesuisse c7e2d214ad renames part6 partially working
bzr revid: al@openerp.com-20110330143556-yogu79hyy5oojdvq
2011-03-30 16:35:56 +02:00
Antony Lesuisse 316d13143f renames part5
bzr revid: al@openerp.com-20110330140448-g0jnzz8nlpywjgt5
2011-03-30 16:04:48 +02:00
Antony Lesuisse dcb9634cea renames part4
bzr revid: al@openerp.com-20110330140048-qm5m28ns44hkqzvn
2011-03-30 16:00:48 +02:00
Antony Lesuisse 4dd20612ad renames part3
bzr revid: al@openerp.com-20110330140007-8mncjzcb07921iw4
2011-03-30 16:00:07 +02:00
Antony Lesuisse 561070589e renames part2
bzr revid: al@openerp.com-20110330135909-7vrkihfqubcg9tmz
2011-03-30 15:59:09 +02:00
Raphael Collet a17cfb4c7c add child_ids in view base.edit_menu_access
bzr revid: rco@openerp.com-20110330135624-6y5cico3hnkxmgrs
2011-03-30 15:56:24 +02:00
Antony Lesuisse 2283e03546 reorganize directories
bzr revid: al@openerp.com-20110330135619-9lcvg2mijzxud8gr
2011-03-30 15:56:19 +02:00
Raphael Collet 6f71892f4d cleanup views (remove experimental menu structure view)
bzr revid: rco@openerp.com-20110330135517-kylqohddxunp4lan
2011-03-30 15:55:17 +02:00
Quentin (OpenERP) e8af0914f6 [FIX] account_asset: fixed the form view of account_asset
bzr revid: qdp-launchpad@openerp.com-20110330134524-56x2ifxs4qbdg7ig
2011-03-30 15:45:24 +02:00
Quentin (OpenERP) 447d680e49 [FIX] account_asset: fixed the structure of account_asset_category
bzr revid: qdp-launchpad@openerp.com-20110330134451-sqqdmmrf4tzsj5dz
2011-03-30 15:44:51 +02:00
Quentin (OpenERP) 27553a73e7 [IMP] account_asset: removed the dependancy of account_simulation
bzr revid: qdp-launchpad@openerp.com-20110330134355-hdt1mmztqn2131tq
2011-03-30 15:43:55 +02:00
Rifakat Haradwala (Open ERP) 8306e424b9 [IMP]: email_message.py: change arguments
bzr revid: rha@tinyerp.com-20110330133521-um3uczn2883i9fli
2011-03-30 19:05:21 +05:30
Rifakat Haradwala (Open ERP) 707efc0d34 [IMP]: ir_mail_server.py: removed _email_send() and merge with email_send()
bzr revid: rha@tinyerp.com-20110330133331-3r1wpr4pepdont6x
2011-03-30 19:03:31 +05:30
Osenda 88de3c4148 [IMP]new salary head view
bzr revid: osenda-20110330133046-o4ef7gz1n1laekt5
2011-03-30 15:30:46 +02:00
OpenERP 95f9e24c7a [ADD] added account_asset
bzr revid: openerp@ubuntu-20110330132527-evi4ug7cew3od7x3
2011-03-30 06:25:27 -07:00
Quentin (OpenERP) 086d74aa9d [IMP] hr_expense: minor improvements in the report (added back the note and certified conform blabla + added validation user)
bzr revid: qdp-launchpad@openerp.com-20110330130723-99rf9fcnsv71exn9
2011-03-30 15:07:23 +02:00
Raphael Collet 374ddee61e introduce explicitly parent_menu_id
bzr revid: rco@openerp.com-20110330124007-fe3zamgc4eh20msi
2011-03-30 14:40:07 +02:00
odoo f3433d30aa [FIX] do not send email if email_to is false, do not link with contact if no partner
bzr revid: odoo@ns307129.ovh.net-20110330114324-4ry4pixddj8jppd7
2011-03-30 13:43:24 +02:00