Commit Graph
81391 Commits
Author SHA1 Message Date
bth-openerp 06fb56ec8b [IMP]IMproved code for publish as per main branch.
bzr revid: bth@tinyerp.com-20130927060207-ssj30gad3xuchqsb
2013-09-27 11:32:07 +05:30
Fabien Pinckaers 73faaabdc8 [IMP] Product Sale Views Cleanup
bzr revid: fp@openerp.com-20130927054910-lppoqz4hxmomckeg
2013-09-27 07:49:10 +02:00
Launchpad Translations on behalf of openerp 5639037c14 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130925052817-8fbiai7kz5lwvqu1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130927054854-49lz8szbyebfo37r
2013-09-27 05:48:54 +00:00
Fabien Pinckaers 54419cf4de [FIX] style in shop list view
bzr revid: fp@openerp.com-20130927053013-ca212xclwntv8ys2
2013-09-27 07:30:13 +02:00
Fabien Pinckaers f1ccbedd2a [iMP] fix wrong view in customize
bzr revid: fp@openerp.com-20130927051727-8jlr62kdhmxmxjjd
2013-09-27 07:17:27 +02:00
bth-openerp 5d1c7b9c81 [MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: bth@tinyerp.com-20130927051709-qltvmcxbte3vjezv
2013-09-27 10:47:09 +05:30
Fabien Pinckaers e614c0d35d [IMP] Title snippet
bzr revid: fp@openerp.com-20130927050638-p93afqafx7i3xfd5
2013-09-27 07:06:38 +02:00
Fabien Meghazi 6fd594ef97 [FIX] Translation dialog box bug
bzr revid: fme@openerp.com-20130926233158-cj2ldz323emynivg
2013-09-27 01:31:58 +02:00
Fabien Pinckaers 261b1f5ca1 [IMP] Parallax Snippet
bzr revid: fp@tinyerp.com-20130926174723-bm0mt96x36u21c5q
2013-09-26 19:47:23 +02:00
Fabien Meghazi e7d55014a4 [MERGE] multilang
bzr revid: fme@openerp.com-20130926165324-2jfo9s8q3u4teor1
2013-09-26 18:53:24 +02:00
Fabien Meghazi a017668fff [MERGE] multilang
bzr revid: fme@openerp.com-20130926165022-s0ua00zyj0xazsct
2013-09-26 18:50:22 +02:00
Fabien Meghazi 4aad26f5c2 [ADD] es5-shim
bzr revid: fme@openerp.com-20130926164902-5ioas0np4tb9qnge
2013-09-26 18:49:02 +02:00
Fabien Meghazi 7b28f77b1e [IMP] website_project multilang
bzr revid: fme@openerp.com-20130926163606-3qhf03p9u43hygap
2013-09-26 18:36:06 +02:00
Fabien Meghazi 70cf46fb94 [IMP] website_membership multilang
bzr revid: fme@openerp.com-20130926163004-4mbb1v6rs2g32hyb
2013-09-26 18:30:04 +02:00
Fabien Meghazi 426696aec7 [IMP] website_hr multilang
bzr revid: fme@openerp.com-20130926151136-x6zrixi7lmxxadgi
2013-09-26 17:11:36 +02:00
Fabien Meghazi ea642e75bf [IMP] website_event multilang
Some controllers does not use route params so it fails with language url offset

bzr revid: fme@openerp.com-20130926150729-ltq6wafp4h0n5x0l
2013-09-26 17:07:29 +02:00
Fabien Meghazi 4bad1f8362 [IMP] website_crm_partner_assign multilang
bzr revid: fme@openerp.com-20130926150223-mngcp1swvvc5uamu
2013-09-26 17:02:23 +02:00
Fabien Meghazi ad42063349 [IMP] website_crm multilang
bzr revid: fme@openerp.com-20130926145845-pym8hr4atb6el9kn
2013-09-26 16:58:45 +02:00
Fabien Meghazi 6d47823121 [IMP] website_sale multilang
bzr revid: fme@openerp.com-20130926145448-lvrfd6ma755jf549
2013-09-26 16:54:48 +02:00
Fabien Meghazi d322b64611 [ADD] request.redirect()
bzr revid: fme@openerp.com-20130926145413-agxgeuwp89stxbbn
2013-09-26 16:54:13 +02:00
Xavier Morel c741c0eeb1 [IMP] reimplement t-field using new converters
bzr revid: xmo@openerp.com-20130926145126-21hlubvs39a0z68j
2013-09-26 16:51:26 +02:00
Fabien Meghazi 3fbc93909b [MERGE] upstream
bzr revid: fme@openerp.com-20130926142342-92hp15tpfeq1zvya
2013-09-26 16:23:42 +02:00
Christophe Matthieu 71a1b12e31 [IMP] website_sale + website_event: set order, first items = published
bzr revid: chm@openerp.com-20130926141935-1y8ts0y0n1i5tpun
2013-09-26 16:19:35 +02:00
Christophe Matthieu 9b538b3744 [FIX] website_sale: add to cart
bzr revid: chm@openerp.com-20130926140750-tmp5wexrpbkipt0w
2013-09-26 16:07:50 +02:00
Fabien Meghazi c67092bc37 [WIP] load translation, mhhh
bzr revid: fme@openerp.com-20130926135216-f1b1k6kg04it9dzs
2013-09-26 15:52:16 +02:00
Xavier Morel 2707b17771 [IMP] add #verify PIL call, can't hurt
bzr revid: xmo@openerp.com-20130926134429-8uwav5lyck532eb2
2013-09-26 15:44:29 +02:00
bth-openerp abe0736ece [IMP]Added link for apply button.
bzr revid: bth@tinyerp.com-20130926134244-inhlk0xglif6s6t6
2013-09-26 19:12:44 +05:30
Xavier Morel 789c0d8a6b [ADD] Conversions from field values to "html" content
> many2one --> mettre <br/> si multi-line, html escape le reste (ex:
> adresse sur un event, on a du mettre dans un <pre> mais ce n'est pas
> bien)

> text --> mettre <br/> si multi-line, html escape le reste (ex:
> description d'un produit, à droite)

> char --> normalement pas de multi-line

> fields.binary --> t-field on image field ne semble pas fonctionner
> en écriture (la photo d'une fiche produit)

(validates that the binary field's content is image data by opening it
with PIL, then generates an <img> tag)

TODO:

> fields.float --> utiliser le digits pour formatter les decimals
> correctement (ex: prix d'un produit, à deux décimales)

> On aura aussi besoin d'un widget="currency", un peu comme dans la
> vue form du client web.

bzr revid: xmo@openerp.com-20130926133850-ab14h241q878jbom
2013-09-26 15:38:50 +02:00
Fabien Meghazi b6e1e1ec71 [MERGE] upstream
bzr revid: fme@openerp.com-20130926133155-y1fz603wa4oxw6g3
2013-09-26 15:31:55 +02:00
ajay javiya (OpenERP) 6b4a1a3d55 [IMP]: Rename log a note to Log an internal note
bzr revid: aja@tinyerp.com-20130926132322-pvu18fr5w24lc18m
2013-09-26 18:53:22 +05:30
ajay javiya (OpenERP) 727a4a9e2b [MERGE]: with trunk
bzr revid: aja@tinyerp.com-20130926132044-oj0q4sqqu8u1nu7c
2013-09-26 18:50:44 +05:30
Fabien Meghazi 8c25a35cc6 [FIX] Save translations and t-fields
bzr revid: fme@openerp.com-20130926131708-16xmpbrx0vxlgbtw
2013-09-26 15:17:08 +02:00
Christophe Matthieu cc939d65fd [FIX] website: auth for page/ route
bzr revid: chm@openerp.com-20130926131645-ypzyiwloulruq9fq
2013-09-26 15:16:45 +02:00
bth-openerp 502b323911 [IMP]Departments string only on Department list.
bzr revid: bth@tinyerp.com-20130926131256-1tyhb781c5f9sl5k
2013-09-26 18:42:56 +05:30
Christophe Matthieu 9f58a5c082 [IMP] website_sale: add styles selector on product
bzr revid: chm@openerp.com-20130926130954-fxojimjdinepgpjq
2013-09-26 15:09:54 +02:00
bth-openerp 6dc6d2bc71 [IMP]Added demo data for HR and added separator before buttons.
bzr revid: bth@tinyerp.com-20130926130249-i3aycjt9oqjgu98r
2013-09-26 18:32:49 +05:30
Fabien Meghazi da26fe77b9 [IMP] Enabling ckeditor on translatable t-fields
bzr revid: fme@openerp.com-20130926124244-u3e3zhw0npmd4dae
2013-09-26 14:42:44 +02:00
Martin Trigaux 861c9b9e70 [FIX] report_webkit: correctly catch error in rendering
bzr revid: mat@openerp.com-20130926122437-nx7idmpjmm8k1r9d
2013-09-26 14:24:37 +02:00
Sunil Sharma (OpenERP Trainee) 155992c18d [IMP]Added demo data for hr.
bzr revid: sunilsharma.sharma07@gmail.com-20130926121113-12si2vrvqag5oyec
2013-09-26 17:41:13 +05:30
Paramjit Singh Sahota de6e8ec7c5 [Merge] Merged lp:~openerp-dev/openobject-addons/trunk-cashcontrol-cod
bzr revid: psa@tinyerp.com-20130926114653-n05d9d9wzlv5tsix
2013-09-26 17:16:53 +05:30
bth-openerp 4eb30c8485 [IMP]Added demo data for CEO.
bzr revid: bth@tinyerp.com-20130926113726-xj0h1s735zkdmh91
2013-09-26 17:07:26 +05:30
Christophe Matthieu f2a97662cd [IMP] website_sale: add a bin packing method for sort and displayed products in the ecomerce. Fix some inherit of products. improve publish button
bzr revid: chm@openerp.com-20130926112307-xqwih3zlvlsmqq7j
2013-09-26 13:23:07 +02:00
Christophe Matthieu c66c5d5b6a [IMP] change publish button, fix website_sale product order + push top/bottom
bzr revid: chm@openerp.com-20130926111854-22ikjc2enj0hi0qu
2013-09-26 13:18:54 +02:00
Vidhin Mehta 333ba69599 [TEST] for second task
bzr revid: vme@tinyerp.com-20130926105242-gza93fwh0vcoucid
2013-09-26 16:22:42 +05:30
Chirag Dodiya (OpenERP Trainee) 651a3bf291 [MRG] Merge with lp:~openerp-dev/openobject-addons/trunk-website-recruitment-bth
bzr revid: chiragdd7@gmail.com-20130926104709-f8imj1ui147e0h7o
2013-09-26 16:17:09 +05:30
Vidhin Mehta 74b67c684e [FIX]
bzr revid: vme@tinyerp.com-20130926102953-27564q9jy4ydhh66
2013-09-26 15:59:53 +05:30
Chirag Dodiya (OpenERP Trainee) 2a6fb69f63 [IMP] Added demo data for job chief executive officer
bzr revid: chiragdd7@gmail.com-20130926095743-q5u23rm9hdevf8s0
2013-09-26 15:27:43 +05:30
bth-openerp 75a3fa1965 [IMP]Added demo data for trainee.
bzr revid: bth@tinyerp.com-20130926095146-1a506slas9r9szfr
2013-09-26 15:21:46 +05:30
bth-openerp d5f8a8ca75 [IMP]Improved demo data for CTO.
bzr revid: bth@tinyerp.com-20130926093410-dcg3xawnsib69n3z
2013-09-26 15:04:10 +05:30
Fabien Meghazi 7e085d4d5b [FIX] Do not activate language switcher on non multilang controllers
bzr revid: fme@openerp.com-20130926092543-79b1e4v3gdttok6h
2013-09-26 11:25:43 +02:00