Commit Graph

92 Commits

Author SHA1 Message Date
Olivier Dony 03b6acd13d [MERGE] Access inherited product fields on the product directly rather than template, courtesy of Alexis de Lattre (Akretion)
It makes the code a little more straightforward and does not hurt.

bzr revid: odo@openerp.com-20121218225015-6r9ydxjlh147m3z1
2012-12-18 23:50:15 +01:00
Cecile Tonglet 15fe515601 [MERGE] From trunk
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
Cedric Snauwaert 182ea633d7 [REF]invert if-else condition
bzr revid: csn@openerp.com-20121212162738-2nwkk3r0f45bmvzs
2012-12-12 17:27:38 +01:00
Cedric Snauwaert ac367e4ceb [FIX]fix problem when trying to add line entry in my current timesheet
bzr revid: csn@openerp.com-20121212152126-czq2fwo1oxkvt73o
2012-12-12 16:21:26 +01:00
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace.
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Fabien Pinckaers 79084f2967 [FIX] domain on invoice lines
bzr revid: fp@tinyerp.com-20121126141944-9613k5raqmzzv1tp
2012-11-26 15:19:44 +01:00
Fabien Pinckaers 4f0c5bf19c [IMP] contract useability and invoicing
bzr revid: fp@openerp.com-20121028151537-98wz6qiosmumbqvg
2012-10-28 16:15:37 +01:00
Fabien Pinckaers af4b056f24 [IMP] cleaned timesheets and contracts useability
bzr revid: fp@openerp.com-20121028110506-v53w8oh42xzrm9ff
2012-10-28 12:05:06 +01:00
Fabien Pinckaers dd3e728fb6 [MERGE] + improve hr_timesheet
bzr revid: fp@tinyerp.com-20121026075715-kq910tdzhc1uul3l
2012-10-26 09:57:15 +02:00
Fabien Pinckaers 17bf5de2ed [IMP] better error message
bzr revid: fp@openerp.com-20120916194536-s3rckgin6oh703i4
2012-09-16 21:45:36 +02:00
Fabien Pinckaers 0d49a19a1e [REVERT] hr_timeshetsheet
bzr revid: fp@openerp.com-20120916183715-1fmaxbrx54ag942p
2012-09-16 20:37:15 +02:00
Fabien Pinckaers f8a32421d9 [MERGE] better HR messages
bzr revid: fp@openerp.com-20120916152319-z1trkemgvcqelfk2
2012-09-16 17:23:19 +02:00
Amit Patel e7cb7fd18f [MERGE]:merged timetracking changes.
bzr revid: apa@tinyerp.com-20120913102648-dom11isset01lj4w
2012-09-13 15:56:48 +05:30
Pinakin Nayi (OpenERP) 651b5c2cdc [IMP]hr_timesheet:journal_id
bzr revid: pna@tinyerp.com-20120912123554-08yyv9xnm47qukcd
2012-09-12 18:05:54 +05:30
Rucha (Open ERP) dd7a2972d8 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120813051411-5no0xcudwbkw07c5
2012-08-13 10:44:11 +05:30
Antonin Bourguignon 59aa37f0e4 [IMP] all the warning messages now start with 'Warning\!' (not 'Warning' or 'Warning \!')
bzr revid: abo@openerp.com-20120807113414-7mryqyt3jnq8shsa
2012-08-07 13:34:14 +02:00
pso (OpenERP) 773c2d5c63 [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120801064711-y90iik5ialfdnfft
2012-08-01 12:17:11 +05:30
Rucha (Open ERP) 450c60762c [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120727045438-740vzcigf5phqqej
2012-07-27 10:24:38 +05:30
Alexis de Lattre f9fe637803 Remplace all occurences of my_browse_rec.product_id.product_tmpl_id.field to my_browse_rec.product_id.field
bzr revid: alexis@via.ecp.fr-20120727015202-7fylff5jr26sgxez
2012-07-27 03:52:02 +02:00
Rucha (Open ERP) 780bdb4a29 [IMP]: product: Changed xml_id of product in data file from product_product_0 to product_product_consultant to identify this record easily when accessing from py
bzr revid: rpa@tinyerp.com-20120726113914-gvpo9rx7fan77w3f
2012-07-26 17:09:14 +05:30
Saurang Suthar(OpenERP) 25d650e96e [IMP] Improved warning messages for hr* modules
bzr revid: pso@tinyerp.com-20120725121354-hypwxo74c43jm5gp
2012-07-25 17:43:54 +05:30
Divyesh Makwana (Open ERP) cbcf68d3d9 [IMP] hr_timesheet : Override the 'on_change_template' method.
bzr revid: mdi@tinyerp.com-20120723121029-9manyfm4brhsbuf0
2012-07-23 17:40:29 +05:30
Pinakin Nayi (OpenERP) 881148d4b1 [IMP]hr-warning-message
bzr revid: pna@tinyerp.com-20120713121613-poze6x6838cr9xpe
2012-07-13 17:46:13 +05:30
Pinakin Nayi (OpenERP) 27226c12b2 [IMP]hr-warning-message
bzr revid: pna@tinyerp.com-20120713070425-b3envibswfdt6umq
2012-07-13 12:34:25 +05:30
Rucha (Open ERP) 2558625eba [IMP]: product: Improved reference of product_consultant
bzr revid: rpa@tinyerp.com-20120703062321-w81hoysgssgwktbj
2012-07-03 11:53:21 +05:30
Amit Patel (OpenERP) 1a1c9c1c6d [IMP]:typo
bzr revid: apa@tinyerp.com-20120531092754-lxeafar67dpuqnlh
2012-05-31 14:57:54 +05:30
Sanjay Gohel (Open ERP) a39b8f3b70 [IMP]boolean timesheet move to hr_timesheet from invoice and view improve
bzr revid: sgo@tinyerp.com-20120528133158-n7cp580jl8kpru9y
2012-05-28 19:01:58 +05:30
Jagdish Panchal (Open ERP) 479d238076 [IMP] HR:UOM to Unit of Measure change everywhere
bzr revid: jap@tinyerp.com-20120425073257-78ys80zqw8piahvi
2012-04-25 13:02:57 +05:30
Olivier Dony da84f36eb4 [FIX] all: update context_today calls after API change
See also server revision 4053
revision-id: odo@openerp.com-20120214122413-rznpdyqajrzswk4o

bzr revid: odo@openerp.com-20120214122520-f4lyaoolw1sik7zo
2012-02-14 13:25:20 +01:00
Olivier Dony 5fc1a9fc7b [FIX] all: use newly introduced fields.date.context_today
Following the introduction of fields.date.context_today,
correct the main cases where we need to use the user's
timezone instead of the default UTC one.
There are probably many minor cases where this may be
useful, but those cases should be easy to fix now
that there is a common way to fix them.

lp bug: https://launchpad.net/bugs/925361 fixed

bzr revid: odo@openerp.com-20120213180741-4hvd4p7wsep0fomf
2012-02-13 19:07:41 +01:00
Quentin (OpenERP) c829e12bd2 [FIX] moved product_consultant data into the module product, as the hr_timesheet module is not the only one using it (sale do as well)
lp bug: https://launchpad.net/bugs/877495 fixed

bzr revid: qdp-launchpad@openerp.com-20111018153152-s7op06lppfu2p0up
2011-10-18 17:31:52 +02:00
fp e37394cd58 [IMP] useability of timesheet
bzr revid: fp@fp-laptop-20110910124355-qkkbtgm3wz6l2w1f
2011-09-10 14:43:55 +02:00
Amit Parmar (OpenERP) 3b34e9707d [IMP] remerge replace sale configuration wizard
bzr revid: aar@tinyerp.com-20110803121332-h2f33lswj3tb8afu
2011-08-03 17:43:32 +05:30
uco (OpenERP) d827b2f6ea [REF]: Added remaining context changes in _constraints. Removed unnecessary checking for context from methods.
bzr revid: uco@tinyerp.com-20101213064309-vg36f1510xv2f8zb
2010-12-13 12:13:09 +05:30
vth cd8e9de724 [REF] hr_*
bzr revid: vth@tinyerp.com-20101027124959-phubwje70rmbec4p
2010-10-27 18:19:59 +05:30
Fabien Pinckaers 47f3768d1d fix
bzr revid: fp@tinyerp.com-20101017224535-pzqi1pq7uw0jd6zq
2010-10-18 00:45:35 +02:00
Fabien Pinckaers ed5019c385 [IMP] better views, hr timesheet and expenses
bzr revid: fp@tinyerp.com-20101017220823-cflmo1s0kcr02v4y
2010-10-18 00:08:23 +02:00
Fabien Pinckaers e61f615c7b [FIX] improve new employee for timesheet
bzr revid: fp@tinyerp.com-20101012172725-5zo9c43yezol5woj
2010-10-12 19:27:25 +02:00
AMP (OpenERP) 66cf3ab7dd [MOD/IMP] hr_timesheet : Improvement in data by default product service and timesheet jounral
bzr revid: amp@tinyerp.com-20101012094042-5lzwzvy2fxsg94n0
2010-10-12 15:10:42 +05:30
Fabien Pinckaers 67999a7e4e [IMP] billing project hours useable
bzr revid: fp@tinyerp.com-20101004232308-pvzlua2cyra2kvqp
2010-10-05 01:23:08 +02:00
Fabien Pinckaers 94fd910f3c fix
bzr revid: fp@tinyerp.com-20101004225629-vidur45sz7dmg9nn
2010-10-05 00:56:29 +02:00
Jay (OpenERP) 449c4ae7bf [FIX] Corrected failures caused by previous commits,Thanks to builbot
bzr revid: jvo@tinyerp.com-20100927123806-hz4nh1imppi772cn
2010-09-27 18:08:06 +05:30
Raphaël Valyi - http://www.akretion.com 64a2c35fac [FIX] hr_timesheet : Onchange of user was counting changed user into context
lp bug: https://launchpad.net/bugs/620907 fixed

bzr revid: jvo@tinyerp.com-20100827091739-14m4insilfd8s3xg
2010-08-27 14:47:39 +05:30
olt@tinyerp.com 1a25228545 [FIX] hr_timesheet: related field 'partner_id' in 'hr_analytic_timesheet' class: 'relation' argument should be set to 'res.partner' and not 'account.analytic.account'
bzr revid: olt@tinyerp.com-20100820085714-vw11cn1tmw2zc2lh
2010-08-20 10:57:14 +02:00
PSI(OpenERP) 04e5144b2d [IMP] HR modules: Usebility, on employee add contract field (latest)
bzr revid: mra@mra-laptop-20100819093802-9z5a0t6rn4f17i5j
2010-08-19 15:08:02 +05:30
Olivier Dony ed29832f40 [IMP] all addons with _inherits: ensure the m2o to the parent is required with ondelete=cascade
The framework has been updated to fix this automatically, but having it set correctly in the _columns is better for readability, and avoids the warnings.

bzr revid: odo@openerp.com-20100812192933-nm46mik1hkzsme2q
2010-08-12 21:29:33 +02:00
PSI (Openerp) 595fdbde61 [IMP] hr related modules improvements
bzr revid: mra@mra-laptop-20100726061527-xftwpfuimrs2bbo8
2010-07-26 11:45:27 +05:30
vra bf8d2a73c0 [IMP][REF] Sql-injection changes, remove print statement, some space improvement.
bzr revid: vra@tinyerp.com-20100616115139-cql5oiqf622spa6p
2010-06-16 17:21:39 +05:30
mra (Open ERP) 59a5344427 [MERGE] merge with main branch changes from dev2 team from trunk addons => Remove conflicts on idea
bzr revid: mra@tinyerp.com-20100601084216-0yihd6bc3knvskdp
2010-06-01 14:12:16 +05:30
hmo 3aaebcb3a9 [MERGE] merge with master trunk-addons
bzr revid: hmo@hmo-20100520113303-67jlxy1thn3iafdn
2010-05-20 17:03:03 +05:30