105c26e623
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140324082422-38x5kcnh830200wl
bzr revid: chm@openerp.com-20140325084953-s3sl2f1un7z08wxy
2014-03-25 09:49:53 +01:00
Simon Lejeune
ad7acd3746
[MERGE][IMP] view improvement on ir.actions.report.xml and moved the qweb contact widget from website to base
...
bzr revid: sle@openerp.com-20140324181412-11fi4wbak55donyj
2014-03-24 19:14:12 +01:00
Simon Lejeune
fba94c1827
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140324164442-bdxf7faei0rmlemj
2014-03-24 17:44:42 +01:00
Denis Ledoux
5e967d1a3f
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9347 revid:dle@openerp.com-20140324162524-ew3c3eauj3kcnefi
...
bzr revid: dle@openerp.com-20140324162852-iubef1i0hwpxiske
2014-03-24 17:28:52 +01:00
Simon Lejeune
d51f4f80ab
[IMP] ir.actions.report.xml form view: hide the attachmend fields when report_type controller is selected
...
bzr revid: sle@openerp.com-20140324162616-93qkrv5xb4yrt3oj
2014-03-24 17:26:16 +01:00
Denis Ledoux
a9001aedb1
[FIX] website_blog: typo, platform instead of plateform
...
bzr revid: dle@openerp.com-20140324162524-ew3c3eauj3kcnefi
2014-03-24 17:25:24 +01:00
Christophe Simonis
a8e1aba23b
[FIX] http: when generating static routes, only wrap dispatcher only if there is any new static directory found
...
bzr revid: chs@openerp.com-20140324161257-fi1cpgyd97825b14
2014-03-24 17:12:57 +01:00
Simon Lejeune
ab003bfea6
[IMP] ir_actions wording
...
bzr revid: sle@openerp.com-20140324150533-bs1lwvhd2z2jow8m
2014-03-24 16:05:33 +01:00
e5f645df4d
[FIX] website: snippet editor: forward port of branch saas-3
...
bzr revid: chm@openerp.com-20140324145416-qn2fvylylxtgu39a
2014-03-24 15:54:16 +01:00
Simon Lejeune
a7e061079d
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140324144056-2waohi777m0lzznm
2014-03-24 15:40:56 +01:00
Denis Ledoux
6cf9867f15
[REF] *: share field is now a computed field, if the user is in the employee group or not
...
bzr revid: dle@openerp.com-20140324143558-jqdm33c0i7wna3va
2014-03-24 15:35:58 +01:00
Simon Lejeune
48f785d786
[REF] Moved qweb contact from website to base and removed the from_html method (it never worked)
...
bzr revid: sle@openerp.com-20140324135723-2f8owtcotk3n9jt8
2014-03-24 14:57:23 +01:00
5692dbdb5e
[IMP] website: Building block / Snippet Editor
...
Add documentation and clean framework
The building blocks appear in the edit bar website. These prebuilt html block allowing the designer to easily generate content on a page (drag and drop).
Options allow snippets to add customizations party html code according to their selector (jQuery) and javascript object.
bzr revid: chm@openerp.com-20140324135220-j0abaam1n4ue03l7
2014-03-24 14:52:20 +01:00
449ca3ab18
[IMP] website snippet: add example in documentation
...
bzr revid: chm@openerp.com-20140324135013-1fr3kznkw29wvca2
2014-03-24 14:50:13 +01:00
Kersten Jeremy
a747309ba8
[FIX] Add related field in sponsor model to allow public user to get logo from res partner without give all the rights.
...
bzr revid: jke@openerp.com-20140324134446-vy2vxycwltb8oclf
2014-03-24 14:44:46 +01:00
Christophe Simonis
d93b79e6f4
[MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
...
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
2014-03-24 14:38:11 +01:00
ba55fcf1d0
[IMP] website: Building block / Snippet Editor
...
Add documentation and clean framework
The building blocks appear in the edit bar website. These prebuilt html block allowing the designer to easily generate content on a page (drag and drop).
Options allow snippets to add customizations party html code according to their selector (jQuery) and javascript object.
bzr revid: chm@openerp.com-20140324130119-xbnejtayna8haykk
2014-03-24 14:01:19 +01:00
Christophe Simonis
7c4557add2
[FIX] http: nodb_routing_map become a lazy property. load_addons() is also lazy called
...
bzr revid: chs@openerp.com-20140324122610-dodj6tme5xpbkc3i
2014-03-24 13:26:10 +01:00
Christophe Simonis
c8eddb7d22
[ADD] openerp.tools.func.lazy_property():
...
Decorator for a lazy property of an object, i.e., an object attribute
that is determined by the result of a method call evaluated once. To
reevaluate the property, simply delete the attribute on the object, and
get it again.
bzr revid: chs@openerp.com-20140324120001-935d90ye7tb8a5q4
2014-03-24 13:00:01 +01:00
Denis Ledoux
f4b1d23cf2
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9159 revid:dle@openerp.com-20140324104743-ubvu8st7emq9pg1q
...
bzr revid: dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
2014-03-24 12:03:49 +01:00
Denis Ledoux
02459f8d4a
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9929 revid:dle@openerp.com-20140325104921-x8zjx5p71l1o3uif
...
bzr revid: dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140311164146-2s599kogbqj8e94l
bzr revid: dle@openerp.com-20140312111149-u6y036aej3ywq7et
bzr revid: dle@openerp.com-20140312121145-06s1jvct9v4m7l6s
bzr revid: mat@openerp.com-20140313084409-c0kckxemy3in0mlo
bzr revid: chs@openerp.com-20140313163420-ifa4hyixj722d6jo
bzr revid: chs@openerp.com-20140314102034-g0nzryvwhrpzdas9
bzr revid: chs@openerp.com-20140314104803-19c5snl2fcuih91o
bzr revid: odo@openerp.com-20140314143519-x6rzcfkkqxwc0e1g
bzr revid: chs@openerp.com-20140318110229-y8098w3shdpmoig2
bzr revid: dle@openerp.com-20140318151824-sscl4m8p87emjl8s
bzr revid: dle@openerp.com-20140320112618-yfyihlwz66ryeqf5
bzr revid: dle@openerp.com-20140320161003-j01cc6sqves2wnp2
bzr revid: dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
bzr revid: dle@openerp.com-20140321140450-8ulnhr76qybiadks
bzr revid: dle@openerp.com-20140324104743-ubvu8st7emq9pg1q
bzr revid: dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
2014-03-25 12:24:13 +01:00
Denis Ledoux
6d60e0ee29
[FIX] project: on project template duplication, keep original tasks stages
...
bzr revid: dle@openerp.com-20140325104921-x8zjx5p71l1o3uif
2014-03-25 11:49:21 +01:00
Martin Trigaux
91c3673949
[MERGE] [FIX] purchase_requisition: when getting the price based on the pricelist for a supplier, pass the missing supplier id (useful for pricelist based on supplier price) (opw 601890)
...
bzr revid: mat@openerp.com-20140325104613-t79wxl4y38ll82h0
2014-03-25 11:46:13 +01:00
Olivier Dony
38c255627e
[MERGE] l10n_fr: remove obsolete French taxes, following 2014 rate update, courtesy of Alexis de Lattre (Akretion)
...
bzr revid: odo@openerp.com-20140325104323-xtxthbopkhk350r4
2014-03-25 11:43:23 +01:00
Denis Ledoux
8310cd1920
[FIX] sale: make invoice for SO grouped by partner based on partner_invoice_id instead of just partner_id
...
For two sale order, if the partner_id were different but the partner_invoice_id were identical, the make invoice grouped by partner created two different invoices
bzr revid: dle@openerp.com-20140325103226-vusygdpd74yha91m
2014-03-25 11:32:26 +01:00
a8d14c47df
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140318062141-rdiqz2ptnz3qmxd0
bzr revid: launchpad_translations_on_behalf_of_openerp-20140325072122-d9jgtji9dmmytg8d
2014-03-25 07:21:22 +00:00
Denis Ledoux
04f632820b
[FIX] sale: trigger signal manual invoice for make invoices wizard (not advance)
...
bzr revid: dle@openerp.com-20140324103427-yckncrnynvs5si8i
2014-03-24 11:34:27 +01:00
Xavier Morel
aa9387e845
[FIX] don't mark view sections as dirty just because the snippets thing has inserted drop zones in it
...
bzr revid: xmo@openerp.com-20140324101850-el3cfs0x4uln3u7v
2014-03-24 11:18:50 +01:00
Simon Lejeune
245e83d43b
[FIX] last version of wkhtmltopdf expects all file to have a doctype, inject one if not present
...
bzr revid: sle@openerp.com-20140324101731-eqzqins3s8uak1yd
2014-03-24 11:17:31 +01:00
Christophe Simonis
58bd4d4950
[FIX] http: register the wsgi handler directly
...
bzr revid: chs@openerp.com-20140324093116-fuunq90t9qb5p8w5
2014-03-24 10:31:16 +01:00
Christophe Simonis
fc760dd0d0
[FIX] web: no need to initialize wsgi handler in postload anymore
...
bzr revid: chs@openerp.com-20140324093038-3nguocje3lia03jp
2014-03-24 10:30:38 +01:00
25d2a09812
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140324061240-jlo8rbxvlnlt5a3r
2014-03-24 06:12:40 +00:00
6472e4155a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140322070453-bbx8zxmppthwar0s
bzr revid: launchpad_translations_on_behalf_of_openerp-20140323064412-l97e4rap18b68ab0
2014-03-23 06:44:12 +00:00
Simon Lejeune
a3be66bb49
[IMP] ir.actions.report.xml views/models adapted for report_type controller
...
bzr revid: sle@openerp.com-20140321184739-0dmft3odaws85m7e
2014-03-21 19:47:39 +01:00
Christophe Simonis
fdd1f69294
[FIX] duplicate/rename/drop database: handle filestore
...
bzr revid: chs@openerp.com-20140321155659-gvg4br76214lur4l
2014-03-21 16:56:59 +01:00
Christophe Simonis
806648d611
[IMP] tools.exec_pg_command: hide command output
...
bzr revid: chs@openerp.com-20140321155605-u96hd1da3rrrmcgg
2014-03-21 16:56:05 +01:00
Denis Ledoux
0871d10503
[FIX] survey: avoid duplicate partners on new users creation
...
bzr revid: dle@openerp.com-20140321135705-lrnxu3gsnkt4r5cd
2014-03-21 14:57:05 +01:00
Xavier Morel
a56dc53bea
[REM] 4-spaces indent for web view pretty-print-before-save routine
...
Didn't quite work right: on the layout, it would exponentially increase
leading spaces in text nodes. Combined with a bug injecting snippets marks in
the footer (and thus invalidating and re-saving the layout at each snippet
addition) this could blow up the layout template and rendered page to >20MB.
Just keep lxml's standard 2-spaces indent.
LXML is unable to pretty print the layout anyway.
bzr revid: xmo@openerp.com-20140321075419-9w88h232r928xv5f
2014-03-21 08:54:19 +01:00
Denis Ledoux
30853afd18
[FIX] website: prevent animations in edit mode
...
bzr revid: dle@openerp.com-20140321150800-q8p8hn8a7aozcya4
2014-03-21 16:08:00 +01:00
Denis Ledoux
9fa1b047ba
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9158 revid:dle@openerp.com-20140321140450-8ulnhr76qybiadks
...
bzr revid: dle@openerp.com-20140321140751-cf85vp7m2p7pa4uf
2014-03-21 15:07:51 +01:00
Kersten Jeremy
356e4f595a
[FIX] Redirect user to /web/login and not /web. The redirect is now compatible with the rev web:3983 (needto be retrocompatible), but the good practice should be to always redirect to login. It is to login controller to redirect if user is alreayd logged.
...
bzr revid: jke@openerp.com-20140321115524-j3vk6lovuphnaods
2014-03-21 12:55:24 +01:00
Kersten Jeremy
1d4b43eb38
[FIX] Redirect user from /web if a get redirect is found.
...
If you redirect an user not logged, into /web?redirect=xxx, he was correctly redirect to /web/login?redirect=/web?redirect=xxx. But when user come back on /web?redirect=xxx, he was not redirected to xxx.
The question should be to have only one behavior when we redirect people, as well /web?redirect as well /web/login?redirect. But because we use both in actual code, we need to accept both for retro-compatibility.
bzr revid: jke@openerp.com-20140321115018-x4e3l3d1v0tp0dyo
2014-03-21 12:50:18 +01:00
2fa6706037
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140321065150-vovy9a0q2y6vkwm4
2014-03-21 06:51:50 +00:00
7b0b8a0790
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140320061913-o2fp3m104dzeb2ky
bzr revid: launchpad_translations_on_behalf_of_openerp-20140321065115-srp2g1l3twjabmcq
2014-03-21 06:51:15 +00:00
Denis Ledoux
54d8cd1e86
[FIX] crm: round robin tests on salesman assignation set force assignation true
...
bzr revid: dle@openerp.com-20140320183814-163zwgilty4l2jv7
2014-03-20 19:38:14 +01:00
Denis Ledoux
0e4cfe0add
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9157 revid:dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
...
bzr revid: chs@openerp.com-20140320134212-9nbuc7uqla4uiyf7
bzr revid: dle@openerp.com-20140320112958-slajf0ho0jtl7u60
bzr revid: dle@openerp.com-20140320161349-olyte7xt35nfj3dg
bzr revid: dle@openerp.com-20140320181737-68q9xh9jhfjynjip
2014-03-20 19:17:37 +01:00
Kersten Jeremy
9bf6f0310e
[FIX] Move default value in the _defaults of model and not in default_get.
...
Don't override the location_id if the super get_default don't retrun a value.
Else it is impossible to set a default value, because the ir_values is always overrided with stock_location_stock as location_id
bzr revid: jke@openerp.com-20140320180240-un42lptu3pjnsmxq
2014-03-20 19:02:40 +01:00
Denis Ledoux
abf8e0d54f
[ADD] crm: mass convert lead to opp, add force assignation checkbox, to force the salesman/salesteam on converted/merged lead/opps or leave the existing salesman/salesteam
...
bzr revid: dle@openerp.com-20140320175129-2lj2pu86l3rjoulw
2014-03-20 18:51:29 +01:00
Denis Ledoux
be81326ee3
[FIX] survey: report not stored on filesystem
...
bzr revid: dle@openerp.com-20140320174835-kdha7ivs64vsvizt
2014-03-20 18:48:35 +01:00
Denis Ledoux
84eeb79875
[FIX] point_of_sale: add multi-companies rules on pos.config
...
bzr revid: dle@openerp.com-20140320154436-ygqhvvyhe6otv70p
2014-03-20 16:44:36 +01:00
chm@openerp.com