Commit Graph

409 Commits

Author SHA1 Message Date
Mack f8b56e4f40 [FIX] hr_payroll: total_wage return format
Field removed in 9.0 at 04cebbd (because useless). This avoids an error if read.
cf #8781
2015-10-08 12:20:29 +02:00
Christophe Combelles 34d4508535 [FIX] hr_payroll: nicer error message for some bad rule definitions
For example avoids a crash with:

    TypeError: can't multiply sequence by non-int of type 'float'

when setting the quantity field of a salary rule to `1,0`
instead of `1.0`.

Fixes #5154
Closes #5155
2015-02-12 12:23:02 +01:00
TheCloneMaster ed58bcf26b [FIX] hr_timesheet: missing '&' in domain clause
To search the contracts for payroll, the domain is constructed with three clauses. Each of these clauses needs to start with a '&' to make sure they are correctly combined with the OR clause'
2014-07-18 10:56:56 +02:00
Martin Trigaux 5fb77bd6c5 [IMP] hr_payroll: ensure localdict is not shared between contracts
bzr revid: mat@openerp.com-20140402082954-05zzk1k3ued4go5a
2014-04-02 10:29:54 +02:00
Pinakin Nayi (OpenERP) 09600a9969 [FIX]hr_payroll : initialize result_rate in localdict to avoid next execution problem
bzr revid: pna@tinyerp.com-20140331050122-kqfw152vcippdl52
2014-03-31 10:31:22 +05:30
Martin Trigaux 4c0c6bbc76 [FIX] hr_payroll: skip missing structures in get_all_structures for hr.contracts (eg: if structure is deleted afterward) (opw #602411)
bzr revid: mat@openerp.com-20131223124413-k0st3i54zou2bga8
2013-12-23 13:44:13 +01:00
Rifakat 2c9ef5b3d5 [FIX] hr_payroll: put a check for the structure used in the contract. When any structure
is already assigned into contract and that is deleted, it will affet the Payslips which were already created and will have [False] value.

bzr revid: rha@tinyerp.com-20131223101841-6fbwfm90gn7sj17m
2013-12-23 15:48:41 +05:30
Quentin (OpenERP) 200257ab89 [FIX] hr_payroll: do not crash when duplicating a payroll structure (because of both classes with same name in the .py) + added recursion check
bzr revid: qdp-launchpad@openerp.com-20130423091626-02475bdw67wdmhd1
2013-04-23 11:16:26 +02:00
Cecile Tonglet a3939acfa5 [FIX] replace from/import decimal_precision by from/import openerp.addons.decimal_precision
bzr revid: cto@openerp.com-20121217152303-8e3b1x30rlw9cb0d
2012-12-17 16:23:03 +01:00
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace.
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Fabien Pinckaers 8fe74c7900 [MERGE] do not delete confirmed payslip
bzr revid: fp@tinyerp.com-20121113075733-kidt1mqc9tf8xayh
2012-11-13 08:57:33 +01:00
Fabien Pinckaers c3c05928e7 [MERGE] compute payroll
bzr revid: fp@tinyerp.com-20121112083937-6wdxk6313q2lbdim
2012-11-12 09:39:37 +01:00
Vo Minh Thu abbe3ac1de [MERGE] removed a few warnings.
bzr revid: vmt@openerp.com-20121106150431-rem9us13kevan8y0
2012-11-06 16:04:31 +01:00
Khushboo Bhatt (Open ERP) 5cde51e636 [IMP]hr_payroll:added unlink method for deleteing draft and cancel payslip.
bzr revid: kbh@tinyerp.com-20121102061126-uzkprztc5aoo0hjf
2012-11-02 11:41:26 +05:30
Mayur Maheshwari (OpenERP) 7d765c0c38 [FIX]hr_payroll : On clicking the Confirm button the salary slip must be computed as well, which is not happening
bzr revid: mma@tinyerp.com-20121101050924-ywsnzr7n930g97pq
2012-11-01 10:39:24 +05:30
Twinkle Christian (OpenERP) c23ec49ad0 [FIX]server warninggs when insttaling modules
bzr revid: tch@tinyerp.com-20121011123201-b0rdwialk1uqc14x
2012-10-11 18:02:01 +05:30
Fabien Pinckaers 196f68fda4 [MERGE] payslip duplicate
bzr revid: fp@tinyerp.com-20120929121056-kfkqc9jofb87cp2m
2012-09-29 14:10:56 +02:00
Antonin Bourguignon 1fbb4a5c16 [IMP] handling of '(copy)' l10n
bzr revid: abo@openerp.com-20120924162645-z1h4l2mj6c8i6wr3
2012-09-24 18:26:45 +02:00
Purnendu Singh (OpenERP) d6608da313 [FIX] hr_payroll: small fix in code
bzr revid: psi@tinyerp.com-20120914112756-rbzvhcaj35sz5duk
2012-09-14 16:57:56 +05:30
Purnendu Singh (OpenERP) 428259a2b6 [IMP] hr_payroll: improve the onchange employee method on payslip so it will not give traceback in case contract is available for the selected employee and salary structure is not there
bzr revid: psi@tinyerp.com-20120914111847-irocinmn1f29wc5d
2012-09-14 16:48:47 +05:30
Mayur Maheshwari (OpenERP) 0b87880029 [IMP]all: imporve string state to status
bzr revid: mma@tinyerp.com-20121012114258-w2q3hg1wb5wlt8wi
2012-10-12 17:12:58 +05:30
Amit (OpenERP) 1987736114 [MERGE]: Merge with lp:openobject-addons
bzr revid: amp@tinyerp.com-20120823053427-xntjhsvbjoktb752
2012-08-23 11:04:27 +05:30
Antonin Bourguignon 8a64e7580a [IMP] all the error messages now start with 'Error\!' (not 'Error' or 'Error \!')
bzr revid: abo@openerp.com-20120807113137-44vehm0mthqawlo3
2012-08-07 13:31:37 +02:00
Amit (OpenERP) 6e161afd7d [FIX] : Fixes the duplicate payslip problem on made payment order field
bzr revid: amp@tinyerp.com-20120730055804-lbsgiok0i4uflmgx
2012-07-30 11:28:04 +05:30
Amit (OpenERP) ddc19ac369 [FIX] hr_payroll : Fixes the duplicate payslip problem
lp bug: https://launchpad.net/bugs/1029318 fixed

bzr revid: amp@tinyerp.com-20120726111113-0jo81xcclbusdp8g
2012-07-26 16:41:13 +05:30
pso (OpenERP) e5da0e191b [MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
2012-07-25 18:23:32 +05:30
Saurang Suthar(OpenERP) 25d650e96e [IMP] Improved warning messages for hr* modules
bzr revid: pso@tinyerp.com-20120725121354-hypwxo74c43jm5gp
2012-07-25 17:43:54 +05:30
Rajesh Prajapati (OpenERP) 71122ae47a [IMP]tooltip : I have changed the tooltip of fields as suggested
bzr revid: rpr@tinyerp.com-20120713101751-zokuph2bcpcmlfc5
2012-07-13 15:47:51 +05:30
Pinakin Nayi (OpenERP) 27226c12b2 [IMP]hr-warning-message
bzr revid: pna@tinyerp.com-20120713070425-b3envibswfdt6umq
2012-07-13 12:34:25 +05:30
Quentin (OpenERP) 6a75cc721d [IMP] payroll modules: improved the management of accounting entries created by a payslip + data for contribution registers in l10n_be payroll modules
bzr revid: qdp-launchpad@openerp.com-20120620130449-aa0qe86kjig8ud4m
2012-06-20 15:04:49 +02:00
Saurang Suthar (OpenERP) a2a05cfc19 [IMP]:improved titles State by Status everywhere
bzr revid: ssu@tinyerp.com-20120504115748-2vd1dns7bxptg384
2012-05-04 17:27:48 +05:30
Purnendu Singh (OpenERP) a09cff3cf3 [IMP] hr_payroll: update help string
bzr revid: psi@tinyerp.com-20120127053724-pkqv2f0xre2p87mf
2012-01-27 11:07:24 +05:30
Divyesh Makwana (Open ERP) 885d596dc5 [FIX] hr_payroll : hr payroll please correct text
lp bug: https://launchpad.net/bugs/916526 fixed

bzr revid: mdi@tinyerp.com-20120118122936-yb4d9mc7gz9bkw0y
2012-01-18 17:59:36 +05:30
Quentin (OpenERP) 5602ac13b7 [IMP] hr_payroll: modified the payroll engine in order to return the rate separately. Added a float precision for payroll rate. Original ideas from Yannick Buron.
bzr revid: qdp-launchpad@openerp.com-20120105081325-2pstk4naim07cy2o
2012-01-05 09:13:25 +01:00
Mayur Maheshwari (OpenERP) b439bc1606 [FIX]All: create an index for the column on require table
lp bug: https://launchpad.net/bugs/901474 fixed

bzr revid: mma@tinyerp.com-20111209060308-muefwlr323ji4kk7
2011-12-09 11:33:08 +05:30
Raphael Collet bf3cbb4305 [MERGE] polish3_hr_payroll: add constraint on dates, default value for expenses journal, and rename report
bzr revid: rco@openerp.com-20111130140107-t3ta1kmcy70smavd
2011-11-30 15:01:07 +01:00
Amit (OpenERP) 2e758fb463 [IMP]:improved code
bzr revid: apa@tinyerp.com-20111123053154-gsay5gufpz83vkns
2011-11-23 11:01:54 +05:30
RavishchanraMurari (Open ERP) fe0754a549 hr_payroll
bzr revid: rmu@tinyerp.com-20111122124129-awp6gqiu2prp7egc
2011-11-22 18:11:29 +05:30
Quentin (OpenERP) b72b197cf0 [FIX] hr_payroll: default value of 'quantity' field in payslip line must be a float (hence its parent object is a varchar and thus its default value was not compatible and breaking in web client)
bzr revid: qdp-launchpad@openerp.com-20111115140723-t4b9xcmi0av3wf5s
2011-11-15 15:07:23 +01:00
Fabien Pinckaers db8da808ff fix
bzr revid: fp@tinyerp.com-20111114224213-asq9x16vsnhv33ap
2011-11-14 23:42:13 +01:00
Fabien Pinckaers b959378ec5 merge: allows to delete a payslip
bzr revid: fp@tinyerp.com-20111111145207-nuewll488gpnqhld
2011-11-11 15:52:07 +01:00
Divyesh Makwana (Open ERP) f2d356f857 [FIX] hr_payroll : Impossible to remove elements from the Employee payslip list view
lp bug: https://launchpad.net/bugs/885673 fixed

bzr revid: mdi@tinyerp.com-20111109053906-pfedy5myoj54vcx5
2011-11-09 11:09:06 +05:30
Antony Lesuisse 2e2042c510 [IMP] hr hierarchy view, rename payslip run into batches
bzr revid: al@openerp.com-20111108230027-uj9bgwyhtil6ve7u
2011-11-09 00:00:27 +01:00
Fabien Pinckaers 78f60c63f2 fix
bzr revid: fp@tinyerp.com-20110917145731-h0woi9z87i9b14fn
2011-09-17 16:57:31 +02:00
Fabien Pinckaers 523be42bd1 merge
bzr revid: fp@tinyerp.com-20110917141929-2goj9ifzidq8g6rk
2011-09-17 16:19:29 +02:00
Meera Trambadia (OpenERP) ba5341a5e6 [MERGE] branch merged with lp:openobject-addons
bzr revid: mtr@tinyerp.com-20110915130151-7uxiju44u28o7b9h
2011-09-15 18:31:51 +05:30
Mustufa Rangwala (OpenERP) bddfe1cd5a [IMP] hr_payroll, hr_payroll_account: Payslip Run => add journal_id field on payslip run, improve search view, fix for done button on payslip run, usibility improvements
bzr revid: mra@tinyerp.com-20110915051636-54xj84eams3fvyu5
2011-09-15 10:46:36 +05:30
Quentin (OpenERP) 7dfc61350c [IMP] hr_payroll: default value for scheduled pay field
bzr revid: qdp-launchpad@openerp.com-20110914142450-au5t6fkg6h420qwg
2011-09-14 16:24:50 +02:00
Quentin (OpenERP) 514dfa0748 [IMP] hr_payroll: added tree view on payroll structures and rule categories. + few renaming of stupid copied/pasted xml_id meaningless
bzr revid: qdp-launchpad@openerp.com-20110914085311-nfg3sg0cdi5jv9y6
2011-09-14 10:53:11 +02:00
mtr b3d4085714 [FIX] account,hr,hr_recruitment,hr_payroll,product:- enforced _sql_constraint to maintain uniqueness
lp bug: https://launchpad.net/bugs/789019 fixed

bzr revid: mtr@mtr-20110805052025-3w0w7ccnnlrish2b
2011-08-05 10:50:25 +05:30