Commit Graph
81391 Commits
Author SHA1 Message Date
Launchpad Translations on behalf of openerp a7f4b6aaa0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130823050144-thvvvu225d4hfqy0
2013-08-23 05:01:44 +00:00
ddm fe45f507a2 Fix variable name
bzr revid: ddm@openerp.com-20130822200407-450rptud8peg4fp7
2013-08-22 22:04:07 +02:00
Christophe Matthieu 370fa231bf [IMP] website_sale: add price for variation and price_list for reduction
bzr revid: chm@openerp.com-20130822142735-n1aglt9wakj27dsb
2013-08-22 16:27:35 +02:00
ddm 141dcf577b Clarify
bzr revid: ddm@openerp.com-20130822133621-237gzh6wxisxnn00
2013-08-22 15:36:21 +02:00
DBR (OpenERP) f3b0c35df4 [Merge] lp:openobject-addons
bzr revid: dbr@tinyerp.com-20130822125445-pur4h2bjzjw4p2nx
2013-08-22 18:24:45 +05:30
Amit Vora (OpenERP Trainee) 32143e8935 [MERGE] merge with addons
bzr revid: voraamitr@gmail.com-20130822124057-rv6oqd0n22mf53c8
2013-08-22 18:10:57 +05:30
ddm f820c074a1 Disable editor on smartphones
<=767px according to bootstrap responsive classes

bzr revid: ddm@openerp.com-20130822124013-br8ccw8hb26dr060
2013-08-22 14:40:13 +02:00
DBR (OpenERP) 89d03a854a [IMP]base_calander: Add create method for crm.meeting
Update the Doc
remove crm.meeting inheritance from .py file

