Gery Debongnie
fcf97a559a
[IMP] adds support for week/quarter groupby in readgroup method (orm.py)
...
bzr revid: ged@openerp.com-20140113133602-ytxleg91bu3fyx62
2014-01-13 14:36:02 +01:00
Gery Debongnie
bb88a5205f
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140113081142-4wix6shl7zl3d3r9
2014-01-13 09:11:42 +01:00
Stephane Wirtel
a097785c67
[MERGE] Extract the base64 encoded images from the xml files lp:~openerp-dev/openobject-server/trunk-extracted_img-stw
...
bzr revid: stw@openerp.com-20140109161022-tbrcm0e0f6plj6fe
2014-01-09 17:10:22 +01:00
Stephane Wirtel
b5635f8603
[MERGE] Extract the base64 encoded images from the xml files lp:~openerp-dev/openobject-addons/trunk-extracted_img-stw
...
bzr revid: stw@openerp.com-20140109160942-zo338hdm1bg8wdr0
2014-01-09 17:09:42 +01:00
Stephane Wirtel
bea411bb98
[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-20140109154550-a04qybctzaaqtrlr
2014-01-09 16:45:50 +01:00
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
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
Gery Debongnie
c2a0f93b9e
[IMP] changes the readgroup method to allow better control in the groupby field when it is a date/datetime (for example, it is now possible to group by week/quarter) (orm.py)
...
bzr revid: ged@openerp.com-20140107085800-hwyt41j3hwj1h1n8
2014-01-07 09:58:00 +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
Gery Debongnie
2489338a33
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140102085515-hr1l4kbubt4g7o7c
bzr revid: ged@openerp.com-20140106083929-eeix8lpzhz1cedvn
2014-01-06 09:39:29 +01:00
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
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
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
d963fa888c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231050201-641kcunlgq2qa0ux
2013-12-31 05:02:01 +00:00
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
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
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
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
Martin Trigaux
22a291d47a
[REF] gamification: use sass files instead of native css
...
bzr revid: mat@openerp.com-20131224134405-9k4potbzq7ea20p4
2013-12-24 14:44:05 +01:00
Martin Trigaux
aefd64e8cf
[REF] gamification: compute_code is now similar to ir.actions, cleanup code
...
bzr revid: mat@openerp.com-20131224130023-e4gc91ell38zdtfj
2013-12-24 14:00:23 +01:00
Denis Ledoux
1508c5dd00
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9718 rev-id: dle@openerp.com-20131224103535-rhtje7dnq1ie7jtb
...
bzr revid: tde@openerp.com-20131220162158-hbgktly09dv37958
bzr revid: dle@openerp.com-20131223155041-8zp8e08fihbr0ie2
bzr revid: dle@openerp.com-20131224112407-aw6dq2q92312kjbk
2013-12-24 12:24:07 +01:00
Denis Ledoux
d1b4aa974d
[FIX] account_voucher: computed writeoff and invoices selected were not right on partial invoice payment in account voucher wizard.
...
Due to the algorithm which did not handle the fact that an invoice could have several move lines
bzr revid: dle@openerp.com-20131224103535-rhtje7dnq1ie7jtb
2013-12-24 11:35:35 +01:00
Gery Debongnie
68795d8a10
[IMP] changes the rng description of the xml grammar to add a 'stacked' attribute to the tag 'graph'
...
bzr revid: ged@openerp.com-20131224103207-48jd6gh78xmri8wd
2013-12-24 11:32:07 +01:00
87aae0efca
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131224055213-dm6b0zx4e0fn18ex
2013-12-24 05:52:13 +00:00
Martin Trigaux
6f5815f44d
[REF] gamification: cahnge some tde remarks, Long live Cthulhu
...
bzr revid: mat@openerp.com-20131223163214-f6yp2yxf5ja1wq22
2013-12-23 17:32:14 +01:00
Martin Trigaux
7c6a6b26f1
[FIX] gamification: goal.condition -> goal.definition_condition, user_ids not in vals -> not vals.get(user_ids)
...
bzr revid: mat@openerp.com-20131223161229-lpoevttkt6ezt2ia
2013-12-23 17:12:29 +01:00
Martin Trigaux
f4e42879d3
[REF] gamification: rename user_from_id -> sender_id, move constants
...
bzr revid: mat@openerp.com-20131223160143-8mgmwrgf6i3wo8ku
2013-12-23 17:01:43 +01:00
Martin Trigaux
c0eef31160
[REF] gamification: add user_from_id on badge, remove outdated-doc, remove useless message_post call
...
bzr revid: mat@openerp.com-20131223155404-h4in4ocr8jakq3ff
2013-12-23 16:54:04 +01:00
Denis Ledoux
36846db2c3
[FIX] account_check_writing: display real currency name on check print
...
Instead of 'Euro' hardcoded.
As the currency complete name is not available in res.curreny model, exceptions are made for currencies EUR, USD and BRL, the mosts used currencies for checks (+75% of cases)
bzr revid: dle@openerp.com-20131223154631-21oenwn8mxszyo5t
2013-12-23 16:46:31 +01:00
Martin Trigaux
4c0c6bbc76
[FIX] hr_payroll: skip missing structures in get_all_structures for hr.contracts (eg: if structure is deleted afterward) (opw #602411 )
...
bzr revid: mat@openerp.com-20131223124413-k0st3i54zou2bga8
2013-12-23 13:44:13 +01:00
Gery Debongnie