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
Launchpad Translations on behalf of openerp
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
Launchpad Translations on behalf of openerp
25d2a09812
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140324061240-jlo8rbxvlnlt5a3r
2014-03-24 06:12:40 +00:00
Launchpad Translations on behalf of openerp
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
Simon Lejeune
d87cd37d67
[FIX] removed 'debugger' statement
...
bzr revid: sle@openerp.com-20140321184347-ph5n6cnywhwasvcf
2014-03-21 19:43:47 +01:00
Simon Lejeune
1b6b320445
[FIX] fixed the report type 'controller', fixed the report_vat_xls route
...
bzr revid: sle@openerp.com-20140321183649-rg8wrlvcrzvv0d29
2014-03-21 19:36:49 +01:00
Simon Lejeune
8581b1847f
[IMP] Multiple improvements: eval_param is set on the controller, the subprocess to get the version of wkhtmltopdf is only open at OpenERP start, better exceptions handling (try to avoid exceptions shallowing) and the rpc call from the webclient to know the version of wkhtmltopdf is only done once
...
bzr revid: sle@openerp.com-20140321164716-uksuu6hsjj7q3698
2014-03-21 17:47:16 +01:00
Frédéric van der Essen
6aa0187ca3
[IMP] posbox: print the homepage url on the status ticket
...
bzr revid: fva@openerp.com-20140321163740-0o0b3ikmz6jv6cwr
2014-03-21 17:37:40 +01:00
Frédéric van der Essen
88e9f7e90b
[IMP] posbox: add a software upgrade page that allows to remotely update the posbox's software
...
bzr revid: fva@openerp.com-20140321162336-n05c693ukz3awfyg
2014-03-21 17:23:36 +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
Frédéric van der Essen
e7ba075c59
[IMP] hw_proxy: make the posbox doc publicly available
...
bzr revid: fva@openerp.com-20140321135245-2kcswqfijr1favwv
2014-03-21 14:52:45 +01:00
Frédéric van der Essen
0e251dbc8e
[IMP] posbox: add a homepage to the root controller on the posbox that explains what it is and where to find information
...
bzr revid: fva@openerp.com-20140321134623-eaj56nrh8hkagvym
2014-03-21 14:46:23 +01:00
Simon Lejeune
5ac5805da0
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140321122202-cegi29h86p0bf54r
2014-03-21 13:22:02 +01:00
Simon Lejeune
1128743932
[FIX] Added the decorator website on the get_file route, correctly pass the context on the mrp bom structure and allow to install report module without pypdf installed
...
bzr revid: sle@openerp.com-20140321122103-mzp465s8hxckq4ai
2014-03-21 13:21:03 +01:00
Dharmraj Jhala (OpenERP)
c96f080e72
[IMP] improved code
...
bzr revid: dizzy.zala@gmail.com-20140321120550-8p0l6lh5iv45mvf7
2014-03-21 17:35:50 +05:30
Simon Lejeune
6b5986e34d
[FIX] ir_http website postprocess args: do not redirect if the only difference between the url and the post-processed url is the url-enconding of some characters
...
bzr revid: sle@openerp.com-20140321120133-0k1zjsrtgwrw6oon
2014-03-21 13:01:33 +01:00
Simon Lejeune
e06cefb4be
[FIX] Correctly separate website variable between report and website_report layouts
...
bzr revid: sle@openerp.com-20140321111742-rzkykk00z6fbum8d
2014-03-21 12:17:42 +01:00
Simon Lejeune
57e6e8fd28
[FIX] Multiples fixes: correct context passing, changed osv.Model to osv.AbstractModel to avoid creating tables in database when the model use for the reports contains only method
...
bzr revid: sle@openerp.com-20140321105806-0bwo992995la91fe
2014-03-21 11:58:06 +01:00
Dharmraj Jhala (OpenERP)
e925756b7f
[IMP] improved typo
...
bzr revid: dizzy.zala@gmail.com-20140321100509-1htk580zquuov71m
2014-03-21 15:35:09 +05:30
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
Dharmraj Jhala (OpenERP)
8bb5bfa241
[MERGE] with latest trunk addons
...
bzr revid: dizzy.zala@gmail.com-20140320063836-xzno2dwuaxt1y033
bzr revid: dizzy.zala@gmail.com-20140321073301-hvfqqnch7jfktinb
2014-03-21 13:03:01 +05:30
Dharmraj Jhala (OpenERP)
f7621ff8be
[MERGE] with latest trunk server
...
bzr revid: pga@tinyerp.com-20140228054414-z2x4vufay1gbbpao
bzr revid: dizzy.zala@gmail.com-20140318065312-uq43i2aiha1kn3d0
bzr revid: dizzy.zala@gmail.com-20140319090323-0srxjge14cw8y4wv
bzr revid: dizzy.zala@gmail.com-20140320064008-fj9merih0wtz6tz6
bzr revid: dizzy.zala@gmail.com-20140321073141-f54b3lqel1l9lgq2
2014-03-21 13:01:41 +05:30
Launchpad Translations on behalf of openerp
2fa6706037
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140321065150-vovy9a0q2y6vkwm4
2014-03-21 06:51:50 +00:00
Launchpad Translations on behalf of openerp
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
Frédéric van der Essen
b206261dd5
[IMP] hw_escpos: re-enabled image printing in xml receipts
...
bzr revid: fva@openerp.com-20140320170955-ekgya8pcv2wljhl8
2014-03-20 18:09:55 +01:00
Simon Lejeune
246ec6854b
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140320170806-3mfsm4nmhiq1ujk7
2014-03-20 18:08:06 +01:00
Simon Lejeune
ad50d5fcfe
[FIX] Multiple improvements in report including giving formatlang a cursor and a uid via a lambda method, cleaning of some comments and restoring the page numbering
...
bzr revid: sle@openerp.com-20140320165841-21clvch4ujak1y3m
2014-03-20 17:58:41 +01:00
Frédéric van der Essen
a4afb910e9
[IMP] hw_escpos / point_of_sale: print receipt with an xml template
...
bzr revid: fva@openerp.com-20140320164530-odpeuf1igh7wkrms
2014-03-20 17:45:30 +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