pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,746 Commits 1 Branch 0 Tags
f61339b82cd6993f00a91149fb5dca7a2bfb8ab1
Commit Graph
89746 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Meghazi faa60474ce Allow initialize_sys_path() to be called more than once 2014-05-30 18:25:05 +02:00
qdp-odoo 52b799d8d0 [MERGE] master-wmsstaging-jco with fixes on WMS + new barcode reports 2014-05-30 18:09:05 +02:00
Fabien Meghazi 4ca17a2afa Removed odoo.py 2014-05-30 17:37:01 +02:00
Christophe Simonis ee304fa65f [IMP] replace OpenERP by Odoo in backend + change company default logo. 2014-05-30 17:30:36 +02:00
Fabien Meghazi 83c402a93e Added odoo start command 2014-05-30 17:06:16 +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
Rucha Dave d1857e0f28 [IMP] claim form 2014-05-30 17:27:37 +05:30
Rucha Dave 93f66e98e2 [IMP] update value 2014-05-30 16:02:35 +05:30
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
Fabien Meghazi 10fb6525e9 Basic support for xml data files 2014-05-30 11:35:28 +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
Fabien Meghazi 7f984dd6ef Added ir.model.access in manifest 2014-05-30 10:45:57 +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
Fabien Meghazi 36485190ac Update manifest for dependencies 2014-05-29 20:02:30 +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
Fabien Meghazi 0e01164842 Moved get_module_root in openerp.modules.module 2014-05-29 18:23:48 +02:00
Fabien Meghazi 5f717cfdd2 Added basic scaffolding for webclient module 2014-05-29 18:01:43 +02:00
Fabien Meghazi 14f7d31a5f Refactor scaffolding engine so it can be used from outside 2014-05-29 16:25:30 +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
Fabien Meghazi fcc854a4e1 Merge remote-tracking branch 'odoo/master' into master-odoo-cmd-fme 2014-05-29 10:28:38 +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