Purnendu Singh (OpenERP)
4675aa0256
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120829112422-yxvlvmpvtoaasnbe
2012-08-29 16:54:22 +05:30
Launchpad Translations on behalf of openerp
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
Antonin Bourguignon
121b351b59
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120822175756-ypym270e6cklpbds
2012-08-22 19:57:56 +02:00
Saurang Suthar(OpenERP)
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
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
pso (OpenERP)
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
Hardik
8f9f860323
[IMP]Update __openerp__.py for all modules
...
bzr revid: hsa@tinyerp.com-20120820125644-px287o03bxrx8h3o
2012-08-20 18:26:44 +05:30
help
0d4603f4f9
[IMP]improved modules description from rst2html
...
bzr revid: help-20120820092716-x61hs1o7d8lz6tpg
2012-08-20 14:57:16 +05:30
Quentin (OpenERP)
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
Hardik
b040d2706d
[IMP]update __openerp__.py in all modules
...
bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g
2012-08-17 16:45:40 +05:30
Ajay Chauhan (OpenERP)
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
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
Mayur Maheshwari (OpenERP)
fdac923424
[MERGE]Merge with parent branch
...
bzr revid: mma@tinyerp.com-20120816051518-2ymocyufeddvalax
2012-08-16 10:45:18 +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
Quentin (OpenERP)
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
Mayur Maheshwari (OpenERP)
b5c6ed5197
[MERGE]Merge with parent branch
...
bzr revid: mma@tinyerp.com-20120814123614-36hf9mz1obl52mk7
2012-08-14 18:06:14 +05:30
Purnendu Singh (OpenERP)
b5fbb818f2
[IMP] small fix
...
bzr revid: psi@tinyerp.com-20120814122543-7o6hkxpy3ecap1m1
2012-08-14 17:55:43 +05:30
Vo Minh Thu
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
Purnendu Singh (OpenERP)
a6bd413462
[merge] merge with main addons
...
bzr revid: psi@tinyerp.com-20120814113447-3c20ay8rtvht373i
2012-08-14 17:04:47 +05:30
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
Thibault Delavallée
8d2c35cc75
[IMP] Misc addons: product_image -> image.
...
bzr revid: tde@openerp.com-20120814081616-zb5xe06cy8r3n5ie
2012-08-14 10:16:16 +02:00
Mayur Maheshwari (OpenERP)
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
Ajay Chauhan (OpenERP)
463d06651a
[Merge] Merge with main addons.
...
bzr revid: cha@tinyerp.com-20120814060914-kvhlm7q2avt2nyc3
2012-08-14 11:39:14 +05:30
Mayur Maheshwari (OpenERP)
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
Vo Minh Thu
9822629548
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
Mayur Maheshwari (OpenERP)
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
Rucha (Open ERP)
dd7a2972d8
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120813051411-5no0xcudwbkw07c5
2012-08-13 10:44:11 +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
Harry (OpenERP)
054de1ed58
[MERGE]
...
bzr revid: hmo@tinyerp.com-20120809131516-9bfj8ou1ud337xlo
2012-08-09 18:45:16 +05:30
Ajay Chauhan (OpenERP)
e9cc89239b
[Merge] Merge with main addons.
...
bzr revid: cha@tinyerp.com-20120809115407-uvmjpj1iafmkox0b
2012-08-09 17:24:07 +05:30
Ajay Chauhan (OpenERP)
4cc8dce4ec
[IMP] hr_expense : added condition to function
...
bzr revid: cha@tinyerp.com-20120809105103-tm0m7g854zglxfrg
2012-08-09 16:21:03 +05:30
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
Launchpad Translations on behalf of openerp
e970ecd62c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120809050051-p6f437n80grsr5vz
2012-08-09 05:00:51 +00:00
Olivier Dony
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
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
Rucha (Open ERP)
d597437dd7
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120808063503-ymsvwnerxakqbcbx
2012-08-08 12:05:03 +05:30
Antonin Bourguignon
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
Antonin Bourguignon
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
Launchpad Translations on behalf of openerp
3cfd65b43d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120807053928-8131c98edycpivlb
2012-08-07 05:39:28 +00:00
pso (OpenERP)
389f8d6803
[MERGE] Merge with main branch
...
bzr revid: pso@tinyerp.com-20120806094234-1b145yrjixy5yrsg
2012-08-06 15:12:34 +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