388f1a1d7e
[MERGE] forward port of branch saas-3 up to 3d4b82c
2014-10-01 16:46:03 +02:00
3d4b82cd56
[MERGE] forward port of branch 7.0 up to 9cc54dc
2014-10-01 12:41:42 +02:00
7201bc0250
[FIX] hr_payroll_account: do not create entries with amount at 0
...
If the salary compuation gives a salary of zero, skip the creation of the account.move.line (not good to have lines at 0).
Fixes lp:1298116, opw 605816
2014-09-30 16:37:24 +02:00
cbe2dbb672
[MERGE] new v8 api by rco
...
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.
- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
2014-07-06 17:05:41 +02:00
c2ba11e72e
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9885 revid:dle@openerp.com-20140310114026-r0ijm0m36su19wn7
...
bzr revid: dle@openerp.com-20140310122101-gicombyc5ii0yz6a
2014-03-10 13:21:01 +01:00
5d2e59e5e4
[FIX] hr_payroll_account: used float_compare() instead of direct comparing between two floats to avoid python rounding
...
bzr revid: rha@tinyerp.com-20140304113117-smy5gb9e92lcuji8
2014-03-04 17:01:17 +05:30
c46929268d
[FIX] account* modules: added 'account_period_prefer_normal':True in context when trying to find the period related to a date.
...
This patch will be forward ported in trunk by changing the behaviour of account_period.find() in order to fetch the normal periods by default (account_period_prefer_normal will be True by default) because there are no business case i could think of where you'd like to get the opening period (except in the closure but it's held in a different way there). On the other hand, it's pretty easy to forget to put that key in the context and introduce a new bug that will select the opening period instead of the wanted one
bzr revid: qdp-launchpad@openerp.com-20130418102433-t52uj23trkpr8vnb
2013-04-18 12:24:33 +02:00
e69326ee3b
[REF] removed explicit model instanciations.
...
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
9bb5ee90e4
[IMP] removed unused netsvc imports.
...
bzr revid: vmt@openerp.com-20130222161029-zecwro75yra2vz0d
2013-02-22 17:10:29 +01:00
e7f4891d46
[IMP] use the openerp namespace.
...
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
7c9ad49789
[IMP] in Payslips: change journal_id label
...
bzr revid: fka@tinyerp.com-20121003124911-o792xmzwj6tswt0e
2012-10-03 18:19:11 +05:30
7902111733
[MERGE] Merge from main addons
...
bzr revid: mra@tinyerp.com-20120823112104-5d4bx6cypst26zr0
bzr revid: mra@tinyerp.com-20120824064641-7jn10i1ykbndaywr
2012-08-24 12:16:41 +05:30
4f430733df
[MERGE] lp: 942373
...
bzr revid: qdp-launchpad@openerp.com-20120823114737-7roj7wmp8542hgbg
2012-08-23 13:47:37 +02:00
298119b0d3
[FIX]error of journal_id fixed and bank record added in yml
...
bzr revid: kbh@tinyerp.com-20120816124407-z0i24fk26k0jltlk
2012-08-16 18:14:07 +05:30
449e9ee6fa
[FIX]Journal entry for rule which is not in payslip lines is created.
...
bzr revid: kbh@tinyerp.com-20120621063800-0nhf399uaf1nbdmw
2012-06-21 12:08:00 +05:30
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
bf3cbb4305
[MERGE] polish3_hr_payroll: add constraint on dates, default value for expenses journal, and rename report
...
bzr revid: rco@openerp.com-20111130140107-t3ta1kmcy70smavd
2011-11-30 15:01:07 +01:00
2e758fb463
[IMP]:improved code
...
bzr revid: apa@tinyerp.com-20111123053154-gsay5gufpz83vkns
2011-11-23 11:01:54 +05:30
fe0754a549
hr_payroll
...
bzr revid: rmu@tinyerp.com-20111122124129-awp6gqiu2prp7egc
2011-11-22 18:11:29 +05:30
0ddceaf772
[FIX] hr_payroll_account : payroll_account: On payslip confirmation it should write the period_id on employee payslip.
...
lp bug: https://launchpad.net/bugs/893469 fixed
bzr revid: mdi@tinyerp.com-20111122121704-0wzjivii1mm65mx9
2011-11-22 17:47:04 +05:30
7678b52dd8
merge: implemented default method on hr_payslip
...
bzr revid: fp@tinyerp.com-20111117191455-vtxqul72sdg4use2
2011-11-17 20:14:55 +01:00
0037710e5d
[FIX] hr : Made copy method in hr_payroll_account/hr_payroll_account.py inorder to make move_id field false when the payslip is duplicated
...
lp bug: https://launchpad.net/bugs/891532 fixed
bzr revid: bde@tinyerp.com-20111117124811-i162so6m6shc0054
2011-11-17 18:18:11 +05:30
f032e11202
[FIX] Hr_payroll_account : System should check the existence of accounts configured in expense journal prior to validation of payslip
...
lp bug: https://launchpad.net/bugs/885663 fixed
bzr revid: support@serpentcs.com-20111104082755-xro8bmrnufwhbe3b
2011-11-04 13:57:55 +05:30
343937cd3c
[FIX] hr_payroll_account: deletion of a payslip with account_move
...
lp bug: https://launchpad.net/bugs/862218 fixed
bzr revid: qdp-launchpad@openerp.com-20111007134926-ur815yiv5gdq02pg
2011-10-07 15:49:26 +02:00
522f90e7d5
merge
...
bzr revid: fp@tinyerp.com-20110924151533-d2yiea7d28mdd5k2
2011-09-24 17:15:33 +02:00
36330b362a
[FIX] Hr_payroll: Inherit wizard of payslip runs to pass journl id on context which used to create payslips
...
bzr revid: mra@tinyerp.com-20110915054539-2ihi7ls1wlxer72t
2011-09-15 11:15:39 +05:30
bddfe1cd5a
[IMP] hr_payroll, hr_payroll_account: Payslip Run => add journal_id field on payslip run, improve search view, fix for done button on payslip run, usibility improvements
...
bzr revid: mra@tinyerp.com-20110915051636-54xj84eams3fvyu5
2011-09-15 10:46:36 +05:30
a3b678909d
[FIX] hr : hr_payroll_account error 6.1
...
lp bug: https://launchpad.net/bugs/837726 fixed
bzr revid: bde@tinyerp.com-20110831132731-26dsntk9rphpqpca
2011-08-31 18:57:31 +05:30
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
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
bc343fe251
[FIX] hr_payroll_account: misc fixes
...
bzr revid: qdp-launchpad@openerp.com-20110530100645-f9auedgpta62zp77
2011-05-30 12:06:45 +02:00
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
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
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
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
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
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
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
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
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
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
398f82a1b1
[IMP] hr_payroll_account: code cleaning
...
bzr revid: mtr@mtr-20110420133058-wrt4tzupai4osgfs
2011-04-20 19:00:58 +05:30
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
4ef1269259
[FIX] payroll_account: improve code
...
bzr revid: mra@mra-laptop-20110420113847-fu562g080n3svr8b
2011-04-20 17:08:47 +05:30
54338ff5a1
[FIX] payroll_account: fix
...
bzr revid: mra@mra-laptop-20110420112222-l0ztdl70fxhyqs16
2011-04-20 16:52:22 +05:30
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
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
eb36f0c726
[IMP] hr_payroll_account: commented unrequired prev_bounds() method
...
bzr revid: mtr@mtr-20110420085011-sujli3n7xeab22r3
2011-04-20 14:20:11 +05:30
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
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
Christophe Simonis
Denis Ledoux
Martin Trigaux
Raphael Collet
Denis Ledoux
Rifakat
Quentin (OpenERP)
Vo Minh Thu
Foram Katharotiya (OpenERP)
Mustufa Rangwala (OpenERP)
Khushboo Bhatt (Open ERP)
Amit (OpenERP)
RavishchanraMurari (Open ERP)
Divyesh Makwana (Open ERP)
Fabien Pinckaers
Bharat (OpenERP)
Serpent Consulting Services
Christopher Ormaza
psi (Open ERP)
mtr
Mustufa Rangwala