Commit Graph
66573 Commits
Author SHA1 Message Date
Dharmraj Jhala (OpenERP) c6917b9c07 [MERGE] with trunk-survey2-rim addons branch
bzr revid: dizzy.zala@gmail.com-20140225053204-mra08nfvumkxyixa
2014-02-25 11:02:04 +05:30
Richard Mathot (OpenERP) 9eb2db4465 [FIX] Typos
bzr revid: rim@openerp.com-20140220120044-syde053xmunoy75z
2014-02-20 13:00:44 +01:00
Richard Mathot (OpenERP) 4691383273 [REF] code cleaning
bzr revid: rim@openerp.com-20140212131837-gjbl4nu8d1zdwqy1
2014-02-12 14:18:37 +01:00
Richard Mathot (OpenERP) 78f683d3d4 [MERGE] Merge trunk
bzr revid: rim@openerp.com-20140212095606-n8e1q086m2996wxn
2014-02-12 10:56:06 +01:00
Launchpad Translations on behalf of openerp 0bbf709f5c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140212052933-2x7w3n6hxognlz1m
2014-02-12 05:29:33 +00:00
Frédéric van der Essen 6dd6035509 [MERGE] point_of_sale: allow negative product quantities and totals in the POS
bzr revid: fva@openerp.com-20140211165120-306mkomw1t964x33
2014-02-11 17:51:20 +01:00
Frédéric van der Essen bfcc2fead3 [MERGE] from trunk
bzr revid: fva@openerp.com-20140211165043-3t8nys0btenqie59
2014-02-11 17:50:43 +01:00
Frédéric van der Essen bcc6a6aeda [IMP] point_of_sale: allow negative product quantities, and negatives totals
bzr revid: fva@openerp.com-20140211164541-nt2xu5rhdv0tm7pk
2014-02-11 17:45:41 +01:00
Richard Mathot (OpenERP) fbbe8631c9 [FIX] Partial fix of 'hr_evaluation', which is broken by the new 'survey' + code cleaning and simplification
bzr revid: rim@openerp.com-20140211153524-kxupg07ns5dny658
2014-02-11 16:35:24 +01:00
Thibault Delavallée d93fce56b6 [MERGE] mrp: small usability fixes
- updated groups on some fields of bom
- removed some icons in form view, to be coherent with other form views
- BOM form view: updated onchange_product_id that now takes product_qty into account to compute
uos and uos quantity.

bzr revid: tde@openerp.com-20140211152116-niwt0pak4r0n8jst
2014-02-11 16:21:16 +01:00
Thibault Delavallée 394b6389f0 [MERGE] Sync with upstream (trunk)
bzr revid: tde@openerp.com-20140211141925-p3sziwkon7jlsq5r
2014-02-11 15:19:25 +01:00
Thibault Delavallée 796d40b474 [MERGE] [IMP] hr, hr_recruitment: job position update and usability improvements
hr: hr.job
- no_of_recruitment now indicates the number of employees you want to hire in a given recruitment phase
- added no_of_hired_employee that is the number of employees already recruited in the current recruitment phase
- updated form view
- removed simplified form view
- the job in the employee form view is now clickable and redirects to the job form view

hr_recruitment
- new dependency: web_kanban_gauge
- installing this module adds the 'Job Positions' menu, and adds a new kanban view for hr.job
- adds fields on hr.job to track applicants and their documents, used in the kanban view
- added configuration for default jobs alias, available in the Human Resources settings
- updated applicant / job subtypes: following some subtypes on the job now makes automatically follow some subtypes on applicants, like salesteam/opportunities or project/tasks and issues

mail: mail_alias
- when migrating to alias, use mail_notrack to avoid performing the tracking; indeed we are in a transient state, and trying to browse and track value change is risky.
mail: mail_thread: empty list help: small tweak to try to find a default alias

misc
- sale_crm: update for the new gauge widget parameters

