Commit Graph

227 Commits

Author SHA1 Message Date
Josse Colpaert f08bf5a08e [FIX] Generates journal items immediately from expense
bzr revid: jco@openerp.com-20130304135329-v1dfw564svd0zv7q
2013-03-04 14:53:29 +01:00
Quentin (OpenERP) d79a4b1028 [FIX] hr_expense: removing the automatic validation of the supplier account.voucher when the hr.expense is set to 'done'
bzr revid: qdp-launchpad@openerp.com-20130107112933-tkuqrbhdxi4hhjsv
2013-01-07 12:29:33 +01:00
Quentin (OpenERP) 9e580d355b [IMP] hr_expense: raise an error when no journal can be found at the time of the expense accounting entries creation
bzr revid: qdp-launchpad@openerp.com-20121221144945-gy67wln705ewgkxw
2012-12-21 15:49:45 +01:00
Thibault Delavallée e3c31cab9e [IMP] track_visibility atribute: moved onto explicit strings.
bzr revid: tde@openerp.com-20121220114730-nip8qaaajr5mqw6s
2012-12-20 12:47:30 +01:00
Thibault Delavallée cd290565a4 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121219093924-5rqmhb6ve7bv7qzl
2012-12-19 10:39:24 +01:00
Fabien Pinckaers 065821dfd6 [MOD] use read() instead of browse
bzr revid: fp@tinyerp.com-20121218234907-j672neyvifmo4bur
2012-12-19 00:49:07 +01:00
Olivier Dony 03b6acd13d [MERGE] Access inherited product fields on the product directly rather than template, courtesy of Alexis de Lattre (Akretion)
It makes the code a little more straightforward and does not hurt.

bzr revid: odo@openerp.com-20121218225015-6r9ydxjlh147m3z1
2012-12-18 23:50:15 +01:00
Thibault Delavallée 8e0c7f9781 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121218181852-j9qg1po5y4yw67ko
2012-12-18 19:18:52 +01:00
Olivier Dony fc0c2942ba [MERGE] Another batch of bugfixes from 6.1
bzr revid: odo@openerp.com-20121218175547-7c1uxq4ypbi314gx
2012-12-18 18:55:47 +01:00
Thibault Delavallée 1efb2d6b0b [REF] Hr_expense: added track on state, _track for subtypes, removed extra chatter messages.
bzr revid: tde@openerp.com-20121218165708-iij5o20k78m4xyax
2012-12-18 17:57:08 +01:00
Thibault Delavallée b95b32d644 [MERGE] Merged branch holding subtype work by APA.
bzr revid: tde@openerp.com-20121218131142-2jb6wac6y9q6dc7v
2012-12-18 14:11:42 +01:00
Olivier Dony 84d7987f33 [MERGE] Bugfixes from 6.1 until revision 6900
rev.6900 = xal@openerp.com-20120720134532-t07xr3lp8ouhn2dv

