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

433 Commits

Author SHA1 Message Date
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
mtr 12aeaca553 [IMP] hr_payroll: minor changes 
bzr revid: mtr@mtr-20110505123515-in7313mb4ryqeb0f
 2011-05-05 18:05:15 +05:30
mtr 0f0a6246d7 [IMP] hr_payroll: improved two methods and moved worked_days_sum method to 'hr.payslip.input' object 
bzr revid: mtr@mtr-20110505123027-jluag8sqpp12gtwk
 2011-05-05 18:00:27 +05:30
mtr e04c62a5f9 [IMP] hr_payroll: if employee is not provided in an argument it returns 0 
bzr revid: mtr@mtr-20110505072004-1254kzo59rv9z97e
 2011-05-05 12:50:04 +05:30
mtr 89a6e52202 [IMP] hr_payroll: added worked_days_sum method to compute 'payslip' on 'other payslip' 
bzr revid: mtr@mtr-20110505054745-hkbzoothm3bqa46u
 2011-05-05 11:17:45 +05:30
mtr f97c21c40c [IMP] hr_payroll: added payslip_sum method to compute 'payslip' on other payslip' 
bzr revid: mtr@mtr-20110504125627-5zyck6tp8438gyd5
 2011-05-04 18:26:27 +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) 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
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
psi (Open ERP) c44fef6526 [IMP] improve the tooltip on code field of hr.salary.rule object 
bzr revid: psi@tinyerp.co.in-20110428133056-cramofq63y4s9nhy
 2011-04-28 19:00:56 +05:30
Quentin (OpenERP) 19db9c692b [IMP] hr_payroll: improved help tooltip 
bzr revid: qdp-launchpad@openerp.com-20110428130848-cs584ryp8sesqmm7
 2011-04-28 15:08:48 +02:00
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
psi (Open ERP) 740aceecc3 [IMP] add help on code field of hr.salary.rule 
bzr revid: psi@tinyerp.co.in-20110426120826-3uid7tvyfwrj5fjt
 2011-04-26 17:38:26 +05:30
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
psi (Open ERP) 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
mtr 30564f93e9 [IMP] hr_payroll:again improved exception message string 
bzr revid: mtr@mtr-20110425120430-kacidzhufm6n25q7
 2011-04-25 17:34:30 +05:30
mtr 122d51a2d7 [IMP] hr_payroll:improved exception message string 
bzr revid: mtr@mtr-20110425102502-6basvgqilrh664th
 2011-04-25 15:55:02 +05:30
mtr 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
mtr 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
Mustufa Rangwala d6dd4198ea [IMP] Payroll: to ease the use of the engine, we should use the code of rule directly as variable name instead of rules[<code of rule>] (we keep as it for heads[]). So it means that i should be able to use 'gross' instead of rules['gross'] 
bzr revid: mra@mra-laptop-20110425071930-co05h4pyl0k73a4v
 2011-04-25 12:49:30 +05:30
Mustufa Rangwala 60ad4cdfe6 [IMP] Payroll_account: improved views, on the other state of draft make fields on payslip to readonly=true 
bzr revid: mra@mra-laptop-20110421072256-la7412gwr7osf0hj
 2011-04-21 12:52:56 +05:30
mtr 566c5c7a8c [IMP] hr_payroll: improved code for payslip reference 
bzr revid: mtr@mtr-20110418133642-8xn0ka4bkwrty241
 2011-04-18 19:06:42 +05:30
mtr 5fa182ab00 [IMP] hr_payroll_account: demo data and code for the verify_sheet,process_sheet function 
bzr revid: mtr@mtr-20110418122708-qeb452wyl9gk18q4
 2011-04-18 17:57:08 +05:30
Quentin (OpenERP) 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
Mustufa Rangwala e4f4d851b8 [IMP] Payroll: payslip lines with appears on payslip = true only 
bzr revid: mra@mra-laptop-20110412133542-etbmskrdx05fml2q
 2011-04-12 19:05:42 +05:30
