Commit Graph

77 Commits

Author SHA1 Message Date
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
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
mra (Open ERP) 38dd957438 [MERGE] Merge with main branch
bzr revid: mra@tinyerp.com-20100520041631-90wyd7ouhnpgwy6a
2010-05-20 09:46:31 +05:30
Fabien Pinckaers a3dd9f05dc [FIX] 3 security rules, [IMP] object names for logs
bzr revid: fp@tinyerp.com-20100519183232-9zieyfnah526r312
2010-05-19 20:32:32 +02:00
psi (Open ERP) 84dfed9da7 [IMP] account, hr_contract, hr_timesheet, project: small changes, clean
bzr revid: psi@tinyerp.co.in-20100519130703-fgog8lo8zgh8g4rk
2010-05-19 18:37:03 +05:30
JMA (OpenERP) f0503973ad [FIX] default_get corrected
bzr revid: jma@tinyerp.com-20100518143817-haxikg9solycjuk9
2010-05-18 20:08:17 +05:30
rpa (Open ERP) 78000800c3 [IMP]: partner_infotab: Renamed partner_crm to partner_infotab, Made relation with timesheet lines and partner
bzr revid: rpa@tinyerp.com-20100512140535-cu62e5qzbiy1vvyp
2010-05-12 19:35:35 +05:30
ksa (Open ERP) 6df236b561 [IMP]: partner_crm hr_timesheet: Task -225 Improvement in partner_crm module
bzr revid: ksa@tinyerp.co.in-20100506122954-leluf2cvydnl27eu
2010-05-06 17:59:54 +05:30
kum (Open ERP) b132399106 [IMP] hr_timesheet:improved code and made change in hr_timesheet_sheet view (Task_id:313)
bzr revid: kum@tinyerp.co.in-20100312070455-yu050itp0wxss9sx
2010-03-12 12:34:55 +05:30
Joel Grand-Guillaume 9478383420 [MRG] Merge last trunk to post again my proposal
bzr revid: joel.grandguillaume@camptocamp.com-20100122131132-jdg4hqgcnyyl8qva
2010-01-22 14:11:32 +01:00
Stephane Wirtel fb3ef7a2f4 [FIX] Change the year of the copyright
bzr revid: stephane@openerp.com-20100112091839-a6p7tenhb4e4zxyx
2010-01-12 10:18:39 +01:00
Joel Grand-Guillaume b75d214b25 [FIX] Analytic_user_function and project_timsheet corrected according to pricetype
bzr revid: joel.grandguillaume@camptocamp.com-20091223171409-a0wfgy034f8o5yjw
2009-12-23 18:14:09 +01:00
Joel Grand-Guillaume 90ddcec2d7 [API] Remove date from onchange_unit_amount from analytic line, cause they are no more used as we base computation on pricetype
[FIX] Start to replace standard_price in everymodule with the right field according to company property

bzr revid: joel.grandguillaume@camptocamp.com-20091223163453-1a1y2pu9kmrzbep4
2009-12-23 17:34:53 +01:00
Joel Grand-Guillaume a0bd469d55 Merge from trunk
bzr revid: joel.grandguillaume@camptocamp.com-20091223073733-jpekbt4hhjklgbfk
2009-12-23 08:37:33 +01:00
uco (OpenERP) 2bc631a28d [IMP,ADD]: Missing or to clarify tooltips: Added and Improved tooltips for some fields.
bzr revid: uco@tinyerp.co.in-20091222130810-12crvqp29ckoxzsj
2009-12-22 18:38:10 +05:30
Joel Grand-Guillaume ff19c0f96b Account:
[ADD] Field company_id on account.analytic.line
[ADD] Function Field currency_id, amount_currency on account.analytic.line, 
on account.analytic.account currency_id
[ADD] Function field currency_id on account.analytic.account = company currency
[API] Change the on_change_unit_amount signature, adding date and company_id
[IMP] Change the on_change_unit_amount funtcion to base cost price on valuation
 instead of standard price.

Product:
[ADD] Add a new property called property_valuation_pricelist into res.company.
purpose of this pricelist is to compute the cost price for a given 
y.

Hr_timesheet:
[API] Change the on_change_unit_amount signature, adding date

Hr_timesheet_invoice
[IMP] Function field currency_id of account.analytic.account base computation
  pricelist currency instead of company currency  

Hr_timesheet_sheet:
[IMP] Add support of new signature for on_change_unit_amount

bzr revid: joel.grandguillaume@camptocamp.com-20091217141332-23u4v79m3pbst7u9
2009-12-17 15:13:32 +01:00
PSO(OpenERP) eb0b928cc0 Changed licencing terms
bzr revid: hda@tinyerp.com-20091014111534-1vtk21rz8byhszzf
2009-10-14 16:45:34 +05:30