Commit Graph
82477 Commits
Author SHA1 Message Date
Turkesh Patel (Open ERP) 0c8d2af2fa [IMP] added subtypes and improved code for post vote.
bzr revid: tpa@tinyerp.com-20140313084130-8kdlra4dhwzl016o
2014-03-13 14:11:30 +05:30
Turkesh Patel (Open ERP) c03ffffa8a [IMP] instead of using len(question.child_ids) use child_count, remove forum filed from gamification.badge use only level, rename controller from /badges to /badge and /tags to /tag
bzr revid: tpa@tinyerp.com-20140312095413-23d39ir8txd3f35q
2014-03-12 15:24:13 +05:30
Turkesh Patel (Open ERP) 07e5c1340c [IMP] improved code to start functionality of sorting.
bzr revid: tpa@tinyerp.com-20140312091602-41w3zi7k3mu6mo1m
2014-03-12 14:46:02 +05:30
Fabien Pinckaers 559600f7e7 [IMP] badges
bzr revid: fp@tinyerp.com-20140312090024-xvyvds6773ff3smi
2014-03-12 10:00:24 +01:00
Fabien Pinckaers 58bcab39c1 [IMP] cleaned code
bzr revid: fp@tinyerp.com-20140312085325-msue61gt1adda0jn
2014-03-12 09:53:25 +01:00
Fabien Pinckaers cc5e113803 [IMP] Website Forum Improvements
bzr revid: fp@tinyerp.com-20140312084647-afpvz2zhbc9vcfka
2014-03-12 09:46:47 +01:00
Turkesh Patel (Open ERP) c30ab24004 [IMP] improved code for filter as new changes landedn in trunk
bzr revid: tpa@tinyerp.com-20140312070735-2np27bur8d7cd3nv
2014-03-12 12:37:35 +05:30
Turkesh Patel (Open ERP) f00a9f484d [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20140312054807-0fu95uxgbgnmt5ls
2014-03-12 11:18:07 +05:30
Simon Lejeune 66c594fe6d [MERGE][FIX] Download of a report was broken because of a slash at the end of the route used by 'get_file'
bzr revid: sle@openerp.com-20140311180929-ih40j1fx1tsloync
2014-03-11 19:09:29 +01:00
Simon Lejeune 5f417a7397 [FIX] Removed the ending slash of download attachment routes
bzr revid: sle@openerp.com-20140311171219-j80lkmaezfezptxx
2014-03-11 18:12:19 +01:00
Christophe Simonis d504764eff [MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
Christophe Simonis 96f744b271 [MERGE] forward port of branch saas-3 up to revid 5088 chs@openerp.com-20140311095550-lg3nvvjyojvgp2po
bzr revid: chs@openerp.com-20140311133850-11bw9vv90e40clw1
2014-03-11 14:38:50 +01:00
Christophe Simonis c3827cb8f7 [MERGE] forward port of branch saas-3 up to revid 3967 jke@openerp.com-20140311093515-02xw8phrcqhgz6zx
bzr revid: chs@openerp.com-20140311132200-1bln6gaj80njyh18
2014-03-11 14:22:00 +01:00
chm@openerp.com 3ceefde489 [FIX] website editor: check if link and fa is editable and display change button
bzr revid: chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
2014-03-11 14:08:52 +01:00
Turkesh Patel (Open ERP) 41876d0379 [IMP] remove activity object and use mail.message
bzr revid: tpa@tinyerp.com-20140311125949-50uxmckmcal11hdf
2014-03-11 18:29:49 +05:30
Kersten Jeremy 849d0ad860 [TEST] Log for debug
bzr revid: jke@openerp.com-20140311122729-ullchqwem8725iw2
2014-03-11 13:27:29 +01:00
Kersten Jeremy 09e5ec2345 [TEST] Log for debug
bzr revid: jke@openerp.com-20140311105910-v1k3l0r8ga1lubp6
2014-03-11 11:59:10 +01:00
chm@openerp.com d1798dcb36 [FIX] website_crm: textarea don't keep value when they are an error because the view use t-attf insead of value inside textarea tags
bzr revid: chm@openerp.com-20140311103537-mp6x2v015tyuimux
2014-03-11 11:35:37 +01:00
Christophe Simonis e634545617 [FIX] http: ensure to clean the request cursor before calling the route function.
The route function can be call more than once in case of database error,
breaking the request cursor. By rollbacking it, we force the creation of a new transaction.

bzr revid: chs@openerp.com-20140311095550-lg3nvvjyojvgp2po
2014-03-11 10:55:50 +01:00
Kersten Jeremy f8bad6f814 [FIX] Fix bug for duration, duration are computed according to if the event is an alll day or not
bzr revid: jke@openerp.com-20140311093515-02xw8phrcqhgz6zx
2014-03-11 10:35:15 +01:00
chm@openerp.com 3353305a6f [FIX] website_sale: remove filter of rows process grid, layout need to create empty tr for rowspan
bzr revid: chm@openerp.com-20140311093050-4p75rrdh5bg8mpqy
2014-03-11 10:30:50 +01:00
Turkesh Patel (Open ERP) 777a5a3c8f [IMP] make post_ids field as function field in Tag object, store vote_count and user_vote in post.
bzr revid: tpa@tinyerp.com-20140311092517-om8d1bgt76b82al5
2014-03-11 14:55:17 +05:30
Kersten Jeremy 86f48a1a79 [TYPO] Typo in calendar template
bzr revid: jke@openerp.com-20140311081025-b9r08awsiwi068fw
2014-03-11 09:10:25 +01:00
Turkesh Patel (Open ERP) 99de16334c [IMP] improved code to apply or remove class on vote
bzr revid: tpa@tinyerp.com-20140311054950-aa27ss1orfcly9kk
2014-03-11 11:19:50 +05:30
Turkesh Patel (Open ERP) 44defdcbd7 [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20140311052054-w51xmjgf814s2lgp
2014-03-11 10:50:54 +05:30
Antony Lesuisse 096432ff73 [REV] reverting xmo@openerp.com-20140310115334-vjh7gx5oizdm6s67
This api change breaks jsfile tests (example test_ui_load.js). The api is broken
but the proper fix would be to avoid accessing phantom.args from PhantomTest

bzr revid: al@openerp.com-20140310184636-8r9x81xi1zqhcsek
2014-03-10 19:46:36 +01:00
chm@openerp.com d41ea1cfdc [FIX] website_sale: grid view remove rowspan if colspan=4
bzr revid: chm@openerp.com-20140310163329-nglj6dxpulzcl5qn
2014-03-10 17:33:29 +01:00
Christophe Simonis d6b93c8b24 [FIX] point_of_sale: use correct method to redirect to login page
bzr revid: chs@openerp.com-20140310153838-svwzew0vuk0khlxz
2014-03-10 16:38:38 +01:00
Christophe Simonis 20efa0e287 [FIX] web: redirect to original page after login
bzr revid: chs@openerp.com-20140310153639-ntfa8cvm4loecm9a
2014-03-10 16:36:39 +01:00
chm@openerp.com 832e6ad2d6 [FIX] website_sale: resize big image if size 1x1 for loading faster; (don't use image_medium who break some layout customisation like 'image full'
bzr revid: chm@openerp.com-20140310152847-xjilnu4cxhs3c73b
2014-03-10 16:28:47 +01:00
Kersten Jeremy 67ea6db043 [FIX] Fix the event duration from calendar between calendar view and form view
bzr revid: jke@openerp.com-20140310150925-c6oskm0o4pxqma0q
2014-03-10 16:09:25 +01:00
Denis Ledoux 74af3ac0fe [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9144 revid:dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140310143600-kz7qjfe4p63s0a34
2014-03-10 15:36:00 +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