Commit Graph
103218 Commits
Author SHA1 Message Date
Richard Mathot (OpenERP) a8117436ab [FIX] Typos and bullshit introduced in r10622
bzr revid: rim@openerp.com-20140325093023-07nvjr5543liobm9
2014-03-25 10:30:23 +01:00
Thibault Delavallée b01ecbec97 [FIX] mass_mailing: email_template: finally found how to specify
a form view id in an action; do not use view_id that seems to be used for
that, but changes the view order (always form by default)... bleurg.

bzr revid: tde@openerp.com-20140325093007-g3hy9m8kcac9x1xs
2014-03-25 10:30:07 +01:00
chm@openerp.com 82989d95f7 [FIX] phantomjs: hide error if document.body does not exists
bzr revid: chm@openerp.com-20140325092547-ilnbqdj4rhdo0q3r
2014-03-25 10:25:47 +01:00
Turkesh Patel (Open ERP) a9d192da24 [IMP] improved code to show some items based on user.
bzr revid: tpa@tinyerp.com-20140325091240-ie606wjojnfakgno
2014-03-25 14:42:40 +05:30
Thibault Delavallée 83151d515c [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140325090223-ubimv7051snep8rp
2014-03-25 10:02:23 +01:00
Thibault Delavallée 7185a68775 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20140325090209-w1qtcswiao01gqlu
2014-03-25 10:02:09 +01:00
Richard Mathot (OpenERP) 631532072d [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140325085451-rscgni01o54123fm
2014-03-25 09:54:51 +01:00
Richard Mathot (OpenERP) 2c9b2f1b18 [IMP] Kanban view improvements 10-first-clicks
bzr revid: rim@openerp.com-20140325085155-c2ik8r09re5yyna5
2014-03-25 09:51:55 +01:00
chm@openerp.com 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
chm@openerp.com 13d7cfe86c [MERGE] from trunk
bzr revid: chm@openerp.com-20140324082341-d6gqyloc7822aen2
bzr revid: chm@openerp.com-20140325084852-i1yomuyhyen4ss95
2014-03-25 09:48:52 +01:00
Cedric Snauwaert 704d4d59f1 [FIX]barcode interface backend
bzr revid: csn@openerp.com-20140325080823-tvvv11eocxj72hqe
2014-03-25 09:08:23 +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
Turkesh Patel (Open ERP) ff76d9ff8a [IMP] improved code to redirect to the login when user click on convert to comment/answer if not logged in
bzr revid: tpa@tinyerp.com-20140325070648-uhyr841iiahnrbz0
2014-03-25 12:36:48 +05:30
Vidhin Mehta (OpenERP) 279be8cb26 [IMP]code refactore python.
bzr revid: vme@tinyerp.com-20140325065616-u4gksi76xtb6ajhw
2014-03-25 12:26:16 +05:30
Turkesh Patel (Open ERP) bde130d9d9 [FIX] improved code to convert msg to plain text from html when convert message in to the comment.
bzr revid: tpa@tinyerp.com-20140325064804-tsb6ok9invu4rkga
2014-03-25 12:18:04 +05:30
Turkesh Patel (Open ERP) f6fa645e8f [IMP] improved code to do not load tags on every page, added new website_forum.js file.
bzr revid: tpa@tinyerp.com-20140325061901-3r0a2rhq74gnt1yt
2014-03-25 11:49:01 +05:30
Amit Dodiya 26f807fa02 [FIX] account_voucher: forward port of 6.0 revision: 5094, for issue cancel_voucher method is unlinking the whole account_move_reconciliation record
bzr revid: ado@tinyerp.com-20140325054743-opywyna9w1toyjp8
2014-03-25 11:17:43 +05:30
Randhir Mayatra rma-openerp 6d414dd923 [MERGE] merge with latest trunk
bzr revid: rma@tinyerp.com-20140325045319-chemmuka66i1bgy2
2014-03-25 10:23:19 +05:30
Dharmraj Jhala (OpenERP) 4c18370ae3 [MERGE] with parent branch
bzr revid: dizzy.zala@gmail.com-20140325044412-upz499nm4lqk539m
2014-03-25 10:14:12 +05:30
Turkesh Patel (Open ERP) d70dc3f425 [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20140325044139-pj35ha1kvt5qcydb
2014-03-25 10:11:39 +05:30
Fabien Pinckaers 2971b56c14 [IMP] removed unused code
bzr revid: fp@tinyerp.com-20140324214917-g5lsl3rwyxplkj7v
2014-03-24 22:49:17 +01:00
Fabien Pinckaers fa46f255f2 [IMP] wording
bzr revid: fp@tinyerp.com-20140324203540-rx76yaqaw3p9aql9
2014-03-24 21:35:40 +01:00
Simon Lejeune c2e7a69eba [MERGE][REF] Report module: Moved methods generating pdf/html from Controller to Model in order to be able to print without request (report controllers still exist but are now just interfaces to these methods) ; adapted account_vat report this way
bzr revid: sle@openerp.com-20140324181616-5kty54mh9zg2mlj3
2014-03-24 19:16:16 +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 b6f6f8614a [FIX] Handle the case where website is installed but the pdf generation is not called in a website request context
bzr revid: sle@openerp.com-20140324174630-43wi6nlh6bigaq7g
2014-03-24 18:46:30 +01:00
Thibault Delavallée 7945d4bb97 [IMP] email_template: added a minimal form view + some custo in mass mailing views
bzr revid: tde@openerp.com-20140324171017-mcv5m493zpba5tgd
2014-03-24 18:10:17 +01:00
Simon Lejeune abce91a8c1 [WIP] tests reports not using httpcase, commented out until post installt tests are working
bzr revid: sle@openerp.com-20140324170222-oxjbgzyvoko2tez3
2014-03-24 18:02:22 +01:00
Josse Colpaert 91a4f76a2b [IMP] Improvements in first chapters
bzr revid: jco@openerp.com-20140324165056-9a1ju26rpgxzfqqp
2014-03-24 17:50:56 +01:00
Simon Lejeune fba94c1827 [MERGE] trunk
bzr revid: sle@openerp.com-20140324164442-bdxf7faei0rmlemj
2014-03-24 17:44:42 +01:00
Simon Lejeune 6889165eb1 [MERGE] trunk
bzr revid: sle@openerp.com-20140324164409-452kibtg3l7rd0nj
2014-03-24 17:44:09 +01:00
Martin Trigaux 33c6f108c0 [FIX] parent_model is null if local column
bzr revid: mat@openerp.com-20140324164334-pvzevi2bnmb642ak
2014-03-24 17:43:34 +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 25b993a62c [FIX] hide the 'search associated qweb views' button when the report_type is not qweb-pdf/qweb-html
bzr revid: sle@openerp.com-20140324162729-k3n6pkhhe8pe6bdp
2014-03-24 17:27:29 +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
Martin Trigaux 66d6fb065f [FIX] fields: when executing (4, *) operations on o2m fields, check the existence based on the sql model of the table.
If the o2m field linked to the o2m is stored on a different table (eg: inherit), previous request would crash as the field do not exists in the '_table' sql table

bzr revid: mat@openerp.com-20140324162130-fyotk8vqmkha43eb
2014-03-24 17:21:30 +01:00
Simon Lejeune 9556cadbff [MERGE] trunk
bzr revid: sle@openerp.com-20140324162043-dzdwcxdt32sfjy57
2014-03-24 17:20:43 +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
Josse Colpaert 4d2eb14146 [IMP] The main pos config should use a standard picking type
bzr revid: jco@openerp.com-20140324160311-aj4zh1y9etbeszfp
2014-03-24 17:03:11 +01:00
Cedric Snauwaert fd00c531d5 [FIX]barcode_interface: correct use of url hash in interface
bzr revid: csn@openerp.com-20140324155628-bojwf560y73s9pv7
2014-03-24 16:56:28 +01:00
Josse Colpaert fd6352ac06 [IMP] Change report to have location instead of warehouse
bzr revid: jco@openerp.com-20140324152211-jecefcplr9mjk0wy
2014-03-24 16:22:11 +01:00
Fabien Meghazi bb8b7ea2d9 [ADD] website ir_http: serve binary ir.attchments with urls
bzr revid: fme@openerp.com-20140324151728-hpegewvf3b38ndyi
2014-03-24 16:17:28 +01:00
Fabien Meghazi 5e484ae892 [IMP] Properly import files
bzr revid: fme@openerp.com-20140324151711-89mfg14573dpnh0p
2014-03-24 16:17:11 +01:00
Fabien Meghazi 9285813da9 [IMP] website images: only checksum ir.attachment for empty urls
bzr revid: fme@openerp.com-20140324151447-a3mkncjh0b7k16hg
2014-03-24 16:14:47 +01:00
Simon Lejeune ab003bfea6 [IMP] ir_actions wording
bzr revid: sle@openerp.com-20140324150533-bs1lwvhd2z2jow8m
2014-03-24 16:05:33 +01:00
chm@openerp.com 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
Denis Ledoux 98ca1ab200 [FIX] account_voucher: bank statement reconciliation for refund invoices
bzr revid: dle@openerp.com-20140324144518-pnjtlxpuz63bq6ig
2014-03-24 15:45:18 +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
Thibault Delavallée 3752e22481 [FIX] mail.compose.message: display mass mailing data only in mass mailing mode
bzr revid: tde@openerp.com-20140324140051-ijza7tn0w2ljgs4j
2014-03-24 15:00:51 +01:00