Commit Graph
654 Commits
Author SHA1 Message Date
Naresh (OpenERP) 72c838b8ff [MERGE FOR TRUNK]
bzr revid: nch@tinyerp.com-20110429090002-jv43vi0hcmbt6ib7
2011-04-29 14:30:02 +05:30
AVP(Axelor) cc3d7333c8 [FIX][IMP] all modules improvement.
bzr revid: amp@tinyerp.com-20110429084948-x0pny8n2ersc4h8m
2011-04-29 14:19:48 +05:30
Harry (OpenERP) 5be7bbd5c3 [MERGE] merged with trunk development branch
bzr revid: hmo@tinyerp.com-20110428111210-llk36qlgkdz1ls54
2011-04-28 16:42:10 +05:30
Harry (OpenERP) d96ceb7e74 [MERGE] fixing usability
bzr revid: hmo@tinyerp.com-20110426073918-j333hzotq62a69nz
2011-04-26 13:09:18 +05:30
Husen Daudi 29e05874b6 merged with trunk
bzr revid: hda@hda-laptop-20110421052650-rtn75wn5o3ue87wp
bzr revid: hda@hda-laptop-20110426053533-gn68qmvhikeefike
2011-04-26 11:05:33 +05:30
Launchpad Translations on behalf of openerp 2f1607c786 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110422043906-4a4yeks4mzl3sfef
bzr revid: launchpad_translations_on_behalf_of_openerp-20110423045345-9xga4elfyud8nsec
bzr revid: launchpad_translations_on_behalf_of_openerp-20110424043747-9x0ffekdqw8ldcc1
bzr revid: launchpad_translations_on_behalf_of_openerp-20110425045050-3owniws6mcmmclll
bzr revid: launchpad_translations_on_behalf_of_openerp-20110426044154-jrf1eg82ie49zl0r
2011-04-26 04:41:54 +00:00
Harry (OpenERP) 0577796333 [MERGE] merged addons trunk development branch after resolving conflicts
bzr revid: hmo@tinyerp.com-20110421080156-3c8gg29i01089rgo
2011-04-21 13:31:56 +05:30
Harry (OpenERP) 490c9e3173 [MERGE] correction of backlog1
bzr revid: hmo@tinyerp.com-20110420125833-au8koi1tvr6bmnvj
2011-04-20 18:28:33 +05:30
Rifakat Haradwala (Open ERP) 96c65e3dbe [FIX]: improvements for attachment as dictionary
bzr revid: rha@tinyerp.com-20110420095458-0w53lpa10sv7wnep
2011-04-20 15:24:58 +05:30
Husen Daudi 2062bd4e8c fixed typo
bzr revid: hda@hda-laptop-20110419133624-w3tbgukt9e83h2h2
2011-04-19 19:06:24 +05:30
Anup (OpenERP) 1060ac58c3 [FIX] base_calendar : Typo Fixed on notification for missing email on invitation wizard
bzr revid: ach@tinyerp.com-20110419115936-2x0o1rrvu9sov1b0
2011-04-19 17:29:36 +05:30
tfr@openerp.com 73124b8784 [FIX] don't load page with non virtual id, event until 23:59:59
bzr revid: tfr@openerp.com-20110419090716-eo930gq7noisu6lj
2011-04-19 11:07:16 +02:00
Husen Daudi c1fdef15dd bugfixes
bzr revid: hda@hda-laptop-20110414104040-l6vkjbb0qpvdqgd3
2011-04-14 16:10:40 +05:30
Rucha (Open ERP) 077d56f53e [FIX]: crm: Fixed computation of repeat Until, if I set 15th as until date, it must include 15th , but it was taking meetings till 14th only
bzr revid: rpa@tinyerp.com-20110414072716-q4ao5c2iczas19f6
2011-04-14 12:57:16 +05:30
Naresh (OpenERP) 485e9e0e60 [MERGE FROM TRUNK]
bzr revid: nch@tinyerp.com-20110406072923-fvvlznickj13xnh3
bzr revid: nch@tinyerp.com-20110412053932-1lpa1fjqtvchuf4j
bzr revid: nch@tinyerp.com-20110414063112-g04hyxqz76h04nef
2011-04-14 12:01:12 +05:30
Xavier Morel 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
Xavier Morel 26ddfe235d [FIX] namespacing of base_calendar addon
bzr revid: xmo@openerp.com-20110413133207-k4d53w0eznwtqoec
2011-04-13 15:32:07 +02:00
Xavier Morel 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
Xavier Morel 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
Ujjvala Collins (OpenERP) ebd9fa95dc [FIX] crm, base_calendar: Fixed yaml warnings.
bzr revid: uco@tinyerp.com-20110413092626-ylqsbtg6l11sbfpj
2011-04-13 14:56:26 +05:30
Xavier Morel 3412b89d95 [IMP] add a bunch of tests for transformation of invisible fields, make View.fields_view_get take a request so it can use the request context for its evaluations
bzr revid: xmo@openerp.com-20110411103118-msx5plh2lnz5obps
2011-04-11 12:31:18 +02:00
Thibault Francois 6280812b27 [CLEAN]
bzr revid: tfr@openerp.com-20110408120918-6ysl3ktwjlhnltc2
2011-04-08 14:09:18 +02:00
Thibault Francois cc29e5e5ab [FIX] deletion + reccurent doesn't appear
bzr revid: tfr@openerp.com-20110408120540-pnnl2a0zwph2t8qj
2011-04-08 14:05:40 +02:00
Thibault Francois f3337fbd9b [MERGE]
bzr revid: tfr@openerp.com-20110408113916-vwyz7x03xm0rbtui
2011-04-08 13:39:16 +02:00
Thibault Francois 86f898c31d [FIX] unlink event
bzr revid: tfr@openerp.com-20110408101420-jj6ysi3c5rn059fn
2011-04-08 12:14:20 +02:00
Thibault Francois 8fb1bedda7 [FIX] don't open meetings => id give are not right
bzr revid: tfr@openerp.com-20110408074255-fgg0zvdkzab4ir8i
2011-04-08 09:42:55 +02:00
Bhumika (OpenERP) 3e8f09657b [MERGE]
bzr revid: sbh@tinyerp.com-20110408054059-vf269ga1vctvsfod
2011-04-08 11:10:59 +05:30
Antony Lesuisse a590451a1b [MERGE] manually calendar view from trunk-proto61-dhtmlx-scheduler-vda
bzr revid: al@openerp.com-20110407164106-odb0y1qogrg4x2js
2011-04-07 18:41:06 +02:00
Thibault Francois 306c4a5f9b [FIX] crm meeting
bzr revid: tfr@openerp.com-20110407122336-m94kjzhfw8vj46on
2011-04-07 14:23:36 +02:00
Thibault Francois 7957d6bbaa [MERGE] trunk
bzr revid: tfr@openerp.com-20110407120320-nbcd1egwuufx06su
2011-04-07 14:03:20 +02:00
Launchpad Translations on behalf of openerp ffee41cbed Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110406043928-xqladzrd05q5t19g
bzr revid: launchpad_translations_on_behalf_of_openerp-20110407043758-7t6u87d24s7yq2lf
2011-04-07 04:37:58 +00:00
Launchpad Translations on behalf of openerp 838512af0b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110401044755-ox0af9npzekocmtk
bzr revid: launchpad_translations_on_behalf_of_openerp-20110402045547-u88jxku3jz7ejycg
bzr revid: launchpad_translations_on_behalf_of_openerp-20110403044009-x9bqq57ukyqvp6ia
bzr revid: launchpad_translations_on_behalf_of_openerp-20110404044757-3uw7ib92gpv7ezu1
bzr revid: launchpad_translations_on_behalf_of_openerp-20110405044706-ew5moemiz1wxra7h
2011-04-05 04:47:06 +00:00
Harry (OpenERP) 1cf2e0e884 [MERGE] rename module: email with mail due to conflicts python packages
bzr revid: hmo@tinyerp.com-20110404105639-147c1wj9c17lp4sk
2011-04-04 16:26:39 +05:30
Rifakat Haradwala (Open ERP) 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
Thibault Francois f1f4488523 [CLEAN] calendar code and files __openerp__.py | 2
base_calendar.py                         |  120 ++++++----------------
 base_calendar_view.xml                   |    3 
 wizard/__init__.py                       |    2 
 wizard/base_calendar_set_exrule.py       |  163 -------------------------------
 wizard/base_calendar_set_exrule_view.xml |   71 -------------
 wizard/calendar_event_edit_all.py        |   98 ------------------
 wizard/calendar_event_edit_all_view.xml  |   41 -------
 8 files changed, 35 insertions(+), 465 deletions(-)

