pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,203 Commits 1 Branch 0 Tags
42952bb7cf514b43eac598397e7bfad4cd943bc7
Commit Graph
81203 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Fabien Meghazi 7ddfe4c5c6 [FIX] file uploads broken by MultiDict 
bzr revid: fme@openerp.com-20131217161725-hx0m85adlgok9uxt
 2013-12-17 17:17:25 +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 ALT 6dc8698319 [FIX] base: remove old deprecated file `base_module_scan.py`. 
This file was wrongly left-over from ancient v6.1 times and not used at all under v7.0.

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

bzr revid: xal@openerp.com-20131217154915-v6iy8us55k8rp7nc
 2013-12-17 16:49:15 +01:00