Commit Graph
56219 Commits
Author SHA1 Message Date
Khushboo Bhatt (Open ERP) eb57fb1503 [FIX]l10n_in_hr_payroll:python code for rules
bzr revid: kbh@tinyerp.com-20120830054908-7j6vydmwwfzsoned
2012-08-30 11:19:08 +05:30
Mustufa Rangwala (OpenERP) eb8a8906f0 [MERGE] merge from main trunk addons
bzr revid: mra@tinyerp.com-20120829123043-qrx1poqa41nj79q7
bzr revid: mra@tinyerp.com-20120830071713-53bp6apq6j11latw
2012-08-30 12:47:13 +05:30
Launchpad Translations on behalf of openerp b065d54d96 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120830051221-904da3tt7dpfmhlx
2012-08-30 05:12:21 +00:00
Fabien Pinckaers 6e943465be imp_css
bzr revid: fp@tinyerp.com-20120829191243-zmgsqb8twjcwzx02
2012-08-29 21:12:43 +02:00
Fabien Pinckaers 254489e168 [IMP] analytic contracts
bzr revid: fp@tinyerp.com-20120829190831-f6n1ruzsca2bo8xc
2012-08-29 21:08:31 +02:00
Fabien Pinckaers d0261477f8 [IMP] CSS improvement
bzr revid: fp@tinyerp.com-20120829190819-gl2q4d0d0xsbh2l3
2012-08-29 21:08:19 +02:00
Minh Tran 1fbec3ca40 merge from mit-trunk
bzr revid: mit@openerp.com-20120829164028-5wuckgc6ozhd9s38
2012-08-29 18:40:28 +02:00
Antony Lesuisse 12dd1aaca1 [MERGE] pad working no conversion yet
bzr revid: al@openerp.com-20120829160430-v6gou8uu5ldwyd6v
2012-08-29 18:04:30 +02:00
Olivier Dony bc74fc920c [MERGE] Rebase incorrect top-level merge of pad/wiki refactoring + extra merge of product form simplification
To be completed by an extra merge containing the remaining
work-in-progress stuff of pad/wiki refactoring.

bzr revid: odo@openerp.com-20120829155400-memirrjghutw5pl7
2012-08-29 17:54:00 +02:00
Minh Tran 3053d26382 fixed project_timesheet with the new project xml
bzr revid: mit@openerp.com-20120829154535-z3qr72o9usnt9piv
2012-08-29 17:45:35 +02:00
Fabien Meghazi ba7aee832d [IMP] Support for classnames in m2o autocomplete
Also improved readability of code