bzr revid: tde@openerp.com-20140211140149-l15qr876s5ykfww5
2014-02-11 15:01:49 +01:00
Thibault Delavallée cff84e5329 [MERGE] [IMP] web_kanban_gauge: cleaned and improved parameters
- max_value: maximum value of the gauge [default: 100]
- max_field: get the max_value from the field that must be present in the view; takes over max_value
- gauge_value_field: if set, the value displayed below the gauge is taken from this field instead of the base field used for the gauge. This allows to display a number different from the gauge.
- force_set: is value is 0, display a text 'Click to set' [default: True]
- label: lable of the gauge, displayed below the gauge value
- title: title of the gauge, displayed on top of the gauge
- on_change: action to call when cliking and setting a value (previously names action_change)
- on_click_label: optional label of the input displayed when clicking

Coming with an update of jobs that triggered those various changes and cleaning in the gauge widget.

bzr revid: tde@openerp.com-20140211140101-33259mv4i5c1ge7j
2014-02-11 15:01:01 +01:00
Christophe Matthieu 5b8ea0803a [FIX] website: crappy layout when use click on edit in the shop. Microforma error. Don't use meta tag in page content: ckeditor bug report 8117.
bzr revid: chm@openerp.com-20140211135610-0xhf2yiuwfc8k0ss
2014-02-11 14:56:10 +01:00
Richard Mathot (OpenERP) 60e4340cee [MERGE] Merge trunk
bzr revid: rim@openerp.com-20140211133450-itj3p86ptmqtqrjt
2014-02-11 14:34:50 +01:00
Thibault Delavallée 0b43555b65 [IMP] web_kanban_gauge: fade update when changing the value
bzr revid: tde@openerp.com-20140211122622-5c3doi7vjp5fepfc
2014-02-11 13:26:22 +01:00
Thibault Delavallée b8c82c0f45 [IMP] hr_recruitment: cleaned code about default user_id and things like that when creating a new applicant.
All code now belongs to onchange_job, and is called in create, whether with
vals.get('job_id') or context.get('default_job_id')

bzr revid: tde@openerp.com-20140211122341-xz5hxe0qrt1reevg
2014-02-11 13:23:41 +01:00
Thibault Delavallée 623b230390 [IMP] hr_recruitment: updated gauge parameter name
bzr revid: tde@openerp.com-20140211122308-qnwz8e9j9ggs4n7p
2014-02-11 13:23:08 +01:00
Thibault Delavallée 6b03c5076a [IMP] sale_crm: udpated gauge parameter name
bzr revid: tde@openerp.com-20140211122253-tj3a7llcr0dbhdbn
2014-02-11 13:22:53 +01:00
Thibault Delavallée f8b9f2a5c5 [IMP] web_kanban_gauge: action_change, renamed to on_click_action, now renamed to on_change, because because.
bzr revid: tde@openerp.com-20140211122240-rtb292sw0f0wngmv
2014-02-11 13:22:40 +01:00
Thibault Delavallée 8b6bea01ed [FIX] hr: demo data: removed color definition as this field is defind in hr_recruitment, not in hr
bzr revid: tde@openerp.com-20140211120551-y5e4oyb3lkalx6l8
2014-02-11 13:05:51 +01:00
Thibault Delavallée 610ebaef85 [CLEAN] hr: moved color field + an action in hr_recruitment, because they are used in this module + removed unnecessary code
bzr revid: tde@openerp.com-20140211120433-f34jsy7xjga1ultt
2014-02-11 13:04:33 +01:00
Thibault Delavallée 38604c3761 [MERGE] Sync with upstream (trunk)
bzr revid: tde@openerp.com-20140211115243-zkqkarv99ah95kc3
2014-02-11 12:52:43 +01:00
Thibault Delavallée 110612fc11 [IMP] hr_recruitment: updated help of default recruitment menu
bzr revid: tde@openerp.com-20140211114121-vehqz4p0ca2o3m79
2014-02-11 12:41:21 +01:00
Thibault Delavallée 7f662d3958 [CLEAN] hr_recruitment: cleaned added code in res_config
- alias finding extgracted in its own method, and uses the new ir.model.data API
xmlid_to_resid
- simplified code of get_default_alias and set_default_alias
- alias_domain default method calls the one defined in mail.alias to try to have only
one method doing the trick

