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
b7003a382a
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
d0e9ba289f
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +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
65f2db5c21
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429081937-hhqcg84o7iha78fq
2014-04-29 10:19:37 +02:00
fdfcb6bf47
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140429064121-xnusb4mb3r8vgtzh
2014-04-29 06:41:21 +00: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
1c4e2cfd22
[IMP] bundlify addons (except website)
...
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +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
89fd1bede4
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140419063533-z6kswp5wkioh5jlv
bzr revid: launchpad_translations_on_behalf_of_openerp-20140420055842-traoy17xi60ufook
bzr revid: launchpad_translations_on_behalf_of_openerp-20140421050815-44ydlitvsaj3xdd9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422082459-bfjqgpt2bpgll64p
2014-04-22 08:24:59 +00:00
fa60b90c1f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
b8d4387d33
[MERGE] merged with main addons branch
...
bzr revid: bde@tinyerp.com-20140418061256-n53rymt5j8krzvr5
2014-04-18 11:42:56 +05:30
cccc7a3d0c
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140417132329-sd2skyprb3nt88uw
2014-04-17 18:53:29 +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
c399e1daaf
[MERGE] merge with latest trunk and resolve conflicts
...
bzr revid: rma@tinyerp.com-20140414110149-r3l00xr8l08ex7oc
2014-04-14 16:31:49 +05:30
e82fbf7d91
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
e1cebe9003
[REF] hr_timesheet: unused piece of code
...
bzr revid: rim@openerp.com-20140414132634-xaps5ydbic5jriw4
2014-04-14 15:26:34 +02:00
91a5db808d
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140414115354-w8gpo3eks1rnud9k
2014-04-14 13:53:54 +02:00
2e9ee9c76e
[MERGE] merge from rma branch
...
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
2014-04-10 16:51:31 +02:00
9dbaa58694
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140407102440-ngtr58o2w2ypqrol
2014-04-07 15:54:40 +05:30
76840b36cb
[MRG]Merge with lp:openobject-addons
...
bzr revid: cod@tinyerp.com-20140331090709-y4bj3kqp5chq2zko
2014-03-31 14:37:09 +05:30
77ff3a69b8
[IMP] improve icons and views
...
bzr revid: rma@tinyerp.com-20140328133051-2amm63n2vy3bj3xe
2014-03-28 19:00:51 +05:30
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
51aa261b44
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
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
1f3c4f852f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140319063002-sd17jxb37ycogrrz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140320061944-bwpy0lt1bp5ee0y2
2014-03-20 06:19:44 +00:00
dd404cd701
[MRG]Merge with lp:openobject-addons
...
bzr revid: cod@tinyerp.com-20140319070736-oxjw6beks1fda6xn
2014-03-19 12:37:36 +05:30
f166daf065
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140308065427-0he29w0cqe07xmc8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140308065421-4udfyb7xcfq5h1zy
bzr revid: launchpad_translations_on_behalf_of_openerp-20140309060314-64jktl10pkq3inv4
2014-03-09 06:03:14 +00:00
b201dc79b7
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140218054104-8egkh4jj7hiiwuih
bzr revid: launchpad_translations_on_behalf_of_openerp-20140219054048-688twg0fubtm2x2q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140220054214-237ri67t9rw3l4fu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221063855-wniw42r27gyg3h6y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222073328-xpn7nwqz407yzumq
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223074516-0r09cpmma58ylqji
bzr revid: launchpad_translations_on_behalf_of_openerp-20140224060319-535oheaq2w9u2ye3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225062420-zl7curej0e0warhz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140226073146-3vzhw4hddr81olbs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140227062959-24e2rn98rqb9afpr
bzr revid: launchpad_translations_on_behalf_of_openerp-20140228072152-f9gm4ud1wu19ge27
bzr revid: launchpad_translations_on_behalf_of_openerp-20140301055205-r0df0fqz9yf5z66i
bzr revid: launchpad_translations_on_behalf_of_openerp-20140302052638-bjf11oumy7w15oco
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304082704-k1z2te1tfud43zy3
2014-03-04 08:27:04 +00:00
9863dbe5c8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
dd4813e360
[mrg]:lp:openobject-addons
...
bzr revid: sunilsharma.sharma07@gmail.com-20140304063937-vyrt063gzfhsoy4k
2014-03-04 12:09:37 +05:30
dbc6a8368d
[MRG]Merge with trunk
...
bzr revid: cod@tinyerp.com-20140225083944-abbn3m7e5c26crk1
2014-02-25 14:09:44 +05:30
b949cef63c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221054843-7g7jwzx085jnes1q
2014-02-21 05:48:43 +00:00
5d2f1c68ac
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140216064134-tam102h50au851o1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140215073800-2219ymc7ijxq57aa
bzr revid: launchpad_translations_on_behalf_of_openerp-20140216064223-17h9wz07b2siswzs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140217060328-7qh928zk8ro30qzb
2014-02-17 06:03:28 +00:00
9e102b6b24
[MERGE] merged with main addons
...
bzr revid: bde@tinyerp.com-20140212064422-4thlmyk5psff9lth
2014-02-12 12:14:22 +05:30
b3c6e20e36
[MERGE]sync with trunk and resolve conflicts.
...
bzr revid: dka@tinyerp.com-20140210084803-rjkt9e4rhni8nhlt
2014-02-10 14:18:03 +05:30
2bebb9cd4d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201065304-8md3g4d14l1b51ii
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202060105-bnt8nw1mcbg2c3m3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203055609-uxdqgnistwilvo2v
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204064835-qdcrcxldc5zsutio
2014-02-04 06:48:35 +00:00
9cdcf812a6
[MERGE] merge from trunk into local branch
...
bzr revid: ged@openerp.com-20140130135251-ahk515cy0wc87kyr
2014-01-30 14:52:51 +01:00
e96e86b314
[IMP] improves the reporting view Timesheet Sheet Analysis (add some measures to the table) in addon hr_timesheet_sheet
...
bzr revid: ged@openerp.com-20140130132007-uyvddo0eq8yssft8
2014-01-30 14:20:07 +01:00
a768f15038
[IMP] improves the reporting view Timesheet Analysis (add some measures to the table) in addon hr_timesheet_sheet
...
bzr revid: ged@openerp.com-20140130131737-hibhsfqurtxe7weh
2014-01-30 14:17:37 +01:00
a267d86b29
[rem,imp]:hr:remove hr dashboard and improve hr view
...
bzr revid: sunilsharma.sharma07@gmail.com-20140130064923-35tvo8q3sy4n09vx
2014-01-30 12:19:23 +05:30
3ce5e01eca
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
68a466e8a8
[IMP] improves the Timesheet Analysis reporting view : changes the axis, adds a 'this month' filter using the new pivot graph view (addon hr_timesheet_sheet)
...
bzr revid: ged@openerp.com-20140127130351-iu422fkjnu8059wd
2014-01-27 14:03:51 +01:00
28a33f3a8d
[IMP] improved some warning messages
...
bzr revid: bde@tinyerp.com-20140124123045-kgovbmuhkovax068
2014-01-24 18:00:45 +05:30
4da0f5460d
[MERGE] merged with main addons
...
bzr revid: bde@tinyerp.com-20140123063749-6lqhwdh34ln69pqu
2014-01-23 12:07:49 +05:30
00c6d55ac9
[MERGE] merge trunk into local branch
...
bzr revid: ged@openerp.com-20140116144326-8kwqab71zp8s7a8e
2014-01-16 15:43:26 +01:00
91aaaec0a5
[MERGE] forward port of branch saas-2 up to revid 9092 dle@openerp.com-20140115165506-yuux9km39gbv7k4n
...
bzr revid: chs@openerp.com-20140115214454-dhl8xzr429co0j5d
2014-01-15 22:44:54 +01:00
5649e0bbf2
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9770 revid:chs@openerp.com-20140116154645-sy4zhdgqc48xaqbx
...
bzr revid: dle@openerp.com-20131224112612-5gjit5uu1aaaqstx
bzr revid: dle@openerp.com-20140103094532-mbczi9ssr3gc90o1
bzr revid: dle@openerp.com-20140108105833-gblxqdw3if1gt35k
bzr revid: dle@openerp.com-20140115121441-bskbyxxbc09ubavh
bzr revid: dle@openerp.com-20140115165506-yuux9km39gbv7k4n
bzr revid: dle@openerp.com-20140116161415-0y9m0kgavcytzj9z
2014-01-16 17:14:15 +01:00
3a6b6dd6df
[FIX] hr_timesheet_sheet: save correctly if focus is in a timesheet input
...
on_change_unit_amount was called manually in the timesheet widget. Normally, save waits for all on_change to be applied, but in this case, as the on_change its called manually in the js, it was not the case.
The fix is to put all deferreds for which we must wait for in an array, and to wait all deferreds to be done before saving.
bzr revid: dle@openerp.com-20140115165114-nqa2ynszgocrnt52
2014-01-15 17:51:14 +01:00
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
0b1f968fc3
[IMP] removes old tree views in reporting and replaces them by the new graph views in pivot mode by default (addon hr_timesheet_sheet)
...
bzr revid: ged@openerp.com-20140102110259-eyxw0qff1w4dwdzu
2014-01-02 12:02:59 +01:00
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
94b4618c13
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131215054553-py8zfwrk3bir6m1l
bzr revid: launchpad_translations_on_behalf_of_openerp-20131212055820-zh0fqpweezvphdc6
bzr revid: launchpad_translations_on_behalf_of_openerp-20131213064308-hil3cycv38im8qds
bzr revid: launchpad_translations_on_behalf_of_openerp-20131215054616-uyc9y42oetvmq1cs
bzr revid: launchpad_translations_on_behalf_of_openerp-20131216053557-w3gf0jlw5wrtzllr
2013-12-16 05:35:57 +00:00
80cd6bcdf9
[MERGE] merged with main addons
...
bzr revid: bde@tinyerp.com-20131203063528-u5n09f49sf2qpkd8
2013-12-03 12:05:28 +05:30
57ef91409a
[MERGE] bootstrap3
...
bzr revid: al@openerp.com-20131202132445-oux9j63auh4om284
2013-12-02 14:24:45 +01:00
baa430d237
[IMP] improved warning messages
...
bzr revid: bde@tinyerp.com-20131202084204-r0br5ytoc12ysjrl
2013-12-02 14:12:04 +05:30
9d95656e0c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131128060619-0nswl7lls658nujd
2013-11-28 06:06:19 +00:00
0521d1aab3
[MERGE] forward port of branch saas-2 up to revid 9017 chs@openerp.com-20131127110552-3u2nxwu01gxj9i7m
...
bzr revid: chs@openerp.com-20131127111208-iclt7a9ib7oucumh
2013-11-27 12:12:08 +01:00
6b05beecc1
[MERGE] forward port of branch 7.0 up to revid 9651 chs@openerp.com-20131127104459-jb77x7quwcvtifm7
...
bzr revid: dle@openerp.com-20131126171210-jovr7e7efehuq3s2
bzr revid: chs@openerp.com-20131127110046-4ow36dkuuyzgf1pl
2013-11-27 12:00:46 +01:00
354afeb8b5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127043735-yp016yh8n07kzusm
2013-11-27 04:37:35 +00:00
6fd5575930
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127053957-ekc1bfm5ohug21aa
2013-11-27 05:39:57 +00:00
d003d8f49a
[FIX]hr_timesheet_sheet: add right-padding to timesheet weekly input in order to avoid the value to be partially cut (in ie 9/10, for instance)
...
bzr revid: dle@openerp.com-20131126170019-bydxxyk7uqzpsb41
2013-11-26 18:00:19 +01:00
7baee28221
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9642 rev-id: dle@openerp.com-20131125160315-tj8n5bv6e5yv8jku
...
bzr revid: dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
bzr revid: dle@openerp.com-20131125160523-hecq5u2uo0mfyoq0
2013-11-25 17:05:23 +01:00
fd080fb745
[FIX]hr_timesheet_sheet: remove useless css rule, which had the effect of erasing the half timesheet weekly input on ie.
...
bzr revid: dle@openerp.com-20131125160315-tj8n5bv6e5yv8jku
2013-11-25 17:03:15 +01:00
bb1e256f5b
[MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
...
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
2013-11-25 16:00:54 +01:00
40a7a5dc64
[FIX]hr_timesheet_sheet: report, the join clause of the view was wrong, account_analytic_line is join with hr_timesheet_sheet_sheet thanks to the sheet_id (hat.sheet_id=htss.id), not with the line_id (hat.line_id=htss.id)
...
bzr revid: dle@openerp.com-20131125142624-wilbjmlgy9yubcgk
2013-11-25 15:26:24 +01:00
271ed43e7b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121054848-007arsnnoa8fs65e
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063838-blqn6j0yfmrlw5vp
2013-11-21 06:38:38 +00:00
88a79fdaf3
[IMP]improved css for survey kanban, file attach button and my current timesheet in hr.
...
bzr revid: ima@tinyerp.com-20131115101317-3jb422klc3jgdwps
2013-11-15 15:43:17 +05:30
960924195e
[MERGE]merged with main addons
...
bzr revid: dka@tinyerp.com-20131030052926-i9c25mf6wpseioh3
2013-10-30 10:59:26 +05:30
db84e912bd
[MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8781 rev-id: dle@openerp.com-20130923165651-0jt823r5wy37enw6
...
bzr revid: dle@openerp.com-20130923171310-mav1riq3d2rebmv2
2013-09-23 19:13:10 +02:00
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
d1a23edd2e
[IMP]align multi-line string
...
bzr revid: dka@tinyerp.com-20130917130814-wikgcy25594gk8dx
2013-09-17 18:38:14 +05:30
21876a5810
[MERGE]merged with main addons
...
bzr revid: dka@tinyerp.com-20130917123814-wqx07inh0ckcqdgw
2013-09-17 18:08:14 +05:30
7bdd9a6ad3
[FIX] hr_timesheet_sheet: use timezone in hour computation for timesheet
...
bzr revid: mat@openerp.com-20130916143300-sa3zpm505ac6r145
2013-09-16 16:33:00 +02:00
9dba69ba48
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00: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
1a6eb52a32
[MERGE] [IMP] hr_payroll: improved demo data and yml tests demo data
...
bzr revid: tde@openerp.com-20130904141110-svlfpvl3ddu12al7
2013-09-04 16:11:10 +02:00
cb8f9c5a0d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903054857-i15nhvtthlho7chm
2013-09-03 05:48:57 +00:00
40772276b8
[MERGE]merged with main addons
...
bzr revid: dka@tinyerp.com-20130829112644-ut06w1p0lf244zz1
2013-08-29 16:56:44 +05:30
9d29902fa5
[MERGE]merged with main addons
...
bzr revid: darshankalola@gmail.com-20130829063416-3zo337keanlemwe2
2013-08-29 12:04:16 +05:30
c02afb45fa
[MERGE] Forward-port of bugfixes from saas-1 series up to rev.8759 rev-id: odo@openerp.com-20130820152607-0p0fx87v1rqhk3vy
...
bzr revid: odo@openerp.com-20130820165258-3mjzbo990xg44dfu
2013-08-20 18:52:58 +02:00
788eb29237
[MERGE] Forward-port of 7.0 bugfixes up to rev.9369 rev-id: launchpad_translations_on_behalf_of_openerp-20130820051502-deoiql3lru7goosd
...
bzr revid: odo@openerp.com-20130820152607-0p0fx87v1rqhk3vy
2013-08-20 17:26:07 +02:00
Gery Debongnie
Antony Lesuisse
Yannick Vaucher
Olivier Dony
Fabien Meghazi
Richard Mathot (OpenERP)
Denis Ledoux
Launchpad Translations on behalf of openerp
Martin Trigaux
Christophe Simonis
Bharat Devnani (Open ERP)
Darshan Kalola (OpenERP)
Randhir Mayatra rma-openerp
Chirag Dodiya (OpenERP)
Yogesh Parekh (OpenERP)
Sunil Sharma (OpenERP)
ima-openerp
Thibault Delavallée
Darshan Kalola