Commit Graph

87689 Commits

Author SHA1 Message Date
Josse Colpaert c60c1d1a72 [DEL] Delete boards
bzr revid: jco@openerp.com-20140502134701-lnoowskaqj9nsaof
2014-05-02 15:47:01 +02:00
Denis Ledoux deb091ea64 [FIX] website: missing acl for manage website menu
bzr revid: dle@openerp.com-20140502134135-zp05ecbpcj8inftc
2014-05-02 15:41:35 +02:00
Mohammed Shekha 5600a79007 [IMP]Improved the database manager, instead of calling html_template, created separate html file which is rendered using jinja2, so that we don't need html_template once pos and edit support render_bootstrap_template.
bzr revid: msh@tinyerp.com-20140502132349-bw9zdyaou4yf8o7q
2014-05-02 18:53:49 +05:30
Gery Debongnie a8e1fbcbd3 [FIX] correct a small typo in previous merge (addon crm)
bzr revid: ged@openerp.com-20140502132258-88x9mam35o3k5ndm
2014-05-02 15:22:58 +02:00
Simon Lejeune 139c35800f [FIX] account report_invoice: display the unit of measure in the same cell as the quantity
bzr revid: sle@openerp.com-20140502131706-cepyft5y0essj0zr
2014-05-02 15:17:06 +02:00
Gery Debongnie 5aa2fa150c [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
Josse Colpaert 8b84615de1 [MERGE] Merge from trunk test
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +02:00
Simon Lejeune 66f5bbcf67 [FIX] account report_invoice: more space to display the taxes, right field to display the fiscal position
bzr revid: sle@openerp.com-20140502130340-22dyefrmj4kqrzdb
2014-05-02 15:03:40 +02:00
Simon Lejeune 7ad6d7a150 [FIX] Report: usage of ids in get_action more consistent: only pass them when they are useful, else pass an empty list
bzr revid: sle@openerp.com-20140502130310-106au0jsza0b3nwe
2014-05-02 15:03:10 +02:00
Kersten Jeremy df80f78393 [FIX] Webiste google Map - don't force http
bzr revid: jke@openerp.com-20140502123407-ojyzpf2dynewo7u0
2014-05-02 14:34:07 +02:00
Gery Debongnie 132ccb7180 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140502123355-9dqpwq1g9rrpisxj
2014-05-02 14:33:55 +02:00
Kersten Jeremy ed6bc9f198 [MERGE] Merge with trunk
bzr revid: jke@openerp.com-20140502123149-4g7d7xh07i5z9dct
2014-05-02 14:31:49 +02:00
Denis Ledoux 03b03d0476 [FIX] crm: in order the mark as lost action to work, the dead stage has to be folded
bzr revid: dle@openerp.com-20140502101525-bzyjpz7jbr1njobl
2014-05-02 12:15:25 +02:00
chm@openerp.com ee16b014b1 [MERGE] from trunk
bzr revid: chm@openerp.com-20140502095132-kfx40xou73mukr2y
2014-05-02 11:51:32 +02:00
chm@openerp.com f299180399 [FIX] website_mail: request.website.user_id.id
bzr revid: chm@openerp.com-20140502092659-1gwsx6lmgmtcf80q
2014-05-02 11:26:59 +02:00
Antony Lesuisse 434c3c455e [FIX] free chs who was stuck in a 2010 spacetime continuum
bzr revid: al@openerp.com-20140501214501-dnt6qjxvqa8tm58o
2014-05-01 23:45:01 +02:00
Antony Lesuisse 6c950dc970 [FIX] ir_qweb revert async script attribute
bzr revid: al@openerp.com-20140501212023-x9r57i05nrr0g29f
2014-05-01 23:20:23 +02:00
Fabien Meghazi a22d0ce78a [FIX] edi, calendar webclient bootstrap
bzr revid: fme@openerp.com-20140501210507-cbl9no3o92zkdq5h
2014-05-01 23:05:07 +02:00
Fabien Meghazi db48dbef3e [FIX] database manager
bzr revid: fme@openerp.com-20140501210436-osyrvlue41w63i6f
2014-05-01 23:04:36 +02:00
Antony Lesuisse e6532d91ba [FIX] ir_qweb set js assets to async
bzr revid: al@openerp.com-20140501205153-ko00g1vyyrmc21k8
2014-05-01 22:51:53 +02:00
Antony Lesuisse aa943fae18 [FIX] qweb loading concat mode only, increase cache age to one day
bzr revid: al@openerp.com-20140501204242-jngte754yqyj4nb0
2014-05-01 22:42:42 +02:00
Antony Lesuisse eb44c37dd9 [FIX] website_event missing javascript asset
bzr revid: al@openerp.com-20140501200150-5u3lfdqls3t3oeih
2014-05-01 22:01:50 +02:00
Antony Lesuisse 9e81c5aa07 [FIX] web_kanban_gauge needs raphaeljs temporarly back in assets_backend
bzr revid: al@openerp.com-20140501191831-mhsrpgza1x00ysy4
2014-05-01 21:18:31 +02:00
Antony Lesuisse 8c6cbebc0e [IMP] ir_qweb improve css minify
bzr revid: al@openerp.com-20140501190544-egvc85ctdxs69cmr
2014-05-01 21:05:44 +02:00
Antony Lesuisse 8d04c66dc3 [IMP] cleanups, move tests, remove deprecated model instantiation
bzr revid: al@openerp.com-20140501184217-pgi1gzbdpysdybog
2014-05-01 20:42:17 +02:00
Antony Lesuisse 5e21a4235d [MERGE] saas-4 up to dle@openerp.com-20140501121915-q88k37nd25ietw8c
bzr revid: al@openerp.com-20140501172508-tjennzht30ktw3nz
2014-05-01 19:25:08 +02:00
Antony Lesuisse 2998bec0e0 [FIX] website controller, correctly resolve last merge about images
fix fp commit to use debian compatible werkzeug api data instead of set_data

bzr revid: al@openerp.com-20140501165004-0e6xp8e9hdpifofj
2014-05-01 18:50:04 +02:00
Fabien Pinckaers b5209451cd [IMP] Lossless PNG compression. Reduced size by 3 with pngquant
bzr revid: fp@tinyerp.com-20140501161452-0pw17e2v0cjjlupm
2014-05-01 18:14:52 +02:00
Antony Lesuisse 7e25b9ae55 [MERGE] saas-4 report_webkit missing dependency on report
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
Antony Lesuisse 9efc4c4db2 [FIX] report_webkit missing dependency on report
bzr revid: al@openerp.com-20140501161108-50yidx30rm6z7d10
2014-05-01 18:11:08 +02:00
Antony Lesuisse 739793cdcd [FIX] tests race condition in phanthomjs tests
A deadlock occurs when
- phantomjs_test1 is executedd, enter_test_mode is activated
- console.log('ok') is issued, sigterm is sent to phantomjs_test1 process
- phantomjs_test1 is finished and leave_test_mode restores the registrymanager lock
- phantomjs_test1 process, just before dying, makes a last http request phantomjs_test1_last_request
- phantomjs_test1_last_request thread will wait for the registrymanager lock, when all tests will be completed 
- phantomjs_test2 is run, enter_test_mode is activated
- phantomjs_test2 is reach its end and _wait_remaining_requests is called
- phantomjs_test2 _wait_remaining_requests hangs forever waiting for phantomjs_test1_last_request

bzr revid: al@openerp.com-20140501150641-ua0b7pntesgm3n5p
2014-05-01 17:06:41 +02:00
Denis Ledoux abbe08f76a [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 4007 revid:dle@openerp.com-20140501121633-6umc2sxwi0h0lhay
bzr revid: dle@openerp.com-20140430123818-zzdxmat4c5yg9gg7
bzr revid: dle@openerp.com-20140501121915-q88k37nd25ietw8c
2014-05-01 14:19:15 +02:00
Denis Ledoux b88755c431 [REVERT] 2 previous revision, as it looks like that the fix causes more troubles than it resolve a problem
bzr revid: dle@openerp.com-20140501121633-6umc2sxwi0h0lhay
2014-05-01 14:16:33 +02:00
Fabien Pinckaers 1dd63bce78 [IMP] website images: allow no max_width (default), faster loading if no resize
bzr revid: fp@tinyerp.com-20140501114003-5xs31o0lzpp8ru2s
2014-05-01 13:40:03 +02:00
Josse Colpaert 67afb31970 [IMP] When changing number of steps, it will also change the resupply rules of the warehouses that are resupplied from this warehouse and the associated mto rules
bzr revid: jco@openerp.com-20140430164526-jiq8zh1lt3x9c3mc
2014-04-30 18:45:26 +02:00
Fabien Meghazi 8474a2ed6f [MERGE] Web assets moved from manifests to ir.ui.view bundles
bzr revid: fme@openerp.com-20140430151509-mme5st89o1hj4zcs
2014-04-30 17:15:09 +02:00
Fabien Meghazi acf2123123 [MERGE] Web assets moved from manifests to ir.ui.view bundles
bzr revid: fme@openerp.com-20140430151302-e42monb4klz4udw5
2014-04-30 17:13:02 +02:00
Fabien Meghazi 8c20eeef6a [MERGE] Web assets moved from manifests to ir.ui.view bundles
bzr revid: fme@openerp.com-20140430151137-c4ue5ko0vdyvoijt
2014-04-30 17:11:37 +02:00
Fabien Meghazi 79ce95638d [IMP] async require of raphael.js
bzr revid: fme@openerp.com-20140430142025-nbvwk5ggzo1bro0q
2014-04-30 16:20:25 +02:00
Gery Debongnie 1cb131d3fb [MERGE] some optimizations on graph view pivot table rendering
bzr revid: ged@openerp.com-20140430140625-83w6v1oql62r5jly
2014-04-30 16:06:25 +02:00
Gery Debongnie a6b25061ba [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140430085942-umusyhp4cs2ffezj
bzr revid: ged@openerp.com-20140430140423-kq0vdboq1mux4zfn
2014-04-30 16:04:23 +02:00
Olivier Dony 52480275c3 [IMP] purchase: invoice creation more modular/extensible through the introduction of a _prepare_invoice method()
This is similar to what was previously done for Sales Orders.

bzr revid: odo@openerp.com-20140430140103-hfumie3ndvlodgeh
2014-04-30 16:01:03 +02:00
Kersten Jeremy 5d6f8bf45c [FIX] Calendar - Fix unlink which can try to unlink a numeric string without cast it in integer
bzr revid: jke@openerp.com-20140430133623-l6iynwdp0ampy23s
2014-04-30 07:36:23 -06:00
Fabien Meghazi 556c1404c2 [FIX] backward compatibility for html_template
bzr revid: fme@openerp.com-20140430132636-p42ehcb0dnc1d3jx
2014-04-30 15:26:36 +02:00
Fabien Meghazi 877503143d [REM] html_template from hw_*
bzr revid: fme@openerp.com-20140430132510-smhi39h9oyi8p4nt
2014-04-30 15:25:10 +02:00
Denis Ledoux d59cb1eda2 [FIX] web: missing ; from previous revision
bzr revid: dle@openerp.com-20140430131739-ywyqb1gh68xbxid1
2014-04-30 15:17:39 +02:00
Fabien Meghazi d00d092e18 [FIX] bootstrap - jquery.ui conflicts
bzr revid: fme@openerp.com-20140430131730-du7hem15of8spau1
2014-04-30 15:17:30 +02:00
Denis Ledoux b7c125869f [FIX] account: remove partial fix for forcing right active_ids
This has been fixed in the web client 3991 revid:dle@openerp.com-20140430123818-zzdxmat4c5yg9gg7

bzr revid: dle@openerp.com-20140430125033-44vbf00spawm9mbg
2014-04-30 14:50:33 +02:00
Denis Ledoux 8d49639933 [FIX] web: reset active_model, id, ids on executing button of type object
bzr revid: dle@openerp.com-20140430123727-cnz6k8is2sqe65w0
2014-04-30 14:37:27 +02:00
Fabien Meghazi ef85e3de80 [FIX] point of sale loading
bzr revid: fme@openerp.com-20140430121632-llnwhirjl3ii6m93
2014-04-30 14:16:32 +02:00