bzr revid: tde@openerp.com-20140211112434-iuqy2a2mrm0pmaxq
2014-02-11 12:24:34 +01:00
Thibault Delavallée 7fd1a825a8 [CLEAN] hr_recruitment: cleaning before merging
- some code reindentation
- updated subtypes, to use parent_id feature between applicants and jobs. Another task will
improve the layout bu hiding some subtypes in applicant; currently we keep a child / parent
behavior.
- renamed open_attachments method
- some changes in create reverted
- chatter posted in job now hav ea subtype, not sure to keep those

bzr revid: tde@openerp.com-20140211105807-ay93xbwilsz3mso6
2014-02-11 11:58:07 +01:00
Thibault Delavallée 87028244f4 [FIX] sale_crm: fixed gauge widget according to new parameters
bzr revid: tde@openerp.com-20140211100725-n5u4y42givj18ept
2014-02-11 11:07:25 +01:00
Thibault Delavallée 5c2839f102 [IMP] hr_recruitment: job kanban view: updated gauge widget according to new parameters
bzr revid: tde@openerp.com-20140211100537-9yrae5pbvmdntelv
2014-02-11 11:05:37 +01:00
Thibault Delavallée 5113c8bca6 [IMP] web_kanban_gauge: udpated parameters
- new parameters: input_value_field is now called gauge_value_field, this is the field
displayed under the gauge
- new parameter: force_set: whether to force setting a value when the value is nul
- new parameter: on_click_label: label under the input when editing the gauge value
- action_change renamed on_click_action

bzr revid: tde@openerp.com-20140211100445-289mvmr8grcgns8x
2014-02-11 11:04:45 +01:00
Fabien Pinckaers 7e41345c02 [IMP] reduce image size, faster preview
bzr revid: fp@tinyerp.com-20140211091401-b3jvu4792bz1de0j
2014-02-11 10:14:01 +01:00
Fabien Pinckaers d31504171c [IMP] Pantone colors of the year
bzr revid: fp@tinyerp.com-20140211085450-ny3pgidw5nobjc5x
2014-02-11 09:54:50 +01:00
Richard Mathot (OpenERP) af58bb70bc [MERGE] Merge trunk
bzr revid: rim@openerp.com-20140211072305-uzc1oocfn4jnuf8i
2014-02-11 08:23:05 +01:00
Turkesh Patel (Open ERP) ba44db60d3 [FIX] change gauge input value method name and improved code in res.config related to create degfault alias.
bzr revid: tpa@tinyerp.com-20140211064607-ll00gw12wviyb2cb
2014-02-11 12:16:07 +05:30
Launchpad Translations on behalf of openerp 06c3efde04 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140211055037-i7s59zrp7mrzmlun
2014-02-11 05:50:37 +00:00
Thibault Delavallée 87f9c85330 [CLEAN] hr: cleaned job form view, removing unnecessary groups, also changed
displayed number of employees (display current number + expected, not the
contraty). Updated hr_recruitment accordingly.

bzr revid: tde@openerp.com-20140210171511-z5277t6ilnvnc48d
2014-02-10 18:15:11 +01:00
Thibault Delavallée 96d3693441 [FIX] mail_alias: avoid performing tracking when migrating to
alias. Indeed in this method, we have unitialized inherited fields because the orm
is updating. A new no_track key (already intorduced in 7.0, added in this branch because
of a missing forward-port) in mail_thread allows to avoid doing the tracking of values
and is used in mail_alias.

