6a3cdf718c
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130605071905-o2ldzc6vxqnoe099
2013-06-05 12:49:05 +05:30
df013f6402
[IMP]add groups in groups_id for hr, hr_attandance and recruitment
...
bzr revid: sgo@tinyerp.com-20130507090204-13gkyryyn3lxtz8z
2013-05-07 14:32:04 +05:30
7a2d912964
[REM] bunch of nonsensical @model + @ref
...
bzr revid: xmo@openerp.com-20130429124333-p1h11fpy04y3sljy
2013-04-29 14:43:33 +02:00
3b73e2b2a4
[IMP]Removed space before Exclamation marks [!]
...
bzr revid: ggh@tinyerp.com-20130429071557-vnxo5nni03vc886j
2013-04-29 12:45:57 +05:30
d5451cf7f2
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130417060441-6vnz2tiym5fawr2n
2013-04-17 11:34:41 +05:30
e69326ee3b
[REF] removed explicit model instanciations.
...
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
2aa1350efc
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130326100719-85r6zm65cf8h8d1d
bzr revid: sgo@tinyerp.com-20130328060222-fb9ijzumjtedqbzs
2013-03-28 11:32:22 +05:30
6bd4368e4b
[FIX] hr_attendance: forgot the import openerp.
...
bzr revid: vmt@openerp.com-20130327131633-zfo1p0nik52es7xk
2013-03-27 14:16:33 +01:00
82535887ab
[REF] hr_attendance: removed openerp.pooler imports.
...
bzr revid: vmt@openerp.com-20130327124855-o01gx77p1kz7f2aw
2013-03-27 13:48:55 +01:00
8b123b8d74
[IMP] add user group in context of event & hr_timesheet yml files
...
bzr revid: fka@tinyerp.com-20130319100252-74kzr5qc41gj6d2t
2013-03-19 15:32:52 +05:30
5763688273
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130318065136-t5o01f51dycctjxv
2013-03-18 12:21:36 +05:30
4ce8d2697d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130316055338-ogfw01ap8fh1hlaj
bzr revid: launchpad_translations_on_behalf_of_openerp-20130317045918-zi1230lgxjbkqw3x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130318044640-ts2tr31y2gl25rev
2013-03-18 04:46:40 +00:00
72f29d98b8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130315055412-luy9qg1pkdjnqlud
2013-03-15 05:54:12 +00:00
ada78b2f1c
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130228045702-05baoslhn584ljh0
2013-02-28 10:27:02 +05:30
675b8eb1dc
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130227043738-bhsrlxdu3ut4vbs9
bzr revid: launchpad_translations_on_behalf_of_openerp-20130228044751-5v2ae5ai22oisclw
2013-02-28 04:47:51 +00:00
bf814eb414
[IMP] improve yml string
...
bzr revid: fka@tinyerp.com-20130222093315-efl5r3wjwn7wu2nd
2013-02-22 15:03:15 +05:30
d9d8abd8b0
[IMP] add access rights in hr_attendance
...
bzr revid: fka@tinyerp.com-20130221090300-is57aytddja1m4f5
2013-02-21 14:33:00 +05:30
37dec8326d
[FIX] import openerp.netsvc instead of netsvc in YML tests.
...
bzr revid: vmt@openerp.com-20130209062436-e2wfh3sgoufrh77t
2013-02-09 07:24:36 +01:00
9c416d171b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130209045520-6ew8n5mvagl6vyki
2013-02-09 04:55:20 +00:00
5c360f7327
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121225044840-forvhhdzu8wfuw2y
bzr revid: launchpad_translations_on_behalf_of_openerp-20121226043938-300zdp9oob5hc6e6
2012-12-26 04:39:38 +00:00
94afe1ccef
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121222060744-44at9lbhw0npx5h6
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223044213-e86qkwoh0uo3cjti
bzr revid: launchpad_translations_on_behalf_of_openerp-20121224044035-1y0s4fc6ns7ytko6
2012-12-24 04:40:35 +00:00
3815d22432
[I18N] Update translation templates for latest changes - ready for 7.0 release
...
bzr revid: odo@openerp.com-20121221172005-uuwfq58gslzikygl
2012-12-21 18:20:05 +01:00
231ecd2032
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121221043915-9f5zsgjkksp56zwn
bzr revid: launchpad_translations_on_behalf_of_openerp-20121221044239-5bv82e8q9e8s6bxw
bzr revid: launchpad_translations_on_behalf_of_openerp-20121221050452-f6jqbwzk9lovjkxm
2012-12-21 05:04:52 +00:00
3fe6987ce7
[MERGE] Harmonization of noupdate flag on security XML data, courtesy of Alexis de Lattre (Akretion)
...
ir.rule records are in noupdate data blocks to let the admin
alter them without fear of them being reset at next update.
Other records such as groups are in normal mode, so they
can be updated whenever necessary
bzr revid: odo@openerp.com-20121218232001-t425t4hi7qbmsip2
2012-12-19 00:20:01 +01:00
73980eba5f
[MERGE] trunk-import-openerp-thu (use strict naming convention when importing openerp stuff)
...
bzr revid: rco@openerp.com-20121218085914-qzr2upqfxmfbzfsx
2012-12-18 09:59:14 +01:00
b2bb3eafbd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218045907-df0xw1q7dgw696s1
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218050221-ab50rd40d94gd9a0
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218050832-5hvbj7p0bpsw6fp0
2012-12-18 05:08:32 +00:00
15fe515601
[MERGE] From trunk
...
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
bfb52002b6
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121216044909-hd4l9dxtqvx85a3h
2012-12-16 04:49:09 +00:00
809c92fdef
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121214053618-1gz9xun2cb10afle
bzr revid: launchpad_translations_on_behalf_of_openerp-20121215050358-th0pl9jeams3pwkr
bzr revid: launchpad_translations_on_behalf_of_openerp-20121215050620-y27swfcuh62k8u32
bzr revid: launchpad_translations_on_behalf_of_openerp-20121215051723-6cnx1julk94gkm66
2012-12-15 05:17:23 +00:00
c4e89c651a
[FIX] hr_attendance: do not show slider widget if user is not an employee
...
bzr revid: chs@openerp.com-20121214155430-h6u3l9jlutm1dclw
2012-12-14 16:54:30 +01:00
2c8f4f7572
[FIX] hr_attendance: invert condition
...
bzr revid: chs@openerp.com-20121214155225-olze66svgx4hwqvg
2012-12-14 16:52:25 +01:00
539af8a8f0
[FIX] hr_attendance: check the user is an employee by checking if (s)he belongs to the "Employee" group
...
bzr revid: chs@openerp.com-20121214152453-tvtjuvvmefw9qcrp
2012-12-14 16:24:53 +01:00
cc8025387b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121214053905-mac64ijay9566opr
bzr revid: launchpad_translations_on_behalf_of_openerp-20121214054902-12ndwftreb4g1964
2012-12-14 05:49:02 +00:00
e8832cb0cb
[FIX] hr_attendance: do not show slider widget if user is not an employee
...
bzr revid: chs@openerp.com-20121213161351-27jx0l3utfzavaeo
2012-12-13 17:13:51 +01:00
d6ea61789f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121213044507-t1hpxi43gks88w2e
bzr revid: launchpad_translations_on_behalf_of_openerp-20121213050131-3r9t674ehhnkneky
2012-12-13 05:01:31 +00:00
cc69fe1b25
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121211044948-8q9vf1f9ftrzq4wm
bzr revid: launchpad_translations_on_behalf_of_openerp-20121211050318-3noic2ymt0j497rw
2012-12-11 05:03:18 +00:00
6072fd11af
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n
2012-12-10 12:16:54 +01:00
5c98593604
[IMP] fields name
...
bzr revid: fp@tinyerp.com-20121208104558-2jr4j84go4gcemrb
2012-12-08 11:45:58 +01:00
e7f4891d46
[IMP] use the openerp namespace.
...
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
538834d9c3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121206044118-gn1y04y813l6skve
bzr revid: launchpad_translations_on_behalf_of_openerp-20121206045406-0pzpwmkyyxre13hn
2012-12-06 04:54:06 +00:00
39470414b0
[IMP]String Replaced Invoiced to Invoice Ratio and Given string to currency_id field.
...
bzr revid: bth@tinyerp.com-20121205083731-vuyi112ouewch5iw
2012-12-05 14:07:31 +05:30
683f31e51b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055506-fin73s7n3o52fmuy
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055956-fsd4tp3felpk8pm5
2012-12-04 05:59:56 +00:00
308e4f1073
[I18N] Removed duplicated terms for inherited [_sql]_constraints -> 400 terms removed
...
bzr revid: odo@openerp.com-20121203162755-p71dnn0k0t2b98yp
2012-12-03 17:27:55 +01:00
f12df4e8ea
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121130050827-124dy1fyx1f113n9
bzr revid: launchpad_translations_on_behalf_of_openerp-20121130051820-ru59ffbuvhm96b8l
2012-11-30 05:18:20 +00:00
828cce9be0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125063324-fjz8k77annh364u7
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126044235-u20vi1440dgppikf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125064209-s515ia18188hl147
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126045508-rm6d2mx71a0sjqh9
2012-11-26 04:55:08 +00:00
117bf937b9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124055830-p04ni2o2ogsch9zc
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124065500-zwtkurcb1ic9ktqb
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124070752-itto1xb6r6oao3z5
2012-11-24 07:07:52 +00:00
771b216118
[I18N] Update translation templates in preparation for 7.0 release
...
bzr revid: odo@openerp.com-20121124030804-9dvr1qwec830p8fc
2012-11-24 04:08:04 +01:00
664997207a
[MERGE] fix XML symbol in attendance & timesheet reports
...
bzr revid: fp@tinyerp.com-20121112084455-lmmujwjx79sla0d2
2012-11-12 09:44:55 +01:00
22ad7a70f7
[MERGE] trunk
...
bzr revid: fme@openerp.com-20121105084838-gwc7xb19f7131vbi
2012-11-05 09:48:38 +01:00
41c43df23a
[MERGE] merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20121102101051-y8tqa85i5bx7c3r7
2012-11-02 15:40:51 +05:30
67d88f64e1
[IMP] hr_attendance: set default value of dates according to week
...
bzr revid: cha@tinyerp.com-20121102094931-3os8m29tjm8tdnhs
2012-11-02 15:19:31 +05:30
18cbe26757
[IMP] hr_attendance: set correct end date of week in report
...
bzr revid: cha@tinyerp.com-20121102090524-32mzyakopzv7xka2
2012-11-02 14:35:24 +05:30
b0a204350f
[IMP] hr_attendance: change font-size in report
...
bzr revid: cha@tinyerp.com-20121102063933-twdqxhomtnagygmv
2012-11-02 12:09:33 +05:30
42df1b6c07
[IMP] hr_attendance: change formatting of 'Attendance by week' report
...
bzr revid: cha@tinyerp.com-20121101134713-ru850hpdj8w914ji
2012-11-01 19:17:13 +05:30
aea578ad6a
[FIX]hr : Company name with & throws error when opening report
...
bzr revid: mma@tinyerp.com-20121101092543-w91bmpwbxed5ftkd
2012-11-01 14:55:43 +05:30
a2715888c1
[IMP] jQuery deferred API changes refactoring. Changed 'then's in 'done'/'fail' and 'pipe's in 'then'
...
bzr revid: fme@openerp.com-20121031103148-r1slfpl2kcnajjd3
2012-10-31 11:31:48 +01:00
4f555e059f
[IMP] hr_attendance: made lines visible even if employee is absent for whole week
...
bzr revid: cha@tinyerp.com-20121030064707-m12g44n2i9q8eun0
2012-10-30 12:17:07 +05:30
87d3caa50f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121030053700-w841c92uvirpii9h
2012-10-30 05:37:00 +00:00
4288a65ccf
[IMP] hr_attendance: add 'Total' label in another row in report
...
bzr revid: cha@tinyerp.com-20121029090235-ltcg4rmgu8jrnt9d
2012-10-29 14:32:35 +05:30
6cfffae349
[MERGE] merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20121029050259-0vimwnu84f2dvk2g
2012-10-29 10:32:59 +05:30
619390d23c
[IMP] timesheets
...
bzr revid: fp@tinyerp.com-20121026080137-bluybqibtsjgb25n
2012-10-26 10:01:37 +02:00
d9900b497a
[IMP] hr_attendance: made little change in header of report
...
bzr revid: cha@tinyerp.com-20121023115929-enc932x4kdk077i4
2012-10-23 17:29:29 +05:30
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
6c15bcce12
[MERGE] HR
...
bzr revid: fp@openerp.com-20121021195925-sbsfni9i10r2o2bw
2012-10-21 21:59:25 +02:00
5bfa3c5a7d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121019053933-51d6oob5aw0ujz40
2012-10-19 05:39:33 +00:00
a098bdc7f1
[IMP] improve condition
...
bzr revid: shp@tinyerp.com-20121019050621-kz81td0dsdt4681o
2012-10-19 10:36:21 +05:30
1bb1b98a31
[IMP] warning message replace is posterior to by comes before
...
bzr revid: shp@tinyerp.com-20121019045723-rt8fqmuk11vsgiak
2012-10-19 10:27:23 +05:30
5cf77ecb5a
[IMP] improve action message as per suggection
...
bzr revid: shp@tinyerp.com-20121018130444-bu8iv6kez1xt1js1
2012-10-18 18:34:44 +05:30
e0424795b6
[IMP] warning message and fix tracback
...
bzr revid: shp@tinyerp.com-20121018113949-wcgkj455rwd81z3h
2012-10-18 17:09:49 +05:30
e48e2a42dc
[IMP] warning mesage and fix traceback ehen click chanwork button
...
bzr revid: atp@tinyerp.com-20121015054845-myi61ts7o2p4bg1e
bzr revid: atp@tinyerp.com-20121016175913-lbq3ymr9y7qz0tae
bzr revid: shp@tinyerp.com-20121018105933-c40om6nmwjw2xz7s
2012-10-18 16:29:33 +05:30
bac6c2151f
[IMP] hr_attendance: made report visible & added header in 'Attendance by Week' report
...
bzr revid: cha@tinyerp.com-20121016072635-aqx7jmysakwkg7fz
2012-10-16 12:56:35 +05:30
ece648faed
[IMP] hr_attendance: added column for total in 'Attendance by Month' report
...
bzr revid: cha@tinyerp.com-20121015093009-69xzo9iutecnhnc5
2012-10-15 15:00:09 +05:30
6761871c4e
[IMP] indentation of active ids of timesheet.py
...
bzr revid: shp@tinyerp.com-20121008051014-fvftsi2mt44abyyn
2012-10-08 10:40:14 +05:30
f00e26b9ca
[FIX] weekly,monthly report problem in hr module
...
bzr revid: shp@tinyerp.com-20121004130606-ju9ahpnk20qxeeyr
2012-10-04 18:36:06 +05:30
1653332080
[MERGE] trunk
...
bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw
2012-10-02 12:29:15 +02:00
fbe0c03df3
[FIX] Attendances rules
...
bzr revid: fp@tinyerp.com-20120927191804-szqoktzis42qju2h
2012-09-27 21:18:04 +02:00
816f50974a
[MERGE] optionnal attendances visible
...
bzr revid: fp@tinyerp.com-20120927174758-zp58w2phycwm30l7
2012-09-27 19:47:58 +02:00
e9f4840c93
[IMP] emoving bad code, no invitation system on events
...
[IMP] no more certifiate, will be managed in apps.openerp.com directly
bzr revid: fp@tinyerp.com-20120926121627-60isym4hdjkaxe9p
2012-09-26 14:16:27 +02:00
fb05869829
[IMP]improve help
...
bzr revid: pna@tinyerp.com-20120924102002-5ege35d024t2br6h
2012-09-24 15:50:02 +05:30
95afcc93bc
[IMP]merge branch
...
bzr revid: pna@tinyerp.com-20120924082300-9unb65nu3asph4x6
2012-09-24 13:53:00 +05:30
4550c4ced8
[IMP]attendance related fields and menu hide
...
bzr revid: pna@tinyerp.com-20120924081934-2e2bj1fa4pstrg91
2012-09-24 13:49:34 +05:30
2deb110a23
[IMP] hr_attendance: refactor code
...
bzr revid: hmo@tinyerp.com-20120924063951-ub602rou1p9wtt7p
2012-09-24 12:09:51 +05:30
4d9fa19122
[IMP]sign in or sign out button enable if attendance group
...
bzr revid: pna@tinyerp.com-20120924051724-m5b74g2kfw8c337h
2012-09-24 10:47:24 +05:30
008d5d35d7
[IMP]add config file in hr_attendance
...
bzr revid: pna@tinyerp.com-20120921134405-0q3mwq6dsp2fw4yu
2012-09-21 19:14:05 +05:30
713dff9dba
[IMP]group attendance to restrict attendance related fields and views
...
bzr revid: pna@tinyerp.com-20120921070809-x62vwxdyhw7pyciw
2012-09-21 12:38:09 +05:30
fabf4971aa
[FIX] timesheet_sheet should not crash anymmore when tests are performed at 23:59
...
bzr revid: fp@tinyerp.com-20120917081451-ugk1qi0le22kn44n
2012-09-17 10:14:51 +02:00
063c548209
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120911045051-qhkumfcarekjpsm0
2012-09-11 04:50:51 +00:00
a3abba201e
[FIX] hr_attendance: minor javascript bug
...
bzr revid: nicolas.vanhoren@openerp.com-20120910100152-eru3fdxalv4lhqek
2012-09-10 12:01:52 +02:00
84ce8fa76c
[IMP] hr_attendance: more visual improvements
...
bzr revid: nicolas.vanhoren@openerp.com-20120907143109-n7dw17g6ogtk2grj
2012-09-07 16:31:09 +02:00
ce11811c05
[IMP] hr_attendance: visual improvements
...
bzr revid: nicolas.vanhoren@openerp.com-20120907143044-czya93nj76yx2ofg
2012-09-07 16:30:44 +02:00
c1c36798f5
[MERGE] employee form view
...
bzr revid: fp@tinyerp.com-20120907135538-pvr31vip94l7n5jc
2012-09-07 15:55:38 +02:00
280d9e426d
[IMP] changed tooltip
...
bzr revid: nicolas.vanhoren@openerp.com-20120907122337-pb8pia5e753zzi32
2012-09-07 14:23:37 +02:00
2698e6dd27
[IMP] hr_attendance: Changed style of sign in/sign out
...
bzr revid: nicolas.vanhoren@openerp.com-20120907115120-dg8xn97oh9pek7k5
2012-09-07 13:51:20 +02:00
69c3ac117d
fixed small bug with tipsy
...
bzr revid: nicolas.vanhoren@openerp.com-20120906142143-wxo087d2r6y6pln8
2012-09-06 16:21:43 +02:00
6eec6cf691
Changed tipsy
...
bzr revid: nicolas.vanhoren@openerp.com-20120906141646-r9wgdi9uhjdd5124
2012-09-06 16:16:46 +02:00
56e2d8984d
added tipsy
...
bzr revid: nicolas.vanhoren@openerp.com-20120906141051-mhgqkoycwxf8flp5
2012-09-06 16:10:51 +02:00
bebed68373
changed most style
...
bzr revid: nicolas.vanhoren@openerp.com-20120906135745-pgmzrv94jvv3imuq
2012-09-06 15:57:45 +02:00
408b6cdd80
[MERGE]:merged employee's view
...
bzr revid: apa@tinyerp.com-20120906124252-xjuonjd49w2fjpea
2012-09-06 18:12:52 +05:30
cf4209ab9b
[IMP]improve he employee form view as per mockup
...
bzr revid: sgo@tinyerp.com-20120906111721-17ev5r0qufc9u4vd
2012-09-06 16:47:21 +05:30
8d0669461f
removed one more global variable
...
bzr revid: nicolas.vanhoren@openerp.com-20120906104012-miuh1ddwsbpgam3v
2012-09-06 12:40:12 +02:00
sgo@tinyerp.com
Xavier Morel
ggh-openerp
Vo Minh Thu
Foram Katharotiya (OpenERP)
Olivier Dony
Raphael Collet
Cecile Tonglet
Christophe Simonis
Fabien Pinckaers
Bhumi Thakkar (Open ERP)
Fabien Meghazi
Ajay Chauhan (OpenERP)
Mayur Maheshwari (OpenERP)
Fabien Pinckaers
pankita shah (Open ERP)
Antonin Bourguignon
Pinakin Nayi (OpenERP)
Harry (OpenERP)
niv-openerp
Amit Patel (OpenERP)
Sanjay Gohel (Open ERP)