bzr revid: fme@openerp.com-20120829153756-7b3lq5lan6b97chy
2012-08-29 17:37:56 +02:00
Antony Lesuisse 588f233f15 wip part1 (no setHTML) working
bzr revid: al@openerp.com-20120829123833-4b9kp33d9ne2gyom
2012-08-29 14:38:33 +02:00
Mustufa Rangwala (OpenERP) 95c0fec699 [MERGE] l10n_in_hr_payroll: Improve salary rules
bzr revid: mra@tinyerp.com-20120829121912-rhsuygls3ot6yn9s
2012-08-29 17:49:12 +05:30
Fabien Meghazi 6e80e425d1 [IMP] Use 'open' action in kanban views
bzr revid: fme@openerp.com-20120829114847-dzvqs8gaas03ma5b
2012-08-29 13:48:47 +02:00
Fabien Meghazi d78cd0a57d [IMP] Use 'open' action in kanban views
bzr revid: fme@openerp.com-20120829114753-s0rhr2jcb7qlvvfp
2012-08-29 13:47:53 +02:00
Fabien Meghazi 848c16e6d0 [ADD] Added 'open' action to kanban card links
bzr revid: fme@openerp.com-20120829114713-kj9c0vsxtn504li3
2012-08-29 13:47:13 +02:00
Khushboo Bhatt (Open ERP) 699720066b [FIX]l10n_in_hr_payroll:description added
bzr revid: kbh@tinyerp.com-20120829110528-mcvijjnfzt5xj594
2012-08-29 16:35:28 +05:30
Khushboo Bhatt (Open ERP) c42ba7020b [FIX]l10n_in_hr_payroll:All company contribution will not appear on the payslip excepts if company deduction from employee salary
bzr revid: kbh@tinyerp.com-20120829102834-o52m2hyq69783ao1
2012-08-29 15:58:34 +05:30
Antony Lesuisse b745a2038a [IMP] view_form remove used callback on do_save
bzr revid: al@openerp.com-20120829102300-0a1m4f237wbmqzv4
2012-08-29 12:23:00 +02:00
Fabien Pinckaers d3bb4f5ae5 merge
bzr revid: fp@tinyerp.com-20120829094828-b8pxz76tfnigfffw
2012-08-29 11:48:28 +02:00
Khushboo Bhatt (Open ERP) b1724905d4 [FIX]l10n_in_hr_payroll:rules improved,help updated
bzr revid: kbh@tinyerp.com-20120829094252-wzdygt5muwcuochl
2012-08-29 15:12:52 +05:30
Antony Lesuisse 2f81a1adc6 [MERGE] trunk
bzr revid: al@openerp.com-20120829093743-syqklh5mypeiqxjp
2012-08-29 11:37:43 +02:00
Antony Lesuisse 9f1633e4a2 todo
bzr revid: al@openerp.com-20120829093606-5oenal17oyhlvxeb
2012-08-29 11:36:06 +02:00
Fabien Meghazi 6c58d3b296 [REM] Removed debugger
bzr revid: fme@openerp.com-20120829081925-jstohijacc121chz
2012-08-29 10:19:25 +02:00
Launchpad Translations on behalf of openerp fcfa02f700 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120829050532-9tyfsc8n79btqrv2
2012-08-29 05:05:32 +00:00
Minh Tran 9575df09ee Merge from mit-trunk
bzr revid: mit@openerp.com-20120828180459-3ttpcs0qjzbi803z
2012-08-28 20:04:59 +02:00
Minh Tran 3ae5a108ab Restyling of project kanban view
bzr revid: mit@openerp.com-20120828180237-w14dhdufbx6dxc2i
2012-08-28 20:02:37 +02:00
Antonin Bourguignon d8eb1234a6 [FIX] mail alias: properly fetch inactive users
bzr revid: abo@openerp.com-20120828171853-sgqtft6ox45fcot2
2012-08-28 19:18:53 +02:00
Antonin Bourguignon 715480a9de [FIX] mail alias: properly fetch inactive users
bzr revid: abo@openerp.com-20120828163918-7hexk4xtotqakobm
2012-08-28 18:39:18 +02:00
Fabien Meghazi 03383c7408 [IMP] If any attachment on a record, display 'X Attachment(s)' in sidebar
bzr revid: fme@openerp.com-20120828144613-6a47a4o5iwqb8t0o
2012-08-28 16:46:13 +02:00
Fabien Meghazi 67ea7a40a4 [FIX] State widget elements overlapping with dropdowns and menus
bzr revid: fme@openerp.com-20120828142935-pdq8zb74f665bznt
2012-08-28 16:29:35 +02:00
Minh Tran 2fb02f4e15 [MERGE] trunk
bzr revid: mit@openerp.com-20120828131240-24t2374v60jn202w
2012-08-28 15:12:40 +02:00
Stephane Wirtel fc01690a94 [MERGE] Remove the pychart library, use the online version via pypi or the package manager
bzr revid: stw@openerp.com-20120828130721-gnwdldquz6ywkwby
2012-08-28 15:07:21 +02:00
Fabien Meghazi 232a51901c [FIX] When drag&dropping a card in kanban view, the record is opened under Firefox.
bzr revid: fme@openerp.com-20120828123906-mc9pbcwb6tiv8da1
2012-08-28 14:39:06 +02:00
Fabien Pinckaers 393b477ffe [IMP] product form improvement
bzr revid: fp@tinyerp.com-20120828120732-e2wg7kst61swskxc
2012-08-28 14:07:32 +02:00
Minh Tran 1106c7cdd4 merge from trunk
bzr revid: mit@openerp.com-20120828112510-5hverqp1564c0g7u
2012-08-28 13:25:10 +02:00
Dharti Ratani (OpenERP) 3733972565 [MERGE]merged with trunk
bzr revid: dhr@tinyerp.com-20120828092928-da2a6k1f2e7g9i42
2012-08-28 14:59:28 +05:30
Launchpad Translations on behalf of openerp 4e31d1be93 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828064335-bftlutj6aiymztbp
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828072410-7ndsu3tnyrjhtuor
2012-08-28 07:24:10 +00:00
Launchpad Translations on behalf of openerp 8a79542d29 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828055452-vim5zth19odzs439
2012-08-28 05:54:52 +00:00
Fabien Pinckaers 420a4811b9 [IMP] remove OpenERP Enterprise old code
bzr revid: fp@openerp.com-20120827213212-cjhnn33eqnrn8mk1
2012-08-27 23:32:12 +02:00
Fabien Pinckaers 95aec10efe merge
bzr revid: fp@openerp.com-20120827212610-roc220otwi7y6wd2
2012-08-27 23:26:10 +02:00
Fabien Pinckaers e6f5e42bd0 [IMP] correct address format
bzr revid: fp@openerp.com-20120827211839-fvpami4gt0rvy231
2012-08-27 23:18:39 +02:00
Olivier Dony 682168e202 [REVERT] Revert hasty commit r.2976 - wreaks havoc on many views by revealing <li> bullets everywhere
bzr revid: odo@openerp.com-20120827140310-zzp1kmtulvenuamo
2012-08-27 16:03:10 +02:00
Mustufa Rangwala (OpenERP) 6aa5ea647f [IMP] l10n_in_hr_payroll: typo
bzr revid: mra@tinyerp.com-20120827052843-tx702vetryimkldk
2012-08-27 10:58:43 +05:30
Mustufa Rangwala (OpenERP) ee80611902 [IMP] l10n_in_hr_payroll: typo
bzr revid: mra@tinyerp.com-20120827051507-d6jpql116j7s8q3k
2012-08-27 10:45:07 +05:30
Mustufa Rangwala (OpenERP) 2658682b32 [MERGE] Merge from main addons
bzr revid: mra@tinyerp.com-20120827043902-6e5u3v77oporquab
2012-08-27 10:09:02 +05:30
niv-openerp 65f532e001 [IMP] made a whole-application replace of $element by $el
bzr revid: nicolas.vanhoren@openerp.com-20120824182743-1d9cii7kigc7exer
2012-08-24 20:27:43 +02:00
niv-openerp 5e338c591a [IMP] made a whole-application replace of $element by $el
bzr revid: nicolas.vanhoren@openerp.com-20120824182707-vt91ef40ieeudwyw
2012-08-24 20:27:07 +02:00
niv-openerp 9818cf073f [IMP] crm: added create_name_field on partner_id in leads
bzr revid: nicolas.vanhoren@openerp.com-20120824172729-4botx8doui5iw1er
2012-08-24 19:27:29 +02:00
niv-openerp 9780532da1 [IMP] changed the way create from m2o works, added option create_name_field
bzr revid: nicolas.vanhoren@openerp.com-20120824172622-evcz7011wlagep4z
2012-08-24 19:26:22 +02:00