bzr revid: odo@openerp.com-20121218021123-9ligpn7bkr9zo4n7
2012-12-18 03:11:23 +01:00
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace.
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Sanjay Gohel (Open ERP) c5fe07802e [IMP]improve code
bzr revid: sgo@tinyerp.com-20121128051414-el91llx1d1i4i565
2012-11-28 10:44:14 +05:30
Sanjay Gohel (Open ERP) 927491120a [IMP]improve as per comment
bzr revid: sgo@tinyerp.com-20121127130723-44i0t3v89ewdy8zw
2012-11-27 18:37:23 +05:30
Khushboo Bhatt (Open ERP) a5afea27d5 [IMP]hr_expense:code improved
bzr revid: kbh@tinyerp.com-20121121091358-33g7oonfo819ry1f
2012-11-21 14:43:58 +05:30
Khushboo Bhatt (Open ERP) f42cee3e94 [IMP]hr_expense:code improved
bzr revid: kbh@tinyerp.com-20121121084139-2phwt6sxbgt0sp5r
2012-11-21 14:11:39 +05:30
Khushboo Bhatt (Open ERP) 17ecd10a35 [ADD/IMP]hr_expense:added method for message in expense
bzr revid: kbh@tinyerp.com-20121121053954-6japxu5y7tjilw9y
2012-11-21 11:09:54 +05:30
Khushboo Bhatt (Open ERP) da5eb4055f [REM]hr_expense:remove code of expense
bzr revid: kbh@tinyerp.com-20121120091810-mgg9y239j8kbindi
2012-11-20 14:48:10 +05:30
Khushboo Bhatt (Open ERP) a1cd2de42a [Add]hr_expense:subtypeadded for expense
bzr revid: kbh@tinyerp.com-20121120080620-s8r0ery17ochs0pz
2012-11-20 13:36:20 +05:30
Fabien Pinckaers d8f9aecce7 [MERGE] improve expense: readonly if not draft
bzr revid: fp@tinyerp.com-20121113073126-8z40r87mmyqknd8p
2012-11-13 08:31:26 +01:00
Saurang Suthar 584f5216ce [IMP]hr_expense:removed on chenge method which is put on hr_expense_ok field
bzr revid: ssu@tinyerp.com-20121106124942-ehomc5nhuhwrci1w
2012-11-06 18:19:42 +05:30
Fabien Pinckaers b020e99c8c [FIX] english typo
bzr revid: fp@openerp.com-20121102174603-i5hsivz4ktg7n7ns
2012-11-02 18:46:03 +01:00
Fabien Pinckaers cd68364301 [MERGE] English typos
bzr revid: fp@openerp.com-20121102173407-umicel4287htim14
2012-11-02 18:34:07 +01:00
Vijaykumar Baladaniya 510be6595c Improve tooltip.
bzr revid: vba@tinyerp.com-20121030131401-hf7oonmt0nkwfi1y
2012-10-30 18:44:01 +05:30
Vijaykumar Baladaniya de55e6d736 [MERGE]merge with trunk-terminology_batch2.
bzr revid: vba@tinyerp.com-20121029055922-pmwrqgxq8yo3qb20
2012-10-29 11:29:22 +05:30
Fabien Pinckaers 9a016b4644 [FIX] useability
bzr revid: fp@tinyerp.com-20121025151013-cd0gvro61h8224tv
2012-10-25 17:10:13 +02:00
Vijaykumar Baladaniya 7850a91339 [IMP]Improve a tooltip.
bzr revid: vba@tinyerp.com-20121023130242-pu2o7e9x7lpr7g36
2012-10-23 18:32:42 +05:30
Khushboo Bhatt (Open ERP) d4f970ff9c [IMP]hr_expense:delete only those expense which are in draft states
bzr revid: kbh@tinyerp.com-20121023123910-v1sd0wtgis9cn0w6
2012-10-23 18:09:10 +05:30
Khushboo Bhatt (Open ERP) 3bde64f49c [IMP]hr_expense:fields are readonly when expense is apporved
bzr revid: kbh@tinyerp.com-20121023121407-6qarpm3ppdmgm8cu
2012-10-23 17:44:07 +05:30
Mayur Maheshwari (OpenERP) 646914c12d [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121012050224-w5qgi0uan9phcgyc
2012-10-12 10:32:24 +05:30
Mayur Maheshwari (OpenERP) 48ad382705 [IMP]all : improve string
bzr revid: mma@tinyerp.com-20121008101422-hen3r94996e6pzye
2012-10-08 15:44:22 +05:30
Mayur Maheshwari (OpenERP) a4da52f7f0 [FIX]hr_expense : remove purchase_ok
bzr revid: mma@tinyerp.com-20121003112746-sw2ycbrysn65hfjz
2012-10-03 16:57:46 +05:30
Randhir Mayatra (OpenERP) 60f3b375bb [IMP] make changes into thehr_expense module
bzr revid: rma@tinyerp.com-20121003095003-98n5tb4tcscn0o07
2012-10-03 15:20:03 +05:30
Fabien Pinckaers 0eee48d30a [MERGE] auto-follow Sales Team, Projet, HR Manager
bzr revid: fp@tinyerp.com-20120927191059-pug5mrft8f06uwux
2012-09-27 21:10:59 +02:00
Atul Patel (OpenERP) 1c1978fbb7 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120927041011-e90b4710saidnlcf
2012-09-27 09:40:11 +05:30
Atul Patel (OpenERP) d050d743ee [FIX]: override write method into hr module..
bzr revid: atp@tinyerp.com-20120926184445-3o03o0n4oxgprern
2012-09-27 00:14:45 +05:30
Atul Patel (OpenERP) 7f08d3d176 [FIX]: Fix employee manager id
bzr revid: atp@tinyerp.com-20120925173320-z4vn1ir2bwp9gu5l
2012-09-25 23:03:20 +05:30
Atul Patel (OpenERP) 55315e418a [FIX]: remove context from expense and set condition for null followers in issue
bzr revid: atp@tinyerp.com-20120925013747-o09k9bfwg83l0a41
2012-09-25 07:07:47 +05:30
Atul Patel (OpenERP) e8cf471e19 [IMP]: Manager should able to follow his employee requests
bzr revid: atp@tinyerp.com-20120924103812-eg1nflvk68cble4m
2012-09-24 16:08:12 +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) b478264bde [IMP] hr_expense: made change in condition
bzr revid: cha@tinyerp.com-20120816134149-wjumyv73z72sh6w5
2012-08-16 19:11:49 +05:30
Ajay Chauhan (OpenERP) cfa66e42f8 [IMP] hr_expense: improve code as per suggestion
bzr revid: cha@tinyerp.com-20120816123617-afade73y5wqune2r
2012-08-16 18:06:17 +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) 0f5f09b2c9 [IMP] hr_expense: small change
bzr revid: psi@tinyerp.com-20120816083402-i0u6j8grvat6jcty
2012-08-16 14:04:02 +05:30
Purnendu Singh (OpenERP) 05609f24ff [MERGE, IMP] merge with mma branch and small improvement
bzr revid: psi@tinyerp.com-20120816071452-5gl39inc3lwkh4wl
2012-08-16 12:44:52 +05:30
Mayur Maheshwari (OpenERP) 26d020fe4c [FIX]hr_expense :improve multi currency code for expense line with multiple cases
bzr revid: mma@tinyerp.com-20120816064637-4c5oo6jbprqcocdx
2012-08-16 12:16:37 +05:30
Mayur Maheshwari (OpenERP) 6accc69e56 [MERGE]Merge with parent branch
bzr revid: mma@tinyerp.com-20120816053002-1e25xdayfldq7hqr
2012-08-16 11:00:02 +05:30
Purnendu Singh (OpenERP) 049e8a12f0 [FIX] small fix
bzr revid: psi@tinyerp.com-20120816052846-gxi0q4gd4at7r7pp
2012-08-16 10:58:46 +05:30