Commit Graph

165 Commits

Author SHA1 Message Date
niv-openerp 4a107613ca [FIX] pad: javascript error in pad.js
bzr revid: nicolas.vanhoren@openerp.com-20121029153653-m5f8uorbhqt4s8gp
2012-10-29 16:36:53 +01:00
Jigar Amin a4e2a7cf05 [MERGE] pad: Task Delegation traceback -ValueError: too many values to unpack
project_timesheet: Project Task work log with empty description show bad timesheet lines entry

bzr revid: jam@tinyerp.com-20121023070225-0mcejm4mypnvbha7
2012-10-23 12:32:25 +05:30
ajay javiya (OpenERP) ce3882d8d7 [FIX]:Task issue in project module
bzr revid: aja@tinyerp.com-20121023065037-2i16k4xlsczqj04y
2012-10-23 12:20:37 +05:30
Launchpad Translations on behalf of openerp 5bfa3c5a7d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121019053933-51d6oob5aw0ujz40
2012-10-19 05:39:33 +00:00
niv-openerp 802eda5ad7 Ported field pad
bzr revid: nicolas.vanhoren@openerp.com-20121012121126-atu1vf14rc4fxu0g
2012-10-12 14:11:26 +02:00
Frédéric van der Essen 1322cd1a3d [MERGE] from trunk
bzr revid: fva@openerp.com-20120927132942-853bb3uptrp1x55d
2012-09-27 15:29:42 +02:00
Fabien Pinckaers e9f4840c93 [IMP] emoving bad code, no invitation system on events
[IMP] no more certifiate, will be managed in apps.openerp.com directly

bzr revid: fp@tinyerp.com-20120926121627-60isym4hdjkaxe9p
2012-09-26 14:16:27 +02:00
Frédéric van der Essen aa17d5cf7a [MERGE] from trunk
bzr revid: fva@openerp.com-20120925135557-09s58wkbt038yxpo
2012-09-25 15:55:57 +02:00
Frédéric van der Essen a7f63f3fb2 [FIX] css: further etherpad fixes:
bzr revid: fva@openerp.com-20120924134600-5avqr2vohdsh7y9n
2012-09-24 15:46:00 +02:00
Antony Lesuisse 283131289d [MERGE] note: remove optionals tags, pad: fix lazy pad creation
bzr revid: al@openerp.com-20120920235343-tveo33j410atkt2y
2012-09-21 01:53:43 +02:00
Frédéric van der Essen 615cc75314 [MERGE] css improvements to mail, hr, and etherpad integration
bzr revid: fva@openerp.com-20120920155216-wzvpnk8rv4ltym5v
2012-09-20 17:52:16 +02:00
Frédéric van der Essen b9fd12a301 [FIX] fixed etherpad's css integration
bzr revid: fva@openerp.com-20120920144017-il5ck5997gjdn5e7
2012-09-20 16:40:17 +02:00
Christophe Matthieu f154707dcb [IMP]note : demo
bzr revid: chm@openerp.com-20120920120616-11khif6ezlacxxy0
2012-09-20 14:06:16 +02:00
Christophe Matthieu e57ae347a0 [IMP] pad : message insert into pad
bzr revid: chm@openerp.com-20120920105713-meckyb4pnlxbapzk
2012-09-20 12:57:13 +02:00
Christophe Matthieu 3863e439d8 [IMP]note: remove options tags, tags for all user inside header bar
bzr revid: chm@openerp.com-20120920075031-lx6k382cd8kcyct9
2012-09-20 09:50:31 +02:00
Christophe Matthieu 245002e48d [IMG] base_calendar, note_pad
bzr revid: chm@openerp.com-20120919143553-lmlvshitpkkftyln
2012-09-19 16:35:53 +02:00
Launchpad Translations on behalf of openerp 063c548209 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120911045051-qhkumfcarekjpsm0
2012-09-11 04:50:51 +00:00
Fabien Pinckaers 3754ded707 [IMP] pad demo daa
bzr revid: fp@openerp.com-20120905205539-sokhzgjpu0wi2pyo
2012-09-05 22:55:39 +02:00
Olivier Dony 424085389f [FIX] pad: fix case of missing pad server
Default to empty pad url when sever is not set, UI will gracefully handle this case

