odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
89,305 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

421 Commits

Author SHA1 Message Date
Quentin (OpenERP) b72b197cf0 [FIX] hr_payroll: default value of 'quantity' field in payslip line must be a float (hence its parent object is a varchar and thus its default value was not compatible and breaking in web client) 
bzr revid: qdp-launchpad@openerp.com-20111115140723-t4b9xcmi0av3wf5s
 2011-11-15 15:07:23 +01:00
Fabien Pinckaers db8da808ff fix 
bzr revid: fp@tinyerp.com-20111114224213-asq9x16vsnhv33ap
 2011-11-14 23:42:13 +01:00
Fabien Pinckaers b959378ec5 merge: allows to delete a payslip 
bzr revid: fp@tinyerp.com-20111111145207-nuewll488gpnqhld
 2011-11-11 15:52:07 +01:00
Divyesh Makwana (Open ERP) f2d356f857 [FIX] hr_payroll : Impossible to remove elements from the Employee payslip list view 
lp bug: https://launchpad.net/bugs/885673 fixed

bzr revid: mdi@tinyerp.com-20111109053906-pfedy5myoj54vcx5
 2011-11-09 11:09:06 +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
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
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 d3e3941eea [IMP] hr_payroll: improved tooltip for 'state' field 
bzr revid: mtr@mtr-20110520120009-7pq67hy8a9wfwa83
 2011-05-20 17:30:09 +05:30
mtr 6cbbeb16a8 [IMP] hr_payroll: improved tooltip for 'state' field and renamed method name. 
bzr revid: mtr@mtr-20110520115514-t5kw865rhuv53q5x
 2011-05-20 17:25:14 +05:30
mtr 32c8d6cb70 [IMP] hr_payroll: The python code expression can now be defined using 'browse',accordingly changed data file 
bzr revid: mtr@mtr-20110519053118-yzcmr39m3hqdb4u5
 2011-05-19 11:01:18 +05:30
psi (Open ERP) f3387aa616 [ADD] hr_payroll: Add report on pyaslip.register object to get details of the payslip lines based on payslip register 
bzr revid: psi@tinyerp.co.in-20110518100941-ur7d0bqukd7tr3g0
 2011-05-18 15:39:41 +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
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
mtr 8d903b60aa [IMP] hr_payroll: improved query for sum method of Payslips class 
bzr revid: mtr@mtr-20110513112315-qcaemrufa22gdnag
 2011-05-13 16:53:15 +05:30
Mustufa Rangwala f46219d266 [REF] Payroll: remove unused import 
bzr revid: mra@mra-laptop-20110513063931-g83470vtp5z9o5lv
 2011-05-13 12:09:31 +05:30
Mustufa Rangwala 83345d5af5 [IMP] Payroll: clean codee 
bzr revid: mra@mra-laptop-20110513063639-kx4lbs2gq3bef6py
 2011-05-13 12:06:39 +05:30
Mustufa Rangwala 62c0ddad78 [IMP] Payroll: demo and default string improvements 
bzr revid: mra@mra-laptop-20110513062405-pf57a2ntrsze36mp
 2011-05-13 11:54:05 +05:30
Mustufa Rangwala 340a1a11d6 [IMP] Payroll: remove unused mehtod def sum from payslip now...it will work now with payslips class .. 
bzr revid: mra@mra-laptop-20110513060327-viq49sr0cx0nj1zp
 2011-05-13 11:33:27 +05:30
Mustufa Rangwala e85341722f [IMP] Payroll: remove print 
bzr revid: mra@mra-laptop-20110513060206-59oo6dc2arw8bps0
 2011-05-13 11:32:06 +05:30
Mustufa Rangwala 5439b7eb58 [IMP] Payroll: Payslips with python code 
bzr revid: mra@mra-laptop-20110513060012-q0qcwg6wbe9vk613
 2011-05-13 11:30:12 +05:30
Mustufa Rangwala efdacca163 [MERGE] Payroll: merge from main trunk-payroll branch 
bzr revid: mra@mra-laptop-20110513050945-zj8tudmzqdkqayli
 2011-05-13 10:39:45 +05:30
Quentin (OpenERP) f595581803 [IMP] hr_payroll: implemented the feature worked_days.WORK100.number_of_hours + improved worked_days.sum() method 
bzr revid: qdp-launchpad@openerp.com-20110512161628-wc8zvq62nqldc5jt
 2011-05-12 18:16:28 +02:00
mtr 8ff806bea3 [IMP] hr_payroll: improved sum method of worked days 
bzr revid: mtr@mtr-20110512135825-r6ighyds5xusu4cd
 2011-05-12 19:28:25 +05:30
