pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,770 Commits 1 Branch 0 Tags
3b636a5df0b34779cb3f9cdc2f2dcf11ef93163f
Commit Graph
89770 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Josse Colpaert 3b636a5df0 [WIP] Simplify procurement check and sales order workflow and that way phantom boms will work 2014-07-15 18:38:06 +02:00
Josse Colpaert 739a1d0051 [IMP] Add buttons product and product templates for analytic rules 2014-07-13 09:56:43 +02:00
Josse Colpaert 32dd003d60 [MERGE] Resolve conflicts 8.0 2014-07-13 09:27:20 +02:00
Josse Colpaert 5f5e18f9bb Merge branch '8.0' of https://github.com/odoo/odoo into odoo/8.0 2014-07-13 08:26:48 +02:00
Martin Trigaux 0a6d63b82c [FIX] product: unfuck templates and products in views 
product.product reuses most of the product.template views however some parts need to be excluded or replaced.
Instead of adding template only parts in base view and removing it for product, split the views in 'common' (product_template_form_view), 'template only' (product_template_only_form_view) and 'product only' (product_normal_form_view) where the first is inherited by the other two. The attribute mode='primary' on both second views allows to make sure that future inheritance of product_template_form_view and product_template_only_form_view will work with the full rendered product_template_form_view view.
This allows us to have valid buttons in crm for bill of material (filters based on active_id).
Also cleaning the mess with circular dependencies.
 2014-07-11 17:03:04 +02:00
Xavier Morel 7d732b1011 [FIX] broken translation cache for absent translation of 'false' 2014-07-11 15:46:12 +02:00
Christophe Matthieu cab80a0252 Merge pull request #1074 from odoo-dev/8.0-website-link-chm 
[FIX] web: update bootstrap to version 3.2.0.
[FIX] website.seo can't edit title and description; website.editor change link for internal page
[IMP] website editor: remove button style from cke and insert into the link dialog box.
 2014-07-11 13:41:21 +02:00
Christophe Matthieu a72bdcca90 [FIX] website: add forgotten button type (btn-success) for link editor 2014-07-11 13:38:57 +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
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
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
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
Christophe Matthieu e851c36a0f [FIX] website: error for rendering of the sitemap template. qweb can't render the xmlns attribute. 2014-07-09 16:03:54 +02:00
Christophe Matthieu f5de19a700 Merge pull request #1036 from odoo-dev/8.0-fix-log-error-tour-chm 
[FIX] tour.js: display a wrong error message when an error is detected with phantomjs test tour
 2014-07-09 15:57:15 +02:00
Raphael Collet 836245564a [IMP] models: iterating over record._cache also returns log_access fields 2014-07-09 15:34:51 +02:00
Raphael Collet 643be98fcf [FIX] models: store FailedValue in cache on log_access fields, too 
This should fix an issue discovered by tde when reading all fields on a record
on which you don't have access right:
 - _read_from_database() fetches result and store it in cache
 - read() retrieves values from cache, starting with field 'create_date'...
 - ... which is not in cache, so prefetch that field, read it, which goes into
   an infinite loop

The problem is that _read_from_database() finds out that you don't have access
on the record, and stores a FailedValue in cache on all fields... except magic
fields. Fix the problem by storing the FailedValue on all fields but 'id'.
 2014-07-09 15:23:15 +02:00
Cédric Snauwaert ad262cad04 Merge pull request #1034 from odoo-dev/8.0-hr-recruitement-onchange-fix-csn 
[FIX]hr_recruitment: fix onchange_job user_id referenced before assignme...
 2014-07-09 15:12:33 +02:00
Christophe Matthieu 90335242cf [FIX] tour.js: display a wrong error message when an error is detected with phantomjs test tour 2014-07-09 14:58:19 +02:00
Christophe Matthieu df2282a548 Merge pull request #999 from odoo-dev/8.0-test-ui-fixes-chm 
[FIX] errors when the user click on a menu item; add menu items for product attributes
 2014-07-09 13:52:14 +02:00
Cedric Snauwaert 9ea75c7dd8 [FIX]hr_recruitment: fix onchange_job user_id referenced before assignment 2014-07-09 13:40:21 +02:00