Commit Graph
81203 Commits
Author SHA1 Message Date
Christophe Simonis 16db944365 [IMP] website_blog: rename "Category" to "Blogs"
bzr revid: chs@openerp.com-20140124162251-3kkn3n17uqum1scu
2014-01-24 17:22:51 +01:00
Thibault Delavallée 33d349f33b [FIX] mail: fixed download_attachment controller
bzr revid: tde@openerp.com-20140124160457-hofozo85ebzbogu7
2014-01-24 17:04:57 +01:00
Christophe Simonis 79fc8d3d20 [FIX] website: select2 is now included in web module
bzr revid: chs@openerp.com-20140124155944-sfre35hkyk0dxcnb
2014-01-24 16:59:44 +01:00
Gery Debongnie ede4fd8861 [MERGE] merge trunk into local branch
bzr revid: ged@openerp.com-20140124153531-f4ynl627jpssj7dx
2014-01-24 16:35:31 +01:00
Gery Debongnie 3a784da015 [MERGE] merge trunk into local branch
bzr revid: ged@openerp.com-20140124153446-2mouqvp02c009y0x
2014-01-24 16:34:46 +01:00
Gery Debongnie 4620c520a1 [FIX] fixes a typo, causing crashes when selecting date fields in groupbys (addon web_graph)
bzr revid: ged@openerp.com-20140124152821-a9ts9soiwlc2niov
2014-01-24 16:28:21 +01:00
Christophe Matthieu 7cc06c62db [IMP] website: public partner active false
bzr revid: chm@openerp.com-20140124152714-jz78701882gt3lry
2014-01-24 16:27:14 +01:00
Thibault Delavallée 86dcc20dcb [MERGE] [REVIEW] payment and payment-related modules cleaning, fixing and improvement.
[RENAME] payment_acquirer_* -> payment_ *

[CLEAN] payment_paypal duplicate of portal.payment.acquirer
- [REM] portal.payment.acquirer model, now replaced by payment.acquirer
- paypal banner generation on sale orders and invoices is done using the new payment.acquirer model. It basically works like the old portal.payment.acquirer, using a render_payment_block method.

[CLEAN] payment_paypal and paypal_account field of res.company
- in account: paypal_account is a char field (nothing changes)
- when installing payment_paypal: the char field is replaced by a function field that looks in the payment.acquirer table for paypal instances and get the first one back
- when installing payment_paypal, the company.paypal_account value is used to replace the default paypal data
- this function field and 'migration mechanism' are company aware

[IMP] payment: added pre_msg, post_msg, that are messages to be displayed before payment (like redirection warning for Paypal) and after payment (like account and communication details for transfer). Added a default message for transfer taking the visible company bank accounts.

[IMP] payment: added manual / automatic distinction. eCommerce use this information to decide whether to poll the tx status or display an information message.

[FIX] payment_*: fixed return controlers, using werkzeug.redirect instead of request.redirect that does not work anymore

[IMP] configuration
- added checkboxes to install paypal, ogone and adyen directly from the invoicing configuration

bzr revid: tde@openerp.com-20140124152541-y6e6kset056jbpkv
2014-01-24 16:25:41 +01:00
Gery Debongnie 7b4f2df8be [FIX] fixes a crash in line chart mode when the view had more than one measure (addon web_graph)
bzr revid: ged@openerp.com-20140124152536-an2aelpaa43ivzjw
2014-01-24 16:25:36 +01:00
Thibault Delavallée 6e11e3f6ce [MERGE] [FIX] tools: mail: when cleaning, unescape mako specific symbols.
Indeed those are escaped when contained inside an href or mailto element
of a tag, leading to mako not rendering the element.