bzr revid: tde@openerp.com-20140210171350-ajwxwau2ar1gu9io
2014-02-10 18:13:50 +01:00
Frédéric van der Essen 22e09cb41e [FIX] hw_escpos: status receipt would not print on the posbox
bzr revid: fva@openerp.com-20140210161701-aolbu63i7w74f97c
2014-02-10 17:17:01 +01:00
Thibault Delavallée 923028c4db [CLEAN] hr: review and cleaning before merging
- hr.py: small cleaning of job code + method renaming + context propagation + compat-mode for
method renaming
- hr_view: job_id on employee form is no longer 'no_open', because otoherwise it is impossible
to see jobs. Removed simplified form for job. Better form for job, recruitmnet-related stuff
is invisible when job is 'open'.

bzr revid: tde@openerp.com-20140210161326-c9qqff69squehg9v
2014-02-10 17:13:26 +01:00
Frédéric van der Essen 04a6074b1a [MERGE] forward porting fixes from saas-3
bzr revid: fva@openerp.com-20140210155628-75mgw7qcq9k5ncem
2014-02-10 16:56:28 +01:00
Frédéric van der Essen 82277b178b [MERGE] point_of_sale: posbox related usability & reliability improvements + firefox bug fix
bzr revid: fva@openerp.com-20140210155318-1exkkl4ij93jtbq2
2014-02-10 16:53:18 +01:00
Christophe Matthieu 1ac9b4d20d [IMP] website: banner tutorial: remove step about customize and promote
bzr revid: chm@openerp.com-20140210155251-iyj3v06r18vexj7d
2014-02-10 16:52:51 +01:00
Frédéric van der Essen 958764e7d3 [MERGE] from saas-3
bzr revid: fva@openerp.com-20140210151007-saw8m1bqwnxek26x
bzr revid: fva@openerp.com-20140210155110-6obc985lc4rl3eyv
2014-02-10 16:51:10 +01:00
Christophe Matthieu 3a273b989c [IMP] website: typo for tutorial
bzr revid: chm@openerp.com-20140210151741-grf5wsvjonuihxw0
2014-02-10 16:17:41 +01:00
Christophe Matthieu abc49aebd5 [FIX] website: don't set tour as automatic when reload page
bzr revid: chm@openerp.com-20140210145923-2w9vbxqqgewgkb0w
2014-02-10 15:59:23 +01:00
Thibault Delavallée 4be860c167 [REVIEW] mail: mail_thread: cleaned comment of modified code in get_empty_list_help
bzr revid: tde@openerp.com-20140210144611-16nkcju2yerc80e5
2014-02-10 15:46:11 +01:00
Thibault Delavallée 622cb42fe6 [CLEAN] mail: mail_alias: alias name cleaning + find as unique in its own method, called by create and write
bzr revid: tde@openerp.com-20140210144346-ropiufpicvlivhb2
2014-02-10 15:43:46 +01:00
Fabien Meghazi 0da8cdda90 [FIX] Set default 'editable' key in website's rendering context
bzr revid: fme@openerp.com-20140210143546-1t82gog330n5x89t
2014-02-10 15:35:46 +01:00
Frédéric van der Essen d930115bd3 [IMP] hw_escpos: print a status receipt on printer connection with ip address for easier configuration & debugging. Also setting the driver thread in daemon mode to avoid hanging the tests on the runbot
bzr revid: fva@openerp.com-20140210133109-xll1ijjdhbgpj1kr
2014-02-10 14:31:09 +01:00
Xavier Morel d4c7de4b03 [FIX] work around distribute_branding
distribute_branding is applied after view inheritance is applied, and does not
take it in account. As a result, altering an existing view "from the top"
(e.g. adding a div element preceding an existing div) will alter the xpath
leading to whatever element we need to deal with.

Move fakebar injection to the bottom of the body, where it can't have any
impact on preceding node paths.

bzr revid: xmo@openerp.com-20140210132855-lwh1ow1tq1e0pidp
2014-02-10 14:28:55 +01:00
Turkesh Patel (Open ERP) ee471832f9 [IMP] improved code to show default alias id
bzr revid: tpa@tinyerp.com-20140210131609-v5cxl5pexk37pt6d
2014-02-10 18:46:09 +05:30