a7368145ca
[MERGE] typo
...
bzr revid: fp@openerp.com-20121024201424-98la8f2wkhfjrtae
2012-10-24 22:14:24 +02:00
5bfa3c5a7d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121019053933-51d6oob5aw0ujz40
2012-10-19 05:39:33 +00:00
d1131c4a8d
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20121018052756-65fv51x0qrmz7zj6
bzr revid: mma@tinyerp.com-20121019050930-mcht3lslqjk38q22
2012-10-19 10:39:30 +05:30
df2750f9fd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121018044110-cqlg7hbfgy4m2bba
2012-10-18 04:41:10 +00:00
8346293d72
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20121015090200-irfaskfn9i1p68j9
bzr revid: mma@tinyerp.com-20121016052513-vl56jxtp7xbpa2ry
2012-10-16 10:55:13 +05:30
0b87880029
[IMP]all: imporve string state to status
...
bzr revid: mma@tinyerp.com-20121012114258-w2q3hg1wb5wlt8wi
2012-10-12 17:12:58 +05:30
ce440f16d3
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20121011075658-bf5ax000j74vi6ro
2012-10-11 09:56:58 +02:00
fc94df2af5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121011050045-qe3vhe34wrjw1xb8
2012-10-11 05:00:45 +00:00
f715525300
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121003064028-49llvt047893tx2n
2012-10-03 12:10:28 +05:30
3d6520b3ff
[FIX]hr_payroll: Fix if address is not defined.
...
bzr revid: atp@tinyerp.com-20121003060346-tdakbm44iumvynw8
2012-10-03 11:33:46 +05:30
1653332080
[MERGE] trunk
...
bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw
2012-10-02 12:29:15 +02:00
082f70cb6f
[MERGE]: Merged display_address() field
...
bzr revid: atp@tinyerp.com-20121002065832-7wick5qjfbbhy5jv
2012-10-02 12:28:32 +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
a9676cfd8c
[IMP] amout with currency.
...
bzr revid: nco@tinyerp.com-20121001110802-r3l169i2ka73t2rh
2012-10-01 16:38:02 +05:30
196f68fda4
[MERGE] payslip duplicate
...
bzr revid: fp@tinyerp.com-20120929121056-kfkqc9jofb87cp2m
2012-09-29 14:10:56 +02:00
1d0230a9c4
[FIX] domain on hr_payroll
...
bzr revid: fp@tinyerp.com-20120929085633-xzu5u5jr1f64zx1g
2012-09-29 10:56:33 +02:00
f994fbde81
[FIX] contract date on payroll
...
bzr revid: fp@tinyerp.com-20120929083313-isidx3975voqzh7h
2012-09-29 10:33:13 +02:00
fc9f8491fe
[MERGE] related not in 'More...'
...
bzr revid: fp@tinyerp.com-20120927173641-i503k4kycnwjyefj
2012-09-27 19:36:41 +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
1fbb4a5c16
[IMP] handling of '(copy)' l10n
...
bzr revid: abo@openerp.com-20120924162645-z1h4l2mj6c8i6wr3
2012-09-24 18:26:45 +02:00
1c46b40f09
[MERGE] merged with main addons
...
bzr revid: bde@tinyerp.com-20120921070605-jw08d71hb12nk4s7
2012-09-21 12:36:05 +05:30
1766a3a9e2
[MERGE] fixes in payroll
...
bzr revid: fp@tinyerp.com-20120920091021-ieq47tyn4bffwcmo
2012-09-20 11:10:21 +02:00
f317c0dc16
[MERGE] hr fixes
...
bzr revid: fp@tinyerp.com-20120920090706-usen24pssndoag0g
2012-09-20 11:07:06 +02:00
f46b934a7a
[IMP] removed same buttons from More button located at top
...
bzr revid: bde@tinyerp.com-20120919132454-vic77ff22hjro39t
2012-09-19 18:54:54 +05:30
ba12f1e786
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120919091058-33m1dqf2k2oly8dj
2012-09-19 14:40:58 +05:30
e6afcac5fd
[MERGE]:employee should not access timesheets from the timesheets menu or also payslip
...
bzr revid: apa@tinyerp.com-20120917122012-rbkf1skp1oeevh5h
2012-09-17 17:50:12 +05:30
1a899f1069
[MERGE] HR
...
bzr revid: fp@openerp.com-20120916160953-8bssla7rcll6gf8g
2012-09-16 18:09:53 +02:00
45accdcb11
[FIX] hr_payroll: small fix in code
...
bzr revid: psi@tinyerp.com-20120914114645-0nmbochejovtmxoa
2012-09-14 17:16:45 +05:30
d6608da313
[FIX] hr_payroll: small fix in code
...
bzr revid: psi@tinyerp.com-20120914112756-rbzvhcaj35sz5duk
2012-09-14 16:57:56 +05:30
428259a2b6
[IMP] hr_payroll: improve the onchange employee method on payslip so it will not give traceback in case contract is available for the selected employee and salary structure is not there
...
bzr revid: psi@tinyerp.com-20120914111847-irocinmn1f29wc5d
2012-09-14 16:48:47 +05:30
2dff9d3c39
[IMP]account : improve tool tip
...
bzr revid: mma@tinyerp.com-20120913125745-k4deap3rlva45oik
2012-09-13 18:27:45 +05:30
b90853eaf0
[IMP]account : improve string
...
bzr revid: mma@tinyerp.com-20120913125154-75dc3d48yk1atujy
2012-09-13 18:21:54 +05:30
5f7466d75a
[MERGE]:hr configuration
...
bzr revid: apa@tinyerp.com-20120913063035-ghidl2su7hsul54t
2012-09-13 12:00:35 +05:30
ffc772edfd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120904045249-1039twan4q8v5oip
2012-09-04 04:52:49 +00:00
6897a476a1
[IMP]hr configuration
...
bzr revid: pna@tinyerp.com-20120903084323-xizfs8wsy4iqxuvb
2012-09-03 14:13:23 +05:30
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
1987736114
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: amp@tinyerp.com-20120823053427-xntjhsvbjoktb752
2012-08-23 11:04:27 +05:30
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
8f9f860323
[IMP]Update __openerp__.py for all modules
...
bzr revid: hsa@tinyerp.com-20120820125644-px287o03bxrx8h3o
2012-08-20 18:26:44 +05:30
b040d2706d
[IMP]update __openerp__.py in all modules
...
bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g
2012-08-17 16:45:40 +05:30
9822629548
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
dd7a2972d8
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120813051411-5no0xcudwbkw07c5
2012-08-13 10:44:11 +05:30
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
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
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
Fabien Pinckaers
Launchpad Translations on behalf of openerp
Mayur Maheshwari (OpenERP)
Quentin (OpenERP)
Atul Patel (OpenERP)
Antonin Bourguignon
Nimesh (Open ERP)
Fabien Pinckaers
Bharat Devnani (OpenERP)
Purnendu Singh (OpenERP)
Amit Patel
Pinakin Nayi (OpenERP)
Amit (OpenERP)
Hardik
Vo Minh Thu
Rucha (Open ERP)
Twinkle Christian (OpenERP)
Olivier Dony
pso (OpenERP)