Commit Graph

76466 Commits

Author SHA1 Message Date
Stephane Wirtel 89f71281a7 [IMP] Backport one feature from website: this feature allows to specify a file
path on the field tag fetching the right file instead of using the base64
encoded file in the field.

<field name="image" type="base64" file="base/static/img/main_partner-image.png" />

bzr revid: stw@openerp.com-20140109154338-0spjbo109pxh75pp
2014-01-09 16:43:38 +01:00
Stephane Wirtel 31fbdd57b2 [FIX] Add the default shell
bzr revid: stw@openerp.com-20140109105100-qevvw17ns4xe9ame
2014-01-09 11:51:00 +01:00
Frédéric van der Essen 7ab7cf2149 [MERGE] from trunk
bzr revid: fva@openerp.com-20140109101313-cle2m2axh6vjj8yy
2014-01-09 11:13:13 +01:00
Stephane Wirtel 8eebb40313 [FIX] On OSX, the system has a lot of Bitmap fonts, and in this case, Reportlab
can not load the 'head' table from the structure of the TTF file. There is no
good way to check if a TTF file is an old style or new style.

bzr revid: stw@openerp.com-20140109095420-uixw7u1b0dbhcp4v
2014-01-09 10:54:20 +01:00
Stephane Wirtel 5aef04550f [REF] Merge a refactoring of the workflow (lp:~openerp-dev/openobject-server/trunk-refactor-workflow-stw)
bzr revid: stw@openerp.com-20140109095017-xakyapswp8b5eed5
2014-01-09 10:50:17 +01:00
Stephane Wirtel 552c76c8b2 [REF] Use the contextlib.closing function instead of a couple of try/catch for
the release of the database cursor.

