Commit Graph
85003 Commits
Author SHA1 Message Date
Simon Lejeune 77e56eea05 [REF] Changed seek(0) to flush when manipulating files and reordered the impors
bzr revid: sle@openerp.com-20140313133459-y3zvhhjby8pysew1
2014-03-13 14:34:59 +01:00
Vidhin Mehta (OpenERP) 0628fca1fc [IMP]add talks
bzr revid: vme@tinyerp.com-20140313133224-jmzacgnqlxee32y5
2014-03-13 19:02:24 +05:30
chm@openerp.com ba63094b9b [FIX] website_sale,website_event: can't create product and event. Why: controller and route are strict mode, remove / at the end of the route
bzr revid: chm@openerp.com-20140313132013-2foflswtdd5fp8hb
2014-03-13 14:20:13 +01:00
chm@openerp.com 9c24ebbaff [IMP] website snippet: remove data-snippet-id and use only jquery selectors. Snippets became only dom item and options is transversal. Create dynamic snippet
bzr revid: chm@openerp.com-20140313130907-mpxzhdvkrr6w6uq3
2014-03-13 14:09:07 +01:00
chm@openerp.com 9496d823e9 [FIX] website: snippet dropdown options
bzr revid: chm@openerp.com-20140313130556-u3m9gbdjwi0zo2v1
2014-03-13 14:05:56 +01:00
Gery Debongnie f4519c11f2 [IMP] css tweaks to stat buttons
bzr revid: ged@openerp.com-20140313124855-h8ez7ajj31u1x9vf
2014-03-13 13:48:55 +01:00
Amit Vora 2a50034bfc [MERGE] merge with main branch
bzr revid: avo@tinyerp.com-20140313124845-p248ahqot4v2x74q
2014-03-13 18:18:45 +05:30
Gery Debongnie d2637811de [IMP] adds PercentPie and X2Many widgets to formview. PercentPie takes a field 'float' and displays a read-only pie chart to visualize the corresponding percent. X2Many takes a 1tomany or a manytomany field and display a read only string '<number of records> <label>'
bzr revid: ged@openerp.com-20140313124843-d4tc5zdz3lx2r8kt
2014-03-13 13:48:43 +01:00
Martin Trigaux 71d8f8f1c4 [FIX] pager: show the pagger earlier to avoid slow loading to mix list and form pagers when fast switching
bzr revid: mat@openerp.com-20140313123811-ej7lu53xp51kn6gu
2014-03-13 13:38:11 +01:00
chm@openerp.com 2390c9179b [MERGE] from trunk
bzr revid: chm@openerp.com-20140312140429-4x94dc1x70yfik1w
bzr revid: chm@openerp.com-20140313122048-1zrqhq6dbtv8jpad
2014-03-13 13:20:48 +01:00
Thibault Delavallée 676189cbf7 [REF] [ADD] marketing: marketing config + CRM-related stuff module reordering
- marketing module now holds only the basic stuff for marketing related
modules: mainly marketing settings + menu definition
- marketing_crm new module is a bridge between crm and marketing and
holds the crm-related stuff previously present in marketing module.

bzr revid: tde@openerp.com-20140313120503-rgvs8uysr0c6zv11
2014-03-13 13:05:03 +01:00
ajay javiya (OpenERP) 9ae66300dd [REN] : 'Inline Discussion' to 'Allow comment in text'
'Allow Comments' to 'Allow blog post comment'
[IMP] :Inline discussion alone shouldn't post gloabl comments

bzr revid: aja@tinyerp.com-20140313111452-whhtar6wlozjd70z
2014-03-13 16:44:52 +05:30
Kersten Jeremy b92001f1d8 [IMP] Calendar - Add redirect to calendar module after the install of it
bzr revid: jke@openerp.com-20140313110002-m645txvytcrb40lr
2014-03-13 12:00:02 +01:00
chm@openerp.com e9fc839785 [FIX] website: css themes
bzr revid: chm@openerp.com-20140313102140-37okt41sx5nchx50
2014-03-13 11:21:40 +01:00
chm@openerp.com caa33bbbbf [FIX] website: edit banner image
bzr revid: chm@openerp.com-20140313102119-nh6byvyeosqsosfn
2014-03-13 11:21:19 +01:00
Vidhin Mehta (OpenERP) 03ca05f638 [IMP] start date and end date can't be same, track must have secret key.
bzr revid: vme@tinyerp.com-20140313101559-q3h08sxbvuy3j7ov
2014-03-13 15:45:59 +05:30
Lionel Sausin 8ee8e3668c [FIX] Add missing context to some calls
lp bug: https://launchpad.net/bugs/1291874 fixed

