odoo/odoo.git
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: 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: 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] 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

13 years ago[IMP] remove sequence form salary head object
psi (Open ERP) [Wed, 4 May 2011 11:13:48 +0000 (16:43 +0530)]
[IMP] remove sequence form salary head object

bzr revid: psi@tinyerp.co.in-20110504111348-kngj0i0tert4w9pt

13 years ago[FIX] rename the menu name
psi (Open ERP) [Wed, 4 May 2011 06:33:16 +0000 (12:03 +0530)]
[FIX] rename the menu name

bzr revid: psi@tinyerp.co.in-20110504063316-26r7wu0ni4gtqhad

13 years ago[IMP] remanes view ids
psi (Open ERP) [Wed, 4 May 2011 05:50:23 +0000 (11:20 +0530)]
[IMP] remanes view ids

bzr revid: psi@tinyerp.co.in-20110504055023-rngf7l4vwf25ilj7

13 years ago[IMP] small fixes
psi (Open ERP) [Tue, 3 May 2011 13:17:50 +0000 (18:47 +0530)]
[IMP] small fixes

bzr revid: psi@tinyerp.co.in-20110503131750-24xxudj2qs84vy21

13 years ago[IMP] rename the class and changed the view accourdingly
psi (Open ERP) [Tue, 3 May 2011 12:38:07 +0000 (18:08 +0530)]
[IMP] rename the class and changed the view accourdingly

bzr revid: psi@tinyerp.co.in-20110503123807-ptgnp6gejy045fai

13 years ago[IMP] Payroll: form and tree view of Salary heads
Mustufa Rangwala [Tue, 3 May 2011 09:12:02 +0000 (14:42 +0530)]
[IMP] Payroll: form and tree view of Salary heads

bzr revid: mra@mra-laptop-20110503091202-pmitrzjymkrr3otf

13 years ago[FIX] small fix in hr_payroll
psi (Open ERP) [Mon, 2 May 2011 12:43:13 +0000 (18:13 +0530)]
[FIX] small fix in hr_payroll

bzr revid: psi@tinyerp.co.in-20110502124313-k0snr1nnx03026oo

13 years ago[MERGE] merge with trunk-payroll branch
psi (Open ERP) [Mon, 2 May 2011 12:21:36 +0000 (17:51 +0530)]
[MERGE] merge with trunk-payroll branch

bzr revid: psi@tinyerp.co.in-20110502122136-wxilodkqcxk0wv05

13 years ago[IMP] wizard will work for employees instead of employee categories
psi (Open ERP) [Mon, 2 May 2011 12:18:22 +0000 (17:48 +0530)]
[IMP] wizard will work for employees instead of employee categories

bzr revid: psi@tinyerp.co.in-20110502121822-2xw9r1yilxoovr2o

13 years ago[IMP] improve the tooltip on code field of hr.salary.rule object
psi (Open ERP) [Thu, 28 Apr 2011 13:30:56 +0000 (19:00 +0530)]
[IMP] improve the tooltip on code field of hr.salary.rule object

bzr revid: psi@tinyerp.co.in-20110428133056-cramofq63y4s9nhy

13 years ago[IMP] hr_payroll: improved help tooltip
Quentin (OpenERP) [Thu, 28 Apr 2011 13:08:48 +0000 (15:08 +0200)]
[IMP] hr_payroll: improved help tooltip

bzr revid: qdp-launchpad@openerp.com-20110428130848-cs584ryp8sesqmm7

