pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,144 Commits 1 Branch 0 Tags
ed7ee4df522fd71b63e809f62a07db8ea30210ce
Commit Graph
82144 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Pinckaers d31504171c [IMP] Pantone colors of the year 
bzr revid: fp@tinyerp.com-20140211085450-ny3pgidw5nobjc5x
 2014-02-11 09:54:50 +01:00
Gery Debongnie 4e0a95f804 [MERGE] merge from trunk into local branch 
bzr revid: ged@openerp.com-20140211082715-1279fmmtb4nisejw
 2014-02-11 09:27:15 +01:00
Gery Debongnie c8e23ffe28 [MERGE] merge from trunk into local branch 
bzr revid: ged@openerp.com-20140211082642-ndnt79zjgjlcyr6a
 2014-02-11 09:26:42 +01:00
Olivier Dony 722163893e [FIX] ir.actions: active_model may not always match current model, in which case object should be None 
bzr revid: odo@openerp.com-20140211082546-tgenye70etn21ih5
 2014-02-11 09:25:46 +01:00
Turkesh Patel (Open ERP) ba44db60d3 [FIX] change gauge input value method name and improved code in res.config related to create degfault alias. 
bzr revid: tpa@tinyerp.com-20140211064607-ll00gw12wviyb2cb
 2014-02-11 12:16:07 +05:30
Launchpad Translations on behalf of openerp c00c424221 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140211064129-f1q7m95fq4tplc1s
 2014-02-11 06:41:29 +00:00
Launchpad Translations on behalf of openerp 06c3efde04 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140211055037-i7s59zrp7mrzmlun
 2014-02-11 05:50:37 +00:00
Thibault Delavallée 87f9c85330 [CLEAN] hr: cleaned job form view, removing unnecessary groups, also changed 
displayed number of employees (display current number + expected, not the
contraty). Updated hr_recruitment accordingly.

bzr revid: tde@openerp.com-20140210171511-z5277t6ilnvnc48d
 2014-02-10 18:15:11 +01:00
Thibault Delavallée 96d3693441 [FIX] mail_alias: avoid performing tracking when migrating to 
alias. Indeed in this method, we have unitialized inherited fields because the orm
is updating. A new no_track key (already intorduced in 7.0, added in this branch because
of a missing forward-port) in mail_thread allows to avoid doing the tracking of values
and is used in mail_alias.

bzr revid: tde@openerp.com-20140210171350-ajwxwau2ar1gu9io
 2014-02-10 18:13:50 +01:00
Christophe Matthieu 1f21989bbb [FIX] website_livechat: add res_config file for configuration of the channel 
bzr revid: chm@openerp.com-20140210164113-41vl0ftlk9eybnlw
 2014-02-10 17:41:13 +01:00
Frédéric van der Essen 22e09cb41e [FIX] hw_escpos: status receipt would not print on the posbox 
bzr revid: fva@openerp.com-20140210161701-aolbu63i7w74f97c
 2014-02-10 17:17:01 +01:00
Thibault Delavallée 923028c4db [CLEAN] hr: review and cleaning before merging 
- hr.py: small cleaning of job code + method renaming + context propagation + compat-mode for
method renaming
- hr_view: job_id on employee form is no longer 'no_open', because otoherwise it is impossible
to see jobs. Removed simplified form for job. Better form for job, recruitmnet-related stuff
is invisible when job is 'open'.

bzr revid: tde@openerp.com-20140210161326-c9qqff69squehg9v
 2014-02-10 17:13:26 +01:00
Denis Ledoux 8092693eec [FIX] point_of_sale: distraction error from revision 9814 revid:dle@openerp.com-20140206163444-ckcmurcwk2vhi5vp, missing .id in order to compare company for taxes 
bzr revid: dle@openerp.com-20140210160645-ww7af7sbkpjf6oss
 2014-02-10 17:06:45 +01:00
Frédéric van der Essen 04a6074b1a [MERGE] forward porting fixes from saas-3 
bzr revid: fva@openerp.com-20140210155628-75mgw7qcq9k5ncem
 2014-02-10 16:56:28 +01:00
Frédéric van der Essen 82277b178b [MERGE] point_of_sale: posbox related usability & reliability improvements + firefox bug fix 
bzr revid: fva@openerp.com-20140210155318-1exkkl4ij93jtbq2
 2014-02-10 16:53:18 +01:00
Christophe Matthieu 1ac9b4d20d [IMP] website: banner tutorial: remove step about customize and promote 
bzr revid: chm@openerp.com-20140210155251-iyj3v06r18vexj7d
 2014-02-10 16:52:51 +01:00
Frédéric van der Essen 958764e7d3 [MERGE] from saas-3 
bzr revid: fva@openerp.com-20140210151007-saw8m1bqwnxek26x
bzr revid: fva@openerp.com-20140210155110-6obc985lc4rl3eyv
 2014-02-10 16:51:10 +01:00
Gery Debongnie 08e8a2547a [IMP] improves some reporting views in CRM (accessed from the sales team screen) (addon crm) 
bzr revid: ged@openerp.com-20140210153808-3iwrihu7a28vca1y
 2014-02-10 16:38:08 +01:00
