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
4d7121cd24
[IMP] hw_escpos: setting up translation strings
...
bzr revid: fva@openerp.com-20131226170830-n67c6upq28zwya41
2013-12-26 18:08:30 +01:00
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
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
a42bf998e2
[MERGE] sync with trunk
...
bzr revid: mat@openerp.com-20131224154340-pwtp292xac5eodci
2013-12-24 16:43:40 +01:00
90ebde3676
[FIX] gamification: remove old calls to action_close
...
bzr revid: mat@openerp.com-20131224152902-i2ozrf41y1ou2vdm
2013-12-24 16:29:02 +01:00
13bfaef3a3
[FIX] gamification: remove old calls to action_start
...
bzr revid: mat@openerp.com-20131224151543-oofn9wc2w3933gjy
2013-12-24 16:15:43 +01:00
5a8040d909
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20131224151318-hw70xl6vfxckf412
2013-12-24 16:13:18 +01:00
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
58994713d8
[FIX] gamification: move template block before challenge declaration
...
bzr revid: mat@openerp.com-20131224150549-uafyr7lyva3u9k8n
2013-12-24 16:05:49 +01:00
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
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
25117ca97f
[REF] gamification: use statusbar instead of action buttons
...
bzr revid: mat@openerp.com-20131224141140-vc0v5lpm0ivfl6i4
2013-12-24 15:11:40 +01:00
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
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
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
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
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
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
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
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
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
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
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
2c9ef5b3d5
[FIX] hr_payroll: put a check for the structure used in the contract. When any structure
...
is already assigned into contract and that is deleted, it will affet the Payslips which were already created and will have [False] value.
bzr revid: rha@tinyerp.com-20131223101841-6fbwfm90gn7sj17m
2013-12-23 15:48:41 +05:30
e453001a7f
[MERGE] [ADD] hr_applicant_document module: link between hr_recruitment and document modules. It allows to search through the indexed content of documents attached to applicants, such as resumes, CVs, ...
...
[IMP] hr.recrutment.stage: added template_id field. If the stage is linked to a template, a message is posted on the applicant when the applicant is moved into this stage. This allows to automatically send an email when approving or refusing an applicant. We usually define server action to achieve that behavior, it is now standard.
[IMP] hr.applicant: added a field to have the number of indexed documents + links in the applicant kanban view to jump to the applicant's documents.
bzr revid: tde@openerp.com-20131223095328-q92yiklf4n1mq055
2013-12-23 10:53:28 +01:00
b9e8df4a43
[DOC] hr_recruitment: added changelog about template_id field
...
bzr revid: tde@openerp.com-20131223092831-lg6j9as0go1r2g7e
2013-12-23 10:28:31 +01:00
c5148a640c
[IMP] hr_recruitment: improved template + xml_id of templates for interest / refuse
...
bzr revid: tde@openerp.com-20131223092819-nxiqqy21wd8f2wk8
2013-12-23 10:28:19 +01:00
0c04878071
[REV] document: reverted a change in spacingf to lessen the diff
...
bzr revid: tde@openerp.com-20131223092057-drrvt9w12r5uwrn4
2013-12-23 10:20:57 +01:00
931f52f0f5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131221061900-mrdvau1f6w722vsn
bzr revid: launchpad_translations_on_behalf_of_openerp-20131222055708-jg10h0irjyde2qii
bzr revid: launchpad_translations_on_behalf_of_openerp-20131223054746-koli3yft4vt25ld4
2013-12-23 05:47:46 +00:00
c3c97ea3df
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131220171818-obp76209n322b9ql
2013-12-20 18:18:18 +01:00
1aa92dbc46
[FORWARD] Forward port of saas-2 fixes until revision 9058 (revid tde@openerp.com-20131220162158-hbgktly09dv37958)
...
bzr revid: tde@openerp.com-20131220165519-2okhclp3qb3if1ey
2013-12-20 17:55:19 +01:00
293001c826
[IMP] point_of_sale: ESC/POS receipt printing
...
bzr revid: fva@openerp.com-20131220163057-9nu1u7hti0m8wo3h
2013-12-20 17:30:57 +01:00
aec8f50b20
[IMP] gamification: use constances
...
bzr revid: mat@openerp.com-20131220150557-xaomxnrdb4bxcex3
2013-12-20 16:05:57 +01:00
b92ad39005
[FIX] email_template: support of email_recipients in send_mail.
...
email_recipients is a char fields holding a comma separated list of partner_ids
that are the email recipients. This field is correctly handled in the composer
but was not taken into account in the send_mail method email_template.
However due to model limitations, this field can only be taken into account
when sending the email directly using force_send. When the email is
queued, no field is available to hold the value of email_recipients.
This is already fixed in trunk/v8 as a field has been added to handle
this value.
[FIX] mail: when sending email to some recipients_ids, filter to have only
the existing partner_ids. Trusting email template to generate valid
partner_ids is a bit risky.
[TESTS] email_template: added tests for send_mail
bzr revid: tde@openerp.com-20131220144652-h18yam60vpedbh7x
2013-12-20 15:46:52 +01:00
b421d76cdd
[MERGE] sync with trunk
...
bzr revid: mat@openerp.com-20131220144635-qq4vmp1ciw3e5xlw
2013-12-20 15:46:35 +01:00
f77aefc07a
[REF] gamification: cleaning methods and reports
...
bzr revid: mat@openerp.com-20131220144521-wyu1gx8bcitu6nk4
2013-12-20 15:45:21 +01:00
4abd454e8e
[FIX] hr_recruitment: email.template field is partner_to, not partner_id
...
bzr revid: tde@openerp.com-20131220125204-24xwn1jzo2nyiwzb
2013-12-20 13:52:04 +01:00
abefabfa3e
[FIX] mail: fix _get_default_from if no alias_name for user.
...
As alias_name is not anymore required, we should check that the alias_domain AND alias_name are set before choosing the alias as email_from of the mail.message
bzr revid: dle@openerp.com-20131220115213-ll8duh01csk0xy4t
2013-12-20 12:52:13 +01:00
9d885fecab
[CLEAN] hr_recruitment: cleaned code about attachments and tree view added in this branch: renamed the method + updated in views accordingly + simplified view + simplified onchange_job code
...
bzr revid: tde@openerp.com-20131220102918-yxn4aozi03hzlnsf
2013-12-20 11:29:18 +01:00
5ce340694e
[FIX] email_template: fixed a test, partner_to is a list of ids, but not a python list
...
bzr revid: tde@openerp.com-20131220102422-holr2goxt823gt5x
2013-12-20 11:24:22 +01:00
28a41dc801
[IMP] hr_recruitment: improved approve/refuse templates
...
bzr revid: tde@openerp.com-20131220101847-a4ku8yst9ve8cf4y
2013-12-20 11:18:47 +01:00
4a55165597
[FIX] email_template: when sending email, process partner_to value also to convet it into a recipient_ids.
...
Hint: backport me into saas-2 or even 7.0
bzr revid: tde@openerp.com-20131220092756-o2qx54cjfq0qbsc9
2013-12-20 10:27:56 +01:00
8fa229061a
[IMP] hr_recruitment: sending an email based on the template of the stage
...
is now done using the composer, therefore using message_post and all processing
required. Next step is to factorize that code to be able to use it directly
with one call.
bzr revid: tde@openerp.com-20131220092644-72uf3jpxn80u1ymq
2013-12-20 10:26:44 +01:00
73dfa69e34
[FIX] project: fix task progress not correctly updated when reopening a task
...
bzr revid: xal@openerp.com-20131220091823-o9uvvlo6hdh4xukw
2013-12-20 10:18:23 +01:00
6e71e067ca
[FIX] purchase: remove duplicate 'Warehouse' and 'Reference UOM' groupby filter in Purchase Analysis search view
...
bzr revid: xal@openerp.com-20131220085429-xxojh1oxjn1fo3a5
2013-12-20 09:54:29 +01:00
95e5d57e02
[FIX] document: on report.document.user view, use correct field type for ``user_id`` field.
...
bzr revid: xal@openerp.com-20131220084446-b5rmz6dfotd2alaa
2013-12-20 09:44:46 +01:00
e6a46a855d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131220053413-o3xa4nlpu9snoiq6
2013-12-20 05:34:13 +00:00
Thibault Delavallée
Launchpad Translations on behalf of openerp
Frédéric van der Essen
Martin Trigaux
Denis Ledoux
Gery Debongnie
Rifakat
Xavier ALT