Commit Graph

33 Commits

Author SHA1 Message Date
Quentin (OpenERP) 6a75cc721d [IMP] payroll modules: improved the management of accounting entries created by a payslip + data for contribution registers in l10n_be payroll modules
bzr revid: qdp-launchpad@openerp.com-20120620130449-aa0qe86kjig8ud4m
2012-06-20 15:04:49 +02:00
Quentin (OpenERP) 5602ac13b7 [IMP] hr_payroll: modified the payroll engine in order to return the rate separately. Added a float precision for payroll rate. Original ideas from Yannick Buron.
bzr revid: qdp-launchpad@openerp.com-20120105081325-2pstk4naim07cy2o
2012-01-05 09:13:25 +01:00
Meera Trambadia (OpenERP) 3ff689c763 [IMP] hr_payroll: improved data.xml to change the sequence in the display of salary rule categories.
bzr revid: mtr@tinyerp.com-20110902092742-cyj58sya4krdu3al
2011-09-02 14:57:42 +05:30
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
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
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
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
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
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
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
Quentin (OpenERP) c976c757d8 [IMP] hr_payroll: added head data for company contribution
bzr revid: qdp-launchpad@openerp.com-20110411154715-idvt0myzjnurmlj2
2011-04-11 17:47:15 +02:00
Quentin (OpenERP) f9aa29d04d [FIX] hr_payroll: fixed NET rule in data
bzr revid: qdp-launchpad@openerp.com-20110411080624-okp70ykmmp4gqop1
2011-04-11 10:06:24 +02:00
Quentin (OpenERP) 0df1e74d79 [FIX] hr_payroll: fixed default rules
bzr revid: qdp-launchpad@openerp.com-20110408163312-x26jnh5zr6erxmqm
2011-04-08 18:33:12 +02:00
Quentin (OpenERP) 2efe4da3ee [IMP] hr_payroll: default data for base structure
bzr revid: qdp-launchpad@openerp.com-20110408154849-8v42egah6r1ge6vu
2011-04-08 17:48:49 +02:00
Quentin (OpenERP) d0a5221fcf [REF] hr_payroll: removed commented code (for 'the sake of clarity' and because bazaar is your historian ^^)
bzr revid: qdp-launchpad@openerp.com-20110406141532-d6f2r49dbtr95rzf
2011-04-06 16:15:32 +02:00
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 8cf0079a92 [IMP] hr_payroll:uncommented the sequence on salary head in data file
bzr revid: mtr@mtr-20110401121434-u0s1kdmwodyary4m
2011-04-01 17:44:34 +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
mtr 6e6b21a875 [IMP] hr_payroll,hr_contract:commented 'hr.contract.wage.type' and improved strings of menuitem in payroll.
bzr revid: mtr@mtr-20110307112817-f3c7o3fro4oxzejn
2011-03-07 16:58:17 +05:30
mtr 971a91390a [IMP] hr_payroll:improvements in salary rules,salary head,salary structure and demo data
bzr revid: mtr@mtr-20110307071829-rluk1idcxjtbw43u
2011-03-07 12:48:29 +05:30
mtr d840425793 [IMP] hr_payroll:renamed 'hr.allounce.deduction.categoty' to 'hr.salary.head' and improved its object and fields
bzr revid: mtr@mtr-20110303095226-kga2d2ulq0mhb4ne
2011-03-03 15:22:26 +05:30
mtr 183e37aaef [IMP] hr_payroll:improved 'salary_head_type' class,object and its fields.
bzr revid: mtr@mtr-20110302120023-ihc9mi4pqk3gucvt
2011-03-02 17:30:23 +05:30
mtr deec616aa5 [IMP] hr_payroll: improved Salary Head,added 'salary.head.type' object and 'salary rule' as m2m on employee,removed one2many 'Child Salary Structure'
bzr revid: mtr@mtr-20110225130726-5bc1b5hf2cgefeo3
2011-02-25 18:37:26 +05:30
qdp-launchpad@tinyerp.com 2df4a68377 [MERGE] merged the dev3 branch
bzr revid: qdp-launchpad@tinyerp.com-20110114001101-wk77opsrvslh7pak
2011-01-14 01:11:01 +01:00
psi (Open ERP) 7a795aa8f6 [FIX] hr_payroll: speling correction of lables
lp bug: https://launchpad.net/bugs/702027 fixed

bzr revid: psi@tinyerp.co.in-20110113075536-q1gjfq0mu3a26hd0
2011-01-13 13:25:36 +05:30
husen f433b959c2 merged with trunk
bzr revid: husen@husen-laptop-20101230095809-cl6dkve1odgdtqtv
2010-12-30 15:28:09 +05:30
Vir (Open ERP) 9138707ef7 [MOD] hr_payroll : Improvements in access rights
bzr revid: vir@tinyerp.com-20101008124815-k6ti98b1a12pb74n
2010-10-08 18:18:15 +05:30
Mantavya Gajjar f2e3f5fc2b [IMP]: implement the salary calculation for the structure
bzr revid: mga@tinyerp.com-20101007140056-r3mo0e7ltp7k4bd1
2010-10-07 19:30:56 +05:30
Mantavya Gajjar 1a2015de2c [IMP]: improvement to view, add links to employee for payslip
[ADD]: add demo data for the contract

bzr revid: mga@tinyerp.com-20101007091900-tglpl048qpffnle8
2010-10-07 14:49:00 +05:30
Mantavya Gajjar 52462287f3 [IMP]L improvement and fix to the payroll module
bzr revid: mga@tinyerp.com-20101007063156-tijiyci4w5r0v29w
2010-10-07 12:01:56 +05:30
Mantavya Gajjar 224319dd51 [FIX]: fix a hr payroll data
bzr revid: mga@tinyerp.com-20100721115602-m5mqo5fc42t0u267
2010-07-21 17:26:02 +05:30
Mantavya Gajjar fc7529f3e6 [IMP]: improvements to payroll module
bzr revid: mga@tinyerp.com-20100618005141-bh618yzj9ucz1jt5
2010-06-18 06:21:41 +05:30
Mantavya Gajjar 9f1620aeff [ADD]: add other files to the hr_payroll module
bzr revid: mga@tinyerp.com-20100606163023-pkf6httl19hma6nx
2010-06-06 22:00:23 +05:30