Gery Debongnie 7be15dabaa [FIX] corrects an interesting bug, caused by datetime in UTC and GMT, then string formatting, causing incorrect information to display in the sales team screen (addon crm.py) 
bzr revid: ged@openerp.com-20140210153453-y0mtvs0mnpm1e4e1
 2014-02-10 16:34:53 +01:00
Gery Debongnie 321a4a7402 [FIX] make sure the graph view takes the col_group_by from the search view and not from the context. 
It was taken from the context, and had the unfortunate side effect that the user could not ungroup by removing the facet from the search view. (addon web_graph)

bzr revid: ged@openerp.com-20140210153221-olkv8xee02r9voer
 2014-02-10 16:32:21 +01:00
Martin Trigaux 69f18925ff [MERGE] [FIX] html_sanitize: partial backport of trunk revision 5047 (opw 603452). 
Unescape elements that have been wrongly escaped.

Some elements (eg: 'href' tag in links) are sanitised in templates which prevents the execution of mako templates.

bzr revid: mat@openerp.com-20140210152806-rl5h3twgq8dd203d
 2014-02-10 16:28:06 +01:00
Christophe Matthieu 3a273b989c [IMP] website: typo for tutorial 
bzr revid: chm@openerp.com-20140210151741-grf5wsvjonuihxw0
 2014-02-10 16:17:41 +01:00
Christophe Matthieu abc49aebd5 [FIX] website: don't set tour as automatic when reload page 
bzr revid: chm@openerp.com-20140210145923-2w9vbxqqgewgkb0w
 2014-02-10 15:59:23 +01:00
Thibault Delavallée 4be860c167 [REVIEW] mail: mail_thread: cleaned comment of modified code in get_empty_list_help 
bzr revid: tde@openerp.com-20140210144611-16nkcju2yerc80e5
 2014-02-10 15:46:11 +01:00
Thibault Delavallée 622cb42fe6 [CLEAN] mail: mail_alias: alias name cleaning + find as unique in its own method, called by create and write 
bzr revid: tde@openerp.com-20140210144346-ropiufpicvlivhb2
 2014-02-10 15:43:46 +01:00
Martin Trigaux e328c0a40e [FIX] html_sanitize: partial backport of trunk revision 5047. 
Unescape elements that have been wrongly escaped.

Some elements (eg: 'href' tag in links) are sanitised in templates which prevents the execution of mako templates.

lp bug: https://launchpad.net/bugs/1273251 fixed

bzr revid: mat@openerp.com-20140210144023-9sp8cqn07ta5o64y
 2014-02-10 15:40:23 +01:00
Fabien Meghazi cb29f0599b [MERGE] saas-3 
bzr revid: fme@openerp.com-20140210143646-kv87fekab804phqh
 2014-02-10 15:36:46 +01:00
Olivier Dony 08fc70a221 [FIX] email_template: attachments using many2many_binary widget are invisible unless label is present - pending widget fix as well 
bzr revid: odo@openerp.com-20140210143613-v56rmg1vwwgfxhhq
 2014-02-10 15:36:13 +01:00
Fabien Meghazi 0da8cdda90 [FIX] Set default 'editable' key in website's rendering context 
bzr revid: fme@openerp.com-20140210143546-1t82gog330n5x89t
 2014-02-10 15:35:46 +01:00
Fabien Meghazi e44ff1a350 [IMP] Not forced to use request.website.render() anymore 
bzr revid: fme@openerp.com-20140210142122-xuqnfnukrfcktflc
 2014-02-10 15:21:22 +01:00
Denis Ledoux 0043f81e33 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9824 revid:dle@openerp.com-20140210134603-ck0jr56xhl8xgzg2 
bzr revid: dle@openerp.com-20140210141704-sjzjwhe7fh5gszxr
 2014-02-10 15:17:04 +01:00
Olivier Dony dc0b8b5c66 [IMP] ir.actions.server: add datetime and dateutil in default eval context + make context extensible 
bzr revid: odo@openerp.com-20140210140933-7g70205v4mxk9qhz
 2014-02-10 15:09:33 +01:00
Denis Ledoux 749e05ccb8 [FIX] close autocomplete listing on input 
Closing previously occured on search request (so that a user wouldn't be able
to select "old" data on new search request), but ``search`` is only triggered
after the search delay. Worked when delay was 0, with it being moved to 250 a
user can get results matching the previous search instead of the current one.

Trigger a closing of the current results list on any ``input`` event, which is
when text is entered in any of the searchview's ``InputView``

bzr revid: dle@openerp.com-20140210140032-06dnlxepcc5ae21f
 2014-02-10 15:00:32 +01:00
Fabien Meghazi de7c5f76bd [MERGE] upstream 
bzr revid: fme@openerp.com-20140210134735-59csf1137d6v10ev
 2014-02-10 14:47:35 +01:00
Denis Ledoux 6e3d193517 [FIX] sale, sale_stock: send by email button visible when sent, progress or manual 
+ remove 'invoiced' from statusbar_visible, as there is no such state
+ proper inherit in sale_stock form view

