b8089a1521
[MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1
...
bzr revid: chs@openerp.com-20140507170112-bjeltv2b0coy60am
2014-05-07 19:01:12 +02:00
1091b24a0c
[MERGE] forward port of branch saas-3 up to revid 9450 chs@openerp.com-20140507153348-g2qw61dkxvps13br
...
bzr revid: chs@openerp.com-20140507160023-8wwqlbf3bv7yqe67
2014-05-07 18:00:23 +02:00
1953aa442f
[MERGE] forward port of branch 7.0 up to revid 10037 mat@openerp.com-20140507133552-v4qsdp7qdp9iwewi
...
bzr revid: chs@openerp.com-20140507153348-g2qw61dkxvps13br
2014-05-07 17:33:48 +02:00
ad0ed2c4d8
[FIX] code cleanup (addon hr_timesheet_sheet)
...
remove try/except/statement that should not be here, uses search_count when appropriate, and remove a now useless one2many field
bzr revid: ged@openerp.com-20140507141725-h2z9u72roscf407n
2014-05-07 16:17:25 +02:00
5aa2fa150c
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
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
c1601e75d3
[FIX] sign in and sign out were broken in rev 10019 as it doesn't provide a date to conversion of attendance time to employee timezone
...
lp bug: https://launchpad.net/bugs/1314589 fixed
bzr revid: yannick.vaucher@camptocamp.com-20140430113730-cn3xw66fbik8p32n
2014-04-30 13:37:30 +02:00
c3e812f34a
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10025 rev-id odo@openerp.com-20140430102552-qkwv20b20nve64th
...
bzr revid: odo@openerp.com-20140430110048-6971xplq8k073tto
2014-04-30 13:00:48 +02:00
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
c393fbcddd
[MERGE] [FIX] hr_timesheet_sheet: make it timezone tolerant and avoid errors when comparing datetime and dates, courtesy of Yannick Vaucher (Camptocamp)
...
The attendance date recieved by the server is in UTC while the user sees it in his timezone. This means that an attendance could be in a timesheet (bounded by dates) for a user but not for the server which would not accept a valid attendance.
The fix will make the check in the user's timezone.
Only the date part of the attendance is kept for comparison as the boundaries are dates objects.
bzr revid: mat@openerp.com-20140428153216-4s6r5hu1ov0p0ofm
2014-04-29 01:32:16 +10:00
22d1c0956f
[UPD] resolve conflicts with main branch and fix bug introduced in rev 10015 lp:1313622
...
lp bug: https://launchpad.net/bugs/1313622 fixed
bzr revid: yannick.vaucher@camptocamp.com-20140428142017-3warx1ai72cfetj1
2014-04-28 16:20:17 +02:00
886c827458
[UPD]
...
bzr revid: yannick.vaucher@camptocamp.com-20140428135535-o9512996d18cudgq
2014-04-28 15:55:35 +02:00
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
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
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
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
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
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
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
b8d4387d33
[MERGE] merged with main addons branch
...
bzr revid: bde@tinyerp.com-20140418061256-n53rymt5j8krzvr5
2014-04-18 11:42:56 +05:30
f57b767361
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
2014-04-15 17:01:46 +02:00
8135812d34
[FIX] moves the field definitions of models hr.job and hr.employee that should have been in submodules to their correct place (in hr_something) to avoid dependencies problems (addons hr, hr_*)
...
bzr revid: ged@openerp.com-20140415105419-wy026n5k10wo80wb
2014-04-15 12:54:19 +02:00
e1cebe9003
[REF] hr_timesheet: unused piece of code
...
bzr revid: rim@openerp.com-20140414132634-xaps5ydbic5jriw4
2014-04-14 15:26:34 +02:00
457a62dee6
[IMP] add stat button for point of sale, email template
...
bzr revid: rma@tinyerp.com-20140327113720-1jlqhlk17muqv5nf
2014-03-27 17:07:20 +05:30
3897de56b7
[IMP]: Convert buttons into stat buttons in hr modules
...
bzr revid: ypa@tinyerp.com-20140326120056-qqauj7pmhf0uxhuj
2014-03-26 17:30:56 +05:30
28a33f3a8d
[IMP] improved some warning messages
...
bzr revid: bde@tinyerp.com-20140124123045-kgovbmuhkovax068
2014-01-24 18:00:45 +05:30
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
d9ab20e1b9
[IMP] Improved code of name_create method
...
bzr revid: cod@tinyerp.com-20131223122433-9svu8iyoruutdmjd
2013-12-23 17:54:33 +05:30
bda62ace29
[IMP]Improved code
...
bzr revid: cod@tinyerp.com-20131223120812-0u2w42i9neaqn76n
2013-12-23 17:38:12 +05:30
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
baa430d237
[IMP] improved warning messages
...
bzr revid: bde@tinyerp.com-20131202084204-r0br5ytoc12ysjrl
2013-12-02 14:12:04 +05:30
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
c59b97b358
[FIX] hr_timesheet_sheet - remove useless call to AT TIME ZONE in psql request here it isn't current_date but an utc 'timestamp' date. Need a strong tea even if it isn't utc tea time.
...
bzr revid: yannick.vaucher@camptocamp.com-20130909103819-i3143f6zenrf8hi9
2013-09-09 12:38:19 +02:00
76a0d0acf6
[IMP] hr_timesheet_sheet - set default timezone as UTC if employee has none
...
bzr revid: yannick.vaucher@camptocamp.com-20130909103749-sc1ia08hna4o6q8h
2013-09-09 12:37:49 +02:00
0ed7f5ef3b
[IMP] hr_timesheet_sheet - simplify and improve readability in search for sheet_ids
...
bzr revid: yannick.vaucher@camptocamp.com-20130909103724-4w5tkx2bfms07s91
2013-09-09 12:37:24 +02:00
372f3d131a
[IMP] hr_timesheet_sheet - remove unused variable
...
bzr revid: yannick.vaucher@camptocamp.com-20130909103654-wwkpyaaoqpwq1mqu
2013-09-09 12:36:54 +02:00
e2b7cd17fc
[FIX] hr_timesheet_sheet - search sheet_id for attendance using date in users timezone. As attendances depends on timezone but timesheet have from and to date instead of datetime we have to change the attendance to the same timezone expected for timesheet. And as a Timesheet belongs to a user, we can expect this timesheet to be in the same timezone as its owner. Maybe a timezone field should be added on timesheet. In anycase it make no sense to have all timesheet forced with start and end date as UTC.
...
lp bug: https://launchpad.net/bugs/1204224 fixed
bzr revid: yannick.vaucher@camptocamp.com-20130723184341-zowaw71f0mpghgrx
2013-07-23 20:43:41 +02:00
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
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
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
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
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
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
e69326ee3b
[REF] removed explicit model instanciations.
...
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
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
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
95a8d5759e
[FIX] hr_timesheet_sheet: did some changes.
...
bzr revid: cha@tinyerp.com-20130201092307-yajxn97wnhz3xofj
2013-02-01 14:53:07 +05:30
4b7ad7da56
[IMP] removed unused import
...
bzr revid: cha@tinyerp.com-20130131092950-mm2xjuv2j2t0gk7v
2013-01-31 14:59:50 +05:30
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
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
Christophe Simonis
Gery Debongnie
Antony Lesuisse
Yannick Vaucher
Olivier Dony
Denis Ledoux
Martin Trigaux
Bharat Devnani (Open ERP)
Richard Mathot (OpenERP)
Randhir Mayatra rma-openerp
Yogesh Parekh (OpenERP)
Chirag Dodiya (OpenERP)
Amit Dodiya
Mohammed Shekha
Thibault Delavallée
Quentin (OpenERP)
Vo Minh Thu
Cedric Snauwaert
Ajay Chauhan (OpenERP)