bzr revid: tde@openerp.com-20140124152528-39njxzbn319jckfn
2014-01-24 16:25:28 +01:00
Fabien Meghazi 2bf139a9a1 [ADD] database selector to auth_signup
bzr revid: fme@openerp.com-20140124151910-riy18qm3ix93nbdg
2014-01-24 16:19:10 +01:00
Fabien Meghazi f4e33da924 [ADD] Database selector to login screen
bzr revid: fme@openerp.com-20140124151656-swy3jknclfnxkwzx
2014-01-24 16:16:56 +01:00
Gery Debongnie c43147628b [REF] lots of small tweaks to improve the code, and some small fixes, after xmo's code review (addon web_graph)
bzr revid: ged@openerp.com-20140124151635-14l3dchnrmujo5ni
2014-01-24 16:16:35 +01:00
Thibault Delavallée a7908b63bd [FIX] payment_*: fixed return controlers, now using werkzeug redirection
bzr revid: tde@openerp.com-20140124145923-fsyv2tm5z92m1je1
2014-01-24 15:59:23 +01:00
Thibault Delavallée 47d8864dc8 [IMP] website_sale: improved manual payment management in checkout process
bzr revid: tde@openerp.com-20140124145713-z30chcqg2n32j1g6
2014-01-24 15:57:13 +01:00
Thibault Delavallée 9e64ddf27e [FIX] payment: fixed default value for validation + portal_sale payment block
bzr revid: tde@openerp.com-20140124145650-3snu3habegunpo2c
2014-01-24 15:56:50 +01:00
Thibault Delavallée 093e8633dc [FIX] payment_transfer: fixed controler, request.redirect -> werkzeug.redirect
bzr revid: tde@openerp.com-20140124145628-3e9pvz88wyww9kr3
2014-01-24 15:56:28 +01:00
Christophe Matthieu c4ec2b752a [FIX] website_event_track: use check_access_right insead of simple try except
bzr revid: chm@openerp.com-20140124145230-1xecdzf7tmhqvh3z
2014-01-24 15:52:30 +01:00
Thibault Delavallée a771127a7e [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20140124144628-eug8try0jywc7lps
2014-01-24 15:46:28 +01:00
Thibault Delavallée d474cacf74 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20140123162135-4zo139exy60lhl33
bzr revid: tde@openerp.com-20140124120918-f732qn72365uro08
bzr revid: tde@openerp.com-20140124144556-b5hjj7ffc3ts3x25
2014-01-24 15:45:56 +01:00
Thibault Delavallée aff2b4973f [IMP] payment: distinguish manual from automatic payment acquirers.
Improved validation (manual/automatic) management in ecommerce.

bzr revid: tde@openerp.com-20140124144355-6aqhocw0nfo7212a
2014-01-24 15:43:55 +01:00
Christophe Matthieu 098381385a [IMP] website_event: the event list right screen is confusing when they are no demo data. Put it as an option
bzr revid: chm@openerp.com-20140124140247-7tfewwf8o440vgka
2014-01-24 15:02:47 +01:00
Xavier Morel ce155acefe [IMP] with device-width, iOS devices don't respond to orientation changes. Use initial-scale instead
bzr revid: xmo@openerp.com-20140124135713-e0uzbnaq5m9hiocr
2014-01-24 14:57:13 +01:00
Christophe Matthieu ab300843ce [FIX] website_sale_crm: create a bridge to add order into website sale teams if crm is installed
bzr revid: chm@openerp.com-20140124135216-3ikjg2glx29stk1j
2014-01-24 14:52:16 +01:00
Xavier Morel 11c2325374 [ADD] viewport meta, so the responsive bootstrapy stuff actually does things
bzr revid: xmo@openerp.com-20140124134729-epag5dnbjk8y2hcw
2014-01-24 14:47:29 +01:00
Thibault Delavallée cc793480fc [IMP] payment: renamed message in pre_msg, msg displayed before
payment. Added post_msg, message displayed after payment.
[IMP] payment_transfer: added a default value (generated at create) for
post_msg, that contains bank accounts details. bank accounts linked to the
current company and used in report footer are shown.
[FIX] payment_*: make the buttons noupdate.
[IMP] payment: portal_published -> website_published + propagation
[IMP] payment: added process selection field that will be used for some
control in the website, telling w hether we want to refresh a payment
validation page or not.

bzr revid: tde@openerp.com-20140124134652-cc0nz08znnlmftw4
2014-01-24 14:46:52 +01:00
Gery Debongnie b2f27dabf0 [REF] implifies the read_group method by removing an useless dictionary (orm.py)
bzr revid: ged@openerp.com-20140124132834-evx3dikqc94m48ed
2014-01-24 14:28:34 +01:00
Christophe Simonis 892325754e [FIX] plugin: correct condition to match partners from emails.
correct copy/paste bug introduced in revid 9785 mat@openerp.com-20140122134728-558gkuhjpi2bc277

bzr revid: chs@openerp.com-20140124132450-cmx4acj6yei49aw7
2014-01-24 14:24:50 +01:00
Christophe Matthieu 9548b71db8 [FIX] event_sale: traceback when confirming an event
bzr revid: chm@openerp.com-20140124132357-90mx68jr7vbxjw1c
2014-01-24 14:23:57 +01:00
Fabien Meghazi f0606d3cc0 [FIX] Contact field encoding issue
bzr revid: fme@openerp.com-20140124132304-4kmjd9k4k2xgjecv
2014-01-24 14:23:04 +01:00
Fabien Meghazi 76144806af [IMP] If t-field can't get/use the resource, set it's content to None
bzr revid: fme@openerp.com-20140124132137-7m8840py82nlib40
2014-01-24 14:21:37 +01:00
ddm@openerp.com edaf96d283 [IMP] add livechat snippet
bzr revid: ddm@openerp.com-20140124130557-1rmrtbabrz0mt1ed
2014-01-24 14:05:57 +01:00
Gery Debongnie 524324ae4e [FIX] fixes two small issues concerning the groupby dates in graph view (addon web_graph)
bzr revid: ged@openerp.com-20140124125944-wxl4zdya37pxdnqv
2014-01-24 13:59:44 +01:00
Anael Closson 4a32b57779 [FIX] conditions inverted in involves not forgotten a
bzr revid: acl@openerp.com-20140124125444-rhigcae80phfixh8
2014-01-24 13:54:44 +01:00
ddm@openerp.com fb49ef287c [IMP] new module for integrating livechat into website
bzr revid: ddm@openerp.com-20140124125140-pr9h42j6p6kp31qt
2014-01-24 13:51:40 +01:00
Thibault Delavallée a21495916b [FIX] website_payment: lost reference to payment_acquirer, renamed to payment
bzr revid: tde@openerp.com-20140124123045-klutr02i9t3eeep1
2014-01-24 13:30:45 +01:00
ajay javiya (OpenERP) 9fe226b6ce [IMP]: validation
bzr revid: aja@tinyerp.com-20140124122929-aakyqkzqus87c4ql
2014-01-24 17:59:29 +05:30
Gery Debongnie 3d6a575d03 [IMP] changes the crm_lead graph view in reporting, to use the new groupby interval features of graph view (addon crm)
bzr revid: ged@openerp.com-20140124122439-t8vvgy9zebbhhy2a
2014-01-24 13:24:39 +01:00
Thibault Delavallée 5758e729ce [REM] payment_*: removed unnecessary doc directories
bzr revid: tde@openerp.com-20140124121646-1j6pbc9nmlvis443
2014-01-24 13:16:46 +01:00
Denis Ledoux 1fb1a6f2af [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9789 revid:dle@openerp.com-20140124120102-we2yxio553ws2yz4
bzr revid: dle@openerp.com-20140120174449-tui0a24zgn9bien2
bzr revid: dle@openerp.com-20140121125538-ke7i6kaz486hwgl8
bzr revid: dle@openerp.com-20140122134115-0ogjemlqe327xoac
bzr revid: dle@openerp.com-20140123103655-mf2zslfbgue97ed2
bzr revid: dle@openerp.com-20140124121027-uk9zy4dx9tqlsblr
2014-01-24 13:10:27 +01:00
Thibault Delavallée 43deedcdf6 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20140124120925-gyysjhkokizynsd8
2014-01-24 13:09:25 +01:00
Thibault Delavallée e93a3b1880 [MERGE] [ADD] product_email_template new module. It allows ot send template-based emails when validating invoices. This allows to send description, user guides, technical datasheets, ... when selling products.
product_template inheritance: added email_template_id field, link to an optional email.template

invoice inheritance: when validating the invoice, send an email for each product that has a linked email.template.

email_template inheritance: defined a new simplified form view with only attachment_ids and body, to ease the quick edition of email templates. This simplified form view is used for the email_template_id field on the product.template form view.

email_template: when having default_model in default_get, use it to prefetch model_id. Indeed model is a related file, we have to redirect its default to the right model_id field.

bzr revid: tde@openerp.com-20140124120652-vxp0jwf14sl1frme
2014-01-24 13:06:52 +01:00
Denis Ledoux 83677ed6e6 [REVERT] 9401 dle@openerp.com-20130830125155-1vedifnupu2xvth7
This had as side-effect to not allow splitting BOMs
(a manufacturing order for 1 unit of a BOM producing 10 units consumed the lines like it was 10 units, not 1)

This fix was to avoid having a fraction of a unit (for instance, 0.5 unit).

But, finally, it is preferable to allow splitting units:
1. Most users do not use several uoms, and in this case, the unit is the default uom (hidden).
2. At the moment, it is allowed to ask a manufacturing order splitting up the unit uom
(It is allowed to ask the production of 0.5 USB Adapter, for instance)
Thus, we should allow the splitting up of the unit uom in the lines too.

bzr revid: dle@openerp.com-20140124120102-we2yxio553ws2yz4
2014-01-24 13:01:02 +01:00
Christophe Matthieu 6f859860e9 [FIX] website_sale_delivery: don't raise (for the website customer) if they are no carrier; return true if they aren't need of carrier or if the carrier is good
bzr revid: chm@openerp.com-20140124115723-nblyb3qknxym9817
2014-01-24 12:57:23 +01:00
Thibault Delavallée b845b708af [CLEAN] email_template: cleaned code
bzr revid: tde@openerp.com-20140124114743-m6s8d1byabl78l63
2014-01-24 12:47:43 +01:00
Christophe Matthieu 33eeff4448 [IMP] website_crm, website_sale: add a Website sale team and new lead and order to this sale team
[FIX] website_sale: remove auto assignation to administrator from website lead and order

bzr revid: chm@openerp.com-20140124114224-w80wd2ea0bx20ldk
2014-01-24 12:42:24 +01:00
Thibault Delavallée 5d17667bb1 [RENAME] account_product_template -> product_email_template, to avoid
confusion with product templates. The main feature are email template on product
therefore renaming the module.

bzr revid: tde@openerp.com-20140124110802-unn4u75ad4jt0bb2
2014-01-24 12:08:02 +01:00
ddm@openerp.com cc978e1490 [FIX] event tour edit
bzr revid: ddm@openerp.com-20140124110552-ai7bfobl72n97bz1
2014-01-24 12:05:52 +01:00
Thibault Delavallée c98acc4919 [CLEAN] account_product_template: cleaned demo data
bzr revid: tde@openerp.com-20140124110510-k1czgon57idv4hct
2014-01-24 12:05:10 +01:00
Thibault Delavallée e374abeba6 [FIX] account_product_template: handle attachments of the template.
bzr revid: tde@openerp.com-20140124110012-lpf79nvmcqjhzuvv
2014-01-24 12:00:12 +01:00