Richard Mathot (OpenERP)
e1cebe9003
[REF] hr_timesheet: unused piece of code
...
bzr revid: rim@openerp.com-20140414132634-xaps5ydbic5jriw4
2014-04-14 15:26:34 +02:00
Martin Trigaux
a52e13bd86
[FIX] remove wrong required and readonly fields
...
bzr revid: mat@openerp.com-20140414131720-bzqd1sv0j2t5wywd
2014-04-14 15:17:20 +02:00
Denis Ledoux
2429e04ec2
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9980 revid:dle@openerp.com-20140414121930-xbawuj93ddifhf4m
...
bzr revid: dle@openerp.com-20140414131146-1jz0isk58wgdsx2p
2014-04-14 15:11:46 +02:00
Thibault Delavallée
55266ab25d
[MERGE] Merged fp's refactoring branch.
...
bzr revid: tde@openerp.com-20140414131109-7ijlz4gybjd2b2oj
2014-04-14 15:11:09 +02:00
Richard Mathot (OpenERP)
fe6ef26720
[MERGE][IMP] hr_timesheet: Quick create of contract (on timesheet) does not open contract edit window anymore
...
bzr revid: rim@openerp.com-20140414125558-zcwstm1ooa3qecpx
2014-04-14 14:55:58 +02:00
Richard Mathot (OpenERP)
fed6bdcf5e
[MERGE][IMP] hr_timesheet: add a menu to configure Timesheet Accounts under HR/Configuration
...
bzr revid: rim@openerp.com-20140414124251-5u5nu75c9q8g8zi9
2014-04-14 14:42:51 +02:00
Fabien Pinckaers
1c4b74a7d1
[IMP] translateable event description
...
bzr revid: fp@tinyerp.com-20140414123443-qom78utc45e86lh1
2014-04-14 14:34:43 +02:00
Fabien Pinckaers
f5ccf4c523
[IMP] Ticket types translateable
...
bzr revid: fp@tinyerp.com-20140414123231-b27qnkaujayk9j84
2014-04-14 14:32:31 +02:00
Denis Ledoux
c3300dce7a
[FIX] account: name_search methods used '=' or 'ilike' to search, instead of the actual operator
...
Therefore, for example, searching invoices for journals doesnt containing 'sales' actually returned invoices with journal containing 'sales'.
bzr revid: dle@openerp.com-20140414121930-xbawuj93ddifhf4m
2014-04-14 14:19:30 +02:00
Richard Mathot (OpenERP)
028b093102
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140414115604-x1a32wfbxwkn3yhp
2014-04-14 13:56:04 +02:00
Richard Mathot (OpenERP)
91a5db808d
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140414115354-w8gpo3eks1rnud9k
2014-04-14 13:53:54 +02:00
Quentin (OpenERP)
c70ea6aeac
[FIX] stock, barcode UI: disable the 'create backorder' button if nothing is processed
...
bzr revid: qdp-launchpad@openerp.com-20140414100202-dhnbdp7jzfvrwb0q
2014-04-14 12:02:02 +02:00
Kersten Jeremy
66e72fec54
[FIX] Website - Don't set active on OpenDialog link else the user cannot click on it again after.
...
bzr revid: jke@openerp.com-20140414094803-bfyvu3wizy09n53c
2014-04-14 11:48:03 +02:00
Quentin (OpenERP)
398d96f273
[MERGE] merged trunk up to revision 9327
...
bzr revid: qdp-launchpad@openerp.com-20140414094743-hv0u7qhigv1to2uc
2014-04-14 11:47:43 +02:00
Richard Mathot (OpenERP)
c34ea0a384
[MERGE][IMP] Terminology uniformisation
...
bzr revid: rim@openerp.com-20140414093342-91n7m8o730om25qm
2014-04-14 11:33:42 +02:00
Richard Mathot (OpenERP)
6d99b1df52
[MERGE][IMP] invoice/sale: Terminology uniformisation
...
bzr revid: rim@openerp.com-20140414093158-pbtttnv57a7nt7y6
2014-04-14 11:31:58 +02:00
Richard Mathot (OpenERP)
96417099b3
[MERGE] Sync with trunk
...
bzr revid: ypa@tinyerp.com-20140404114223-zalha5tvp2l0ov8f
bzr revid: rim@openerp.com-20140414091137-icatnn1humn7kisc
2014-04-14 11:11:37 +02:00
Denis Ledoux
a0b26b6cfe
[FIX] mass_mailing: mail_thread model redefined as a osv.Model, while the original mail thread is an AbstractModel. Mass mailing mail thread must be an Abstract Model as well
...
bzr revid: dle@openerp.com-20140414090825-o456mdd9q38m47mw
2014-04-14 11:08:25 +02:00
Thibault Delavallée
5ea15d56fb
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140414090428-y435e4tsy4ju5nc3
2014-04-14 11:04:28 +02:00
Richard Mathot (OpenERP)
15725997dd
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140414090336-vc5283odv5f612es
2014-04-14 11:03:36 +02:00
Josse Colpaert
4768c24340
[IMP] Improve the copying of products and make sure the orderpoints apply their copy method
...
bzr revid: jco@openerp.com-20140414084821-1yi87wk6cfrr69qg
2014-04-14 10:48:21 +02:00
Richard Mathot (OpenERP)
01d9ea6f64
[MERGE][IMP] crm/sale_crm: Terminology
...
Replacement of the term "category" by "tag", for the sake of consistency
bzr revid: rim@openerp.com-20140414083511-b5qvr4ek4mgxx17x
2014-04-14 10:35:11 +02:00
Quentin (OpenERP)
4987c9d42d
[FIX] stock, product_expiry: fixes of removal fefo and putaway processing
...
bzr revid: qdp-launchpad@openerp.com-20140414083303-5vwlnakof0vcbtri
2014-04-14 10:33:03 +02:00
chm@openerp.com
8da0820a88
[FIX] website: media editor: when the user save the picture, the dialog box re-open automatically. Do not re-active snippet when we save a field image
...
bzr revid: chm@openerp.com-20140414082617-svxpb6kuqfhjm8oa
2014-04-14 10:26:17 +02:00
Fabien Pinckaers
34e618965a
[IMP] commment
...
bzr revid: fp@tinyerp.com-20140414081035-9ixrag5oly2q0emb
2014-04-14 10:10:35 +02:00
Martin Trigaux
3a27186643
[MERGE] [FIX] FormView: avoid multiple creations of the same line in o2m fields when the save action fails (e.g. forgot one required field)
...
This is done by removing the added action 'prepend_on_create' that can be present as many time as we pressed the save button
lp bug: https://launchpad.net/bugs/1265705 fixed
bzr revid: mat@openerp.com-20140414081003-290q4v21q01m4rsi
2014-04-14 10:10:03 +02:00
Raphael Collet
ea167ad7ab
[IMP] test cursor: code cleanup to make it more robust to concurrent accesses
...
bzr revid: rco@openerp.com-20140414075906-2d0i4qhe4x7czsao
2014-04-14 09:59:06 +02:00
Josse Colpaert
72b37e2bbd
[IMP] context_today should apply to function fields also in order to show them in qweb reports
...
bzr revid: jco@openerp.com-20140414074558-irgt7g9st5ongny9
2014-04-14 09:45:58 +02:00
Amit Vora
bf3d4a7d94
[MRG] merge with main branch
...
bzr revid: avo@tinyerp.com-20140414071801-3eaa6iqryfrolxbt
2014-04-14 12:48:01 +05:30
Launchpad Translations on behalf of openerp
001a034e58
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094159-mhy3v2prb3ctx32k
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094217-3u3f03f0wjhbzyo4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140413062047-z833pejjrtuhfygs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140414055948-intynzk8l823ukei
2014-04-14 05:59:48 +00:00
Fabien Pinckaers
8d42202c92
[FIX] show stages only if campaign is set
...
bzr revid: fp@tinyerp.com-20140413205337-kkr9xtk6x5bzvzo5
2014-04-13 22:53:37 +02:00
Fabien Pinckaers
3db3160644
[IMP] website_link field removed
...
bzr revid: fp@tinyerp.com-20140413204625-tu2bw7cyj14rjx53
2014-04-13 22:46:25 +02:00
Fabien Pinckaers
57078f5c12
[IMP] features
...
bzr revid: fp@tinyerp.com-20140413203634-75mf4z8o3xh7i83h
2014-04-13 22:36:34 +02:00
Fabien Pinckaers
96a750fd03
[IMP] Removing featuer
...
bzr revid: fp@tinyerp.com-20140413203309-digp60hsobgv3i57
2014-04-13 22:33:09 +02:00
Fabien Pinckaers
2ad0b6e369
[IMP] removing unused code
...
bzr revid: fp@tinyerp.com-20140413202922-glv198j62sqeugz2
2014-04-13 22:29:22 +02:00
Fabien Pinckaers
b1ccd56368
[IMP] better usability
...
bzr revid: fp@tinyerp.com-20140413201748-u8e26ef40dt7360i
2014-04-13 22:17:48 +02:00
Fabien Pinckaers
8d6e2b4a15
[iMP] minor bugfixes
...
bzr revid: fp@tinyerp.com-20140413195730-zpzpsmo53fqa4x96
2014-04-13 21:57:30 +02:00
Fabien Pinckaers
f908137d76
[IMP] Template Editor
...
bzr revid: fp@tinyerp.com-20140413162028-9tqqzis7qbggcrp4
2014-04-13 18:20:28 +02:00
Fabien Pinckaers
cb544e61c4
[IMP] default recipients to mailing list
...
bzr revid: fp@tinyerp.com-20140413070922-jw7f5s9wrt9g2gek
2014-04-13 09:09:22 +02:00
Fabien Pinckaers
84fe98085b
[IMP] Adding stats file
...
bzr revid: fp@tinyerp.com-20140412233019-au2omxtet5sfqcxr
2014-04-13 01:30:19 +02:00
Fabien Pinckaers
227b9a917d
[IMP] Adding stats file
...
bzr revid: fp@tinyerp.com-20140412232548-csyb7j13fyu4cwnw
2014-04-13 01:25:48 +02:00
Fabien Pinckaers
e9cf53934b
[iMP] small improvements
...
bzr revid: fp@tinyerp.com-20140412232159-1y35hdpaahy633tb
2014-04-13 01:21:59 +02:00
Fabien Pinckaers
3df4eb0f72
[WIP] Mailing Lists and Contacts cleaned
...
bzr revid: fp@tinyerp.com-20140412203129-5l7w4qr8rf2d1nqo
2014-04-12 22:31:29 +02:00
Fabien Pinckaers
2feab20dbb
[WIP] started to reduce code
...
bzr revid: fp@tinyerp.com-20140412153339-rr3b1r4cmdeigp0v
2014-04-12 17:33:39 +02:00
Fabien Pinckaers
ff41711be7
[MERGE] trunk
...
bzr revid: fp@tinyerp.com-20140412140002-lxl2bkmv0liwbiid
2014-04-12 16:00:02 +02:00
Antony Lesuisse
e69b086ecd
[FIX] logging, pg logging use thread db
...
bzr revid: al@openerp.com-20140412134728-vzn9247twgyfbcid
2014-04-12 15:47:28 +02:00
Fabien Pinckaers
915ac89024
[merge]
...
bzr revid: fp@tinyerp.com-20140412130132-6dncdvhrxsciyr7l
2014-04-12 15:01:32 +02:00
Launchpad Translations on behalf of openerp
e82fbf7d91
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
Thibault Delavallée
9640e839d8
[ADD] New module: website_forum, a clone of askbot / stackoverflow.
...
This module models a forum: questions, answers, voting and comment system, karma
management. There is a link with gamification, allowing to use badges and reward
users for their participation to the forum.
Badges are temporarily commented out to ease the module beta-testing without having
to wait for some gamification improvements.
This merge also contains some fixes in access rights for gamification.
bzr revid: tde@openerp.com-20140411183646-fmkeng9fzixjrqy5
2014-04-11 20:36:46 +02:00
Thibault Delavallée
ac8f4d62a5
[IMP] [FIX] ir_qweb: fixed a call to a parameter considered as being
...
a dict but that could be None; added management of country flag on the
contact widget.
bzr revid: tde@openerp.com-20140411183425-nzhuk6mb80pahvwm
2014-04-11 20:34:25 +02:00