f715525300
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121003064028-49llvt047893tx2n
2012-10-03 12:10:28 +05:30
257d03f403
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121003052447-99gpby70gy2fbhih
2012-10-03 10:54:47 +05:30
0d80ceda1a
[MERGE]: Merged nco branch for display amount with currency symbol using formatLang
...
bzr revid: atp@tinyerp.com-20121001194847-mgepvrrgwi6ifnlh
2012-10-02 01:18:47 +05:30
f669a37fc0
[IMP] make changes into product
...
bzr revid: rma@tinyerp.com-20121001121630-cvtnnh6eh86nkj1a
2012-10-01 17:46:30 +05:30
e033f2f1ae
[MERGE] merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20121001084641-li6apbpimfbyllo3
2012-10-01 14:16:41 +05:30
6dd16f2613
[MERGE] trunk
...
bzr revid: al@openerp.com-20120930141638-bw50m7b5a8wnu2yh
2012-09-30 16:16:38 +02:00
8683ea9c6d
[MERGE] trunk
...
bzr revid: abo@openerp.com-20120928152152-p6s1dzq96g0sy2sf
2012-09-28 17:21:52 +02:00
8afc4b0d16
[IMP] expense.rml
...
bzr revid: nco@tinyerp.com-20120928122920-rah1697pni2xnwk3
2012-09-28 17:59:20 +05:30
0159340e87
[IMP] imporve amount with curruncy in hr_expense
...
bzr revid: nco@tinyerp.com-20120928113712-wcy20zoas4ixkk7x
2012-09-28 17:07:12 +05:30
254aacbd01
[MERGE] merge with main addons
...
bzr revid: cha@tinyerp.com-20120928055404-hwwdjkqod93pcbk5
2012-09-28 11:24:04 +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
ffb34cf11a
[MERGE] expenses on products
...
bzr revid: fp@tinyerp.com-20120927172857-33gdnizuxzi63dce
2012-09-27 19:28:57 +02:00
8c42299413
[REMOVE] remove create button form all posgress report.
...
bzr revid: nco@tinyerp.com-20120927083839-ruhpxzwgdyasodfe
2012-09-27 14:08:39 +05:30
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
77d4347f4a
[IMP] hr_expense: made access_rule to create expense as a employee
...
bzr revid: cha@tinyerp.com-20120926125325-xshc34cau22qnc40
2012-09-26 18:23:25 +05:30
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
e9f4840c93
[IMP] emoving bad code, no invitation system on events
...
[IMP] no more certifiate, will be managed in apps.openerp.com directly
bzr revid: fp@tinyerp.com-20120926121627-60isym4hdjkaxe9p
2012-09-26 14:16:27 +02:00
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
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
fa63653de9
[MERGE] from trunk-mail-mail-rules-tde
...
bzr revid: chm@openerp.com-20120921095037-czl4s3v0do11yhkq
2012-09-21 11:50:37 +02:00
c7b1d6cb63
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120920145753-2izkiam4sf8t53of
2012-09-20 16:57:53 +02:00
84fbc3b7da
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120920144900-isobpji9066sftj1
2012-09-20 16:49:00 +02:00
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
8c83c0dcb8
[MERGE] visibility of accounting data in expenses
...
bzr revid: fp@tinyerp.com-20120920085609-bwuuayhgk4c8frmv
2012-09-20 10:56:09 +02:00
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
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
a6e77b12e2
[IMP]:hr_expense:add accountant group for journal.
...
bzr revid: apa@tinyerp.com-20120917061316-bnjex2lyoplo3jom
2012-09-17 11:43:16 +05:30
1e7cccc36c
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20120917053353-p3orjwynojw7an6o
2012-09-17 11:03:53 +05:30
b9fa71cc59
[MERGE] merge rpa's imprvoements of modules description
...
bzr revid: fp@openerp.com-20120916212615-jfoghzsady0ektp1
2012-09-16 23:26:15 +02:00
ab4b7da49f
[IMP] cleaned ir.actions.todo to launch newly installed application
...
bzr revid: fp@openerp.com-20120916114249-5px8shvbm3tzhidh
2012-09-16 13:42:49 +02:00
59c03591df
[MERGE] improvements on module descriptions
...
bzr revid: gim@openerp.com-20120914140950-drka4c0tnbnkw3fg
2012-09-14 16:09:50 +02:00
30839863e8
[IMP] improve module descriptions
...
bzr revid: gim@openerp.com-20120914122827-dhao39ur269mmin8
2012-09-14 14:28:27 +02:00
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
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
7cbbfb8b3d
[IMP]:security
...
bzr revid: apa@tinyerp.com-20120913133350-e9ky4ikdqtz07ika
2012-09-13 19:03:50 +05:30
8bf810c493
[IMP]:security
...
bzr revid: apa@tinyerp.com-20120913130806-492c65dk9jfbyjrl
2012-09-13 18:38:06 +05:30
0b1cd66d1b
[MERGE]:merged hr expense
...
bzr revid: apa@tinyerp.com-20120913123908-mmp08uyxwb2a3vwd
2012-09-13 18:09:08 +05:30
afb33dba8a
[IMP]: hr_expense: Improved module description for hr_expense
...
bzr revid: rpa@tinyerp.com-20120912121818-yvntgjkzjr0fqo18
2012-09-12 17:48:18 +05:30
585dce207d
[REM] Dashboard: Removed creatable option (requested by fp)
...
bzr revid: fme@openerp.com-20120910093152-r14olqa181obp7f2
2012-09-10 11:31:52 +02:00
2160072508
[MERGE] sync with trunk
...
bzr revid: odo@openerp.com-20120905073134-v1j98vzvmwe6a72i
2012-09-05 09:31:34 +02:00
ff1a41d098
[IMP]change access rights of emloyee
...
bzr revid: pna@tinyerp.com-20120903054914-c816mv1ctphqlqwv
2012-09-03 11:19:14 +05:30
1dce0b1dc4
[FIX] all mail dependencies: replace message_post call by normal record + review misc wording
...
bzr revid: odo@openerp.com-20120830141852-ku8nql1sfkko8669
2012-08-30 16:18:52 +02:00
4675aa0256
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120829112422-yxvlvmpvtoaasnbe
2012-08-29 16:54:22 +05:30
8b910c1f1d
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120829074244-x6u8dnw4owiw93pv
2012-08-29 09:42:44 +02:00
4e31d1be93
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828064335-bftlutj6aiymztbp
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828072410-7ndsu3tnyrjhtuor
2012-08-28 07:24:10 +00:00
4b0d1be1c0
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120827083705-p2edynkzch7hszrd
2012-08-27 10:37:05 +02:00
121b351b59
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120822175756-ypym270e6cklpbds
2012-08-22 19:57:56 +02:00
095843797c
[IMP] Improved _openerp__.py of all modules by replacing demo_xml with demo, init_xml and update_xml with data and adding noupdate
...
bzr revid: pso@tinyerp.com-20120822130232-un52dks3sclyx8m5
2012-08-22 18:32:32 +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
c78a04bc68
[MERGE] Merged HSA's branch to improve __openerp__.py of all modules by replacing init_xml, update_xml with data, demo_xml with demo, Adding noupdate in init_xml files
...
bzr revid: pso@tinyerp.com-20120822071445-yamr1s0zf3fk9jj7
2012-08-22 12:44:45 +05:30
eeb7878d43
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120821150936-0pvvttbq6w3t2byi
2012-08-21 17:09:36 +02:00
8f9f860323
[IMP]Update __openerp__.py for all modules
...
bzr revid: hsa@tinyerp.com-20120820125644-px287o03bxrx8h3o
2012-08-20 18:26:44 +05:30
0d4603f4f9
[IMP]improved modules description from rst2html
...
bzr revid: help-20120820092716-x61hs1o7d8lz6tpg
2012-08-20 14:57:16 +05:30
d6ea5a5cc6
[MERGE] branch with improvement hr_expense (accounting entries booking)
...
bzr revid: qdp-launchpad@openerp.com-20120817122406-gjf1ih4l4m5wm2qu
2012-08-17 14:24:06 +02:00
6ac583c0f7
[IMP] mail cleaning
...
bzr revid: fp@tinyerp.com-20120817111936-2d33nlqlbvkjb374
2012-08-17 13:19:36 +02:00
b040d2706d
[IMP]update __openerp__.py in all modules
...
bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g
2012-08-17 16:45:40 +05:30
66ece041f0
[IMP] append note
...
bzr revid: fp@tinyerp.com-20120817102650-1sglq1y2dbb3xqju
2012-08-17 12:26:50 +02:00
4b364238c3
[IMP] hr_expense: made little changes in demo data
...
bzr revid: cha@tinyerp.com-20120817094727-8u7dt2djaawz4lc0
2012-08-17 15:17:27 +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
da8045d784
add message_followers_ids
...
bzr revid: al@openerp.com-20120815223038-ppuq03m5wj97u6rj
2012-08-16 00:30:38 +02:00
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
2376fe0add
[MERGE] merged view changes: the `type` is now a functional field derived from the arch.
...
bzr revid: vmt@openerp.com-20120814121117-dent4ctz89kdcabi
2012-08-14 14:11:17 +02:00
a6bd413462
[merge] merge with main addons
...
bzr revid: psi@tinyerp.com-20120814113447-3c20ay8rtvht373i
2012-08-14 17:04:47 +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
8d2c35cc75
[IMP] Misc addons: product_image -> image.
...
bzr revid: tde@openerp.com-20120814081616-zb5xe06cy8r3n5ie
2012-08-14 10:16:16 +02:00
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
463d06651a
[Merge] Merge with main addons.
...
bzr revid: cha@tinyerp.com-20120814060914-kvhlm7q2avt2nyc3
2012-08-14 11:39:14 +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
9822629548
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
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
dd7a2972d8
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120813051411-5no0xcudwbkw07c5
2012-08-13 10:44:11 +05:30
e8e7c91138
[IMP] hr_expense: small improvements
...
bzr revid: qdp-launchpad@openerp.com-20120810151108-lxqlaxh7m6yd31fi
2012-08-10 17:11:08 +02:00
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
e970ecd62c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120809050051-p6f437n80grsr5vz
2012-08-09 05:00:51 +00:00
3fd9a77c83
[REVERT] Cancel PO Template changes from rev.2702 - to be fully re-generated before next release
...
We'll also attempt to replace the master strings in the
translated .po files before replacing the master strings,
to avoid losing translations just because of mere typo fixes.
bzr revid: odo@openerp.com-20120808144613-wtz50tcz5n7kvcza
2012-08-08 16:46:13 +02:00
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
d597437dd7
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120808063503-ymsvwnerxakqbcbx
2012-08-08 12:05:03 +05:30
a97687a420
[MERGE] latest trunk
...
also replace the error message title 'Operation Not Permitted' by 'Invalid Action'
bzr revid: abo@openerp.com-20120807120451-zdrrecilfh82obhl
2012-08-07 14:04:51 +02:00
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
3cfd65b43d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120807053928-8131c98edycpivlb
2012-08-07 05:39:28 +00:00
389f8d6803
[MERGE] Merge with main branch
...
bzr revid: pso@tinyerp.com-20120806094234-1b145yrjixy5yrsg
2012-08-06 15:12:34 +05:30
bbf4bfe78c
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120806060602-ph2s5sx6tebomcs3
2012-08-06 11:36:02 +05:30
Atul Patel (OpenERP)
Randhir Mayatra (OpenERP)
Ajay Chauhan (OpenERP)
Antony Lesuisse
Antonin Bourguignon
Nimesh (Open ERP)
Fabien Pinckaers
Quentin (OpenERP)
Christophe Matthieu
Thibault Delavallée
Hardik
Amit Patel
Fabien Pinckaers
Gilles Major
Frédéric van der Essen
Rucha (Open ERP)
Fabien Meghazi
Olivier Dony
Pinakin Nayi (OpenERP)
Purnendu Singh (OpenERP)
Launchpad Translations on behalf of openerp
pso (OpenERP)
Mayur Maheshwari (OpenERP)
Vo Minh Thu
Harry (OpenERP)
Twinkle Christian (OpenERP)