Christophe Simonis
a6b11a151e
[MERGE] forward port of branch 7.0 up to f8b56e4
2015-10-10 14:25:35 +02:00
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
Denis Ledoux
550910a8f6
[MERGE] forward port of branch 7.0 up to a87d60f
2015-02-16 18:26:45 +01: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
Martin Trigaux
1f878f152a
[MERGE] forward port of branch 7.0 up to 680f955
2014-07-22 13:39:15 +02: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
Christophe Simonis
db6fb31870
[MERGE] forward port of branch 7.0 up to revid 9954 chs@openerp.com-20140403153129-jq9zc7ityoy25c73
...
bzr revid: chs@openerp.com-20140403155904-ya5mas5s3g7ivihb
2014-04-03 17:59:04 +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
Thibault Delavallée
2488f78e6d
[FORWARD] Forward port of latest saas-2 fixes, until revision 9062 (revid tde@openerp.com-20140102124143-m1qv8koovjcl8mah)
...
bzr revid: tde@openerp.com-20140102133028-xhvkzstqy5t8dquh
2014-01-02 14:30:28 +01:00
Denis Ledoux
1508c5dd00
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9718 rev-id: dle@openerp.com-20131224103535-rhtje7dnq1ie7jtb
...
bzr revid: tde@openerp.com-20131220162158-hbgktly09dv37958
bzr revid: dle@openerp.com-20131223155041-8zp8e08fihbr0ie2
bzr revid: dle@openerp.com-20131224112407-aw6dq2q92312kjbk
2013-12-24 12:24:07 +01:00
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
Foram Katharotiya (OpenERP)
09c62b0d02
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20130613071422-9iw22gkm33epbkpb
2013-06-13 12:44:22 +05:30
Olivier Dony
9c08e12962
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9085
...
revision-id: odo@openerp.com-20130429105458-r89mnkx8okdxsdld
bzr revid: odo@openerp.com-20130429151410-54y94063gijyk16o
2013-04-29 17:14:10 +02:00
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
Vo Minh Thu
e69326ee3b
[REF] removed explicit model instanciations.
...
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
Raphael Collet
96ad608854
[IMP] general: use registry[X] instead registry.get(X) when X is dynamic
...
bzr revid: rco@openerp.com-20130329143720-80pkd4csemlk1aqz
2013-03-29 15:37:20 +01:00
Ajay Chauhan (OpenERP)
d157bc386d
[IMP] hr_payroll: changed string to 'Payslip Name' in model 'hr.payslip'
...
bzr revid: cha@tinyerp.com-20130320133137-ypgfok0im8dq9gdk
2013-03-20 19:01:37 +05:30
Ajay Chauhan (OpenERP)
709264645b
[IMP] hr_payroll: change string of field 'note'
...
bzr revid: cha@tinyerp.com-20130312133309-okitqk4yzdo1gsin
2013-03-12 19:03:09 +05:30
Ajay Chauhan (OpenERP)
ba02e50efa
[IMP] hr_payroll: use the new signal_xxx methods instead of trg_validate.
...
bzr revid: cha@tinyerp.com-20130131063333-jhcpvbingaqxroiq
2013-01-31 12:03:33 +05:30
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