pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,391 Commits 1 Branch 0 Tags
92b8aafe97d94deacb06b37503a05d80b25dbba8
Commit Graph
81391 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibault Delavallée 9cf78e93cc [MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files. 
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
 2014-01-16 11:39:10 +01:00
Fabien Meghazi 6252ac4d11 [REV] Revert cache invalidation for translation, will move it in ir.ui.view 
bzr revid: fme@openerp.com-20140116102746-m520it5q5ag73yd1
 2014-01-16 11:27:46 +01:00
Frédéric van der Essen fa22b31967 [FIX] hw_escpos: syntax error 
bzr revid: fva@openerp.com-20140116101755-7rxbn895yyq7sdub
 2014-01-16 11:17:55 +01:00
Fabien Meghazi 6f2f02625a [IMP] Changed login template for inheritance 
bzr revid: fme@openerp.com-20140116101554-vvqu8aeim246lj1i
 2014-01-16 11:15:54 +01:00
Frédéric van der Essen 873a26e59f [MERGE] from trunk 
bzr revid: fva@openerp.com-20140116100255-m35evr41zorwnl6y
 2014-01-16 11:02:55 +01:00
Gery Debongnie 588e541387 [FIX] fixes some issues with the col_group_bys in searchbar (main problem was that do_search is called twice when the user swap axis) (addon web_graph) 
bzr revid: ged@openerp.com-20140116095549-3f2hbyzj32nuj147
 2014-01-16 10:55:49 +01:00
Martin Trigaux c02f16e443 [FIX] base_calendar: when searching on events, avoid getting an error if virtual_id=False and count=True 
bzr revid: mat@openerp.com-20140116094758-y32i7bw4zpakk92z
 2014-01-16 10:47:58 +01:00
Xavier Morel e2fede3fe7 [ADD] dialog for fontawesome glyph manipulation 
bzr revid: xmo@openerp.com-20140116094747-w1uey27l39fy66zc
 2014-01-16 10:47:47 +01:00
Fabien Meghazi 726ef6e967 [FIX] Fixed website translation 
Invalidated read_template cache

bzr revid: fme@openerp.com-20140116094347-hmg0mv3sjwwmmkvp
 2014-01-16 10:43:47 +01:00
Darshan Kalola (OpenERP) 27da32873e [IMP]put domainin ecommerce_get_product_domain method of website to restrict the product_template which has not variants(ecommerce view). 
bzr revid: dka@tinyerp.com-20140116093347-tz9mn24r01xbfdp0
 2014-01-16 15:03:47 +05:30
Thibault Delavallée ab5c23079a [MERGE] Sync with trunk, solved conflicts. 
bzr revid: tde@openerp.com-20140116091716-zk1n5ots94i65io5
 2014-01-16 10:17:16 +01:00
Darshan Kalola (OpenERP) 79778888e7 [IMP]improved test case in compute_price_margin. 
bzr revid: dka@tinyerp.com-20140116084128-4g5cqtuf6bqf9mh8
 2014-01-16 14:11:28 +05:30
Fabien Pinckaers 8bfed06459 [IMP] Small bootstrap fix for nested containers 
bzr revid: fp@tinyerp.com-20140116083653-z3hk2w8ol6xrvgln
 2014-01-16 09:36:53 +01:00
Darshan Kalola (OpenERP) acde6d86c1 [IMP]rename has_variants field to standard_variants in product form and improved fields_view_get method. 
bzr revid: dka@tinyerp.com-20140116074535-m40q8q7dy3kzfguf
 2014-01-16 13:15:35 +05:30
Darshan Kalola (OpenERP) a8fe8ac44f [IMP]added onchange method on product_tmpl_id and added standard_variants function field to check the number of variants, improved view of product and removed unneccessary code. 
bzr revid: dka@tinyerp.com-20140116072118-0xccl7mkdqbpdggb
 2014-01-16 12:51:18 +05:30
ajay javiya (OpenERP) 1bcdc4dc2f [IMP]: better table of content 
[IMP] : The user should not be able to delete a sale order line ,unless it's an option that has been added previously
[IMP]: open the sent email link, it open the cms homepage, not the quote

bzr revid: aja@tinyerp.com-20140116064329-1da392uplmsm01me
 2014-01-16 12:13:29 +05:30
Launchpad Translations on behalf of openerp f39b8bb436 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140116060347-s1e2v9o33n1cxk2y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140116060418-cw791djr2ebt2wuy
bzr revid: launchpad_translations_on_behalf_of_openerp-20140116060651-x8r0l0m27wcx0yav
 2014-01-16 06:06:51 +00:00
Launchpad Translations on behalf of openerp 7b2948c3bc Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140116051725-2fysq8wj8ez01l9u
 2014-01-16 05:17:25 +00:00
Christophe Simonis 0e870fc7a7 [MERGE] forward port of branch saas-2 up to revid 3897 dle@openerp.com-20140115121441-bskbyxxbc09ubavh 
bzr revid: chs@openerp.com-20140115221349-3lw7b0kpo3f2d04l
 2014-01-15 23:13:49 +01:00
Christophe Simonis 91aaaec0a5 [MERGE] forward port of branch saas-2 up to revid 9092 dle@openerp.com-20140115165506-yuux9km39gbv7k4n 
bzr revid: chs@openerp.com-20140115214454-dhl8xzr429co0j5d
 2014-01-15 22:44:54 +01:00
Christophe Simonis 0771ca2692 [MERGE] forward port of branch saas-2 up to revid 5002 dle@openerp.com-20140114173613-ruxye1m7fxtcjfim 
bzr revid: chs@openerp.com-20140115205357-arptzm69logz3osm
 2014-01-15 21:53:57 +01:00
Fabien Pinckaers 78b4f8fe8f [IMP] Better feature list snippets 
bzr revid: fp@tinyerp.com-20140115183611-5see7x5616jdmw3o
 2014-01-15 19:36:11 +01:00
Fabien Meghazi 130fff6241 [REM] Removed QWeb's useless t-escf and t-rawf 
bzr revid: fme@openerp.com-20140115183346-qhifdt2ta9am7tj7
 2014-01-15 19:33:46 +01:00
Fabien Meghazi 84a840a38c [REM] Removed useless QWeb t-escf and t-rawf 
bzr revid: fme@openerp.com-20140115182018-d7q3e6elm6uqh0ox
 2014-01-15 19:20:18 +01:00
Frédéric van der Essen 2131aaa48f [MERGE] from trunk 
bzr revid: fva@openerp.com-20140115171732-2uh1mgmseaag34qy
 2014-01-15 18:17:32 +01:00
Fabien Meghazi 2c7dd54fec [IMP] make /web/login route return a lazy response 
bzr revid: fme@openerp.com-20140115170142-szl5y22p0rciz21t
 2014-01-15 18:01:42 +01:00
Denis Ledoux 3a6b6dd6df [FIX] hr_timesheet_sheet: save correctly if focus is in a timesheet input 
on_change_unit_amount was called manually in the timesheet widget. Normally, save waits for all on_change to be applied, but in this case, as the on_change its called manually in the js, it was not the case.
The fix is to put all deferreds for which we must wait for in an array, and to wait all deferreds to be done before saving.

bzr revid: dle@openerp.com-20140115165114-nqa2ynszgocrnt52
 2014-01-15 17:51:14 +01:00
jke-openerp 46545b6005 [MERGE] Merge with trunk-ren-crmmeeting 
This commit replace all occurences of "crm.meeting" into "calendar.event" and "crm_meeting" into "calendar_event".
It remove 2 fields unused from calendar.event model and from the tests.
Add oe_update_date in exclude field, to allow the update of recurrence if field(s) updated are only in this exclu list

bzr revid: jke@openerp.com-20140115163922-gx6sc552y2phs6tz
 2014-01-15 17:39:22 +01:00
jke-openerp 493301be30 [REF] Add field oe_update_date in exclude list in the write of calendar. That allow to update the name of title in all recurrence. 
bzr revid: jke@openerp.com-20140115163358-uitr7iz38j5lojm3
 2014-01-15 17:33:58 +01:00
Christophe Simonis 29cd983258 [FIX] http: correct jsonp 2pass 
bzr revid: chs@openerp.com-20140115162242-cyqb02wxmlhxqtu6
 2014-01-15 17:22:42 +01:00
Christophe Simonis eae55df214 [FIX] point_of_sale: let the session generate a session_id itself 
bzr revid: chs@openerp.com-20140115161651-aht37d2ruf1jyzw6
 2014-01-15 17:16:51 +01:00
Fabien Meghazi 96c79572f8 [FIX] test ui should use /login route for auto login 
bzr revid: fme@openerp.com-20140115161318-v8ksw0u0u1mpgn0x
 2014-01-15 17:13:18 +01:00
Christophe Matthieu 52e4cb3f99 [IMP] website_job: no job offer found message, better template, and fix type 
bzr revid: chm@openerp.com-20140115160219-mqh0sx869zfwk1g7
 2014-01-15 17:02:19 +01:00
Fabien Meghazi 3755e320a0 [MERGE] upstream 
bzr revid: fme@openerp.com-20140115160017-tg0zqbogexo0ybhz
 2014-01-15 17:00:17 +01:00
Christophe Matthieu 57273279db [IMP] website_blog: no blog post found message 
bzr revid: chm@openerp.com-20140115155211-61zcen9fjnatzyfr
 2014-01-15 16:52:11 +01:00
Gery Debongnie 74d6e75007 [IMP] supports col groupby in search view in graph view (addon web_graph) 
bzr revid: ged@openerp.com-20140115155137-qwy0sr49zhizgmf6
 2014-01-15 16:51:37 +01:00
Christophe Matthieu 025a94ad2f [IMP] website_event: no event found message 
bzr revid: chm@openerp.com-20140115154941-cz9ijtlaf961p72g
 2014-01-15 16:49:41 +01:00
Frédéric van der Essen edce92293d [FIX] point_of_sale: increased network posbox discovery timeout 
bzr revid: fva@openerp.com-20140115154542-vpl29qoj80ftskuf
 2014-01-15 16:45:42 +01:00
Christophe Matthieu 6117f829b1 [IMP] product: Service (product.product_product_consultant) eval='False' and True inside demo data 
bzr revid: chm@openerp.com-20140115153713-vd0tn5ttn7dhb3k6
 2014-01-15 16:37:13 +01:00
Fabien Meghazi 876760bec4 [IMP] Ignore phantomjs Warnings for ui tests 
bzr revid: fme@openerp.com-20140115153235-hicqe8foynkc14yj
 2014-01-15 16:32:35 +01:00
Christophe Matthieu cd12832f9e [IMP] product: Service (product.product_product_consultant) is sale_ok=False by default and overwrite in hr_timesheet to True 
bzr revid: chm@openerp.com-20140115152526-dptyljv7yxdkmis0
 2014-01-15 16:25:26 +01:00
Thibault Delavallée 54ee20cbd0 [IMP] website_mail: tmeplate editor: improved tmeplate of the pag 
- removed an unnecessary oe_structure in head of the page
- added a position: relative on the body_html field because otherwise
there are ugly violet bars

bzr revid: tde@openerp.com-20140115151706-pwy0jjgce955ttth
 2014-01-15 16:17:06 +01:00
Thibault Delavallée 6072e586f4 [FIX] website_mail: email_template: fixed lxml/etree adding a div 
outside of the html content, breaking the snippets-based editor.

bzr revid: tde@openerp.com-20140115151644-0cei3chdl5op2flr
 2014-01-15 16:16:44 +01:00
Martin Trigaux 1066a1ca2c [MERGE] [FIX] css: Fix the missing border-bottom of the notebook in dialogs 
bzr revid: mat@openerp.com-20140115145049-bj80tsytb8fcrsiw
 2014-01-15 15:50:49 +01:00
Darshan Kalola (OpenERP) 90248025a4 [MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al. 
bzr revid: dka@tinyerp.com-20140115144940-srkv28a758ov0xx8
 2014-01-15 20:19:40 +05:30
Martin Trigaux 83babf4f21 [IMP] sale,purchase order: order the field based on date_order instead of name (opw 602879) 
This avoids getting irrelevent order based on sequences without padding (eg: SO10 between SO1 and SO2)

bzr revid: mat@openerp.com-20140115144030-04xlhaf3b4sviq92
 2014-01-15 15:40:30 +01:00
Christophe Matthieu 3487d36fc2 [FIX] website_sale: fix boostrap row 
bzr revid: chm@openerp.com-20140115143139-dieh48j9t1tbh4w3
 2014-01-15 15:31:39 +01:00
Thibault Delavallée c63ffed24d [IMP] tools: mail: the cleaner, by parsing and serializing the html content, 
encapsulatse the whole content inside a div. This means that html fields are
not editor-clean after being sanitized, because a div has been inserted as root
element. Removing this element allows to have snippets that can be dragged,
dropped, or to insert new snippets inside edited html content in html fields.

[IMP] tools: tests: mail: updated a test accordingly

bzr revid: tde@openerp.com-20140115142709-e4951b4nc06sfxf0
 2014-01-15 15:27:09 +01:00
Christophe Matthieu 5593d53e94 [IMP] website_crm: auto install (and add the contact form in the contact us page) when install crm and website 
bzr revid: chm@openerp.com-20140115142630-p3vfz2p3upilbthk
 2014-01-15 15:26:30 +01:00
Cecile Tonglet f00e6711f5 [FIX] Fix the missing border-bottom of the notebook in dialogs 
bzr revid: cto@openerp.com-20140115142608-rjemiq5lq8ju8zc0
 2014-01-15 15:26:08 +01:00