Commit Graph

1169 Commits

Author SHA1 Message Date
Olivier Dony 49597f0e66 [MERGE] *: improved english wording, suggestions courtesy of OpenERP Community
bzr revid: odo@openerp.com-20121221164808-kdjrtcbgma4dr3on
2012-12-21 17:48:08 +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 fa36ac76ee [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121220091908-7qy8excmhe3ussi0
2012-12-20 10:19:08 +01:00
Launchpad Translations on behalf of openerp 2315050bab Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121220044654-aygk0cmaxl26bs0f
bzr revid: launchpad_translations_on_behalf_of_openerp-20121220045947-8j22pe4nm62kzq22
2012-12-20 04:59:47 +00:00
Thibault Delavallée e0cf6831f0 [IMP] Continuing last commit: still some subtype description updated.
bzr revid: tde@openerp.com-20121219212747-gk9cnsuyvft1zm4x
2012-12-19 22:27:47 +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
Randhir Mayatra (OpenERP) e60b495ebd [IMP] improve the string of expense type
bzr revid: rma@tinyerp.com-20121219065041-zwm9w62474x4jstl
2012-12-19 12:20:41 +05:30
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
Quentin (OpenERP) a513344bc1 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121218134118-ixggega7sumgv6gq
2012-12-18 14:41:18 +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 b67f73c327 [MERGE] Sync with trunk
bzr revid: odo@openerp.com-20121218025230-zig415ldtmazgbxt
2012-12-18 03:52:30 +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
Cecile Tonglet 15fe515601 [MERGE] From trunk
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
Quentin (OpenERP) d5a38257ea [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121217110601-z27qffjgh164jgxf
2012-12-17 12:06:01 +01:00
Quentin (OpenERP) f9e227717e [MERGE] addons-27 sale
bzr revid: qdp-launchpad@openerp.com-20121217110245-1rc9cl4x7r3l607j
2012-12-17 12:02:45 +01:00
Foram Katharotiya (OpenERP) 6ebeb076c3 [MERGE] with trunk
bzr revid: fka@tinyerp.com-20121217051643-o8j4hz7w8thwbymi
2012-12-17 10:46:43 +05:30
Launchpad Translations on behalf of openerp cc8025387b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121214053905-mac64ijay9566opr
bzr revid: launchpad_translations_on_behalf_of_openerp-20121214054902-12ndwftreb4g1964
2012-12-14 05:49:02 +00:00
Launchpad Translations on behalf of openerp d6ea61789f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121213044507-t1hpxi43gks88w2e
bzr revid: launchpad_translations_on_behalf_of_openerp-20121213050131-3r9t674ehhnkneky
2012-12-13 05:01:31 +00:00
Foram Katharotiya (OpenERP) ff15fe0c7c [MERGE] with trunk
bzr revid: fka@tinyerp.com-20121213045043-hwdrk202wlubx31b
2012-12-13 10:20:43 +05:30
Quentin (OpenERP) 1f92bd6854 [MERGE] usability in purchase order and demo data of hr.expense
bzr revid: qdp-launchpad@openerp.com-20121212105944-3osl24f7i1przey1
2012-12-12 11:59:44 +01:00
Launchpad Translations on behalf of openerp cc69fe1b25 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121211044948-8q9vf1f9ftrzq4wm
bzr revid: launchpad_translations_on_behalf_of_openerp-20121211050318-3noic2ymt0j497rw
2012-12-11 05:03:18 +00:00
Foram Katharotiya (OpenERP) 38e578d2c0 [MERGE] with trunk
bzr revid: fka@tinyerp.com-20121211045123-gi4y8dsm3fxq1lii
2012-12-11 10:21:23 +05:30
Vo Minh Thu 6072fd11af [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n
2012-12-10 12:16:54 +01:00
Jiten (OpenERP) fd1e69a638 [MER] Merged trunk.
bzr revid: jra@tinyerp.com-20121210083952-fhjlo40g55d7ngf4
2012-12-10 14:09:52 +05:30
Anand Patel (OpenERP) 524da44d8e [MERGE]Merged with latest trunk
bzr revid: pan@tinyerp.com-20121210061420-38p68a9jg2u0vjrx
2012-12-10 11:44:20 +05:30
Foram Katharotiya (OpenERP) 955f2588a2 [MERGE] with trunk
bzr revid: fka@tinyerp.com-20121210045724-sk2hk8mmi8iahfwn
2012-12-10 10:27:24 +05:30
Antony Lesuisse 446abaee2d [FIX] incorrect import, prepare for wizard removal
bzr revid: al@openerp.com-20121209182237-6yp9j6yyrnsa813y
2012-12-09 19:22:37 +01:00
Fabien Pinckaers f3fc080ef7 [MERGE] module desc + stock
bzr revid: fp@tinyerp.com-20121209105527-4ot27zsv5vqr38ls
2012-12-09 11:55:27 +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
Anand Patel (OpenERP) b47cf7f0ac [IMP] Improved demo data to add cost price for hr_expense product 'Air Ticket' to resolve issue for fischal position.
bzr revid: pan@tinyerp.com-20121206112113-23m8lzl60jztnpko
2012-12-06 16:51:13 +05:30
Bhumi Thakkar (Open ERP) 7bf0d91f48 [MERGE] Merge lp:~openerp-dev/openobject-addons/trunk-improve-addons27-contract-bth.
bzr revid: bth@tinyerp.com-20121206111208-gwr8htsdhgu0ggzm
2012-12-06 16:42:08 +05:30
Launchpad Translations on behalf of openerp 683f31e51b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055506-fin73s7n3o52fmuy
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055956-fsd4tp3felpk8pm5
2012-12-04 05:59:56 +00:00
Foram Katharotiya (OpenERP) b7e5fa13b9 [MERGE] with trunk
bzr revid: fka@tinyerp.com-20121204055947-4wyypt1tkrqi2uv4
2012-12-04 11:29:47 +05:30
Olivier Dony 308e4f1073 [I18N] Removed duplicated terms for inherited [_sql]_constraints -> 400 terms removed
bzr revid: odo@openerp.com-20121203162755-p71dnn0k0t2b98yp
2012-12-03 17:27:55 +01:00
Olivier Dony 5483897ad0 [I18N] Update translation templates for latest changes
bzr revid: odo@openerp.com-20121203155934-zmut8afc7hh82b02
2012-12-03 16:59:34 +01:00
Thibault Delavallée ce923903b5 [IMP] [REVIEW] [DOC] addons: added some comments in the various data files about subtypes.
bzr revid: tde@openerp.com-20121203114009-obtca9gf3t7b909y
2012-12-03 12:40:09 +01:00
Thibault Delavallée c3a3492848 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121203093454-lf21qlsuse1ve8ro
2012-12-03 10:34:54 +01:00
Bhumi Thakkar (Open ERP) c468fbedff [IMP] Set priority and when no any data in listview then display message with arrow message.
bzr revid: bth@tinyerp.com-20121130110332-fq30b3174e0kfu33
2012-11-30 16:33:32 +05:30
dle@openerp.com 514952bdd3 [MERGE]Latest trunk
bzr revid: dle@openerp.com-20121128164105-m3hgq38xw6ikewa5
2012-11-28 17:41:05 +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) 257bc28f47 [MERGE]merge with trunk
bzr revid: sgo@tinyerp.com-20121127132410-97fdoscu8mhg7d6r
2012-11-27 18:54:10 +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
Fabien Pinckaers d9936eda84 [IMP] some timesheet invoices fixes (not all)
bzr revid: fp@tinyerp.com-20121126075403-z4dq5h9ytptrf6sh
2012-11-26 08:54:03 +01:00
Fabien Pinckaers 1651164755 [IMP] HR Leaves useability
bzr revid: fp@tinyerp.com-20121126074101-emvux1ullg1txoly
2012-11-26 08:41:01 +01:00
Launchpad Translations on behalf of openerp 828cce9be0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125063324-fjz8k77annh364u7
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126044235-u20vi1440dgppikf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125064209-s515ia18188hl147
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126045508-rm6d2mx71a0sjqh9
2012-11-26 04:55:08 +00:00