Commit Graph

20 Commits

Author SHA1 Message Date
Stephane Wirtel c750d0b8e1 [MERGE] Remove unused res.payterm
bzr revid: stw@openerp.com-20120911153948-bfuzz0a66qi0ncpb
2012-09-11 17:39:48 +02:00
Stephane Wirtel 5bd3b4f0a2 [MERGE] base: fix typo of some languages
bzr revid: stw@openerp.com-20120911152531-h5naowr08c3lqva0
2012-09-11 17:25:31 +02:00
Stephane Wirtel 97278d6ed5 [MERGE] base: fix some address formats and some English
bzr revid: stw@openerp.com-20120911150724-yh4kvtstv8fehaj1
2012-09-11 17:07:24 +02:00
Turkesh Patel (Open ERP) b791fc2743 [MRG] merge with main branch.
bzr revid: tpa@tinyerp.com-20120822120213-sbfqq119bo4rwqaw
2012-08-22 17:32:13 +05:30
Turkesh Patel (Open ERP) 568288c3e1 [MRG] merge with main branch.
bzr revid: tpa@tinyerp.com-20120822115641-3l3yla4kji6xaxm6
2012-08-22 17:26:41 +05:30
Quentin (OpenERP) 1450ebd847 [FIX] base: restored translations for label 'VAT' changed into 'TIN' in revision 4344
bzr revid: qdp-launchpad@openerp.com-20120820115042-13epfxw99vzvumer
2012-08-20 13:50:42 +02:00
Turkesh Patel (Open ERP) 6e6ef1ed0f [IMP] remove res.payterm which is not in any part of code of server or addons.
bzr revid: tpa@tinyerp.com-20120705125411-fd1eazoofe5mpbvf
2012-07-05 18:24:11 +05:30
Turkesh Patel (Open ERP) c49f2418c2 [FIX] Typo in Portuguese official language names.
bzr revid: tpa@tinyerp.com-20120704051748-y41la206dwk67klv
2012-07-04 10:47:48 +05:30
Jigar Amin - OpenERP f86ccd2f4e [FIX] followup to follow-up
bzr revid: jam@tinyerp.com-20120626062428-d42lj4sf4a4almja
2012-06-26 11:54:28 +05:30
Jigar Amin - OpenERP f5bc454043 [FIX] renmae E-mail, E-Mail to Email
bzr revid: jam@tinyerp.com-20120625130652-ini3czg6a8qd71n2
2012-06-25 18:36:52 +05:30
Jigar Amin - OpenERP c8f8bd9cea [FIX] ren E-mail to Email
bzr revid: jam@tinyerp.com-20120625130201-d9032tey5ddu1pqu
2012-06-25 18:32:01 +05:30
Raphael Collet 204fe6cceb [IMP] adapt po files to label changes in models
bzr revid: rco@openerp.com-20120510093527-rumw265kyd2c7e0f
2012-05-10 11:35:27 +02:00
Bogdan Stanciu 434af1f37a [IMP] corrected a few titles vs. "shortcuts" and added three titles to res.partner.title
bzr revid: bogdanovidiu.stanciu@gmail.com-20120212122557-6od8yipxs6bp31ht
2012-02-12 13:25:57 +01:00
Bogdan Stanciu d52e838455 [IMP] some English corrections & 'encoding' into 'coding' for several py files. No code change.
bzr revid: bogdanovidiu.stanciu@gmail.com-20120212114509-yrw86zewyv70dow7
2012-02-12 12:45:09 +01:00
Olivier Dony f13de315be [I18N] base: updated translation template
This should be the last major sync before the
final release of 6.1

bzr revid: odo@openerp.com-20120208004538-uutge29kymontex4
2012-02-08 01:45:38 +01:00
Raphael Collet ac205cd443 [MERGE] small fixes (typo in tooltip, char field size)
bzr revid: rco@openerp.com-20120131132112-y526k22lrltqnocm
2012-01-31 14:21:12 +01:00
Olivier Dony fbc0545842 [IMP] base: change conflicting address-related "State" fields to "Fed. State"
This will avoid ambiguous translations, until we can
implement some sort of context-sensitive translation
system.

lp bug: https://launchpad.net/bugs/918086 fixed

bzr revid: odo@openerp.com-20120118132900-427nc6j0p4h25bdn
2012-01-18 14:29:00 +01:00
Olivier Dony 3bf839996c [I18N] base: updated translation template
bzr revid: odo@openerp.com-20111222202225-bfyk0uzmakgt1tle
2011-12-22 21:22:25 +01:00
Vo Minh Thu 6929d9f3c8 [FIX] ir_sequence: any merge proposal should touch as many .po files as possible.
bzr revid: vmt@openerp.com-20110928133101-z1baqrqw7yb2u73c
2011-09-28 15:31:01 +02:00
Vo Minh Thu f8572e5c60 [IMP] openerp python module.
- Some logging code moved from netsvc.py to loglevels.py
- Changed imports to use the new openerp module
- config and netsvc initialization calls move to openerp-server.py
- Moved openerp-server.py outside the old bin directory
- Some imports in tools moved inside the methods to break mutual-dependencies

bzr revid: vmt@openerp.com-20110207125723-ooee7d7ng5elmkso
2011-02-07 13:57:23 +01:00