pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,833 Commits 1 Branch 0 Tags
58263bcbbda0893ebbb4d8da53959bda94ef6607
Commit Graph
375 Commits
Author SHA1 Message Date
Christophe Simonis a7c2125735 [MERGE] forward port of branch saas-4 up to 6b8e972 2014-06-10 13:15:46 +02:00
Christophe Simonis 6b8e9727e5 [MERGE] forward port of branch saas-3 up to 4601d85 2014-06-10 12:29:47 +02:00
Christophe Simonis 4601d85944 [MERGE] forward port of branch 7.0 up to 6fdb783 2014-06-10 11:49:14 +02:00
Martin Trigaux 6fdb783a37 Merge pull request #56 from yvaucher/7.0-fix-1319109 
[FIX] report_webkit: avoid sharing parser instance globally and make it thread safe
 2014-06-10 09:38:48 +02:00
Olivier Dony 04211015fc [MERGE] Forward-port of latest saas-4 fixes, up to 0452851 2014-05-27 20:49:49 +02:00
Olivier Dony fd21abd847 [MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da 2014-05-27 17:18:43 +02:00
Olivier Dony 2af03e1b6e [MERGE] Forward-port latest 7.0 bugfixes, up to f8671cb 2014-05-22 16:44:33 +02:00
Yannick Vaucher 4ed343455c Fix incompatibility with Windows using tempfile. 2014-05-14 13:22:42 +02:00
Yannick Vaucher e367a54640 fix indentation 2014-05-14 11:50:27 +02:00
Yannick Vaucher 72ab3e81a5 Make report_webkit thread safe by removing parser_instance attribute, as a WebkitParser instance can be shared by multiple thread and thus we don't want a thread to erase parser_instance of anorther thread. 2014-05-13 18:23:48 +02:00
Yannick Vaucher 494f1686c3 Use NamedTemporaryFile instead of file and of deprecated mktemp. That way we ensure 2 files created at the exact same time will have a unique name 2014-05-13 17:56:10 +02:00
Jitendra Prajapati (OpenERP) 59a9d91558 [MERGE]sync main branch 
bzr revid: jpr@tinyerp.com-20140505095247-gv9je300z9j98sk0
 2014-05-05 15:22:47 +05:30
Antony Lesuisse 7e25b9ae55 [MERGE] saas-4 report_webkit missing dependency on report 
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
 2014-05-01 18:11:56 +02:00
Antony Lesuisse 9efc4c4db2 [FIX] report_webkit missing dependency on report 
bzr revid: al@openerp.com-20140501161108-50yidx30rm6z7d10
 2014-05-01 18:11:08 +02:00
Jitendra Prajapati (OpenERP) 9c051c5bd9 [MERGE]with main branch 
bzr revid: jpr@tinyerp.com-20140424050125-c58ek4dlw5805k29
 2014-04-24 10:31:25 +05:30
Simon Lejeune 85c32739d9 [FIX] report_webkit: moved configuration to the report tab of company form and moved menuitem under 'Reports' menuitem 
bzr revid: sle@openerp.com-20140423132927-3n5xv62zck6nyh2m
 2014-04-23 15:29:27 +02:00
Launchpad Translations on behalf of openerp fa60b90c1f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
 2014-04-22 07:52:47 +00:00
Jitendra Prajapati (OpenERP) 3b1b426e0b [MERGE]with main branch 
bzr revid: jpr@tinyerp.com-20140415053045-yh8qhduikoqdhz36
 2014-04-15 11:00:45 +05:30
Launchpad Translations on behalf of openerp e82fbf7d91 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
 2014-04-12 08:31:53 +00:00
Jitendra Prajapati (OpenERP) 7d06600a77 [MERGE]with main branch 
bzr revid: jpr@tinyerp.com-20140403093632-rdnixbj5vulsoppy
 2014-04-03 15:06:32 +05:30
Launchpad Translations on behalf of openerp 51aa261b44 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
 2014-03-27 07:35:04 +00:00
Jitendra Prajapati (OpenERP) 0178fa1fa6 [MERGE]with main branch 
bzr revid: jpr@tinyerp.com-20140327062643-wcrsh4q9fwzhm2wz
 2014-03-27 11:56:43 +05:30
Launchpad Translations on behalf of openerp 87f5acb97b Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140326071242-wi4c4p17bbhfp671
 2014-03-26 07:12:42 +00: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
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
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
Jitendra Prajapati (OpenERP) f81c4ec36e [MERGE]with main branch 
bzr revid: jpr@tinyerp.com-20140319051202-hvo8wvd8aunce5bc
 2014-03-19 10:42:02 +05:30
Launchpad Translations on behalf of openerp 9863dbe5c8 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
 2014-03-04 07:52:38 +00:00
Atul Patel (OpenERP) 403575f272 [MERGE]: Merged with addons 
bzr revid: atp@tinyerp.com-20140210064642-edr5rju09v49dzqg
 2014-02-10 12:16:42 +05:30
Jitendra Prajapati (OpenERP) 58476c1968 [MERGE]with lp:openobject-addons 
bzr revid: jpr@tinyerp.com-20140204062122-900f6528zk7k15if
 2014-02-04 11:51:22 +05:30
Launchpad Translations on behalf of openerp 3ce5e01eca Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
 2014-01-28 06:41:39 +00:00
Pooja Zankhariya (OpenERP) 90717ea1b0 [MERGE]Merge with Trunk 
bzr revid: prajapatijitendra7969@gmail.com-20131127051848-i0hrg70ro4uu68oq
bzr revid: prajapatijitendra7969@gmail.com-20131202053459-2p1zdlhgcai3bszr
bzr revid: prajapatijitendra7969@gmail.com-20131212072502-ktr7iyuietkiofl5
bzr revid: prajapatijitendra7969@gmail.com-20131217050537-thvwwcn2k599cs5l
bzr revid: pza@tinyerp.com-20131226071410-pnnr7i5lwu4qn4py
 2013-12-26 12:14:10 +05:00
Christophe Simonis 6f67143908 [FIX] *: do not call deprecated method LocalService() 
bzr revid: chs@openerp.com-20131121120611-06h1pki3460tzj1s
 2013-11-21 13:06:11 +01:00
Launchpad Translations on behalf of openerp 271ed43e7b Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121054848-007arsnnoa8fs65e
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063838-blqn6j0yfmrlw5vp
 2013-11-21 06:38:38 +00:00
Launchpad Translations on behalf of openerp eaa917bef9 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131120054418-15be15rhz84vk0et
 2013-11-20 05:44:18 +00:00
Launchpad Translations on behalf of openerp 108ccbf108 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114062958-ies8xa3pft7n59ms
bzr revid: launchpad_translations_on_behalf_of_openerp-20131106055135-r0xt2vr04710jh1t
bzr revid: launchpad_translations_on_behalf_of_openerp-20131107055120-r8z445ergt50erlx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108062620-bvfofx1jl1wb1csh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110064525-ioceogsmu0nmx2qj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111053908-gbrp09ast5fhr6iw
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112062316-5uf2bvbzdhkq1b7k
bzr revid: launchpad_translations_on_behalf_of_openerp-20131113060841-bkjcuz4e9rtzn6f9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114063058-rrm2q5lxkyawuvpz
 2013-11-14 06:30:58 +00:00
Pooja Zankhariya (OpenERP) 24a976502c [IMP]Improved logo align for webkit report 
bzr revid: pza@tinyerp.com-20131106110925-5ncq3u8rb8r1xmdj
 2013-11-06 16:09:25 +05:00
Atul Patel (OpenERP) 57fa2724af [MERGE]: Merged with addons 
bzr revid: atp@tinyerp.com-20131029135026-9oatploppbu9k1nn
 2013-10-29 19:20:26 +05:30
Olivier Dony 5cba82e2c9 [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8788 dle@openerp.com-20131003094541-ro29hhkas03rdvw8 
bzr revid: odo@openerp.com-20131003111222-upt1ytb92db50zay
 2013-10-03 13:12:22 +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
Launchpad Translations on behalf of openerp ba95017720 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130925054914-zqgjgcb39ny7ejt5
 2013-09-25 05:49:14 +00:00
Launchpad Translations on behalf of openerp 9dba69ba48 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
 2013-09-12 06:40:18 +00:00
Launchpad Translations on behalf of openerp cb8f9c5a0d Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903054857-i15nhvtthlho7chm
 2013-09-03 05:48:57 +00:00
Jaydeep Barot (OpenERP Trainee) 5fbf21698c [MERGE]: Merged with lp:openobject-addons 
bzr revid: jaydeep.gvp@gmail.com-20130822055918-ul0xjgz6c40rcuy3
 2013-08-22 11:29:18 +05:30
Olivier Dony c02afb45fa [MERGE] Forward-port of bugfixes from saas-1 series up to rev.8759 rev-id: odo@openerp.com-20130820152607-0p0fx87v1rqhk3vy 
bzr revid: odo@openerp.com-20130820165258-3mjzbo990xg44dfu
 2013-08-20 18:52:58 +02:00
Denis Ledoux a99b5786d1 [MERGE] Forward-port of 7.0 bugfixes up to rev. 9337 (dle@openerp.com-20130731153129-8hmqrgsg3e9d533f) 
bzr revid: mat@openerp.com-20130726073123-6buqe3rg321gj5rw
bzr revid: odo@openerp.com-20130730110536-a74ea14pwb2y03ay
bzr revid: dle@openerp.com-20130801123703-frjhpeqwocsjo7ge
 2013-08-01 14:37:03 +02:00
Launchpad Translations on behalf of openerp 20a0428e6f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130726054722-d69j4mwclp38job7
bzr revid: launchpad_translations_on_behalf_of_openerp-20130727052743-v62n9j5jvp11j2ji
bzr revid: launchpad_translations_on_behalf_of_openerp-20130728063405-ksa7gfbj9k4hajaj
bzr revid: launchpad_translations_on_behalf_of_openerp-20130729055426-094ilqmvjoocrzmm
bzr revid: launchpad_translations_on_behalf_of_openerp-20130727052813-u58hk431f664vao7
bzr revid: launchpad_translations_on_behalf_of_openerp-20130728063427-t032j0icp8pkksol
bzr revid: launchpad_translations_on_behalf_of_openerp-20130729055503-id0512tblbixh8to
 2013-07-29 05:55:03 +00:00
Martin Trigaux 2ee6e30f02 [IMP] report_webkit: show labels on form view, courtesy of Yannick Vaucher (Camptocamp) 
lp bug: https://launchpad.net/bugs/1077238 fixed

bzr revid: mat@openerp.com-20130726093030-3umg02phcinzvklv
 2013-07-26 11:30:30 +02:00
Martin Trigaux 0b6e7ea4d3 [MERGE] [IMP] report_webkit: better installation message for wkhtmltopdf, courtesy of Yannick Vaucher (Camptocamp) 
lp bug: https://launchpad.net/bugs/1113418 fixed

bzr revid: mat@openerp.com-20130722153657-5i04kjvq51lcjro1
 2013-07-22 17:36:57 +02:00