bzr revid: ls@numerigraphe.com-20140313095054-3506f3tan8eyqc61
2014-03-13 10:50:54 +01:00
Xavier Morel b1cd54f5e9 [FIX] CSS of link style pane
bzr revid: xmo@openerp.com-20140313093822-kpkufmmya0e21my2
2014-03-13 10:38:22 +01:00
Xavier Morel cd0434fb2a [IMP] context-sensitivity of toolbar commands (kinda, attempted)
bzr revid: xmo@openerp.com-20140313093707-gpaz7gmsd5zt2ck5
2014-03-13 10:37:07 +01:00
Xavier Morel 0308b7968c [IMP] don't allow HTML formatting in non-HTML fields
bzr revid: xmo@openerp.com-20140313093202-02s734ucabvkckli
2014-03-13 10:32:02 +01:00
ajay javiya (OpenERP) 217d0bea68 [MERGE] : with trunk
bzr revid: aja@tinyerp.com-20140313093104-r1qaasxq0xv52gqx
2014-03-13 15:01:04 +05:30
Vidhin Mehta (OpenERP) 49c965aed1 [MERGE]Trunk.
bzr revid: vme@tinyerp.com-20140313092609-jsjt19yw2eczb1jq
2014-03-13 14:56:09 +05:30
ajay javiya (OpenERP) 633ceff7fc [IMP] : join group button is visible to public user if public user will click on join group will ask to login
[IMP] : button color
[ADD] : 'Mailing List' menu in footer

bzr revid: aja@tinyerp.com-20140313092505-yr2uwmxafudtdju9
2014-03-13 14:55:05 +05:30
Vidhin Mehta (OpenERP) 8152dff1c1 [ADD]comment
bzr revid: vme@tinyerp.com-20140313092428-rvyc6zz8nubfsg3g
2014-03-13 14:54:28 +05:30
Turkesh Patel (Open ERP) 01da080dd1 [MRG] added template and controller for edit and delete posts.
bzr revid: tpa@tinyerp.com-20140313090454-zso7153zubjkdwfi
2014-03-13 14:34:54 +05:30
Denis Ledoux 2b762083a3 [FIX] website_sale: only display payment acquirers of the company of the quotation, or payment acquirers not linked to any company
bzr revid: dle@openerp.com-20140313085107-ie4ptew82p4rq9cy
2014-03-13 09:51:07 +01:00
Vidhin Mehta (OpenERP) 08823a3640 [IMP]track can't overlapped now, contraint added, change in demo data.
bzr revid: vme@tinyerp.com-20140313084226-dx4tkrhi6ju0th8y
2014-03-13 14:12:26 +05:30
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
Martin Trigaux 6abd78e753 [FIX] base_import: avoid name clash when importing ir.translation records. Call the orm method directly.
This hack is needed in 7.0 to avoid changes in the API.
Renaming the load method of ir.translation is the proper solution for trunk (done in server revision 5018)

bzr revid: mat@openerp.com-20140313082813-afjsj912q2idrhl5
2014-03-13 09:28:13 +01:00
Launchpad Translations on behalf of openerp ba823b0a63 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140313071540-nhiuwlanpkvorb8h
2014-03-13 07:15:40 +00:00
Vidhin Mehta (OpenERP) 5587ede447 [IMP]complete algo,template and working well timetable.
bzr revid: vme@tinyerp.com-20140313064737-r49q62owvgaltmuq
2014-03-13 12:17:37 +05:30
Launchpad Translations on behalf of openerp 584a88294f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140313061654-qs7tba29pn3cenc7
2014-03-13 06:16:54 +00:00
Amit Vora c3dbae7f54 [MERGE] merge with main branch
bzr revid: avo@tinyerp.com-20140313052510-vnbxchpkv2j4maea
2014-03-13 10:55:10 +05:30
Fabien Pinckaers a8f130a2a8 [IMP] layout
bzr revid: fp@tinyerp.com-20140312211726-wnho0pedhl4u1qv8
2014-03-12 22:17:26 +01:00
Antony Lesuisse 84bd0f0581 [MERGE] db dump/restore new zip based file format
bzr revid: al@openerp.com-20140312182118-4u93tqmlfvofrz8p
2014-03-12 19:21:18 +01:00
Antony Lesuisse b0888ec29b [MERGE] db dump/restore new zip based file format
bzr revid: al@openerp.com-20140312181724-hs26iumd4na2avns
2014-03-12 19:17:24 +01:00
Christophe Simonis c7d114d9a9 [MERGE] forward port of branch saas-2 up to revid 5020 chs@openerp.com-20140312174526-a5rhh83g0fw8djuc
bzr revid: chs@openerp.com-20140312180614-8yb454s3mkjwnk2q
2014-03-12 19:06:14 +01:00
chm@openerp.com 4093259ec2 [WIP] website: fix css layout for themes
bzr revid: chm@openerp.com-20140312175519-o1ld0jo983ao7aaa
2014-03-12 18:55:19 +01:00
Antony Lesuisse 96db6703dd [MERGE] db dump/restore zip-based format.
The new format uses plain text sql and includes the filestore.
The old pg_dump format is still supported for db restore.

