Commit Graph

265 Commits

Author SHA1 Message Date
Antony Lesuisse 6dd16f2613 [MERGE] trunk
bzr revid: al@openerp.com-20120930141638-bw50m7b5a8wnu2yh
2012-09-30 16:16:38 +02:00
Antonin Bourguignon 8683ea9c6d [MERGE] trunk
bzr revid: abo@openerp.com-20120928152152-p6s1dzq96g0sy2sf
2012-09-28 17:21:52 +02:00
Fabien Pinckaers ffb34cf11a [MERGE] expenses on products
bzr revid: fp@tinyerp.com-20120927172857-33gdnizuxzi63dce
2012-09-27 19:28:57 +02:00
Quentin (OpenERP) fceb8556df [MERGE] addons9 + usability improvements (product form view, quotation report)
bzr revid: qdp-launchpad@openerp.com-20120926122435-35ag0m4s0mteki28
2012-09-26 14:24:35 +02:00
Christophe Matthieu f47111449c [IMP] mail_follower: unique field widget, sub-types on click
bzr revid: chm@openerp.com-20120924095616-keuji387bvy6pmcs
2012-09-24 11:56:16 +02:00
Christophe Matthieu fa63653de9 [MERGE] from trunk-mail-mail-rules-tde
bzr revid: chm@openerp.com-20120921095037-czl4s3v0do11yhkq
2012-09-21 11:50:37 +02:00
Antonin Bourguignon c7b1d6cb63 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120920145753-2izkiam4sf8t53of
2012-09-20 16:57:53 +02:00
Thibault Delavallée 84fbc3b7da [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120920144900-isobpji9066sftj1
2012-09-20 16:49:00 +02:00
Thibault Delavallée 1206b8f7a0 [IMP] Addons: added message_is_follower and message_subtype_data invisible fields to all views using Chatter and Followers widgets.
bzr revid: tde@openerp.com-20120920115900-vvpfhjvw135vhf91
2012-09-20 13:59:00 +02:00
Fabien Pinckaers 8c83c0dcb8 [MERGE] visibility of accounting data in expenses
bzr revid: fp@tinyerp.com-20120920085609-bwuuayhgk4c8frmv
2012-09-20 10:56:09 +02:00
Hardik 1650c991af [IMP]Product Form, set postion of fields and set label
bzr revid: hsa@tinyerp.com-20120919125059-82uazhvyng025jwd
2012-09-19 18:20:59 +05:30
Thibault Delavallée abf16c58c6 [IMP] Addons: added invisible field for message_is_follower; note: reidented view; account_voucher: reidented one view.
bzr revid: tde@openerp.com-20120917153533-u102ds3eo1xr1mnt
2012-09-17 17:35:33 +02:00
Amit Patel a6e77b12e2 [IMP]:hr_expense:add accountant group for journal.
bzr revid: apa@tinyerp.com-20120917061316-bnjex2lyoplo3jom
2012-09-17 11:43:16 +05:30
Christophe Matthieu 46a60cdac7 [MERGE] from trunk-mail-concreting-tde, TODO fix bug
bzr revid: chm@openerp.com-20121029090847-27h3tmyvsv9c8vej
2012-10-29 10:08:47 +01:00
Frédéric van der Essen 7cdf99ade1 [IMP] mail: improved display of openchatter in form views
bzr revid: fva@openerp.com-20121026095821-c3idarsd5yi9fzso
2012-10-26 11:58:21 +02:00
Amit Patel 0b1cd66d1b [MERGE]:merged hr expense
bzr revid: apa@tinyerp.com-20120913123908-mmp08uyxwb2a3vwd
2012-09-13 18:09:08 +05:30
Pinakin Nayi (OpenERP) ff1a41d098 [IMP]change access rights of emloyee
bzr revid: pna@tinyerp.com-20120903054914-c816mv1ctphqlqwv
2012-09-03 11:19:14 +05:30
Ajay Chauhan (OpenERP) b7d0615c24 [MERGE] merge with lp:~openerp-dev/openobject-addons/trunk-editable_list
bzr revid: cha@tinyerp.com-20120822083946-nz7wzlukwbjmct0q
2012-08-22 14:09:46 +05:30
Ajay Chauhan (OpenERP) 5458cc1d92 [IMP] hr_expense: made little changes in code
bzr revid: cha@tinyerp.com-20120817084242-79xf2pa2souihp8d
2012-08-17 14:12:42 +05:30
Ajay Chauhan (OpenERP) e1e730ffbc [Merge] Merge with main addons.
bzr revid: cha@tinyerp.com-20120816085147-o1wzevd3cj85vm2y
2012-08-16 14:21:47 +05:30
Purnendu Singh (OpenERP) 4ef4dd3054 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120816051019-ybu9967pkdpq122a
2012-08-16 10:40:19 +05:30
Antony Lesuisse da8045d784 add message_followers_ids
bzr revid: al@openerp.com-20120815223038-ppuq03m5wj97u6rj
2012-08-16 00:30:38 +02:00
Purnendu Singh (OpenERP) 14e4696c0d [IMP] hr_expense: update journal on currency change and improve the code for multicurrency
bzr revid: psi@tinyerp.com-20120814113320-wf5bnieerjo7yt86
2012-08-14 17:03:20 +05:30
Quentin (OpenERP) e8e7c91138 [IMP] hr_expense: small improvements
bzr revid: qdp-launchpad@openerp.com-20120810151108-lxqlaxh7m6yd31fi
2012-08-10 17:11:08 +02:00
Ajay Chauhan (OpenERP) 1a36733f5b [IMP]hr_expense : made expense line editable
bzr revid: cha@tinyerp.com-20120809084430-fvhy9nfph9xiwwna
2012-08-09 14:14:30 +05:30
Twinkle Christian (OpenERP) 721adad01e [IMP]Remove type field from the whole hr module
bzr revid: tch@tinyerp.com-20120808124839-ecd1uic8mscg3s7f
2012-08-08 18:18:39 +05:30
Purnendu Singh (OpenERP) bbf4bfe78c [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120806060602-ph2s5sx6tebomcs3
2012-08-06 11:36:02 +05:30
Fabien Pinckaers ea52cfae17 [IMP] introducing new file type: html
bzr revid: fp@openerp.com-20120804143556-457q040g6q30x3fu
2012-08-04 16:35:56 +02:00
Fabien Pinckaers b363b1f622 fix
bzr revid: fp@openerp.com-20120804135631-9qqfgcz9513qsyzp
2012-08-04 15:56:31 +02:00
Fabien Pinckaers 4e69bdd6fc [IMP] improved menu tips - 10 firsts clicks
bzr revid: fp@openerp.com-20120804132136-2b18cfkwv0njsglj
2012-08-04 15:21:36 +02:00
Twinkle Christian (OpenERP) cb1c6c08af [IMP]Improve search view in all modules
bzr revid: tch@tinyerp.com-20120731112804-a0akxtqr1z0uew6w
2012-07-31 16:58:04 +05:30
vta vta@openerp.com 264d2c3365 [MERGE] Trunk.
bzr revid: vta@openerp.com-20120730123628-49rirhupbwqfzr0r
2012-07-30 14:36:28 +02:00
Purnendu Singh (OpenERP) 815128e7d3 [IMP] hr_expense: assign group multicurrency to currency fields
bzr revid: psi@tinyerp.com-20120730111647-r65atxk71el136c7
2012-07-30 16:46:47 +05:30
Purnendu Singh (OpenERP) 4e8971d7be [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120730050945-jirpezzzeqkg3kdo
2012-07-30 10:39:45 +05:30
Raphael Collet 0f2cd6cdcc [IMP] hr_expense: I am picky about indentation, I know.
bzr revid: rco@openerp.com-20120725143946-og73z315389lcgne
2012-07-25 16:39:46 +02:00
Divyesh Makwana (Open ERP) 73f4c519dc [IMP] hr_expense : OpenReceipt must be normal, not red.
bzr revid: mdi@tinyerp.com-20120723054536-gcsffy284r1qx2rf
2012-07-23 11:15:36 +05:30
Divyesh Makwana (Open ERP) 9606e7a28c [IMP] hr_expense : Rename the 'Issue Receipt' into 'Generate Account Entry' and make it visible only by the eInvoicing & Payment User (not the HR).
bzr revid: mdi@tinyerp.com-20120723054300-sde5r73zn31dbpw2
2012-07-23 11:13:00 +05:30
Turkesh Patel (Open ERP) 918f386b38 [IMP] hr_expanse: improved search views.
bzr revid: tpa@tinyerp.com-20120720103721-4i424494z5wkmvhj
2012-07-20 16:07:21 +05:30
Divyesh Makwana (Open ERP) bb7df4dcc5 [IMP] hr_expense : After the confirmation of the expense, the button should create a purchase receipt and confirmed it. It must creates the accounting entries exactly as the current invoice does.
bzr revid: mdi@tinyerp.com-20120717104214-pwypgr6d17ji4s4q
2012-07-17 16:12:14 +05:30
Divyesh Makwana (Open ERP) edaedb7455 [IMP] hr_expense : After the confirmation of the expense, the button should create an account.voucher (instead of an invoice) and confirmed it. It must creates the accounting entries exactly as the current invoice does.
bzr revid: mdi@tinyerp.com-20120717071731-mbc91xnbuirbc6o2
2012-07-17 12:47:31 +05:30
Divyesh Makwana (Open ERP) 311beb1b20 [Merge] Merge with main branch.
bzr revid: mdi@tinyerp.com-20120716095215-69vxhf3ba35efi7h
2012-07-16 15:22:15 +05:30
Divyesh Makwana (Open ERP) 361291706e [IMP] hr_expense : Improved the view.
bzr revid: mdi@tinyerp.com-20120716065809-xazcx753xqzum18c
2012-07-16 12:28:09 +05:30
Divyesh Makwana (Open ERP) 248f7ade33 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120712044109-ffyj5eavkrtze574
bzr revid: mdi@tinyerp.com-20120713042730-web0bk83baozc0og
bzr revid: mdi@tinyerp.com-20120716044240-1boga05nifw4gfe9
2012-07-16 10:12:40 +05:30
Divyesh Makwana (Open ERP) e068186c17 [IMP] hr_improvement : Added 'Open Receipt' button to open the receipt in 'receipted' state.
bzr revid: mdi@tinyerp.com-20120713123952-gr48p943v6rjon57
2012-07-13 18:09:52 +05:30
Divyesh Makwana (Open ERP) 9fe6cdd4ee [IMP] hr_expense : After the confirmation of the expense, the button should create an account.voucher (instead of an invoice) and confirmed it. It must creates the accounting entries exactly as the current invoice does and its related changes.
bzr revid: mdi@tinyerp.com-20120713113812-pv886hx31397viv5
2012-07-13 17:08:12 +05:30
Divyesh Makwana (Open ERP) 00ec1afdf0 [IMP] hr_improvement : Fix the journal used when the expense is paid.
bzr revid: mdi@tinyerp.com-20120712113346-47fkltrn5kyydmld
2012-07-12 17:03:46 +05:30
Divyesh Makwana (Open ERP) a4e5ec5ce2 [IMP] hr_recruitment : Opens the purchase receipt form on voucher_id field.
bzr revid: mdi@tinyerp.com-20120712094645-4m86lvzxz4d4wjmx
2012-07-12 15:16:45 +05:30
Divyesh Makwana (Open ERP) 3512fd1be0 [IMP] hr_expense : Added 'Total Amount' field in form view.
bzr revid: mdi@tinyerp.com-20120712084407-s78a0udwp3ww4npd
2012-07-12 14:14:07 +05:30
Divyesh Makwana (Open ERP) 4ecf6fef06 [IMP] hr_expense : After the confirmation of the expense, the button should create an account.voucher (instead of an invoice) and confirmed it. It must creates the accounting entries exactly as the current invoice does.
bzr revid: mdi@tinyerp.com-20120711131347-4uj73ojgrrfcdjd1
2012-07-11 18:43:47 +05:30
Divyesh Makwana (Open ERP) a3e93d5104 [IMP] hr_expense : Improved the menu-tips.
bzr revid: mdi@tinyerp.com-20120710084056-h5cthd65dilaf6le
2012-07-10 14:10:56 +05:30
Divyesh Makwana (Open ERP) 02f3d49923 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120706042716-kkgc4e2xdiz137hu
2012-07-06 09:57:16 +05:30
Quentin (OpenERP) e6ef77b047 [MERGE] hr review of form views
bzr revid: qdp-launchpad@openerp.com-20120705092921-0edv4n7z0392ia83
2012-07-05 11:29:21 +02:00
Divyesh Makwana (Open ERP) b09ade2e55 [IMP] hr_expense : Improved the menutips of expense list.
bzr revid: mdi@tinyerp.com-20120702061508-r059qr6wjo2ubch8
2012-07-02 11:45:08 +05:30
Amit Patel (OpenERP) 5260efe702 [MERGE]:merged from trunk
bzr revid: apa@tinyerp.com-20120629124820-aec88wzcrvm6xps4
2012-06-29 18:18:20 +05:30
Jigar Amin - OpenERP 7c645856fe [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120627114052-094g4yequ34sr59d
2012-06-27 17:10:52 +05:30
Amit Patel (OpenERP) 6dad1c7e3e [MERGE]
bzr revid: apa@tinyerp.com-20120627050643-zdfu7r9kfrasx5z4
2012-06-27 10:36:43 +05:30
Amit Patel (OpenERP) 9175b5008e [IMP]:hr_expense:improved expense line view
bzr revid: apa@tinyerp.com-20120625085527-g33k4hwd94gs1dy9
2012-06-25 14:25:27 +05:30
Amit Patel (OpenERP) 3c7cd469e6 [MERGE]
bzr revid: apa@tinyerp.com-20120622090553-lkvmsz12ooao1lug
bzr revid: apa@tinyerp.com-20120625050407-vfjnqgnqexrfvr8d
2012-06-25 10:34:07 +05:30
Amit Patel (OpenERP) 5e12f8dbf6 [MERGE]
bzr revid: apa@tinyerp.com-20120625045019-86qrhmewdodwbbis
2012-06-25 10:20:19 +05:30
Jigar Amin - OpenERP 43a50a651b [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120625041934-v1twcjzbjupl369n
2012-06-25 09:49:34 +05:30
Purnendu Singh (OpenERP) 55633a22a2 [REF] search views: removed filterr_domain if only one element was inside
bzr revid: psi@tinyerp.com-20120622111251-nykd53nolythqhu2
2012-06-22 16:42:51 +05:30
Sanjay Gohel (Open ERP) 5b6c2985f7 [IMP]improve and clean hr_expense
bzr revid: sgo@tinyerp.com-20120621090602-m72nm166odf8h05k
2012-06-21 14:36:02 +05:30
Jigar Amin - OpenERP 501721883d [USB] removed useless class defination
bzr revid: jam@tinyerp.com-20120621070959-qrkmzuk1xg304kwa
2012-06-21 12:39:59 +05:30
Randhir Mayatra (OpenERP) e80980330b [USA] replaced red button class oe_form_button_active_flow to oe_highlight
bzr revid: rma@tinyerp.com-20120620101205-uf0ibqbq4uzu17iq
2012-06-20 15:42:05 +05:30
Purnendu Singh (OpenERP) 2663cbca6e [MERGE] hr_*: make some improvements and Merge cha branch
bzr revid: psi@tinyerp.com-20120615125750-7yanak6d4282nk4u
2012-06-15 18:27:50 +05:30
Turkesh Patel (Open ERP) 3e3d7726bb [IMP] hr_expense: improved color of button based on business flow
bzr revid: tpa@tinyerp.com-20120615065551-gm5pe0zzsvfepyra
2012-06-15 12:25:51 +05:30
Turkesh Patel (Open ERP) 65c5d7afa0 [IMP] hr_expanse: improved color of button based on business flow
bzr revid: tpa@tinyerp.com-20120614060302-jeqf15pkqmh3r89u
2012-06-14 11:33:02 +05:30
Ajay Chauhan (OpenERP) 6db119b7d8 [IMP]hr_* : improve search code in xml
bzr revid: cha@tinyerp.com-20120613124157-z5zpn42aao3w3cf2
2012-06-13 18:11:57 +05:30
Amit Patel (OpenERP) deec2bda0d [MERGE]:resolved conflicts and merged with trunk
bzr revid: apa@tinyerp.com-20120612063539-japenzf86hh59541
2012-06-12 12:05:39 +05:30
Quentin (OpenERP) 204ce4380a [MERGE] merged with the trunk
bzr revid: qdp-launchpad@openerp.com-20120611124211-kf741tkd3gdsp3ep
2012-06-11 14:42:11 +02:00
Fabien Pinckaers 3c8643ce4c [IMP] better form views, new guidelines
bzr revid: fp@tinyerp.com-20120609143904-ydwqfyb54atbcpvw
2012-06-09 16:39:04 +02:00
Fabien Pinckaers b1ea5e4c97 [IMP] replace footer by divs for chatter
bzr revid: fp@tinyerp.com-20120713095341-6h0ganz4zmlwv9wg
2012-07-13 11:53:41 +02:00
Fabien Pinckaers 001d2e84c9 [IMP] form views
bzr revid: fp@tinyerp.com-20120607173007-1kihroun2dbacq1c
2012-06-07 19:30:07 +02:00
Purnendu Singh (OpenERP) cfce82898b [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120605122830-r3o25y55lzo0o73n
bzr revid: psi@tinyerp.com-20120606103845-w2jftpw5jw706pgo
2012-06-06 16:08:45 +05:30
Amit Patel (OpenERP) 317a25b34e [MERGE]
bzr revid: apa@tinyerp.com-20120606095311-7px6hn7fcdeblkc9
2012-06-06 15:23:11 +05:30
Fabien Pinckaers 48f8823bad [IMP] replaced all oe_form_topbar with the new <header> style
bzr revid: fp@tinyerp.com-20120604121139-zqoqbou9v2fdue5h
2012-06-04 14:11:39 +02:00
Fabien Pinckaers 623fd428bd [IMP] xml of topbars, removed oe_right, oe_clear
bzr revid: fp@tinyerp.com-20120604105056-xvos3jwt3i9wsqrb
2012-06-04 12:50:56 +02:00
Amit Patel (OpenERP) a5604d2cfa [MERGE]:merged from trunk
bzr revid: apa@tinyerp.com-20120604085217-ntsulc7zrujp6efc
2012-06-04 14:22:17 +05:30
Divyesh Makwana (Open ERP) e98eb11510 [Merge] Merge with main branch.
bzr revid: mdi@tinyerp.com-20120601094937-575f84vxwljlgkpv
bzr revid: mdi@tinyerp.com-20120601123900-0ozu8nlq02upa8xb
bzr revid: mdi@tinyerp.com-20120601124121-oz0cr3gv4acejs7b
2012-06-01 18:11:21 +05:30
Sanjay Gohel (Open ERP) 11bf57f1bf [IMP]add expense line and add depend expense of hr in contract for calculation
bzr revid: sgo@tinyerp.com-20120530125641-w27mjp97b981yrpd
2012-05-30 18:26:41 +05:30
Divyesh Makwana (Open ERP) d18cb96c97 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120528062205-ukjcxs41f917dsk2
2012-05-28 11:52:05 +05:30
Ajay Chauhan (OpenERP) 47cc03c954 [MERGE] merge with main addons
bzr revid: cha@tinyerp.com-20120523111541-o1o60ncctasc5t41
2012-05-23 16:45:41 +05:30
Ajay Chauhan (OpenERP) 7418558d1d [IMP] : removed button from tree
bzr revid: cha@tinyerp.com-20120523110047-3403esloff9i98ki
2012-05-23 16:30:47 +05:30
Fabien Pinckaers b3fa4ccf5c [IMP] removed icons from topbar
bzr revid: fp@tinyerp.com-20120522091445-mpiknieg2v8sd31f
2012-05-22 11:14:45 +02:00
Fabien Pinckaers ee566d388c [IMP] merged topbar status widgets
bzr revid: fp@tinyerp.com-20120522085037-oktkq3td2hg9lvzr
2012-05-22 10:50:37 +02:00
Divyesh Makwana (Open ERP) 94c010b8a1 [IMP] hr_expense : Removed all filters related to a date field and added the related date field in the search view.
bzr revid: mdi@tinyerp.com-20120522070348-mollhizuy7zbgd5q
2012-05-22 12:33:48 +05:30
Fabien Pinckaers c31a54334c [FIX] fixing default_context
bzr revid: fp@tinyerp.com-20120521160745-4bir71koyn0vqgww
2012-05-21 18:07:45 +02:00
Divyesh Makwana (Open ERP) 3a07843c6e [IMP] hr_expense : added missing filter string in search view.
bzr revid: mdi@tinyerp.com-20120521110310-anod47oajf9c3y6c
2012-05-21 16:33:10 +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
Purnendu Singh (OpenERP) 6f1efa4ac7 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120430060154-b9rlmzwta6vb6gs3
2012-04-30 11:31:54 +05:30
Amit Patel (OpenERP) 5472a85b28 [MERGE]
bzr revid: apa@tinyerp.com-20120427105446-80dp19jsboes2n7c
2012-04-27 16:24:46 +05:30
Amit Patel (OpenERP) 8d3365c1ba [IMP]
bzr revid: apa@tinyerp.com-20120427095137-5v5dnze0jokg7u3f
2012-04-27 15:21:37 +05:30
Raphael Collet 41057fed10 [MERGE] from trunk
bzr revid: rco@openerp.com-20120426143728-5n5b9wo6unnbeb5x
2012-04-26 16:37:28 +02:00
Mayur Maheshwari (OpenERP) c71446957f [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20120426091833-ocminkwzjkntdkde
2012-04-26 14:48:33 +05:30
Turkesh Patel (Open ERP) b22f46a8f9 [MRG] merge with lp:~openerp-dev/openobject-addons/trunk-form-add-topbar-apa
bzr revid: tpa@tinyerp.com-20120426062357-4mnv2rclpg7c88dy
2012-04-26 11:53:57 +05:30
Raphael Collet e4efcb808d [IMP] hr*: remove group_extended
bzr revid: rco@openerp.com-20120425141135-9jgai7os8mxj80go
2012-04-25 16:11:35 +02:00
Turkesh Patel (Open ERP) bbe06d5104 [IMP] hr_expence: improved view
bzr revid: tpa@tinyerp.com-20120425132701-bsr6t8n5yocneegs
2012-04-25 18:57:01 +05:30
Mayur Maheshwari (OpenERP) 9e59ce8812 [IMP]all: Improve all typos
bzr revid: mma@tinyerp.com-20120424060532-ohrf0sxwq8rpq6ls
2012-04-24 11:35:32 +05:30
Amit Patel (OpenERP) 8b65da991a [MERGE]
bzr revid: apa@tinyerp.com-20120329082210-0z0qer1589wp8ez0
2012-03-29 13:52:10 +05:30
Quentin (OpenERP) 343158f39f [MERGE] merged the branch with menu modifications
bzr revid: qdp-launchpad@openerp.com-20120322172305-ko3l5j363lhdozkw
2012-03-22 18:23:05 +01:00