Commit Graph
28423 Commits
Author SHA1 Message Date
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
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
mtr b78fdb96ec [IMP] hr_payroll: improved company contribution
bzr revid: mtr@mtr-20110401103832-vla2it1171yumm8w
2011-04-01 16:08:32 +05:30
psi (Open ERP) c6ef6826a9 [IMP] Details by salary head will show the salary head related to holidays also
bzr revid: psi@tinyerp.co.in-20110401100750-uxlggpoxumej3ihf
2011-04-01 15:37:50 +05:30
Mustufa Rangwala 45ee81b6be [MERGE] merge from trunk-payroll branch
bzr revid: mra@mra-laptop-20110401055801-dd4el5ugvrg2723h
2011-04-01 11:28:01 +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
Xavier Morel 11bdbfef5c [MERGE] view manager redo from proto-61
Full of timing bugs ;_;

bzr revid: xmo@openerp.com-20110401090249-kxp4xkm92sqkxu1e
2011-04-01 11:02:49 +02:00
Mustufa Rangwala cafe5a4baa [FIX] payroll: structure on payslip readonly
bzr revid: mra@mra-laptop-20110401054512-s2s2pfu2miq9xgw9
2011-04-01 11:15:12 +05:30
psi (Open ERP) ad0286795f [IMP] Holidays based on contract
bzr revid: psi@tinyerp.co.in-20110401051417-od73wdl9u77vto1g
2011-04-01 10:44:17 +05:30
mtr 794e3ee8b2 [IMP] hr_payroll: added NET rule in data file and removed 'sequence' field
bzr revid: mtr@mtr-20110401051048-f20cz98tdqmlrewd
2011-04-01 10:40:48 +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
Antony Lesuisse 0d9a590970 [MERGE] fme viewmanager updates
bzr revid: al@openerp.com-20110331172258-vzrkxqeo4rk2lsvx
2011-03-31 19:22:58 +02:00
Fabien Meghazi 6910a9c19a [ADD] Activated simple datepicker on date field
bzr revid: fme@openerp.com-20110331160323-opcovdlczzi6ugxs
2011-03-31 18:03:23 +02:00
Fabien Meghazi 6de5177cf3 [ADD] calendar image
bzr revid: fme@openerp.com-20110331160309-0jybr51uf03ygizh
2011-03-31 18:03:09 +02:00
Xavier Morel baf8d2d9a9 [IMP] server behavior fix: split tree view mode into tree and list based on view_type, nuke view_type
bzr revid: xmo@openerp.com-20110331152531-cpff6js0k8v4dtk9
2011-03-31 17:25:31 +02:00
Fabien Meghazi 79ce2be95e [IMP] DataSet has no more notion of fields. These are now inherent to the views.
bzr revid: fme@openerp.com-20110331151441-z5xtn0j4kohi72ja
2011-03-31 17:14:41 +02:00
Xavier Morel 16d580a573 [FIX] generify view management using a registry
bzr revid: xmo@openerp.com-20110331145432-qg0kigi1xtgxvk1i
2011-03-31 16:54:32 +02:00
Fabien Meghazi 4d76991c55 [FIX] Search is now done by the view and not by the viewmanager
bzr revid: fme@openerp.com-20110331144422-34wmf2bauc0lmz7d
2011-03-31 16:44:22 +02:00
Xavier Morel 95bd1d1237 [IMP] have action manager correctly stop the view manager
bzr revid: xmo@openerp.com-20110331134346-bn5fuq62ypcjs0fz
2011-03-31 15:43:46 +02:00