Commit Graph

82756 Commits

Author SHA1 Message Date
Turkesh Patel (Open ERP) d7e179a6df [ADD] added functionality to close question, added icon for edit and other links.
bzr revid: tpa@tinyerp.com-20140321125747-lq3otpnakwua08w0
2014-03-21 18:27:47 +05:30
Turkesh Patel (Open ERP) 7738af32e2 [FIX] improved code to add karma on vote
bzr revid: tpa@tinyerp.com-20140321094019-hbekr1rntbpdvvc5
2014-03-21 15:10:19 +05:30
Turkesh Patel (Open ERP) 283af4b6e5 [MRG] merged branch with improvements for assigning badges on running challange,improved some badge data.
bzr revid: tpa@tinyerp.com-20140321091924-mc3acnpx66oar555
2014-03-21 14:49:24 +05:30
Turkesh Patel (Open ERP) 7a82d51f84 [IMP] instead of showing no of badges show karma in user detail
bzr revid: tpa@tinyerp.com-20140321065332-ic28um9qtvdxx82f
2014-03-21 12:23:32 +05:30
Turkesh Patel (Open ERP) 967c424833 [MRG] merge with lp:openobejct-addons
bzr revid: tpa@tinyerp.com-20140321064210-uuccvuj2dwelabms
2014-03-21 12:12:10 +05:30
Turkesh Patel (Open ERP) e0ec4271f3 [IMP] don't allow user to post on hos own post.
bzr revid: tpa@tinyerp.com-20140321063855-ok26jsyyhza7x3ff
2014-03-21 12:08:55 +05:30
Sunil Sharma (OpenERP) 1185f7b8b5 [imp]:improve gamification challenge line category forum and add clss gamification challenge assign reward user
bzr revid: sunilsharma.sharma07@gmail.com-20140321054642-bjbgm4e92tur9f83
2014-03-21 11:16:42 +05:30
Denis Ledoux 54d8cd1e86 [FIX] crm: round robin tests on salesman assignation set force assignation true
bzr revid: dle@openerp.com-20140320183814-163zwgilty4l2jv7
2014-03-20 19:38:14 +01:00
Denis Ledoux abf8e0d54f [ADD] crm: mass convert lead to opp, add force assignation checkbox, to force the salesman/salesteam on converted/merged lead/opps or leave the existing salesman/salesteam
bzr revid: dle@openerp.com-20140320175129-2lj2pu86l3rjoulw
2014-03-20 18:51:29 +01:00
Turkesh Patel (Open ERP) 141eecfa4c [ADD] added function to add karma to user.
bzr revid: tpa@tinyerp.com-20140320130014-jehnk1x7n9jc1khj
2014-03-20 18:30:14 +05:30
Antony Lesuisse 520e10d4b4 [FIX] account invoice analysis exclude proforma from invoiced
bzr revid: al@openerp.com-20140320101555-hw2bgaqs2kw0b7of
2014-03-20 11:15:55 +01:00
Kersten Jeremy 720339ed1d [MERGE] Merge branch lp:~numerigraphe/openobject-server/7.0-translation-order-933496-numerigraphe
bzr revid: jke@openerp.com-20140320090105-fl2jt7hhplwu6dgr
2014-03-20 10:01:05 +01:00
Turkesh Patel (Open ERP) 1eddfb2eef [IMP] improved data of badges.
bzr revid: tpa@tinyerp.com-20140320085149-h65gmgojsr47e0ls
2014-03-20 14:21:49 +05:30
Launchpad Translations on behalf of openerp 800ab84e3b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140320054727-1wcctx54alajpzne
2014-03-20 05:47:27 +00:00
Antony Lesuisse 3116d31b53 [MERGE] ir_logging postgresql log handler --log-db=<dbname>
bzr revid: al@openerp.com-20140320001115-k9vmhq834wivanyl
2014-03-20 01:11:15 +01:00
Antony Lesuisse e73230d0fc ir_logging fix logger names
bzr revid: al@openerp.com-20140320000912-1a5hngnw8ilq22k8
2014-03-20 01:09:12 +01:00
Antony Lesuisse 6e4db0a0a6 ir_logging fix config option
bzr revid: al@openerp.com-20140320000524-gs98xy6iqh2ceev6
2014-03-20 01:05:24 +01:00
Antony Lesuisse 666f4d0801 [MERGE] trunk
bzr revid: al@openerp.com-20140319235117-7trt1y3927mml13u
2014-03-20 00:51:17 +01:00
Antony Lesuisse 48d3befa07 ir_logging disabled by default
bzr revid: al@openerp.com-20140319234542-jsmxchx7tuv13e13
2014-03-20 00:45:42 +01:00
Thibault Delavallée 10babec89d [MERGE] [FIX] Merged branch holding some fixes for the newly
(badly ?) introduced module website_mail_group: subscribe / unsubscribe now working,
pager now working. Some redesign will probably land in trunk if we have time
as the current layout is not very efficient.

