Frédéric van der Essen [Thu, 9 Jan 2014 10:13:13 +0000 (11:13 +0100)]
[MERGE] from trunk
bzr revid: fva@openerp.com-
20140109101313-cle2m2axh6vjj8yy
Frédéric van der Essen [Mon, 6 Jan 2014 17:49:57 +0000 (18:49 +0100)]
[FIX] point_of_sale: removed console.logs, fixed the tests to work with the new ui
bzr revid: fva@openerp.com-
20140106174957-ee323a33j59q1npw
Frédéric van der Essen [Mon, 6 Jan 2014 17:15:32 +0000 (18:15 +0100)]
[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
Frédéric van der Essen [Mon, 6 Jan 2014 14:54:46 +0000 (15:54 +0100)]
[IMP] hw_escpos: print taxes details on receipt
bzr revid: fva@openerp.com-
20140106145446-fhcefc6zy8w7zsur
Frédéric van der Essen [Mon, 6 Jan 2014 13:51:19 +0000 (14:51 +0100)]
[IMP] point_of_sale: detailed tax report on receipt
bzr revid: fva@openerp.com-
20140106135119-cnhopx3nie7f0r8h
Launchpad Translations on behalf of openerp [Sun, 5 Jan 2014 05:26:47 +0000 (05:26 +0000)]
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
Frédéric van der Essen [Fri, 3 Jan 2014 16:40:48 +0000 (17:40 +0100)]
[IMP] point_of_sale: styling of the category button without pictures
bzr revid: fva@openerp.com-
20140103164048-pwq852fmbroz27c3
Frédéric van der Essen [Fri, 3 Jan 2014 15:56:15 +0000 (16:56 +0100)]
[FIX] point_of_sale: changed background of product categories list
bzr revid: fva@openerp.com-
20140103155615-on0o5sy4d2f6jxx1
Frédéric van der Essen [Fri, 3 Jan 2014 15:53:19 +0000 (16:53 +0100)]
[FIX] point_of_sale: overflow on the receipt footer & header in the web printing
bzr revid: fva@openerp.com-
20140103155319-lvxy7slsw9riwfwq
Frédéric van der Essen [Fri, 3 Jan 2014 15:49:39 +0000 (16:49 +0100)]
[IMP] point_of_sale: receipt footer & header in web printing
bzr revid: fva@openerp.com-
20140103154939-jm6rddipomf5d2wy
Frédéric van der Essen [Fri, 3 Jan 2014 13:34:39 +0000 (14:34 +0100)]
[IMP] hw_proxy: adding correct module dependencies for hw_escpos and hw_scanner
bzr revid: fva@openerp.com-
20140103133439-n2tp9laduf8tbn2u
Frédéric van der Essen [Fri, 3 Jan 2014 13:09:30 +0000 (14:09 +0100)]
[hw_scanner] implementation of the client side component of the barcode scanner proxy
bzr revid: fva@openerp.com-
20140103130930-q1shnj9172yzn0gr
Frédéric van der Essen [Thu, 2 Jan 2014 14:15:19 +0000 (15:15 +0100)]
[hw_scanner] implementation of the server side component of the barcode scanner proxy
bzr revid: fva@openerp.com-
20140102141519-jaqi8mcqff282c6n
Thibault Delavallée [Thu, 2 Jan 2014 13:30:28 +0000 (14:30 +0100)]
[FORWARD] Forward port of latest saas-2 fixes, until revision 9062 (revid tde@openerp.com-
20140102124143-m1qv8koovjcl8mah)
bzr revid: tde@openerp.com-
20140102133028-xhvkzstqy5t8dquh
Thibault Delavallée [Thu, 2 Jan 2014 12:58:58 +0000 (13:58 +0100)]
[MERGE] [IMP] hr: changed some pictures of employees in demo data to avoid copyright issues
bzr revid: tde@openerp.com-
20140102125858-b2r3mntmj5uu15nl
Thibault Delavallée [Thu, 2 Jan 2014 12:41:43 +0000 (13:41 +0100)]
[FIX] account_anglo_saxon: fixed yml tests using an hardocded year instead of the current year.
bzr revid: tde@openerp.com-
20140102124143-m1qv8koovjcl8mah
Thibault Delavallée [Thu, 2 Jan 2014 11:30:09 +0000 (12:30 +0100)]
[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
Martin Trigaux [Tue, 31 Dec 2013 14:03:58 +0000 (15:03 +0100)]
[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
Launchpad Translations on behalf of openerp [Tue, 31 Dec 2013 05:02:01 +0000 (05:02 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20131231050201-641kcunlgq2qa0ux
Launchpad Translations on behalf of openerp [Tue, 31 Dec 2013 04:47:45 +0000 (04:47 +0000)]
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
Martin Trigaux [Mon, 30 Dec 2013 12:53:07 +0000 (13:53 +0100)]
[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
Martin Trigaux [Mon, 30 Dec 2013 10:40:45 +0000 (11:40 +0100)]
[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
Paramjit Singh Sahota [Mon, 30 Dec 2013 07:27:18 +0000 (12:57 +0530)]
[MERGE] Merged lp:openobject-addons
bzr revid: psa@tinyerp.com-
20131230072718-um169nlnfdblzzyx
Paramjit Singh Sahota [Mon, 30 Dec 2013 07:24:52 +0000 (12:54 +0530)]
[IMP] Improved code as per the suggestions on the Merge proposal.
bzr revid: psa@tinyerp.com-
20131230072452-zew8ys6lqomzxcsm
Quentin (OpenERP) [Fri, 27 Dec 2013 16:49:11 +0000 (17:49 +0100)]
[IMP] kanban_gauge: allow to set levelcolors in widget options instead of taking the default ones
bzr revid: qdp-launchpad@openerp.com-
20131227164911-tk7og4pf37jmvj0c
Thibault Delavallée [Fri, 27 Dec 2013 15:35:17 +0000 (16:35 +0100)]
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-
20131227153517-j278y3hrjj2nzw79
Launchpad Translations on behalf of openerp [Fri, 27 Dec 2013 05:26:17 +0000 (05:26 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20131220051750-c2x3cf7wrd35we7a
bzr revid: launchpad_translations_on_behalf_of_openerp-
20131227052617-sg1lzd37c8fk1pgm
Frédéric van der Essen [Thu, 26 Dec 2013 17:08:30 +0000 (18:08 +0100)]
[IMP] hw_escpos: setting up translation strings
bzr revid: fva@openerp.com-
20131226170830-n67c6upq28zwya41
Frédéric van der Essen [Thu, 26 Dec 2013 16:56:20 +0000 (17:56 +0100)]
[IMP] hw_escpos: basic support for japanese receipt and open cashdrawer
bzr revid: fva@openerp.com-
20131226165620-6262zfqyxxyryxo0
Martin Trigaux [Tue, 24 Dec 2013 15:51:38 +0000 (16:51 +0100)]
[MERGE] [ADD] gamification
New modules gamification, hr_gamification, gamification_sale_crm, portal_gamification.
Merry Christmas OpenERP
bzr revid: mat@openerp.com-
20131224155138-3bbp8m3gyrfsb3ni
Martin Trigaux [Tue, 24 Dec 2013 15:43:40 +0000 (16:43 +0100)]
[MERGE] sync with trunk
bzr revid: mat@openerp.com-
20131224154340-pwtp292xac5eodci
Martin Trigaux [Tue, 24 Dec 2013 15:29:02 +0000 (16:29 +0100)]
[FIX] gamification: remove old calls to action_close
bzr revid: mat@openerp.com-
20131224152902-i2ozrf41y1ou2vdm
Martin Trigaux [Tue, 24 Dec 2013 15:15:43 +0000 (16:15 +0100)]
[FIX] gamification: remove old calls to action_start
bzr revid: mat@openerp.com-
20131224151543-oofn9wc2w3933gjy
Frédéric van der Essen [Tue, 24 Dec 2013 15:13:18 +0000 (16:13 +0100)]
[MERGE] from trunk
bzr revid: fva@openerp.com-
20131224151318-hw70xl6vfxckf412
Frédéric van der Essen [Tue, 24 Dec 2013 15:11:12 +0000 (16:11 +0100)]
[IMP] hw_escpos: company logo on receipt and multi-lingual receipt support
bzr revid: fva@openerp.com-
20131224151112-3svn5wm1wyf71wim
Martin Trigaux [Tue, 24 Dec 2013 15:05:49 +0000 (16:05 +0100)]
[FIX] gamification: move template block before challenge declaration
bzr revid: mat@openerp.com-
20131224150549-uafyr7lyva3u9k8n
Martin Trigaux [Tue, 24 Dec 2013 14:54:49 +0000 (15:54 +0100)]
[FIX] gamification: remove import data, add trackvisibility on challenge instead of sending message
bzr revid: mat@openerp.com-
20131224145449-93b3z97lagu12yri
Martin Trigaux [Tue, 24 Dec 2013 14:45:14 +0000 (15:45 +0100)]
[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
Martin Trigaux [Tue, 24 Dec 2013 14:11:40 +0000 (15:11 +0100)]
[REF] gamification: use statusbar instead of action buttons
bzr revid: mat@openerp.com-
20131224141140-vc0v5lpm0ivfl6i4
Martin Trigaux [Tue, 24 Dec 2013 13:44:05 +0000 (14:44 +0100)]
[REF] gamification: use sass files instead of native css
bzr revid: mat@openerp.com-
20131224134405-9k4potbzq7ea20p4
Martin Trigaux [Tue, 24 Dec 2013 13:00:23 +0000 (14:00 +0100)]
[REF] gamification: compute_code is now similar to ir.actions, cleanup code
bzr revid: mat@openerp.com-
20131224130023-e4gc91ell38zdtfj
Denis Ledoux [Tue, 24 Dec 2013 11:24:07 +0000 (12:24 +0100)]
[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
Denis Ledoux [Tue, 24 Dec 2013 10:35:35 +0000 (11:35 +0100)]
[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
Gery Debongnie [Tue, 24 Dec 2013 10:32:07 +0000 (11:32 +0100)]
[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
Launchpad Translations on behalf of openerp [Tue, 24 Dec 2013 05:52:13 +0000 (05:52 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20131224055213-dm6b0zx4e0fn18ex
Martin Trigaux [Mon, 23 Dec 2013 16:32:14 +0000 (17:32 +0100)]
[REF] gamification: cahnge some tde remarks, Long live Cthulhu
bzr revid: mat@openerp.com-
20131223163214-f6yp2yxf5ja1wq22
Martin Trigaux [Mon, 23 Dec 2013 16:12:29 +0000 (17:12 +0100)]
[FIX] gamification: goal.condition -> goal.definition_condition, user_ids not in vals -> not vals.get(user_ids)
bzr revid: mat@openerp.com-
20131223161229-lpoevttkt6ezt2ia
Martin Trigaux [Mon, 23 Dec 2013 16:01:43 +0000 (17:01 +0100)]
[REF] gamification: rename user_from_id -> sender_id, move constants
bzr revid: mat@openerp.com-
20131223160143-8mgmwrgf6i3wo8ku
Martin Trigaux [Mon, 23 Dec 2013 15:54:04 +0000 (16:54 +0100)]
[REF] gamification: add user_from_id on badge, remove outdated-doc, remove useless message_post call
bzr revid: mat@openerp.com-
20131223155404-h4in4ocr8jakq3ff
Denis Ledoux [Mon, 23 Dec 2013 15:46:31 +0000 (16:46 +0100)]
[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
Martin Trigaux [Mon, 23 Dec 2013 12:44:13 +0000 (13:44 +0100)]
[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
Rifakat [Mon, 23 Dec 2013 10:18:41 +0000 (15:48 +0530)]
[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
Thibault Delavallée [Mon, 23 Dec 2013 09:53:28 +0000 (10:53 +0100)]
[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
Thibault Delavallée [Mon, 23 Dec 2013 09:28:31 +0000 (10:28 +0100)]
[DOC] hr_recruitment: added changelog about template_id field
bzr revid: tde@openerp.com-
20131223092831-lg6j9as0go1r2g7e
Thibault Delavallée [Mon, 23 Dec 2013 09:28:19 +0000 (10:28 +0100)]
[IMP] hr_recruitment: improved template + xml_id of templates for interest / refuse
bzr revid: tde@openerp.com-
20131223092819-nxiqqy21wd8f2wk8
Thibault Delavallée [Mon, 23 Dec 2013 09:20:57 +0000 (10:20 +0100)]
[REV] document: reverted a change in spacingf to lessen the diff
bzr revid: tde@openerp.com-
20131223092057-drrvt9w12r5uwrn4
Launchpad Translations on behalf of openerp [Mon, 23 Dec 2013 05:47:46 +0000 (05:47 +0000)]
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
Thibault Delavallée [Fri, 20 Dec 2013 17:18:18 +0000 (18:18 +0100)]
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-
20131220171818-obp76209n322b9ql
Thibault Delavallée [Fri, 20 Dec 2013 16:55:19 +0000 (17:55 +0100)]
[FORWARD] Forward port of saas-2 fixes until revision 9058 (revid tde@openerp.com-
20131220162158-hbgktly09dv37958)
bzr revid: tde@openerp.com-
20131220165519-2okhclp3qb3if1ey
Frédéric van der Essen [Fri, 20 Dec 2013 16:30:57 +0000 (17:30 +0100)]
[IMP] point_of_sale: ESC/POS receipt printing
bzr revid: fva@openerp.com-
20131220163057-9nu1u7hti0m8wo3h
Martin Trigaux [Fri, 20 Dec 2013 15:05:57 +0000 (16:05 +0100)]
[IMP] gamification: use constances
bzr revid: mat@openerp.com-
20131220150557-xaomxnrdb4bxcex3
Thibault Delavallée [Fri, 20 Dec 2013 14:46:52 +0000 (15:46 +0100)]
[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
Martin Trigaux [Fri, 20 Dec 2013 14:46:35 +0000 (15:46 +0100)]
[MERGE] sync with trunk
bzr revid: mat@openerp.com-
20131220144635-qq4vmp1ciw3e5xlw
Martin Trigaux [Fri, 20 Dec 2013 14:45:21 +0000 (15:45 +0100)]
[REF] gamification: cleaning methods and reports
bzr revid: mat@openerp.com-
20131220144521-wyu1gx8bcitu6nk4
Thibault Delavallée [Fri, 20 Dec 2013 12:52:04 +0000 (13:52 +0100)]
[FIX] hr_recruitment: email.template field is partner_to, not partner_id
bzr revid: tde@openerp.com-
20131220125204-24xwn1jzo2nyiwzb
Denis Ledoux [Fri, 20 Dec 2013 11:52:13 +0000 (12:52 +0100)]
[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
Thibault Delavallée [Fri, 20 Dec 2013 10:29:18 +0000 (11:29 +0100)]
[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
Thibault Delavallée [Fri, 20 Dec 2013 10:24:22 +0000 (11:24 +0100)]
[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
Thibault Delavallée [Fri, 20 Dec 2013 10:18:47 +0000 (11:18 +0100)]
[IMP] hr_recruitment: improved approve/refuse templates
bzr revid: tde@openerp.com-
20131220101847-a4ku8yst9ve8cf4y
Thibault Delavallée [Fri, 20 Dec 2013 09:27:56 +0000 (10:27 +0100)]
[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
Thibault Delavallée [Fri, 20 Dec 2013 09:26:44 +0000 (10:26 +0100)]
[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
Xavier ALT [Fri, 20 Dec 2013 09:18:23 +0000 (10:18 +0100)]
[FIX] project: fix task progress not correctly updated when reopening a task
bzr revid: xal@openerp.com-
20131220091823-o9uvvlo6hdh4xukw
Xavier ALT [Fri, 20 Dec 2013 08:54:29 +0000 (09:54 +0100)]
[FIX] purchase: remove duplicate 'Warehouse' and 'Reference UOM' groupby filter in Purchase Analysis search view
bzr revid: xal@openerp.com-
20131220085429-xxojh1oxjn1fo3a5
Xavier ALT [Fri, 20 Dec 2013 08:44:46 +0000 (09:44 +0100)]
[FIX] document: on report.document.user view, use correct field type for ``user_id`` field.
bzr revid: xal@openerp.com-
20131220084446-b5rmz6dfotd2alaa
Launchpad Translations on behalf of openerp [Fri, 20 Dec 2013 05:34:13 +0000 (05:34 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20131220053413-o3xa4nlpu9snoiq6
Launchpad Translations on behalf of openerp [Fri, 20 Dec 2013 05:11:17 +0000 (05:11 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20131220051117-xo0f99jx4i5kjl2l
Denis Ledoux [Thu, 19 Dec 2013 16:03:45 +0000 (17:03 +0100)]
[FIX] stock: warehouse manager impliying account invoicing group is enough (no need to be accountant)
bzr revid: dle@openerp.com-
20131219160345-jj68pdnkqjxm1f2o
Xavier ALT [Thu, 19 Dec 2013 15:45:46 +0000 (16:45 +0100)]
[FIX] project: fix error on ``schedule_tasks`` when there is no resource available on project
bzr revid: xal@openerp.com-
20131219154546-xlbgqfkc34ndf8kp
Xavier ALT [Thu, 19 Dec 2013 14:55:28 +0000 (15:55 +0100)]
[FIX] l10n_be: fix no value in 'Code (Tax Code)' column on 'Print VAT Intra' preview report
bzr revid: xal@openerp.com-
20131219145528-ppndys5c1jryefgk
Thibault Delavallée [Thu, 19 Dec 2013 14:40:25 +0000 (15:40 +0100)]
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-
20131219144025-cu9hxr0ctcmajyrr
Frédéric van der Essen [Thu, 19 Dec 2013 14:29:11 +0000 (15:29 +0100)]
[FIX] point_of_sale & hw_proxy: connect the pos to the new proxy, and fix scale emulation
bzr revid: fva@openerp.com-
20131219142911-i9mkwqt1e0wz28i7
Thibault Delavallée [Thu, 19 Dec 2013 13:52:56 +0000 (14:52 +0100)]
[MERGE] [IMP] kanban: added drag 'n drop to folded columns.
bzr revid: tde@openerp.com-
20131219135256-6n6bhjgfe888z3tl
Thibault Delavallée [Thu, 19 Dec 2013 13:52:06 +0000 (14:52 +0100)]
[MERGE] [FIX] mail: fixed group button position that was too much dependent of the group description length
[IMP] project: removed unnecessary code in project to try to be able to move kanban records in a folded column (was not working + generic solution coming)
bzr revid: tde@openerp.com-
20131219135206-nv8i13wjugix84r3
Xavier ALT [Thu, 19 Dec 2013 13:51:47 +0000 (14:51 +0100)]
[FIX] hr_holidays, hr_timesheet: fix XMLSyntaxError when company name contain an ampersand '&' sign
bzr revid: xal@openerp.com-
20131219135147-jpli369iqlanf3t3
Thibault Delavallée [Thu, 19 Dec 2013 13:50:54 +0000 (14:50 +0100)]
[CLEAN] kanban: cleaned added code
bzr revid: tde@openerp.com-
20131219135054-3qcaxkh1j9f6i3bu
Thibault Delavallée [Thu, 19 Dec 2013 13:47:33 +0000 (14:47 +0100)]
[CLEAN] kanban: added some forgotten spaces
bzr revid: tde@openerp.com-
20131219134733-e0aqknw29gfpm2fr
Thibault Delavallée [Thu, 19 Dec 2013 13:40:55 +0000 (14:40 +0100)]
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-
20131219134055-rtbn9oylxq3ybaai
Thibault Delavallée [Thu, 19 Dec 2013 13:28:39 +0000 (14:28 +0100)]
[FIX] note: fixed note creation.
When creating a new note, a function field requires to browse the note in order
to get the stages. However the basic rule for creating a note is to be in the
followers. As followers is another field set during the creation, we are not
sure uid is already in the followers of the note when reading it. We therefore
do it as SUPERUSER_ID, because it is only to have access to some technical
data of the note.
bzr revid: tde@openerp.com-
20131219132839-m0a5rv0znhliqbq1
Frédéric van der Essen [Thu, 19 Dec 2013 13:11:40 +0000 (14:11 +0100)]
[IMP] hw_proxy: initial commit of the hardware proxy module, used by the point of sale to connect to usb devices
bzr revid: fva@openerp.com-
20131219131140-sm6fvpjtje6ova0p
Denis Ledoux [Thu, 19 Dec 2013 13:09:01 +0000 (14:09 +0100)]
[FIX] hr: merge of views Leave Request & Allocation request, as they are allmost similar.
Moreover, before this fix, when you clicked on an allocation request from a mail.message (for instance, from the messaging inbox page), you were not redirected to the right view: You were redirected to the view of Leave request instead of Allocation request.
bzr revid: dle@openerp.com-
20131219130901-nxciudhsacru2tmb
Thibault Delavallée [Thu, 19 Dec 2013 12:31:28 +0000 (13:31 +0100)]
[FIX] project_issue_sheet: worklog responsible should be the current user and not the issue responsible user
bzr revid: tde@openerp.com-
20131219123128-u0nmoait1cysjgv3
Frédéric van der Essen [Thu, 19 Dec 2013 10:45:29 +0000 (11:45 +0100)]
[MERGE] from trunk
bzr revid: fva@openerp.com-
20131219104529-pm5covlh6uvo992d
Thibault Delavallée [Thu, 19 Dec 2013 10:00:41 +0000 (11:00 +0100)]
[FIX] mass_mailing: opening the composer when sending a new wave should not have the res_id
linked to the campaign. As we are working with mass mailing, it should be False; ids will come
from active_ids / active_domain.
bzr revid: tde@openerp.com-
20131219100041-85mbafgk05u8naud
Thibault Delavallée [Thu, 19 Dec 2013 09:57:29 +0000 (10:57 +0100)]
[FIX] mass_mailing: when creating a new wave from the mass mailing campaign
kanban view, add the campaign in default
bzr revid: tde@openerp.com-
20131219095729-k5tsvmkqm2mdsnza
Launchpad Translations on behalf of openerp [Thu, 19 Dec 2013 06:15:41 +0000 (06:15 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20131219061541-j0v5712t55sdiqb6
Launchpad Translations on behalf of openerp [Thu, 19 Dec 2013 05:39:03 +0000 (05:39 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20131219053903-g82qo7aa2trdg2yd
Martin Trigaux [Wed, 18 Dec 2013 16:50:33 +0000 (17:50 +0100)]
[MERGE] forward port of latest saas-2 until rev 3893 dle@openerp.com-
20131218112416-2vtaq442qo8opq4u
bzr revid: mat@openerp.com-
20131218165033-4djghawrzllkeckg
Martin Trigaux [Wed, 18 Dec 2013 16:00:41 +0000 (17:00 +0100)]
[MERGE] forward port of latest saas-2 until rev 4996 dle@openerp.com-
20131218123130-vlejjv7r2klkzoj0
bzr revid: mat@openerp.com-
20131218160041-58x5kij4v7earagu
Martin Trigaux [Wed, 18 Dec 2013 15:57:15 +0000 (16:57 +0100)]
[MERGE] forward port of latest saas-2 until rev 9051 dle@openerp.com-
20131217142126-1lbim47d2m2x4bb0
bzr revid: mat@openerp.com-
20131218155715-khb909yy99cbmna8
Xavier Morel [Wed, 18 Dec 2013 15:26:26 +0000 (16:26 +0100)]
[MERGE] fixes for non-direct IME
bzr revid: xmo@openerp.com-
20131218152626-kexq1wudvjwnh962