c78a04bc68
[MERGE] Merged HSA's branch to improve __openerp__.py of all modules by replacing init_xml, update_xml with data, demo_xml with demo, Adding noupdate in init_xml files
...
bzr revid: pso@tinyerp.com-20120822071445-yamr1s0zf3fk9jj7
2012-08-22 12:44:45 +05:30
8f9f860323
[IMP]Update __openerp__.py for all modules
...
bzr revid: hsa@tinyerp.com-20120820125644-px287o03bxrx8h3o
2012-08-20 18:26:44 +05:30
0d4603f4f9
[IMP]improved modules description from rst2html
...
bzr revid: help-20120820092716-x61hs1o7d8lz6tpg
2012-08-20 14:57:16 +05:30
b040d2706d
[IMP]update __openerp__.py in all modules
...
bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g
2012-08-17 16:45:40 +05:30
af71b1a653
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120724064138-h6fa97bu7drfohv6
2012-07-24 12:11:38 +05:30
e71819212c
[IMP]hr_recruitment: fix isuue in Application form view click on Schedule Interview button create new Interview meeting save and then click on done button give traceback
...
bzr revid: mma@tinyerp.com-20120723110910-9a6cy2smup58c1ok
2012-07-23 16:39:10 +05:30
ae8b2f65ed
[FIX] merge of lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-cha and fix
...
bzr revid: stw@openerp.com-20120720121246-ltdbylsj8aveiz13
2012-07-20 14:12:46 +02:00
7eb49260d1
[REVERT] previous merge of lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-cha
...
bzr revid: stw@openerp.com-20120720073459-bhslng4t8qbigoka
2012-07-20 09:34:59 +02:00
2a19e799d7
[IMP]: Place crm_meeting demo & data file at right location in base_calendar
...
bzr revid: cha@tinyerp.com-20120719100924-61t3jqsqzj61squb
2012-07-19 15:39:24 +05:30
d177d9a2a9
[IMP] move the views of crm.meeting in base_calendar, adapt xml ids in xml, and improve the code that opens those views
...
bzr revid: rco@openerp.com-20120706122959-o8clpxqvewpyha0k
2012-07-06 14:29:59 +02:00
bd1d436f9d
[IMP] crm, base_calendar: move the core of crm.meeting into base_calendar
...
bzr revid: rco@openerp.com-20120704141042-fiy0o7pdhc8hboht
2012-07-04 16:10:42 +02:00
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
ad4b6fcc21
[IMP] manifest: renamed active to auto_install.
...
bzr revid: vmt@openerp.com-20120130101837-zyebtyhfjypg2b4w
2012-01-30 11:18:37 +01:00
81c1bf7fcb
[IMP] better manifests for modules
...
bzr revid: fp@tinyerp.com-20111212142244-cm6e3um1adizu3kz
2011-12-12 15:22:44 +01:00
4e0befa1f4
[IMP] better manifests on modules
...
bzr revid: fp@tinyerp.com-20111206120355-h5vufbibzovtvf0j
2011-12-06 13:03:55 +01:00
3dc8168974
[FIX] Set the categories
...
bzr revid: stw@openerp.com-20111005141902-72du0lku4x176ix9
2011-10-05 16:19:02 +02:00
50507512cb
[MERGE] latest trunk
...
This was a helluva merge, with hundreds of conflicts resolved manually!!
I hope I did not break too many things, but a full review of the mail-related
features (where most of the conflicts occurred) must still be done before
this feature branch can be merged.
bzr revid: odo@openerp.com-20110809234428-3dsvxrt6t54ju0cf
2011-08-10 01:44:28 +02:00
dd456159b4
[ADD] Updated dhtmlxSheduler to version 3.0. (Fixed dhtmlx core initialization)
...
bzr revid: fme@openerp.com-20110803140914-5qjtozi94i4ruica
2011-08-03 16:09:14 +02:00
100fc72548
[FIX] js and css for mini calendar.
...
bzr revid: vda@tinyerp.com-20110601072441-y03c1h8ydau8os03
2011-06-01 12:54:41 +05:30
bc2b83e883
[FIX] gantt addon so it loads correctly
...
Also remove leftover debugging log in chrome, and fix dependencies listing for calendar
bzr revid: xmo@openerp.com-20110413142001-5dpxoava5a0cwmq7
2011-04-13 16:20:01 +02:00
b4cd776b25
[FIX] correctly load calendar addon
...
* Fix loading of active modules (don't hardcode list)
* Implement loading of CSS files via css list
* Fix Calendar addon
- Add list of JS files to descriptor
- Add list of CSS files to descriptor
- Have calendar load its own qweb template file
- Put calendar in the correct namespace (openerp.base_calendar) instead of a nonsensical one
bzr revid: xmo@openerp.com-20110413125042-feiimul8617a51d6
2011-04-13 14:50:42 +02:00
b7a638ccde
[BOOM] deactivate all addons, remove links to addons stuff from base, do not belong there
...
bzr revid: xmo@openerp.com-20110413120756-md9lg1rgehoyg4mc
2011-04-13 14:07:56 +02:00
47a85e9f8f
[IMP] mail: rename module email to mail because of parsing error
...
bzr revid: rha@tinyerp.com-20110404094552-j2rdq2sbeqrbffgn
2011-04-04 15:15:52 +05:30
cf7c73310d
[MERGE] merged with trunk addods development branch
...
bzr revid: hmo@tinyerp.com-20110329122736-78igudbed2jz7lf4
2011-03-29 17:57:36 +05:30
cf07e58016
[MERGE] Other improvements of descriptions in module manifests.
...
bzr revid: nicolas.vanhoren@openerp.com-20110318140618-jg2jumv3gyacfb74
2011-03-18 15:06:18 +01:00
437ed909c2
[IMP]: Module descriptions.
...
bzr revid: vro@tinyerp.com-20110318114737-znh9wtipt84hc5jd
2011-03-18 17:17:37 +05:30
a898038b47
[MERGE] Merged module screenshots and improvements to module descriptions.
...
bzr revid: nicolas.vanhoren@openerp.com-20110318110816-f8bnmmlfzc9eqyu7
2011-03-18 12:08:16 +01:00
5f1e8c27c5
base_calendar
...
bzr revid: al@openerp.com-20110317145321-bchwp2kw8isof6xx
2011-03-17 15:53:21 +01:00
edbb2d7168
[MERGE] Improvements to manifests.
...
bzr revid: nicolas.vanhoren@openerp.com-20110317122126-q1vxxy287aykxv6h
2011-03-17 13:21:26 +01:00
117d3f75a0
[MERGE]: Merge with latest trunk
...
bzr revid: rpa@tinyerp.com-20110317095800-l0sc4mj3uktsm8wa
2011-03-17 15:28:00 +05:30
3e6ec6f679
[ADD]: Images: base_action_rule, base_calendar, base_contact, base crypt
...
bzr revid: vro@tinyerp.com-20110314121708-xzia08gel40uvygp
2011-03-14 17:47:08 +05:30
e1afe5828a
[IMP] change module name emails to email and related to changes in addons all module. move email_gateway module file in email module and also related changes in related module..
...
bzr revid: ysa@tinyerp.com-20110310073900-ivesygpb7cdwpp43
2011-03-10 13:09:00 +05:30
a69c473f52
[IMP] Changed all module categories, limited number of categories
...
bzr revid: evv@openerp.com-20110309100505-mwxe08davyzdkfis
2011-03-09 11:05:05 +01:00
4c0cd7b7ed
[BUF/FIX] survey, base_calendar : added new access rights for the Survey/User for Invited user of the Survey
...
lp bug: https://launchpad.net/bugs/730651 fixed
bzr revid: jam@tinyerp.com-20110308125911-pzwecd8396dxjnib
2011-03-08 18:29:11 +05:30
26447d3f50
[MOV] change module name email to emails
...
bzr revid: ysa@tinyerp.com-20110208085311-yepv15l0pskvrmc2
2011-02-08 14:23:11 +05:30
5140ae0d98
[IMP] add email module depedancy in related module.
...
bzr revid: ysa@tinyerp.com-20110204062934-yf8in8dzu15vdmeh
2011-02-04 11:59:34 +05:30
34f1d34f77
[IMP] Add the missing certificates
...
bzr revid: stephane@openerp.com-20110117102616-xhdg1e24reijv88k
2011-01-17 11:26:16 +01:00
c860708a9c
[RENAME] Tiny ERP to OpenERP SA in all places
...
bzr revid: vir@tinyerp.com-20100728114344-u2cm97mk6gnfpp13
2010-07-28 17:13:44 +05:30
410fa0575e
[IMP]: base_calendar: Minor improvements
...
bzr revid: rpa@tinyerp.com-20100702091042-zgzsdboa1eazrn0y
2010-07-02 14:40:42 +05:30
2b21569972
[IMP]: base_calendar: Improved module description,
...
* Added state in event
* Code improvement
bzr revid: rpa@tinyerp.com-20100702073406-p2516r7p6reior5t
2010-07-02 13:04:06 +05:30
f388ea5445
[REF]
...
bzr revid: jvo@tinyerp.com-20100526082837-dzd3mu7n6y5p1x4c
2010-05-26 13:58:37 +05:30
ff1b4fd3f0
[MERGE] Merged from main branch.
...
bzr revid: vra@tinyerp.com-20100524081117-s63vktc1m3grcu8v
2010-05-24 13:41:17 +05:30
e277449755
[REF]
...
bzr revid: jma@tinyerp.com-20100521125831-rqe512penoei0kqz
2010-05-21 18:28:31 +05:30
27018a4253
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
...
bzr revid: ksa@tinyerp.co.in-20100503044623-cdwm3l4h1o7r9qev
2010-05-03 10:16:23 +05:30
084c657765
[ADD]: base_calendar: Add new wizard for exrule field functionality
...
bzr revid: ksa@tinyerp.co.in-20100429135023-aao2wuuzkvfsp0oc
2010-04-29 19:20:23 +05:30
5142d98b30
[FIX] Remove the executable flag on the python and xml files
...
bzr revid: stephane@openerp.com-20100429080154-kmn18r5kci0uq84u
2010-04-29 10:01:54 +02:00
3c41398683
[ADD]: base_calendar: Added yml test cases in base_calendar
...
bzr revid: rpa@tinyerp.com-20100420125848-dzlue5uw6n5yyb6e
2010-04-20 18:28:48 +05:30
8c34d46921
[Rename] __terp__.py file renamed to __openerp__.py for all crm, caldav, calendar, document, olap, wiki, survey, thunderbird modules.
...
bzr revid: ysa@tinyerp.co.in-20100412134029-fdaowqcc6bt350os
2010-04-12 19:10:29 +05:30
pso (OpenERP)
Hardik
help
Mayur Maheshwari (OpenERP)
Stephane Wirtel
Ajay Chauhan (OpenERP)
Raphael Collet
Vo Minh Thu
Fabien Pinckaers
Olivier Dony
Fabien Meghazi
vda (OpenERP)
Xavier Morel
Rifakat Haradwala (Open ERP)
Harry (OpenERP)
niv-openerp
vro
Antony Lesuisse
Rucha (Open ERP)
Yogesh (OpenERP)
Els Van Vossel
Jigar Amin
Stephane Wirtel
Jay (Open ERP)
vra
JMA (OpenERP)
ksa (Open ERP)
Ysa (Open ERP)