Commit Graph
81391 Commits
Author SHA1 Message Date
jke-openerp dc7660414a [FIX] Use superuser to upate users token from google_calendar.set_all_token
bzr revid: jke@openerp.com-20131218174931-q0nz4xji5metspoz
2013-12-18 18:49:31 +01:00
Fabien Meghazi 9abcc28884 [IMP] Set EditorBar height programmatically
bzr revid: fme@openerp.com-20131218173915-ds5jeyfypbaefrqf
2013-12-18 18:39:15 +01:00
Martin Trigaux 07f2a7c1f9 [MERGE] forward port of latest saas-2 until rev 3893 dle@openerp.com-20131218112416-2vtaq442qo8opq4u
bzr revid: mat@openerp.com-20131218165033-4djghawrzllkeckg
2013-12-18 17:50:33 +01:00
jke-openerp 1a3cb3dcf8 [TYPO] Remove warning
bzr revid: jke@openerp.com-20131218160827-0bv1vxcux22p4ioa
2013-12-18 17:08:27 +01:00
Martin Trigaux 79f716c70f [MERGE] forward port of latest saas-2 until rev 4996 dle@openerp.com-20131218123130-vlejjv7r2klkzoj0
bzr revid: mat@openerp.com-20131218160041-58x5kij4v7earagu
2013-12-18 17:00:41 +01:00
Martin Trigaux 54be818a3b [MERGE] forward port of latest saas-2 until rev 9051 dle@openerp.com-20131217142126-1lbim47d2m2x4bb0
bzr revid: mat@openerp.com-20131218155715-khb909yy99cbmna8
2013-12-18 16:57:15 +01:00
Gery Debongnie d7fdeec72f [REF] refactors bar_chart method in graph widget. basically, it removes 80 duplicated lines (addon web_graph)
bzr revid: ged@openerp.com-20131218154949-9jno1wb4s549jyl7
2013-12-18 16:49:49 +01:00
Xavier Morel 1b76c66930 [MERGE] fixes for non-direct IME
bzr revid: xmo@openerp.com-20131218152626-kexq1wudvjwnh962
2013-12-18 16:26:26 +01:00
ddm 2381c44441 [IMP] UI test runner code doc
bzr revid: ddm@openerp.com-20131218152352-mclkpnjpzvqsibqh
2013-12-18 16:23:52 +01:00
Gery Debongnie 1323c2c25b [IMP] adds stacked/grouped setting to chart widget (addon web_graph)
bzr revid: ged@openerp.com-20131218152048-36no38nud6a5ft10
2013-12-18 16:20:48 +01:00
ddm 50ab1e551e [IMP] Cleanup UI tests
bzr revid: ddm@openerp.com-20131218151702-68m9z9wm31rj5g2f
2013-12-18 16:17:02 +01:00
Gery Debongnie 0e8a8517f8 [REF] moves all the charts code from chart.js into the graph widget (in file graph.js) (addon web_graph)
bzr revid: ged@openerp.com-20131218150756-ol0or9m6pg61ye2c
2013-12-18 16:07:56 +01:00
ddm 245a6aafa9 [FIX] Fix UI test runner
bzr revid: ddm@openerp.com-20131218150056-xqueu19zpm17nlpj
2013-12-18 16:00:56 +01:00
ddm 4f0ad3f64a [IMP] Basic support for ui tests
bzr revid: ddm@openerp.com-20131218145628-9oqxlwy4g05n4jwa
2013-12-18 15:56:28 +01:00
Frédéric van der Essen 586e8984fe [FIX] point_of_sale: proper closing action
bzr revid: fva@openerp.com-20131218145602-0ss9j35xg0bofeh7
2013-12-18 15:56:02 +01:00
Martin Trigaux fe5383f0e2 [MERGE] [IMP] account_payment: remove widget=selection (was forcing the preloading of every partner for an invisible field)
bzr revid: mat@openerp.com-20131218144617-pq3oy121rxaxiu5r
2013-12-18 15:46:17 +01:00
Thibault Delavallée 9315134b7d [IMP] website_sale_delivery: delivery costs also in review + removed the button to update the sale order as it is now directly updated when choosing a carrier
bzr revid: tde@openerp.com-20131218142759-j4j7jznjyobyrfy6
2013-12-18 15:27:59 +01:00
Thibault Delavallée 531d40cd3b [IMP] website_sale_delivery: when choosing a carrier, immediately update the sale order
bzr revid: tde@openerp.com-20131218142735-r444egdcmxfap01v
2013-12-18 15:27:35 +01:00
Xavier Morel e04983ae69 [IMP] conversion back from m2o t-field to openerp value
Instead of doing a name_get on the edited value and trying to find out
an m2o to assign back (which there's pretty much no chance of given
there's no autocompletion or anything), alter the m2o record in-place
by setting the provided edited value to its _rec_name.

Ideally, both features could be supported via more advanced m2o
edition widgets which would allow selecting an existing m2o, creating
a new m2o record from scratch or (maybe) editing the existing m2o's
display_name if possible, somewhat similar to what the form view
provides.

Without these though, the only action which makes any sense is to edit
the user-visible "value" where it is found, as with more normal
fields.

bzr revid: xmo@openerp.com-20131218140917-4eo2o55yfcumzhov
2013-12-18 15:09:17 +01:00
Martin Trigaux 90dfa5895d [FIX] gamification: send badge on user, fix function field
bzr revid: mat@openerp.com-20131218140333-nipcc21z5snhac1c
2013-12-18 15:03:33 +01:00
Xavier Morel b741852c3d [IMP] correctly handle writing to a view without a model_data (e.g. test views)
bzr revid: xmo@openerp.com-20131218134932-382cvndk8asr82ip
2013-12-18 14:49:32 +01:00
jke-openerp 86b827113b [Typo] print for debug warning
bzr revid: jke@openerp.com-20131218134334-adel8j7onf0ziuh7
2013-12-18 14:43:34 +01:00
Gery Debongnie 7bb84af05f [REF] large refactoring of graphview: it separates the drawing code into a widget that can be used independently of the view (addon web_graph)
bzr revid: ged@openerp.com-20131218134040-63fcm5a68gsk3hry
2013-12-18 14:40:40 +01:00
jke-openerp 088a2f6447 [Typo] Typo + print for debug warning
bzr revid: jke@openerp.com-20131218133939-nxiwt25bjevs1kic
2013-12-18 14:39:39 +01:00
Xavier Morel eb44a6b21e [FIX] in contactus page, replace res_company.partner_id by res_company.name so it can be saved
bzr revid: xmo@openerp.com-20131218132610-adby5u0daviprjev
2013-12-18 14:26:10 +01:00
Thibault Delavallée 2578feda85 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131218132218-y5gn6noemlhmtuth
2013-12-18 14:22:18 +01:00
Thibault Delavallée 7a564f261e [IMP] [FIX] [ADD] website_sale, website_sale_delivery: delivery + ecommerce code cleaning
- added a website_order_line on sale.order model, that are the lines to display
and use in the front-end. This allows to display only products (and not delivery
costs), and to have a correct badge for the number od products.
- cleaned ecommerce website code and method name. Still some cleaning to do
I think.
- fixed some issues in partner and shipping info management, now using CheckoutInfo
more cleanly
- fixed the process of choosing the carrier

bzr revid: tde@openerp.com-20131218132150-f4br0099p2caf43i
2013-12-18 14:21:50 +01:00
Thibault Delavallée e883b15c48 [FIX] sale, delivery: _amount_all function used in function field is now wrapper. Indeed as
we give the function pointer when creating the fields, inheritance is not taken into
account. This is done by adding a wrapper that calls _amount_all, using this time correct
inheritance.

bzr revid: tde@openerp.com-20131218131942-9lzrxbscb4lu4rj8
2013-12-18 14:19:42 +01:00
jke-openerp e4469e0aeb [MERGE] Merge with trunk
bzr revid: jke@openerp.com-20131218131034-61e6su19shmrgakz
2013-12-18 14:10:34 +01:00
jke-openerp 4be9d97332 [MERGE] Merge with trunk
bzr revid: jke@openerp.com-20131218130914-w8akdktrpad5pflk
2013-12-18 14:09:14 +01:00
Fabien Meghazi f57869a89d [FIX] menu should honor the 'Open in a new window' option
bzr revid: fme@openerp.com-20131218130515-7ztpt4qpfb9bq5ah
2013-12-18 14:05:15 +01:00
jke-openerp d7c9436685 [Typo] Remove bad file
bzr revid: jke@openerp.com-20131218130404-ze14bh58e3v120nv
2013-12-18 14:04:04 +01:00
Martin Trigaux 938a07a361 [FIX] gamification: check grant badges are now sistematic except for superuser (always possible)
bzr revid: mat@openerp.com-20131218130039-y5vp0wt48ejd3jrh
2013-12-18 14:00:39 +01:00
ajay javiya (OpenERP) 0ed13a4a00 [ADD] : modal(wizard) on decline button ,
[IMP]: typos and code

bzr revid: aja@tinyerp.com-20131218125559-km8k9ug0izotlynh
2013-12-18 18:25:59 +05:30
jke-openerp b7a001866d [IMP] Move threading.currentThread().testing from load_test to load_data. The purpose is to dont send mail when we are installing the demo data
bzr revid: jke@openerp.com-20131218123858-09hitdpxxqa5uh3j
2013-12-18 13:38:58 +01:00
Denis Ledoux 44006349af [FIX] base: size of partner address labels, according to standard 24 labels per page
bzr revid: dle@openerp.com-20131218123130-vlejjv7r2klkzoj0
2013-12-18 13:31:30 +01:00
Martin Trigaux 553e85f369 [FIX] gamification: move manifest order and remove useless browse
bzr revid: mat@openerp.com-20131218121459-zlfumwysdx9qm7d9
2013-12-18 13:14:59 +01:00
Martin Trigaux 5acd144c81 [FIX] gamification: rename view files
bzr revid: mat@openerp.com-20131218115227-39ii3so3uupc7vp8
2013-12-18 12:52:27 +01:00
Xavier Morel 90a9e522f3 [ADD] placeholder support on t-field
A placeholder is looked up:

1. in the field's options ("placeholder")
2. on the t-field node itself (@placeholder)
3. on the field's column (.placeholder)

The first one found is used as the @placeholder of the resulting node
(in-HTML), and displayed when the field is empty and unfocused.

If no placeholder is found, an empty field just gets a small padding
in order to be easier to see & focus.

bzr revid: xmo@openerp.com-20131218114901-xi3ye11x5pysq2a2
2013-12-18 12:49:01 +01:00
Xavier ALT 9491755b8b [FIX] web: only show in 'Advanced Search', fields that are actually searcheable and avoid duplicate 'ID' field
bzr revid: xal@openerp.com-20131218113547-myl7eihvw5vbzkaa
2013-12-18 12:35:47 +01:00
Denis Ledoux cb0074ab15 [FIX] web: context propagation was broken on buttons of action and object type.
The context on the button must be propagated to the resulting action

bzr revid: dle@openerp.com-20131218112416-2vtaq442qo8opq4u
2013-12-18 12:24:16 +01:00
Fabien Meghazi b4918347cc [IMP] webclient entry point controller
bzr revid: fme@openerp.com-20131218111937-hp5vfutci5x7k2p5
2013-12-18 12:19:37 +01:00
Martin Trigaux e7887b8b8f [REF] gamification: python tests and other improvements
bzr revid: mat@openerp.com-20131218111243-npnauv6mxhb4nttg
2013-12-18 12:12:43 +01:00
Xavier ALT bf324b417c [FIX] base: make explicit, that res.users reified fields are not selectable
bzr revid: xal@openerp.com-20131218111214-543cjhkp6k0steyi
2013-12-18 12:12:14 +01:00
jke-openerp 6a0b69a7e7 [IMP] Add Demo data, Test on Event, Test en recurrence + [FIX] google_event__internal_id size changed, because more than 128 char for some users
bzr revid: jke@openerp.com-20131218110418-wdubheq1by0j0daf
2013-12-18 12:04:18 +01:00
Thibault Delavallée 56f18f56c5 [FIX] ir_ui_view: still usign context without being sure it exists
bzr revid: tde@openerp.com-20131218105511-fuf8ca99nimzbcpc
2013-12-18 11:55:11 +01:00
jke-openerp d2aef70633 [IMP] Update Demo data to have data more expplicit
bzr revid: jke@openerp.com-20131218091129-f36cx3hpnt5garod
2013-12-18 10:11:29 +01:00
jke-openerp b5059e1d52 [FIX] Add required on field res.partner from model Contacts to avoid the creation of empty coworkers
bzr revid: jke@openerp.com-20131218091020-8upymhda9nd84fg8
2013-12-18 10:10:20 +01:00
Martin Trigaux b63950e0dc [REF] gamification: mode to adequate folders
bzr revid: mat@openerp.com-20131218085907-6501sfdif2rk4a0b
2013-12-18 09:59:07 +01:00
ajay javiya (OpenERP) 1b7a51b9b9 [IMP]: code and security
bzr revid: aja@tinyerp.com-20131218072235-fglrt10ln4ela6t3
2013-12-18 12:52:35 +05:30