13 years ago[MERGE] merged mtr's branch: added field 'quantity' on salary rule object and changed...
Quentin (OpenERP) [Thu, 28 Apr 2011 12:40:14 +0000 (14:40 +0200)]
[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

13 years ago[MERGE] merged mtr's branch: improved payslip line view
Quentin (OpenERP) [Thu, 28 Apr 2011 12:34:02 +0000 (14:34 +0200)]
[MERGE] merged mtr's branch: improved payslip line view

bzr revid: qdp-launchpad@openerp.com-20110428123402-2aj4ylhc13msk6fq

13 years ago[MERGE] merged mtr's branch: payslip line color is blue when total is 0
Quentin (OpenERP) [Thu, 28 Apr 2011 12:26:05 +0000 (14:26 +0200)]
[MERGE] merged mtr's branch: payslip line color is blue when total is 0

bzr revid: qdp-launchpad@openerp.com-20110428122605-5l7e4xe75imw6u4b

13 years ago[MERGE] merged mra's branch: now we can access rules directly by giving rule code...
Quentin (OpenERP) [Thu, 28 Apr 2011 12:22:06 +0000 (14:22 +0200)]
[MERGE] merged mra's branch: now we can access rules directly by giving rule code no need to give rules[Code name] in dictionary

bzr revid: qdp-launchpad@openerp.com-20110428122206-vougeyi34zhp5gga

13 years ago[IMP] hr_payroll: revert back the changes of access rights,made for hr user
mtr [Thu, 28 Apr 2011 08:53:11 +0000 (14:23 +0530)]
[IMP] hr_payroll: revert back the changes of access rights,made for hr user

bzr revid: mtr@mtr-20110428085311-7017lofdf8jf7s3f

13 years ago[IMP] hr_payroll: 'HR / Officer' can now see the payslips of him and of employess...
mtr [Thu, 28 Apr 2011 08:35:38 +0000 (14:05 +0530)]
[IMP] hr_payroll: 'HR / Officer' can now see the payslips of him and of employess for which he's the manager

bzr revid: mtr@mtr-20110428083538-v08g50zk6sx18t4j

13 years ago[IMP] hr_payroll: added ir.rule for employee payslip and modified access rights
mtr [Thu, 28 Apr 2011 06:31:40 +0000 (12:01 +0530)]
[IMP] hr_payroll: added ir.rule for employee payslip and modified access rights

bzr revid: mtr@mtr-20110428063140-rxao7nev4xgzl9f2

13 years ago[IMP] add help on code field of hr.salary.rule
psi (Open ERP) [Tue, 26 Apr 2011 12:08:26 +0000 (17:38 +0530)]
[IMP] add help on code field of hr.salary.rule

bzr revid: psi@tinyerp.co.in-20110426120826-3uid7tvyfwrj5fjt

13 years ago[IMP] payslip by category wizard
psi (Open ERP) [Tue, 26 Apr 2011 11:37:09 +0000 (17:07 +0530)]
[IMP] payslip by category wizard

bzr revid: psi@tinyerp.co.in-20110426113709-znwz3vo0cf2wukjo

13 years ago[IMP] hr_payroll:commented older payslip report
mtr [Tue, 26 Apr 2011 11:35:59 +0000 (17:05 +0530)]
[IMP] hr_payroll:commented older payslip report

bzr revid: mtr@mtr-20110426113559-bd8dr2d2txe1njxj

13 years ago[IMP] hr_payroll:improved bank details on payslip report
mtr [Tue, 26 Apr 2011 11:17:15 +0000 (16:47 +0530)]
[IMP] hr_payroll:improved bank details on payslip report

bzr revid: mtr@mtr-20110426111715-p3kt5lz3arw1wgda

13 years ago[IMP] hr_payroll:calculates total for salary head in payslip report
mtr [Tue, 26 Apr 2011 10:52:15 +0000 (16:22 +0530)]
[IMP] hr_payroll:calculates total for salary head in payslip report

bzr revid: mtr@mtr-20110426105215-aiijosjm7wv2rjjr

13 years ago[IMP] improve the newly created wizard as per requirment suggested
psi (Open ERP) [Tue, 26 Apr 2011 10:26:56 +0000 (15:56 +0530)]
[IMP] improve the newly created wizard as per requirment suggested

bzr revid: psi@tinyerp.co.in-20110426102656-s2lfltvnkkvzz6ve

13 years ago[IMP] hr_payroll:added company_id in payslip line view
mtr [Mon, 25 Apr 2011 13:17:40 +0000 (18:47 +0530)]
[IMP] hr_payroll:added company_id in payslip line view

bzr revid: mtr@mtr-20110425131740-422eih4okmi6rjqh

13 years ago[IMP] Add wizard to generate payslip by employee categories
psi (Open ERP) [Mon, 25 Apr 2011 12:30:44 +0000 (18:00 +0530)]
[IMP] Add wizard to generate payslip by employee categories

bzr revid: psi@tinyerp.co.in-20110425123044-hxb20cq7iynw5ou7

13 years ago[IMP] hr_payroll:again improved exception message string
mtr [Mon, 25 Apr 2011 12:04:30 +0000 (17:34 +0530)]
[IMP] hr_payroll:again improved exception message string

bzr revid: mtr@mtr-20110425120430-kacidzhufm6n25q7

13 years ago[IMP] hr_payroll:improved payslip line view,removed fields that are used to calculate...
mtr [Mon, 25 Apr 2011 10:37:18 +0000 (16:07 +0530)]
[IMP] hr_payroll:improved payslip line view,removed fields that are used to calculate the total

bzr revid: mtr@mtr-20110425103718-r80y25vatlik17z4

13 years ago[FIX] hr_payroll: payslip line color is blue when total is 0
ARA (OpenERP) [Mon, 25 Apr 2011 10:25:44 +0000 (15:55 +0530)]
[FIX] hr_payroll: payslip line color is blue when total is 0

bzr revid: ara@tinyerp.com-20110425102544-ivqy6vu4fb14z68u

13 years ago[IMP] hr_payroll:improved exception message string
mtr [Mon, 25 Apr 2011 10:25:02 +0000 (15:55 +0530)]
[IMP] hr_payroll:improved exception message string

bzr revid: mtr@mtr-20110425102502-6basvgqilrh664th

13 years ago[IMP] hr_payroll:removed qty from demo,improved search engine,made qty mandatory...
mtr [Mon, 25 Apr 2011 09:55:37 +0000 (15:25 +0530)]
[IMP] hr_payroll:removed qty from demo,improved search engine,made qty mandatory and added tooltip

bzr revid: mtr@mtr-20110425095537-ewmhlikkh5i50jyg

13 years ago[FIX] hr_payroll: payslip line color is blue when total is 0
ARA (OpenERP) [Mon, 25 Apr 2011 09:41:42 +0000 (15:11 +0530)]
[FIX] hr_payroll: payslip line color is blue when total is 0

bzr revid: ara@tinyerp.com-20110425094142-w0hjdx79bq84r920

13 years ago[IMP] hr_payroll:added field 'quantity' on salary rules,modified computation engine...
mtr [Mon, 25 Apr 2011 07:25:10 +0000 (12:55 +0530)]
[IMP] hr_payroll:added field 'quantity' on salary rules,modified computation engine and demo data

bzr revid: mtr@mtr-20110425072510-9f7tbuo9w3q3qq30