bzr revid: dle@openerp.com-20140210134603-ck0jr56xhl8xgzg2
 2014-02-10 14:46:03 +01:00
Frédéric van der Essen d930115bd3 [IMP] hw_escpos: print a status receipt on printer connection with ip address for easier configuration & debugging. Also setting the driver thread in daemon mode to avoid hanging the tests on the runbot 
bzr revid: fva@openerp.com-20140210133109-xll1ijjdhbgpj1kr
 2014-02-10 14:31:09 +01:00
Xavier Morel d4c7de4b03 [FIX] work around distribute_branding 
distribute_branding is applied after view inheritance is applied, and does not
take it in account. As a result, altering an existing view "from the top"
(e.g. adding a div element preceding an existing div) will alter the xpath
leading to whatever element we need to deal with.

Move fakebar injection to the bottom of the body, where it can't have any
impact on preceding node paths.

bzr revid: xmo@openerp.com-20140210132855-lwh1ow1tq1e0pidp
 2014-02-10 14:28:55 +01:00
Christophe Matthieu 90ed82bb14 [IMP] test phantomtest: inject files with testing if a variable is already setted 
bzr revid: chm@openerp.com-20140210131910-z8eggofegua88516
 2014-02-10 14:19:10 +01:00
Turkesh Patel (Open ERP) ee471832f9 [IMP] improved code to show default alias id 
bzr revid: tpa@tinyerp.com-20140210131609-v5cxl5pexk37pt6d
 2014-02-10 18:46:09 +05:30
Amit Dodiya (OpenERP) 004e983497 [FIX] hr_expense: journal entries should set posted state if journal has Skip Draft State for Manual Entries is checked 
bzr revid: ado@tinyerp.com-20140210131514-480wqb4m34getdp9
 2014-02-10 18:45:14 +05:30
Fabien Meghazi b9697ed52e [MERGE] upstream 
bzr revid: fme@openerp.com-20140210131511-8sklkj5z2vorhbq7
 2014-02-10 14:15:11 +01:00
Xavier Morel e95eb140a7 [CHG] website: fp wants image 'change' buttons to be btn-sm 
bzr revid: xmo@openerp.com-20140210130504-hejvay436emh7f36
 2014-02-10 14:05:04 +01:00
Xavier Morel 0821af1af9 [FIX] close autocomplete listing on input 
Closing previously occured on search request (so that a user wouldn't be able
to select "old" data on new search request), but ``search`` is only triggered
after the search delay. Worked when delay was 0, with it being moved to 250 a
user can get results matching the previous search instead of the current one.

Trigger a closing of the current results list on any ``input`` event, which is
when text is entered in any of the searchview's ``InputView``.

bzr revid: xmo@openerp.com-20140210123416-cfc0x24bfkiv4lse
 2014-02-10 13:34:16 +01:00
Gery Debongnie 450b9b647d [FIX] forces the kanban view in sales/sales team to take the correct reporting view when clicking on those small sparklines (on leads and on opportunities) (addon crm) 
bzr revid: ged@openerp.com-20140210122046-o5albh9m7jhoylf2
 2014-02-10 13:20:46 +01:00
Thibault Delavallée 759ed5bbb6 [IMP] mail: subscription: if no-one to (un)subscribe, already return. This is not 
necessary for computation, but saves some browse / access right checking.

bzr revid: tde@openerp.com-20140210115827-2y451i0edgve59mi
 2014-02-10 12:58:27 +01:00
Gery Debongnie 9eda870d2b [FIX] fixes a bug caused by two consecutive calls to do_search, with incomplete informations in the first call. These calls then triggered useless queries and caused an incorrect (but brief) display of partial information in graph view (addon web_graph) 
bzr revid: ged@openerp.com-20140210112313-z9elwhmjil41jcd2
 2014-02-10 12:23:13 +01:00
Fabien Meghazi f36b92bb81 [MERGE] saas-3 
bzr revid: fme@openerp.com-20140210105311-wattch3c49ikwwmn
 2014-02-10 11:53:11 +01:00
Gery Debongnie ff89abba85 [FIX] correctly displays tooltips in sales/sales team (they previously were cut in half by incorrect padding) (addon web) 
bzr revid: ged@openerp.com-20140210100439-icqps10dvtdhlvv0
 2014-02-10 11:04:39 +01:00
Denis Ledoux bd0f05690c [FIX] mail: do no pop reply_to if same thread or post in the document is false 
Otherwiwse if same thread is checked and post not, the reply_to is forced to the user email to avoid the email to be regarded as private without having a parent mail (has the parent is not posted in the thread), which is not what is expected

bzr revid: dle@openerp.com-20140210092301-1bdyvdwgekwgo9rh
 2014-02-10 10:23:01 +01:00
Gery Debongnie f4bbf7b5d4 [FIX] fixes an issue in graph view (addon web_graph) 
when the user clicked several times on a field name to expand it, the dropdown menu was displayed several times, overlapping, instead of being reset to the last click location

bzr revid: ged@openerp.com-20140210091716-of9w9xhjnpmaa5td
 2014-02-10 10:17:16 +01:00