Commit Graph

344 Commits

Author SHA1 Message Date
Jigar Amin - OpenERP 501721883d [USB] removed useless class defination
bzr revid: jam@tinyerp.com-20120621070959-qrkmzuk1xg304kwa
2012-06-21 12:39:59 +05:30
Sanjay Gohel (Open ERP) 3f068c097b [IMP]Payslip Info and Advantage should be in 2 columns
bzr revid: sgo@tinyerp.com-20120621065608-5mw14bj3iwec2z0o
2012-06-21 12:26:08 +05:30
Sanjay Gohel (Open ERP) 7ad658375f [IMP]clean form view and improve hr employee form view
bzr revid: sgo@tinyerp.com-20120621061333-zfjlr55m0oo83f24
2012-06-21 11:43:33 +05:30
Jigar Amin - OpenERP d145817fb8 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120621043747-n4sjqa91q2xc3wl9
2012-06-21 10:07:47 +05:30
Randhir Mayatra (OpenERP) e80980330b [USA] replaced red button class oe_form_button_active_flow to oe_highlight
bzr revid: rma@tinyerp.com-20120620101205-uf0ibqbq4uzu17iq
2012-06-20 15:42:05 +05:30
Purnendu Singh (OpenERP) 4ccafc4c3a [IMP] misc
bzr revid: psi@tinyerp.com-20120620084428-ltgfaqakh3d7h7sg
2012-06-20 14:14:28 +05:30
Stephane Wirtel f2fba32b56 [REF] Change the CSS classes
bzr revid: stw@openerp.com-20120619085618-agdxk4fdgy3of6gp
2012-06-19 10:56:18 +02:00
Jigar Amin - OpenERP 7fc1b0b25e [MERGE] lp:openpbject-addons
bzr revid: jam@tinyerp.com-20120619061856-eok4a7xmyodeapku
2012-06-19 11:48:56 +05:30
Purnendu Singh (OpenERP) 4395463c57 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120618070239-h6zjmw4hvn3oq543
2012-06-18 12:32:39 +05:30
Purnendu Singh (OpenERP) 2663cbca6e [MERGE] hr_*: make some improvements and Merge cha branch
bzr revid: psi@tinyerp.com-20120615125750-7yanak6d4282nk4u
2012-06-15 18:27:50 +05:30
Turkesh Patel (Open ERP) fb9dd03f05 [IMP] hr_payroll: improved color of button based on business flow
bzr revid: tpa@tinyerp.com-20120614062441-040366zt7ymws9le
2012-06-14 11:54:41 +05:30
Ajay Chauhan (OpenERP) 6db119b7d8 [IMP]hr_* : improve search code in xml
bzr revid: cha@tinyerp.com-20120613124157-z5zpn42aao3w3cf2
2012-06-13 18:11:57 +05:30
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
psi (Open ERP) 939fed8f4f [IMP] hr_payroll: Increase the width of columns and rename lable
bzr revid: psi@tinyerp.co.in-20110603073917-v9cf1nl1voa9fxvb
2011-06-03 13:09:17 +05:30
psi (Open ERP) a9327bd59e [IMP] hr_payroll: Update the label of quantity field
bzr revid: psi@tinyerp.co.in-20110603050002-g5932m0150i9pccp
2011-06-03 10:30:02 +05:30
psi (Open ERP) abfeeabd5f [IMP] hr_payslip: improve layout and add field amount and qunatity in contribution register section on payslip details report
bzr revid: psi@tinyerp.co.in-20110531134237-ka2v0mkxa1ume0fk
2011-05-31 19:12:37 +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
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 2b8e537224 [MERGE] branch merged with trunk-payroll
bzr revid: mtr@mtr-20110526085043-psf4ph1ywl5b3sxd
2011-05-26 14:20:43 +05:30
mtr d353d12965 [MERGE] branch merged with trunk-payroll
bzr revid: mtr@mtr-20110525061731-ayjulztx5mxq6flb
2011-05-25 11:47:31 +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 ad6b2593c2 [IMP] hr_payroll: renamed the field 'quantity' to 'amount'
bzr revid: mtr@mtr-20110524060202-z58x324zvkugddd1
2011-05-24 11:32:02 +05:30
psi (Open ERP) f69a2a7b7d [IMP] hr_payroll: Imporve search view of hr.payslip
bzr revid: psi@tinyerp.co.in-20110520133452-1auudht73qdm0idv
2011-05-20 19:04:52 +05:30
mtr 79b139d095 [IMP] hr_payroll: improved tooltip,code and view for payslip run
bzr revid: mtr@mtr-20110520130536-j56u80qdnvjc6iii
2011-05-20 18:35:36 +05:30
mtr c22f7fece7 [IMP] hr_payroll: added fields and assigned value to start_date and end_date on payslip run
bzr revid: mtr@mtr-20110518050148-hhomxkvrsjot786n
2011-05-18 10:31:48 +05:30
psi (Open ERP) 7c36ebc0d8 [IMP] hr_payroll: Added search based on payslip.run object on payslip
bzr revid: psi@tinyerp.co.in-20110517105818-ae5u33d3luh1z42x
2011-05-17 16:28:18 +05:30
mtr 0df1f06801 [IMP] hr_payroll: improved payslip states(draft, verify, done) and workflow
bzr revid: mtr@mtr-20110517105155-d4dp2tt7d7ut4jxd
2011-05-17 16:21:55 +05:30
psi (Open ERP) badc8caef5 [IMP] small improvment in wizard
bzr revid: psi@tinyerp.co.in-20110512070253-iyahei1j6cc1m4r0
2011-05-12 12:32:53 +05:30
psi (Open ERP) ba27653083 [MERGE,IMP] merge with main payroll branch and improve the code in wizard according to that
bzr revid: psi@tinyerp.co.in-20110511093426-0ao8e98y846hfmiv
bzr revid: psi@tinyerp.co.in-20110512045902-e310b5m3k7wf3m7b
2011-05-12 10:29:02 +05:30
Quentin (OpenERP) 5aab6e88a8 [MERGE] merged mtr's branch with new name for salary.head
bzr revid: qdp-launchpad@openerp.com-20110511132148-g2pyjq9oy6e88w6t
2011-05-11 15:21:48 +02:00
psi (Open ERP) 03fb4577c4 [MERGE] merge with main branch
bzr revid: psi@tinyerp.co.in-20110511101733-8a0tbbmuwvo5bix5
2011-05-11 15:47:33 +05:30
psi (Open ERP) d705511664 [IMP] Improve code and add state on hr.payslip.run object
bzr revid: psi@tinyerp.co.in-20110511091009-iyu5bloo5ewg5re9
2011-05-11 14:40:09 +05:30
mtr 7ae069998e [IMP] hr_payroll: renamed hr.salary.category into hr.salary.rule.category
bzr revid: mtr@mtr-20110511071854-ctdf3czpedhe5t6l
2011-05-11 12:48:54 +05:30
Quentin (OpenERP) b55e82f0d9 [MERGE] merged mtr's branch with salary.head => salary.category
bzr revid: qdp-launchpad@openerp.com-20110510142723-6kr9k4ivqwrusxss
2011-05-10 16:27:23 +02:00
mtr 84739f218e [IMP] hr_payroll: renamed salary head into salary category
bzr revid: mtr@mtr-20110510115411-lkf923pyakj1ykug
2011-05-10 17:24:11 +05:30
psi (Open ERP) c600603f3a [ADD] improve code and add demo rule for sales
bzr revid: psi@tinyerp.co.in-20110510111931-4v21peqft66hblpp
2011-05-10 16:49:31 +05:30
psi (Open ERP) 8666be5ebd [IMP] rename object to worked_days and add one object hr.salary.input
bzr revid: psi@tinyerp.co.in-20110509085002-l0ygkq5al9yedmz6
2011-05-09 14:20:02 +05:30
psi (Open ERP) a13984cf7b [IMP] remove sequence form salary head object
bzr revid: psi@tinyerp.co.in-20110504111348-kngj0i0tert4w9pt
2011-05-04 16:43:48 +05:30
psi (Open ERP) c5d6059ab2 [FIX] rename the menu name
bzr revid: psi@tinyerp.co.in-20110504063316-26r7wu0ni4gtqhad
2011-05-04 12:03:16 +05:30
psi (Open ERP) df2bac2686 [IMP] remanes view ids
bzr revid: psi@tinyerp.co.in-20110504055023-rngf7l4vwf25ilj7
2011-05-04 11:20:23 +05:30
psi (Open ERP) fe16882b43 [IMP] small fixes
bzr revid: psi@tinyerp.co.in-20110503131750-24xxudj2qs84vy21
2011-05-03 18:47:50 +05:30
psi (Open ERP) 46cf364574 [IMP] rename the class and changed the view accourdingly
bzr revid: psi@tinyerp.co.in-20110503123807-ptgnp6gejy045fai
2011-05-03 18:08:07 +05:30
Mustufa Rangwala efdb84c905 [IMP] Payroll: form and tree view of Salary heads
bzr revid: mra@mra-laptop-20110503091202-pmitrzjymkrr3otf
2011-05-03 14:42:02 +05:30
psi (Open ERP) d8962fac28 [MERGE] merge with trunk-payroll branch
bzr revid: psi@tinyerp.co.in-20110502122136-wxilodkqcxk0wv05
2011-05-02 17:51:36 +05:30
psi (Open ERP) 978b756760 [IMP] wizard will work for employees instead of employee categories
bzr revid: psi@tinyerp.co.in-20110502121822-2xw9r1yilxoovr2o
2011-05-02 17:48:22 +05:30
Quentin (OpenERP) 4023e0d5e9 [MERGE] merged mtr's branch: added field 'quantity' on salary rule object and changed the computation engine accordingly
bzr revid: qdp-launchpad@openerp.com-20110428124014-31j04y8kx3cm31k6
2011-04-28 14:40:14 +02:00
Quentin (OpenERP) d997f0a92c [MERGE] merged mtr's branch: improved payslip line view
bzr revid: qdp-launchpad@openerp.com-20110428123402-2aj4ylhc13msk6fq
2011-04-28 14:34:02 +02:00
Quentin (OpenERP) 6535ed21f6 [MERGE] merged mtr's branch: payslip line color is blue when total is 0
bzr revid: qdp-launchpad@openerp.com-20110428122605-5l7e4xe75imw6u4b
2011-04-28 14:26:05 +02:00
psi (Open ERP) e425496f88 [IMP] improve the newly created wizard as per requirment suggested
bzr revid: psi@tinyerp.co.in-20110426102656-s2lfltvnkkvzz6ve
2011-04-26 15:56:56 +05:30