Commit Graph
70704 Commits
Author SHA1 Message Date
Jagdish Panchal (Open ERP) 87f1f877c3 [IMP] l10n_in: improve code in xml
bzr revid: jap@tinyerp.com-20120518115421-z8uejo5jfbtjc03g
2012-05-18 17:24:21 +05:30
Thibault Delavallée a43bd1d904 [IMP] Statusbar widget: merged the two versions into a generic one.
bzr revid: tde@openerp.com-20120518114731-k765gtrja6djp0h0
2012-05-18 13:47:31 +02:00
DBR (OpenERP) 38d3044665 [IMP]hr_holidays:Improve leave tooltip for date
bzr revid: dbr@tinyerp.com-20120518114550-bo8dh6hbsh53wxii
2012-05-18 17:15:50 +05:30
Sbh (Openerp) 2068ff73d9 [MERGE] hr_recruitment changes
bzr revid: sbh@tinyerp.com-20120518114413-xtmtm8g7ws1naonz
2012-05-18 17:14:13 +05:30
Divyesh Makwana (Open ERP) 09e4a6e95c [IMP] sale : Opens sales order form when quotation is confirmed.
bzr revid: mdi@tinyerp.com-20120518113937-ut4kghjs0pvd3378
2012-05-18 17:09:37 +05:30
Xavier Morel ffbd7480a4 [ADD] 'locked' icon on non-public custom filters
Icon is kind-of crummy, but none of the iconic font's icons work,
they're too small to work correctly (especially when using both locked
and unlocked, they can't be distinguished below a font size of ~48)

bzr revid: xmo@openerp.com-20120518111202-3h19grpq5cxgejg0
2012-05-18 13:12:02 +02:00
Pinakin Nayi (OpenERP) a2b8056409 [IMP]hr_recruitment: Improve name, tooltips
bzr revid: pna@tinyerp.com-20120518110349-idx1knrdrsncocde
2012-05-18 16:33:49 +05:30
DBR (OpenERP) d42c1b7fad [IMP]stock: remove conflicts
bzr revid: dbr@tinyerp.com-20120518103941-9mwsya999g1vmslc
2012-05-18 16:09:41 +05:30
Amit (OpenERP) f9c2437959 [FIX] account : Add access rules for entry analysis report
lp bug: https://launchpad.net/bugs/999506 fixed

bzr revid: amp@tinyerp.com-20120518103541-vfp9bh4p9dqwbr18
2012-05-18 16:05:41 +05:30
Divyesh Makwana (Open ERP) 7e66d4f3a3 [IMP] account_voucher : Added groups to journal items.
bzr revid: mdi@tinyerp.com-20120518101032-nd304pu1re8633n0
2012-05-18 15:40:32 +05:30
Olivier Dony f28bdc7c9b [MERGE] ir.filters: unassigned filters are now global
Both clients will be adapted very soon to properly
handle the new global filters

bzr revid: odo@openerp.com-20120518100706-n5o94okkf119grky
2012-05-18 12:07:06 +02:00
Divyesh Makwana (Open ERP) a8de539a2c [IMP] stock : Added groups to stock journal.
bzr revid: mdi@tinyerp.com-20120518100604-jn29z8khf3o06tfh
2012-05-18 15:36:04 +05:30
DBR (OpenERP) bf406c4af7 [IMP]hr_holidays: remove extra import
bzr revid: dbr@tinyerp.com-20120518095544-u0qrrgaaqmc4cbhg
2012-05-18 15:25:44 +05:30
Xavier Morel f03d64365b [FIX] correctly save group_by context key when saving a search to a dashboard
bzr revid: xmo@openerp.com-20120518094443-boszrcvibitbrozf
2012-05-18 11:44:43 +02:00
Pinakin Nayi (OpenERP) 9fcd0f639b [IMP] hr_recruitmentimprove tooltips
bzr revid: pna@tinyerp.com-20120518092641-jjvw8s5m0308rz6o
2012-05-18 14:56:41 +05:30
Pinakin Nayi (OpenERP) 5c0d84a109 [merge] merge with parent beanch
bzr revid: pna@tinyerp.com-20120518090239-8tr76ftzqbo5xnuf
2012-05-18 14:32:39 +05:30
Amit (OpenERP) e8ee0449f5 [FIX] stock : fixes some hidden bug on get_product_available function
lp bug: https://launchpad.net/bugs/998631 fixed

