Commit Graph

28407 Commits

Author SHA1 Message Date
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
psi (Open ERP) adb7b1fab7 [IMP] comment the holidays_confirm method b'coz it was creating problem while creating new database due to demo data of holidays is without contract
bzr revid: psi@tinyerp.co.in-20110331125635-t0kcgsrepp37w311
2011-03-31 18:26:35 +05:30
psi (Open ERP) d9f0d9f279 [IMP] small change in holidays_confirm method so it will raise warning for only leave requests
bzr revid: psi@tinyerp.co.in-20110331123742-gc0vfk5a1d8gq10w
2011-03-31 18:07:42 +05:30
mtr e9b4d4538c [IMP] hr_payroll: improved string for 'state' fields
bzr revid: mtr@mtr-20110331123213-8kqt1becfgcqwfgy
2011-03-31 18:02:13 +05:30
psi (Open ERP) e5fb623048 [IMP] raise warning if there isn't any contract selected on employee leave request
bzr revid: psi@tinyerp.co.in-20110331122829-20k622n739xad2xi
2011-03-31 17:58:29 +05:30
psi (Open ERP) 01217907a4 [IMP] Improve _get_holidays method on hr.paysilp so it will not give traceback when no contract selected on hr.payslip
bzr revid: psi@tinyerp.co.in-20110331113828-k65poknbx19ye9ad
2011-03-31 17:08:28 +05:30
mtr c74c3fe55f [IMP] hr_payroll: improved code to check condition when amount_type=code
bzr revid: mtr@mtr-20110331104700-u3xp4h2rg42w9lkq
2011-03-31 16:17:00 +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 cb6176a892 [MERGE] merge
bzr revid: mra@mra-laptop-20110331102726-ouqn5sq5hur501nu
2011-03-31 15:57:26 +05:30
Mustufa Rangwala 71d2458390 [IMP] payroll improve code
bzr revid: mra@mra-laptop-20110331102436-h318f46xiwnm1u8m
2011-03-31 15:54:36 +05:30
mtr 14c6473473 [IMP] hr_payroll: improved code to avoid duplicate rules on payslip
bzr revid: mtr@mtr-20110331093109-0wq8bqq2q4t6y5bz
2011-03-31 15:01:09 +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
Mustufa Rangwala 2e4287681d [FIX] payroll
bzr revid: mra@mra-laptop-20110331071802-7dht90mooy7egqf1
2011-03-31 12:48:02 +05:30
Mustufa Rangwala 3066f1206b [FIX] fixes on payroll
bzr revid: mra@mra-laptop-20110331060658-d79zu4ov0ess6rix
2011-03-31 11:36:58 +05:30
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 8663c434a4 [IMP] hr_payroll: improved code
bzr revid: mtr@mtr-20110330084832-t4iuqxrl2l2le3b9
2011-03-30 14:18:32 +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
mtr 2d7687ab6e [MERGE] branch merged with trunk-payroll-salary_rules-psi
bzr revid: mtr@mtr-20110330051941-06s0i1nqfri8cv1r
2011-03-30 10:49:41 +05:30
mtr fa0ca7a4ae [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll
bzr revid: mtr@mtr-20110330044952-rcd1f1qfrrtoneoq
2011-03-30 10:19:52 +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
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
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
Xavier Morel 05a3ee3b46 [IMP] nicely style search date field (with little calendar icon)
bzr revid: xmo@openerp.com-20110401152833-p4f4r1vecdfkae4i
2011-04-01 17:28:33 +02:00
Xavier Morel b42333b86f [FIX] correctly format result of date picker, otherwise search blows up
bzr revid: xmo@openerp.com-20110401152649-mpjug9jdp4qvap0i
2011-04-01 17:26:49 +02:00
Xavier Morel ac649d5ccc [ADD] date search widget
bzr revid: xmo@openerp.com-20110401151735-hdxo0289ilmik1go
2011-04-01 17:17:35 +02:00
Xavier Morel efbeb7e50d [REF] move custom fields search below normal fields and inputs
bzr revid: xmo@openerp.com-20110401125313-xizmsalj4gf1mjur
2011-04-01 14:53:13 +02:00
Olivier Dony 11e1097c61 [FIX] ir.actions: fixed and documented a bit the function field computing views for actions
The previous implementation had numerous flaws and edge cases where it would
not have any useful result. The new implementation is backwards compatible
with the valid combinations of view_id, view_modes and view_id.
A unique constraint was also added to make sure that it is not possible to
specify multiple views of the same type for the same action. This was never
used, but should be prevented completely so that clients can rely on this
fact. Also a little bit of documentation was added to explain what the field
is doing.

bzr revid: odo@openerp.com-20110401124852-r0i6cclc80acoegj
2011-04-01 14:48:52 +02:00
Xavier Morel f40d778c2e [FIX] some domains and contexts have leading or trailing slashes, need to strip them before evaluation
bzr revid: xmo@openerp.com-20110401094835-k1w7xlgdcyppt7io
2011-04-01 11:48:35 +02:00
Xavier Morel a806fe63cc [ADD] fake views init in order to check the views are correctly instantiated
bzr revid: xmo@openerp.com-20110401094030-jysoq5gj9k20ulrd
2011-04-01 11:40:30 +02:00
Xavier Morel 52fb7adc66 [IMP] reverse logic for handling view-switching buttons so it's more efficient and straightforward
bzr revid: xmo@openerp.com-20110401091117-v2q0s57qp2xny7cx
2011-04-01 11:11:17 +02:00
Xavier Morel de1912d2a1 [IMP] enabling/disabling of switcher buttons on view switch
bzr revid: xmo@openerp.com-20110401090653-jr21w79p5e5pdfts
2011-04-01 11:06:53 +02:00