Mustufa Rangwala e91d5a7c38 [FIX] Payroll: Fix for installation 
bzr revid: mra@mra-laptop-20110412052349-bcjzxxtkwqy3caol
 2011-04-12 10:53:49 +05:30
Quentin (OpenERP) 33f392cb28 [MERGE] merge 
bzr revid: qdp-launchpad@openerp.com-20110411155356-jncdanf2fv0rgynd
 2011-04-11 17:53:56 +02:00
Mustufa Rangwala 3f69757064 [MERGE] merge from trunk payroll 
bzr revid: mra@mra-laptop-20110411122559-8s7vnahm7jguta5d
 2011-04-11 17:55:59 +05:30
Mustufa Rangwala 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
Quentin (OpenERP) 7080f2b5f3 [IMP] hr_payroll: refund payslip feature improved 
bzr revid: qdp-launchpad@openerp.com-20110411121046-7r0dzzqiw6hv6hkl
 2011-04-11 14:10:46 +02:00
Mustufa Rangwala 8994649cf3 [MERGE] merge from trunk payroll 
bzr revid: mra@mra-laptop-20110411114415-bp4bchwp51i0932i
 2011-04-11 17:14:15 +05:30
Mustufa Rangwala 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
Quentin (OpenERP) 3e1f543b78 [FIX] hr_payroll: refund button 
bzr revid: qdp-launchpad@openerp.com-20110411111923-18x2v4weqm71hms4
 2011-04-11 13:19:23 +02:00
Mustufa Rangwala 295f699558 [REM] unused code 
bzr revid: mra@mra-laptop-20110411104437-08y014kaeelpw150
 2011-04-11 16:14:37 +05:30
Mustufa Rangwala dd68253b95 [IMP] payroll: new structure should get as default for parent_id: ref(structure_base) 
bzr revid: mra@mra-laptop-20110411103527-7zza1n093a27ohhu
 2011-04-11 16:05:27 +05:30
Quentin (OpenERP) 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
Mustufa Rangwala 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
Quentin (OpenERP) f41c989295 [IMP] hr_payroll: cosmetic imp 
bzr revid: qdp-launchpad@openerp.com-20110408223845-8kj51e3uo6ko8gt0
 2011-04-09 00:38:45 +02:00
Quentin (OpenERP) 1042c0c0d6 [FIX] hr_payroll, computation engine: the heads have to be summed recursively 
bzr revid: qdp-launchpad@openerp.com-20110408145554-q09v8sud2jf63l3j
 2011-04-08 16:55:54 +02:00
Mustufa Rangwala 5cf844c230 [MERGE] merge from same branch 
bzr revid: mra@mra-laptop-20110408130434-lgsdbrfl95j6cxwo
 2011-04-08 18:34:34 +05:30
Quentin (OpenERP) 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
Mustufa Rangwala 97b7ef99ff [FIX] Payroll: strcut_id on contract now compulsory 
bzr revid: mra@mra-laptop-20110408130136-y4g2m87dzo0zei51
 2011-04-08 18:31:36 +05:30
Quentin (OpenERP) fc2d33a3be [IMP] hr_payroll: cosmetic changes + small code optimization 
bzr revid: qdp-launchpad@openerp.com-20110408125616-4k6phaduqbfzv88c
 2011-04-08 14:56:16 +02:00
Mustufa Rangwala 2e796b85a6 [IMP] hr payroll: use worked_days['NORM100'] in the computation engine 
bzr revid: mra@mra-laptop-20110408123156-dwcg5rnlwo4i8lyq
 2011-04-08 18:01:56 +05:30
Quentin (OpenERP) 112a4c77b4 [FIX] hr_payroll, computation engine: added a blacklist to avoid computing rules for which an ancestor has failed to satisfy_condition() 
bzr revid: qdp-launchpad@openerp.com-20110408121936-nqivku1zh45p4ipc
 2011-04-08 14:19:36 +02:00
Quentin (OpenERP) 8ba367a839 [REF] hr_payroll: moved recursive_search_of_rule function in hr.salary.rule class 
bzr revid: qdp-launchpad@openerp.com-20110408121759-zok1ml5ff1ix1lkr
 2011-04-08 14:17:59 +02:00