bzr revid: stw@openerp.com-20140109093258-vmr1a3gaxruo0psp
2014-01-09 10:32:58 +01:00
Martin Trigaux 5237d95f16 [ADD] project: add change_default parameter on project_id field of project.task. This allows to set default values depending on project through ir.values.
bzr revid: mat@openerp.com-20140107171346-nd1a2esmdaqj9xip
2014-01-07 18:13:46 +01:00
Frédéric van der Essen a726bf2d76 [FIX] point_of_sale: removed console.logs, fixed the tests to work with the new ui
bzr revid: fva@openerp.com-20140106174957-ee323a33j59q1npw
2014-01-06 18:49:57 +01:00
Frédéric van der Essen b9a245b22a [IMP] point_of_sale: proper dom cache implementation, removed Imagecache as it is now obsolete, and some minor css fixes
bzr revid: fva@openerp.com-20140106171532-bue38i0myofyt3ww
2014-01-06 18:15:32 +01:00
Frédéric van der Essen 4b4642bcc9 [IMP] hw_escpos: print taxes details on receipt
bzr revid: fva@openerp.com-20140106145446-fhcefc6zy8w7zsur
2014-01-06 15:54:46 +01:00
Frédéric van der Essen 643bb8566c [IMP] point_of_sale: detailed tax report on receipt
bzr revid: fva@openerp.com-20140106135119-cnhopx3nie7f0r8h
2014-01-06 14:51:19 +01:00
Quentin (OpenERP) 5881686194 [IMP] web_kanban_sparkline: don't show the value in the tooltip for the sparklines of type 'tristate'
bzr revid: qdp-launchpad@openerp.com-20140106131605-8lfp6dzpnl9vor09
2014-01-06 14:16:05 +01:00
jke-openerp 4c24a73c64 [Merge] Merge with trunk
bzr revid: jke@openerp.com-20140106082231-84opu0zwlwvzfvzg
2014-01-06 09:22:31 +01:00
jke-openerp 5a4ecf0134 [Merge] Merge with trunk
bzr revid: jke@openerp.com-20131218130304-y3scbl1ms65vhupf
bzr revid: jke@openerp.com-20131220144934-e0hvmc5du87k2k8n
bzr revid: jke@openerp.com-20140106082149-xzralqftgxnauv51
2014-01-06 09:21:49 +01:00
jke-openerp ecca2f99c3 [Merge] Merge With Trunk
bzr revid: jke@openerp.com-20140106082030-e0auqh3l9b2cpuyi
2014-01-06 09:20:30 +01:00
Launchpad Translations on behalf of openerp a5f3084ac4 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140101052634-06unjy412n3xm508
bzr revid: launchpad_translations_on_behalf_of_openerp-20140106043902-000yyr2clg1qc9lb
2014-01-06 04:39:02 +00:00
Launchpad Translations on behalf of openerp ced63415b7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140103054140-sxa6ru24qvhgz2ve
bzr revid: launchpad_translations_on_behalf_of_openerp-20140104054255-7o6b0x7c1vifv0do
bzr revid: launchpad_translations_on_behalf_of_openerp-20140105052647-pckbu2ehnp5l8217
2014-01-05 05:26:47 +00:00
Frédéric van der Essen 96dd2211c9 [IMP] point_of_sale: styling of the category button without pictures
bzr revid: fva@openerp.com-20140103164048-pwq852fmbroz27c3
2014-01-03 17:40:48 +01:00
Frédéric van der Essen 36a58d47d0 [FIX] point_of_sale: changed background of product categories list
bzr revid: fva@openerp.com-20140103155615-on0o5sy4d2f6jxx1
2014-01-03 16:56:15 +01:00
Frédéric van der Essen d38b7c2065 [FIX] point_of_sale: overflow on the receipt footer & header in the web printing
bzr revid: fva@openerp.com-20140103155319-lvxy7slsw9riwfwq
2014-01-03 16:53:19 +01:00
Frédéric van der Essen 23adb2214a [IMP] point_of_sale: receipt footer & header in web printing
bzr revid: fva@openerp.com-20140103154939-jm6rddipomf5d2wy
2014-01-03 16:49:39 +01:00
Frédéric van der Essen a82f9ec6f2 [IMP] hw_proxy: adding correct module dependencies for hw_escpos and hw_scanner
bzr revid: fva@openerp.com-20140103133439-n2tp9laduf8tbn2u
2014-01-03 14:34:39 +01:00
Frédéric van der Essen 434513e761 [hw_scanner] implementation of the client side component of the barcode scanner proxy
bzr revid: fva@openerp.com-20140103130930-q1shnj9172yzn0gr
2014-01-03 14:09:30 +01:00
Frédéric van der Essen 0fd4888e84 [hw_scanner] implementation of the server side component of the barcode scanner proxy
bzr revid: fva@openerp.com-20140102141519-jaqi8mcqff282c6n
2014-01-02 15:15:19 +01:00
Thibault Delavallée 2488f78e6d [FORWARD] Forward port of latest saas-2 fixes, until revision 9062 (revid tde@openerp.com-20140102124143-m1qv8koovjcl8mah)
bzr revid: tde@openerp.com-20140102133028-xhvkzstqy5t8dquh
2014-01-02 14:30:28 +01:00
Thibault Delavallée 5e7fdb5bcc [MERGE] [IMP] hr: changed some pictures of employees in demo data to avoid copyright issues
bzr revid: tde@openerp.com-20140102125858-b2r3mntmj5uu15nl
2014-01-02 13:58:58 +01:00
Thibault Delavallée c243854aae [FIX] account_anglo_saxon: fixed yml tests using an hardocded year instead of the current year.
bzr revid: tde@openerp.com-20140102124143-m1qv8koovjcl8mah
2014-01-02 13:41:43 +01:00
Thibault Delavallée 737be08fbf [MERGE] account: cash register view improvements
- now looking like cash control methods from the point of sale module.

point of sale: improved some tooltips + cash control form view improvements

bzr revid: tde@openerp.com-20140102113009-lb1vv2w3g4dz2oqw
2014-01-02 12:30:09 +01:00
Martin Trigaux 0bd968a801 [MERGE] [FIX] ir_translation: backport of rev 5018 from trunk
rename method load to load_module_terms to avoid name clash with load call from base_import (opw 602531)

