Commit Graph

366 Commits

Author SHA1 Message Date
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
Quentin (OpenERP) cc5639bbac [IMP] usaiblity improvements
bzr revid: qdp-launchpad@openerp.com-20110711160549-n2rgb060zuo51g65
2011-07-11 18:05:49 +02:00
Quentin (OpenERP) 4f77873577 [IMP] payroll: small usabiltiy improvements
bzr revid: qdp-launchpad@openerp.com-20110711150309-z1j2780kijojmzep
2011-07-11 17:03:09 +02:00
Quentin (OpenERP) 243d19b89e [MERGE] payroll: fixed error in schema of hr_contract
bzr revid: qdp-launchpad@openerp.com-20110711103326-rti0sjuex2a6mcmq
2011-07-11 12:33:26 +02:00
psi (Open ERP) 7890f2f080 [FIX] hr_payroll: fixes YML trace back as struct_id field was required on hr.contract object
bzr revid: psi@tinyerp.co.in-20110630091533-al5ei2f202aw5q7a
2011-06-30 14:45:33 +05:30
psi (Open ERP) 48c01fbf51 [IMP] hr_payroll: make credit note readonly while state is not draft and remove unsused attrs from appers_on_payslip field
bzr revid: psi@tinyerp.co.in-20110629090353-xodv3bnvnjwdeyjw
2011-06-29 14:33:53 +05:30
Quentin (OpenERP) 42f835eb93 [MERGE] payroll: added the contribution register report
bzr revid: qdp-launchpad@openerp.com-20110616104918-5q5ddzavn39albb5
2011-06-16 12:49:18 +02:00
Quentin (OpenERP) 8ce709f04a [MERGE] decimal precision for payroll module
bzr revid: qdp-launchpad@openerp.com-20110609112733-p3w2ptg4cgmgvwmv
2011-06-09 13:27:33 +02:00
Quentin (OpenERP) 387b534a33 [MERGE] improvements in payslip run
bzr revid: qdp-launchpad@openerp.com-20110609100743-ogqkahrq0pg9vz03
2011-06-09 12:07:43 +02:00
mtr 3898cb05ae [IMP] hr_payroll: created decimal_precision for Payroll and improved dp in hr_payroll.py
bzr revid: mtr@mtr-20110603092555-tz8ajg8r578pw1zz
2011-06-03 14:55:55 +05:30
psi (Open ERP) 0e076c4060 [IMP] hr_payroll: Improve code of contribution report and update the help on register_id of rule object
bzr revid: psi@tinyerp.co.in-20110602130043-lhfiercyh6bqp82p
2011-06-02 18:30:43 +05:30
psi (Open ERP) 23c22472ee [MERGE] hr_payroll: Merge with main payroll branch
bzr revid: psi@tinyerp.co.in-20110601051224-6dwhpwxo3w7xla7c
2011-06-01 10:42:24 +05:30
Quentin (OpenERP) e41d251cdc [MERGE] hr_payroll: merged branch of mtr with browsable categories + fixed few points in it
[IMP] hr_payroll: improved BrowsableObject class to return 0.0 if the key isn't defined
[FIX] hr_payroll: fix the computation of categories