bzr revid: dbr@tinyerp.com-20130822123534-zx3uxdjojoj55bqn
2013-08-22 18:05:34 +05:30
Amit Vora (OpenERP Trainee) 68711bb1c5 [IMP] remove unused space
bzr revid: voraamitr@gmail.com-20130822123156-dv80muri4r9ivx5a
2013-08-22 18:01:56 +05:30
Amit Vora (OpenERP Trainee) 4d0ad501b7 [IMP] remove _default_payment_methods from point_of_sale.py file
bzr revid: voraamitr@gmail.com-20130822121849-hns960rom7p22920
2013-08-22 17:48:49 +05:30
Mansi Kariya (OpenERP Trainee) 55024350df [MERGE] Merged with main branch
bzr revid: mansi.mk.179@gmail.com-20130822114606-0wi2fnxc7j4hfdwj
2013-08-22 17:16:06 +05:30
Amit Bhavsar (Open ERP) 073bf7d937 [MERGE] merge with latest trunk
bzr revid: amb@tinyerp.com-20130822112419-vz74jafyh2kavq76
2013-08-22 16:54:19 +05:30
Paramjit Singh Sahota 9d6cc51728 [ADD] Added the test for MRP Issue where producing a BoM with a component of Service type is not possible.
bzr revid: psa@tinyerp.com-20130822110848-kg8g2s3gfhbgxsg9
2013-08-22 16:38:48 +05:30
ddm b9f2e796ca Mobile preview (initial styling)
bzr revid: ddm@openerp.com-20130822104736-5gt43278o83fvt9s
2013-08-22 12:47:36 +02:00
Fabien Meghazi 53fa372f6a [IMP] More precision for kanban column width
bzr revid: fme@openerp.com-20130822101952-qhliw0umneujz4cf
2013-08-22 12:19:52 +02:00
Thibault Delavallée ef879b133f [MERGE] [IMP] fleet: vehicles and contracts form view imp + some tootips imp
bzr revid: tde@openerp.com-20130822101240-civ3bx5ls58xdb8a
2013-08-22 12:12:40 +02:00
bth-openerp b9a85ca48c [MERGE]Merge lp:openobject-addons.
bzr revid: bth@tinyerp.com-20130822101113-3x2bxzpcm52x6q1x
2013-08-22 15:41:13 +05:30
Thibault Delavallée 2368906d23 [MERGE] [IMP] crm, hr_recruitment, project_issue: removed message_new putting the original email content into internal note. Chatter should be sufficient now.
bzr revid: tde@openerp.com-20130822101036-xc7y2rjoca7111ng
2013-08-22 12:10:36 +02:00
niv-openerp 4cc2766b2e [IMP] added possibility to desactivate quick create in m2o
bzr revid: nicolas.vanhoren@openerp.com-20130822100030-39ipz56hkrtq8pw0
2013-08-22 12:00:30 +02:00
bth-openerp 2e4397868d [MERGE]Merge lp:openobject-addons.
bzr revid: bth@tinyerp.com-20130822094920-uye48grby8tj0guc
2013-08-22 15:19:20 +05:30
Thibault Delavallée c147dd4975 [IMP] crm, hr_recruitment, project_issue: removed message put in description in message_new
bzr revid: tde@openerp.com-20130822094613-os846v2g3t2dloo5
2013-08-22 11:46:13 +02:00
Christophe Matthieu 4b67f75722 [IMP] website: kanban: remove default layout with thumbnail class
bzr revid: chm@openerp.com-20130822093049-6kcj1eobj2sl2nn4
2013-08-22 11:30:49 +02:00
bth-openerp ac2e155456 [IMP]Improved write method.
bzr revid: bth@tinyerp.com-20130822092903-34y8e3i2435klsn9
2013-08-22 14:59:03 +05:30
Christophe Matthieu 833951634e [FIX] website: kanban pager position
bzr revid: chm@openerp.com-20130822092536-lij12jeueg6bbo6v
2013-08-22 11:25:36 +02:00
Christophe Matthieu 8c23530b85 [FIX] website: kanban javascript
bzr revid: chm@openerp.com-20130822092416-sfcygyz15oi7qygr
2013-08-22 11:24:16 +02:00
Christophe Matthieu 0edba38c86 [IMP] website: kanban view; script in js file, dynamique template
bzr revid: chm@openerp.com-20130822091812-i71rjpxj1cprifbh
2013-08-22 11:18:12 +02:00
Christophe Matthieu 01733be984 [FIX] website_sale: pricelist code required
bzr revid: chm@openerp.com-20130822090941-yrb7c95xw2y4d15r
2013-08-22 11:09:41 +02:00
ddm 7d40a7db38 Mobile preview (initial commit)
bzr revid: ddm@openerp.com-20130822085825-7mpsoi0nyujekg5f
2013-08-22 10:58:25 +02:00
bth-openerp 1729d29bc3 [IMP]Add css.
bzr revid: bth@tinyerp.com-20130822084323-5xoggc5b4csyw65l
2013-08-22 14:13:23 +05:30
Fabien Meghazi f60bd37d57 [IMP] ir ui view search view
bzr revid: fme@openerp.com-20130822084221-fiiklna0258cgusg
2013-08-22 10:42:21 +02:00
bth-openerp 74ae0e99a8 [IMP]Improved code for subscribe and unsubscribe and removed unneccesary code.
bzr revid: bth@tinyerp.com-20130822073718-32ibwy5li2b510ot
2013-08-22 13:07:18 +05:30
DBR (OpenERP) 051b042bc0 [Merge] lp:openobject-addons
bzr revid: dbr@tinyerp.com-20130822051759-eimb58c5uojikals
2013-08-22 10:47:59 +05:30
bth-openerp 1027a710dc [MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: bth@tinyerp.com-20130822051603-51qaw8rvdd0wjmf0
2013-08-22 10:46:03 +05:30
Paramjit Singh Sahota 024d57f43d [MERGE] Sync with lp:openobject-addons/7.0
bzr revid: psa@tinyerp.com-20130822051059-eq0r7kpvi7uxrje4
2013-08-22 10:40:59 +05:30
Frédéric van der Essen d26b487b71 [MERGE] website: further work on the snippet editor
bzr revid: fva@openerp.com-20130821163052-8t7nqni7okn555mc
2013-08-21 18:30:52 +02:00
Frédéric van der Essen 6ccd087ee0 [MERGE] from upstream
bzr revid: fva@openerp.com-20130821163002-y45g9l65xwrcxmsn
2013-08-21 18:30:02 +02:00
Frédéric van der Essen 5848dc526f [IMP] website: basics of snippet system are now working and looking good
bzr revid: fva@openerp.com-20130821162534-yr6nx292xoj2m2s2
2013-08-21 18:25:34 +02:00
Christophe Matthieu b806728af1 [IMP] website: create generic kanban view
bzr revid: chm@openerp.com-20130821160632-tsl5v1l5cj10w92c
2013-08-21 18:06:32 +02:00
Martin Trigaux a01fd767a7 [MERGE] various changes
analytic_user_function: fix traceback with non-existant variable
lunch: name_get and remove create button on you lunch account view
mail: being more permissive on check to also allow creating message when have create access rights on model

bzr revid: mat@openerp.com-20130821155818-ktljx5c1my4w540j
2013-08-21 17:58:18 +02:00
Martin Trigaux 5c2d665af8 [FIX] analytic_user_function: initialise variable
bzr revid: mat@openerp.com-20130821154401-vgjpfmmjd59bm3j6
2013-08-21 17:44:01 +02:00
Martin Trigaux b03203fd3a [FIX] mail: check create access only for acess rights, not access rules (too permissive)
bzr revid: mat@openerp.com-20130821153918-pdtf4mhcdycfdf3p
2013-08-21 17:39:18 +02:00
Fabien Meghazi 7781e1df23 [IMP] QWeb: allow t-call to use dynamic template name using string interpolation
bzr revid: fme@openerp.com-20130821153507-qlh3aaytsouupx1m
2013-08-21 17:35:07 +02:00
Fabien Meghazi 98f19d8890 [IMP] Improved string interpolation in templates
bzr revid: fme@openerp.com-20130821145731-kkw9sxiv6oqz65qk
2013-08-21 16:57:31 +02:00
Martin Trigaux 11d50f0afc [MERGE] [IMP] lunch: better name_get and avoid seeing twice the create button on the cashmove view
bzr revid: mat@openerp.com-20130821144900-86hcgrwd43mavo5y
2013-08-21 16:49:00 +02:00
Xavier Morel 667dbbfdd9 [IMP] simplify ckeditor image and link dialogs
& add easy linking to existing site pages and attachments

bzr revid: xmo@openerp.com-20130821143816-0hvp0m0eklh6ti1m
2013-08-21 16:38:16 +02:00
Martin Trigaux a6410e1bcf [IMP] mail: beeing more permissive on the condition to post new message, allow also if have only the create access
bzr revid: mat@openerp.com-20130821143714-9a1isp0ylwko275k
2013-08-21 16:37:14 +02:00
Xavier Morel 516c81b4fc [MERGE] flag indicating whether a view template is or is not a page
Used to list all existing CMS pages from the RTE's link dialog

bzr revid: xmo@openerp.com-20130821143404-r8hnemydlvg3cjvs
2013-08-21 16:34:04 +02:00
Xavier Morel 92a20deca8 [ADD] simplified link dialog + link to existing pages dropdown
TODO: better UI, create new page, correct selection when reopen dialog

bzr revid: xmo@openerp.com-20130821143152-o3lawyupxcssuq2v
2013-08-21 16:31:52 +02:00
Fabien Meghazi e039e76883 [IMP] Improved template's t-foreach
You need to pull Rev#4980 of server/trunk-website-al

bzr revid: fme@openerp.com-20130821140953-zb2hdglg1nvp2ckq
2013-08-21 16:09:53 +02:00
Fabien Meghazi 83d5da0a1d [FIX] QWeb: foreach does not correctly handle @t-as
bzr revid: fme@openerp.com-20130821140910-bara9ykq4j8lix0t
2013-08-21 16:09:10 +02:00