bzr revid: odo@openerp.com-20120830095821-2044b23scst5dktk
2012-08-30 11:58:21 +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
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
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
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
Saurang Suthar(OpenERP) 095843797c [IMP] Improved _openerp__.py of all modules by replacing demo_xml with demo, init_xml and update_xml with data and adding noupdate
bzr revid: pso@tinyerp.com-20120822130232-un52dks3sclyx8m5
2012-08-22 18:32:32 +05:30
Antony Lesuisse 72c5fe278b generate url from the widget if needed
bzr revid: al@openerp.com-20120820234008-olfcnxj7np6hwwgz
2012-08-21 01:40:08 +02:00
Hardik b040d2706d [IMP]update __openerp__.py in all modules
bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g
2012-08-17 16:45:40 +05:30
Twinkle Christian (OpenERP) fc1b1749a8 [IMP]Remove type field from the modules
bzr revid: tch@tinyerp.com-20120809060516-zgx3gdyv6wdshfyw
2012-08-09 11:35:16 +05:30
Launchpad Translations on behalf of openerp 3cfd65b43d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120807053928-8131c98edycpivlb
2012-08-07 05:39:28 +00:00
Stephane Wirtel 9f299d9a20 [MERGE] lp:~openerp-dev/openobject-addons/trunk-review_module_desc-psi
bzr revid: stw@openerp.com-20120724080711-6655pbbfubiau3li
2012-07-24 10:07:11 +02:00
Antony Lesuisse a79139048d [FIX] pad everything, remove unused api
bzr revid: al@openerp.com-20120721192551-q6nbqn4xxau0e64x
2012-07-21 21:25:51 +02:00
Purnendu Singh (OpenERP) c45d68d6b8 [MERGE] Merge with main addons
bzr revid: psi@tinyerp.com-20120718055558-03lss1ha0tcdi2dk
2012-07-18 11:25:58 +05:30
Fabien Pinckaers d17e291031 [IMP] etherpad fullscreen
bzr revid: fp@openerp.com-20120717225636-bqudwmo6cve50fjn
2012-07-18 00:56:36 +02:00
Fabien Pinckaers 4c82865bfd [IMP] etherpad
bzr revid: fp@openerp.com-20120717222457-f652anzrzharlwkn
2012-07-18 00:24:57 +02:00
Fabien Pinckaers 36cde3d9fc [IMP] some cleaning in etherpad
bzr revid: fp@openerp.com-20120717221408-zk30i103f0erk4a3
2012-07-18 00:14:08 +02:00
Tejas Tank 45c50d3a31 merged lasted + resolve conflicts + etherpad with project.task
bzr revid: tta@openerp.com-20120717101845-52upauotn1sjfqio
2012-07-17 15:48:45 +05:30
Sanjay Gohel (Open ERP) b81c51c73c [MERGE]merge with trunk addons
bzr revid: sgo@tinyerp.com-20120716065703-gcmugagvaaq1xl4c
2012-07-16 12:27:03 +05:30
Launchpad Translations on behalf of openerp 8028996327 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120714062750-arh47r4vgtj7zlwu
2012-07-14 06:27:50 +00:00
Quentin (OpenERP) ef74150d31 [IMP] settings: better form view for res.company
bzr revid: qdp-launchpad@openerp.com-20120713161158-w0e5268zip8drzi1
2012-07-13 18:11:58 +02:00
Ajay Chauhan (OpenERP) e0d24ed957 [IMP] : Update Description for modules
bzr revid: cha@tinyerp.com-20120713065810-91bvrnod20nr38gq
2012-07-13 12:28:10 +05:30
Sanjay Gohel (Open ERP) 12bae0d8f9 [IMP]improve company form view as per review. improve email_template,user form and all action window and also remove sheets from configuration
bzr revid: sgo@tinyerp.com-20120706123413-1n615yx09cw2kq36
2012-07-06 18:04:13 +05:30
Sanjay Gohel (Open ERP) 0fd2ca6bdc [IMP]Improve company view in settings and organise in group
bzr revid: sgo@tinyerp.com-20120703051546-2bxwnl0evv8qzirz
2012-07-03 10:45:46 +05:30
Launchpad Translations on behalf of openerp d4271f66c8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120613045614-nvpnoumt1aazscag
bzr revid: launchpad_translations_on_behalf_of_openerp-20120614043456-3m7u51qfu23c0qhx
bzr revid: launchpad_translations_on_behalf_of_openerp-20120614044123-deayo2v3jjc74u8f
2012-06-14 04:41:23 +00:00
Mayur Maheshwari (OpenERP) ea859f54c8 [IMP]all: remove a complexity in openerp and move asset management and Payroll in extra modules
bzr revid: mma@tinyerp.com-20120518052605-e6sdmicwtb4kcoq0
2012-05-18 10:56:05 +05:30
Tejas Tank ecc3903576 [IMP] Improve code.
bzr revid: tta@openerp.com-20120515122004-a7ru3nbu9ebc21pv
2012-05-15 17:50:04 +05:30
Tejas Tank 4aeccd8c32 Removed unwanted comment.
bzr revid: tta@openerp.com-20120515114250-724qkt8uv0sdpuag
2012-05-15 17:12:50 +05:30
Tejas Tank 6cfbb6cbfa pad height increased
bzr revid: tta@openerp.com-20120515113445-blgmm94w41gqqro3
2012-05-15 17:04:45 +05:30
Tejas Tank 13cce602fb Etherpad API Integraion, Set default blank pad, and user name per pad visit
bzr revid: tta@openerp.com-20120515111928-dgpejwc01nlyxemf
2012-05-15 16:49:28 +05:30
Tejas Tank 2a81f8e452 Etherpad API Integration.
bzr revid: tta@openerp.com-20120514134958-21spjsnqjitqw4ie
2012-05-14 19:19:58 +05:30
Tejas Tank 2af74107d7 Improvement with etherpad and with latest trunk code.
bzr revid: tta@openerp.com-20120511045856-yyrp8sfz6asnbujc
2012-05-11 10:28:56 +05:30