Commit Graph
77789 Commits
Author SHA1 Message Date
JoshuaJan 8b84cbeeb4 [fix][typo]
bzr revid: popkar77@gmail.com-20131219150042-7yyfrpb5m2vsy2be
2013-12-19 23:00:42 +08:00
JoshuaJan 1d0423b9ad [wrong model]not payment.acquirer but payment.transaction
bzr revid: popkar77@gmail.com-20131219145716-cybxgkamyyrnn238
2013-12-19 22:57:16 +08:00
Thibault Delavallée 38e22d1808 [MERGE] [IMP] website_sale_delivery: make the module effectively works.
- added support in the front-end to choose and carrier and update the quotation
- 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
- added some wrappers on _amount_all method of the sale.order model, in order to be able to use inheritance for this method
- fixed shipping values management in website_sale + fixed shipping partner finding
- improved the cart to display only product lines, the delivery amount is displayed below the quotation total

[FIX] email_template: fixed a bug with pre-loading the template that was preventing to send a quotation by email

bzr revid: tde@openerp.com-20131219112219-kjvzfukcfur6f8g5
2013-12-19 12:22:19 +01:00
Thibault Delavallée 86fc66e797 [FIX] website_sale: checkout process: fixed carrier choice redirection
bzr revid: tde@openerp.com-20131219105122-awib6gys6uklbvxa
2013-12-19 11:51:22 +01:00
Thibault Delavallée 348a2bda96 [FIX] website_sale: get_total_quantity -> get_number_of_products
[FIX] website_sale: fixed domain to find the shipping_partner_id

