Commit Graph
81391 Commits
Author SHA1 Message Date
Christophe Simonis bf29a2ebc7 [MERGE] forward port of branch 7.0 up to revid 9302 chs@openerp.com-20130718111616-apacuhc2qhquobtc
bzr revid: dle@openerp.com-20130627104833-b9zgtu8urj43f12b
bzr revid: mat@openerp.com-20130702135856-kmg7d8anw17nkbd8
bzr revid: chs@openerp.com-20130718115928-wpa84dqh8tcq31zt
2013-07-18 13:59:28 +02:00
Christophe Simonis 1e9789baf8 [FIX] base_report_designer: correct "Export To RML" on OSX
bzr revid: chs@openerp.com-20130718111616-apacuhc2qhquobtc
2013-07-18 13:16:16 +02:00
Dharmraj Zala (OpenERP Trainee) 6c063627e6 [FIX] encoded some stirng with utf-8 which could not be converted into ascii
bzr revid: dizzy.zala@gmail.com-20130718094943-xgru5gi07uqq0b5v
2013-07-18 15:19:43 +05:30
ajay javiya (OpenERP) 281ff41ab1 [IMP]: code for accept/decline invitation
bzr revid: aja@tinyerp.com-20130718084811-rlii1g3898zoikku
2013-07-18 14:18:11 +05:30
Thibault Delavallée 486c31af17 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130718084544-jgz0p60kphl8cdc1
2013-07-18 10:45:44 +02:00
Thibault Delavallée 0d68a800e3 [FIX] project_mrp: fixed issue with the state field used in an sql query.
bzr revid: tde@openerp.com-20130718084451-z6us9ajaoli2a28c
2013-07-18 10:44:51 +02:00
Launchpad Translations on behalf of openerp dc5b5228db Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130717072519-9772wyvh9z6e4g8n
bzr revid: launchpad_translations_on_behalf_of_openerp-20130718071434-7x6sozvlnl6qhb2i
bzr revid: launchpad_translations_on_behalf_of_openerp-20130717072525-qqiq08bh7teas3sh
bzr revid: launchpad_translations_on_behalf_of_openerp-20130718071444-zxeebb2ub7nv2zqq
2013-07-18 07:14:44 +00:00
Atul Patel (OpenERP) 6228a12e27 [Merge]: Merged with addons
bzr revid: atp@tinyerp.com-20130718042025-4jn0hldondi7pvjc
2013-07-18 09:50:25 +05:30
Atul Patel (OpenERP) 70d47d809a [MERGE]: Merged with addons
bzr revid: atp@tinyerp.com-20130718041650-rpo69kehswfc8gq4
2013-07-18 09:46:50 +05:30
Christophe Simonis 0729f9292f [MERGE][FIX]crm: lead/opp convert/opp wizard: Add salesperson and salesteam in wizard form
bzr revid: chs@openerp.com-20130717154502-2om2l3gzwjyj81nd
2013-07-17 17:45:02 +02:00
Christophe Simonis 24ea151a37 merge upstream
bzr revid: chs@openerp.com-20130717142947-de40mn3234gt5044
2013-07-17 16:29:47 +02:00
Christophe Matthieu 8fa171aa0d [FIX] crm_meeting: fix domain evaluation for calendar recursive. (see openerp-web/7.0/revision/3989). Todo: fix recursive when the begin date it's before the domain search date
bzr revid: chm@openerp.com-20130717142325-8lo9el6gk9kgos3d
2013-07-17 16:23:25 +02:00
Thibault Delavallée b49d94408f [FIX] crm: added date_last_stage_update in crm + report
bzr revid: tde@openerp.com-20130717141336-ul8xwlveh3c1w9y9
2013-07-17 16:13:36 +02:00
Maxime Chambreuil 72989c1a9d [FIX] reconcile = False on tax accounts
bzr revid: maxime.chambreuil@savoirfairelinux.com-20130717125745-b8p0pn2govdq1qp8
2013-07-17 08:57:45 -04:00
Paramjit Singh Sahota b7160bc1cf [IMP] Improved code for fetch_followers and done as was previously && added condition for the record in display_followers so that it never breaks && improve the mouse-enter and mouse-leave.
bzr revid: psa@tinyerp.com-20130717124842-vuqct26jy6a7palb
2013-07-17 18:18:42 +05:30
Thibault Delavallée b802e66079 [IMP] [FIX] ir_actions_server: form view fixes and improvements + some model update to ease the process of creating new server actions.
bzr revid: tde@openerp.com-20130717120936-52f0emxeufinzqg4
2013-07-17 14:09:36 +02:00
Christophe Matthieu 46ddd14a7d [IMP] website_sale: in progress
bzr revid: chm@openerp.com-20130717113242-npbhnvrqeuw56iod
2013-07-17 13:32:42 +02:00
Christophe Matthieu 729f65bd71 [IMP] website: add menu item in backend
bzr revid: chm@openerp.com-20130731090625-6q7d2kmgaslvu3dl
2013-07-31 11:06:25 +02:00
Christophe Matthieu 3c7f3c7528 [IMP] website_mail: change button layout
bzr revid: chm@openerp.com-20130731083437-b35f7vpirq00bvn6
2013-07-31 10:34:37 +02:00
Christophe Matthieu 0330d9d962 [FIX] website_mail: edit blog
bzr revid: chm@openerp.com-20130731081955-h2d6nzwsc0icpssu
2013-07-31 10:19:55 +02:00
Thibault Delavallée 8d292b6f59 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130716082412-ll8kr34qleu4trkh
bzr revid: tde@openerp.com-20130717092938-mpfcwwnb1yojwer0
2013-07-17 11:29:38 +02:00
Thibault Delavallée 48dd55b1e8 [FIX] mail: fixed merge issue, forgottent conflict
bzr revid: tde@openerp.com-20130717085925-l0u2nkvz91wm5kcy
2013-07-17 10:59:25 +02:00
Thibault Delavallée 32d0f6bce0 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130717074710-2jz58nqwe7hnyyij
2013-07-17 09:47:10 +02:00
Thibault Delavallée 4f7afae100 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130717074450-puhtirdoqswf55pl
2013-07-17 09:44:50 +02:00
Launchpad Translations on behalf of openerp f3e128cb89 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130706061657-5n94hzrjw9qy5efq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130710055130-0m6p2gfsn1tod5bq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063420-lu76zka6n8deodkk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055831-4f7mdp0hocv4r25l
bzr revid: launchpad_translations_on_behalf_of_openerp-20130717072430-94onks9pjgbvbsgb
2013-07-17 07:24:30 +00:00
Launchpad Translations on behalf of openerp 455fa4e597 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130717064313-thb64cq8368siq7s
2013-07-17 06:43:13 +00:00
bth-openerp dc70c5118a [MERGE]Merge lp:openobject-addons.
bzr revid: bth@tinyerp.com-20130717061626-dbxhag7y6wzy2clp
2013-07-17 11:46:26 +05:30
bth-openerp 9a49a6c2dc [MERGE]Merge lp:openobject-addons.
bzr revid: bth@tinyerp.com-20130717053307-qtsb5djddkc41rpc
2013-07-17 11:03:07 +05:30
Amit Bhavsar (Open ERP) 9ce89b12a9 [MERGE] merge with latest trunk
bzr revid: amb@tinyerp.com-20130717051958-qpl3u5aoo15au5c2
2013-07-17 10:49:58 +05:30
Thibault Delavallée 707373ec9e [FIX] crm modules: various fixes about state removal.
bzr revid: tde@openerp.com-20130716153818-7ag1nrjyylj6ze8n
2013-07-16 17:38:18 +02:00
Thibault Delavallée aa389bcd5b [MERGE] Merged branch remove-state-tde-all, taking only part about crm_claim, crm_helpdesk and various fixes in other crm modules.
bzr revid: tde@openerp.com-20130716151513-vb1vovihcgf0dltq
2013-07-16 17:15:13 +02:00
Thibault Delavallée 0e9fd3d5d5 [IMP] crm: removed state field. Refactored code according to the new guidelines.
bzr revid: tde@openerp.com-20130716151003-c2df3nzgo1by0hyi
2013-07-16 17:10:03 +02:00
Christophe Matthieu 02e8b1ab3e [IMP] website_sale: no accordion
bzr revid: chm@openerp.com-20130716143048-fafg42kd92396d2z
2013-07-16 16:30:48 +02:00
Fabien Meghazi d1c74232b8 [ADD] Added template declaration in qweb templates
bzr revid: fme@openerp.com-20130718170004-sreng8338a40nilc
2013-07-18 19:00:04 +02:00
Fabien Meghazi aa5c6790a3 Compiled base.sass, added oe_styling_v8. (Not even sure I should do that)
bzr revid: fme@openerp.com-20130718145610-ctnwbis5yzn69ubi
2013-07-18 16:56:10 +02:00
Antony Lesuisse ae3a97538b m
bzr revid: al@openerp.com-20130716135848-31c82if5j4za4s0s
2013-07-16 15:58:48 +02:00
niv-openerp 3885ee3330 [FIX] some more problems with werkzeug 0.9.1
bzr revid: nicolas.vanhoren@openerp.com-20130716131548-aa60tcfn3zwchqd0
2013-07-16 15:15:48 +02:00
niv-openerp 788071f34f [FIX] some more problems with werkzeug 0.9.1
bzr revid: nicolas.vanhoren@openerp.com-20130716131401-abj3i020a8831l98
2013-07-16 15:14:01 +02:00
Thibault Delavallée 25439cfb3a [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130716122426-lbt7hrxjv3lgi1ev
2013-07-16 14:24:26 +02:00
Amit Bhavsar (Open ERP) 3812f2d8c7 [imp img] Improve description Images for MRP.
bzr revid: amb@tinyerp.com-20130716101555-5i0l6y1xfbgq7b83
2013-07-16 15:45:55 +05:30
Denis Ledoux f8480b69be [FIX]email_template: generate_email_for_composer, clean context before find or create partner, to avoid default values for partner
bzr revid: dle@openerp.com-20130716095928-z79ipwgjxw5ypg3y
2013-07-16 11:59:28 +02:00
ajay javiya (OpenERP) 5c667f27f9 [IMP]: Click on Direct in OpenERP should redirect to calender view of meeting
bzr revid: aja@tinyerp.com-20130716095015-ls0xkmq7irn11z8c
2013-07-16 15:20:15 +05:30
Mehul Mehta (OpenERP Trainee) 295d807aa5 [IMP] change a reply private discussion Document in chatter and remove a author notified of its own messages
bzr revid: mehulmehta008@gmail.com-20130716094124-ksigo91x3njgdj4f
2013-07-16 17:41:24 +08:00
Thibault Delavallée 7c4f374aca [MERGE] [IMP] l10n_in improvements
chart of taxes and taxes improvements
missing COA addition

bzr revid: tde@openerp.com-20130716093458-bgganvrcl6pm8hcb
2013-07-16 11:34:58 +02:00
ajay javiya (OpenERP) 9ea3b4c5ab [IMP]: user will accept only his/her meeting
bzr revid: aja@tinyerp.com-20130716091848-09xzzbb6j0jev0mj
2013-07-16 14:48:48 +05:30
bth-openerp 06e4b00202 [MERGE]Merge lp:openobject-addons.
bzr revid: bth@tinyerp.com-20130716091008-6b7rw45j1naeda39
2013-07-16 14:40:08 +05:30
bth-openerp 1d391ebb33 [FIX]Resolve conflicts.
bzr revid: bth@tinyerp.com-20130716090653-4xrtndazb02k2kof
2013-07-16 14:36:53 +05:30
Priket Trivedi (OpenERP Trainee) e2155ae540 [IMP] mail in add class to set margin and change pixel for filed
bzr revid: trivedi.pariket@gmail.com-20130716085231-8qe107fvcm6rwmj4
2013-07-16 14:22:31 +05:30
Thibault Delavallée a95b321883 [FIX] Fixed active_ids / active_id management, wrong getter on active_id making server action run twice.
bzr revid: tde@openerp.com-20130716082344-cvw0djli0n8pq3bt
2013-07-16 10:23:44 +02:00
Christophe Simonis df8d972057 [IMP] */static/description/index.html: link to /start include app name
bzr revid: chs@openerp.com-20130715162504-9ntu1dj222rgv9ek
2013-07-15 18:25:04 +02:00