bzr revid: amp@tinyerp.com-20120518085818-8cuybt5d2qsgd3fg
2012-05-18 14:28:18 +05:30
Xavier Morel 9b6e1a876f [FIX] priorities when selecting view modes in dashboard
In the case of ``list`` view mode, code would fail to use provided
``views`` array (and therefore lose the view id), overriding it with
``[false, 'list']`` instead.

Original issue seemed to be that the dashboard's ``view_mode`` may
contain view names which are not in the original action's ``views``
array (?) in which case the _.find call returns ``undefined`` and then
blows up.

This was fixed by pre-checking the dashboard's view mode against the
action's view_mode, which is:

1. Wrong, as the action's view_mode will always contain ``tree`` never
   ``list``
2. Weird, why not fallback *instead of returning ``undefined``*?

So that's what was changed: instead of returning ``undefined`` the
mapping function now returns a default ``[false, mode]`` pair.

bzr revid: xmo@openerp.com-20120518085105-job3luim44ih6nps
2012-05-18 10:51:05 +02:00
Olivier Dony 2f9888a701 [MERGE] Sync with latest trunk
bzr revid: odo@openerp.com-20120518084926-dplc49g38krv7dsn
2012-05-18 10:49:26 +02:00
DBR (OpenERP) 17c776c2eb [Merge]with: lp:openobject-addons
bzr revid: dbr@tinyerp.com-20120518084522-enysb9wuzo22g1bs
2012-05-18 14:15:22 +05:30
Thibault Delavallée 860a1cbbe2 [MERGE] Merged with main web.
bzr revid: tde@openerp.com-20120518083926-0w0igb83bbd30v03
2012-05-18 10:39:26 +02:00
Thibault Delavallée 7976598531 [MERGE] Merged with main addons.
bzr revid: tde@openerp.com-20120518083900-kwrk13lxhflciq7g
2012-05-18 10:39:00 +02:00
Ashvin Rathod (OpenERP) c43ab9e5c1 [IMP] hr_recruitment: add tooltips on buttons
bzr revid: ara@tinyerp.com-20120518064217-hq99bghaqc2d9evc
2012-05-18 12:12:17 +05:30
Turkesh Patel (Open ERP) 4661fb71d2 [FIX] account: set ondelete='cascade' on payment_id for allow to delete payment term.
bzr revid: tpa@tinyerp.com-20120518063348-1lm9oyy0kw5pkwdy
2012-05-18 12:03:48 +05:30
Sbh (Openerp) 3b74b8f83a [MERGE] Merge chagnges of meeting
bzr revid: sbh@tinyerp.com-20120518062652-wlcmf0qjcrn2p30k
2012-05-18 11:56:52 +05:30
Ashvin Rathod (OpenERP) 9154401fb6 [IMP] Impreve survey form view
bzr revid: ara@tinyerp.com-20120518060156-vesnnis4d4hxgol1
2012-05-18 11:31:56 +05:30
Mayur Maheshwari (OpenERP) 7c06e4a5b6 [IMP]module: improve tree and form view and remove complexity field from ir.module object
bzr revid: mma@tinyerp.com-20120518052939-51ps201qaq51g2bp
2012-05-18 10:59:39 +05:30
Mayur Maheshwari (OpenERP) ea859f54c8 [IMP]all: remove a complexity in openerp and move asset management and Payroll in extra modules
bzr revid: mma@tinyerp.com-20120518052605-e6sdmicwtb4kcoq0
2012-05-18 10:56:05 +05:30
Jagdish Panchal (Open ERP) 9ee1727eb7 [IMP] l10n_in: improve code for tax account
bzr revid: jap@tinyerp.com-20120518045917-rv2mgpo2tlel5fm2
2012-05-18 10:29:17 +05:30
Launchpad Translations on behalf of openerp bd0bc7d4c5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120517043702-3k4asqkfmh2j0eca
bzr revid: launchpad_translations_on_behalf_of_openerp-20120518044026-ms6s6v52bntmiayu
2012-05-18 04:40:26 +00:00
Kuldeep Joshi (OpenERP) e2c4052741 [IMP]hr_recruitment: change the string
bzr revid: kjo@tinyerp.com-20120517132101-tnym86mf7jrzmw4p
2012-05-17 18:51:01 +05:30
DBR (OpenERP) f33d8657dc [FIX]hr_holidays: yml error
bzr revid: dbr@tinyerp.com-20120517131156-3mnula9bxi79zj3s
2012-05-17 18:41:56 +05:30
Sbh (Openerp) 560d57ad09 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120517122108-dmvu8qv955byy6te
2012-05-17 17:51:08 +05:30
Kuldeep Joshi (OpenERP) 5009d29c72 [IMP]hr_recruitment: set relation with meeting
bzr revid: kjo@tinyerp.com-20120517120911-5jcg0bhnz4eo39xs
2012-05-17 17:39:11 +05:30
Khushboo Bhatt (Open ERP) 38bc8ca8f0 [IMP]improved rules(HRA,DA,city allowance,driver salary,transport allowance).
bzr revid: kbh@tinyerp.com-20120517120335-inov2l3rsfraix96
2012-05-17 17:33:35 +05:30
DBR (OpenERP) 1b09de07e8 [FIX]hr_holidays: Iprove the search for get perfect days
bzr revid: dbr@tinyerp.com-20120517105902-9wxxvlxd9csy80pb
2012-05-17 16:29:02 +05:30
Purnendu Singh (OpenERP) 7af37ce79a [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120517105752-w0t9w57tifokahy4
2012-05-17 16:27:52 +05:30
Atul Patel (OpenERP) 96fde61acf [ADD]: Event page
bzr revid: atp@tinyerp.com-20120517103941-6ngwqfkiow8f4ugq
2012-05-17 16:09:41 +05:30
Mayur Maheshwari (OpenERP) 40f95490c1 [IMP]stock: improve field
bzr revid: mma@tinyerp.com-20120517102429-dh3n0gq7kcphcm6r
2012-05-17 15:54:29 +05:30
Ravi Gohil (Open ERP) b39904ad4a [FIX] To prevent the leak when domain and context passed blank and view_id is passed as blank list by the server action : (Maintenance Case : 574769)
bzr revid: rgo@tinyerp.com-20120517102359-7u10pq22ynd3219k
2012-05-17 15:53:59 +05:30
Amit Patel (OpenERP) 1aefff9733 [MERGE]:merged from trunk
bzr revid: apa@tinyerp.com-20120517101517-npk57s14kgxlk7in
2012-05-17 15:45:17 +05:30
Pinakin Nayi (OpenERP) a81d8c34af [IMP]hr_recruitment: improve job position form view
bzr revid: pna@tinyerp.com-20120517095816-w1zphtkph49hnshg
2012-05-17 15:28:16 +05:30
Ashvin Rathod (OpenERP) a95648bc7a [IMP] hr_recruitment: Improve applicant form view
bzr revid: ara@tinyerp.com-20120517093446-syuhtypz3rncj5xn
2012-05-17 15:04:46 +05:30
DBR (OpenERP) c8f335a355 [IMP]board: set reporting dashboard menu
bzr revid: dbr@tinyerp.com-20120517083930-2h17u5phzolz9ywe
2012-05-17 14:09:30 +05:30
Atul Patel (OpenERP) 08cd412d78 [ADD]: Add event google map file.
bzr revid: atp@tinyerp.com-20120517073046-i47jypr9p6ndckox
2012-05-17 13:00:46 +05:30
Atul Patel (OpenERP) 99e1ebfcd7 [FIX]: New event page view
bzr revid: atp@tinyerp.com-20120517072853-is1te37zsy3be4y6
2012-05-17 12:58:53 +05:30
Mayur Maheshwari (OpenERP) 045f865dd0 [IMP]purchase: improve a xml teg
bzr revid: mma@tinyerp.com-20120517072258-hyhi72b6i97v17pl
2012-05-17 12:52:58 +05:30
Mustufa Rangwala (OpenERP) 89b8796035 [MERGE] merge from main branch
bzr revid: mra@tinyerp.com-20120517071808-kw55nr7qv4rm9el9
2012-05-17 12:48:08 +05:30
Mustufa Rangwala (OpenERP) 40f7343cd7 [MERGE] Merge KBH branch for Indian payroll account module not finished yet
lp:~openerp-dev/openerp-india/payroll-india-trunk-module-descriptor-kbh

bzr revid: mra@tinyerp.com-20120517071336-q0fuc1vk7dzjoz6m
2012-05-17 12:43:36 +05:30
Jagdish Panchal (Open ERP) 15938009e3 [IMP] l10n_in: improve code and add new xml file for different taxes
bzr revid: jap@tinyerp.com-20120517071059-0s96fem90ke2i5sw
2012-05-17 12:40:59 +05:30