pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,045 Commits 1 Branch 0 Tags
fcf0f2882acdbc0c8110d1af2ec00203896b32ce
Commit Graph
92045 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Christophe Matthieu a72bdcca90 [FIX] website: add forgotten button type (btn-success) for link editor 2014-07-11 13:38:57 +02:00
Xavier Morel 6014d44b2b [IMP] add read access to all users for product.pricelist.type 
In new API, selection field value is checked (against the selection's possible
values) at both read and write. For pricelist.type this requires read access
to product.pricelist.type.
 2014-07-11 13:32:46 +02:00
Olivier Dony 924e4b1a08 [MERGE] Fwd-port saas-4 up to e31fd6a 2014-07-11 12:00:42 +02:00
Olivier Dony e31fd6a1e1 [MERGE] Fwd-port saas-3 up to a9d2b65 2014-07-11 11:53:07 +02:00
Simon Lejeune 239144d519 [FIX] view_form: use the reference of menu from the instance, not from the widget ancestors 
Fixes #1024: when using a formview on a non trivial way, the reference of the menu using the widget ancestors may be wrong
 2014-07-11 11:51:54 +02:00
Olivier Dony a9d2b65da5 [MERGE] Fwd-port 7.0 up to 783b9e1 2014-07-11 11:51:06 +02:00
Olivier Dony 783b9e1c89 [FIX] event_sale: reset event-related fields on SO line when switching products 2014-07-11 11:45:38 +02:00
Richard Mathot 117a26babe [FIX] hr: call hr_employee super's when unlinking 
Also fixes some weird inheritance bugs in upper versions
 2014-07-11 11:41:17 +02:00
Martin Trigaux 437116f3c4 [FIX] orm: custom m2m with different label 
At rev 84e9a67cdf a check to avoid the creation of ir.model.relation for custom modules was added. The condition is not correct as based on the string instead of the field name. We do not have access to column name at this level but the the m2m relation table do start with x_ for custom fields (see __init__ method).
 2014-07-11 11:39:32 +02:00
Christophe Matthieu aca1865654 [FIX] website.seo: regexp doesn't match the object and object id 2014-07-11 11:33:18 +02:00
Christophe Matthieu 1eee1d2c51 [IMP] website: replace the select box into dropdown for link editor to have a preview 2014-07-11 11:09:24 +02:00
Fabien Meghazi 814e384744 [ADD] Support for LessCSS in asset bundles 
Also added option in order to include asset bundles in
templates list available to the HTML editor
 2014-07-11 10:56:17 +02:00
Fabien Meghazi d431f31936 Merge remote-tracking branch 'odoo/master' into master-less-support-in-bundles-fme 2014-07-11 09:47:05 +02:00
Thibault Delavallée 67f1fd8a53 Merge pull request #724 from odoo-dev/7.0-mail_issues-fix-adh 
[FIX] mail: misc bug fixing
- avoid deleting the Whole Company mail group if still present, because it is required for some module installation. In 7.0 installing some modules may crash if this group is not present.
- fixed an issue when computing possible recipients in the Chatter
- small fix in html2plaintext about blank lines
 2014-07-10 22:50:53 +02:00
Christophe Simonis 8f190ccb2a [MERGE] forward port of branch 8.0 up to f654a77 2014-07-10 22:50:21 +02:00
Christophe Simonis f654a7719b [MERGE] forward port of branch saas-5 up to 73d39a0 2014-07-10 22:49:53 +02:00
Christophe Simonis 73d39a0c8c [MERGE] forward port of branch saas-4 up to a361947 2014-07-10 22:12:16 +02:00
Christophe Simonis a361947143 [MERGE] forward port of branch saas-3 up to a35aec2 2014-07-10 22:02:58 +02:00
Christophe Simonis a35aec2a0b [MERGE] forward port of branch 7.0 up to 6e96ffd 2014-07-10 22:02:01 +02:00
Richard Mathot 4d6b89105b [TYPO] in website_partner 2014-07-10 20:28:21 +02:00
Loïc Bellier 6e96ffd44c [FIX] stock: remove permission to create locations for partner managers 
There's a big risk of mistake with the fast-create
feature and they don't need it

