Commit Graph

28698 Commits

Author SHA1 Message Date
mtr 284d747eb0 [REM] hr_payroll: removed sequence and images of unrequired objects
bzr revid: mtr@mtr-20110609131617-jm1wio04cwmhse1u
2011-06-09 18:46:17 +05:30
mtr c2b9195d04 [REM] hr_payroll: removed unused yaml
bzr revid: mtr@mtr-20110609125516-fampkxgnwlsxtxmy
2011-06-09 18:25:16 +05:30
mtr f63c039f42 [REM] hr_payroll: removed unused reports
bzr revid: mtr@mtr-20110609123723-zhcgfq69ytimxw7h
2011-06-09 18:07:23 +05:30
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
Quentin (OpenERP) e182ef2a10 [MERGE] usability imp
bzr revid: qdp-launchpad@openerp.com-20110609091555-1i677vp4qfewl2f6
2011-06-09 11:15:55 +02:00
Quentin (OpenERP) bcdba37a15 [MERGE] usability imp
bzr revid: qdp-launchpad@openerp.com-20110609091519-imlpmizacavcwbza
2011-06-09 11:15:19 +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) 3d28dc8043 [IMP] hr_payroll: Remove readonly from credit note field of hr payslip
bzr revid: psi@tinyerp.co.in-20110530055945-i22u93tr9pfyste7
2011-05-30 11:29:45 +05:30
psi (Open ERP) 4c05d621ea [IMP] hr_payroll: rename the worked Days tab to worked days and inputs
bzr revid: psi@tinyerp.co.in-20110530053541-hrdg3c21xm59j0bd
2011-05-30 11:05:41 +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
Quentin (OpenERP) 6872104462 [MERGE] payroll: merged branch for briwsing rules
bzr revid: qdp-launchpad@openerp.com-20110527080441-khw4ggihutiawvfx
2011-05-27 10:04:41 +02:00
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
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 9325bbf70e [IMP] hr_payroll: improved string of label
bzr revid: mtr@mtr-20110526101304-ls5emcuj5f1ttr9y
2011-05-26 15:43:04 +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 937dfdddb7 [IMP] hr_payroll: improved string of label on Payslip run wizard
bzr revid: mtr@mtr-20110526085314-tetaycxkkq6ge8gi
2011-05-26 14:23:14 +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 92d7a663d6 [IMP] hr_payroll: removed 3 fields from wizard and generated payslip from dates of hr.payslip.run object
bzr revid: mtr@mtr-20110526083901-ju9sl16lp41o3b15
2011-05-26 14:09:01 +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
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
mtr 8462b39b9e [IMP] hr_payroll: improved separator string for Generate Payslip wizard
bzr revid: mtr@mtr-20110525060059-1l5ml5xegex6so4i
2011-05-25 11:30:59 +05:30
mtr 14b089bd33 [IMP] hr_payroll: improved indentation
bzr revid: mtr@mtr-20110525054743-kud7fi4o8uepjqjs
2011-05-25 11:17:43 +05:30
mtr d246077537 [IMP] hr_payroll: changed view,made fields required=True and optimised code for Generate Payslip wizard
bzr revid: mtr@mtr-20110525054446-bkp0wrgemigzytiu
2011-05-25 11:14:46 +05:30
mtr f9c4f6d754 [IMP] hr_payroll: optimised code for Generate Payslip wizard
bzr revid: mtr@mtr-20110524133246-pdgbei67rnpmdjsc
2011-05-24 19:02:46 +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 76f38cd088 [IMP] hr_payroll: added help string for fields on wizard
bzr revid: mtr@mtr-20110524121314-yb5eurgkad08wsp4
2011-05-24 17:43:14 +05:30
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
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
Quentin (OpenERP) 86bf1a8448 [MERGE] merged branch with improvements in payslip and payslip run
bzr revid: qdp-launchpad@openerp.com-20110524092138-rf6ldei8mpmpya2v
2011-05-24 11:21:38 +02:00
Quentin (OpenERP) cbc5c114be [MERGE] merged the branch with split of the 2 reports on payslip
bzr revid: qdp-launchpad@openerp.com-20110524091417-neoz2vbj0ubjdx13
2011-05-24 11:14:17 +02:00
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
mtr 9f1a74ca3e [MERGE] branch merged with trunk-payroll
bzr revid: mtr@mtr-20110524051948-sr86je1hlk5bkyvr
2011-05-24 10:49:48 +05:30
Quentin (OpenERP) 24822683dc [MERGE]
bzr revid: qdp-launchpad@openerp.com-20110523142020-tlr7jjc1n3zhgf65
2011-05-23 16:20:20 +02:00
Quentin (OpenERP) da8281001a [IMP] hr_payroll: better demo data
bzr revid: qdp-launchpad@openerp.com-20110523141423-5x5e6curv55gpdej
2011-05-23 16:14:23 +02:00
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
psi (Open ERP) 59d55a993d [IMP] hr_payroll: used removeParaNode if there isn't any description on payslip
bzr revid: psi@tinyerp.co.in-20110523091029-a1doow4k02y67ax7
2011-05-23 14:40:29 +05:30