Denis Ledoux
6ed5b04146
[FIX] calendar: replace end_type = final_date by end_date, the actual right selection
2014-06-02 12:02:11 +02:00
Jean-Baptiste Quenot
310ecb0d60
Fix detection of MIME type in message_parse()
...
Be careful, content-type may contain tricky content like in the
following example so test the MIME type with startswith()
Content-Type: multipart/related;
boundary="_004_3f1e4da175f349248b8d43cdeb9866f1AMSPR06MB343eurprd06pro_";
type="text/html"
2014-06-02 11:48:30 +02:00
Denis Ledoux
eb22d202e4
[FIX] mail: mail routing, allow more fallback cases
...
Specifically, allow mail to fallback in aliases if the post in the document res_model/res_id wasnt succesful
2014-06-02 01:37:45 +02:00
Denis Ledoux
da231e909a
[FIX] mail: commited pudb ... its late and it has been a while since the last time : ).
2014-06-01 22:10:54 +02:00
Denis Ledoux
dd36a0e509
[FIX] mass_mailing: on mass mailing sending, set same_thread for message composer
...
same_thread boolean field of mail.compose.message model define wether or not replies should be posted in the thread or not
On composer creation, this boolean should be passed according to the reply_to_mode of the mass_mailing
Otherwise, all replies would be posted in the thread, and the reply_to will be ignored (if same_thread id True, reply_to is poped from the mails values, mail/wizard/mail_compose_message.py:284)
2014-06-01 22:08:56 +02:00
Denis Ledoux
d6a2ae642b
[FIX] mass_mailing: avoid to eval an undefined domain
2014-06-01 21:45:26 +02:00
Denis Ledoux
97c0dbcd0a
[FIX] mail: do not link email to a model/res_id if this model doesn't support new message
2014-06-01 21:27:55 +02:00
Denis Ledoux
9d33ce4900
[FIX] website_sale: missing openerp.tools import
2014-06-01 20:20:21 +02:00
Christophe Simonis
c19bb8ce48
[FIX] website: correct "/" redirect to first menu
2014-06-01 14:30:15 +02:00
Christophe Simonis
587084f682
[MERGE] forward port of branch saas-4 up to revid c319dc4
2014-06-01 11:19:03 +02:00
Christophe Simonis
c319dc40e7
[FIX] mail: view_mode "list" does not exists, it's "tree"
2014-06-01 11:17:09 +02:00
Christophe Simonis
36f9af78aa
[MERGE] forward port of branch saas-3 up to revid faace84
2014-06-01 10:56:39 +02:00
Christophe Simonis
faace8493d
[FIX] email_template: partners ids are integers, not strings
2014-06-01 10:52:02 +02:00
Christophe Simonis
285e1d5c38
[FIX] website_sale: so javascipt does not like tuples. use a list instead
2014-05-31 15:37:23 +02:00
Christophe Simonis
960b86611e
[FIX] website_sale: remove invalid (and stupid) function field
2014-05-31 14:05:48 +02:00
Olivier Dony
52501dde7a
[FIX] website_mail_group: duplicate preventDefault() call (called before onclick already)
...
Plus it fails because `event` is not defined nor passed there (e.g. in Firefox)
2014-05-31 01:48:55 +02:00
Christophe Simonis
7dd79cb183
Merge pull request #278 from odoo-dev/master-bank-reconcile-ama
...
[IMP] account: bank statement reconciliation widget
2014-05-30 22:54:05 +02:00
qdp-odoo
ee92839465
[FIX] account: fixed inconsistence in yaml test since some demo data was added
2014-05-30 22:25:52 +02:00
Fabien Pinckaers
84d194d7a1
Merge pull request #269 from sve-odoo/patch-1
...
[ADD] "Model" Column in base_action_rule tree view.
2014-05-30 21:26:13 +02:00
Christophe Simonis
7ce927ab46
[FIX] account_bank_statement_extensions: do not extend dropped form view
2014-05-30 20:34:56 +02:00
qdp-odoo
f839621f52
[FIX] account_bank_statement_extension: fixed xml path in view
2014-05-30 19:28:40 +02:00
qdp-odoo
07460d7191
[IMP] account: bank statement reconciliation widget (part 3: missing files lost during manual merge (renamed))
2014-05-30 19:04:13 +02:00
qdp-odoo
e3491ccb71
[IMP] account: bank statement reconciliation widget (part 2)
2014-05-30 18:47:50 +02:00
qdp-odoo
7580b6510b
[IMP] account: bank statement reconciliation widget
2014-05-30 18:34:13 +02:00
qdp-odoo
52b799d8d0
[MERGE] master-wmsstaging-jco with fixes on WMS + new barcode reports
2014-05-30 18:09:05 +02:00
Christophe Simonis
ee304fa65f
[IMP] replace OpenERP by Odoo in backend + change company default logo.
2014-05-30 17:30:36 +02:00
qdp-odoo
0fa755bc89
[MERGE] master
2014-05-30 17:05:44 +02:00
Xavier Morel
46712acaec
[FIX] bunch of changes lost in incorrect merge f4d78ae738
2014-05-30 17:00:52 +02:00
Xavier Morel
d325c0caef
[REV] attempt to revert incorrect removals in f4d78ae738
2014-05-30 16:00:28 +02:00
Richard Mathot
8d822419e7
[FIX] website: fix incomplete refactoring
2014-05-30 15:35:59 +02:00
Richard Mathot
29387c518e
[REV][FIX] Reverting regression introduced in forward-port
...
04211015fc
2014-05-30 15:20:18 +02:00
Thibault Delavallée
0b54d8fb3c
[FIX] website_mail_group: fixed discussion group data, wrongly forward-ported
2014-05-30 11:22:00 +02:00
Josse Colpaert
742cfe83e0
Merge remote-tracking branch 'odoo/master' into master-wmsstaging-jco
2014-05-30 11:15:51 +02:00
Josse Colpaert
45dc3db6cc
Merge branch 'master-wmssecurity3-jco' into master-wmsstaging-jco
2014-05-30 10:37:26 +02:00
Josse Colpaert
231278997e
Merge branch 'master-wmsstatbut-jco' into master-wmsstaging-jco
2014-05-30 10:24:31 +02:00
Christophe Simonis
fb650ee92e
[MERGE] product: refactoring of product variants.
...
close PR #222
2014-05-30 10:22:36 +02:00
Christophe Simonis
b8af4775e3
[IMP] product: improve field labels about variant/attributes distinction
2014-05-30 10:00:54 +02:00
Antony Lesuisse
c05584a4d9
[FIX] website_sale and website_event imports
...
missing import prevent cli help display
2014-05-29 23:19:24 +02:00
sve-odoo
6c89284ec6
[ADD] "Model" Column in base_action_rule tree view.
2014-05-29 15:48:10 +02:00
Antony Lesuisse
130c889348
[FIX] ir.attachment mess, restore list view
2014-05-29 15:02:27 +02:00
Josse Colpaert
7b890e138a
[IMP] Location barcode
2014-05-29 14:58:48 +02:00
Olivier Dony
045ecc603e
[FIX] website_mail_group: restore missing snippet icon
...
The file was originally added in website_mail at 59b934
in saas-4 but was lost in master since.
2014-05-29 02:07:18 +02:00
Olivier Dony
248107d11a
[FIX] website_mail*: fix + bundlify changes of 0c89ca: move subscription widget from website_mail to website_mail_group
2014-05-29 01:59:47 +02:00
Fabien Meghazi
c9e12161c9
[FIX] website_mail.editor.js moved but still referenced
...
Commit 0c89ca0f8f
moves
website_mail.editor.js but is still referenced in website_mail.xml
2014-05-28 23:13:38 +02:00
Christophe Matthieu
138274e30d
[FIX] point_of_sale: fix product view layout
2014-05-28 20:50:20 +02:00
Christophe Matthieu
0017d02469
[FIX] membership: increase priority of product view (don't take this view by default).
2014-05-28 20:49:51 +02:00
Christophe Matthieu
435b5b9ca3
[IMP] product: rename fields variant_ids into attribute_line_ids on the template and attribute_value_ids on the product.
2014-05-28 19:42:15 +02:00
Pariket Trivedi
09dd6e3da6
[IMP] event_sale: extra QWeb report for printing event badges, with HTML fields for custom content
2014-05-28 19:05:11 +02:00
Christophe Matthieu
152ec5bf50
[FIX] product: revert change for price_extra. Need to filter by template to apply the price_extra.
2014-05-28 19:04:23 +02:00
Christophe Simonis
d42840a6f8
Merge pull request #226 from odoo-dev/master-website_sale-add-vat-chm
...
[IMP] website_sale: add vat field on checkout + validate it if base_vat module is installed
2014-05-28 18:45:12 +02:00
Christophe Matthieu
6958d56a66
[IMP] product: fixes for review
2014-05-28 18:30:03 +02:00
Denis Ledoux
65d7cc524d
[FIX] purchase: Do not allow to delete a purchase order line which is validated
...
This restriction behavior copied from the sale.order model
Moreover, the purchase.order lines state were not set to cancel when the purchase order was cancelled.
This is now the case, this behavior is also coped from the sale.order model
When the purchase order is reset to draft, we also reset the order lines state to draft
2014-05-28 18:00:11 +02:00
Olivier Dony
e276ac33f6
[MERGE] Forward-port saas-4 up to bf135ad
2014-05-28 17:45:31 +02:00
Richard Mathot
bf135ad057
[FIX] website_blog: display properly (very) long words in comments
2014-05-28 17:23:28 +02:00
Denis Ledoux
6ed774de61
[FIX] web: on new ir actions act_window target current, change the active* params from context for the dataset only
...
This fix is related to a37bad205b
This previous fix did solved the issue of its purpose, but had a side effect for actions using these active* params, e.g. search views
For instance, Go to Project > Projects, click on any project, you are than redirected to tasks/issues of this project
If you reload the page, an error pops up, complaining that active_id cannot be found
2014-05-28 15:50:02 +02:00
Denis Ledoux
f085274d5f
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. df0ae7e4d1
2014-05-28 14:53:32 +02:00
Thibault Delavallée
57c85a8b7a
Merge pull request #251 from odoo-dev/saas-4-follower-route-tde
...
[FIX] website_mail_group: discussion group snippet
- moved into website_mail_group, instead of having the snippet in website_mail and the archives in website_mail_group
- fixed routes to avoid security issues
- better display of email on groups and archive
2014-05-28 14:10:05 +02:00
Denis Ledoux
df0ae7e4d1
[FIX] payment_paypal: wrong handling fees computation formula
2014-05-28 14:02:56 +02:00
Christophe Matthieu
3f1e459430
[FIX] mrp_sale: move explode product with wrong bom; change product id
2014-05-28 12:29:56 +02:00
Christophe Matthieu
be8e10097d
[FIX] mrp: demo data is wrong don't produce ipad but pc
2014-05-28 12:26:57 +02:00
Denis Ledoux
00dc3a59df
[FIX] website_sale: force changing pricelist on different account signin
...
opw-607517
2014-05-28 12:04:41 +02:00
Christophe Matthieu
256a17d419
[IMP] product: rename field variants_ids to respect odoo typo; add demo data for mrp
2014-05-28 11:46:32 +02:00
Christophe Matthieu
3f69628f96
[FIX] product: recursion error when active field on product.template is modified
2014-05-28 11:29:20 +02:00
Thibault Delavallée
0c89ca0f8f
[FIX] website_mail, websit_mail_group: moved discussion group snippet to the right module; it should not be available when the mailing list archives module is not installed. Also fixed get_alias_info route to be mail_group specific and to avoid allowing people to browse the database.
2014-05-28 11:12:33 +02:00
Richard Mathot
57e1cc4edd
[ADD] website_crm_partner_assign: display demo data on website
2014-05-28 10:35:58 +02:00
Richard Mathot
5f94504c08
[TYPO] in crm_partner_assign
2014-05-28 10:06:42 +02:00
Thibault Delavallée
02018563b3
[FIX] website_mail: fixed is_follower controller, that could leak data about records.
...
Added instead a controller to get alias data. This controller is called by the
discussion group snippet to have the info about the alias.
2014-05-28 09:59:31 +02:00
Christophe Matthieu
c6f0699435
[FIX] website_sale: search attributes error when the user select a product with a search
2014-05-27 20:57:00 +02:00
Olivier Dony
04211015fc
[MERGE] Forward-port of latest saas-4 fixes, up to 0452851
2014-05-27 20:49:49 +02:00
Christophe Matthieu
585511d36e
[FIX] website_sale: inherit_option_id must be convert in optional='enabled'
2014-05-27 18:56:58 +02:00
Christophe Simonis
045285123f
[FIX] website: correct bad code indentation introduced during previous commit
2014-05-27 18:46:18 +02:00
Denis Ledoux
cadf582d78
[FIX] event_sale, website_event_sale: ACLs for event.event.ticket
...
event.event.ticket were set in website_event_sale, while this model is set in event_sale module
Manager acl moved from website_event_sale to event_sale
Created a new acl for event user in event_sale
Left the acl for everyone in website_event_sale, meaning that when this module is installed, everyone can read tickets, event those who aren't event user
2014-05-27 18:39:00 +02:00
Christophe Matthieu
abab5c2e94
[MERGE] from trunk
2014-05-27 18:28:40 +02:00
Christophe Matthieu
bb669f82c8
[FIX] website_sale: search by attributes not work for more of one selection
2014-05-27 18:20:42 +02:00
Christophe Matthieu
e987cd6c75
[FIX] website_sale: fix the product attribute templates to display the comma
2014-05-27 18:07:26 +02:00
Christophe Matthieu
d24aede8d7
[FIX] product: don't create new variants if the product.template is create by product.product.
2014-05-27 18:03:15 +02:00
Christophe Simonis
e16233217c
[MERGE] Replace inherit_option_id by a selection field (PR #229 )
2014-05-27 17:57:33 +02:00
Martin Trigaux
41c5ceb8eb
[FIX] stock: clean previous commit
2014-05-27 17:56:30 +02:00
Martin Trigaux
1ef2c18103
[FIX] stock: auto_validate move not set to done when multiple parent move set to done at the same time (opw 607970)
2014-05-27 17:47:28 +02:00
Christophe Matthieu
aacde7984f
[IMP] product: add demo data for variants
2014-05-27 17:35:52 +02:00
Olivier Dony
fd21abd847
[MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da
2014-05-27 17:18:43 +02:00
Thibault Delavallée
d22e515d52
[MERGE] [ADD] module: payment_buckaroo acquirer: manage payments using Buckaroo.
2014-05-27 16:57:31 +02:00
Olivier Dony
30f43daa3b
[MERGE] Forward-port of latest 7.0 bugfixes, up to aeaa826
2014-05-27 16:50:02 +02:00
Martin Trigaux
aeaa826d2f
Merge pull request #221 from odoo-dev/7.0-o2m-duplication-issue-msh
...
[FIX] Fix o2m record duplication when clicking on a button
The button action will execute a write call, creating the new line.
The reload is necessary to avoid recreating the line when using the save button.
2014-05-27 16:37:10 +02:00
Josse Colpaert
81222bc47f
[IMP] Package bar code printing from barcode itf
2014-05-27 16:32:21 +02:00
Fabien Meghazi
0544fc2929
Revert "Merge pull request #225 from odoo-dev/master-frontend-assets"
...
This reverts commit dd900408de
, reversing
changes made to 4da882d48f
.
2014-05-27 16:12:52 +02:00
Denis Ledoux
63b7f678f3
[FIX] website_sale: in the product grid, a product must have min size 1 and max size 4
2014-05-27 16:11:27 +02:00
Mohammed Shekha
26cb208903
[FIX]Refixed the issue of o2m record duplication
2014-05-27 19:35:09 +05:30
Richard Mathot
b2ff7ef41d
[BACKPORT][FIX] base_gengo: use supported/up-to-date library
...
Commit backported from master 8ad97da843
2014-05-27 15:53:25 +02:00
Thibault Delavallée
61d27543c5
[CLEAN] website_mail: cleaned a lost console.log and a commented line that should have been removed with pr 213
2014-05-27 15:35:17 +02:00
Christophe Matthieu
2efb074733
[IMP] website_sale: use company vat_check_vies field to select the method to check the vat id base_vat is installed
2014-05-27 14:35:07 +02:00
Thibault Delavallée
4fecb29c51
[FIX] website_sale, website_event_sale: updated tests according to the new dom of the checkout page introduced in pull request 232
2014-05-27 14:22:29 +02:00
Josse Colpaert
04e86a70d9
[IMP] Show quantity available
2014-05-27 13:39:38 +02:00
Thibault Delavallée
c93d169fde
[FIX] mail: fixed get_default_recipient, trying to call a method even if the target model do not have it; also fixed default recipients generation on the contact model; sending a mass mailing when not having recipient now raise a warning.
2014-05-27 13:33:10 +02:00
Thibault Delavallée
a26a0e6d30
[FIX] web: chardomain widget: fixed selection of some records in a list (bad domain formatting), fixed domain evaluation tah is done server-side instead of through a stringigy.
2014-05-27 13:31:12 +02:00
Christophe Matthieu
59be055c37
[IMP] website_sale: if base_vat is installed, when the use try to validate checkout, the vat is checked (VAT Information Exchange System)
2014-05-27 12:49:16 +02:00
Xavier Morel
e06f5b414b
[IMP] inherit_option_id -> application
2014-05-27 12:13:51 +02:00
Thibault Delavallée
b5a7156f7d
Merge pull request #224 from odoo-dev/master-payment-post-tde
...
[IMP] website_sale: correctly submit the payment form using a post request, correctly create the tx asynchronously
2014-05-27 12:09:01 +02:00
Christophe Matthieu
b5833591dc
[IMP] website_sale: add vat field on checkout
2014-05-27 12:05:41 +02:00
Xavier Morel
d67161b649
[IMP] renamed some stuff for clarity
2014-05-27 11:57:06 +02:00
Xavier Morel
80c7b6defc
[IMP] dict(int: True) -> set(int)
2014-05-27 11:57:06 +02:00
Xavier Morel
da4441246e
[IMP] use set to collect inherit_id and inherit_option_id
...
Also add a few comments to note understanding of code
2014-05-27 11:57:05 +02:00
Xavier Morel
b5cce44dd2
[IMP] use sets to check for groups/ACL
...
rco notes that group tests are generally intersections, if the user has *any*
group set on the object he can see/use it. This change is a literal
translation of the original semantics, which may be wrong.
2014-05-27 11:57:05 +02:00
Xavier Morel
4e3864c1fb
[IMP] no need to ensure an actual context if the method does not use it
...
just forwarding the context object does not count as using it, if callees want
a context they can ensure they've got one on their own
2014-05-27 11:57:04 +02:00
Xavier Morel
85c466611a
[IMP] don't pointlessly recreate view_obj every time _views_get is called, better use of pool & data APIs
2014-05-27 11:57:04 +02:00
Xavier Morel
ad33728043
[IMP] use sorted + key instead of sort + cmp
2014-05-27 11:57:03 +02:00
Xavier Morel
3d91b2dfa2
[REM] unused stack_result parameter
2014-05-27 11:57:03 +02:00
Fabien Meghazi
dd900408de
Merge pull request #225 from odoo-dev/master-frontend-assets
...
[IMP] Move website assets to frontend bundle
2014-05-27 11:49:28 +02:00
Thibault Delavallée
a6379e2e67
[IMP] payment addons: fixed submit buttons: now have type=submit (and not image or nothing) and removed name, because this may cause issues when trying to submit a form manually with type=submit and a name. Also improved js code in website_sale to correctly handle the click binding, the asynchronous call to the server to create the transaction, and then submit the form. As form submission is synchronous in javascript, we cannot use the deferred. Instead we prevent the click event from bubbling, wait for the server to create the transaction, adn then manually submit the form.
2014-05-27 11:35:32 +02:00
--global
ed51e843a2
[IMP] website_sale: change 'pay now' button behavior.
...
Now: intercept the call, make an asynchronous call to create the tx, then continue to the acquirer. Previous this was done by
a redirection, leading to a get request beign done. However it should be a post request.
2014-05-27 11:35:32 +02:00
Fabien Meghazi
51e10ffbac
Indentation
2014-05-27 11:16:57 +02:00
Fabien Meghazi
1744208928
Changed xpath expression from /t to .
2014-05-27 10:45:07 +02:00
Christophe Matthieu
6e6b5ea15b
[FIX] point_of_sale: public category became pos category
2014-05-27 10:36:08 +02:00
Martin Trigaux
14c300bdbd
Merge pull request #223 from odoo-dev/7.0-ail-form-context-parent-mat
...
account: safer access to parent in invoice line form
2014-05-27 10:32:53 +02:00
Denis Ledoux
c6c8fb06a9
[FIX] account_followup: account_followup_print report, sxw according to rml
2014-05-27 10:29:12 +02:00
Martin Trigaux
222e7915a6
[FIX] account: safer access to parent in invoice line form
...
In the account.invoice.line form, do not assume the parent is defined when
evaluating the context to invoice_line_tax_id as we could come from another
view (e.g.: purchase order line form).
Fixes #206
2014-05-27 10:16:44 +02:00
Richard Mathot
af72adcd64
[DIRTY FIX] website_sale: make the runbot green
2014-05-27 10:01:58 +02:00
Josse Colpaert
3cea0e32e5
[IMP] Make partial move_type by default when doing picking assign
2014-05-27 10:01:42 +02:00
Christophe Matthieu
43977deb71
[IMP] product: refactoring of product variant. The main view became the view of product template and the product product (or product variant) are created with the variant values combinaison. Bom is splitted into bom and bom line and can use the variant combinaison.
2014-05-27 09:42:52 +02:00
Thibault Delavallée
b26b3f9701
Merge pull request #213 from odoo-dev/saas-4-group-snippet-imp-tde
...
[IMP] website_mail: improved snippet to subscribe to a mail.group
2014-05-27 09:26:10 +02:00
Richard Mathot
88202680ea
[FIX] website_event_sale: bad xpath in template
2014-05-27 09:18:31 +02:00
Thibault Delavallée
ef2c068ec3
[IMP] website_mail: improved snippet to subscribe to a mail.group.
...
Main modifications :
- layout: input - button when not following, links (email - archives - unsubscribe) when following
- when adding your email, update all other subscribe snippets input in the page to avoid havign to re-type it
- management of fields of the record to subscribe to, used to have access to the alias of the group
2014-05-27 08:54:37 +02:00
Mitesh Savani
d89064c73c
[IMP]Improved code
2014-05-27 10:45:04 +05:30
Mohammed Shekha
477fa85e55
[FIX]Fixe the issue o2m record duplication.
2014-05-27 10:10:06 +05:30
etenesaca
2097af20b7
* Deleted: oe_m2o_dropdown_option_no_results_to_show AND REUSED oe_m2o_dropdown_option
...
* Deleted: manually translation in es.po
2014-05-26 11:51:24 -05:00
etenesaca
b6189b4d5a
Merge remote-tracking branch 'odoo/master'
2014-05-26 11:29:48 -05:00
Fabien Meghazi
a91a12e67f
Merge pull request #216 from odoo-dev/master-import-module-wizard-tpa
...
[IMP] Add 'Import Module' wizard to base_import_module
2014-05-26 17:30:29 +02:00
Fabien Meghazi
fc9d0d9ab0
[FIX] typo
2014-05-26 17:26:19 +02:00
Martin Trigaux
8b546d20ad
Merge pull request #203 from buke/7.0
...
[FIX] delivery: when computing the weight and volume, use the quantity converted to the product uom instead of the uom of the purchase order.
2014-05-26 17:07:14 +02:00
Denis Ledoux
a37bad205b
[FIX] web: on launching ir_actions_act_window, reset the active_* params if the target is current
...
This commit is related to 8d49639933
and b88755c431
When hitting buttons of type object, the active_model and active_id(s) were kept, and, therefore, when calling a feature using the active* args, this feature used the active* args from the previous action.
Nevertheless, concerning wizards, the active* args should be indeed the active* args of the previous action, as wizards expects to have the active* args from the previous action. Thus, we reset these active* args only when this is not a wizard (target === 'current')
For example, from a sales order, hit the 'view invoice' button, and on the invoice, hit the 'send by email' button: The active_id in the send by email wizard were the id of the sale order, not of the invoice
2014-05-26 17:05:02 +02:00
Richard Mathot
e137a7713b
[FIX] website_sale: test did not load js properly and failed
2014-05-26 16:58:14 +02:00
etenesaca
0aa4203d41
Merge remote-tracking branch 'odoo/master'
2014-05-26 09:55:11 -05:00
Fabien Meghazi
06b10a8ef2
Merge remote-tracking branch 'odoo/master' into master-import-module-wizard-tpa
2014-05-26 16:52:41 +02:00
Martin Trigaux
1779495f79
Merge pull request #188 from blaggacao/patch-2
...
Removed confusing doubled check box "child_depend" in the tax view
2014-05-26 16:28:57 +02:00
Fabien Meghazi
532b979f60
Merge pull request #210 from odoo-dev/saas-4-fix-partner-grade-access-fme
...
[FIX] access rights for public user on res.partner.grade
2014-05-26 16:12:15 +02:00
Fabien Meghazi
5cc1317a5f
[FIX] sitemap.xml urls
2014-05-26 14:58:30 +02:00
Fabien Meghazi
125ec49099
[FIX] duplicate xmlid
2014-05-26 14:25:37 +02:00
Martin Trigaux
dcb4b610e2
[FIX] website_forum: display the users as a table in block of 3 cols
2014-05-26 13:37:58 +02:00
JoshuaJan
e6973e2c64
'invoiced' fields help message is wrong
2014-05-26 17:55:26 +08:00
Denis Ledoux
1e84f72899
[FIX] website_forum: do not check if the user has the group comment
...
This access rights checks is meaningful for website_blog only
2014-05-26 11:49:26 +02:00
Fabien Meghazi
aa3009bb27
[FIX] access rights for public user on res.partner.grade
2014-05-26 11:24:58 +02:00
Denis Ledoux
fa5cfcd67e
[FIX] hr_recruitment: default company set according to department company
2014-05-26 11:20:40 +02:00
buke
1971141dc5
Fixed delivery grid get_price
...
It's wrong for cal weight in delivery gird . It's use product.weight * qty.
2014-05-26 17:12:38 +08:00
Richard Mathot
b4c47bcf85
[FIX] website: SEO js
2014-05-26 09:43:01 +02:00
Richard Mathot
e01725d15a
[FIX] website: SEO promote box
2014-05-26 08:53:54 +02:00
Richard Mathot
b0e263d00f
[REF] website: shorter tag for charset
2014-05-26 08:51:38 +02:00
Richard Mathot
2012ee998d
[FIX] website: remove illegal HTML attribute
2014-05-26 08:51:38 +02:00
Richard Mathot
8fb320e86f
[FIX] website: remove illegal HTML attribute
2014-05-26 08:51:38 +02:00
Richard Mathot
e28c810123
[FIX] website: convert non-standard HTML metatag to data attribute
2014-05-26 08:51:38 +02:00
Richard Mathot
df94bddac8
[FIX] website: not well-formed HTML
2014-05-26 08:51:38 +02:00
etenesaca
d97b044274
Merge remote-tracking branch 'odoo/master'
2014-05-23 16:05:49 -05:00
David Arnold
6e8e22f1be
Removed confusing doubled check box "child_depend"
...
This checkbox caused greate confusion, as it was doubled in the tax form view. Field is already present in line 937
Thanks for merging.
2014-05-23 14:01:16 -05:00
Denis Ledoux
be0ce80f5f
[FIX] account_analytic_analysis: set false to price_unit in product_id_change in form view, so the price unit is reset when the product id is changed
2014-05-23 17:58:00 +02:00
Denis Ledoux
c59427d23f
[FIX] purchase: po email template, the currency could be different than the pricelist currency
2014-05-23 17:13:42 +02:00
Denis Ledoux
7ccd8fdcc7
[FIX] mail: push to breadcrumb on subject, author or notified partners links click
...
opw-608251: When coming from website > My account, and clicking on a lead link from a message in the inbox, and then deleting the lead, the history_back is triggered and we come back in the website, while we should have come back in the inbox. This is because the action performed was not pushed in the breadcrumb
2014-05-23 15:54:43 +02:00
Simon Lejeune
2d7c890939
Merge remote-tracking branch 'odoo/saas-4' into saas-4-report-fixes-sle
2014-05-23 15:38:56 +02:00
Xavier Morel
327dda0bde
[FIX] correctly handle invalid max_width/max_height passed to website._image
2014-05-23 15:11:13 +02:00
Xavier Morel
4362c6127f
[IMP] use url_encode when building url query string
...
I have no idea why I originall implemented that crap via string munging.
2014-05-23 15:03:23 +02:00
Mitesh Savani
daba406886
[IMP]Move assetss to frontend template.
2014-05-23 18:31:01 +05:30
Thibault Delavallée
9fadd0b04c
[IMP] website_mail_group: display previous / next message when browsing + take into account thread or date mode.
2014-05-23 13:17:33 +02:00
Denis Ledoux
51c7b55da0
[FIX] request.handle_exception: cleanup override logic, fixed chain broken by commit a096ae0
...
handle_exception() is supposed to try handling an exception and if it cannot,
re-raise it. Overridden methods must therefore call super() within a try/except
block, and only attempt to handle the exception if super() raised.
2014-05-23 13:15:52 +02:00
Thibault Delavallée
41e3f88119
Merge remote-tracking branch 'odoo/saas-4' into saas-4-website-mail-group-tde
2014-05-23 12:40:39 +02:00
Thibault Delavallée
c40f184102
[IMP] website_mail_group: better variables name in js file
2014-05-23 12:40:08 +02:00
Thibault Delavallée
dc98882c90
[FIX] website_mail_group: added forgotten parameter for a view, added previously in this branch
2014-05-23 12:39:50 +02:00
Xavier Morel
9f6f9853a0
[REM] leftovers from removed/deactivated modules
...
* document_page should have disappeared a long time ago, no idea why it
remains
* thunderbird seems to have suffered from odd conflictual moves (or lack
thereof)
* audittrail was removed but not deactivated in rosetta
2014-05-23 12:18:17 +02:00
Xavier Morel
ed156e6724
[REM] undead modules reanimated by translation file exports
2014-05-23 12:02:03 +02:00
Richard Mathot
15ea4563af
[FIX] website_crm_partner_assign: better display of partners logos
2014-05-23 11:58:25 +02:00
Richard Mathot
1d70ecd80d
[IMP] website: add max_height and max_width options to image Qweb widget
2014-05-23 11:55:48 +02:00
Denis Ledoux
7a3b7f7fe2
[FIX] account_analytic_analysis: recurring invoice line description and yearly interval
...
the product_id_change name is reset if name is not passed to method args
the product_id_change call in account_analytic_view set name as false so it is reset each time the product is change
the yearly interval add a year to the next recurring date instead of one month
2014-05-23 11:16:46 +02:00
Thibault Delavallée
c69f0260ef
Merge pull request #170 from odoo-dev/master-fix-languages-thingy-tde
...
[FIX] website: fixed languages errors
- ir_http: added a missing ? when a route using the default language was re-rerouted to remove the language part of the path, leading to a wrong url
- website layout: fixed use of a languages variable not always defined depending on the working conditions
2014-05-23 11:06:47 +02:00
--global
62c0f6bf11
[FIX] website: ir_http: when rerouting url containing default language -> url without language, the ? was missing, leading to wrong urls.
2014-05-23 10:39:26 +02:00
--global
319f4cb270
[FIX] website: define languages variable outside of an 'if' as it is used below in the same template, leading to a crash due to the variable not always being defined.
2014-05-23 10:23:13 +02:00
Fabien Pinckaers
7a6435b0a3
[MERGE] no website description
2014-05-23 10:20:06 +02:00
Martin Trigaux
4c36ee0b59
Restore missed images during bzr to git transition
2014-05-23 10:11:25 +02:00
Fabien Pinckaers
1ddc8c7f93
[IMP] missing file
2014-05-23 09:55:24 +02:00
Fabien Pinckaers
f6575e2645
[FIX] Missing file
2014-05-23 09:43:34 +02:00
Fabien Pinckaers
143615ddc1
Merge branch 'master-remove-html-fields-backend-ypa' of https://github.com/odoo-dev/odoo into odoo-dev-master-remove-html-fields-backend-ypa
2014-05-23 09:24:16 +02:00
Sylvain LE GAL
5d8927e2b1
[FIX] Issues #167 . Remove obsolete shop reference
2014-05-22 22:55:50 +02:00
etenesaca
aa1deea9b5
Merge remote-tracking branch 'odoo/master'
2014-05-22 14:42:14 -05:00
Olivier Dony
2af03e1b6e
[MERGE] Forward-port latest 7.0 bugfixes, up to f8671cb
2014-05-22 16:44:33 +02:00
Thibault Delavallée
ada00bbe32
Merge pull request #164 from odoo-dev/master-website_sale--fix-tde
...
[FIX] website_sale: cleaned call to removed methods in website_sale
2014-05-22 16:22:32 +02:00
Martin Trigaux
c0fdc2cdbe
Improvement of the delivery module
...
Add field sequence on the delivery.gird.line to order rules
Add condition quantity to add more flexibility in the rules
Add operators > and < to be able to create rules without gap (instead of needing hack like 'x <= 100', 'x >= 100.000001')
2014-05-22 15:41:36 +02:00
--global
13ac3865d5
[CLEAN] Use none or false, but not both on two lines ...
2014-05-22 15:40:29 +02:00
--global
15e874b5c8
[FIX] website_sale: still cleaning lost references to deleted code in website_sale ...
...
Fixed checkout redirection that was meant to clean the session (incorrect sale order or transaction) that may happen
when having issues with the payment.
2014-05-22 15:34:09 +02:00
Martin Trigaux
0efc066aa6
Add sequence field with handle in tree view
2014-05-22 14:56:33 +02:00
Martin Trigaux
4e34e3bce5
Add < and > operators to allow rules without gap (eg: until 100 & above 100)
2014-05-22 14:55:26 +02:00
Josse Colpaert
41136215ae
[IMP] Change the barcodes to code128 and make a little bigger
2014-05-22 14:37:23 +02:00
Thibault Delavallée
8df42a88ab
Merge pull request #160 from odoo-dev/master-forum-subtypes-tde
...
MERGE [IMP] website_forum: make forum.forum inherit from mail.thread. This way we add the possibility to users to follow a forum and be automatically followers of new questions, using some new subtypes on the forum.forum model that do the auto subscription.
Misc :
also added a profile link on the forum, when logged.
also added a subscribe button on the forum.
2014-05-22 14:29:06 +02:00
Olivier Dony
02035b27b8
[RESTORE] Restore *.sxw files, skipped during bzr-to-git conversion to discard older binary blobs
2014-05-22 14:07:15 +02:00
--global
2649beba97
[IMP] website_forum: make forum;forum inherit from mail.thread. This way we
...
add the possibility to users to follow a forum and be automatically followers of new
questions, using some new subtypes on the forum.forum model that do the auto subscription.
Also added a profile link on the forum, when logged.
Also added a subscribe button on the forum.
2014-05-22 13:49:41 +02:00
tpa-odoo
15e0662200
[IMP] improved sequence of menu
2014-05-22 17:12:57 +05:30
tpa-odoo
8fa3a17c39
[IMP] improved code to show import result in wizard and improved typo
2014-05-22 17:09:52 +05:30
--global
47f24697ec
[FIX] website_mail_group: effectively handle replies_per_page parameter that controls the number of replies to display under each message.
2014-05-22 13:38:07 +02:00
Richard Mathot
0b0f74861e
[DOC] base_gengo: add changelog
2014-05-22 13:36:48 +02:00
--global
8a6b0d1d4d
[FIX] website_mail_group: number of thread and replies back to normal values after testing.
2014-05-22 13:29:49 +02:00
--global
a6eaa7bac3
[FIX] website_mail_group: email-based author was wrongly placed in the layout
2014-05-22 12:48:32 +02:00
--global
b0def9d479
[FIX] website_mail_group: order archives by date descending
2014-05-22 12:48:09 +02:00
Yogesh Parekh
59ecefbed2
Remove content field in Pages History form in website_blog module
2014-05-22 16:17:22 +05:30
--global
538d97a6b3
[FIX] website_mail_group: better layout for main mailing lists page: more space for subscribe button
2014-05-22 12:25:35 +02:00
tpa-odoo
41147025b8
[ADD] add wizard to import zipped module
2014-05-22 15:51:51 +05:30
Martin Trigaux
35a07975de
[FIX] website_sale: add the parameter _mail_post_access on product.template
...
This parameter gives the possibility to post messages en product.template to
people having a read access. The website_sale giving the possibility to post
comments, people not belonging to the 'Sale Manager' group were not able to
post messages.
2014-05-22 12:15:45 +02:00
--global
6ed56d8393
Merge remote-tracking branch 'odoo/saas-4' into saas-4-website-mail-group-tde
2014-05-22 12:14:17 +02:00
Richard Mathot
b283f8d5b1
[FIX] base_gengo: use supported/up-to-date library
2014-05-22 12:13:34 +02:00
Martin Trigaux
1ae8c980c3
Merge pull request #55 from yvaucher/7.0-fix-1319095
...
report_webkit: use safer and non-deprecated methods to handle temporary files
2014-05-22 12:05:05 +02:00
Yogesh Parekh
52f571ac8a
Remove content html field from website_blog module
2014-05-22 15:33:37 +05:30
Yogesh Parekh
c0f453a1ea
Remove description html field from website_event_track module
2014-05-22 15:28:39 +05:30
Yogesh Parekh
a79ffefd87
Remove description html field in website_forum module
2014-05-22 15:26:10 +05:30
Yogesh Parekh
3772a3a3af
Remove html fields in frontend from website_quote module
2014-05-22 15:23:09 +05:30
Josse Colpaert
6905b58f46
[IMP] Picking priorities to priority of move instead + propagation + show package operations after done
2014-05-22 11:02:58 +02:00
Richard Mathot
7184f8c3f0
Merge pull request #127 from odoo-dev/saas-4-speakers-rim
...
[MERGE][FIX] website_event_track: display speakers name to public users
2014-05-22 10:29:36 +02:00
Denis Ledoux
c0e9a15960
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. a096ae0080
2014-05-22 09:35:26 +02:00
Anaël Closson
f96a03247b
[FIX] stock: auto_validate move not set to done when multiple parent move set to done at the same time - opw 607970
2014-05-22 09:26:40 +02:00
Pariket Trivedi
6d65ff1f99
[FIX]:IE9 Kanban: The 'show more' button is not display correctly.
2014-05-22 11:56:28 +05:30
Pariket Trivedi
a77123fccc
[FIX]: Bad display in kanban view with a group by in Event.
2014-05-22 11:49:09 +05:30
Martin Trigaux
a096ae0080
[FIX] http: force rolleback for failed http request
...
1st issue:
When an exception was raised, it was badly handled by the website in case of
website_enabled key. The response page was generated without calling super.
The WebRequest object being responsible to rollback the transaction in case
of errors.
2sd issue:
The _failed attribute is required to rollback the transaction in an WebRequest
object. Previously it was only set in the JsonRequest object (which inherit
from WebRequest), replace by call to super. The attribute _failed is now set
in the WebRequest object.
2014-05-21 19:12:37 +02:00
Josse Colpaert
2c171f5f44
[WIP] Use new stat buttons from bzr
2014-05-21 17:49:17 +02:00
Josse Colpaert
ad58b17e6e
[IMP] Add security rules from bzr branch
2014-05-21 17:34:19 +02:00
Richard Mathot
37d6fe344b
[FIX] website_event_track: display speakers name to public users
2014-05-21 17:10:50 +02:00
Martin Trigaux
91d61212e1
Merge pull request #14 from savoirfairelinux/7.0-crossovered_unicode_1292245
...
[FIX] Fix account_budget name unicode error (7.0 lp:1292245)
2014-05-21 16:51:34 +02:00
Thibault Delavallée
59a7c85a6f
Merge remote-tracking branch 'odoo/saas-4' into saas-4-website-mail-group-tde
2014-05-21 16:35:48 +02:00
Thibault Delavallée
007725cd07
[FIX] website_mail_group: added forgotten files for css / js.
2014-05-21 16:35:15 +02:00
Thibault Delavallée
52eb9cba89
[IMP] website_mail_group: refactored layout of displayed mailing lists and their archive. Should be a bit more easy to use and understand. Todo: fix number of displayed thread / replies, and probably re-do the layout once somebody decides to change everything.
2014-05-21 16:32:31 +02:00
Thibault Delavallée
b7c6b1cbca
[FIX] website_mail: message description should effectively be limited to the first 30 characters.
2014-05-21 16:27:17 +02:00
etenesaca
0295e12d6c
Merge with Origin Master - odoo/odoo
2014-05-21 08:54:51 -05:00
Martin Trigaux
abe5c803a0
[IMP] account: support for partial reconciliation in aged partner balance
...
When computing the aged partner balance, the partial reconciliation was not
handled correctly. The reconciled amount should be removed from the original
remaining amount instead of displaying two entries in the journal.
eg: if invocie of 1000 in period 1 and payment of 300 in period 2, should only
display +700 in period 1 instead of two entries
2014-05-21 15:48:35 +02:00
Simon Lejeune
d7e8edc880
Merge remote-tracking branch 'odoo/saas-4' into saas-4-report-fixes-sle
2014-05-21 14:09:35 +02:00
Simon Lejeune
1f97c40c9c
[FIX] Report: get the wkhtmltopdf version in a cleaner way with a simple regex
2014-05-21 14:05:18 +02:00
Richard Mathot
2e760407e4
[FIX] survey: enable survey access to portal users instead of 404
2014-05-21 13:42:17 +02:00
Simon Lejeune
58d3a6f3f7
[FIX] Report: inform the user that he may not print a pdf report while his openerp is running with only one worker; adapt method to extract wkhtmltopdf version to also work on mac where the ouput of '--version' is different from gnu/linux binary
2014-05-21 13:06:31 +02:00
Denis Ledoux
ecce35bc6e
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 6958d47694
2014-05-21 13:05:41 +02:00
Pariket Trivedi
ff4fe2c05e
[FIX]: change correct label and fields in Event Analysis.
2014-05-21 16:34:34 +05:30
Simon Lejeune
654df600c1
[FIX] Report: less verbose error message
2014-05-21 13:02:59 +02:00
Simon Lejeune
226579a80d
[FIX] Report: removed psutil/signal/openerp worker crap
2014-05-21 13:01:42 +02:00
Simon Lejeune
1745c738ee
[FIX] Report: double the default height/width of barcode image to avoid a blurred/unusable barcode once integrated in a report
2014-05-21 12:59:05 +02:00
Denis Ledoux
6958d47694
[FIX] account_analytic_analysis: recurring invoices prepare and product_id_change
...
product_id_change set the description with the same behavior as sale orders
product_id_change set the price unit according to the pricelist
_prepare_invoice is split into two sub methods, _prepare_invoice_data and _prepare_invoice_line
_prepare_invoice actually prepare the invoice values instead of directly creating the invoice
2014-05-21 12:57:28 +02:00
Simon Lejeune
4019b2b334
[FIX] Report: do not raise when wkhtmltopdf returns a code 1. In most cases, it is due to some http requests which did not success *but* the pdf is still acceptable. Far from the best commit ever, but it avoids to completely crash when just a link to an image is wrong
2014-05-21 12:56:56 +02:00
Simon Lejeune
35c5e56718
[FIX] address div more to the left on external reports
2014-05-21 11:57:45 +02:00
Fabien Meghazi
593cdf427f
Merge remote-tracking branch 'odoo/master' into master-seperate-bundle-fme
2014-05-21 10:29:04 +02:00
Richard Mathot
f1a6ab5070
[FIX] website_hr_recruitment: Hide unpublished job offers to portal users and employees
2014-05-21 10:00:08 +02:00
etenesaca
bd8b2e9002
Optimized search fields from m2o
...
Added translation of the message
Now this style of message in a CSS class and not use HTML tags
2014-05-20 21:16:52 -05:00
etenesaca
1ce6322bfc
Merge branch 'master' of https://github.com/odoo/odoo
2014-05-20 16:08:22 -05:00
etenesaca
49657b28e6
Now when a search is conducted in the fields and not m2o results have a message saying "No results to show" since the show nothing will display the user is confused
2014-05-20 14:58:40 -05:00
Christophe Simonis
93238cd1cb
[FIX] website: respect max_{width,height} for /website/image route
2014-05-20 20:23:25 +02:00
Christophe Simonis
a756b82372
[MERGE] forward port of branch saas-4 up to revid bb26dea
2014-05-20 20:19:55 +02:00
Christophe Simonis
bb26dea60b
[MERGE] forward port of branch saas-3 up to revid 38abc8a
2014-05-20 19:00:50 +02:00
Christophe Simonis
38abc8a006
[MERGE] forward port of branch 7.0 up to revid b09b6a0
2014-05-20 18:57:04 +02:00
Christophe Simonis
040c93026a
[MERGE] merge bzr trunk addons branch
2014-05-20 18:10:36 +02:00
Christophe Simonis
a70eea3b11
[MERGE] merge bzr saas-4 web branch
2014-05-20 17:14:18 +02:00
Christophe Simonis
d93f628c72
[MERGE] merge bzr saas-4 addons branch
2014-05-20 17:12:01 +02:00
Fabien Meghazi
863edbaaf2
Seperate assets_common from other bundles
2014-05-20 17:06:25 +02:00