pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,833 Commits 1 Branch 0 Tags
58263bcbbda0893ebbb4d8da53959bda94ef6607
Commit Graph
6751 Commits
Author SHA1 Message Date
Thibault Delavallée 43f9b18183 [FIX] web: form_view: fixed event variable name in chardomain widget (hidden in chrome but make the widget crash in firefox) 2014-06-11 08:56:42 +02:00
Christophe Simonis a7c2125735 [MERGE] forward port of branch saas-4 up to 6b8e972 2014-06-10 13:15:46 +02:00
Christophe Simonis 6b8e9727e5 [MERGE] forward port of branch saas-3 up to 4601d85 2014-06-10 12:29:47 +02:00
Christophe Simonis 4601d85944 [MERGE] forward port of branch 7.0 up to 6fdb783 2014-06-10 11:49:14 +02:00
Christophe Simonis ab9ac783db [FIX] web: many2many field handle "no_create" option 2014-06-05 13:46:53 +02:00
Christophe Simonis ee304fa65f [IMP] replace OpenERP by Odoo in backend + change company default logo. 2014-05-30 17:30:36 +02:00
Olivier Dony e276ac33f6 [MERGE] Forward-port saas-4 up to bf135ad 2014-05-28 17:45:31 +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
Olivier Dony 04211015fc [MERGE] Forward-port of latest saas-4 fixes, up to 0452851 2014-05-27 20:49:49 +02:00
Olivier Dony fd21abd847 [MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da 2014-05-27 17:18:43 +02:00
Olivier Dony 30f43daa3b [MERGE] Forward-port of latest 7.0 bugfixes, up to aeaa826 2014-05-27 16:50:02 +02:00
Mohammed Shekha 26cb208903 [FIX]Refixed the issue of o2m record duplication 2014-05-27 19:35:09 +05:30
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
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
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
etenesaca 0295e12d6c Merge with Origin Master - odoo/odoo 2014-05-21 08:54:51 -05:00
Fabien Meghazi 593cdf427f Merge remote-tracking branch 'odoo/master' into master-seperate-bundle-fme 2014-05-21 10:29:04 +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 a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +02:00
Fabien Meghazi 863edbaaf2 Seperate assets_common from other bundles 2014-05-20 17:06:25 +02:00
Cedric Snauwaert cef51e2a50 [FIX]modal: in some particular case, we have 2 actions opening modal one after another, fix problem in those case where second modal was close instead of first one 2014-05-19 14:01:47 +02:00
Xavier Morel 477d7ad803 Merge branch 'web-trunk' 2014-05-14 15:13:35 +02:00
Launchpad Translations on behalf of openerp e30348e1e0 Launchpad automatic translations update. 2014-05-14 05:55:34 +00:00
Christophe Simonis 08c504d39e [FIX] web: Dialog: avoid triggering "closing" twice. 2014-05-13 13:38:10 +02:00
Fabien Meghazi f3c8cc50c8 [IMP] Include openerpframework in common assets. Add module list in bundle 2014-05-12 17:18:12 +02:00
Martin Trigaux 27a6d2e9f4 Forward-port of latest saas-4, up to revision 3994 (rev-id jke@openerp.com-20140509131203-4gy3nhlj0v6fk7zv) 2014-05-12 10:10:32 +02:00
Launchpad Translations on behalf of openerp 1397b7aa34 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140510075539-empsrh7k5l6q44ln
bzr revid: launchpad_translations_on_behalf_of_openerp-20140510075505-nu0zmfg57i2352lz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140511070820-8xp1e2jxonp4i750
bzr revid: launchpad_translations_on_behalf_of_openerp-20140503064840-v6n2wyrm1l162bh4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140504062728-9tmsk2r01vvs3avi
bzr revid: launchpad_translations_on_behalf_of_openerp-20140506072722-8xpshoxb4um6ef30
bzr revid: launchpad_translations_on_behalf_of_openerp-20140511070841-lboiasc73m8h3fb2
 2014-05-11 07:08:41 +00:00
Fabien Meghazi dba3e92195 [IMP] Add $.fn.button to jquery.ui noconflict template 
bzr revid: fme@openerp.com-20140509133528-9i2kvn0heyxn6ngw
 2014-05-09 15:35:28 +02:00
Cedric Snauwaert dee000be14 [FIX]modal: when closing a modal, focus previous one to allow several escape hit key 
bzr revid: csn@openerp.com-20140509094836-yhncaqp60od67w7k
 2014-05-09 11:48:36 +02:00
Mahendra Barad b4aa0eb76f [MERGE] [ADD] kanban_state_selection widget, allowing to manage kanban_state-like selection fields using bullet + dropdown; priority widget allowing to manage priorities using stars. 
bzr revid: tde@openerp.com-20140508160156-b2jekyiajkjp7bse
 2014-05-08 18:01:56 +02:00
Thibault Delavallée 7d5de8d90d [IMP] dropdownselection widget renamed kanban state selection 
bzr revid: tde@openerp.com-20140508153418-hs6ix3qouy1fu482
 2014-05-08 17:34:18 +02:00
Thibault Delavallée 15e28717b4 [FIX] priority widget: css fixes 
bzr revid: tde@openerp.com-20140508152516-1rv69jatyswj8e4r
 2014-05-08 17:25:16 +02:00
Thibault Delavallée 750cc768c1 [CLEAN] web: cleaned priority widget implementation: cleaned xml / js code 
bzr revid: tde@openerp.com-20140508140545-kkogxe1dhbh7ryrk
 2014-05-08 16:05:45 +02:00
Richard Mathot (OpenERP) 0ab06fa991 [IMP] Tooltip placement 
bzr revid: rim@openerp.com-20140508133931-3ffe66hwgnffvdqu
 2014-05-08 15:39:31 +02:00
Vidhin Mehta (OpenERP) 9967c9e19c [MERGE]Trunk. 
bzr revid: vme@tinyerp.com-20140508125444-7d1m7qk7bi2hrbmv
 2014-05-08 18:24:44 +05:30
Thibault Delavallée dae5ee484a [CLEAN] web: cleaned dropdown selection widget implementation: cleaned css and js code. 
bzr revid: tde@openerp.com-20140508123347-ye6pvk1uo5jargec
 2014-05-08 14:33:47 +02:00
Thibault Delavallée 0b28fb706f [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140508120955-m29bs4no8uogrm0n
 2014-05-08 14:09:55 +02:00
Barad Mahendra 0b9126d0fe [IMP]remove unwanted css 
bzr revid: mba@tinyerp.com-20140508083740-g0u9cfef10d94oxh
 2014-05-08 14:07:40 +05:30
Barad Mahendra d9f8f11541 [IMP]improve the widget for dropdown selection and priority 
bzr revid: mba@tinyerp.com-20140508055735-ekt5gh7w119w2i2j
 2014-05-08 11:27:35 +05:30
Fabien Meghazi 4373f85773 [FIX] Do not self close empty elements that are not html void elements 
bzr revid: fme@openerp.com-20140507121413-o7jqhexbm1wmitt6
 2014-05-07 14:14:13 +02:00
Barad Mahendra d3410a6924 [Merge]with trunk 
bzr revid: mba@tinyerp.com-20140507104547-p7pmav8pez08zf1h
 2014-05-07 16:15:47 +05:30
Fabien Meghazi 7db3619c37 [REM] html_template and render_bootstrap_template() 
bzr revid: fme@openerp.com-20140506163422-vruavrvkcowu09zi
 2014-05-06 18:34:22 +02:00
Mohammed Shekha 0e62b9d8df [IMP] Jinja template for database manager 
bzr revid: fme@openerp.com-20140506155051-3u3kkb9lpvm06iad
 2014-05-06 17:50:51 +02:00
Fabien Meghazi b393c4ac18 [FIX] jQuery.ui - boostrap conflicts 
bzr revid: fme@openerp.com-20140506153300-0p1gwnrxihpb4y3r
 2014-05-06 17:33:00 +02:00
Fabien Meghazi f6e33eca13 [IMP] do_warn on ClientAction not found 
bzr revid: fme@openerp.com-20140506122840-01b9xtewp4wcv42g
 2014-05-06 14:28:40 +02:00
Fabien Meghazi c033b660e8 [ADD] openerp.loadBundle() 
bzr revid: fme@openerp.com-20140506103649-wrfa25boj2chy6gl
 2014-05-06 12:36:49 +02:00
Launchpad Translations on behalf of openerp 2b67c9c77b Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140506061338-jwpj0jxfcnakph24
bzr revid: launchpad_translations_on_behalf_of_openerp-20140506061359-p8lxp23aopeb6mwh
bzr revid: launchpad_translations_on_behalf_of_openerp-20140506063612-leryt792evbx9hsy
 2014-05-06 06:36:12 +00:00