bzr revid: qdp-launchpad@openerp.com-20110527101322-k0lx0660feopt30i
2011-05-27 12:13:22 +02:00
psi (Open ERP) 998c0f641f [IMP] hr_payroll: contribution report improvemnt as specified in need fixing
bzr revid: psi@tinyerp.co.in-20110527073256-d6v6voa6ssw9fykg
2011-05-27 13:02:56 +05:30
mtr 43eb0502b6 [IMP] hr_payroll: improved code to have access of all the fields on rules object
bzr revid: mtr@mtr-20110527072352-tdexanp29hxmnepi
2011-05-27 12:53:52 +05:30
mtr 45ec4a4110 [MERGE] branch merged with trunk-payroll
bzr revid: mtr@mtr-20110527061311-2tn9n7cbu5gb7l6a
2011-05-27 11:43:11 +05:30
mtr 253eaa325e [MERGE] branch merged with trunk-payroll
bzr revid: mtr@mtr-20110527060154-1fq5lppd897p9jc3
2011-05-27 11:31:54 +05:30
mtr ea2fc5b4d9 [MERGE] branch merged with trunk-payroll
bzr revid: mtr@mtr-20110527054718-ik8t3hdxpsfmj87e
2011-05-27 11:17:18 +05:30
psi (Open ERP) b2bfc10213 [MERGE] hr_payroll: Merge with main payroll branch
bzr revid: psi@tinyerp.co.in-20110527045953-c0pmm96haygt6yk4
2011-05-27 10:29:53 +05:30
Quentin (OpenERP) b55495512c [IMP] hr_payroll: added quantity on payslip lines
bzr revid: qdp-launchpad@openerp.com-20110526165610-3ppefzx2tqk4sd98
2011-05-26 18:56:10 +02:00
mtr 2eb5bb33f7 [IMP] hr_payroll: improved help string on 'amount_python_compute' field
bzr revid: mtr@mtr-20110526113525-de0h5y8bp7c5shdm
2011-05-26 17:05:25 +05:30
mtr 481d4e4bbe [IMP] hr_payroll: made 'rules' into browseable object
bzr revid: mtr@mtr-20110526110838-n5juwnp5atajt8on
2011-05-26 16:38:38 +05:30
mtr b3653a88d2 [MERGE] branch merged with trunk-payroll
bzr revid: mtr@mtr-20110526093749-uam9vgtya56vpvm2
2011-05-26 15:07:49 +05:30
mtr 2b8e537224 [MERGE] branch merged with trunk-payroll
bzr revid: mtr@mtr-20110526085043-psf4ph1ywl5b3sxd
2011-05-26 14:20:43 +05:30
mtr 09b88682e1 [IMP] hr_payroll: improved help string categories=>rule_categories
bzr revid: mtr@mtr-20110526055655-iw9yg4999a5l8g1z
2011-05-26 11:26:55 +05:30
mtr 8b32533bec [IMP] hr_payroll: revert back the changes from localdict => category_dict
bzr revid: mtr@mtr-20110526055402-ua3mu846d8zw4jso
2011-05-26 11:24:02 +05:30
psi (Open ERP) 4f1ed7c970 [MERGE] hr_payroll: Merge with main payroll branch
bzr revid: psi@tinyerp.co.in-20110526053146-cybrig63j99qt4tx
2011-05-26 11:01:46 +05:30
Quentin (OpenERP) c6fa707ca2 [MERGE]
bzr revid: qdp-launchpad@openerp.com-20110525134101-7v3n4bjszg1di0k7
2011-05-25 15:41:01 +02:00
mtr 60794632f8 [IMP] hr_payroll: improved payslip state as per workflow changes and removed unrequired methods
bzr revid: mtr@mtr-20110525091234-ih8c8e9vei8vfhbp
2011-05-25 14:42:34 +05:30
mtr 46afc22ac9 [MERGE] branch merged with trunk-payroll
bzr revid: mtr@mtr-20110525062621-m04kj8v37ov1v6bu
2011-05-25 11:56:21 +05:30
mtr d353d12965 [MERGE] branch merged with trunk-payroll
bzr revid: mtr@mtr-20110525061731-ayjulztx5mxq6flb
2011-05-25 11:47:31 +05:30
psi (Open ERP) fc4e99ccba [IMP] hr_payroll: remove commented codes from hr_payroll_report.xml and hr_payroll.py files
bzr revid: psi@tinyerp.co.in-20110524131257-u5qc6qwhneeta3ds
2011-05-24 18:42:57 +05:30
Quentin (OpenERP) 06f1f00def [MERGE] hr_payroll: changed field 'quantity' into 'amount' in input lines
bzr revid: qdp-launchpad@openerp.com-20110524124908-hzgk4vhegmynonsc
2011-05-24 14:49:08 +02:00
Quentin (OpenERP) c002b2df9e [MERGE] hr_payroll: merged the branch with modifications on workflow and state of payslip
bzr revid: qdp-launchpad@openerp.com-20110524123116-y0l7o66mclk8fkd2
2011-05-24 14:31:16 +02:00
mtr 4dd134c822 [IMP] hr_payroll: added fields on wizard and improved code so that generated payslip have date from payslip run
bzr revid: mtr@mtr-20110524114117-pqqarqenjwwempmj
2011-05-24 17:11:17 +05:30
psi (Open ERP) 7175b83346 [MERGE] hr_payroll: merge with main payroll branch
bzr revid: psi@tinyerp.co.in-20110524112625-rmuu1o1ogti7c7s3
2011-05-24 16:56:25 +05:30
mtr a54773c65d [IMP] hr_payroll: used 'BrowsableObject' method instead of inheritancy
bzr revid: mtr@mtr-20110524103312-dvn8fbyzfp2grpll
2011-05-24 16:03:12 +05:30
mtr b5849f3519 [MERGE] branch merged with trunk-payroll
bzr revid: mtr@mtr-20110524085206-tdpekv2v5fy2zbvf
2011-05-24 14:22:06 +05:30
mtr ad6b2593c2 [IMP] hr_payroll: renamed the field 'quantity' to 'amount'
bzr revid: mtr@mtr-20110524060202-z58x324zvkugddd1
2011-05-24 11:32:02 +05:30
Quentin (OpenERP) 00384b71e5 [IMP] hr_payroll: better name class for browsable object in python code of salary rules
bzr revid: qdp-launchpad@openerp.com-20110523140926-388dp1b8egyt08zl
2011-05-23 16:09:26 +02:00
mtr 33f2f16249 [IMP] hr_payroll: inherited 'Inputline' class and changed help strings
bzr revid: mtr@mtr-20110523112203-3xj8q54ffiqxmyz3
2011-05-23 16:52:03 +05:30
mtr 961e04cc9e [IMP] hr_payroll: initiate object outside the for loop
bzr revid: mtr@mtr-20110523093504-m2ibjrkk755dejuu
2011-05-23 15:05:04 +05:30
mtr 995cc05169 [IMP] hr_payroll: fields become readonly when state is close and changed tooltip for 'credit_note'
bzr revid: mtr@mtr-20110523060113-3flgpwe89tu7ezuo
2011-05-23 11:31:13 +05:30
mtr b6778a8c02 [IMP] hr_payroll: improved tooltip for 'credit_note' field
bzr revid: mtr@mtr-20110520133737-w7ioouj4l2jkkk6g
2011-05-20 19:07:37 +05:30