Commit Graph

188 Commits

Author SHA1 Message Date
Launchpad Translations on behalf of openerp 752df5acbd Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110905055933-cld0r3vv3jmiu5bx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110906044018-ajk9u7zfqoiatufs
2011-09-06 04:40:18 +00:00
Launchpad Translations on behalf of openerp ae7b1699cb Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110823050537-7q5lx6k2wq8n70ld
bzr revid: launchpad_translations_on_behalf_of_openerp-20110824043728-ri9o75i5hp2tss1x
2011-08-24 04:37:28 +00:00
Launchpad Translations on behalf of openerp 063e28a83d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110820045348-7oh5zs7l4lr3zsq1
2011-08-20 04:53:48 +00:00
Launchpad Translations on behalf of openerp ac9c0e55b0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110818043608-kjmi6rgmnpk2d36r
2011-08-18 04:36:08 +00:00
fp d2ac8defd8 [FIX] fixed yml tests due to removed fields on account payments
bzr revid: fp@fp-laptop-20110815230637-q86iamto5atzycfg
2011-08-16 01:06:37 +02:00
Raphael Collet 81a1eb18a1 [MERGE] from trunk
bzr revid: rco@openerp.com-20110718083424-kdaesx3gflza142a
2011-07-18 10:34:24 +02:00
Quentin (OpenERP) 4931d847ec [IMP] hr_payroll_account: code cleaning and fixing
bzr revid: qdp-launchpad@openerp.com-20110711224010-8jx0prw252dg02a2
2011-07-12 00:40:10 +02:00
mtr 418265d252 [IMP] hr_payroll,hr_payroll_account: improved yaml and demo data for payroll_account
bzr revid: mtr@mtr-20110711102754-1qw17zempu4e32ol
2011-07-11 15:57:54 +05:30
mtr 781ebda8f9 [MERGE] branch merged with trunk-payroll
bzr revid: mtr@mtr-20110711102131-gecb7yb6og0x8ac4
2011-07-11 15:51:31 +05:30
Raphael Collet 292b4683b6 [MERGE] add field 'complexity' in modules
bzr revid: rco@openerp.com-20110708100307-5axn5hnn92qm8qiw
2011-07-08 12:03:07 +02:00
Hardik Ansodariy (OpenERP) 1f5aa0643f [IMP]: module is defined by its complexity
bzr revid: han@tinyerp.com-20110706122928-xvcpdu5inpkganfy
2011-07-06 17:59:28 +05:30
Olivier Dony f36e724804 [IMP] removed remaining method=True params from fields.function
Server revision 3495 odo@openerp.com-20110701232328-flgxulxva70vnyxr
removed the need for passing method=True to function fields.

bzr revid: odo@openerp.com-20110705122857-zvzpamu0n24zst1q
2011-07-05 14:28:57 +02:00
Olivier Dony 06fb14130a [IMP] removed method=True params from all fields.function
Server revision 3495 odo@openerp.com-20110701232328-flgxulxva70vnyxr
removed the need for passing method=True to function fields,
so this is the equivalent addons fix, removing it everywhere.
Please be careful from now on, and do not pass it anymore!

