Quentin (OpenERP)
546fb69c7c
[REF] hr_contract: removed commented code (for 'the sake of clarity' and because bazaar is your historian ^^)
...
bzr revid: qdp-launchpad@openerp.com-20110406131149-i1135jaom7vhny8z
2011-04-06 15:11:49 +02:00
Quentin (OpenERP)
8713630eb8
[REF] hr_contract: removed commented code (for 'the sake of clarity' and because bazaar is your historian ^^)
...
bzr revid: qdp-launchpad@openerp.com-20110406130721-ttg9xgrkq5n3ry3d
2011-04-06 15:07:21 +02:00
Quentin (OpenERP)
a6fb80e028
[REF] hr_payroll: small code refactoring in compute_sheet() method
...
bzr revid: qdp-launchpad@openerp.com-20110406125421-owo9vuxjldb9ddoo
2011-04-06 14:54:21 +02:00
Quentin (OpenERP)
27b3cf53c6
[IMP] hr_contract: enable back the yaml test (why was it disable?)
...
bzr revid: qdp-launchpad@openerp.com-20110406124624-iv16tm1egw1i2yvn
2011-04-06 14:46:24 +02:00
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
psi (Open ERP)
2147838dda
[FIX] small fix in compute_sheet method so it will delete the old payslip lines
...
bzr revid: psi@tinyerp.co.in-20110406055519-u9a1joiyp8f3f2m0
2011-04-06 11:25:19 +05:30
psi (Open ERP)
5853d90ae0
[FIX] small fix in compute_sheet method
...
bzr revid: psi@tinyerp.co.in-20110406053948-mg7uc3mo23vaat0d
2011-04-06 11:09:48 +05:30
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
440392700c
[IMP] hr_payroll: minor changes on payslip report, still major changes are yet to be completed
...
bzr revid: mtr@mtr-20110405133834-u5u2k3toqfn2brej
2011-04-05 19:08:34 +05:30
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
mtr
481a4d104e
[IMP] hr_payroll:improved ir.model.access.csv file
...
bzr revid: mtr@mtr-20110405062132-fswk1fn73341866x
2011-04-05 11:51:32 +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
Mustufa Rangwala
9843f42b1f
[FIX] payroll
...
bzr revid: mra@mra-laptop-20110404130033-rxhyg3jpwga7xaof
2011-04-04 18:30:33 +05:30
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)
c369b99712
[FIX] hr_payroll
...
bzr revid: psi@tinyerp.co.in-20110404100637-ljba7flsrrawhxdp
2011-04-04 15:36:37 +05:30
Mustufa Rangwala
3bb9bf2065
[FIX] payrol;
...
bzr revid: mra@mra-laptop-20110404100136-usw6fe76l64bph8u
2011-04-04 15:31:36 +05:30
psi (Open ERP)
9c796d9768
[IMP] Improve verify_sheet method of hr.payslip object so it will consider the child rules and holidays
...
bzr revid: psi@tinyerp.co.in-20110404090656-mq92felignt05nq5
2011-04-04 14:36:56 +05:30
psi (Open ERP)
cf2ed5f5aa
[IMP] onchange will clear the field details_by_salary_head
...
bzr revid: psi@tinyerp.co.in-20110404065026-6klls1fkg3mt8j41
2011-04-04 12:20:26 +05:30
mtr
d2ca30caf9
[IMP] hr_payroll:improved code to calculate total_payment for multiple contract
...
bzr revid: mtr@mtr-20110404064453-sd7a9pecamnt80fn
2011-04-04 12:14:53 +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
6c5051fa38
[MERGE] merge from trunk-payroll branch
...
bzr revid: mra@mra-laptop-20110404044953-hi0lrxppki4nekr2
2011-04-04 10:19:53 +05:30
Mustufa Rangwala
57da5007e5
[MERGE] merge from trunk addons
...
bzr revid: mra@mra-laptop-20110317044632-q2idnbo10137sp20
bzr revid: mra@mra-laptop-20110318090655-j34s9q5qu3iika49
bzr revid: mra@mra-laptop-20110321091456-nn8ydasget5h400r
bzr revid: mra@mra-laptop-20110322130110-e4q5os11b2aphfk6
bzr revid: mra@mra-laptop-20110323043940-490q3q9lnwwvduy0
bzr revid: mra@mra-laptop-20110328045527-rih3g38wcgonx05m
bzr revid: mra@mra-laptop-20110329045144-vclevl8cvq05ga8c
bzr revid: mra@mra-laptop-20110330044007-iiokjyv6ap6k94ak
bzr revid: mra@mra-laptop-20110401043719-mtgl4wwz90mi5rac
bzr revid: mra@mra-laptop-20110404044827-rqbqf6jdaf9o5unc
2011-04-04 10:18:27 +05:30
Launchpad Translations on behalf of openerp
838512af0b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110401044755-ox0af9npzekocmtk
bzr revid: launchpad_translations_on_behalf_of_openerp-20110402045547-u88jxku3jz7ejycg
bzr revid: launchpad_translations_on_behalf_of_openerp-20110403044009-x9bqq57ukyqvp6ia
bzr revid: launchpad_translations_on_behalf_of_openerp-20110404044757-3uw7ib92gpv7ezu1
bzr revid: launchpad_translations_on_behalf_of_openerp-20110405044706-ew5moemiz1wxra7h
2011-04-05 04:47:06 +00:00
Antony Lesuisse
a3718ca395
jquery patch to get stack trace back in webkit
...
bzr revid: al@openerp.com-20110404200829-61780xapqq043pcr
2011-04-04 22:08:29 +02:00
Antony Lesuisse
f59a134519
cosmetic changes, remove debug div
...
bzr revid: al@openerp.com-20110404195216-mp01qygi4er4k9yh
2011-04-04 21:52:16 +02:00
Fabien Meghazi
e9b3548c11
[ADD] Partial pager in form view
...
bzr revid: fme@openerp.com-20110404160936-4uk9pywwdbv6qj9f
2011-04-04 18:09:36 +02:00
Antony Lesuisse
04969e8bf1
base_diagram
...
bzr revid: al@openerp.com-20110404155209-muckezl9xvm8ocxl
2011-04-04 17:52:09 +02:00
Fabien Meghazi
345496d9a3
[ADD] Added do_show and do_hide in views
...
bzr revid: fme@openerp.com-20110404153426-2vlz4n0s4v69b5o5
2011-04-04 17:34:26 +02:00
Fabien Meghazi
6dd76ea8f6
[FIX] Simplified dataset. Plugged form view.
...
bzr revid: fme@openerp.com-20110404150619-z8tc382ujdfw89ji
2011-04-04 17:06:19 +02:00
Antony Lesuisse
1865a1dae0
typo
...
bzr revid: al@openerp.com-20110404113803-hme1ls2rxahxa64w
2011-04-04 13:38:03 +02:00
Antony Lesuisse
9ad770a2da
[MERGE] xmo viewmanager
...
bzr revid: al@openerp.com-20110404112535-pa3ss7ymj6mr97r1
2011-04-04 13:25:35 +02:00
mtr
c472eaafbc
[IMP] hr_payroll:improved code to calculate total_payment using 'NET' rule
...
bzr revid: mtr@mtr-20110401133226-pbhv7xbr5n7bwwji
2011-04-01 19:02:26 +05:30
psi (Open ERP)
a5cacc1ff7
[IMP] clean the code
...
bzr revid: psi@tinyerp.co.in-20110401131735-pwddzzgf21ie4hcj
2011-04-01 18:47:35 +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
03a02288f9
[FIX] payroll: fix on payroll register
...
bzr revid: mra@mra-laptop-20110401122643-mbuqzap5emjzxvg3
2011-04-01 17:56:43 +05:30
Mustufa Rangwala
a8f0b1ac53
[MERGE] merge from same branch
...
bzr revid: mra@mra-laptop-20110401122314-i08827x7u2ebeffo
2011-04-01 17:53:14 +05:30
Mustufa Rangwala
2688eada6e
[FIX] payroll
...
bzr revid: mra@mra-laptop-20110401122132-5rdibau7jngyeeal
2011-04-01 17:51:32 +05:30
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
Xavier Morel
f880ecb5d9
[FIX] race condition on auto_search due to desynchronized loading of search view and {any default main view}
...
If loading of search view completes before loading of content view, do_search is immediately called on search view and forwarded to content view which is *not* ready yet and therefore blows up.
Solved by having start() methods return a promise object (or a non-promise object taken as a fulfilled promise) which the viewmanager can use (from both search view and initial content view) to synchronize when both are ready and it's possible to start a search
bzr revid: xmo@openerp.com-20110401115005-inceqsj7qn4k3b8e
2011-04-01 13:50:05 +02:00
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
Mustufa Rangwala
6056d569ae
[FIX] Payroll: Small fix
...
bzr revid: mra@mra-laptop-20110401110105-8i6rmnxd4rdz8qr4
2011-04-01 16:31:05 +05:30
Mustufa Rangwala
0b2aeb031e
[FIX] Payroll: Small but if we have no stcture defined for contract and try to make onchanges
...
bzr revid: mra@mra-laptop-20110401105807-1l1z3gvg1top1wei
2011-04-01 16:28:07 +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
Xavier Morel
0a5a8cd81a
[IMP] show and hide search view based on whether the currently displayed view is searchable
...
Note: searchability is *opt-out*, a view is searchable until it unambiguously states 'do not search me'
bzr revid: xmo@openerp.com-20110401104500-n7g6so01xb8oow3n
2011-04-01 12:45:00 +02:00
Antony Lesuisse
96e08cf3d1
action handling proposal
...
bzr revid: al@openerp.com-20110401104454-djtm0728azy66g76
2011-04-01 12:44:54 +02:00
Fabien Meghazi
3cc735cc2c
[IMP] Improved date widget styling
...
bzr revid: fme@openerp.com-20110404090047-yvmbfnnt910b553n
2011-04-04 11:00:47 +02:00
Fabien Meghazi
1c07f1dd53
[FIX] Fix dataset testsuite that I broke in rev #4648
...
bzr revid: fme@openerp.com-20110404082842-i95u0pg31xj8vy1t
2011-04-04 10:28:42 +02:00