bzr revid: al@openerp.com-20140312174233-0ulbcwn784ujuk6p
2014-03-12 18:42:33 +01:00
Christophe Simonis 5873f0abe6 [FIX] add the logging handler only to the root logger. let the loggers propagate to allow more than one handler
bzr revid: chs@openerp.com-20140312171819-bnj3md07w4le2m7m
2014-03-12 18:18:19 +01:00
Denis Ledoux e13ac3153f [FIX] crm: get duplicated leads use email_split from tools
bzr revid: dle@openerp.com-20140312164459-gi7ol7huxx3gcbxi
2014-03-12 17:44:59 +01:00
Denis Ledoux 387dc3c911 [FIX] crm: crm to opp, get duplidated leads does not take losts and deads. + search algorithm imp
bzr revid: dle@openerp.com-20140312155453-fj9ngb988advvn8s
2014-03-12 16:54:53 +01:00
Fabien Meghazi a8f513f4f2 [MERGE] upstream
bzr revid: fme@openerp.com-20140312152942-egbzui0drs85wt7i
2014-03-12 16:29:42 +01:00
Denis Ledoux 5bf1608278 [FIX] crm_partner_assign: remove readonly of partner latitude and longitude, otherwise it is not possible to set the geolocation manually, and impossible to reset the geolocation if it is wrong
bzr revid: dle@openerp.com-20140312150736-r1orwkwzjy37tchp
2014-03-12 16:07:36 +01:00
Martin Trigaux 82692f11a0 [MERGE] [FIX] one2many fields: when sortign on a column of type m2o (format (id, name)), instead of sorting on the tuple (and then id), sort on the name_get value to match what is shown on the screen
bzr revid: mat@openerp.com-20140312150435-shq9hy3b9njkhxsn
2014-03-12 16:04:35 +01:00
Fabien Meghazi b4ffbb4b35 [FIX] website#ir.http: do not postprocess arguments on non website_enabled endpoints
bzr revid: fme@openerp.com-20140312143539-bzf54zlzeawqkfuo
2014-03-12 15:35:39 +01:00
Denis Ledoux 187545a06a [FIX] crm: lead to opp, do not force salesteam in mass convert
bzr revid: dle@openerp.com-20140312143102-0887zl1r4tc4yq6z
2014-03-12 15:31:02 +01:00
Xavier Morel 8ad325614d [FIX] sprurious widgetification and editability of icon elements
* tighten widget match: don't match elements with .fa which are also "view
  section" roots (~ editing hosts) as the classes themselves out not be
  editable and the result will thus be odd
* correspondingly, only associate the icon "change" button to instances of the
  ``icons`` widget, other elements bearing ``.fa`` are not editable and should
  be excluded.

bzr revid: xmo@openerp.com-20140312141910-a2apy22qj4wwxsne
2014-03-12 15:19:10 +01:00
Martin Trigaux c9bca78bb1 [FIX] base_import: avoid name clash when importing ir.translation records. Call the orm method directly.
This hack is needed in 7.0 to avoid changes in the API.
Renaming the method is the proper solution for trunk (done revision 5018)

bzr revid: mat@openerp.com-20140312140515-tisj9cye0mzfprsw
2014-03-12 15:05:15 +01:00
chm@openerp.com 44523f4679 [IMP] website_crm: contact form improvement
get argument are processed and set into input fields + hidden fields
save some datas from http headers
controller should save all the submitted vars

bzr revid: chm@openerp.com-20140312140232-nhdkhjc38xnviu1d
2014-03-12 15:02:32 +01:00