bzr revid: odo@openerp.com-20110701234124-a61zl0idvdfz3hyb
2011-07-02 01:41:24 +02:00
Launchpad Translations on behalf of openerp eedefe1ebc Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110628044031-fyrldmppur3u2vso
2011-06-28 04:40:31 +00:00
Launchpad Translations on behalf of openerp d9527bc6e4 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110611045707-80hy5o0jzhzgegg6
bzr revid: launchpad_translations_on_behalf_of_openerp-20110612045225-0cb8z6pthizjz5jw
bzr revid: launchpad_translations_on_behalf_of_openerp-20110613043706-3shtfzjbmfhs6ase
bzr revid: launchpad_translations_on_behalf_of_openerp-20110614044016-zvbl05dph25z6npc
bzr revid: launchpad_translations_on_behalf_of_openerp-20110615044012-k78a3yz2w70ywfhe
2011-06-15 04:40:12 +00:00
Mustufa Rangwala 06c119ef26 [IMP] hr_payroll_account: Minor improvement in payslip.yml
bzr revid: mra@mra-laptop-20110607085259-ikf0uy2d7b3jta9u
2011-06-07 14:22:59 +05:30
mtr 0dc9fd9baf [IMP] hr_payroll_account: changed the string
bzr revid: mtr@mtr-20110607060132-972q4ptkl3awbosr
2011-06-07 11:31:32 +05:30
mtr d80ad7c068 [IMP] hr_payroll_account: added yml for hr_payroll_account module
bzr revid: mtr@mtr-20110607051215-auc7uacqdo2he2we
2011-06-07 10:42:15 +05:30
psi (Open ERP) 3eaa5428ee [IMP] hr_payroll_account: remove analaytic_account_id field and post the move only if the boolean 'skip draft state for new entry' is set on the selected journal of payslip
bzr revid: psi@tinyerp.co.in-20110531070228-vp7doq20e6cbgjro
2011-05-31 12:32:28 +05:30
Quentin (OpenERP) bc343fe251 [FIX] hr_payroll_account: misc fixes
bzr revid: qdp-launchpad@openerp.com-20110530100645-f9auedgpta62zp77
2011-05-30 12:06:45 +02:00
mtr d65bc5d7ca [IMP] hr_payroll_account: minor change in Adjustment entry for debit
bzr revid: mtr@mtr-20110527052921-w6dnm07rpn3nzx3b
2011-05-27 10:59:21 +05:30
mtr 4f28c87d46 [IMP] hr_payroll_account: changed variable name and string for adjustment moves
bzr revid: mtr@mtr-20110527051611-plh7e43c6n9brx5x
2011-05-27 10:46:11 +05:30
mtr 2aeb9b6ef4 [IMP] hr_payroll_account: improved code to create accounting entries in order to balance the moves
bzr revid: mtr@mtr-20110526131045-st6zsk868ul0zs3q
2011-05-26 18:40:45 +05:30
mtr 0bff771eda [IMP] hr_payroll_account: removed fields from contribution.register and salary.rule
bzr revid: mtr@mtr-20110516103231-vzmxbdy11zyhs52y
2011-05-16 16:02:31 +05:30
Quentin (OpenERP) 6abc27ba6d [FIX] hr_payroll_account: debugged the process_sheet method()
bzr revid: qdp-launchpad@openerp.com-20110512114749-bbpukg17a3kad67q
2011-05-12 13:47:49 +02:00
Quentin (OpenERP) e9e490b1fe [FIX] hr_payroll_account: removed the reference to old and removed objects
bzr revid: qdp-launchpad@openerp.com-20110512110703-9ri4udog0gdmo422
2011-05-12 13:07:03 +02:00
Quentin (OpenERP) b98ea8905e [IMP] hr_payroll_account: no need of new security rules in the module hr_payroll_account
bzr revid: qdp-launchpad@openerp.com-20110512110243-9ixjk1ywyxwn00a6
2011-05-12 13:02:43 +02:00
Quentin (OpenERP) 6b5e01d3ea [IMP] hr_payroll_account: cleaning of views and implementation of compute_sheet method
bzr revid: qdp-launchpad@openerp.com-20110512110121-mqo8bv40fc54wdp3
2011-05-12 13:01:21 +02:00
Quentin (OpenERP) b653a74923 [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
2011-05-12 10:01:47 +02:00
mtr 3682e3df40 [IMP] hr_payroll_account: made account_id unrequired field on contribution register
bzr revid: mtr@mtr-20110512053637-2yudj4rinjtwayy1
2011-05-12 11:06:37 +05:30
mtr 9dda35f064 [IMP] hr_payroll_account: added onchange_employee_id method and comments(help) in the code
bzr revid: mtr@mtr-20110512051949-8znbh8wy6yyt192t
2011-05-12 10:49:49 +05:30
Olivier Dony 560915cb68 [MERGE] merged latest fixes from 6.0 up to r.4556
Rev 4556 = revision-id: jvo@tinyerp.com-20110502133745-s1zyed65h6ojwkvk.

bzr revid: odo@openerp.com-20110502184643-d3qzosqdurscd51i
2011-05-02 20:46:43 +02:00
Launchpad Translations on behalf of openerp d553615695 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110429055618-q15rvfmlvfsl2im5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110430045341-qzlphdlvqf2aa1zx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110501045420-py2vl38b1o3mfs7o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110502043731-ym2tvgj2djoitk8f
2011-05-02 04:37:31 +00:00
Michael Telahun Makonnen, mtr(OpenERP) faf4bec06c [FIX] hr_payroll_account: changed domain and ir.property to make account type=payable
lp bug: https://launchpad.net/bugs/761456 fixed

bzr revid: mtr@mtr-20110421113925-r6j0cxhdxrcaqqyg
2011-04-21 17:09:25 +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
Mustufa Rangwala 005d73a5e5 [FIX] Payroll_account: fix
bzr revid: mra@mra-laptop-20110421062209-dv0rpudc6tdt6gtg
2011-04-21 11:52:09 +05:30
Mustufa Rangwala bee4dc8551 [MERGE] merge from same branch
bzr revid: mra@mra-laptop-20110421051522-2sas8btck974jirm
2011-04-21 10:45:22 +05:30
Mustufa Rangwala 2f9f8f1e4f [FIX] Payroll: rename demo file
bzr revid: mra@mra-laptop-20110421051146-xvy2lvai7wa8k9lw
2011-04-21 10:41:46 +05:30
ARA (OpenERP) 4d1f84ccac [FIX] hr_payroll_accounr: merge same for same branch
bzr revid: ara@tinyerp.com-20110420133835-bxkb1dwgznexhm6g
bzr revid: ara@tinyerp.com-20110421045652-2c44p0ypnfxsvu0f
2011-04-21 10:26:52 +05:30
mtr 398f82a1b1 [IMP] hr_payroll_account: code cleaning
bzr revid: mtr@mtr-20110420133058-wrt4tzupai4osgfs
2011-04-20 19:00:58 +05:30
mtr 956f12eccd [IMP] hr_payroll_account: assign journal on payslip with contract journal
bzr revid: mtr@mtr-20110420132508-7u5lry0mkq9533a9
2011-04-20 18:55:08 +05:30
ARA (OpenERP) 3e87d45ce3 [FIX] hr_payroll_account: payslip line link not working
bzr revid: ara@tinyerp.com-20110420132428-kk8fa7v0bhm616d9
2011-04-20 18:54:28 +05:30
Mustufa Rangwala 4ef1269259 [FIX] payroll_account: improve code
bzr revid: mra@mra-laptop-20110420113847-fu562g080n3svr8b
2011-04-20 17:08:47 +05:30
Mustufa Rangwala 54338ff5a1 [FIX] payroll_account: fix
bzr revid: mra@mra-laptop-20110420112222-l0ztdl70fxhyqs16
2011-04-20 16:52:22 +05:30
Mustufa Rangwala c158f0235e [FIX] Payroll: Correct xml views
bzr revid: mra@mra-laptop-20110420111117-1k9ihl2ytwu1zbyq
2011-04-20 16:41:17 +05:30
mtr ba2f190424 [IMP] hr_payroll_account: added account.move(m2m) field on payslip and improved code to get its Entries
bzr revid: mtr@mtr-20110420103811-rphergw2re9ca11y
2011-04-20 16:08:11 +05:30
mtr 2447cd56dd [IMP] hr_payroll_account: improved code to assigned analytic account on payslip line from salary rule
bzr revid: mtr@mtr-20110420085519-emevo3dufjvso7w6
2011-04-20 14:25:19 +05:30
mtr eb36f0c726 [IMP] hr_payroll_account: commented unrequired prev_bounds() method
bzr revid: mtr@mtr-20110420085011-sujli3n7xeab22r3
2011-04-20 14:20:11 +05:30
mtr fa908b5e00 [IMP] hr_payroll_account: commented code, creating hr.expense.expense as payslip line
bzr revid: mtr@mtr-20110419124637-p96wnqvwbfm3uhv1
2011-04-19 18:16:37 +05:30
mtr 5051b21ea4 [IMP] hr_payroll_account: improved code to assign credit/debit account on payslip line
bzr revid: mtr@mtr-20110419124401-fpn4kxijz74xxhbu
2011-04-19 18:14:01 +05:30