(Rebase of PR #1073)
 2014-07-10 19:16:41 +02:00
Josse Colpaert 6191ed33a0 [IMP] default priority if no moves in picking 2014-07-10 19:03:33 +02:00
qdp-odoo 82bb9b0880 [FIX] purchase_requisition: converting the date into datetime using the timezone of the requisition's responsible 2014-07-10 19:03:07 +02:00
Xavier Morel 19c7380951 [FIX] small potential encoding issue in custom models 2014-07-10 17:34:48 +02:00
Christophe Matthieu 67e15d8d86 [FIX] web: update bootstrap to version 3.2.0; add bootstrap less files 2014-07-10 16:59:31 +02:00
Thibault Delavallée e4cb5619fe Merge pull request #1067 from odoo-dev/saas-5-forum-answer-order-fix-htr 
[FIX] website_forum: fix answers display order (correct, then votes, then write_date)
 2014-07-10 16:54:43 +02:00
Thibault Delavallée a23333eaa3 Merge pull request #1066 from odoo-dev/master-setting-paa 
[IMP] event: better settings to install some event-related modules
 2014-07-10 16:42:57 +02:00
Anand-Dharampuriya 5cbc611361 [FIX] Solve some mail issues which are currently present in 7.0 2014-07-10 16:29:54 +02:00
qdp-odoo 42bd6e5240 [FIX] purchase_requisition: use fields.date.date_to_datetime() to convert date into datetime... which simply makre sense 2014-07-10 16:24:04 +02:00
parthiv patel 7177f83da9 [ADD] l10n_sg: Chart of accounts and chart of taxes for Singapore 
(Rebase of PR #1057)
 2014-07-10 16:12:35 +02:00
Christophe Matthieu 886d6101ac [IMP] website editor: change link editor modal layout 2014-07-10 15:25:44 +02:00
Richard Mathot f6bf77c2b5 [FIX] mail: bad display of aliases on user forms 
(Partial backport of commit 1f86156991)

Closes #800.
 2014-07-10 15:22:03 +02:00
sle-odoo a3f9118c2a Merge pull request #1072 from anybox/fix_address_display 
[FIX] #1065 display_name does not display the address
 2014-07-10 14:37:33 +02:00
Christophe Matthieu 0effbe3ca6 [FIX] website: enumarate page raise an exception if query_string is not null; Can't create a page with the modal link editor 2014-07-10 14:30:15 +02:00
Richard Mathot a0a17fa46e [TYPO] in event, event_sale 2014-07-10 14:11:01 +02:00
Fabien Meghazi d137b0aec0 [ADD] Option to list asset bundles in templates editor 2014-07-10 14:01:03 +02:00
Christophe Matthieu c2c0fdc916 [IMP] website editor: remove button style from cke and insert into the link dialog box. Fix the dialog box label value when the user create a link. 2014-07-10 13:34:02 +02:00
Christophe Combelles 0050a3f797 [FIX] #1065 display_name does not display the address 2014-07-10 14:26:38 +03:00
FalcoBolger e6b6392f3a FIX email_template: Update help from lang field leading to confusion while creating a template 2014-07-10 11:28:33 +02:00
FalcoBolger 44bf56c77c [FIX] event_sale: do not crash when empty field product in ticket types lines 2014-07-10 11:26:19 +02:00
Christophe Matthieu caa534e503 Merge pull request #1039 from odoo-dev/8.0-fix-sitemap-chm 
[FIX] website: error for rendering of the sitemap template. qweb can't render the xmlns attribute.
 2014-07-10 11:05:01 +02:00
qdp-odoo 7b82d79932 Merge pull request #1000 from odoo-dev/8.0-po-as-datetime-qdp 
Changed fields.date_order on purchase.order from date to datetime
 2014-07-10 09:18:34 +02:00
Thibault Delavallée abbe4ef76c [FIX] website_forum: fixed issue with user vote badly taken into account when upvoting / downvoting + crash due to wrong field name. Backport of Leonardo Donelli PR for master. 2014-07-10 09:03:53 +02:00
Fabien Pinckaers b333457ca3 CSS Fix: /shop 2014-07-09 18:51:07 +02:00
Fabien Pinckaers ac7f1d9e0e CSS Fix for Products in /shop 2014-07-09 18:48:25 +02:00
Christophe Matthieu be93fd9540 Merge pull request #1001 from odoo-dev/master-fix-website_sale-double-price-chm 
[FIX] website_sale: discount price is never hide
 2014-07-09 18:00:24 +02:00
Jeremy Kersten 8eb97cc082 [IMP] website_sale: Add google analytics on checkout process 2014-07-09 17:45:40 +02:00
Raphael Collet c4d6389aed Merge pull request #1037 from odoo-dev/8.0-accesserror-on-logaccess-rco 
[FIX] models: store FailedValue in cache on log_access fields, too
 2014-07-09 16:42:56 +02:00
Martin Trigaux fa44bdb486 [FIX] mass_mailing: load images in emails 
The emails containing emails generated with the image widget have absolute path (src='/website/static/...'), adding <base> tag allows the mail client to load it correctly.
 2014-07-09 16:42:22 +02:00
Christophe Matthieu 928f4fbf76 merge from 8.0 2014-07-09 16:10:08 +02:00