Commit Graph
88652 Commits
Author SHA1 Message Date
Géry Debongnie 52a8c4cf9a [MERGE] merge from master 2014-05-30 20:21:03 +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
Géry Debongnie 907546eaf4 Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged 2014-05-30 15:14:12 +02:00
Géry Debongnie c522fe6add [FIX] compute the correct offset to adjust view
the jquery method length() compute the height of its element, even if
it is diplay:none.  But in our case, we want the offset to be zero if
there is no visible view_manager_header.  (for example, general settings
in settings menu)
2014-05-30 15:10:18 +02:00
Géry Debongnie 3bfdcfd443 [FIX] fix the add to dashboard widget (web client)
The dashboard widget didn't work because it tried to look for its
parent view, but the searchview has been split in searchview and drawer.
This patch makes sure it looks for the data in the correct place.
2014-05-30 14:34:36 +02:00
Géry Debongnie 803b8b0b14 [FIX] change css to prevent unreachable fields
in drawer, advanced search, it can happen that the form extends out
of the drawer.  Overflow:auto at least allows the user to interact
properly with the form.
2014-05-30 12:15:48 +02:00
Géry Debongnie 18581ad851 [FIX] crop the text in drawer when it is too long 2014-05-30 12:12:49 +02:00
Géry Debongnie 6cbf8c5a28 [FIX] use _.isEmpty instead of Object.keys
Object.keys is not supported by all browsers (*cough* IE *cough*).
Also, bonus, isEmpty is more readable and more 'semantic'
2014-05-30 11:33:56 +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
Géry Debongnie 080b473d1d [FIX] fix wrong conflict resolution in merge
The merge #5142037 from odoo/master in local branch was wrong.
I basically overwrote the changes from master.  This commit resolves
the issue correctly.
2014-05-30 11:03:06 +02:00
Josse Colpaert 45dc3db6cc Merge branch 'master-wmssecurity3-jco' into master-wmsstaging-jco 2014-05-30 10:37:26 +02:00
Géry Debongnie 514203743d Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
Conflicts:
	addons/mrp/mrp_view.xml
2014-05-30 10:29:30 +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
Géry Debongnie 1a7101d94e [IMP] scroll back to top when opening searchview 2014-05-30 09:58:07 +02:00
Antony Lesuisse 1f7a2eaf30 [FIX] odoo.py git_locate 2014-05-30 09:55:30 +02:00
Géry Debongnie 271b925a12 [FIX] correct default value in add to dashboard
the searchview has been split in two: searchview and searchviewdrawer.
The widget addtodashboard need to get the name from the searchview and
not from the drawer.
2014-05-30 09:46:40 +02:00
Géry Debongnie 6b4a227cd4 Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged 2014-05-30 09:22:12 +02:00
Géry Debongnie 6f436a2a0e [FIX] correctly compute mouse click coords
in graph view, when the user click on the pivot table.  It was
calculated with pageX, pageY and positioned with 'absolute'. However,
the main view is now also positionod, so the dropdown menu was not
where it should be.
2014-05-30 09:21:30 +02:00
Antony Lesuisse 2f4984b838 [IMP] packaging v8 part1, tgz deb and rpm 2014-05-30 01:54:20 +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
Antony Lesuisse 6e9edeeb46 [FIX] odoo.py setup deps and readme.md 2014-05-29 22:29:38 +02:00
Antony Lesuisse d4624fa826 [IMP] repository cleanup
- move packaging stuff to setup
- remove historical stuff
- remove oe, odoo-cmd-fme will be merged with the convered commands
- add an odoo.py script to run odo and boostrap it
- simplify README
- prepare to move documentation to the github wiki
2014-05-29 18:33:04 +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 7dd10060df Merge pull request #263 from odoo-dev/master-fix-asset-fme
[FIX] website_mail.editor.js moved but still referenced

Commit 0c89ca0 moves
website_mail.editor.js but is still referenced in website_mail.xml
2014-05-29 00:27:54 +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
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
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
Géry Debongnie f4bcf5fa28 [FIX] adjust viewtop when breadcrumbs are involved
due to the way breadcrumbs work, the method adjust_view_top was
not called at the correct time.  This had the unfortunate consequence
that the main view was on top of the header.
2014-05-28 16:44:54 +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
Géry Debongnie 24f0e80e2e Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged 2014-05-28 13:18:07 +02:00