Commit Graph

60 Commits

Author SHA1 Message Date
Olivier Dony 06fb14130a [IMP] removed method=True params from all fields.function
Server revision 3495 odo@openerp.com-20110701232328-flgxulxva70vnyxr
removed the need for passing method=True to function fields,
so this is the equivalent addons fix, removing it everywhere.
Please be careful from now on, and do not pass it anymore!

bzr revid: odo@openerp.com-20110701234124-a61zl0idvdfz3hyb
2011-07-02 01:41:24 +02: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
psi (Open ERP) 7a795aa8f6 [FIX] hr_payroll: speling correction of lables
lp bug: https://launchpad.net/bugs/702027 fixed

bzr revid: psi@tinyerp.co.in-20110113075536-q1gjfq0mu3a26hd0
2011-01-13 13:25:36 +05:30
husen 5fefd9f529 typo
bzr revid: husen@husen-laptop-20101230134220-nqz0cncs6cqhaacg
2010-12-30 19:12:20 +05:30
husen f433b959c2 merged with trunk
bzr revid: husen@husen-laptop-20101230095809-cl6dkve1odgdtqtv
2010-12-30 15:28:09 +05:30
Quentin THEURET f078fe580a [FIX] hr_payrol: Fixed unicodeerror
lp bug: https://launchpad.net/bugs/693788 fixed

bzr revid: pso@tinyerp.com-20101224120544-fav3jc3co3kkrly6
2010-12-24 17:35:44 +05:30
Mustufa Rangwala b0f61a9546 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20101214130232-wqsim6966u1hilu9
bzr revid: mra@mra-laptop-20101217043732-ri8dfx38pacpruye
2010-12-17 10:07:32 +05:30
Mustufa Rangwala 6428d964a9 [FIX] Hr: hr, passport field, bad widget
lp bug: https://launchpad.net/bugs/687310 fixed

