Commit Graph
340 Commits
Author SHA1 Message Date
Quentin (OpenERP) a79f6fe7a5 [FIX] hr_contract, hr_payroll: fixed installation errors due to previous commit
bzr revid: qdp-launchpad@openerp.com-20110408173129-sqvdowkfuawxjddb
2011-04-08 19:31:29 +02:00
psi (Open ERP) ad8437fc0a [FIX] hr_contract: Fix yml test
bzr revid: psi@tinyerp.co.in-20110407052528-uxz29uxwyjj5kf03
2011-04-07 10:55:28 +05:30
Quentin (OpenERP) 546fb69c7c [REF] hr_contract: removed commented code (for 'the sake of clarity' and because bazaar is your historian ^^)
bzr revid: qdp-launchpad@openerp.com-20110406131149-i1135jaom7vhny8z
2011-04-06 15:11:49 +02:00
Quentin (OpenERP) 8713630eb8 [REF] hr_contract: removed commented code (for 'the sake of clarity' and because bazaar is your historian ^^)
bzr revid: qdp-launchpad@openerp.com-20110406130721-ttg9xgrkq5n3ry3d
2011-04-06 15:07:21 +02:00
Quentin (OpenERP) 27b3cf53c6 [IMP] hr_contract: enable back the yaml test (why was it disable?)
bzr revid: qdp-launchpad@openerp.com-20110406124624-iv16tm1egw1i2yvn
2011-04-06 14:46:24 +02:00
Mustufa Rangwala df2e6428d3 [IMP] contract: add default for wage type
bzr revid: mra@mra-laptop-20110329111442-p89ssh3da6qgt7ko
2011-03-29 16:44:42 +05:30
psi (Open ERP) dc38bb2f62 [IMP] remove hr.contract.wage.type.period.user from security file and comment all appearance of the object from view file
bzr revid: psi@tinyerp.co.in-20110322130811-ps38kxglfwqqkx59
2011-03-22 18:38:11 +05:30
psi (Open ERP) 188ca3c715 [IMP] hr_contract: remove unwanted object 'hr.contract.wage.type.period', hr_payroll: Add recompute button, improve the compute method or hr.payroll.register and workflow of hr.payslip
bzr revid: psi@tinyerp.co.in-20110322103531-kxk06fej7kh95td5
2011-03-22 16:05:31 +05:30
psi (Open ERP) 3b178aaf33 [MERGE] merge with payroll branchw
bzr revid: psi@tinyerp.co.in-20110321094140-kjl03qot2ic0zufx
2011-03-21 15:11:40 +05:30
niv-openerp cf07e58016 [MERGE] Other improvements of descriptions in module manifests.
bzr revid: nicolas.vanhoren@openerp.com-20110318140618-jg2jumv3gyacfb74
2011-03-18 15:06:18 +01:00
mtr f989fe70f8 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll
bzr revid: mtr@mtr-20110318114852-29h76togtrdlx053
2011-03-18 17:18:52 +05:30
vro 437ed909c2 [IMP]: Module descriptions.
bzr revid: vro@tinyerp.com-20110318114737-znh9wtipt84hc5jd
2011-03-18 17:17:37 +05:30
niv-openerp a898038b47 [MERGE] Merged module screenshots and improvements to module descriptions.
bzr revid: nicolas.vanhoren@openerp.com-20110318110816-f8bnmmlfzc9eqyu7
2011-03-18 12:08:16 +01:00
niv-openerp edbb2d7168 [MERGE] Improvements to manifests.
bzr revid: nicolas.vanhoren@openerp.com-20110317122126-q1vxxy287aykxv6h
2011-03-17 13:21:26 +01:00
rch-openerp 721d40f606 [ADD]: Images of hr, hr_attendance and hr_contract modules.
bzr revid: rch@tinyerp.com-20110314112013-zwazl3oanlsh7fz5
2011-03-14 16:50:13 +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
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
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
mtr d4a5c96afa [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll
bzr revid: mtr@mtr-20110310053747-79fbrkud3ycqfhz6
2011-03-10 11:07:47 +05:30
psi (Open ERP) 3ce6dbde44 [MERGE] merge with main trunk-payroll branch
bzr revid: psi@tinyerp.co.in-20110310053224-zlmqbi3u1ht3ocop
2011-03-10 11:02:24 +05:30
Thibault Francois e3e979a498 [MERGE] default value in act_window
bzr revid: tfr@openerp.com-20110309130345-uraw50vl1xlzqy6t
2011-03-09 14:03:45 +01:00
Els Van Vossel a69c473f52 [IMP] Changed all module categories, limited number of categories
bzr revid: evv@openerp.com-20110309100505-mwxe08davyzdkfis
2011-03-09 11:05:05 +01:00
mtr 6292725450 [IMP] hr_contract:added access rights for hr.passport object
bzr revid: mtr@mtr-20110309062231-ea2huggnqk8qgchg
2011-03-09 11:52:31 +05:30
Launchpad Translations on behalf of openerp 1e681a15bc Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110305045627-sks4s3i42qo2oj3p
bzr revid: launchpad_translations_on_behalf_of_openerp-20110306045008-pcson59t3bl9r6ax
bzr revid: launchpad_translations_on_behalf_of_openerp-20110307044936-g60qlnsbhllrba7h
bzr revid: launchpad_translations_on_behalf_of_openerp-20110308044752-1i8vh7qa5baootby
bzr revid: launchpad_translations_on_behalf_of_openerp-20110309044026-i5o7lki6yoc0wwol
2011-03-09 04:40:26 +00:00
Mustufa Rangwala d39237d474 [IMP/FIX] hr_payroll: Improvement and cleaning
bzr revid: mra@mra-laptop-20110308063637-zfv8hawzqkdvsk8d
2011-03-08 12:06:37 +05:30
mtr 6e6b21a875 [IMP] hr_payroll,hr_contract:commented 'hr.contract.wage.type' and improved strings of menuitem in payroll.
bzr revid: mtr@mtr-20110307112817-f3c7o3fro4oxzejn
2011-03-07 16:58:17 +05:30
mtr a40185970f [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll
bzr revid: mtr@mtr-20110307084702-31hy9x8zv2fwnnzb
2011-03-07 14:17:02 +05:30
mtr 11c72fb988 [IMP] hr_payroll:removed 'advantages_net' and 'advantages_gross' fields from hr.contract
bzr revid: mtr@mtr-20110307084515-3o33wpeh1uh3czhe
2011-03-07 14:15:15 +05:30
psi (Open ERP) f241d2e3dc [MERGE] merge with trunk-payroll branch
bzr revid: psi@tinyerp.co.in-20110304052550-jvxn2c9en9jmu1lo
2011-03-04 10:55:50 +05:30
psi (Open ERP) 016fbccf00 [IMP] changes as per hr_payroll_new file given by QDP sir: move hr_passport obj to hr module, move some fields of hr.contract from hr_paroll to hr_contract, remove working_days_per_week field for contart and get it from resource calender
bzr revid: psi@tinyerp.co.in-20110303124903-nopz0swoebyqtsqq
2011-03-03 18:19:03 +05:30
psi (Open ERP) aeb79ab194 [IMP, FIX] hr_payroll: Remove Compute and Recompute buttons from hr.payslip, fixes: on hr.contract Visa fields become required=true when we fill the passport, Improve view of hr.payslip
bzr revid: psi@tinyerp.co.in-20110302093407-7vchj5e2hw70357h
2011-03-02 15:04:07 +05:30
psi (Open ERP) 3f1aeeef70 [IMP] hr_payroll: Add new tab Holiday on hr.payslip object and comment unwanted calculation for gross and net, remove wage_type_id
bzr revid: psi@tinyerp.co.in-20110225134314-zopq8bwlwmh61glr
2011-02-25 19:13:14 +05:30
Launchpad Translations on behalf of openerp adcd9eaa27 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110225044009-gb32846xiwjlmimn
2011-02-25 04:40:09 +00:00
Launchpad Translations on behalf of openerp 14a1f2b574 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110224043750-poegyu38623mcw13
2011-02-24 04:37:50 +00:00
Launchpad Translations on behalf of openerp 7b6e366a5f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110208043710-75bxojtr8ox15lgb
bzr revid: launchpad_translations_on_behalf_of_openerp-20110209045556-98ev5i679ddf25uu
2011-02-09 04:55:56 +00:00
Launchpad Translations on behalf of openerp 89933f4c30 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110205045946-ngssapvavvzymfc4
bzr revid: launchpad_translations_on_behalf_of_openerp-20110206045319-cjbcpcr7k0jw8v8f
bzr revid: launchpad_translations_on_behalf_of_openerp-20110205050201-5kxv4wvlb171y4ec
bzr revid: launchpad_translations_on_behalf_of_openerp-20110206045419-syxas10vfjwq4nw9
bzr revid: launchpad_translations_on_behalf_of_openerp-20110207052017-1qsba36kfnjc0zkj
2011-02-07 05:20:17 +00:00
Ujjvala Collins (OpenERP) 4bac6d8969 [FIX] all: Fixed incomplete behavior of act_window.
lp bug: https://launchpad.net/bugs/708467 fixed

bzr revid: uco@tinyerp.com-20110127094939-v8gugx666pakihva
2011-01-27 15:19:39 +05:30
Launchpad Translations on behalf of openerp 916b46ec41 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110122045333-i2yk2vz51qj6mb5k
bzr revid: launchpad_translations_on_behalf_of_openerp-20110123045910-1fm8jx3vrbju1gg6
bzr revid: launchpad_translations_on_behalf_of_openerp-20110124045514-ho879xhno0nup1n3
2011-01-24 04:55:14 +00:00
Launchpad Translations on behalf of openerp b54fbb4957 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110121043831-eluknu6abf6pkaf0
bzr revid: launchpad_translations_on_behalf_of_openerp-20110121044107-0jtepgcibqnai8il
2011-01-21 04:41:07 +00:00
Launchpad Translations on behalf of openerp 2e4efe2677 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110120045440-i7atfpeu9pwzvw29
2011-01-20 04:54:40 +00:00
Launchpad Translations on behalf of openerp 0c96f19b44 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110115055903-i9kqtkstdk8j0hnz
2011-01-15 05:59:03 +00:00
Launchpad Translations on behalf of openerp 62f28364e5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110114045237-gdlm32e67rdh70kr
bzr revid: launchpad_translations_on_behalf_of_openerp-20110114055119-e9fpaxlistgondmp
2011-01-14 05:51:19 +00:00
qdp-launchpad@tinyerp.com 2df4a68377 [MERGE] merged the dev3 branch
bzr revid: qdp-launchpad@tinyerp.com-20110114001101-wk77opsrvslh7pak
2011-01-14 01:11:01 +01:00
Mustufa Rangwala afb6515047 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110112054702-493i7dt0emwfv80z
2011-01-12 11:17:02 +05:30
Launchpad Translations on behalf of openerp 6098beab56 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110112045846-8uu2xx0dqvamh2rf
2011-01-12 04:58:46 +00:00
Mustufa Rangwala 3d11cc2351 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110111121832-dq30dncvyjx3v7pc
2011-01-11 17:48:32 +05:30
Olivier Dony 9e4d49c5ca [I18N] all: updated translation templates after latest changes
bzr revid: odo@openerp.com-20110111112150-nlr78yxgufuqd6yl
2011-01-11 12:21:50 +01:00
Mustufa Rangwala a95ca078da [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110111052448-fa5gq0oz438rk1n0
2011-01-11 10:54:48 +05:30
Launchpad Translations on behalf of openerp cda7d17dc3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110111050313-70y56tghmjexq3p5
2011-01-11 05:03:13 +00:00
Mustufa Rangwala b6177f80a8 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110110120924-b1vs539xou7wt6l1
bzr revid: mra@mra-laptop-20110110124817-7zne2i3c7hbaxqar
bzr revid: mra@mra-laptop-20110111044415-e0xo335fvdxvh4rw
2011-01-11 10:14:15 +05:30