Commit Graph

241 Commits

Author SHA1 Message Date
Antony Lesuisse 7e25b9ae55 [MERGE] saas-4 report_webkit missing dependency on report
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
Denis Ledoux 79d4c57877 [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9439 revid:dle@openerp.com-20140429112147-hqfqd0y487s817n7
bzr revid: dle@openerp.com-20140429112738-y2el246dmd2o2zy9
2014-04-29 13:27:38 +02:00
Denis Ledoux 2832d2ddc9 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10016 revid:dle@openerp.com-20140425125507-njfyl1r6wn11vqwx
bzr revid: dle@openerp.com-20140425125926-5nchz1tcq4fx18jx
2014-04-25 14:59:26 +02:00
Martin Trigaux bb85882322 [FIX] hr_timesheet_sheet: forbid to record an attendance in a submitted timesheet (opw 592632)
bzr revid: mat@openerp.com-20140425100856-lcpgyjdk4u632bws
2014-04-25 12:08:56 +02:00
Martin Trigaux 34067a1f49 [FIX] hr_timesheet_sheet: forbid to record an attendance in a submitted timesheet
lp bug: https://launchpad.net/bugs/1180769 fixed

bzr revid: mat@openerp.com-20140424142829-ramy830hwkghk1jv
2014-04-24 16:28:29 +02:00
Christophe Simonis 7a7d7febf8 [MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
Christophe Simonis 52cfc16c2e [MERGE] forward port of branch 7.0 up to revid 10012 launchpad_translations_on_behalf_of_openerp-20140424063249-gwnojb5kvlq544nz
bzr revid: chs@openerp.com-20140424123538-rxk9got9k2on1ki1
2014-04-24 14:35:38 +02:00
Denis Ledoux 966a818aa6 [FIX] hr_timesheet_sheet: allow writing attendance line not according to the date order, and check that the attendances satisfy the alternance constraint, even for delete operations
lp bug: https://launchpad.net/bugs/1180773 fixed

bzr revid: dle@openerp.com-20140423112554-75bpk5k3viroqbh5
2014-04-23 13:25:54 +02:00
Bharat Devnani (Open ERP) 3a0c820dfd [MERGE][IMP] More explicit error messages (in delivery, hr_timesheet_sheet, purchase, purchase_requisition, sale_stock, stock)
bzr revid: rim@openerp.com-20140422123022-22zef462lts0qyqi
2014-04-22 14:30:22 +02:00
Bharat R. Devnani (OpenERP) b8d4387d33 [MERGE] merged with main addons branch
bzr revid: bde@tinyerp.com-20140418061256-n53rymt5j8krzvr5
2014-04-18 11:42:56 +05:30
Richard Mathot (OpenERP) e1cebe9003 [REF] hr_timesheet: unused piece of code
bzr revid: rim@openerp.com-20140414132634-xaps5ydbic5jriw4
2014-04-14 15:26:34 +02:00
Bharat R. Devnani (OpenERP) 28a33f3a8d [IMP] improved some warning messages
bzr revid: bde@tinyerp.com-20140124123045-kgovbmuhkovax068
2014-01-24 18:00:45 +05:30
Chirag Dodiya (OpenERP) 9a3ce1a5cc [IMP]Improved code to open contract wizard from hr timesheet
bzr revid: cod@tinyerp.com-20140107061157-lt1b0qvvms8a0qdi
2014-01-07 11:41:57 +05:30
Chirag Dodiya (OpenERP) d9ab20e1b9 [IMP] Improved code of name_create method
bzr revid: cod@tinyerp.com-20131223122433-9svu8iyoruutdmjd
2013-12-23 17:54:33 +05:30
Chirag Dodiya (OpenERP) bda62ace29 [IMP]Improved code
bzr revid: cod@tinyerp.com-20131223120812-0u2w42i9neaqn76n
2013-12-23 17:38:12 +05:30
Chirag Dodiya (OpenERP) fbfe9936a1 [IMP]override name_create method of analytic account for not do not open contract page on quick create
bzr revid: cod@tinyerp.com-20131223113138-pj0bgtf31lh5jcg8
2013-12-23 17:01:38 +05:30
Bharat R. Devnani (OpenERP) baa430d237 [IMP] improved warning messages
bzr revid: bde@tinyerp.com-20131202084204-r0br5ytoc12ysjrl
2013-12-02 14:12:04 +05:30
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
Amit Dodiya 70f32e1d08 [FIX] hr_timesheet_sheet: timesheet is stuck after removing an inside attendance entries so restricted deletion of inside entries if it does not follow the signin signout rule
bzr revid: ado@tinyerp.com-20130610114126-puf1gf1m1qhjvcmg
2013-06-10 17:11:26 +05:30
Amit Dodiya b2b30af120 [FIX] hr_timesheet_sheet: timesheet is stuck after removing an inside attendance entries so restricted deletion of inside entries if it does not follow the signin signout rule
bzr revid: ado@tinyerp.com-20130610092948-i7ewkauvjse4rpc3
2013-06-10 14:59:48 +05:30
Amit Dodiya 141000ffb4 [FIX] hr_timesheet_sheet: timesheet is stuck after removing an inside attendance entries so restricted deletion of inside entries if it does not follow the signin signout rule
bzr revid: ado@tinyerp.com-20130604070131-ce1dln15r6oq04zb
2013-06-04 12:31:31 +05:30
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