bzr revid: mra@mra-laptop-20101213082134-1qjew9qqz2wqmrs8
2010-12-13 13:51:34 +05:30
uco (OpenERP) d827b2f6ea [REF]: Added remaining context changes in _constraints. Removed unnecessary checking for context from methods.
bzr revid: uco@tinyerp.com-20101213064309-vg36f1510xv2f8zb
2010-12-13 12:13:09 +05:30
uco (OpenERP) 097ff85deb [MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-20101123071135-712ya21x2v77mn36
2010-11-23 12:41:35 +05:30
uco (OpenERP) 6dd290e824 [REF]: Replace the condition 'if not context' with 'if context is None'.
bzr revid: uco@tinyerp.com-20101123070505-9i2lrqhgxzaii3zn
2010-11-23 12:35:05 +05:30
uco (OpenERP) 12fcd1be2f [IMP] : Added context=None on methods used for _constraints and replaced context={} with context=None.
bzr revid: uco@tinyerp.com-20101119134801-974ev29j4tu46pq2
2010-11-19 19:18:01 +05:30
Olivier Dony e1d9d1d6c6 [FIX] stock,hr,pos,project,...: cleanup some calls to _( ) - only literal strings should ever been used!
bzr revid: odo@openerp.com-20101119122003-4r52xuupedyhgmcx
2010-11-19 13:20:03 +01:00
Olivier Dony c90aa7f2f0 [FIX] caldav,email_template,hr_payroll,mrp: cleanup some calls to _( ) - only literal strings should ever been passed!
bzr revid: odo@openerp.com-20101118162131-s2nb25l3e4xzmnjg
2010-11-18 17:21:31 +01:00
Thibault Francois d516bc0ea1 [MERGE] with trunk
bzr revid: tfr@openerp.com-20101110120902-k60lls4irx842pq2
2010-11-10 13:09:02 +01:00
pso e0bd6974e2 [FIX] hr_payroll: Fixed decimal precision error
lp bug: https://launchpad.net/bugs/617974 fixed

bzr revid: pso@tinyerp.com-20101103080442-xp0k54djtvx6cw8l
2010-11-03 13:34:42 +05:30
uco (OpenERP) ffbb15e03e [MERGE]: Merged with team1.
bzr revid: uco@tinyerp.com-20101028070542-fhe8w6z1ggb4crne
2010-10-28 12:35:42 +05:30
uco (OpenERP) eccc1d33b2 [REF] copyrights: Replaced 'GNU General Public License' with 'GNU Affero General Public License'
bzr revid: uco@tinyerp.com-20101028065418-ahi6poaxn1aa5dmp
2010-10-28 12:24:18 +05:30
Mustufa Rangwala 63024dc43f [REF] hr_payroll: Removed warnings from buildbot
bzr revid: mra@mra-laptop-20101028042705-9fq386jz2wk7mrxb
2010-10-28 09:57:05 +05:30
vra c0561bea93 [FIX][IMP] hr_payroll, hr_payroll_account: improved the demo for default account, fixed the datetime traceback in payslip compute action.
bzr revid: vra@tinyerp.com-20101027141328-hs3qcosrckpzpbm5
2010-10-27 19:43:28 +05:30
Mustufa Rangwala 17a5fd4ee8 [REF]
bzr revid: mra@mra-laptop-20101027131019-mx6r2q7fgpnkh0sb
2010-10-27 18:40:19 +05:30
vth cd8e9de724 [REF] hr_*
bzr revid: vth@tinyerp.com-20101027124959-phubwje70rmbec4p
2010-10-27 18:19:59 +05:30
jas 90e8a2a9ac [FIX] hr_payroll :added cancel_sheet and set_to_draft function
bzr revid: jas@tinyerp.com-20101026122332-9olfswqdnjgqxeye
2010-10-26 17:53:32 +05:30
vra 90e27fd366 [REF]hr_payroll, hr_payroll_account: code cleaning.
bzr revid: vra@tinyerp.com-20101015055414-d5p5lchgh3t1e7n8
2010-10-15 11:24:14 +05:30
qdp-launchpad@tinyerp.com 175e637ed3 [FIX] hr, hr_contract, hr_payroll: moved back the field bank_account on the hr.employee object into the HR module: even if it's used only in payroll it may be interssting to record that info before. besides, the view of hr_contract module was crashing
bzr revid: qdp-launchpad@tinyerp.com-20101008160155-nwpaxwqyltc6d663
2010-10-08 18:01:55 +02:00
Mantavya Gajjar 30efb09f7a [IMP]: improve the usability
bzr revid: mga@tinyerp.com-20101008131845-alqqlb6d97y3s3d5
2010-10-08 18:48:45 +05:30
Mantavya Gajjar 86a26c1d6b [IMP]: now from the employee object we will get the earnings and computations
bzr revid: mga@tinyerp.com-20101008090555-24n0qrti5obce8bx
2010-10-08 14:35:55 +05:30
Mantavya Gajjar cf672602eb [IMP]: improvement to the contract object
bzr revid: mga@tinyerp.com-20101007144456-vu0v0750ujf8bgzq
2010-10-07 20:14:56 +05:30
Mantavya Gajjar f2e3f5fc2b [IMP]: implement the salary calculation for the structure
bzr revid: mga@tinyerp.com-20101007140056-r3mo0e7ltp7k4bd1
2010-10-07 19:30:56 +05:30
Mantavya Gajjar 1a2015de2c [IMP]: improvement to view, add links to employee for payslip
[ADD]: add demo data for the contract

bzr revid: mga@tinyerp.com-20101007091900-tglpl048qpffnle8
2010-10-07 14:49:00 +05:30
Mantavya Gajjar eb95954919 [IMP]: improvement to payroll
[REM]: remove some field specific to the localize data, may be added from the localize module

bzr revid: mga@tinyerp.com-20101007071334-tonherdg56xbn0xa
2010-10-07 12:43:34 +05:30
Mantavya Gajjar 52462287f3 [IMP]L improvement and fix to the payroll module
bzr revid: mga@tinyerp.com-20101007063156-tijiyci4w5r0v29w
2010-10-07 12:01:56 +05:30
Mantavya Gajjar 9860aa21c1 [FIX]: fix a small code that will allow user to prepare a slip for any contract based on the date
bzr revid: mga@tinyerp.com-20101006134724-24ki3h7m6k8gjloo
2010-10-06 19:17:24 +05:30
Mantavya Gajjar 15792bb9fa [IMP]: improve the hr_payroll module make it fully independent of account and hr_expanse module
Accounting functionalities to payroll will be added by the hr_payroll_account module.

bzr revid: mga@tinyerp.com-20101006124454-t1vgn6879dnu62ou
2010-10-06 18:14:54 +05:30
Vir (Open ERP) 7e54aa782c [Merge]
bzr revid: vir@tinyerp.com-20100924043941-x7ij7c6saw272bwe
2010-09-24 10:09:41 +05:30
Mantavya Gajjar 07b88cb8da [FIX]: add the missing field to the payslip model
bzr revid: mga@tinyerp.com-20100923091734-7niyoorw5hmryo58
2010-09-23 14:47:34 +05:30
uco (Open ERP) 31d249a9ab [MERGE]
bzr revid: uco@tinyerp.com-20100819125727-iuofahcl931exx1r
2010-08-19 18:27:27 +05:30
RHA (Open ERP) d5ad0b8ff1 [CLEAN]: Removed commented codes, unnecessary spaces.
bzr revid: uco@tinyerp.com-20100819115157-sfsmbnjdgpp4wl12
2010-08-19 17:21:57 +05:30
PSI(OpenERP) 04e5144b2d [IMP] HR modules: Usebility, on employee add contract field (latest)
bzr revid: mra@mra-laptop-20100819093802-9z5a0t6rn4f17i5j
2010-08-19 15:08:02 +05:30
PSI(OpenERP) 2c9f004a19 [FIX] hr_payroll: onchange company
bzr revid: mra@mra-laptop-20100805134155-mefm72ezoclnfqog
2010-08-05 19:11:55 +05:30
PSI(OpenERP) 187e9ff63c [IMP] hr_payroll: Reports improvements and add bank field on payroll advice object
bzr revid: mra@mra-laptop-20100805044104-jt6s9irtb1v59fr2
2010-08-05 10:11:04 +05:30
PSI (OpenERP) 4b1348a989 [IMP] hr related modules improvements
bzr revid: mra@mra-laptop-20100727071145-4n3z9i1jj1zosp8z
2010-07-27 12:41:45 +05:30
Mantavya Gajjar 0ffd63135c [FIX]: improvement in hr_payroll and account recurring wizard
bzr revid: mga@tinyerp.com-20100722121342-4kx7jv06zonmv5g2
2010-07-22 17:43:42 +05:30
Mantavya Gajjar f8efca986f [IMP]: improvement in payroll module
bzr revid: mga@tinyerp.com-20100707130347-r4zlz7ktthfet0ai
2010-07-07 18:33:47 +05:30
Mantavya Gajjar 21786ff375 [FIX]: fix a small problems related to views and labels
bzr revid: mga@tinyerp.com-20100707062107-yljp2sv5tlpr17at
2010-07-07 11:51:07 +05:30
Mantavya Gajjar 0e61edf922 [FIX]: reviwe payroll and recall lost changes during the merge
bzr revid: mga@tinyerp.com-20100702103715-iew7rlke3we92ipg
2010-07-02 16:07:15 +05:30
Mustufa Rangwala fc210d0b95 [MERGE] hr_payroll: branch merge for sbh => osv memory conversion and search view
bzr revid: mra@mra-laptop-20100701073146-ms0xdv7pvx7fsbzt
2010-07-01 13:01:46 +05:30
Mantavya Gajjar 8a7e4a2617 [FIX]: fix a problems in payroll module
bzr revid: mga@tinyerp.com-20100629172204-0jmz15a7ak6nk7ff
2010-06-29 22:52:04 +05:30
Vir (Open ERP) e5f3fd07e2 [MOD] hr: otherid,identification_id , hr_holidays: action added on list view
bzr revid: vir@tinyerp.com-20100911132900-q5fxoeqr42m3tifb
2010-09-11 18:59:00 +05:30
Vir (Open ERP) 8882b118d3 [MOD] hr : passport field set as char,and added on_change method
bzr revid: vir@tinyerp.com-20100911093215-sbr079z0rwpj2r6n
2010-09-11 15:02:15 +05:30