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
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
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
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
9890c9e044
date _from_hr
...
bzr revid: rmu@tinyerp.com-20111124052327-a7beohzmnuab1pzc
2011-11-24 10:53:27 +05:30
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
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
05d6d35cc8
[Merge]
...
bzr revid: fp@tinyerp.com-20110917110317-34apz3spz1h9azjl
2011-09-17 13:03:17 +02:00
ffd416e00e
[MERGE[ hr_payroll: usability enhancement
...
bzr revid: qdp-launchpad@openerp.com-20110915163050-n2ueot8ee2vb0ljq
2011-09-15 18:30:50 +02:00
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
ba785eca19
[IMP] hr_payroll: small changes(imporve view ids)
...
bzr revid: psi@tinyerp.com-20110915124055-is068g72tfk47nl1
2011-09-15 18:10:55 +05:30
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
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
4960c39193
[IMP] hr_payroll:label improvment
...
bzr revid: psi@tinyerp.com-20110915060953-zslf0b4pdcg03oya
2011-09-15 11:39:53 +05:30
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
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
3b8ebe0615
[IMP] hr_payroll: usability improvements
...
bzr revid: qdp-launchpad@openerp.com-20110914123108-k5xtjxau4zc50sv8
2011-09-14 14:31:08 +02:00
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
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
cc5639bbac
[IMP] usaiblity improvements
...
bzr revid: qdp-launchpad@openerp.com-20110711160549-n2rgb060zuo51g65
2011-07-11 18:05:49 +02:00
ecb85380ad
[IMP] hr_payrolll: usability improvements
...
bzr revid: qdp-launchpad@openerp.com-20110711121525-88cz0kag3s6qim68
2011-07-11 14:15:25 +02:00
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
f9464f5ee4
[MERGE] payroll:usabilty
...
bzr revid: qdp-launchpad@openerp.com-20110710013833-s07r2l6zlyxg8t6f
2011-07-10 03:38:33 +02:00
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
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
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
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
a4f2bb20d2
[MERGE] payroll reports improvements
...
bzr revid: qdp-launchpad@openerp.com-20110616103051-001utngd2i9iz42v
2011-06-16 12:30:51 +02:00
387b534a33
[MERGE] improvements in payslip run
...
bzr revid: qdp-launchpad@openerp.com-20110609100743-ogqkahrq0pg9vz03
2011-06-09 12:07:43 +02:00
e182ef2a10
[MERGE] usability imp
...
bzr revid: qdp-launchpad@openerp.com-20110609091555-1i677vp4qfewl2f6
2011-06-09 11:15:55 +02:00
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
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
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
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
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
ea2fc5b4d9
[MERGE] branch merged with trunk-payroll
...
bzr revid: mtr@mtr-20110527054718-ik8t3hdxpsfmj87e
2011-05-27 11:17:18 +05:30
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
2b8e537224
[MERGE] branch merged with trunk-payroll
...
bzr revid: mtr@mtr-20110526085043-psf4ph1ywl5b3sxd
2011-05-26 14:20:43 +05:30
d353d12965
[MERGE] branch merged with trunk-payroll
...
bzr revid: mtr@mtr-20110525061731-ayjulztx5mxq6flb
2011-05-25 11:47:31 +05:30
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
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
ad6b2593c2
[IMP] hr_payroll: renamed the field 'quantity' to 'amount'
...
bzr revid: mtr@mtr-20110524060202-z58x324zvkugddd1
2011-05-24 11:32:02 +05:30
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
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
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
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
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
badc8caef5
[IMP] small improvment in wizard
...
bzr revid: psi@tinyerp.co.in-20110512070253-iyahei1j6cc1m4r0
2011-05-12 12:32:53 +05:30
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
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
03fb4577c4
[MERGE] merge with main branch
...
bzr revid: psi@tinyerp.co.in-20110511101733-8a0tbbmuwvo5bix5
2011-05-11 15:47:33 +05:30
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
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
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
84739f218e
[IMP] hr_payroll: renamed salary head into salary category
...
bzr revid: mtr@mtr-20110510115411-lkf923pyakj1ykug
2011-05-10 17:24:11 +05:30
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
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
a13984cf7b
[IMP] remove sequence form salary head object
...
bzr revid: psi@tinyerp.co.in-20110504111348-kngj0i0tert4w9pt
2011-05-04 16:43:48 +05:30
c5d6059ab2
[FIX] rename the menu name
...
bzr revid: psi@tinyerp.co.in-20110504063316-26r7wu0ni4gtqhad
2011-05-04 12:03:16 +05:30
df2bac2686
[IMP] remanes view ids
...
bzr revid: psi@tinyerp.co.in-20110504055023-rngf7l4vwf25ilj7
2011-05-04 11:20:23 +05:30
fe16882b43
[IMP] small fixes
...
bzr revid: psi@tinyerp.co.in-20110503131750-24xxudj2qs84vy21
2011-05-03 18:47:50 +05:30
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
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
d8962fac28
[MERGE] merge with trunk-payroll branch
...
bzr revid: psi@tinyerp.co.in-20110502122136-wxilodkqcxk0wv05
2011-05-02 17:51:36 +05:30
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
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
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
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
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
98438b2376
[IMP] hr_payroll:added company_id in payslip line view
...
bzr revid: mtr@mtr-20110425131740-422eih4okmi6rjqh
2011-04-25 18:47:40 +05:30
ea9ab772d6
[IMP] Add wizard to generate payslip by employee categories
...
bzr revid: psi@tinyerp.co.in-20110425123044-hxb20cq7iynw5ou7
2011-04-25 18:00:44 +05:30
eac6fb073c
[IMP] hr_payroll:improved payslip line view,removed fields that are used to calculate the total
...
bzr revid: mtr@mtr-20110425103718-r80y25vatlik17z4
2011-04-25 16:07:18 +05:30
11da3fc37b
[FIX] hr_payroll: payslip line color is blue when total is 0
...
bzr revid: ara@tinyerp.com-20110425102544-ivqy6vu4fb14z68u
2011-04-25 15:55:44 +05:30
3c877bb4c7
[IMP] hr_payroll:removed qty from demo,improved search engine,made qty mandatory and added tooltip
...
bzr revid: mtr@mtr-20110425095537-ewmhlikkh5i50jyg
2011-04-25 15:25:37 +05:30
9f2709ccd0
[FIX] hr_payroll: payslip line color is blue when total is 0
...
bzr revid: ara@tinyerp.com-20110425094142-w0hjdx79bq84r920
2011-04-25 15:11:42 +05:30
51543fa458
[IMP] hr_payroll:added field 'quantity' on salary rules,modified computation engine and demo data
...
bzr revid: mtr@mtr-20110425072510-9f7tbuo9w3q3qq30
2011-04-25 12:55:10 +05:30
2dad28d4fd
[IMP] hr_payroll: misc improvements among
...
* remove typo in hr.contribution.register object name
* fix engine: a rule with same code must overwrite the previous value
* improved demo data: set same code for Conveyance Allowance for Paolino and parent rule
* improved tree/search views
bzr revid: qdp-launchpad@openerp.com-20110412170128-xlf1r1tfsm8ke7e5
2011-04-12 19:01:28 +02:00
9ed1b31b4f
[ADD] Payroll: Payslip line action on payslip + search view added for payslip lines
...
bzr revid: mra@mra-laptop-20110412095337-ohnd7nymekow41eb
2011-04-12 15:23:37 +05:30
3f69757064
[MERGE] merge from trunk payroll
...
bzr revid: mra@mra-laptop-20110411122559-8s7vnahm7jguta5d
2011-04-11 17:55:59 +05:30
c4a1c85e41
[REM] payroll: remove the if condition from payslip lines appears
...
bzr revid: mra@mra-laptop-20110411121241-eh69dw6hq2bu8smb
2011-04-11 17:42:41 +05:30
7080f2b5f3
[IMP] hr_payroll: refund payslip feature improved
...
bzr revid: qdp-launchpad@openerp.com-20110411121046-7r0dzzqiw6hv6hkl
2011-04-11 14:10:46 +02:00
8994649cf3
[MERGE] merge from trunk payroll
...
bzr revid: mra@mra-laptop-20110411114415-bp4bchwp51i0932i
2011-04-11 17:14:15 +05:30
81a66b9d39
[FIX] payroll: grouping of details by salayr head AND domain is not applied on first tab of payslip, we should see there only the payslip lines with appears_on_payslip = True
...
bzr revid: mra@mra-laptop-20110411113637-qfnxuylu1icn6889
2011-04-11 17:06:37 +05:30
a1fec3b62f
[MERGE] merged mra's dev branch containing stuff with refund
...
bzr revid: qdp-launchpad@openerp.com-20110411100846-4vwlngl6iqb2juvv
2011-04-11 12:08:46 +02:00
d4950bdbd8
[IMP] Payroll: put back the tab with rules grouped by head
...
bzr revid: mra@mra-laptop-20110411084007-g5p3gvdcl7z9uh2m
2011-04-11 14:10:07 +05:30
f41c989295
[IMP] hr_payroll: cosmetic imp
...
bzr revid: qdp-launchpad@openerp.com-20110408223845-8kj51e3uo6ko8gt0
2011-04-09 00:38:45 +02:00
73173225a7
[MERGE] merged the ara branch containing bugfix on reset to draft button
...
bzr revid: qdp-launchpad@openerp.com-20110408130313-ldaslut65hcb9l3s
2011-04-08 15:03:13 +02:00
24ea4323c6
[IMP] hr_payroll: view improvements
...
bzr revid: qdp-launchpad@openerp.com-20110408101059-mnfv1v4xabha6ob0
2011-04-08 12:10:59 +02:00
0b00184c32
[FIX] hr_payroll: set to draft button not working in cancel state
...
bzr revid: ara@tinyerp.com-20110408093829-b62t39d3heuk3mnh
2011-04-08 15:08:29 +05:30
9133186eda
[IMP] Payroll: define a new field.boolean on payslip: 'credit note'
...
on a 'done' payslip, add a button 'make a credite note' that will duplicate the current payslip with 'credit note' = True, confirm and done it.
bzr revid: mra@mra-laptop-20110408093010-qgkeiy7wud1exwgd
2011-04-08 15:00:10 +05:30
7ff22495b9
[FIX] Payroll: Remove contribution reg lines in xml and in .csv
...
bzr revid: mra@mra-laptop-20110407130634-syjdvcme17nwhdhe
2011-04-07 18:36:34 +05:30
7e320d618f
[FIX] payroll: Not open employee form
...
bzr revid: mra@mra-laptop-20110407110844-5bchm1c4mrkoomtt
2011-04-07 16:38:44 +05:30
230e12b5c4
[IMP] hr_payroll: major improvements (fill input, compute only on button pressed, code cleaning, improved computation engine...)
...
bzr revid: qdp-launchpad@openerp.com-20110406122845-au66vdlm7i39mh1c
2011-04-06 14:28:45 +02:00
6885252b1a
[IMP] hr_payroll: improvements on framework and code cleaning
...
bzr revid: qdp-launchpad@openerp.com-20110405164617-j0zbg9m7ue9eqftx
2011-04-05 18:46:17 +02:00
55739910e7
[IMP] hr_payroll:improved code,demo data and Details by salary head
...
bzr revid: mtr@mtr-20110405115528-p78zhmgfr87q6ifd
2011-04-05 17:25:28 +05:30
2aac36a718
[IMP] hr_payroll: major improvements (redesign computation machina and code cleaning, mostly)
...
bzr revid: qdp-launchpad@openerp.com-20110404212811-2abh9j4i6tg4ob5w
2011-04-04 23:28:11 +02:00
9202d61260
[IMP] hr_payroll: several major improvements among
...
* removed hr.payroll.register object
* removed hr.salary.head.type object, now replaced by a m2o(hr.salary.head) named parent_id on the salary head
* removed unused fields state and user_id on hr.salary.head
* defined new object hr.salary.input (and commented the references to hr.holidays)
* added condition 'Always True' on the hr.salary.rule
* improved view of hr.salary.rule
bzr revid: qdp-launchpad@openerp.com-20110404113219-nc949ndu1hvtiobl
2011-04-04 13:32:19 +02:00
19dd109f75
[IMP] hr_payroll:improved code to display salary rules as per the sequence of salary head
...
bzr revid: mtr@mtr-20110404104831-zb30sau1ikzuufjl
2011-04-04 16:18:31 +05:30
0c0ea31d9c
[IMP] add help on state field of hr.payslip and view improvement
...
bzr revid: psi@tinyerp.co.in-20110404062930-bf2onlnsmjb5mm43
2011-04-04 11:59:30 +05:30
f380549275
[IMP] payroll: code clean, add date argument on onchnage-employee from holidays to get it latest contract
...
bzr revid: mra@mra-laptop-20110401125959-hsuwv6ms31v4it75
2011-04-01 18:29:59 +05:30
Serpent Consulting Services
Quentin (OpenERP)
Raphael Collet
Vo Minh Thu
Ravish Murari (OpenERP)
Antony Lesuisse
Fabien Pinckaers
Purnendu Singh (OpenERP)
Mustufa Rangwala (OpenERP)
Xavier Morel
psi (Open ERP)
mtr
Mustufa Rangwala
ARA (OpenERP)