Commit Graph
81391 Commits
Author SHA1 Message Date
Frédéric van der Essen 9cba9de9fd [MERGE] from upstream
bzr revid: fva@openerp.com-20130806123005-7mup0zq6ua4d8g3r
2013-08-06 14:30:05 +02:00
niv-openerp c63a86c593 [IMP] Merged corelib.js and coresetup.js into core.js
bzr revid: nicolas.vanhoren@openerp.com-20130806122623-pq6bpkjk65jx0fnp
2013-08-06 14:26:23 +02:00
Frédéric van der Essen 2abda5e554 [WIP] ecommerce pagination: fun with qweb
bzr revid: fva@openerp.com-20130806121931-9eso1k9pf7imaf8d
2013-08-06 14:19:31 +02:00
niv-openerp 392e9d260b [IMP] Mostly improvements of openerpframework.js . Moved a lot of necessary features to it (jsonrpc, models, translations,...). Added tests. Also some other style improvements.
bzr revid: nicolas.vanhoren@openerp.com-20130806120724-55nsh8ay9qiac72r
2013-08-06 14:07:24 +02:00
ajay javiya (OpenERP) 2c6221092e [IMP]: merge with main trunk
bzr revid: aja@tinyerp.com-20130806120148-5b1c47dqt5kz33d8
2013-08-06 17:31:48 +05:30
Fabien Meghazi 1b40e9265f [FIX] Replace views string interpolation by manual replacement.
No need to double % in views anymore

