Commit Graph

283 Commits

Author SHA1 Message Date
Stephane Wirtel f2fba32b56 [REF] Change the CSS classes
bzr revid: stw@openerp.com-20120619085618-agdxk4fdgy3of6gp
2012-06-19 10:56:18 +02:00
Sbh (Openerp) 234084df87 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120612105345-d10lp54bywb7y7oz
2012-06-12 16:23:45 +05:30
Olivier Dony d496a2cb23 [FIX] *: Correct @version spec in new-style forms, after FP's recent merge
bzr revid: odo@openerp.com-20120611161014-19p6rd5qpkmmijmg
2012-06-11 18:10:14 +02:00
Sanjay Gohel (Open ERP) 0b0425557c [IMP]solved xml architecure error in hr_payroll
bzr revid: sgo@tinyerp.com-20120608094050-04mdh6zrqfppt4mf
2012-06-08 15:10:50 +05:30
Fabien Pinckaers 001d2e84c9 [IMP] form views
bzr revid: fp@tinyerp.com-20120607173007-1kihroun2dbacq1c
2012-06-07 19:30:07 +02:00
ara@tinyerp.com b71c7c244d [MERGE] merge with parent brnach
bzr revid: ara@tinyerp.com-20120605072734-eqg19sd93rj5yftg
2012-06-05 12:57:34 +05:30
Fabien Pinckaers 48f8823bad [IMP] replaced all oe_form_topbar with the new <header> style
bzr revid: fp@tinyerp.com-20120604121139-zqoqbou9v2fdue5h
2012-06-04 14:11:39 +02:00
Fabien Pinckaers 623fd428bd [IMP] xml of topbars, removed oe_right, oe_clear
bzr revid: fp@tinyerp.com-20120604105056-xvos3jwt3i9wsqrb
2012-06-04 12:50:56 +02:00
Kuldeep Joshi (OpenERP) 7496ae5bf0 [IMP] set no one group
bzr revid: kjo@tinyerp.com-20120530101238-atvcsna2vc5jwad9
2012-05-30 15:42:38 +05:30
Fabien Pinckaers b3fa4ccf5c [IMP] removed icons from topbar
bzr revid: fp@tinyerp.com-20120522091445-mpiknieg2v8sd31f
2012-05-22 11:14:45 +02:00
Fabien Pinckaers ee566d388c [IMP] merged topbar status widgets
bzr revid: fp@tinyerp.com-20120522085037-oktkq3td2hg9lvzr
2012-05-22 10:50:37 +02:00
Amit Patel (OpenERP) 1aefff9733 [MERGE]:merged from trunk
bzr revid: apa@tinyerp.com-20120517101517-npk57s14kgxlk7in
2012-05-17 15:45:17 +05:30
Mayur Maheshwari (OpenERP) acfd8ab255 [IMP]hr_payroll : Added state and buttons on top bar
bzr revid: mma@tinyerp.com-20120503132018-dohip75it2rwgqmm
2012-05-03 18:50:18 +05:30
Mayur Maheshwari (OpenERP) c71446957f [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20120426091833-ocminkwzjkntdkde
2012-04-26 14:48:33 +05:30
Raphael Collet e4efcb808d [IMP] hr*: remove group_extended
bzr revid: rco@openerp.com-20120425141135-9jgai7os8mxj80go
2012-04-25 16:11:35 +02:00
Mayur Maheshwari (OpenERP) 9e59ce8812 [IMP]all: Improve all typos
bzr revid: mma@tinyerp.com-20120424060532-ohrf0sxwq8rpq6ls
2012-04-24 11:35:32 +05:30
Meera Trambadia (OpenERP) 0e8ccd774d [MERGE] branch merged with openobject-addons
bzr revid: mtr@tinyerp.com-20120326114847-6yju1vy8h7a33iwv
2012-03-26 17:18:47 +05:30
Jagdish Panchal (Open ERP) 8dc623fb21 [IMP] HR: change sequence of menus and apply group_no_one
bzr revid: jap@tinyerp.com-20120322123823-gpn075d2e09etchq
2012-03-22 18:08:23 +05:30
Jagdish Panchal (Open ERP) 9ab663db09 [IMP] HR: apply group_no_one on menus Categories structure,Job Positions, Contract Types,Attendance Reasons,Stages, Degrees, Sources of Applicants,Salary Structures Hierarchy, Salary Rule Categories, Salary Rule Categories Hierarchy, Salary Rules
bzr revid: jap@tinyerp.com-20120316104313-f3f7234wi8yg98zb
2012-03-16 16:13:13 +05:30
Meera Trambadia (OpenERP) 0e20074121 [IMP] hr_*:-changed sequence for menus
bzr revid: mtr@tinyerp.com-20120305124245-xh77bpp62l4wfalm
2012-03-05 18:12:45 +05:30
Serpent Consulting Services 7aa3bc9660 [FIX] hr_payroll :- add parent_id domain in action of tree view in hr.salary.rule.category object
lp bug: https://launchpad.net/bugs/912194 fixed

bzr revid: support@serpentcs.com-20120109091415-gvaice2ltdfhljg4
2012-01-09 14:44:15 +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
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
Vo Minh Thu 2e1023ddbe [IMP] domain to context:
Use explicitely default_xxx in the context instead of
relying on the domain to fill form views.

bzr revid: vmt@openerp.com-20111124121433-z5du2yeu319ea1ax
2011-11-24 13:14:33 +01:00
Ravish Murari (OpenERP) 9890c9e044 date _from_hr
bzr revid: rmu@tinyerp.com-20111124052327-a7beohzmnuab1pzc
2011-11-24 10:53:27 +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
Quentin (OpenERP) d618938b1d [MERGE] merged the branch with adding of an act window on a hr.salary.rule to see all its children in tree view (that part was not clean and improved in the merge commit)
bzr revid: qdp-launchpad@openerp.com-20111010131907-7iarc1ubi57ma7o1
2011-10-10 15:19:07 +02:00
Fabien Pinckaers 05d6d35cc8 [Merge]
bzr revid: fp@tinyerp.com-20110917110317-34apz3spz1h9azjl
2011-09-17 13:03:17 +02:00
Quentin (OpenERP) ffd416e00e [MERGE[ hr_payroll: usability enhancement
bzr revid: qdp-launchpad@openerp.com-20110915163050-n2ueot8ee2vb0ljq
2011-09-15 18:30:50 +02:00
Quentin (OpenERP) d7dc402fee [MERGE[ hr_payroll_account: journal_id on payslip run
bzr revid: qdp-launchpad@openerp.com-20110915162603-psjo4r9m6869v2ny
2011-09-15 18:26:03 +02:00
Purnendu Singh (OpenERP) ba785eca19 [IMP] hr_payroll: small changes(imporve view ids)
bzr revid: psi@tinyerp.com-20110915124055-is068g72tfk47nl1
2011-09-15 18:10:55 +05:30
Purnendu Singh (OpenERP) 5274942d61 [IMP] hr_payroll: Add button to get salary rule hierarchy
bzr revid: psi@tinyerp.com-20110915112255-nls8msun2o4nfdb4
2011-09-15 16:52:55 +05:30
Purnendu Singh (OpenERP) 6caf40c88b [IMP] hr_payroll: add act window button on contribution register which will give all payslip lines of that register
bzr revid: psi@tinyerp.com-20110915063446-qsfr61kqosv2l5rx
2011-09-15 12:04:46 +05:30
Purnendu Singh (OpenERP) 4960c39193 [IMP] hr_payroll:label improvment
bzr revid: psi@tinyerp.com-20110915060953-zslf0b4pdcg03oya
2011-09-15 11:39:53 +05:30
Purnendu Singh (OpenERP) f763635a53 [FIX] hr_payroll: shifed the worked days and input tab to first position and rename Payslip Lines act window to Payslip Computation Detail
bzr revid: psi@tinyerp.com-20110915052737-541rkobli69etr2g
2011-09-15 10:57:37 +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) 3b8ebe0615 [IMP] hr_payroll: usability improvements
bzr revid: qdp-launchpad@openerp.com-20110914123108-k5xtjxau4zc50sv8
2011-09-14 14:31:08 +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
Xavier Morel 178fec5c64 [FIX] str 'in' str (singletons missing tuple-building comma), in @colors attributes. Replace by string equality
bzr revid: xmo@openerp.com-20110911135025-v9yct8pnjfj21tyj
2011-09-11 15:50:25 +02:00
Quentin (OpenERP) cc5639bbac [IMP] usaiblity improvements
bzr revid: qdp-launchpad@openerp.com-20110711160549-n2rgb060zuo51g65
2011-07-11 18:05:49 +02:00
Quentin (OpenERP) ecb85380ad [IMP] hr_payrolll: usability improvements
bzr revid: qdp-launchpad@openerp.com-20110711121525-88cz0kag3s6qim68
2011-07-11 14:15:25 +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
Quentin (OpenERP) f9464f5ee4 [MERGE] payroll:usabilty
bzr revid: qdp-launchpad@openerp.com-20110710013833-s07r2l6zlyxg8t6f
2011-07-10 03:38:33 +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) fff45e7a17 [IMP] hr_payroll: added a button relate on the payslip to get all the payslip lines applied grouped by contribution register
bzr revid: psi@tinyerp.co.in-20110629122727-1hfynocjx7kxjefd
2011-06-29 17:57:27 +05:30
psi (Open ERP) 606ebf8781 [IMP] hr_payroll: Added button for contribution register in group by search for payslip search view
bzr revid: psi@tinyerp.co.in-20110629111122-13e8l8fwyorjmjqc
2011-06-29 16:41:22 +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) a4f2bb20d2 [MERGE] payroll reports improvements
bzr revid: qdp-launchpad@openerp.com-20110616103051-001utngd2i9iz42v
2011-06-16 12:30:51 +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