Commit Graph

221 Commits

Author SHA1 Message Date
Denis Ledoux 546a191f0a [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9459 rev-id: fva@openerp.com-20130918153347-fy4nuvbm82ngfb8x
bzr revid: mat@openerp.com-20130826135110-f9q4p65ds2aholcw
bzr revid: dle@openerp.com-20130828141129-ecxl2vlpb8vw0o9f
bzr revid: dle@openerp.com-20130828162659-n8a0ku9o3h01qaov
bzr revid: dle@openerp.com-20130830094205-q3itwd7x0246d9n6
bzr revid: dle@openerp.com-20130830133604-mfnfbscn5wdk4vi4
bzr revid: dle@openerp.com-20130902131244-v9uh0s8rg4889i7j
bzr revid: mat@openerp.com-20130903134105-68ziuaccreu6rs61
bzr revid: chs@openerp.com-20130906171851-jtfsf4au1k30wwlr
bzr revid: dle@openerp.com-20130909103120-k5oefxgebhyslac3
bzr revid: dle@openerp.com-20130909170047-pbzw4ernvcpivbhh
bzr revid: chs@openerp.com-20130910122113-171osvcukxffxcry
bzr revid: tde@openerp.com-20130912121059-k840pi4rwdzpez8g
bzr revid: dle@openerp.com-20130913085251-p906ci2divy82jur
bzr revid: tde@openerp.com-20130913092546-kzshg1a7sls566l8
bzr revid: mat@openerp.com-20130917122102-drf8fj9lrjj0fvju
bzr revid: mat@openerp.com-20130917161614-w8u2c1ayeb5kxm30
bzr revid: dle@openerp.com-20130918161305-7ep1642nxzyy3vhd
2013-09-18 18:13:05 +02:00
Mohammed Shekha a74fa6ed73 [FIX]Fixed the issue of timezone on total attendance on My current timesheet view.
bzr revid: msh@openerp.com-20130522125350-b6yj2mpqosfwajkc
2013-05-22 18:23:50 +05:30
Thibault Delavallée a05b0bebbe [FORWARD] Forward port of 7.0 branch until revision 9143.
bzr revid: tde@openerp.com-20130521122359-b5vii7gv8arluz06
2013-05-21 14:23:59 +02:00
Quentin (OpenERP) 7351a7312d [FIX] hr_timesheet: improved perfomances on the read of timesheet sheets
bzr revid: qdp-launchpad@openerp.com-20130508085938-a2uyalx1cy2musj0
2013-05-08 10:59:38 +02:00
Vo Minh Thu e69326ee3b [REF] removed explicit model instanciations.
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
Quentin (OpenERP) 2b64c79c3d [MERGE] forward port of fixes made in v7 addons branch up to revision 8872
bzr revid: qdp-launchpad@openerp.com-20130318122717-qptmntn26bx4wn8r
2013-03-18 13:27:17 +01:00
Cedric Snauwaert 7d0630b448 [FIX]hr_timesheet_sheet: fix user_id variable referenced before assignment when no employee_id
specified in onchange_employee_id

bzr revid: csn@openerp.com-20130314150614-bsnwc4gk7a9eyri0
2013-03-14 16:06:14 +01:00
Ajay Chauhan (OpenERP) 95a8d5759e [FIX] hr_timesheet_sheet: did some changes.
bzr revid: cha@tinyerp.com-20130201092307-yajxn97wnhz3xofj
2013-02-01 14:53:07 +05:30
Ajay Chauhan (OpenERP) 4b7ad7da56 [IMP] removed unused import
bzr revid: cha@tinyerp.com-20130131092950-mm2xjuv2j2t0gk7v
2013-01-31 14:59:50 +05:30
Ajay Chauhan (OpenERP) da43da8f3b [IMP] hr_timesheet_sheet: use the new signal_xxx methods instead of trg_validate.
bzr revid: cha@tinyerp.com-20130131092440-gxhz5y5rxkfuy9k3
2013-01-31 14:54:40 +05:30
Thibault Delavallée 331e420a55 [FIX] needaction: fixed last commit, harmonizing the parameters of the various needaction_domain_get.
bzr revid: tde@openerp.com-20121220110242-ot9ha7rt1ofyjoj5
2012-12-20 12:02:42 +01:00
Thibault Delavallée d737a7f098 [IMP] sale, purchase, hr_timesheet_sheet, hr_holidays, event, crm_meeting: fixed, improved and cleaned needaction_domain_get.
bzr revid: tde@openerp.com-20121220100005-d0r0se41fx83w38c
2012-12-20 11:00:05 +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 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 6072fd11af [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n
2012-12-10 12:16:54 +01:00
Fabien Pinckaers e128f7f5d8 [MERGE] fixes + cleaning hr_evaluation
bzr revid: fp@tinyerp.com-20121208124319-wyrc3udl3mau2963
2012-12-08 13:43:19 +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
Tejas Tank 82c58a9f85 [FIX] corrected code for sending unwated more notes.
bzr revid: tta@openerp.com-20121206063612-g3l7aracvtyrkqnz
2012-12-06 11:36:12 +05:00
Tejas Tank 61382204dc [FIX] Does not require to set related field in default.
bzr revid: tta@openerp.com-20121203074442-cbzavdhswqyd306g
2012-12-03 12:44:42 +05:00
Tejas Tank cd4899aa6a An employee should receive a mail.message in inbox when an manager refuse a timesheet.
bzr revid: tta@openerp.com-20121122110015-61xx09vchksen6v3
2012-11-22 16:30:15 +05:30
Tejas Tank 0c07c9c827 [IMP] Corrected _needaction_domain_get.
bzr revid: tta@openerp.com-20121122063326-gsvahyei0xsnmzyg
2012-11-22 12:03:26 +05:30
Tejas Tank a8fb9f6cdd A manager of an employee should receive a mail.message in inbox when an employee validates a timesheet.
bzr revid: tta@openerp.com-20121121135444-i79rrica84rl4e4a
2012-11-21 19:24:44 +05:30
Tejas Tank 414920b52f [FIX] Corrected code style.
bzr revid: tta@openerp.com-20121121134349-fsko8x6t97d1hzdz
2012-11-21 19:13:49 +05:30
Bharat Devnani (OpenERP) 54e2722948 merged hsa's branch lp:~openerp-dev/openobject-addons/trunk-10-hr-click-2-bde-timesheet-hsa
bzr revid: bde@tinyerp.com-20121112110220-rqk5qo07ol4duzds
2012-11-12 16:32:20 +05:30
Bharat Devnani (OpenERP) 89f8722f23 [ADD] added default value for user_id
bzr revid: bde@tinyerp.com-20121112103455-aar7t15a4bixjyrj
2012-11-12 16:04:55 +05:30
Pinakin Nayi (OpenERP) d987291a63 [IMP]hr_timesheet_shhet add chatter
bzr revid: pna@tinyerp.com-20121112095424-p3z0bwx1f38nbv4n
2012-11-12 15:24:24 +05:30
Hardik 40745949d4 [IMP]following fields are invalid user in timesheet
bzr revid: hsa@tinyerp.com-20121109133705-biefd0u3d50zyzh6
2012-11-09 19:07:05 +05:30
Ajay Chauhan (OpenERP) 3894874ebb [MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121030050323-cpn92n9txy0xw5gj
2012-10-30 10:33:23 +05:30
Ajay Chauhan (OpenERP) 6cfffae349 [MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121029050259-0vimwnu84f2dvk2g
2012-10-29 10:32:59 +05:30
Fabien Pinckaers dd3e728fb6 [MERGE] + improve hr_timesheet
bzr revid: fp@tinyerp.com-20121026075715-kq910tdzhc1uul3l
2012-10-26 09:57:15 +02:00
Fabien Pinckaers a7368145ca [MERGE] typo
bzr revid: fp@openerp.com-20121024201424-98la8f2wkhfjrtae
2012-10-24 22:14:24 +02:00
Ajay Chauhan (OpenERP) 12246cfb2b [IMP] hr_timesheet_sheet: made little change in warning message
bzr revid: cha@tinyerp.com-20121022070215-y87h55i1h8fuljuf
2012-10-22 12:32:15 +05:30
Ajay Chauhan (OpenERP) b7bc79d9c3 [MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121018060531-wl123qyuvlccjyfc
bzr revid: cha@tinyerp.com-20121022053314-olinyyizlbcmf9y2
2012-10-22 11:03:14 +05:30
Fabien Pinckaers 6c15bcce12 [MERGE] HR
bzr revid: fp@openerp.com-20121021195925-sbsfni9i10r2o2bw
2012-10-21 21:59:25 +02:00
Mayur Maheshwari (OpenERP) 0b87880029 [IMP]all: imporve string state to status
bzr revid: mma@tinyerp.com-20121012114258-w2q3hg1wb5wlt8wi
2012-10-12 17:12:58 +05:30
Ajay Chauhan (OpenERP) 142253b76e [IMP] hr_timesheet_sheet: made changes in warning message
bzr revid: cha@tinyerp.com-20121011122036-ff1kevlg121t2yz7
2012-10-11 17:50:36 +05:30
Atul Patel (OpenERP) b27b12db1b [FIX]: Fix onchange account id problem
bzr revid: atp@tinyerp.com-20121011121201-h6030emuz00t55nv
2012-10-11 17:42:01 +05:30
Atul Patel (OpenERP) e2a28b011a [FIX]: Fix on_change_analytic_id problem
bzr revid: atp@tinyerp.com-20121010150849-u4cldadvfjzmw8mj
2012-10-10 20:38:49 +05:30
Atul Patel (OpenERP) f935c9e482 [FIX]: get sheet id using timesheet line user id
bzr revid: atp@tinyerp.com-20121010124716-hdaebwpsowpowhl7
2012-10-10 18:17:16 +05:30
Atul Patel (OpenERP) eb20086d59 [REM]: Remove print statement
bzr revid: atp@tinyerp.com-20121010111151-cgylp0roe61vhzs9
2012-10-10 16:41:51 +05:30
Atul Patel (OpenERP) 98eaf2c2bc [FIX]: Fix on_change_account_id() argument problem
bzr revid: atp@tinyerp.com-20121010103450-n4gt4ikp05t6b8yu
2012-10-10 16:04:50 +05:30
pankita shah (Open ERP) 28bc19896d [MERGE] merged with lp:openobject-addons
bzr revid: shp@tinyerp.com-20121010052449-hvnp0e53d1sp6xs2
2012-10-10 10:54:49 +05:30
Atul Patel (OpenERP) bea6f1bbf3 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121009132059-fd0jvi6nuh9jyrl7
2012-10-09 18:50:59 +05:30
Atul Patel (OpenERP) 82138688a2 [FIX]: Fix analytic line shown.
bzr revid: atp@tinyerp.com-20121008154647-bdxw4ajq5hgb7jsk
2012-10-08 21:16:47 +05:30
niv-openerp a21489c8c8 Added on_change
bzr revid: nicolas.vanhoren@openerp.com-20121004134858-bsjtmlpbr4v9zv4d
2012-10-04 15:48:58 +02:00
niv-openerp dbd69a0e9e merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20121002122939-xr3by0mdqzri0lss
2012-10-02 14:29:39 +02:00
niv-openerp 6679892393 fixed line duplication bug
bzr revid: nicolas.vanhoren@openerp.com-20121002121103-wyvshcyky324nc6r
2012-10-02 14:11:03 +02:00
Antonin Bourguignon 1653332080 [MERGE] trunk
bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw
2012-10-02 12:29:15 +02:00
niv-openerp 7c1339928b Removed day by day
bzr revid: nicolas.vanhoren@openerp.com-20121001154605-nemay3pze49ejjld
2012-10-01 17:46:05 +02:00
Fabien Pinckaers 0eee48d30a [MERGE] auto-follow Sales Team, Projet, HR Manager
bzr revid: fp@tinyerp.com-20120927191059-pug5mrft8f06uwux
2012-09-27 21:10:59 +02:00