Mustufa Rangwala 5a2d032bdc [IMP] Payroll: refund button will open refund payslip => todo: need to directly open form instead of tree 
bzr revid: mra@mra-laptop-20110408103412-hmijd7i9q3a62fkl
 2011-04-08 16:04:12 +05:30
ARA (OpenERP) 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
Mustufa Rangwala 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
Quentin (OpenERP) 7785eb0c2a [FIX] hr_payroll: fixed localdict in satisfy_condition 
bzr revid: qdp-launchpad@openerp.com-20110407124050-3qvf3zyzxff6ctim
 2011-04-07 14:40:50 +02:00
Mustufa Rangwala f4e63a2c22 [FIX] Payroll: problem with the onchange_contract in payslip => contract_id is not saved 
bzr revid: mra@mra-laptop-20110407114552-nxvwbfg7nbjxo1ma
 2011-04-07 17:15:52 +05:30
Quentin (OpenERP) 8a625c9901 [IMP] hr_payroll: removed hr.contibution.register.line object 
bzr revid: qdp-launchpad@openerp.com-20110407101226-9gworw70i6rvqlp2
 2011-04-07 12:12:26 +02:00
Quentin (OpenERP) a6fb80e028 [REF] hr_payroll: small code refactoring in compute_sheet() method 
bzr revid: qdp-launchpad@openerp.com-20110406125421-owo9vuxjldb9ddoo
 2011-04-06 14:54:21 +02:00
Quentin (OpenERP) 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
psi (Open ERP) 2147838dda [FIX] small fix in compute_sheet method so it will delete the old payslip lines 
bzr revid: psi@tinyerp.co.in-20110406055519-u9a1joiyp8f3f2m0
 2011-04-06 11:25:19 +05:30
psi (Open ERP) 5853d90ae0 [FIX] small fix in compute_sheet method 
bzr revid: psi@tinyerp.co.in-20110406053948-mg7uc3mo23vaat0d
 2011-04-06 11:09:48 +05:30
Quentin (OpenERP) 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
mtr 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
Quentin (OpenERP) 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
Mustufa Rangwala 9843f42b1f [FIX] payroll 
bzr revid: mra@mra-laptop-20110404130033-rxhyg3jpwga7xaof
 2011-04-04 18:30:33 +05:30
Quentin (OpenERP) 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
mtr 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
psi (Open ERP) c369b99712 [FIX] hr_payroll 
bzr revid: psi@tinyerp.co.in-20110404100637-ljba7flsrrawhxdp
 2011-04-04 15:36:37 +05:30
Mustufa Rangwala 3bb9bf2065 [FIX] payrol; 
bzr revid: mra@mra-laptop-20110404100136-usw6fe76l64bph8u
 2011-04-04 15:31:36 +05:30
psi (Open ERP) 9c796d9768 [IMP] Improve verify_sheet method of hr.payslip object so it will consider the child rules and holidays 
bzr revid: psi@tinyerp.co.in-20110404090656-mq92felignt05nq5
 2011-04-04 14:36:56 +05:30
psi (Open ERP) cf2ed5f5aa [IMP] onchange will clear the field details_by_salary_head 
bzr revid: psi@tinyerp.co.in-20110404065026-6klls1fkg3mt8j41
 2011-04-04 12:20:26 +05:30
mtr d2ca30caf9 [IMP] hr_payroll:improved code to calculate total_payment for multiple contract 
bzr revid: mtr@mtr-20110404064453-sd7a9pecamnt80fn
 2011-04-04 12:14:53 +05:30
psi (Open ERP) 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
mtr c472eaafbc [IMP] hr_payroll:improved code to calculate total_payment using 'NET' rule 
bzr revid: mtr@mtr-20110401133226-pbhv7xbr5n7bwwji
 2011-04-01 19:02:26 +05:30
psi (Open ERP) a5cacc1ff7 [IMP] clean the code 
bzr revid: psi@tinyerp.co.in-20110401131735-pwddzzgf21ie4hcj
 2011-04-01 18:47:35 +05:30