bzr revid: fme@openerp.com-20130806113626-t7y3v1trtfdtitar
2013-08-06 13:36:26 +02:00
Turkesh Patel (Open ERP) 90983ace49 [IMP] add demo user in direct sales team also.
bzr revid: tpa@tinyerp.com-20130806112713-l11uio6f6sgzzfc5
2013-08-06 16:57:13 +05:30
Martin Trigaux 122f0aa9b3 [FIX] workerst: revert commit 4930, remove useless loop and if condition always validated
bzr revid: mat@openerp.com-20130806094222-w61oolrjo66ulg3n
2013-08-06 11:42:22 +02:00
Christophe Matthieu 472b547c30 [FIX] website_event: access right for public user
bzr revid: chm@openerp.com-20130806093115-1bhh873xhycdag84
2013-08-06 11:31:15 +02:00
Pinakin Nayi (OpenERP) 28426f6409 [FIX]mrp : in work orders duration is displayed in decimal numbers instead of time
bzr revid: pna@tinyerp.com-20130806093021-vcpren454u03qy91
2013-08-06 15:00:21 +05:30
Frédéric van der Essen c51b8953b4 [WIP] ecommerce pagination
bzr revid: fva@openerp.com-20130806092344-noe43pgifa3rqr04
2013-08-06 11:23:44 +02:00
bth-openerp 78d007ec50 [MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: bth@tinyerp.com-20130802113100-o2zujug0h9mbuw49
bzr revid: bth@tinyerp.com-20130805080538-tqslnjo1tzu5isrs
bzr revid: bth@tinyerp.com-20130806091909-fbpfe6mj7p3ob0dt
2013-08-06 14:49:09 +05:30
Christophe Matthieu 81ae0babf2 [FIX] qweb: many2one field = False
bzr revid: chm@openerp.com-20130806091554-dpjl4ienh21c14zi
2013-08-06 11:15:54 +02:00
Chirag Dodiya (OpenERP Trainee) 5323abfafc [IMP] Improved css for kanbanview of Sales Teams
bzr revid: chiragdd7@gmail.com-20130806091413-yf8xyc5xvcpcc3m2
2013-08-06 14:44:13 +05:30
Turkesh Patel (Open ERP) 9daabe3754 [IMP] show sales analysis based on cretion date for quatation and for sales based on confirm date.
bzr revid: tpa@tinyerp.com-20130806091124-650f98bm7d1e004e
2013-08-06 14:41:24 +05:30
Martin Trigaux f47ac59b38 [IMP] workers: remove unused code, _acquire_job does not return any value
lp bug: https://launchpad.net/bugs/1193399 fixed

bzr revid: mat@openerp.com-20130806091032-5w6km2pmbl20zicl
2013-08-06 11:10:32 +02:00
Christophe Matthieu f55561d154 [FIX] website_mail: access right and xml
bzr revid: chm@openerp.com-20130806090845-xi47tuk6mfekaedr
2013-08-06 11:08:45 +02:00
Christophe Matthieu bf44e33c87 [FIX] qweb: access right for name_get on many2one field
bzr revid: chm@openerp.com-20130806090704-4igjnhsuwi59hkpm
2013-08-06 11:07:04 +02:00
niv-openerp cb55e11c70 Put everything in the framework directly in the openerp namespace instead of the openerp.web namespace.
bzr revid: nicolas.vanhoren@openerp.com-20130806085812-ek8v8k0x4m7ocu4f
2013-08-06 10:58:12 +02:00
Christophe Matthieu c0f75a5931 [IMP] website_mail: subscribe (add followers)
bzr revid: chm@openerp.com-20130806085654-n3z6f9u991k9wky3
2013-08-06 10:56:54 +02:00
Christophe Matthieu bf86ccf433 [IMP] website: clean xml
bzr revid: chm@openerp.com-20130806080412-aq2mtf577zt1t3pl
2013-08-06 10:04:12 +02:00
Christophe Matthieu c8999f8553 [IMP] website_sale: description_website
bzr revid: chm@openerp.com-20130806075346-6bi5zbjw39juheih
2013-08-06 09:53:46 +02:00
Turkesh Patel (Open ERP) a24a72e3d3 [IMP] improved view by css
bzr revid: tpa@tinyerp.com-20130806063416-8rrqtf3qb7j01sb2
2013-08-06 12:04:16 +05:30
DBR (OpenERP) b6d23fe0cc [Merge] lp:openobject-addons
bzr revid: dbr@tinyerp.com-20130730061010-w8y3f6r78izik6te
bzr revid: dbr@tinyerp.com-20130806063107-i4dz2jh4ynkbe3mv
2013-08-06 12:01:07 +05:30
Fabien Meghazi af08367290 [ADD] Added website osv object + refactoring
bzr revid: fme@openerp.com-20130805161600-abms35e0vk47f3i1
2013-08-05 18:16:00 +02:00
Christophe Matthieu 3f90f2c5e5 [IMP] qweb: clean code
bzr revid: chm@openerp.com-20130805154542-l7dovsfikqk4l32y
2013-08-05 17:45:42 +02:00
Martin Trigaux b0619887af [FIX] l10n_be_invoice_bba: add copy method to invoice to generate a new bba comunication when duplicating, courtesy of Peter Langenberg (Agaplan)
bzr revid: mat@openerp.com-20130805153713-os2c4d5bfwr0pgmk
2013-08-05 17:37:13 +02:00
niv-openerp 034e4893d5 Some commas
bzr revid: nicolas.vanhoren@openerp.com-20130805151544-pdaebd2o8bh70z7z
2013-08-05 17:15:44 +02:00
niv-openerp 1bd4b62142 Perfected translations integration in the framework
bzr revid: nicolas.vanhoren@openerp.com-20130805151012-wnc7wkyiz0eay5oh
2013-08-05 17:10:12 +02:00
Christophe Matthieu 81d707978e [FIX] website_event
bzr revid: chm@openerp.com-20130805150514-9zfut5y6xda3rpyx
2013-08-05 17:05:14 +02:00
Christophe Matthieu 4b8a51f3af [IMP] website_event
bzr revid: chm@openerp.com-20130805150319-y5iy0zxkq4fkuk5h
2013-08-05 17:03:19 +02:00
niv-openerp 556deae262 Potential problems with request and context
bzr revid: nicolas.vanhoren@openerp.com-20130805145835-6yro8zp4exx3uz8v
2013-08-05 16:58:35 +02:00
niv-openerp 38699e04cf Copied a part of translation database to openerpframework.js
bzr revid: nicolas.vanhoren@openerp.com-20130805145514-uuywlhleyfz2xoj4
2013-08-05 16:55:14 +02:00
niv-openerp b3c4d02590 Improved translation controller to be more flexible
bzr revid: nicolas.vanhoren@openerp.com-20130805144431-ycv6gwv99c5bh1p1
2013-08-05 16:44:31 +02:00
Thibault Delavallée 199b3e96bc [REM] crm_lead: removed _check, because should use base action rule
bzr revid: tde@openerp.com-20130805141905-watnhgi6z29w3l1q
2013-08-05 16:19:05 +02:00
niv-openerp ab4d080450 Desactivated some tests that, once again, do not work in the runbot
bzr revid: nicolas.vanhoren@openerp.com-20130805140404-x15shdy1a4b3zqvk
2013-08-05 16:04:04 +02:00
niv-openerp 07617fef45 Added tests for the models
bzr revid: nicolas.vanhoren@openerp.com-20130805134548-n6j48iv7823u3eh7
2013-08-05 15:45:48 +02:00
niv-openerp 76ef945c96 Corrected some stuff in openerp.web.Model
bzr revid: nicolas.vanhoren@openerp.com-20130805134059-3ayw6b0tqqberkaw
2013-08-05 15:40:59 +02:00
niv-openerp d256d16e3a Fixed potential security issue + some details
bzr revid: nicolas.vanhoren@openerp.com-20130805133309-jds80qa5j5lgwslq
2013-08-05 15:33:09 +02:00
Thibault Delavallée dce673c6b5 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130805132618-ewjjxjfwnkeg8hue
2013-08-05 15:26:18 +02:00
Frédéric van der Essen bd81cfd1f2 [FIX] only self-close void elements
bzr revid: fva@openerp.com-20130805130605-8decmjyplrstszgp
2013-08-05 15:06:05 +02:00
niv-openerp 226b142ac6 Simplified a little the Query class by removing a reference to a controller and using call_kw instead
bzr revid: nicolas.vanhoren@openerp.com-20130805130458-21w806v9wc456oq4
2013-08-05 15:04:58 +02:00
Christophe Matthieu d67443803a [IMP] website_event
bzr revid: chm@openerp.com-20130805130420-wlf5qkbamii90jcr
2013-08-05 15:04:20 +02:00
niv-openerp 70e3af6312 Desactivated some tests because the phantomjs runner crashed
bzr revid: nicolas.vanhoren@openerp.com-20130805125045-q1x1bciwcdyabg8v
2013-08-05 14:50:45 +02:00
Christophe Matthieu 9cd3d8132b [IMP] website_event
bzr revid: chm@openerp.com-20130805124428-9pnqbdb68lruqnxq
2013-08-05 14:44:28 +02:00
Christophe Matthieu 343ff62c8c [FIX] qweb: div autoclose
bzr revid: chm@openerp.com-20130805124236-59j42sm6ararml1t
2013-08-05 14:42:36 +02:00
niv-openerp affb4f0589 Ported model to the framework
bzr revid: nicolas.vanhoren@openerp.com-20130805123916-s62upxq3jwqjygt0
2013-08-05 14:39:16 +02:00
Frédéric van der Essen c7ae298ad5 [MERGE] from upstream
bzr revid: fva@openerp.com-20130805120523-ux0vnixhbe59pvrf
bzr revid: fva@openerp.com-20130805123836-1vhj1e5mb0ejiu9j
2013-08-05 14:38:36 +02:00
niv-openerp 14fccd0a4e Even more tests
bzr revid: nicolas.vanhoren@openerp.com-20130805114034-7xcpjmses5aodjhr
2013-08-05 13:40:34 +02:00
niv-openerp a6ea300848 Added some tests about authentication
bzr revid: nicolas.vanhoren@openerp.com-20130805113928-yldn5qh2lm0vc8j9
2013-08-05 13:39:28 +02:00