cd290565a4
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121219093924-5rqmhb6ve7bv7qzl
2012-12-19 10:39:24 +01:00
065821dfd6
[MOD] use read() instead of browse
...
bzr revid: fp@tinyerp.com-20121218234907-j672neyvifmo4bur
2012-12-19 00:49:07 +01:00
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
8e0c7f9781
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121218181852-j9qg1po5y4yw67ko
2012-12-18 19:18:52 +01:00
fc0c2942ba
[MERGE] Another batch of bugfixes from 6.1
...
bzr revid: odo@openerp.com-20121218175547-7c1uxq4ypbi314gx
2012-12-18 18:55:47 +01:00
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
b95b32d644
[MERGE] Merged branch holding subtype work by APA.
...
bzr revid: tde@openerp.com-20121218131142-2jb6wac6y9q6dc7v
2012-12-18 14:11:42 +01:00
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
e7f4891d46
[IMP] use the openerp namespace.
...
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
c5fe07802e
[IMP]improve code
...
bzr revid: sgo@tinyerp.com-20121128051414-el91llx1d1i4i565
2012-11-28 10:44:14 +05:30
927491120a
[IMP]improve as per comment
...
bzr revid: sgo@tinyerp.com-20121127130723-44i0t3v89ewdy8zw
2012-11-27 18:37:23 +05:30
a5afea27d5
[IMP]hr_expense:code improved
...
bzr revid: kbh@tinyerp.com-20121121091358-33g7oonfo819ry1f
2012-11-21 14:43:58 +05:30
f42cee3e94
[IMP]hr_expense:code improved
...
bzr revid: kbh@tinyerp.com-20121121084139-2phwt6sxbgt0sp5r
2012-11-21 14:11:39 +05:30
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
da5eb4055f
[REM]hr_expense:remove code of expense
...
bzr revid: kbh@tinyerp.com-20121120091810-mgg9y239j8kbindi
2012-11-20 14:48:10 +05:30
a1cd2de42a
[Add]hr_expense:subtypeadded for expense
...
bzr revid: kbh@tinyerp.com-20121120080620-s8r0ery17ochs0pz
2012-11-20 13:36:20 +05:30
d8f9aecce7
[MERGE] improve expense: readonly if not draft
...
bzr revid: fp@tinyerp.com-20121113073126-8z40r87mmyqknd8p
2012-11-13 08:31:26 +01:00
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
b020e99c8c
[FIX] english typo
...
bzr revid: fp@openerp.com-20121102174603-i5hsivz4ktg7n7ns
2012-11-02 18:46:03 +01:00
cd68364301
[MERGE] English typos
...
bzr revid: fp@openerp.com-20121102173407-umicel4287htim14
2012-11-02 18:34:07 +01:00
510be6595c
Improve tooltip.
...
bzr revid: vba@tinyerp.com-20121030131401-hf7oonmt0nkwfi1y
2012-10-30 18:44:01 +05:30
de55e6d736
[MERGE]merge with trunk-terminology_batch2.
...
bzr revid: vba@tinyerp.com-20121029055922-pmwrqgxq8yo3qb20
2012-10-29 11:29:22 +05:30
9a016b4644
[FIX] useability
...
bzr revid: fp@tinyerp.com-20121025151013-cd0gvro61h8224tv
2012-10-25 17:10:13 +02:00
7850a91339
[IMP]Improve a tooltip.
...
bzr revid: vba@tinyerp.com-20121023130242-pu2o7e9x7lpr7g36
2012-10-23 18:32:42 +05:30
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
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
646914c12d
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20121012050224-w5qgi0uan9phcgyc
2012-10-12 10:32:24 +05:30
48ad382705
[IMP]all : improve string
...
bzr revid: mma@tinyerp.com-20121008101422-hen3r94996e6pzye
2012-10-08 15:44:22 +05:30
a4da52f7f0
[FIX]hr_expense : remove purchase_ok
...
bzr revid: mma@tinyerp.com-20121003112746-sw2ycbrysn65hfjz
2012-10-03 16:57:46 +05:30
60f3b375bb
[IMP] make changes into thehr_expense module
...
bzr revid: rma@tinyerp.com-20121003095003-98n5tb4tcscn0o07
2012-10-03 15:20:03 +05:30
0eee48d30a
[MERGE] auto-follow Sales Team, Projet, HR Manager
...
bzr revid: fp@tinyerp.com-20120927191059-pug5mrft8f06uwux
2012-09-27 21:10:59 +02:00
1c1978fbb7
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120927041011-e90b4710saidnlcf
2012-09-27 09:40:11 +05:30
d050d743ee
[FIX]: override write method into hr module..
...
bzr revid: atp@tinyerp.com-20120926184445-3o03o0n4oxgprern
2012-09-27 00:14:45 +05:30
7f08d3d176
[FIX]: Fix employee manager id
...
bzr revid: atp@tinyerp.com-20120925173320-z4vn1ir2bwp9gu5l
2012-09-25 23:03:20 +05:30
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
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
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
5458cc1d92
[IMP] hr_expense: made little changes in code
...
bzr revid: cha@tinyerp.com-20120817084242-79xf2pa2souihp8d
2012-08-17 14:12:42 +05:30
b478264bde
[IMP] hr_expense: made change in condition
...
bzr revid: cha@tinyerp.com-20120816134149-wjumyv73z72sh6w5
2012-08-16 19:11:49 +05:30
cfa66e42f8
[IMP] hr_expense: improve code as per suggestion
...
bzr revid: cha@tinyerp.com-20120816123617-afade73y5wqune2r
2012-08-16 18:06:17 +05:30
e1e730ffbc
[Merge] Merge with main addons.
...
bzr revid: cha@tinyerp.com-20120816085147-o1wzevd3cj85vm2y
2012-08-16 14:21:47 +05:30
0f5f09b2c9
[IMP] hr_expense: small change
...
bzr revid: psi@tinyerp.com-20120816083402-i0u6j8grvat6jcty
2012-08-16 14:04:02 +05:30
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
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
6accc69e56
[MERGE]Merge with parent branch
...
bzr revid: mma@tinyerp.com-20120816053002-1e25xdayfldq7hqr
2012-08-16 11:00:02 +05:30
049e8a12f0
[FIX] small fix
...
bzr revid: psi@tinyerp.com-20120816052846-gxi0q4gd4at7r7pp
2012-08-16 10:58:46 +05:30
fdac923424
[MERGE]Merge with parent branch
...
bzr revid: mma@tinyerp.com-20120816051518-2ymocyufeddvalax
2012-08-16 10:45:18 +05:30
4ef4dd3054
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120816051019-ybu9967pkdpq122a
2012-08-16 10:40:19 +05:30
1232812cc6
[MERGE] merged branch that corrects the decimal precision on fields. Courtesy of Akretion
...
bzr revid: qdp-launchpad@openerp.com-20120814141040-oaf7d56thhi2s9rm
2012-08-14 16:10:40 +02:00
b5c6ed5197
[MERGE]Merge with parent branch
...
bzr revid: mma@tinyerp.com-20120814123614-36hf9mz1obl52mk7
2012-08-14 18:06:14 +05:30
b5fbb818f2
[IMP] small fix
...
bzr revid: psi@tinyerp.com-20120814122543-7o6hkxpy3ecap1m1
2012-08-14 17:55:43 +05:30
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
48f2640283
[FIX]hr_expense :put an onchange in the currency field that fill the force journal field with a purhcase journal that has the same currency
...
bzr revid: mma@tinyerp.com-20120814065201-57472t4o0wma1232
2012-08-14 12:22:01 +05:30
25367f13bb
[FIX]hr_expense :improve fource journal if fource journal have currency convert the expense to that currency
...
bzr revid: mma@tinyerp.com-20120814054348-6ofe8r0fcksbhp85
2012-08-14 11:13:48 +05:30
52eb6fd1dd
[FIX]hr_expense :improve voucher if voucher journal have currency convert the expense to that currency
...
bzr revid: mma@tinyerp.com-20120813132347-j6f6uy991wbrogfi
2012-08-13 18:53:47 +05:30
054de1ed58
[MERGE]
...
bzr revid: hmo@tinyerp.com-20120809131516-9bfj8ou1ud337xlo
2012-08-09 18:45:16 +05:30
e9cc89239b
[Merge] Merge with main addons.
...
bzr revid: cha@tinyerp.com-20120809115407-uvmjpj1iafmkox0b
2012-08-09 17:24:07 +05:30
4cc8dce4ec
[IMP] hr_expense : added condition to function
...
bzr revid: cha@tinyerp.com-20120809105103-tm0m7g854zglxfrg
2012-08-09 16:21:03 +05:30
1a36733f5b
[IMP]hr_expense : made expense line editable
...
bzr revid: cha@tinyerp.com-20120809084430-fvhy9nfph9xiwwna
2012-08-09 14:14:30 +05:30
8a64e7580a
[IMP] all the error messages now start with 'Error\!' (not 'Error' or 'Error \!')
...
bzr revid: abo@openerp.com-20120807113137-44vehm0mthqawlo3
2012-08-07 13:31:37 +02:00
9b9e5f1349
[IMP] hr_expense: Small change rename Paid to done as we are not paying the expence on the click of Generate Accounting Entries button
...
bzr revid: psi@tinyerp.com-20120730101519-qq7bs1s5cpfc3vbf
2012-07-30 15:45:19 +05:30
f9fe637803
Remplace all occurences of my_browse_rec.product_id.product_tmpl_id.field to my_browse_rec.product_id.field
...
bzr revid: alexis@via.ecp.fr-20120727015202-7fylff5jr26sgxez
2012-07-27 03:52:02 +02:00
b362ec2e8d
[IMP] hr_expense: improve to support multi currency payment
...
bzr revid: psi@tinyerp.com-20120725133154-gxjoahiuis5108g7
2012-07-25 19:01:54 +05:30
25d650e96e
[IMP] Improved warning messages for hr* modules
...
bzr revid: pso@tinyerp.com-20120725121354-hypwxo74c43jm5gp
2012-07-25 17:43:54 +05:30
31673d1139
[IMP] hr_expense : Rename 'Done' status into 'Paid'.
...
bzr revid: mdi@tinyerp.com-20120723055033-3hg9cyflwf61ov9t
2012-07-23 11:20:33 +05:30
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
7ea31c56f7
[IMP] hr_expense : Improved the code.
...
bzr revid: mdi@tinyerp.com-20120717090738-awbina7y4e7h7z3n
2012-07-17 14:37:38 +05:30
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
4e132aa66a
[IMP] hr_expense : Improved the code.
...
bzr revid: mdi@tinyerp.com-20120716112935-idcmrz47p8f0azjk
2012-07-16 16:59:35 +05:30
4bd4bd4b43
[IMP] hr_expense : Improved the tooltip.
...
bzr revid: mdi@tinyerp.com-20120716093859-nazz1z16342py7ta
2012-07-16 15:08:59 +05:30
18913e1b4d
[IMP] hr_expense : Improved the code.
...
bzr revid: mdi@tinyerp.com-20120716071150-cj8hu9wxtul9mmbz
2012-07-16 12:41:50 +05:30
2368d235bf
[IMP] hr_expense : Improved the code.
...
bzr revid: mdi@tinyerp.com-20120716065052-6pmwb3j1firawhdl
2012-07-16 12:20:52 +05:30
9afbde5c97
[IMP] hr_expense : Improved the code.
...
bzr revid: mdi@tinyerp.com-20120713132814-qu531hn061hawh18
2012-07-13 18:58:14 +05:30
ba225d9d56
[IMP] hr_expense : Improved the code.
...
bzr revid: mdi@tinyerp.com-20120713130716-6obmfiioui5qxtxa
2012-07-13 18:37:16 +05:30
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
0fee0b9527
[IMP] hr_expense : Improved the code.
...
bzr revid: mdi@tinyerp.com-20120713114717-1gg9xygu4ut3nl64
2012-07-13 17:17:17 +05:30
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
27226c12b2
[IMP]hr-warning-message
...
bzr revid: pna@tinyerp.com-20120713070425-b3envibswfdt6umq
2012-07-13 12:34:25 +05:30
7a2e0463dd
[IMP] hr_expense : Improved the code.
...
bzr revid: mdi@tinyerp.com-20120712122556-p8bgyf0cqq4sfdi0
2012-07-12 17:55:56 +05:30
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
d4e7e106bb
[IMP] hr_expense : Improved the code.
...
bzr revid: mdi@tinyerp.com-20120712104738-a362686jqyz116j9
2012-07-12 16:17:38 +05:30
85cf7c94fd
[IMP] hr_expense : Improved the code.
...
bzr revid: mdi@tinyerp.com-20120712084825-enistrb9u1fum2at
2012-07-12 14:18:25 +05:30
7ceed2bb9b
[IMP] hr_expense : Improved the test cases in accordance with voucher.
...
bzr revid: mdi@tinyerp.com-20120712065455-0xhhss2jcoo4cyxp
2012-07-12 12:24:55 +05:30
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
dc3ae0488b
[IMP] replace 'Price Unit name by 'Product Price'
...
bzr revid: benoit.guillot@akretion.com.br-20120711130615-25ascb8dfllo4r7j
2012-07-11 15:06:15 +02:00
05cb32962c
[REF] ref decimal precision on expense fields
...
bzr revid: benoit.guillot@akretion.com.br-20120710122846-8582vh8p8bimgufo
2012-07-10 14:28:46 +02:00
e6ef77b047
[MERGE] hr review of form views
...
bzr revid: qdp-launchpad@openerp.com-20120705092921-0edv4n7z0392ia83
2012-07-05 11:29:21 +02:00
5c791531aa
[IMP] improved typos
...
bzr revid: fp@tinyerp.com-20120522161055-6013qr1s4p773hoj
2012-05-22 18:10:55 +02:00
1aefff9733
[MERGE]:merged from trunk
...
bzr revid: apa@tinyerp.com-20120517101517-npk57s14kgxlk7in
2012-05-17 15:45:17 +05:30
c8a99a69b5
[FIX] hr_expense: when listing expenses in tree view, the 'amount' computed field is not respecting the defined decimal precision
...
bzr revid: olt@tinyerp.com-20120510134831-s2hmnjdrj5ba9ipj
2012-05-10 15:48:31 +02:00
a2a05cfc19
[IMP]:improved titles State by Status everywhere
...
bzr revid: ssu@tinyerp.com-20120504115748-2vd1dns7bxptg384
2012-05-04 17:27:48 +05:30
d1147c51e9
[IMP]
...
bzr revid: apa@tinyerp.com-20120501123446-kykbs2zi3pj0kq9u
2012-05-01 18:04:46 +05:30
8d3365c1ba
[IMP]
...
bzr revid: apa@tinyerp.com-20120427095137-5v5dnze0jokg7u3f
2012-04-27 15:21:37 +05:30
479d238076
[IMP] HR:UOM to Unit of Measure change everywhere
...
bzr revid: jap@tinyerp.com-20120425073257-78ys80zqw8piahvi
2012-04-25 13:02:57 +05:30
ffd0c86ec2
[FIX] a lot of fixes in several modules, as the result of the code review of the merge of the objects res.partner and res.partner.address
...
bzr revid: qdp-launchpad@openerp.com-20120330090837-s87z2qzsvynhlbwr
2012-03-30 11:08:37 +02:00
e6eb4f31ad
[Fix] hr_expense: fix the field name
...
bzr revid: sbh@tinyerp.com-20120307104942-r2674ngetk44b0y6
2012-03-07 16:19:42 +05:30
7419c49725
[Fix] remove unused field referce
...
bzr revid: sbh@tinyerp.com-20120307104530-wjmgyaj4c9ocrd5i
2012-03-07 16:15:30 +05:30
5fc1a9fc7b
[FIX] all: use newly introduced fields.date.context_today
...
Following the introduction of fields.date.context_today,
correct the main cases where we need to use the user's
timezone instead of the default UTC one.
There are probably many minor cases where this may be
useful, but those cases should be easy to fix now
that there is a common way to fix them.
lp bug: https://launchpad.net/bugs/925361 fixed
bzr revid: odo@openerp.com-20120213180741-4hvd4p7wsep0fomf
2012-02-13 19:07:41 +01:00
6aa1e416da
[IMP] indexes on _order
...
bzr revid: fp@tinyerp.com-20111221221504-dcj2l8x2xstqmccs
2011-12-21 23:15:04 +01:00
357f3fca2f
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20111221123724-buifqfz9zvmu9s8n
2011-12-21 18:07:24 +05:30
Thibault Delavallée
Fabien Pinckaers
Olivier Dony
Vo Minh Thu
Sanjay Gohel (Open ERP)
Khushboo Bhatt (Open ERP)
Saurang Suthar
Fabien Pinckaers
Vijaykumar Baladaniya
Mayur Maheshwari (OpenERP)
Randhir Mayatra (OpenERP)
Atul Patel (OpenERP)
Ajay Chauhan (OpenERP)
Purnendu Singh (OpenERP)
Quentin (OpenERP)
Harry (OpenERP)
Antonin Bourguignon
Alexis de Lattre
Saurang Suthar(OpenERP)
Divyesh Makwana (Open ERP)
Pinakin Nayi (OpenERP)
Benoit Guillot
Amit Patel (OpenERP)
Jagdish Panchal (Open ERP)
Bhumika (OpenERP)