Commit Graph
65936 Commits
Author SHA1 Message Date
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
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
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
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
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
ajay javiya (OpenERP) 5567caa27d [IMP]: overwrite record rule to allow public user to read sale.order data
bzr revid: aja@tinyerp.com-20131218055645-fb9izyc3029jtz0k
2013-12-18 11:26:45 +05:30
Launchpad Translations on behalf of openerp d23b68540b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131218055330-dvkrpp97rqo7gcf2
2013-12-18 05:53:30 +00:00
jke-openerp f7691df022 [TRY] Try to debug demo data for multi company since new user created in calendar
bzr revid: jke@openerp.com-20131217215623-03k90pja43x1vq11
2013-12-17 22:56:23 +01:00
jke-openerp ed86fee50f [Typo] Set demo as no update
bzr revid: jke@openerp.com-20131217210531-z4eqjggg5i94q6cf
2013-12-17 22:05:31 +01:00
jke-openerp affb77ed71 [IMP] Improve perf of google calendar synchro, add demo data for Calendar
bzr revid: jke@openerp.com-20131217204238-sat6h8jc600d1n69
2013-12-17 21:42:38 +01:00
Frédéric van der Essen 12818d0c63 [FIX] point_of_sale: make debug window draggable on touch devices
bzr revid: fva@openerp.com-20131217172258-llzy2ews9727pref
2013-12-17 18:22:58 +01:00
Frédéric van der Essen a0199955b3 [FIX] point_of_sale: minimal viable styling for OpenERP error dialogs
bzr revid: fva@openerp.com-20131217170654-qj5evj3t7ilih69b
2013-12-17 18:06:54 +01:00
Martin Trigaux 4bc29b9ffa [REF] gamification
bzr revid: mat@openerp.com-20131217170232-e0zruxzl1wlycaji
2013-12-17 18:02:32 +01:00
Thibault Delavallée ba73588c6c [FIX] email_template: fixed default_get, not possible ot render when we do not have any data about the record used for rendering
bzr revid: tde@openerp.com-20131217165931-muxsi0hwhihcvo1f
2013-12-17 17:59:31 +01:00
Frédéric van der Essen ba88cd3438 [FIX] point_of_sale: remove useless console.logs
bzr revid: fva@openerp.com-20131217165641-a30md8f5k8p9fhmh
2013-12-17 17:56:41 +01:00
Martin Trigaux c184adab44 [REF] gamification
bzr revid: mat@openerp.com-20131217164619-ewgj8cclza3u44pp
2013-12-17 17:46:19 +01:00
Thibault Delavallée e701544aa4 [CLEAN] website_sale_delivery: removed dead JS code
bzr revid: tde@openerp.com-20131217163912-4br0aar371qvr5cs
2013-12-17 17:39:12 +01:00
Martin Trigaux 122c15c48d [REF] gamification: pretty much changing half of the code to make tde happy...
bzr revid: mat@openerp.com-20131217161541-oxsgy7gmko2x6qui
2013-12-17 17:15:41 +01:00
Frédéric van der Essen ab8ca276e0 [MERGE] from trunk
bzr revid: fva@openerp.com-20131217160043-vsgkwupgvyihj7fg
2013-12-17 17:00:43 +01:00
Xavier Morel 128f1e1281 [FIX] odd behavior in cke widgets
in "block-level" widgets (divs), when hitting [return] instead of
adding a newline in the widget a new bit of widget may be added. This
is caused by an incompability between widgets and the enterKey plugin.

Remove enterKey, behavior on [Return] is slightly worse (always
inserts br) but widgets don't get broken.

See https://dev.ckeditor.com/ticket/11326 for issue in upstream.

bzr revid: xmo@openerp.com-20131217153751-7fbwp34o8kac9x94
2013-12-17 16:37:51 +01:00
Gery Debongnie 79250f0c07 [REF] adds event handling to pivot table class (triggers 'redraw_required' and 'groupby_changed' event when necessary (addon web_graph)
bzr revid: ged@openerp.com-20131217153204-43la1m8eqw632j05
2013-12-17 16:32:04 +01:00
Thibault Delavallée 3805a86302 [IMP] website_sale_delivery: make the module effectively works.
- added JS / HTML to handle the choice of the carrier
- added override of payment controller in website_sale_delivery to handle the carrier
and recompute the amount and details
- some code cleaning
- added amount_delivery field in sale.order, that is the amount related to the
delivery

bzr revid: tde@openerp.com-20131217152605-0xoulnnlo0nn7j9o
2013-12-17 16:26:05 +01:00
Frédéric van der Essen 68f8dd7e23 [FIX] point_of_sale: activate the font 'Lato' & prevent rubberbanding on application body when possible
bzr revid: fva@openerp.com-20131217151550-i8wd88qby6gjaclj
2013-12-17 16:15:50 +01:00
Fabien Meghazi 68f0397609 [IMP] preload all objects
bzr revid: fme@openerp.com-20131217150211-zquu7nn05g23m4r4
2013-12-17 16:02:11 +01:00
Denis Ledoux 7486095918 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9701 rev-id: dle@openerp.com-20131217124201-kha2717b4ka51aih
bzr revid: dle@openerp.com-20131217142126-1lbim47d2m2x4bb0
2013-12-17 15:21:26 +01:00
jke-openerp 00d43cd601 [TYPO] Typo and go in edit mode by default and not view mode when editing an event
bzr revid: jke@openerp.com-20131217140719-3nh6pmwmg716d9jh
2013-12-17 15:07:19 +01:00
Cecile Tonglet 0877e27f82 [FIX] The widget selection on partner_id force the form to load every partner for nothing
bzr revid: cto@openerp.com-20131217140015-f3v3tjmrhnwjfsqi
2013-12-17 15:00:15 +01:00
Fabien Meghazi fca5a85fc6 [FIX] forgot to remove a js statement
bzr revid: fme@openerp.com-20131217134734-tfz8c3e6watamac3
2013-12-17 14:47:34 +01:00