Mustufa Rangwala 8dea4d2698 [MERGE] merge from trunk-payroll main branch 
bzr revid: mra@mra-laptop-20110512130410-5ybp0b0drz6iqg7f
 2011-05-12 18:34:10 +05:30
mtr 54586b7d55 [IMP] hr_payroll: updated localdict to copmute payslip on payslip 
bzr revid: mtr@mtr-20110512123619-bss3lcy1dlrbi9r7
 2011-05-12 18:06:19 +05:30
mtr 30dee04d10 [IMP] hr_payroll: improved method of hr.payslip,to call it without passing(cr,uid) 
bzr revid: mtr@mtr-20110512120752-sdqi99qim652kwk0
 2011-05-12 17:37:52 +05:30
Quentin (OpenERP) 631d8a9e53 [MERGE] merged the branch containing the modifications on hr_payroll_account (author mtr and qpd) 
bzr revid: qdp-launchpad@openerp.com-20110512115719-m5ppmv0sk02wutgr
 2011-05-12 13:57:19 +02:00
Quentin (OpenERP) 4418c83a5f [REF] hr_payroll: added TODO comment 
bzr revid: qdp-launchpad@openerp.com-20110512115458-kg1s089del0032lx
 2011-05-12 13:54:58 +02:00
Quentin (OpenERP) b6f4aef872 [FIX] hr_payroll: fix errors in get_contract + removed old commented code 
bzr revid: qdp-launchpad@openerp.com-20110512090009-2wt0cqfm6kh9brtw
 2011-05-12 11:00:09 +02:00
Quentin (OpenERP) 746a2f073d [MERGE] merged the branch of psi with payslip run feature (+add required=True on name field of payslip.run) 
bzr revid: qdp-launchpad@openerp.com-20110512074918-7h5qqgj4an2smayy
 2011-05-12 09:49:18 +02:00
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) 3df45b0659 [FIX] small fix in onchange_employee(when onchage is called with no employee, worked days lines will also update) 
bzr revid: psi@tinyerp.co.in-20110512050703-lvf1d3ra76i4walx
 2011-05-12 10:37:03 +05:30
Mustufa Rangwala ed0311cb56 [MERGE] Merge from trunk-payroll main project branch 
bzr revid: mra@mra-laptop-20110512050150-m4qysq80qgo48fp1
 2011-05-12 10:31:50 +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
psi (Open ERP) dad5da0b60 [FIX] small fix 
bzr revid: psi@tinyerp.co.in-20110511133522-8e51br6tsnzs4dao
 2011-05-11 19:05:22 +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 042adc54a4 [MERGE] branch merged with trunk-payroll 
bzr revid: mtr@mtr-20110511073453-oqxvhdp20mfkc4ax
 2011-05-11 13:04:53 +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
mtr c866c963e3 [IMP] hr_payroll: removed context,as we don't use the context later in the function 
bzr revid: mtr@mtr-20110511062312-r3lzjbdp10nqa28a
 2011-05-11 11:53:12 +05:30
mtr 4058da5295 [IMP] hr_payroll: improved code to take into account credit_note while calculating the sum 
bzr revid: mtr@mtr-20110511061349-dj6jlpmnhjn13iij
 2011-05-11 11:43:49 +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
Quentin (OpenERP) 962da7711c [MERGE] merge psi branch with removal of sequence on salary heads 
bzr revid: qdp-launchpad@openerp.com-20110510134237-ac3lu8aeec50hlsf
 2011-05-10 15:42:37 +02:00
Quentin (OpenERP) 1819c3d5ad [MERGE] merged psi branch with tooltip improvement 
bzr revid: qdp-launchpad@openerp.com-20110510133410-c9lapqzd49291o76
 2011-05-10 15:34:10 +02:00
Mustufa Rangwala 7e28aed3a0 [FIX] Payroll: Payslip lines readonly with all states of payslips 
bzr revid: mra@mra-laptop-20110510131110-gd32dkedh7m3gv2i
 2011-05-10 18:41:10 +05:30
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
Mustufa Rangwala 7f97f2e2b3 [IMP] Payroll: Clean the code 
bzr revid: mra@mra-laptop-20110506063903-4hno1tb6enrd0bk4
 2011-05-06 12:09:03 +05:30
mtr 3bca5dc9c8 [IMP] hr_payroll: minor improvement in methods for parameter employee 
bzr revid: mtr@mtr-20110505124959-062hns4ca03vltbu
 2011-05-05 18:19:59 +05:30