Commit Graph

202 Commits

Author SHA1 Message Date
Vo Minh Thu 9822629548 [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
Twinkle Christian (OpenERP) fc1b1749a8 [IMP]Remove type field from the modules
bzr revid: tch@tinyerp.com-20120809060516-zgx3gdyv6wdshfyw
2012-08-09 11:35:16 +05:30
Launchpad Translations on behalf of openerp e970ecd62c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120809050051-p6f437n80grsr5vz
2012-08-09 05:00:51 +00:00
Olivier Dony 3fd9a77c83 [REVERT] Cancel PO Template changes from rev.2702 - to be fully re-generated before next release
We'll also attempt to replace the master strings in the
translated .po files before replacing the master strings,
to avoid losing translations just because of mere typo fixes.

bzr revid: odo@openerp.com-20120808144613-wtz50tcz5n7kvcza
2012-08-08 16:46:13 +02:00
Antonin Bourguignon a97687a420 [MERGE] latest trunk
also replace the error message title 'Operation Not Permitted' by 'Invalid Action'

bzr revid: abo@openerp.com-20120807120451-zdrrecilfh82obhl
2012-08-07 14:04:51 +02:00
Jigar Amin - OpenERP 935e31b328 merge lp:openobject-addons
bzr revid: jam@tinyerp.com-20120807105628-j3py2jnd1fnbnzza
2012-08-07 16:26:28 +05:30
Twinkle Christian (OpenERP) 2e689ca4e0 [IMP]improved views
bzr revid: tch@tinyerp.com-20120807093734-0u3ozi0hn7rxiy2q
2012-08-07 15:07:34 +05:30
Launchpad Translations on behalf of openerp 3cfd65b43d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120807053928-8131c98edycpivlb
2012-08-07 05:39:28 +00:00
pso (OpenERP) e5da0e191b [MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
2012-07-25 18:23:32 +05:30
Saurang Suthar(OpenERP) 7e978dce74 [IMP] Improved warning messages for report_webkit, share and wiki modules
bzr revid: pso@tinyerp.com-20120722134024-hu4fbdhw5ga8p1u7
2012-07-22 19:10:24 +05:30
pso (OpenERP) d5d97cb6e3 [MERGE] Improved warning messages for report_webkit, share and wiki modules
bzr revid: pso@tinyerp.com-20120722131934-j9rbotugz3ymvt4m
2012-07-22 18:49:34 +05:30
Purnendu Singh (OpenERP) c45d68d6b8 [MERGE] Merge with main addons
bzr revid: psi@tinyerp.com-20120718055558-03lss1ha0tcdi2dk
2012-07-18 11:25:58 +05:30
Purnendu Singh (OpenERP) 2e2f7188d3 [MERGE, IMP] improve and merge cha branch to update desc formatting
bzr revid: psi@tinyerp.com-20120716094548-xx1ip3eljal3ffvl
2012-07-16 15:15:48 +05:30
Launchpad Translations on behalf of openerp 8028996327 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120714062750-arh47r4vgtj7zlwu
2012-07-14 06:27:50 +00:00
Ajay Chauhan (OpenERP) 01981534f6 [IMP] : Update Description for modules
bzr revid: cha@tinyerp.com-20120713093114-wzrprgaeo34tzjbx
2012-07-13 15:01:14 +05:30
Fabien Pinckaers 64a9321d56 [IMP] footer on forms
bzr revid: fp@tinyerp.com-20120710164011-unqi1okf2uu8yhts
2012-07-10 18:40:11 +02:00
Raphael Collet 5133bee1d5 [FIX] in form views, replace class 'oe_highlight_on_dirty' by 'oe_highlight'
bzr revid: rco@openerp.com-20120629083024-rqhtbf9melkygg0m
2012-06-29 10:30:24 +02:00
Raphael Collet 1debe0efcd [MERGE] from trunk
bzr revid: rco@openerp.com-20120628131210-hyx2t1lqbl5hwm9g
2012-06-28 15:12:10 +02:00
Launchpad Translations on behalf of openerp 997fe404b3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120628044101-cehvpv9yfm3xfsr3
2012-06-28 04:41:01 +00:00
Jigar Amin - OpenERP 11224704cd [FIX] purchase*, sale, share, report_webkit, buton cancel
bzr revid: jam@tinyerp.com-20120627134530-141mzncfffkmjrom
2012-06-27 19:15:30 +05:30
Jigar Amin - OpenERP 7c645856fe [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120627114052-094g4yequ34sr59d
2012-06-27 17:10:52 +05:30
Twinkle (OpenERP) 471037495c [IMP]Apply css class flow on wizards buttons
bzr revid: tch@tinyerp.com-20120626063119-5i93di16milljxap
2012-06-26 12:01:19 +05:30
Twinkle (OpenERP) 0e97cefe9e [IMP]Improve wizard button
bzr revid: tch@tinyerp.com-20120625100901-ucjbttxod55erqmf
2012-06-25 15:39:01 +05:30
Kuldeep Joshi (OpenERP) 3c50eb017a [IMP] set logging.getLogger(__name__)
bzr revid: kjo@tinyerp.com-20120622064854-5f6fss55k7305e8q
2012-06-22 12:18:54 +05:30
Twinkle (OpenERP) 660cc67256 [IMP]Added highlight button on wizard
bzr revid: tch@tinyerp.com-20120620104923-z1hty740vn160fg9
2012-06-20 16:19:23 +05:30
Jigar Amin - OpenERP 21650f9790 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120619093157-ay1hdzmp8yh8bfgz
2012-06-19 15:01:57 +05:30
Stephane Wirtel 038e61fef4 [REF] Review and fix some views
bzr revid: stw@openerp.com-20120618163959-84x74s1vpuhkmqo9
2012-06-18 18:39:59 +02:00
Turkesh Patel (Open ERP) 7aa15407c9 [IMP] report_webkit:remove cancel button from wizard and improved view.
bzr revid: tpa@tinyerp.com-20120618084925-ddk4gf2d4mywiqp5
2012-06-18 14:19:25 +05:30
Launchpad Translations on behalf of openerp 10291e4673 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120616050526-srd8lul8rylb2k80
bzr revid: launchpad_translations_on_behalf_of_openerp-20120617044416-mxknrkegpytqjux4
bzr revid: launchpad_translations_on_behalf_of_openerp-20120616045845-74cddydmo6bilpef
bzr revid: launchpad_translations_on_behalf_of_openerp-20120617043537-yuizdga4lqp4zvl5
bzr revid: launchpad_translations_on_behalf_of_openerp-20120618052727-0zp1kvye3gwpzepo
2012-06-18 05:27:27 +00:00
Turkesh Patel (Open ERP) bd5be877db [IMP] report_webkit: remove cancel button and improved view of wizard.
bzr revid: tpa@tinyerp.com-20120615104312-n14uwl9b14khnrnc
2012-06-15 16:13:12 +05:30
Fabien Pinckaers 1f885950b4 [FIX] headers
bzr revid: fp@tinyerp.com-20120609222849-gm9loztzarjyn7pl
2012-06-10 00:28:49 +02:00
Fabien Pinckaers 7e5c7916a2 [IMP] form view, removed project_planning
bzr revid: fp@tinyerp.com-20120609194946-5pgqdhkf1mmrleox
2012-06-09 21:49:46 +02:00
Sanjay Gohel (Open ERP) e07d4252eb [IMP]:add condition for context in report_webkit for fields view get
bzr revid: sgo@tinyerp.com-20120605113839-cum83coqtg6ji8jh
2012-06-05 17:08:39 +05:30
Fabien Pinckaers c90df64012 [IMP] Moved Webkit Configuration to Technical menu
bzr revid: fp@tinyerp.com-20120529143006-u0q234936m9r1pr3
2012-05-29 16:30:06 +02:00
Kuldeep Joshi (OpenERP) 261c94cbe0 [FIX]report_webkit: remover address filed
bzr revid: kjo@tinyerp.com-20120326093254-6h0phzkm64nr3doz
2012-03-26 15:02:54 +05:30
Launchpad Translations on behalf of openerp 88c25488a5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120218050004-fsjgcm68ejwkyila
bzr revid: launchpad_translations_on_behalf_of_openerp-20120219054401-1933r0e5ukykqh0h
bzr revid: launchpad_translations_on_behalf_of_openerp-20120220054126-hug47vk8c43pxbqk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120221055612-pdqteum51dyapu2e
2012-02-21 05:56:12 +00:00
Launchpad Translations on behalf of openerp 9f65e1565e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120217050201-xlguleciidhnkxln
bzr revid: launchpad_translations_on_behalf_of_openerp-20120217051344-6opxazcgg875mypq
2012-02-17 05:13:44 +00:00
Stephane Wirtel 4fe0e22bbe [FIX] report_webkit: fix the path computation for the webkithtmltopdf executable
bzr revid: stw@openerp.com-20120216105858-74d2m1qhjhqu8in7
2012-02-16 11:58:58 +01:00
Stephane Wirtel 5d4ff77bd3 [FIX] webkit: Set the right signature for the get_lib function
bzr revid: stw@openerp.com-20120215095527-a3b4ps6lyk735v1h
2012-02-15 10:55:27 +01:00
Antony Lesuisse 137612b4c5 [MERGE] report_webkit move wkhtmltopdf PATH from company to ir config parameters
bzr revid: al@openerp.com-20120215092317-ops1e4bbjepzrsah
2012-02-15 10:23:17 +01:00
Olivier Dony 64d0bdfb4a [MERGE] webkit: support for @webkit_header attribute in <report> tags courtesy of Nicolas Bessi (Camptocamp)
Also updates the sample invoice report from
report_webkit_sample.

bzr revid: odo@openerp.com-20120214141148-qgm8sky27u9sfqhp
2012-02-14 15:11:48 +01:00
Stephane Wirtel 1052e36d7c [FIX] report_webkit: Use the parent of the root_path if we use openerp on Windows
bzr revid: stw@openerp.com-20120213173514-vj6mqv9qrqs0y7k6
2012-02-13 18:35:14 +01:00
Launchpad Translations on behalf of openerp 74b3b0bc69 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214054303-2gawtr1s4zulhhhs
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214054630-925y7kotw7axa7z4
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214061906-2g5kxwe0xle5u54c
2012-02-14 06:19:06 +00:00
Olivier Dony 5ecb66312c [REV] Last merge by AL breaks tests
bzr revid: odo@openerp.com-20120213084242-wn07hua23owewgvm
2012-02-13 09:42:42 +01:00
Antony Lesuisse 87c00a1d3e [MERGE] webkit wkhtmltopdf path configuration
bzr revid: al@openerp.com-20120210173911-9f7oqrtghejse9o4
2012-02-10 18:39:11 +01:00
Stephane Wirtel 7500c3976c [FIX] report_webkit: Integration of WebkitHtmlToPdf
The system will read the default path from the webkit_path defined into the ir.config_parameter.
If there is no value, the system will use the PATH.

bzr revid: stw@openerp.com-20120210160929-thor1qik8i3ybnn2
2012-02-10 17:09:29 +01:00
Launchpad Translations on behalf of openerp 0e2e9ddd78 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120209055558-qfwy9bg1km791dys
bzr revid: launchpad_translations_on_behalf_of_openerp-20120209071015-0jykfhbo8iamzpzk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120209072746-stmwycdircyzrxn4
2012-02-09 07:27:46 +00:00
Carlos Vásquez 3afecc7604 [ADD] es_CR.po: added po to all modules, copy from es.po or from pot
bzr revid: carlos.vasquez@clearcorp.co.cr-20120208145917-aaai0irh68omlzmb
2012-02-08 08:59:17 -06:00
Launchpad Translations on behalf of openerp 320b2d2e2e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120208060921-wir47e717rh04xxn
bzr revid: launchpad_translations_on_behalf_of_openerp-20120208063913-vg9qdu30tx09ojrl
2012-02-08 06:39:13 +00:00
Olivier Dony 0a63ecb0cf [I18N] all: updated translation template
This should be the last major template sync
before the final release of 6.1.

bzr revid: odo@openerp.com-20120208010830-zchnkg48u7s40nw2
2012-02-08 02:08:30 +01:00