odoo/odoo.git
13 years ago[IMP] hr_payroll: changed yml for payslip as per the changes in hr_payroll module
mtr [Mon, 6 Jun 2011 13:01:57 +0000 (18:31 +0530)]
[IMP] hr_payroll: changed yml for payslip as per the changes in hr_payroll module

bzr revid: mtr@mtr-20110606130157-bmb3g4t9yslx9n11

13 years ago[MERGE] hr_payroll: merged branch of mtr with browsable categories + fixed few points...
Quentin (OpenERP) [Fri, 27 May 2011 10:13:22 +0000 (12:13 +0200)]
[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

13 years ago[MERGE] payroll: merged branch for briwsing rules
Quentin (OpenERP) [Fri, 27 May 2011 08:04:41 +0000 (10:04 +0200)]
[MERGE] payroll: merged branch for briwsing rules

bzr revid: qdp-launchpad@openerp.com-20110527080441-khw4ggihutiawvfx

13 years ago[IMP] hr_payroll: improved code to have access of all the fields on rules object
mtr [Fri, 27 May 2011 07:23:52 +0000 (12:53 +0530)]
[IMP] hr_payroll: improved code to have access of all the fields on rules object

bzr revid: mtr@mtr-20110527072352-tdexanp29hxmnepi

13 years ago[MERGE] branch merged with trunk-payroll
mtr [Fri, 27 May 2011 06:13:11 +0000 (11:43 +0530)]
[MERGE] branch merged with trunk-payroll

bzr revid: mtr@mtr-20110527061311-2tn9n7cbu5gb7l6a

13 years ago[MERGE] branch merged with trunk-payroll
mtr [Fri, 27 May 2011 06:01:54 +0000 (11:31 +0530)]
[MERGE] branch merged with trunk-payroll

bzr revid: mtr@mtr-20110527060154-1fq5lppd897p9jc3

13 years ago[IMP] hr_payroll: added quantity on payslip lines
Quentin (OpenERP) [Thu, 26 May 2011 16:56:10 +0000 (18:56 +0200)]
[IMP] hr_payroll: added quantity on payslip lines

bzr revid: qdp-launchpad@openerp.com-20110526165610-3ppefzx2tqk4sd98

13 years ago[IMP] hr_payroll: improved help string on 'amount_python_compute' field
mtr [Thu, 26 May 2011 11:35:25 +0000 (17:05 +0530)]
[IMP] hr_payroll: improved help string on 'amount_python_compute' field

bzr revid: mtr@mtr-20110526113525-de0h5y8bp7c5shdm

13 years ago[IMP] hr_payroll: made 'rules' into browseable object
mtr [Thu, 26 May 2011 11:08:38 +0000 (16:38 +0530)]
[IMP] hr_payroll: made 'rules' into browseable object

bzr revid: mtr@mtr-20110526110838-n5juwnp5atajt8on

13 years ago[MERGE] branch merged with trunk-payroll
mtr [Thu, 26 May 2011 09:37:49 +0000 (15:07 +0530)]
[MERGE] branch merged with trunk-payroll

bzr revid: mtr@mtr-20110526093749-uam9vgtya56vpvm2

13 years ago[IMP] hr_payroll: improved help string categories=>rule_categories
mtr [Thu, 26 May 2011 05:56:55 +0000 (11:26 +0530)]
[IMP] hr_payroll: improved help string categories=>rule_categories

bzr revid: mtr@mtr-20110526055655-iw9yg4999a5l8g1z

13 years ago[IMP] hr_payroll: revert back the changes from localdict => category_dict
mtr [Thu, 26 May 2011 05:54:02 +0000 (11:24 +0530)]
[IMP] hr_payroll: revert back the changes from localdict => category_dict

bzr revid: mtr@mtr-20110526055402-ua3mu846d8zw4jso

13 years ago[MERGE]
Quentin (OpenERP) [Wed, 25 May 2011 13:41:01 +0000 (15:41 +0200)]
[MERGE]

bzr revid: qdp-launchpad@openerp.com-20110525134101-7v3n4bjszg1di0k7

13 years ago[IMP] hr_payroll: improved payslip state as per workflow changes and removed unrequir...
mtr [Wed, 25 May 2011 09:12:34 +0000 (14:42 +0530)]
[IMP] hr_payroll: improved payslip state as per workflow changes and removed unrequired methods

bzr revid: mtr@mtr-20110525091234-ih8c8e9vei8vfhbp

13 years ago[MERGE] branch merged with trunk-payroll
mtr [Wed, 25 May 2011 06:26:21 +0000 (11:56 +0530)]
[MERGE] branch merged with trunk-payroll

bzr revid: mtr@mtr-20110525062621-m04kj8v37ov1v6bu

13 years ago[MERGE] hr_payroll: changed field 'quantity' into 'amount' in input lines
Quentin (OpenERP) [Tue, 24 May 2011 12:49:08 +0000 (14:49 +0200)]
[MERGE] hr_payroll: changed field 'quantity' into 'amount' in input lines

bzr revid: qdp-launchpad@openerp.com-20110524124908-hzgk4vhegmynonsc

13 years ago[MERGE] hr_payroll: merged the branch with modifications on workflow and state of...
Quentin (OpenERP) [Tue, 24 May 2011 12:31:16 +0000 (14:31 +0200)]
[MERGE] hr_payroll: merged the branch with modifications on workflow and state of payslip

bzr revid: qdp-launchpad@openerp.com-20110524123116-y0l7o66mclk8fkd2

13 years ago[IMP] hr_payroll: used 'BrowsableObject' method instead of inheritancy
mtr [Tue, 24 May 2011 10:33:12 +0000 (16:03 +0530)]
[IMP] hr_payroll: used 'BrowsableObject' method instead of inheritancy

bzr revid: mtr@mtr-20110524103312-dvn8fbyzfp2grpll

13 years ago[MERGE] merged branch with improvements in payslip and payslip run
Quentin (OpenERP) [Tue, 24 May 2011 09:21:38 +0000 (11:21 +0200)]
[MERGE] merged branch with improvements in payslip and payslip run

bzr revid: qdp-launchpad@openerp.com-20110524092138-rf6ldei8mpmpya2v

13 years ago[MERGE] merged the branch with split of the 2 reports on payslip
Quentin (OpenERP) [Tue, 24 May 2011 09:14:17 +0000 (11:14 +0200)]
[MERGE] merged the branch with split of the 2 reports on payslip

bzr revid: qdp-launchpad@openerp.com-20110524091417-neoz2vbj0ubjdx13

13 years ago[MERGE] branch merged with trunk-payroll
mtr [Tue, 24 May 2011 08:52:06 +0000 (14:22 +0530)]
[MERGE] branch merged with trunk-payroll

bzr revid: mtr@mtr-20110524085206-tdpekv2v5fy2zbvf

13 years ago[IMP] hr_payroll: renamed the field 'quantity' to 'amount'
mtr [Tue, 24 May 2011 06:02:02 +0000 (11:32 +0530)]
[IMP] hr_payroll: renamed the field 'quantity' to 'amount'

bzr revid: mtr@mtr-20110524060202-z58x324zvkugddd1

13 years ago[MERGE] branch merged with trunk-payroll
mtr [Tue, 24 May 2011 05:19:48 +0000 (10:49 +0530)]
[MERGE] branch merged with trunk-payroll

bzr revid: mtr@mtr-20110524051948-sr86je1hlk5bkyvr

13 years ago[MERGE]
Quentin (OpenERP) [Mon, 23 May 2011 14:20:20 +0000 (16:20 +0200)]
[MERGE]

bzr revid: qdp-launchpad@openerp.com-20110523142020-tlr7jjc1n3zhgf65

13 years ago[IMP] hr_payroll: better demo data
Quentin (OpenERP) [Mon, 23 May 2011 14:14:23 +0000 (16:14 +0200)]
[IMP] hr_payroll: better demo data

bzr revid: qdp-launchpad@openerp.com-20110523141423-5x5e6curv55gpdej

13 years ago[IMP] hr_payroll: better name class for browsable object in python code of salary...
Quentin (OpenERP) [Mon, 23 May 2011 14:09:26 +0000 (16:09 +0200)]
[IMP] hr_payroll: better name class for browsable object in python code of salary rules

bzr revid: qdp-launchpad@openerp.com-20110523140926-388dp1b8egyt08zl

13 years ago[IMP] hr_payroll: inherited 'Inputline' class and changed help strings
mtr [Mon, 23 May 2011 11:22:03 +0000 (16:52 +0530)]
[IMP] hr_payroll: inherited 'Inputline' class and changed help strings

bzr revid: mtr@mtr-20110523112203-3xj8q54ffiqxmyz3

13 years ago[IMP] hr_payroll: initiate object outside the for loop
mtr [Mon, 23 May 2011 09:35:04 +0000 (15:05 +0530)]
[IMP] hr_payroll: initiate object outside the for loop

bzr revid: mtr@mtr-20110523093504-m2ibjrkk755dejuu

13 years ago[IMP] hr_payroll: used removeParaNode if there isn't any description on payslip
psi (Open ERP) [Mon, 23 May 2011 09:10:29 +0000 (14:40 +0530)]
[IMP] hr_payroll: used removeParaNode if there isn't any description on payslip

bzr revid: psi@tinyerp.co.in-20110523091029-a1doow4k02y67ax7

13 years ago[IMP] hr_payroll: changed amount in the demo data for 'Meal voucher' rule
mtr [Mon, 23 May 2011 07:13:28 +0000 (12:43 +0530)]
[IMP] hr_payroll: changed amount in the demo data for 'Meal voucher' rule

bzr revid: mtr@mtr-20110523071328-ngvq8z1somz7bomt

13 years ago[IMP] hr_payroll: Imporve search view of hr.payslip
psi (Open ERP) [Fri, 20 May 2011 13:34:52 +0000 (19:04 +0530)]
[IMP] hr_payroll: Imporve search view of hr.payslip

bzr revid: psi@tinyerp.co.in-20110520133452-1auudht73qdm0idv

13 years ago[IMP] hr_payroll: Change the label of the report from PaySlip Details to Employee...
psi (Open ERP) [Fri, 20 May 2011 13:25:54 +0000 (18:55 +0530)]
[IMP] hr_payroll: Change the label of the report from PaySlip Details to Employee Payslip Details

bzr revid: psi@tinyerp.co.in-20110520132554-2ohtfufdnsh9dm52

13 years ago[IMP] hr_payroll: improved tooltip for 'state' field
mtr [Fri, 20 May 2011 12:00:09 +0000 (17:30 +0530)]
[IMP] hr_payroll: improved tooltip for 'state' field

bzr revid: mtr@mtr-20110520120009-7pq67hy8a9wfwa83

13 years ago[IMP] hr_payroll: improved tooltip for 'state' field and renamed method name.
mtr [Fri, 20 May 2011 11:55:14 +0000 (17:25 +0530)]
[IMP] hr_payroll: improved tooltip for 'state' field and renamed method name.

bzr revid: mtr@mtr-20110520115514-t5kw865rhuv53q5x

13 years ago[IMP] hr_payroll: The python code expression can now be defined using 'browse',accord...
mtr [Thu, 19 May 2011 05:31:18 +0000 (11:01 +0530)]
[IMP] hr_payroll: The python code expression can now be defined using 'browse',accordingly changed data file

bzr revid: mtr@mtr-20110519053118-yzcmr39m3hqdb4u5

13 years ago[IMP] hr_payroll: Added search based on payslip.run object on payslip
psi (Open ERP) [Tue, 17 May 2011 10:58:18 +0000 (16:28 +0530)]
[IMP] hr_payroll: Added search based on payslip.run object on payslip

bzr revid: psi@tinyerp.co.in-20110517105818-ae5u33d3luh1z42x

13 years ago[IMP] hr_payroll: improved payslip states(draft, verify, done) and workflow
mtr [Tue, 17 May 2011 10:51:55 +0000 (16:21 +0530)]
[IMP] hr_payroll: improved payslip states(draft, verify, done) and workflow

bzr revid: mtr@mtr-20110517105155-d4dp2tt7d7ut4jxd

13 years ago[IMP] hr_payroll: changed label of field quantity on Payslip input into 'Amount'
mtr [Mon, 16 May 2011 13:27:39 +0000 (18:57 +0530)]
[IMP] hr_payroll: changed label of field quantity on Payslip input into 'Amount'

bzr revid: mtr@mtr-20110516132739-bay9gf9tpolxagsx

13 years ago[IMP] split payslip report in to two. Employee payslip report will show the payslip...
psi (Open ERP) [Mon, 16 May 2011 09:46:55 +0000 (15:16 +0530)]
[IMP] split payslip report in to two. Employee payslip report will show the payslip lines appears on payslip and the payslip details report will show all the payslip line by category as well as by contribution register

bzr revid: psi@tinyerp.co.in-20110516094655-gj6qtu29b6us3lh2

13 years ago[MERGE] merge with trunk-payroll branch
psi (Open ERP) [Mon, 16 May 2011 04:54:04 +0000 (10:24 +0530)]
[MERGE] merge with trunk-payroll branch

bzr revid: psi@tinyerp.co.in-20110516045404-xlphkqjrtvkuw0fw

13 years ago[IMP] hr_payroll: improved query for sum method of Payslips class
mtr [Fri, 13 May 2011 11:23:15 +0000 (16:53 +0530)]
[IMP] hr_payroll: improved query for sum method of Payslips class

bzr revid: mtr@mtr-20110513112315-qcaemrufa22gdnag

13 years ago[REF] Payroll: remove unused import
Mustufa Rangwala [Fri, 13 May 2011 06:39:31 +0000 (12:09 +0530)]
[REF] Payroll: remove unused import

bzr revid: mra@mra-laptop-20110513063931-g83470vtp5z9o5lv

13 years ago[IMP] Payroll: clean codee
Mustufa Rangwala [Fri, 13 May 2011 06:36:39 +0000 (12:06 +0530)]
[IMP] Payroll: clean codee

bzr revid: mra@mra-laptop-20110513063639-kx4lbs2gq3bef6py

13 years ago[IMP] Payroll: demo and default string improvements
Mustufa Rangwala [Fri, 13 May 2011 06:24:05 +0000 (11:54 +0530)]
[IMP] Payroll: demo and default string improvements

bzr revid: mra@mra-laptop-20110513062405-pf57a2ntrsze36mp

13 years ago[IMP] Payroll: remove unused mehtod def sum from payslip now...it will work now with...
Mustufa Rangwala [Fri, 13 May 2011 06:03:27 +0000 (11:33 +0530)]
[IMP] Payroll: remove unused mehtod def sum from payslip now...it will work now with payslips class ..

bzr revid: mra@mra-laptop-20110513060327-viq49sr0cx0nj1zp

13 years ago[IMP] Payroll: remove print
Mustufa Rangwala [Fri, 13 May 2011 06:02:06 +0000 (11:32 +0530)]
[IMP] Payroll: remove print

bzr revid: mra@mra-laptop-20110513060206-59oo6dc2arw8bps0

13 years ago[IMP] Payroll: Payslips with python code
Mustufa Rangwala [Fri, 13 May 2011 06:00:12 +0000 (11:30 +0530)]
[IMP] Payroll: Payslips with python code

bzr revid: mra@mra-laptop-20110513060012-q0qcwg6wbe9vk613

13 years ago[MERGE] Payroll: merge from main trunk-payroll branch
Mustufa Rangwala [Fri, 13 May 2011 05:09:45 +0000 (10:39 +0530)]
[MERGE] Payroll: merge from main trunk-payroll branch

bzr revid: mra@mra-laptop-20110513050945-zj8tudmzqdkqayli

13 years ago[IMP] hr_payroll: implemented the feature worked_days.WORK100.number_of_hours + impro...
Quentin (OpenERP) [Thu, 12 May 2011 16:16:28 +0000 (18:16 +0200)]
[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

13 years ago[IMP] hr_payroll: improved sum method of worked days
mtr [Thu, 12 May 2011 13:58:25 +0000 (19:28 +0530)]
[IMP] hr_payroll: improved sum method of worked days

bzr revid: mtr@mtr-20110512135825-r6ighyds5xusu4cd

13 years ago[MERGE] merged psi's branch with payslip report
Quentin (OpenERP) [Thu, 12 May 2011 13:57:49 +0000 (15:57 +0200)]
[MERGE] merged psi's branch with payslip report

bzr revid: qdp-launchpad@openerp.com-20110512135749-jaipercgs20ae539

13 years ago[IMP] pass details_by_salary_rule_category instead of line_ids so the report will...
psi (Open ERP) [Thu, 12 May 2011 13:39:40 +0000 (19:09 +0530)]
[IMP] pass details_by_salary_rule_category instead of line_ids so the report will show payslip_lines with rule as Appear on payslip checked

bzr revid: psi@tinyerp.co.in-20110512133940-cwmcdbtl3rz8giru

13 years ago[MERGE, IMP] merge with main payroll branch, Add payslip lines by contribution regist...
psi (Open ERP) [Thu, 12 May 2011 13:05:43 +0000 (18:35 +0530)]
[MERGE, IMP] merge with main payroll branch, Add payslip lines by contribution register on Employee payslip report

bzr revid: psi@tinyerp.co.in-20110512083943-5e5eys6j7ae0af8e
bzr revid: psi@tinyerp.co.in-20110512130543-ld0w9si6oypo298u

13 years ago[MERGE] merge from trunk-payroll main branch
Mustufa Rangwala [Thu, 12 May 2011 13:04:10 +0000 (18:34 +0530)]
[MERGE] merge from trunk-payroll main branch

bzr revid: mra@mra-laptop-20110512130410-5ybp0b0drz6iqg7f

13 years ago[IMP] hr_payroll: updated localdict to copmute payslip on payslip
mtr [Thu, 12 May 2011 12:36:19 +0000 (18:06 +0530)]
[IMP] hr_payroll: updated localdict to copmute payslip on payslip

bzr revid: mtr@mtr-20110512123619-bss3lcy1dlrbi9r7

13 years ago[IMP] hr_payroll: improved method of hr.payslip,to call it without passing(cr,uid)
mtr [Thu, 12 May 2011 12:07:52 +0000 (17:37 +0530)]
[IMP] hr_payroll: improved method of hr.payslip,to call it without passing(cr,uid)

bzr revid: mtr@mtr-20110512120752-sdqi99qim652kwk0

13 years ago[MERGE] merged the branch containing the modifications on hr_payroll_account (author...
Quentin (OpenERP) [Thu, 12 May 2011 11:57:19 +0000 (13:57 +0200)]
[MERGE] merged the branch containing the modifications on hr_payroll_account (author mtr and qpd)

bzr revid: qdp-launchpad@openerp.com-20110512115719-m5ppmv0sk02wutgr

13 years ago[REF] hr_payroll: added TODO comment
Quentin (OpenERP) [Thu, 12 May 2011 11:54:58 +0000 (13:54 +0200)]
[REF] hr_payroll: added TODO comment

bzr revid: qdp-launchpad@openerp.com-20110512115458-kg1s089del0032lx

13 years ago[FIX] hr_payroll_account: debugged the process_sheet method()
Quentin (OpenERP) [Thu, 12 May 2011 11:47:49 +0000 (13:47 +0200)]
[FIX] hr_payroll_account: debugged the process_sheet method()

bzr revid: qdp-launchpad@openerp.com-20110512114749-bbpukg17a3kad67q

13 years ago[FIX] hr_payroll_account: removed the reference to old and removed objects
Quentin (OpenERP) [Thu, 12 May 2011 11:07:03 +0000 (13:07 +0200)]
[FIX] hr_payroll_account: removed the reference to old and removed objects

bzr revid: qdp-launchpad@openerp.com-20110512110703-9ri4udog0gdmo422

13 years ago[IMP] hr_payroll_account: no need of new security rules in the module hr_payroll_account
Quentin (OpenERP) [Thu, 12 May 2011 11:02:43 +0000 (13:02 +0200)]
[IMP] hr_payroll_account: no need of new security rules in the module hr_payroll_account

bzr revid: qdp-launchpad@openerp.com-20110512110243-9ixjk1ywyxwn00a6

13 years ago[IMP] hr_payroll_account: cleaning of views and implementation of compute_sheet method
Quentin (OpenERP) [Thu, 12 May 2011 11:01:21 +0000 (13:01 +0200)]
[IMP] hr_payroll_account: cleaning of views and implementation of compute_sheet method

bzr revid: qdp-launchpad@openerp.com-20110512110121-mqo8bv40fc54wdp3

13 years ago[FIX] hr_payroll: fix errors in get_contract + removed old commented code
Quentin (OpenERP) [Thu, 12 May 2011 09:00:09 +0000 (11:00 +0200)]
[FIX] hr_payroll: fix errors in get_contract + removed old commented code

bzr revid: qdp-launchpad@openerp.com-20110512090009-2wt0cqfm6kh9brtw

13 years ago[IMP] hr_payroll_account: set the basis for the new version of hr_payroll_account...
Quentin (OpenERP) [Thu, 12 May 2011 08:01:47 +0000 (10:01 +0200)]
[IMP] hr_payroll_account: set the basis for the new version of hr_payroll_account based on our new vision of hr_payroll

bzr revid: qdp-launchpad@openerp.com-20110512080147-emqikvpp8idhiwnx

13 years ago[MERGE] merged the branch of psi with payslip run feature (+add required=True on...
Quentin (OpenERP) [Thu, 12 May 2011 07:49:18 +0000 (09:49 +0200)]
[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

13 years ago[IMP] small change in warning
psi (Open ERP) [Thu, 12 May 2011 07:21:31 +0000 (12:51 +0530)]
[IMP] small change in warning

bzr revid: psi@tinyerp.co.in-20110512072131-bkyu91oejlje6k1e

13 years ago[IMP] small improvment in wizard
psi (Open ERP) [Thu, 12 May 2011 07:02:53 +0000 (12:32 +0530)]
[IMP] small improvment in wizard

bzr revid: psi@tinyerp.co.in-20110512070253-iyahei1j6cc1m4r0

13 years ago[IMP] hr_payroll_account: made account_id unrequired field on contribution register
mtr [Thu, 12 May 2011 05:36:37 +0000 (11:06 +0530)]
[IMP] hr_payroll_account: made account_id unrequired field on contribution register

bzr revid: mtr@mtr-20110512053637-2yudj4rinjtwayy1

13 years ago[IMP] hr_payroll_account: added onchange_employee_id method and comments(help) in...
mtr [Thu, 12 May 2011 05:19:49 +0000 (10:49 +0530)]
[IMP] hr_payroll_account: added onchange_employee_id method and comments(help) in the code

bzr revid: mtr@mtr-20110512051949-8znbh8wy6yyt192t

13 years ago[FIX] small fix in onchange_employee(when onchage is called with no employee, worked...
psi (Open ERP) [Thu, 12 May 2011 05:07:03 +0000 (10:37 +0530)]
[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

13 years ago[MERGE] Merge from trunk-payroll main project branch
Mustufa Rangwala [Thu, 12 May 2011 05:01:50 +0000 (10:31 +0530)]
[MERGE] Merge from trunk-payroll main project branch

bzr revid: mra@mra-laptop-20110512050150-m4qysq80qgo48fp1

13 years ago[MERGE,IMP] merge with main payroll branch and improve the code in wizard according...
psi (Open ERP) [Thu, 12 May 2011 04:59:02 +0000 (10:29 +0530)]
[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

13 years ago[MERGE] merged psi with fix of computation engine
Quentin (OpenERP) [Wed, 11 May 2011 14:52:39 +0000 (16:52 +0200)]
[MERGE] merged psi with fix of computation engine

bzr revid: qdp-launchpad@openerp.com-20110511145239-uidsrlki2kn35x8f

13 years ago[FIX] small fix
psi (Open ERP) [Wed, 11 May 2011 13:35:22 +0000 (19:05 +0530)]
[FIX] small fix

bzr revid: psi@tinyerp.co.in-20110511133522-8e51br6tsnzs4dao

13 years ago[MERGE] merged mtr's branch with new name for salary.head
Quentin (OpenERP) [Wed, 11 May 2011 13:21:48 +0000 (15:21 +0200)]
[MERGE] merged mtr's branch with new name for salary.head

bzr revid: qdp-launchpad@openerp.com-20110511132148-g2pyjq9oy6e88w6t

13 years ago[MERGE] merged psi branch with new feature for input on payslip
Quentin (OpenERP) [Wed, 11 May 2011 13:16:50 +0000 (15:16 +0200)]
[MERGE] merged psi branch with new feature for input on payslip

bzr revid: qdp-launchpad@openerp.com-20110511131650-2en4cz4331u4ihnh

13 years ago[MERGE] merge with main branch
psi (Open ERP) [Wed, 11 May 2011 10:17:33 +0000 (15:47 +0530)]
[MERGE] merge with main branch

bzr revid: psi@tinyerp.co.in-20110511101733-8a0tbbmuwvo5bix5

13 years ago[IMP] Improve code and add state on hr.payslip.run object
psi (Open ERP) [Wed, 11 May 2011 09:10:09 +0000 (14:40 +0530)]
[IMP] Improve code and add state on hr.payslip.run object

bzr revid: psi@tinyerp.co.in-20110511091009-iyu5bloo5ewg5re9

13 years ago[MERGE] branch merged with trunk-payroll
mtr [Wed, 11 May 2011 07:34:53 +0000 (13:04 +0530)]
[MERGE] branch merged with trunk-payroll

bzr revid: mtr@mtr-20110511073453-oqxvhdp20mfkc4ax

13 years ago[IMP] hr_payroll: renamed hr.salary.category into hr.salary.rule.category
mtr [Wed, 11 May 2011 07:18:54 +0000 (12:48 +0530)]
[IMP] hr_payroll: renamed hr.salary.category into hr.salary.rule.category

bzr revid: mtr@mtr-20110511071854-ctdf3czpedhe5t6l

13 years ago[MERGE] branch merged with trunk-payroll
mtr [Wed, 11 May 2011 06:43:27 +0000 (12:13 +0530)]
[MERGE] branch merged with trunk-payroll

bzr revid: mtr@mtr-20110511064327-jzwjr10clzh33m37

13 years ago[IMP] hr_payroll: removed context,as we don't use the context later in the function
mtr [Wed, 11 May 2011 06:23:12 +0000 (11:53 +0530)]
[IMP] hr_payroll: removed context,as we don't use the context later in the function

bzr revid: mtr@mtr-20110511062312-r3lzjbdp10nqa28a

13 years ago[IMP] hr_payroll: improved code to take into account credit_note while calculating...
mtr [Wed, 11 May 2011 06:13:49 +0000 (11:43 +0530)]
[IMP] hr_payroll: improved code to take into account credit_note while calculating the sum

bzr revid: mtr@mtr-20110511061349-dj6jlpmnhjn13iij

13 years ago[MERGE] merged mtr's branch related to security improvements
Quentin (OpenERP) [Tue, 10 May 2011 14:50:46 +0000 (16:50 +0200)]
[MERGE] merged mtr's branch related to security improvements

bzr revid: qdp-launchpad@openerp.com-20110510145046-vc2603j5wrmc48tf

13 years ago[MERGE] merged mtr's branch with salary.head => salary.category
Quentin (OpenERP) [Tue, 10 May 2011 14:27:23 +0000 (16:27 +0200)]
[MERGE] merged mtr's branch with salary.head => salary.category

bzr revid: qdp-launchpad@openerp.com-20110510142723-6kr9k4ivqwrusxss

13 years ago[MERGE] merged psi's branch with improvement of search view of employees
Quentin (OpenERP) [Tue, 10 May 2011 14:02:56 +0000 (16:02 +0200)]
[MERGE] merged psi's branch with improvement of search view of employees

bzr revid: qdp-launchpad@openerp.com-20110510140256-2j5sxnjatudmjnym

13 years ago[MERGE] merge psi branch with removal of sequence on salary heads
Quentin (OpenERP) [Tue, 10 May 2011 13:42:37 +0000 (15:42 +0200)]
[MERGE] merge psi branch with removal of sequence on salary heads

bzr revid: qdp-launchpad@openerp.com-20110510134237-ac3lu8aeec50hlsf

13 years ago[MERGE] merged psi branch with tooltip improvement
Quentin (OpenERP) [Tue, 10 May 2011 13:34:10 +0000 (15:34 +0200)]
[MERGE] merged psi branch with tooltip improvement

bzr revid: qdp-launchpad@openerp.com-20110510133410-c9lapqzd49291o76

13 years ago[IMP] improve searh view of hr.employee add filter on categories
psi (Open ERP) [Tue, 10 May 2011 13:32:27 +0000 (19:02 +0530)]
[IMP] improve searh view of hr.employee add filter on categories

bzr revid: psi@tinyerp.co.in-20110510133227-fzbbptd2tje5suf8

13 years ago[FIX] Payroll: Payslip lines readonly with all states of payslips
Mustufa Rangwala [Tue, 10 May 2011 13:11:10 +0000 (18:41 +0530)]
[FIX] Payroll: Payslip lines readonly with all states of payslips

bzr revid: mra@mra-laptop-20110510131110-gd32dkedh7m3gv2i

13 years ago[IMP] hr_payroll: renamed salary head into salary category
mtr [Tue, 10 May 2011 11:54:11 +0000 (17:24 +0530)]
[IMP] hr_payroll: renamed salary head into salary category

bzr revid: mtr@mtr-20110510115411-lkf923pyakj1ykug

13 years ago[ADD] improve code and add demo rule for sales
psi (Open ERP) [Tue, 10 May 2011 11:19:31 +0000 (16:49 +0530)]
[ADD] improve code and add demo rule for sales

bzr revid: psi@tinyerp.co.in-20110510111931-4v21peqft66hblpp

13 years ago[IMP] rename object to worked_days and add one object hr.salary.input
psi (Open ERP) [Mon, 9 May 2011 08:50:02 +0000 (14:20 +0530)]
[IMP] rename object to worked_days and add one object hr.salary.input

bzr revid: psi@tinyerp.co.in-20110509085002-l0ygkq5al9yedmz6

13 years ago[IMP] Payroll: Clean the code
Mustufa Rangwala [Fri, 6 May 2011 06:39:03 +0000 (12:09 +0530)]
[IMP] Payroll: Clean the code

bzr revid: mra@mra-laptop-20110506063903-4hno1tb6enrd0bk4

13 years ago[IMP] hr_payroll: minor improvement in methods for parameter employee
mtr [Thu, 5 May 2011 12:49:59 +0000 (18:19 +0530)]
[IMP] hr_payroll: minor improvement in methods for parameter employee

bzr revid: mtr@mtr-20110505124959-062hns4ca03vltbu

13 years ago[IMP] hr_payroll: minor changes
mtr [Thu, 5 May 2011 12:35:15 +0000 (18:05 +0530)]
[IMP] hr_payroll: minor changes

bzr revid: mtr@mtr-20110505123515-in7313mb4ryqeb0f

13 years ago[IMP] hr_payroll: improved two methods and moved worked_days_sum method to 'hr.paysli...
mtr [Thu, 5 May 2011 12:30:27 +0000 (18:00 +0530)]
[IMP] hr_payroll: improved two methods and moved worked_days_sum method to 'hr.payslip.input' object

bzr revid: mtr@mtr-20110505123027-jluag8sqpp12gtwk

13 years ago[IMP] hr_payroll: if employee is not provided in an argument it returns 0
mtr [Thu, 5 May 2011 07:20:04 +0000 (12:50 +0530)]
[IMP] hr_payroll: if employee is not provided in an argument it returns 0

bzr revid: mtr@mtr-20110505072004-1254kzo59rv9z97e

13 years ago[IMP] hr_payroll: added worked_days_sum method to compute 'payslip' on 'other payslip'
mtr [Thu, 5 May 2011 05:47:45 +0000 (11:17 +0530)]
[IMP] hr_payroll: added worked_days_sum method to compute 'payslip' on 'other payslip'

bzr revid: mtr@mtr-20110505054745-hkbzoothm3bqa46u

13 years ago[IMP] hr_payroll: added payslip_sum method to compute 'payslip' on other payslip'
mtr [Wed, 4 May 2011 12:56:27 +0000 (18:26 +0530)]
[IMP] hr_payroll: added payslip_sum method to compute 'payslip' on other payslip'

bzr revid: mtr@mtr-20110504125627-5zyck6tp8438gyd5