 Mustufa Rangwala
|
bfdec77ead
|
[IMP] payroll cleaning
bzr revid: mra@mra-laptop-20110314112227-6rzbc31dpg0tvop1
|
2011-03-14 16:52:27 +05:30 |
|
|
mtr
|
007e96a197
|
[IMP] hr_payroll:improved code for min and max range condition for amount_type=percentage
bzr revid: mtr@mtr-20110314094429-zulakh5vl7cykotu
|
2011-03-14 15:14:29 +05:30 |
|
|
mtr
|
617ec80f97
|
[MERGE] branch merged with trunk-payroll-salary_rules-psi
bzr revid: mtr@mtr-20110314090928-dkkkld0rr6zkyzu1
|
2011-03-14 14:39:28 +05:30 |
|
|
psi (Open ERP)
|
d7e626ff76
|
[MERGE] merge with mtr's branch
bzr revid: psi@tinyerp.co.in-20110314090226-f9ut7cqf5l0r1xud
|
2011-03-14 14:32:26 +05:30 |
|
|
Mustufa Rangwala
|
adf35bc8e0
|
[IMP] Cleaning employee object
bzr revid: mra@mra-laptop-20110314085854-g192a5k8is984klt
|
2011-03-14 14:28:54 +05:30 |
|
|
psi (Open ERP)
|
41fd33e46e
|
[IMP] improve in workflow of hr.payslip object
bzr revid: psi@tinyerp.co.in-20110314085750-5qk7f0txo8b003d2
|
2011-03-14 14:27:50 +05:30 |
|
|
Mustufa Rangwala
|
e50705e393
|
[IMP] remove line_ids (hr.payslip lines) from employee object
bzr revid: mra@mra-laptop-20110314084555-jxm2en3l9yiy8tyb
|
2011-03-14 14:15:55 +05:30 |
|
|
Mustufa Rangwala
|
a523e73c1e
|
[IMP] hr_payroll: Code improved
bzr revid: mra@mra-laptop-20110314072317-rivtyc4yokwvsqtd
|
2011-03-14 12:53:17 +05:30 |
|
|
psi (Open ERP)
|
03514546bc
|
[MERGE] merge with mtr's payroll branch
bzr revid: psi@tinyerp.co.in-20110314063558-49f4r1uhqe8v0i3m
bzr revid: psi@tinyerp.co.in-20110314064457-z00g49gp27o1ucgs
|
2011-03-14 12:14:57 +05:30 |
|
|
mtr
|
46f2aac28f
|
[MERGE] branch merged with trunk-payroll-salary_rules-psi
bzr revid: mtr@mtr-20110314063511-owhz4ewy6o3a0pla
|
2011-03-14 12:05:11 +05:30 |
|
|
mtr
|
62ff4c00d6
|
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll
bzr revid: mtr@mtr-20110314063207-x6zetvo3b1if7nov
|
2011-03-14 12:02:07 +05:30 |
|
|
Mustufa Rangwala
|
00ef0b0c2e
|
[MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110302052932-1tt9xs62v39htl32
bzr revid: mra@mra-laptop-20110303061405-azv302dg6qkr94le
bzr revid: mra@mra-laptop-20110304045245-kd3ycla3c2a851ur
bzr revid: mra@mra-laptop-20110307050004-xceuvt5r7qsiyd6e
bzr revid: mra@mra-laptop-20110308053154-x0wtawpjq6jrqxv6
bzr revid: mra@mra-laptop-20110310051004-vo6ktz5cb0l6y9ao
bzr revid: mra@mra-laptop-20110314062835-a2kggd1e7vce3i0l
bzr revid: mra@mra-laptop-20110315043807-etzoyb4d2e0v5mn0
|
2011-03-15 10:08:07 +05:30 |
|
|
Thibault Francois
|
5db90156e9
|
[MERGE] fix lp:731294
bzr revid: tfr@openerp.com-20110314122547-c5x3llhblzbdpusl
|
2011-03-14 13:25:47 +01:00 |
|
|
Thibault Francois
|
0c307168c6
|
[MERGE] fix lp:730651
bzr revid: tfr@openerp.com-20110314110208-qkkw3j227aalda4g
|
2011-03-14 12:02:08 +01:00 |
|
|
Antony Lesuisse
|
099cbcb416
|
merge xmo testsuite and improvement for qweb
bzr revid: al@openerp.com-20110314104422-53gcaty2m9g2lhxu
|
2011-03-14 11:44:22 +01:00 |
|
|
Thibault Francois
|
92a2b731d0
|
[MERGE] bug lp:732518
bzr revid: tfr@openerp.com-20110314103841-8dkiw6domlyfjkqh
|
2011-03-14 11:38:41 +01:00 |
|
|
psi (Open ERP)
|
743a6fe8ee
|
[IMP] get holidays line of employee in holidays tab
bzr revid: psi@tinyerp.co.in-20110314061621-zn9ntg6l28zts7a6
|
2011-03-14 11:46:21 +05:30 |
|
|
psi (Open ERP)
|
0be7eecb8f
|
[MERGE] merge with mtr's branch
bzr revid: psi@tinyerp.co.in-20110314050010-pkqhcumi84fhmfdd
|
2011-03-14 10:30:10 +05:30 |
|
|
Launchpad Translations on behalf of openerp
|
2f4e4f3614
|
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110312050230-04oy1jc0vy0oc6b6
bzr revid: launchpad_translations_on_behalf_of_openerp-20110313045022-bn9v2s1j02fdt51o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110314044624-p765rl8121i95w5o
|
2011-03-14 04:46:24 +00:00 |
|
|
Quentin (OpenERP)
|
bc12c091d8
|
[MERGE] merged the dev branch containing the HR improvements
bzr revid: qdp-launchpad@openerp.com-20110311172952-jqlv6z6kf9x64fr8
|
2011-03-11 18:29:52 +01:00 |
|
|
Quentin (OpenERP)
|
87ca1eefae
|
[FIX] hr_timesheet_sheet: removed readonly on attendances
bzr revid: qdp-launchpad@openerp.com-20110311172513-7b3cpor9feipqfvf
|
2011-03-11 18:25:13 +01:00 |
|
|
Quentin (OpenERP)
|
ae319d8495
|
[FIX] hr_recruitment: decrease no_of_recruitment if employee is hired
bzr revid: qdp-launchpad@openerp.com-20110311172000-2f2ljdljf6y0tqjv
|
2011-03-11 18:20:00 +01:00 |
|
|
Julien Thewys
|
3d24d76b4f
|
[FIX] Removed deprecated license files (was GPL v3, we are using AGPL v3).
bzr revid: jth@openerp.com-20110311171816-5zoozckwq3efv7ed
|
2011-03-11 18:18:16 +01:00 |
|
|
Quentin (OpenERP)
|
68c5102563
|
[MERGE] lp:729651
bzr revid: qdp-launchpad@openerp.com-20110311160425-g3hp0y1589og7lc6
|
2011-03-11 17:04:25 +01:00 |
|
|
Quentin (OpenERP)
|
32304d8fe9
|
[MERGE] lp:731795
bzr revid: qdp-launchpad@openerp.com-20110311155813-4523ulj2av7l7shd
|
2011-03-11 16:58:13 +01:00 |
|
|
Quentin (OpenERP)
|
4cacb67193
|
[MERGE] lp:731332
bzr revid: qdp-launchpad@openerp.com-20110311154909-jzqf7l3f4qsezsja
|
2011-03-11 16:49:09 +01:00 |
|
|
Quentin (OpenERP)
|
10d0c857a4
|
[MERGE] lp:731787
bzr revid: qdp-launchpad@openerp.com-20110311154647-rg9vhygirxzhq61u
|
2011-03-11 16:46:47 +01:00 |
|
|
Quentin (OpenERP)
|
6a213f9c07
|
[MERGE] lp:729539
bzr revid: qdp-launchpad@openerp.com-20110311154335-omz3sjw6supwr2hc
|
2011-03-11 16:43:35 +01:00 |
|
|
Quentin (OpenERP)
|
acf53ceed0
|
[MERGE] lp:728384
bzr revid: qdp-launchpad@openerp.com-20110311154027-ttt0dxt3hx000kkd
|
2011-03-11 16:40:27 +01:00 |
|
|
Quentin (OpenERP)
|
028fdd4f8c
|
[MERGE] lp:712555
bzr revid: qdp-launchpad@openerp.com-20110311152011-l4exyyynypxqv08r
|
2011-03-11 16:20:11 +01:00 |
|
|
Quentin (OpenERP)
|
6ec75017ed
|
[MERGE] lp:720282
bzr revid: qdp-launchpad@openerp.com-20110311151819-11hyz2byqmee3w22
|
2011-03-11 16:18:19 +01:00 |
|
|
Quentin (OpenERP)
|
67e758945d
|
[MERGE] lp:724073
bzr revid: qdp-launchpad@openerp.com-20110311151123-66ps2vpxxh07xqqc
|
2011-03-11 16:11:23 +01:00 |
|
|
Quentin (OpenERP)
|
ad35eeba58
|
[MERGE] lp:724059
bzr revid: qdp-launchpad@openerp.com-20110311150926-t7yoq5d0f9rpccdx
|
2011-03-11 16:09:26 +01:00 |
|
|
Quentin (OpenERP)
|
03c8e8b36a
|
[IMP] hr: improved recruitement
bzr revid: qdp-launchpad@openerp.com-20110311134136-jal186xbwpjf4hba
|
2011-03-11 14:41:36 +01:00 |
|
|
Antony Lesuisse
|
10104a2bf0
|
addons js loading
bzr revid: al@openerp.com-20110311132622-otrxhghgox9jqax6
|
2011-03-11 14:26:22 +01:00 |
|
|
Jigar Amin
|
50fd414738
|
[BUG/FIX] lp:732518 sale_crm : Covert to Quote shoud show only list of Customers
lp bug: https://launchpad.net/bugs/732518 fixed
bzr revid: jam@tinyerp.com-20110311125535-l3trf4ykjpn48qax
|
2011-03-11 18:25:35 +05:30 |
|
|
aag (OpenERP)
|
7cb99c6031
|
[IMP] hr,hr_timesheet:add one func _no_of_expected_employees ans change string analytic account
bzr revid: aag@tinyerp.co.in-20110311122345-g1ufdl0i4ogzwbe2
|
2011-03-11 17:53:45 +05:30 |
|
|
psi (Open ERP)
|
cc8bb306f5
|
[IMP] improve _caluculate method on hr.payslip object so it will consider all line_ids of hr.payslip
bzr revid: psi@tinyerp.co.in-20110311122326-golfefokn1bp2gsz
|
2011-03-11 17:53:26 +05:30 |
|
|
Quentin (OpenERP)
|
924c9639c5
|
[FIX] hr_holidays: type of holidays
bzr revid: qdp-launchpad@openerp.com-20110311115024-5sx7xt40tpla9c6x
|
2011-03-11 12:50:24 +01:00 |
|
|
mtr
|
36366390b5
|
[IMP] hr_payroll:created a function to get parent_id of salary structure
bzr revid: mtr@mtr-20110311114155-stpuykd37s02iyq1
|
2011-03-11 17:11:55 +05:30 |
|
|
Quentin (OpenERP)
|
73b00ed701
|
[IMP] hr,hr_holidays: remove extended view on employee category (was conflicting with hr/manager group)
bzr revid: qdp-launchpad@openerp.com-20110311113204-kxmskgilat5vlk3f
|
2011-03-11 12:32:04 +01:00 |
|
|
Rucha (Open ERP)
|
9bc35e9192
|
[IMP]: hr: Added on change department in employee form to set manager
bzr revid: rpa@tinyerp.com-20110311105449-0h02fpefhrk6kqhu
|
2011-03-11 16:24:49 +05:30 |
|
|
Rucha (Open ERP)
|
e11dc0b43c
|
[IMP]: hr_holidays: Made demo of leave allocation request as validated to avoid warning when confirming a leave request for another demo
bzr revid: rpa@tinyerp.com-20110311103109-lgqt6vp1wz94c0sh
|
2011-03-11 16:01:09 +05:30 |
|
|
mtr
|
5c0680f7f8
|
[MERGE] branch merged with trunk-payroll-salary_rules-psi
bzr revid: mtr@mtr-20110311101220-9yehi8n5lz7ui2hx
|
2011-03-11 15:42:20 +05:30 |
|
|
Rucha (Open ERP)
|
36fe64becc
|
[IMP]: Rename "Confirm" to "Submit to Manager"
bzr revid: rpa@tinyerp.com-20110311101016-gzi2lkvfj5029n8x
|
2011-03-11 15:40:16 +05:30 |
|
|
Rucha (Open ERP)
|
2be7bebe87
|
[IMP]: hr_recruitment: Improvement in wizard to hire applicant
* Put appripriate function names
* Improved view
bzr revid: rpa@tinyerp.com-20110311100752-ltcri0xmbn89ic30
|
2011-03-11 15:37:52 +05:30 |
|
|
mtr
|
473a1541e1
|
[IMP] hr_payroll:added code in onchange_employee_id if salary structure has parent_id
bzr revid: mtr@mtr-20110311085740-gkz19qlnpt38gowc
|
2011-03-11 14:27:40 +05:30 |
|
|
Rucha (Open ERP)
|
d64d4b0d83
|
[MERGE]: Merge with trunk addons
bzr revid: rpa@tinyerp.com-20110311084452-hlkwjehf0tzkbdoh
|
2011-03-11 14:14:52 +05:30 |
|
|
Jigar Amin
|
ae526beef0
|
[MERGE] with lp:openobject-addons
bzr revid: jam@tinyerp.com-20110310130751-4khjwfq1d8yl2k7y
bzr revid: jam@tinyerp.com-20110311050353-7r08lpp060oozm0s
|
2011-03-11 10:33:53 +05:30 |
|
|
Launchpad Translations on behalf of openerp
|
a0cc38df3b
|
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110310044459-bl4c8to5a8lkqoie
bzr revid: launchpad_translations_on_behalf_of_openerp-20110311044533-vzu3t2xfqo9rpcie
bzr revid: launchpad_translations_on_behalf_of_openerp-20110311044949-0wrkjd4vljipalzz
|
2011-03-11 04:49:49 +00:00 |
|