bzr revid: tde@openerp.com-20131219103732-84nrt5xlqyqbwsns
2013-12-19 11:37:32 +01:00
Thibault Delavallée e2b07d5d7d [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131219102240-43nvqj9hkzn5ymt2
2013-12-19 11:22:40 +01:00
Fabien Meghazi af1e65ffdb [IMP] Use cursor: text for editable .btn's
bzr revid: fme@openerp.com-20131219093410-lgr1f54nehaz9fk0
2013-12-19 10:34:10 +01:00
Fabien Meghazi 375e440c2e [ADD] Markers for vim
bzr revid: fme@openerp.com-20131219093329-s5oumfhwyw0pevfy
2013-12-19 10:33:29 +01:00
Fabien Meghazi b180d69808 [IMP] Better events naming for EditorBar height related stuff
bzr revid: fme@openerp.com-20131218201619-vja6dv0sctokep3b
2013-12-18 21:16:19 +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
ddm 2381c44441 [IMP] UI test runner code doc
bzr revid: ddm@openerp.com-20131218152352-mclkpnjpzvqsibqh
2013-12-18 16:23:52 +01:00
ddm 50ab1e551e [IMP] Cleanup UI tests
bzr revid: ddm@openerp.com-20131218151702-68m9z9wm31rj5g2f
2013-12-18 16:17:02 +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
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
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
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
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
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
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
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
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
Fabien Meghazi 68f0397609 [IMP] preload all objects
bzr revid: fme@openerp.com-20131217150211-zquu7nn05g23m4r4
2013-12-17 16:02:11 +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
Fabien Meghazi 1434a5aae9 [IMP] allow to reset broken views in the 500 error page
bzr revid: fme@openerp.com-20131217134600-v0i170n9gw7752vj
2013-12-17 14:46:00 +01:00
ddm 5d97a99b1a [IMP] removed JS function from banner tour
bzr revid: ddm@openerp.com-20131217130240-hdbgp90f47uori0h
2013-12-17 14:02:40 +01:00
Xavier Morel 4469b36f77 [FIX] change view section saving: only save view section *content*
Before, would save view section itself (including root element). But
branding distribution (and thus editability) are set on the last
programmatic root, thus the root element may well be generated
e.g. <span t-att-foo> will define the span itself as editable.

Saving this would remove the programmatic content on the node, and
thus break the view section altogether.

Fix the issue by only saving the root's content in the previous root.

bzr revid: xmo@openerp.com-20131217112034-nbxbg919cffv4w51
2013-12-17 12:20:34 +01:00
Xavier Morel f6eb40fc90 [FIX] enable user-selection on editable buttons (when the button itself is editable, not just in an editable section)
bzr revid: xmo@openerp.com-20131217104702-jell0imowvzjlasl
2013-12-17 11:47:02 +01:00
Thibault Delavallée 21791ced7c [IMP] payment_acquirer_transfer: make it auto_install. This way users
installing the ecommerce will always have a default payment
method.

bzr revid: tde@openerp.com-20131217085056-meq403m1bdl8vk9w
2013-12-17 09:50:56 +01:00
Max Mumford 3aaa0c10fe [ADD] <main> tag around content for easy replacing, and CSS changes to maintain current UI
bzr revid: mmu@openerp.com-20131216160654-s75kx9xr2yutq5fg
2013-12-16 17:06:54 +01:00
Xavier Morel 98c4e6b3d4 [IMP] editability criteria for links and images
if a link or image is an editing host (has @contenteditable=true), its
body is editable *but* its attributes should not be considered
editable: if the attributes come from a t-att-*, @contenteditable will
be set on the node itself.

such elements should be ignored by the link & image dialog handling
thing, as editing their attributes has undesirable effects.

bzr revid: xmo@openerp.com-20131216134424-fdqs03i9pidbmaqt
2013-12-16 14:44:24 +01:00
ddm d15f3d2b8a [FIX] Main object for members (promote)
bzr revid: ddm@openerp.com-20131216134033-qnrvj06od8y2o868
2013-12-16 14:40:33 +01:00
ddm ff7da06cf9 [FIX] Main object for jobs (promote)
bzr revid: ddm@openerp.com-20131216133549-57343aix6it9ch5a
2013-12-16 14:35:49 +01:00
ddm 599b34d78d [FIX] Snafu
bzr revid: ddm@openerp.com-20131216112211-t8tvnamftce80qjd
2013-12-16 12:22:11 +01:00
Fabien Meghazi defdd6e565 [ADD] main_object for events
bzr revid: fme@openerp.com-20131216110234-iup1hiz57b68j8g7
2013-12-16 12:02:34 +01:00
ddm ff25c7a85a [FIX] Main object for events (promote)
bzr revid: ddm@openerp.com-20131216105403-0x6p1gg4ef0zjvid
2013-12-16 11:54:03 +01:00
ddm 285a596bf2 [FIX] Main object for customers (promote)
bzr revid: ddm@openerp.com-20131216102557-m9itxlw5jqjcdtlr
2013-12-16 11:25:57 +01:00
ddm 7cd60fb225 [FIX] Customers CMS bug
bzr revid: ddm@openerp.com-20131216095847-i4dqzk4ix26hh3cg
2013-12-16 10:58:47 +01:00
ddm 7763d6967e [FIX] Main object for partners (promote)
bzr revid: ddm@openerp.com-20131216092711-sv3n8ah969zm8nbs
2013-12-16 10:27:11 +01:00
Xavier Morel 87c3b6ac72 [FIX] disabling of field escaping
bzr revid: xmo@openerp.com-20131216092343-0e6t7nvse3r0p2zs
2013-12-16 10:23:43 +01:00
ddm 7ce0b5a69e [FIX] Main object for blog posts (promote)
bzr revid: ddm@openerp.com-20131216085636-y1h0h4ig9pbv9bcm
2013-12-16 09:56:36 +01:00
ddm 8f7db60fd6 [FIX] Tour should not start when testing
bzr revid: ddm@openerp.com-20131216075516-o70h4ydhgqj4i3kh
2013-12-16 08:55:16 +01:00
Fabien Pinckaers 38df46190a [IMP] Typo
bzr revid: fp@tinyerp.com-20131215080035-nbenf3bvfrmp1qv1
2013-12-15 09:00:35 +01:00
Fabien Pinckaers c62e8fc793 [IMP] Small improvements
bzr revid: fp@tinyerp.com-20131214192105-0ngdj4t6fz8xjd4q
2013-12-14 20:21:05 +01:00
Fabien Pinckaers b5393c97e4 [IMP] slugify products/categories
bzr revid: fp@tinyerp.com-20131214115227-6g3w70pm6cotiqdk
2013-12-14 12:52:27 +01:00