bzr revid: mat@openerp.com-20131231140358-ldh0snu9zmcs3tpw
2013-12-31 15:03:58 +01:00
Launchpad Translations on behalf of openerp d963fa888c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231050201-641kcunlgq2qa0ux
2013-12-31 05:02:01 +00:00
Launchpad Translations on behalf of openerp 67e479e96e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131225060225-zss93rqqqz3holkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131226060540-odnnltlm0bobiqp9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227052235-xq201ghozcgucfuq
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228051943-jo247cfuiyx4w767
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230043947-d1jcf2vpf9go93ec
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231044745-8v24a0fydnvde3js
2013-12-31 04:47:45 +00:00
Martin Trigaux 216303c2fa [FIX] ir_translation: rename method load to load_module_terms to avoid name clash with load call from base_import
bzr revid: mat@openerp.com-20131230125307-kald7ir36bvq3o7c
2013-12-30 13:53:07 +01:00
Martin Trigaux 8146a3ed43 [FIX] note: revert rev 9055 as made impossible to change stage if no rights on other users' relations
bzr revid: mat@openerp.com-20131230104045-2h070kuouz4msz1x
2013-12-30 11:40:45 +01:00
Paramjit Singh Sahota 87291ef069 [MERGE] Merged lp:openobject-addons
bzr revid: psa@tinyerp.com-20131230072718-um169nlnfdblzzyx
2013-12-30 12:57:18 +05:30
Paramjit Singh Sahota 7980ac78ae [IMP] Improved code as per the suggestions on the Merge proposal.
bzr revid: psa@tinyerp.com-20131230072452-zew8ys6lqomzxcsm
2013-12-30 12:54:52 +05:30
Quentin (OpenERP) f3737b122c [IMP] kanban_gauge: allow to set levelcolors in widget options instead of taking the default ones
bzr revid: qdp-launchpad@openerp.com-20131227164911-tk7og4pf37jmvj0c
2013-12-27 17:49:11 +01:00
Thibault Delavallée 0bcd78116f [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131227153517-j278y3hrjj2nzw79
2013-12-27 16:35:17 +01:00
Launchpad Translations on behalf of openerp 1e3ebc0285 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131220051750-c2x3cf7wrd35we7a
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227052617-sg1lzd37c8fk1pgm
2013-12-27 05:26:17 +00:00
Frédéric van der Essen 4d7121cd24 [IMP] hw_escpos: setting up translation strings
bzr revid: fva@openerp.com-20131226170830-n67c6upq28zwya41
2013-12-26 18:08:30 +01:00
Frédéric van der Essen bf650fa07a [IMP] hw_escpos: basic support for japanese receipt and open cashdrawer
bzr revid: fva@openerp.com-20131226165620-6262zfqyxxyryxo0
2013-12-26 17:56:20 +01:00
Martin Trigaux aba5888a34 [MERGE] [ADD] gamification
New modules gamification, hr_gamification, gamification_sale_crm, portal_gamification.

Merry Christmas OpenERP

bzr revid: mat@openerp.com-20131224155138-3bbp8m3gyrfsb3ni
2013-12-24 16:51:38 +01:00
Martin Trigaux a42bf998e2 [MERGE] sync with trunk
bzr revid: mat@openerp.com-20131224154340-pwtp292xac5eodci
2013-12-24 16:43:40 +01:00
Martin Trigaux 90ebde3676 [FIX] gamification: remove old calls to action_close
bzr revid: mat@openerp.com-20131224152902-i2ozrf41y1ou2vdm
2013-12-24 16:29:02 +01:00
Martin Trigaux 13bfaef3a3 [FIX] gamification: remove old calls to action_start
bzr revid: mat@openerp.com-20131224151543-oofn9wc2w3933gjy
2013-12-24 16:15:43 +01:00
Frédéric van der Essen 5a8040d909 [MERGE] from trunk
bzr revid: fva@openerp.com-20131224151318-hw70xl6vfxckf412
2013-12-24 16:13:18 +01:00
Frédéric van der Essen e95ea35caa [IMP] hw_escpos: company logo on receipt and multi-lingual receipt support
bzr revid: fva@openerp.com-20131224151112-3svn5wm1wyf71wim
2013-12-24 16:11:12 +01:00
Martin Trigaux 58994713d8 [FIX] gamification: move template block before challenge declaration
bzr revid: mat@openerp.com-20131224150549-uafyr7lyva3u9k8n
2013-12-24 16:05:49 +01:00
Martin Trigaux ff83d9eb4d [FIX] gamification: remove import data, add trackvisibility on challenge instead of sending message
bzr revid: mat@openerp.com-20131224145449-93b3z97lagu12yri
2013-12-24 15:54:49 +01:00
Martin Trigaux be7bc54edc [REF] gamification: use m2o to email.template for report progress, create new field report_template_id, cleaning code
bzr revid: mat@openerp.com-20131224144514-lmbhw88nj7aa3r8i
2013-12-24 15:45:14 +01:00
Martin Trigaux 25117ca97f [REF] gamification: use statusbar instead of action buttons
bzr revid: mat@openerp.com-20131224141140-vc0v5lpm0ivfl6i4
2013-12-24 15:11:40 +01:00