bzr revid: tfr@openerp.com-20110331151449-k5wcwdzmkf8x9rpz
2011-03-31 17:14:49 +02:00
Thibault Francois 692d25a7a5 [FIX] rrule computation base_calendar.py | 120 ++++---------------------------------------------------
1 file changed, 10 insertions(+), 110 deletions(-)

bzr revid: tfr@openerp.com-20110331144539-9d5z7518axvfef0y
2011-03-31 16:45:39 +02:00
Thibault Francois 77e4f4af0f [TO FIX] remove store rrule
bzr revid: tfr@openerp.com-20110331141727-yhlnbojr0rtc9d4y
2011-03-31 16:17:27 +02:00
Thibault Francois 4b50fcf718 [FIX] count, search for forerever meeting
bzr revid: tfr@openerp.com-20110331124025-rsfhq57m9nhs06uf
2011-03-31 14:40:25 +02:00
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) 9a9c100595 [Merge]: merge with lp:~openerp-dev/openobject-addons/emails-framework-addons
bzr revid: rha@tinyerp.com-20110330092614-sgnniorxit17zvxn
2011-03-30 14:56:14 +05:30
Harry (OpenERP) cf7c73310d [MERGE] merged with trunk addods development branch
bzr revid: hmo@tinyerp.com-20110329122736-78igudbed2jz7lf4
2011-03-29 17:57:36 +05:30
Launchpad Translations on behalf of openerp d8ca559b5d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110329044041-qyy3q7u1em74acq9
2011-03-29 04:40:41 +00:00
Thibault Francois faf861da83 [IMP] support of read_group
bzr revid: tfr@openerp.com-20110323151230-8ga1qghcs5d5ug06
2011-03-23 16:12:30 +01:00
Thibault Francois 010e873dfa [FIX] search count
bzr revid: tfr@openerp.com-20110323110842-pzf48p650qc2er6k
2011-03-23 12:08:42 +01:00
Thibault Francois 3d47f150f2 [IMP]
bzr revid: tfr@openerp.com-20110323095423-kjqxe90a9i3jg6tz
2011-03-23 10:54:23 +01:00
Rifakat Haradwala (Open ERP) 2fe7c51e36 [REM] email.smtp_server: removed email.smtp_server and did changes in email module
bzr revid: rha@tinyerp.com-20110321133156-y57yw6sekshnw9ns
2011-03-21 19:01:56 +05:30
niv-openerp 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
vro 437ed909c2 [IMP]: Module descriptions.
bzr revid: vro@tinyerp.com-20110318114737-znh9wtipt84hc5jd
2011-03-18 17:17:37 +05:30
niv-openerp 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
Antony Lesuisse 5f1e8c27c5 base_calendar
bzr revid: al@openerp.com-20110317145321-bchwp2kw8isof6xx
2011-03-17 15:53:21 +01:00