bzr revid: tde@openerp.com-20140319133309-33vni7479w5q5tu0
2014-03-19 14:33:09 +01:00
Turkesh Patel (Open ERP) b68577f595 [IMP] store posts_count field and add function to update.
bzr revid: tpa@tinyerp.com-20140319130413-ojrr71d5800xghnd
2014-03-19 18:34:13 +05:30
Turkesh Patel (Open ERP) 02f43a69ad [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20140319124246-1v3nxprd7xdlnrsk
2014-03-19 18:12:46 +05:30
Turkesh Patel (Open ERP) 39e4f461e3 [MRG] improved demo data, instead of create_uid added field user_id in post
bzr revid: tpa@tinyerp.com-20140319124026-msq07bikv1p7xckz
2014-03-19 18:10:26 +05:30
Sunil Sharma (OpenERP) cf338062c9 [mrg]:lp:~openerp-dev/openobject-addons/trunk-website-forum-tpa
bzr revid: sunilsharma.sharma07@gmail.com-20140319121853-6h9pmz1zxr8fk5vy
2014-03-19 17:48:53 +05:30
Sunil Sharma (OpenERP) 70b0535d1e [imp]:improve run scheduler
bzr revid: sunilsharma.sharma07@gmail.com-20140319114613-mkoqzpj5wdgf0oih
2014-03-19 17:16:13 +05:30
Thibault Delavallée b484da7e73 [FIX] [IMP] website_mail: improved and fixed the 'subscribe button'.
This button is used to perform a 'message_subscribe' or 'message_unsubscribe' on some
documents. It is notably used to add a 'Subscribe' button in some pages that subscribe
the user to a mailing list (aka mail.group).
This branch fixes some subscribe/unsubscribe issues, better manages the public user,
use the session to remember whether a public user has subscribe to a mailing list,
and uses already-existing code to manage partners.

bzr revid: tde@openerp.com-20140319113129-qd2bok52hvf1ybiu
2014-03-19 12:31:29 +01:00
Turkesh Patel (Open ERP) 9bb6139cd2 [IMP] gamification: improved code to send notification message when bedge assigned, website_forum: improved code to show notification when badge assigned to user.
bzr revid: tpa@tinyerp.com-20140319090735-zi01wzh8a8u5cfb7
2014-03-19 14:37:35 +05:30
Sunil Sharma (OpenERP) 3fa07a4d6a [imp]:admin user edit a question asked by demo user to improve typo
bzr revid: sunilsharma.sharma07@gmail.com-20140319063642-4fek8778h2h8b82y
2014-03-19 12:06:42 +05:30
Launchpad Translations on behalf of openerp edf0f26d59 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140319055226-bk4bs5tp612t236j
2014-03-19 05:52:26 +00:00
Sunil Sharma (OpenERP) 0e1483bba9 [imp]:improve user downvote or upvote and improve create_uid field to user_id
bzr revid: sunilsharma.sharma07@gmail.com-20140319050635-7ph64mvoy58pbm3r
2014-03-19 10:36:35 +05:30
Christophe Simonis 99a3c45976 [MERGE] forward port of branch saas-3 up to revid 9328 chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
bzr revid: chs@openerp.com-20140318132741-aur3q1k7t9iympri
2014-03-18 14:27:41 +01:00
Denis Ledoux cac0c9600a [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9154 revid:dle@openerp.com-20140318151824-sscl4m8p87emjl8s
bzr revid: chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
bzr revid: dle@openerp.com-20140318152621-l6jxc0bbbofm7fzg
2014-03-18 16:26:21 +01:00
Denis Ledoux 02459f8d4a [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9929 revid:dle@openerp.com-20140325104921-x8zjx5p71l1o3uif
bzr revid: dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140311164146-2s599kogbqj8e94l
bzr revid: dle@openerp.com-20140312111149-u6y036aej3ywq7et
bzr revid: dle@openerp.com-20140312121145-06s1jvct9v4m7l6s
bzr revid: mat@openerp.com-20140313084409-c0kckxemy3in0mlo
bzr revid: chs@openerp.com-20140313163420-ifa4hyixj722d6jo
bzr revid: chs@openerp.com-20140314102034-g0nzryvwhrpzdas9
bzr revid: chs@openerp.com-20140314104803-19c5snl2fcuih91o
bzr revid: odo@openerp.com-20140314143519-x6rzcfkkqxwc0e1g
bzr revid: chs@openerp.com-20140318110229-y8098w3shdpmoig2
bzr revid: dle@openerp.com-20140318151824-sscl4m8p87emjl8s
bzr revid: dle@openerp.com-20140320112618-yfyihlwz66ryeqf5
bzr revid: dle@openerp.com-20140320161003-j01cc6sqves2wnp2
bzr revid: dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
bzr revid: dle@openerp.com-20140321140450-8ulnhr76qybiadks
bzr revid: dle@openerp.com-20140324104743-ubvu8st7emq9pg1q
bzr revid: dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
2014-03-25 12:24:13 +01:00
Denis Ledoux 6d60e0ee29 [FIX] project: on project template duplication, keep original tasks stages
bzr revid: dle@openerp.com-20140325104921-x8zjx5p71l1o3uif
2014-03-25 11:49:21 +01:00
Martin Trigaux 91c3673949 [MERGE] [FIX] purchase_requisition: when getting the price based on the pricelist for a supplier, pass the missing supplier id (useful for pricelist based on supplier price) (opw 601890)
bzr revid: mat@openerp.com-20140325104613-t79wxl4y38ll82h0
2014-03-25 11:46:13 +01:00
Olivier Dony 38c255627e [MERGE] l10n_fr: remove obsolete French taxes, following 2014 rate update, courtesy of Alexis de Lattre (Akretion)
bzr revid: odo@openerp.com-20140325104323-xtxthbopkhk350r4
2014-03-25 11:43:23 +01:00
Denis Ledoux 8310cd1920 [FIX] sale: make invoice for SO grouped by partner based on partner_invoice_id instead of just partner_id
For two sale order, if the partner_id were different but the partner_invoice_id were identical, the make invoice grouped by partner created two different invoices

bzr revid: dle@openerp.com-20140325103226-vusygdpd74yha91m
2014-03-25 11:32:26 +01:00
Launchpad Translations on behalf of openerp a8d14c47df Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140318062141-rdiqz2ptnz3qmxd0
bzr revid: launchpad_translations_on_behalf_of_openerp-20140325072122-d9jgtji9dmmytg8d
2014-03-25 07:21:22 +00:00
Denis Ledoux 04f632820b [FIX] sale: trigger signal manual invoice for make invoices wizard (not advance)
bzr revid: dle@openerp.com-20140324103427-yckncrnynvs5si8i
2014-03-24 11:34:27 +01:00
Simon Lejeune 245e83d43b [FIX] last version of wkhtmltopdf expects all file to have a doctype, inject one if not present
bzr revid: sle@openerp.com-20140324101731-eqzqins3s8uak1yd
2014-03-24 11:17:31 +01:00
Launchpad Translations on behalf of openerp 6472e4155a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140322070453-bbx8zxmppthwar0s
bzr revid: launchpad_translations_on_behalf_of_openerp-20140323064412-l97e4rap18b68ab0
2014-03-23 06:44:12 +00:00
Denis Ledoux 0871d10503 [FIX] survey: avoid duplicate partners on new users creation
bzr revid: dle@openerp.com-20140321135705-lrnxu3gsnkt4r5cd
2014-03-21 14:57:05 +01:00
Launchpad Translations on behalf of openerp 2fa6706037 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140321065150-vovy9a0q2y6vkwm4
2014-03-21 06:51:50 +00:00
Launchpad Translations on behalf of openerp 7b0b8a0790 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140320061913-o2fp3m104dzeb2ky
bzr revid: launchpad_translations_on_behalf_of_openerp-20140321065115-srp2g1l3twjabmcq
2014-03-21 06:51:15 +00:00
Kersten Jeremy 9bf6f0310e [FIX] Move default value in the _defaults of model and not in default_get.
Don't override the location_id if the super get_default don't retrun a value. 

Else it is impossible to set a default value, because the ir_values is always overrided with stock_location_stock as location_id

bzr revid: jke@openerp.com-20140320180240-un42lptu3pjnsmxq
2014-03-20 19:02:40 +01:00
Denis Ledoux be81326ee3 [FIX] survey: report not stored on filesystem
bzr revid: dle@openerp.com-20140320174835-kdha7ivs64vsvizt
2014-03-20 18:48:35 +01:00
Denis Ledoux 84eeb79875 [FIX] point_of_sale: add multi-companies rules on pos.config
bzr revid: dle@openerp.com-20140320154436-ygqhvvyhe6otv70p
2014-03-20 16:44:36 +01:00
Christophe Simonis 03c31de4dd [FIX] web: when filtering out context, also strip *_view_ref keys
bzr revid: chs@openerp.com-20140320131014-3v5qfjxq9unqu5fs
2014-03-20 14:10:14 +01:00
Denis Ledoux 287aae3942 [FIX] stock: force form_view_ref to False in context of actions track_line and scrap_move to avoid context propagation of stock picking views
bzr revid: dle@openerp.com-20140320110741-pg8se5c02p87yi1y
2014-03-20 12:07:41 +01:00
Olivier Dony 42518c339a [FIX] subscription: missing required dependency on `base`
bzr revid: odo@openerp.com-20140320091349-74zykqzf2ols3ja1
2014-03-20 10:13:49 +01:00