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

186 Commits

Author SHA1 Message Date
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
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 9ed1b31b4f [ADD] Payroll: Payslip line action on payslip + search view added for payslip lines 
bzr revid: mra@mra-laptop-20110412095337-ohnd7nymekow41eb
 2011-04-12 15:23:37 +05:30
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) 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) 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
Quentin (OpenERP) 24ea4323c6 [IMP] hr_payroll: view improvements 
bzr revid: qdp-launchpad@openerp.com-20110408101059-mnfv1v4xabha6ob0
 2011-04-08 12:10:59 +02:00
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
Mustufa Rangwala 7ff22495b9 [FIX] Payroll: Remove contribution reg lines in xml and in .csv 
bzr revid: mra@mra-laptop-20110407130634-syjdvcme17nwhdhe
 2011-04-07 18:36:34 +05:30
Mustufa Rangwala 7e320d618f [FIX] payroll: Not open employee form 
bzr revid: mra@mra-laptop-20110407110844-5bchm1c4mrkoomtt
 2011-04-07 16:38:44 +05:30
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
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
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) 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
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 33a795167f [MERGE] merge 
bzr revid: mra@mra-laptop-20110401113506-274l4aoq3nu1jb9w
 2011-04-01 17:05:06 +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
psi (Open ERP) 6ee3a940ed [IMP] improve Holidays and Details by Salary Head tab view of payslip 
bzr revid: psi@tinyerp.co.in-20110401112511-dxidmww1ujzxgrg2
 2011-04-01 16:55:11 +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
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
Mustufa Rangwala 47c207a56a [FIX] Payroll: Remove appear on payslip tab from payslip form 
bzr revid: mra@mra-laptop-20110401044945-73k0m9t2tyzdloar
 2011-04-01 10:19:45 +05:30
Mustufa Rangwala b390d2ce07 [ADD] compuation exp tab 
bzr revid: mra@mra-laptop-20110331103748-p50ewmk1vfq99p8y
 2011-03-31 16:07:48 +05:30
Mustufa Rangwala 352a3ec142 [FIX] payroll remove the tabs 
bzr revid: mra@mra-laptop-20110331092325-vfsm4q487lh9dmo2
 2011-03-31 14:53:25 +05:30
Mustufa Rangwala ab98d8809d [FIX] payroll 
bzr revid: mra@mra-laptop-20110331092048-uivs7dxmh2o7fhp8
 2011-03-31 14:50:48 +05:30
Osenda f7777d457d [IMP] in payslip asked by qdp 
bzr revid: osenda-20110331072504-pspga7znfo87dvl0
 2011-03-31 09:25:04 +02:00
Osenda 88de3c4148 [IMP]new salary head view 
bzr revid: osenda-20110330133046-o4ef7gz1n1laekt5
 2011-03-30 15:30:46 +02:00
Osenda ca98534357 [IMP] l10n_be_payroll: rules ok 
bzr revid: osenda-20110330082730-9esh7xn89mv9s0v5
 2011-03-30 10:27:30 +02:00
mtr 97a5a3c227 [MERGE] branch merged with trunk-payroll-salary_rules-psi 
bzr revid: mtr@mtr-20110331050506-yczfv6k3rq0027r5
 2011-03-31 10:35:06 +05:30
psi (Open ERP) 4bf712c413 [IMP] on_change_contract works for every condition now 
bzr revid: psi@tinyerp.co.in-20110330132114-i30h0pk8ho8ikjme
 2011-03-30 18:51:14 +05:30
mtr b8bdd54fe1 [IMP] hr_payroll: committing view changes which got reverted 
bzr revid: mtr@mtr-20110330063927-25p27rwvklr12ge8
 2011-03-30 12:09:27 +05:30
mtr 473be47059 [IMP] hr_payroll: improved string 
bzr revid: mtr@mtr-20110330053457-jf3gowwjdbs290w1
 2011-03-30 11:04:57 +05:30
mtr 4f27ec3e8f [IMP] hr_payroll: again committing changes which got reverted 
bzr revid: mtr@mtr-20110330053055-3ovz8idtmrvtkoqq
 2011-03-30 11:00:55 +05:30
psi (Open ERP) bc6a98c3ab [IMP] onchange_employee on holidays will update the contract also, and now get_contract function will return list of contract object 
bzr revid: psi@tinyerp.co.in-20110329133243-ki3uigbuskveb6sd
 2011-03-29 19:02:43 +05:30
psi (Open ERP) fa5ceb85c2 [MERGE] merge with mtr's branch 
bzr revid: psi@tinyerp.co.in-20110329072747-zugi6o6pmpsvtt3z
bzr revid: psi@tinyerp.co.in-20110329073653-ueki6be4gby8briw
 2011-03-29 13:06:53 +05:30
psi (Open ERP) c92303afc1 [IMP] hr_payroll: Holidays for multiple contracts 
bzr revid: psi@tinyerp.co.in-20110329072648-e9dilqyvijhv6li2
 2011-03-29 12:56:48 +05:30
Osenda e9d028ea34 [IMP]Changes on salary rule form 
bzr revid: osenda-20110328135032-yfumqec54ovtsbox
 2011-03-28 15:50:32 +02:00
mtr 8eaf9ae4a5 [IMP] hr_payroll:created a method for three function fields. 
bzr revid: mtr@mtr-20110328123241-m0tul6jysd4cr2k8
 2011-03-28 18:02:41 +05:30
psi (Open ERP) 491387a736 [IMP] Update the code of compute_sheet method for recompute button 
bzr revid: psi@tinyerp.co.in-20110328102153-z7deqd97musv89d0
 2011-03-28 15:51:53 +05:30
psi (Open ERP) cfb4267d8a [MERGE, IMP] Merge with mtr's branch and improve compute_sheet method for multiple contracts of an employee 
bzr revid: psi@tinyerp.co.in-20110328052714-7p6lh6p9hzj9s7pr
 2011-03-28 10:57:14 +05:30
psi (Open ERP) f8050e531c [IMP] hr_payroll: Improve onchange_employee_id function so it will consider more than one contract 
bzr revid: psi@tinyerp.co.in-20110325132010-2wbznignx994jvb5
 2011-03-25 18:50:10 +05:30