Mustufa Rangwala 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
Mustufa Rangwala 03a02288f9 [FIX] payroll: fix on payroll register 
bzr revid: mra@mra-laptop-20110401122643-mbuqzap5emjzxvg3
 2011-04-01 17:56:43 +05:30
Mustufa Rangwala 2688eada6e [FIX] payroll 
bzr revid: mra@mra-laptop-20110401122132-5rdibau7jngyeeal
 2011-04-01 17:51:32 +05:30
Mustufa Rangwala 34f8594f58 [FIX] Payroll: Add seq field on salary head 
bzr revid: mra@mra-laptop-20110401113211-4qcdob9xi0xq30xi
 2011-04-01 17:02:11 +05:30
Mustufa Rangwala 6056d569ae [FIX] Payroll: Small fix 
bzr revid: mra@mra-laptop-20110401110105-8i6rmnxd4rdz8qr4
 2011-04-01 16:31:05 +05:30
Mustufa Rangwala 0b2aeb031e [FIX] Payroll: Small but if we have no stcture defined for contract and try to make onchanges 
bzr revid: mra@mra-laptop-20110401105807-1l1z3gvg1top1wei
 2011-04-01 16:28:07 +05:30
psi (Open ERP) 5e571864f7 [IMP] improve Other Information tab view of payslip 
bzr revid: psi@tinyerp.co.in-20110401104932-v71cdub1pse5543h
 2011-04-01 16:19:32 +05:30
mtr b78fdb96ec [IMP] hr_payroll: improved company contribution 
bzr revid: mtr@mtr-20110401103832-vla2it1171yumm8w
 2011-04-01 16:08:32 +05:30
psi (Open ERP) c6ef6826a9 [IMP] Details by salary head will show the salary head related to holidays also 
bzr revid: psi@tinyerp.co.in-20110401100750-uxlggpoxumej3ihf
 2011-04-01 15:37:50 +05:30
Mustufa Rangwala cafe5a4baa [FIX] payroll: structure on payslip readonly 
bzr revid: mra@mra-laptop-20110401054512-s2s2pfu2miq9xgw9
 2011-04-01 11:15:12 +05:30
psi (Open ERP) ad0286795f [IMP] Holidays based on contract 
bzr revid: psi@tinyerp.co.in-20110401051417-od73wdl9u77vto1g
 2011-04-01 10:44:17 +05:30
mtr 794e3ee8b2 [IMP] hr_payroll: added NET rule in data file and removed 'sequence' field 
bzr revid: mtr@mtr-20110401051048-f20cz98tdqmlrewd
 2011-04-01 10:40:48 +05:30
Mustufa Rangwala 9ea2084e08 [ADD] payroll: Onchange on company contribution boolean: if company contribution then appears on payslip = uncheck disable company contribution = checkenable so like this we can tell if it is a company contribution or not 
bzr revid: mra@mra-laptop-20110401050630-15la70amdihuz68k
 2011-04-01 10:36:30 +05:30
psi (Open ERP) adb7b1fab7 [IMP] comment the holidays_confirm method b'coz it was creating problem while creating new database due to demo data of holidays is without contract 
bzr revid: psi@tinyerp.co.in-20110331125635-t0kcgsrepp37w311
 2011-03-31 18:26:35 +05:30
psi (Open ERP) d9f0d9f279 [IMP] small change in holidays_confirm method so it will raise warning for only leave requests 
bzr revid: psi@tinyerp.co.in-20110331123742-gc0vfk5a1d8gq10w
 2011-03-31 18:07:42 +05:30
mtr e9b4d4538c [IMP] hr_payroll: improved string for 'state' fields 
bzr revid: mtr@mtr-20110331123213-8kqt1becfgcqwfgy
 2011-03-31 18:02:13 +05:30
psi (Open ERP) e5fb623048 [IMP] raise warning if there isn't any contract selected on employee leave request 
bzr revid: psi@tinyerp.co.in-20110331122829-20k622n739xad2xi
 2011-03-31 17:58:29 +05:30