Odoo Server (MOVED TO GITHUB)

Merge lp://staging/~nch-openerp/openobject-server/stable_report into lp://staging/~openerp/openobject-server/old_trunk

  1. stable_report
  2. Merge into old_trunk
Proposed by Naresh(OpenERP)
Status: Rejected
Rejected by: Xavier (Open ERP)
Proposed branch: lp://staging/~nch-openerp/openobject-server/stable_report
Merge into: lp://staging/~openerp/openobject-server/old_trunk
Diff against target: 288354 lines (+179376/-14517)
212 files modified
Makefile (+43/-0)
bin/PKG-INFO (+1/-1)
bin/addons/__init__.py (+44/-23)
bin/addons/base/base.sql (+11/-1)
bin/addons/base/base_data.xml (+6/-1643)
bin/addons/base/i18n/ar_AR.po (+3981/-338)
bin/addons/base/i18n/base.pot (+4041/-338)
bin/addons/base/i18n/bg_BG.po (+4100/-465)
bin/addons/base/i18n/bs_BS.po (+4016/-370)
bin/addons/base/i18n/ca_ES.po (+4193/-518)
bin/addons/base/i18n/cs_CZ.po (+4022/-376)
bin/addons/base/i18n/de_DE.po (+4147/-497)
bin/addons/base/i18n/es_AR.po (+4017/-372)
bin/addons/base/i18n/es_ES.po (+4147/-497)
bin/addons/base/i18n/et_EE.po (+4201/-540)
bin/addons/base/i18n/fi_FI.po (+11271/-0)
bin/addons/base/i18n/fr_FR.po (+4253/-525)
bin/addons/base/i18n/hr_HR.po (+3981/-338)
bin/addons/base/i18n/hu_HU.po (+3989/-346)
bin/addons/base/i18n/id_ID.po (+11254/-0)
bin/addons/base/i18n/it_IT.po (+4125/-475)
bin/addons/base/i18n/lt_LT.po (+3981/-338)
bin/addons/base/i18n/nl_BE.po (+3984/-341)
bin/addons/base/i18n/nl_NL.po (+4147/-497)
bin/addons/base/i18n/pl_PL.po (+3981/-338)
bin/addons/base/i18n/pt_BR.po (+4111/-461)
bin/addons/base/i18n/pt_PT.po (+4113/-463)
bin/addons/base/i18n/ro_RO.po (+3995/-351)
bin/addons/base/i18n/ru_RU.po (+4098/-450)
bin/addons/base/i18n/sl_SL.po (+4105/-457)
bin/addons/base/i18n/sq_AL.po (+11254/-0)
bin/addons/base/i18n/sv_SE.po (+3994/-349)
bin/addons/base/i18n/tr_TR.po (+3986/-342)
bin/addons/base/i18n/uk_UA.po (+11261/-0)
bin/addons/base/i18n/vi_VN.po (+11254/-0)
bin/addons/base/i18n/zh_CN.po (+4022/-376)
bin/addons/base/i18n/zh_TW.po (+3996/-352)
bin/addons/base/ir/ir.xml (+13/-5)
bin/addons/base/ir/ir_actions.py (+75/-54)
bin/addons/base/ir/ir_attachment.py (+32/-28)
bin/addons/base/ir/ir_cron.py (+61/-25)
bin/addons/base/ir/ir_model.py (+55/-24)
bin/addons/base/ir/ir_rule.py (+9/-4)
bin/addons/base/ir/ir_sequence.py (+4/-4)
bin/addons/base/ir/ir_translation.py (+32/-3)
bin/addons/base/ir/ir_ui_menu.py (+2/-2)
bin/addons/base/ir/ir_ui_view.py (+1/-1)
bin/addons/base/ir/ir_values.py (+1/-1)
bin/addons/base/maintenance/maintenance.py (+8/-2)
bin/addons/base/module/module.py (+5/-4)
bin/addons/base/module/report/ir_module_reference_print.py (+1/-1)
bin/addons/base/report/corporate_defaults.xsl (+9/-9)
bin/addons/base/report/custom_default.xsl (+4/-2)
bin/addons/base/res/__init__.py (+6/-0)
bin/addons/base/res/partner/partner.py (+15/-2)
bin/addons/base/res/partner/partner_demo.xml (+20/-1)
bin/addons/base/res/partner/partner_view.xml (+7/-0)
bin/addons/base/res/partner/wizard/wizard_spam.py (+4/-0)
bin/addons/base/res/res_lang.py (+4/-5)
bin/addons/base/res/res_user.py (+4/-0)
bin/addons/base/rng/view.rng (+51/-0)
bin/addons/module_graph.py (+1/-1)
bin/addons/quality_integration_server/base_quality_interrogation.py (+381/-0)
bin/import_xml.rng (+1/-0)
bin/netsvc.py (+17/-8)
bin/openerp-server.py (+11/-2)
bin/osv/expression.py (+145/-40)
bin/osv/fields.py (+73/-15)
bin/osv/orm.py (+582/-83)
bin/osv/osv.py (+5/-4)
bin/pychart/__init__.py (+21/-0)
bin/pychart/afm/AvantGarde_Book.py (+5/-0)
bin/pychart/afm/AvantGarde_BookOblique.py (+5/-0)
bin/pychart/afm/AvantGarde_Demi.py (+5/-0)
bin/pychart/afm/AvantGarde_DemiOblique.py (+5/-0)
bin/pychart/afm/Bookman_Demi.py (+5/-0)
bin/pychart/afm/Bookman_DemiItalic.py (+5/-0)
bin/pychart/afm/Bookman_Light.py (+5/-0)
bin/pychart/afm/Bookman_LightItalic.py (+5/-0)
bin/pychart/afm/Courier.py (+5/-0)
bin/pychart/afm/Courier_Bold.py (+5/-0)
bin/pychart/afm/Courier_BoldOblique.py (+5/-0)
bin/pychart/afm/Courier_Oblique.py (+5/-0)
bin/pychart/afm/Helvetica.py (+5/-0)
bin/pychart/afm/Helvetica_Bold.py (+5/-0)
bin/pychart/afm/Helvetica_BoldOblique.py (+5/-0)
bin/pychart/afm/Helvetica_Light.py (+5/-0)
bin/pychart/afm/Helvetica_LightOblique.py (+5/-0)
bin/pychart/afm/Helvetica_Narrow.py (+5/-0)
bin/pychart/afm/Helvetica_Narrow_Bold.py (+5/-0)
bin/pychart/afm/Helvetica_Narrow_BoldOblique.py (+5/-0)
bin/pychart/afm/Helvetica_Narrow_Oblique.py (+5/-0)
bin/pychart/afm/Helvetica_Oblique.py (+5/-0)
bin/pychart/afm/NewCenturySchlbk_Bold.py (+5/-0)
bin/pychart/afm/NewCenturySchlbk_BoldItalic.py (+5/-0)
bin/pychart/afm/NewCenturySchlbk_Italic.py (+5/-0)
bin/pychart/afm/NewCenturySchlbk_Roman.py (+5/-0)
bin/pychart/afm/Palatino_Bold.py (+5/-0)
bin/pychart/afm/Palatino_BoldItalic.py (+5/-0)
bin/pychart/afm/Palatino_Italic.py (+5/-0)
bin/pychart/afm/Palatino_Roman.py (+5/-0)
bin/pychart/afm/Symbol.py (+5/-0)
bin/pychart/afm/Times_Bold.py (+5/-0)
bin/pychart/afm/Times_BoldItalic.py (+5/-0)
bin/pychart/afm/Times_Italic.py (+5/-0)
bin/pychart/afm/Times_Roman.py (+5/-0)
bin/pychart/afm/Utopia_Bold.py (+5/-0)
bin/pychart/afm/Utopia_BoldItalic.py (+5/-0)
bin/pychart/afm/Utopia_Italic.py (+5/-0)
bin/pychart/afm/Utopia_Regular.py (+5/-0)
bin/pychart/afm/ZapfChancery_MediumItalic.py (+5/-0)
bin/pychart/afm/ZapfDingbats.py (+5/-0)
bin/pychart/afm/__init__.py (+1/-0)
bin/pychart/afm/dir.py (+2/-0)
bin/pychart/area.py (+249/-0)
bin/pychart/area_doc.py (+63/-0)
bin/pychart/arrow.py (+184/-0)
bin/pychart/arrow_doc.py (+9/-0)
bin/pychart/axis.py (+241/-0)
bin/pychart/axis_doc.py (+53/-0)
bin/pychart/axis_x_doc.py (+65/-0)
bin/pychart/axis_y_doc.py (+65/-0)
bin/pychart/bar_plot.py (+268/-0)
bin/pychart/bar_plot_doc.py (+79/-0)
bin/pychart/basecanvas.py (+505/-0)
bin/pychart/canvas.py (+123/-0)
bin/pychart/category_coord.py (+47/-0)
bin/pychart/chart_data.py (+387/-0)
bin/pychart/chart_object.py (+73/-0)
bin/pychart/color.py (+611/-0)
bin/pychart/color_doc.py (+7/-0)
bin/pychart/coord.py (+49/-0)
bin/pychart/doc_support.py (+122/-0)
bin/pychart/empty_docs.py (+44/-0)
bin/pychart/error_bar.py (+159/-0)
bin/pychart/error_bar_doc.py (+34/-0)
bin/pychart/fill_style.py (+285/-0)
bin/pychart/fill_style_doc.py (+7/-0)
bin/pychart/font.py (+454/-0)
bin/pychart/generate_docs.py (+125/-0)
bin/pychart/gs_frontend.py (+87/-0)
bin/pychart/interval_bar_plot.py (+228/-0)
bin/pychart/legend.py (+181/-0)
bin/pychart/legend_doc.py (+28/-0)
bin/pychart/line_plot.py (+150/-0)
bin/pychart/line_plot_doc.py (+25/-0)
bin/pychart/line_style.py (+158/-0)
bin/pychart/line_style_doc.py (+24/-0)
bin/pychart/linear_coord.py (+37/-0)
bin/pychart/log_coord.py (+48/-0)
bin/pychart/object_set.py (+43/-0)
bin/pychart/pdfcanvas.py (+297/-0)
bin/pychart/pie_plot.py (+148/-0)
bin/pychart/pie_plot_doc.py (+34/-0)
bin/pychart/pngcanvas.py (+55/-0)
bin/pychart/pscanvas.py (+257/-0)
bin/pychart/pychart_types.py (+70/-0)
bin/pychart/pychart_util.py (+142/-0)
bin/pychart/range_plot.py (+144/-0)
bin/pychart/range_plot_doc.py (+11/-0)
bin/pychart/rose_plot.py (+143/-0)
bin/pychart/scaling.py (+28/-0)
bin/pychart/svgcanvas.py (+428/-0)
bin/pychart/text_box.py (+152/-0)
bin/pychart/text_box_doc.py (+20/-0)
bin/pychart/theme.py (+234/-0)
bin/pychart/tick_mark.py (+188/-0)
bin/pychart/tick_mark_doc.py (+7/-0)
bin/pychart/typechecker.py (+27/-0)
bin/pychart/version.py (+16/-0)
bin/pychart/x11canvas.py (+25/-0)
bin/pychart/zap.py (+78/-0)
bin/release.py (+1/-2)
bin/report/common.py (+44/-1)
bin/report/custom.py (+1/-0)
bin/report/interface.py (+40/-8)
bin/report/preprocess.py (+79/-0)
bin/report/print_xml.py (+71/-113)
bin/report/printscreen/ps_form.py (+28/-35)
bin/report/printscreen/ps_list.py (+99/-62)
bin/report/render/__init__.py (+2/-3)
bin/report/render/html2html/__init__.py (+26/-0)
bin/report/render/html2html/html2html.py (+96/-0)
bin/report/render/odt2odt/__init__.py (+22/-0)
bin/report/render/odt2odt/odt2odt.py (+56/-0)
bin/report/render/rml.py (+37/-10)
bin/report/render/rml2html/rml2html.py (+124/-84)
bin/report/render/rml2html/utils.py (+10/-17)
bin/report/render/rml2pdf/__init__.py (+2/-21)
bin/report/render/rml2pdf/color.py (+3/-1)
bin/report/render/rml2pdf/trml2pdf.py (+329/-341)
bin/report/render/rml2pdf/utils.py (+116/-18)
bin/report/report_sxw.py (+289/-236)
bin/service/security.py (+16/-1)
bin/service/web_services.py (+116/-32)
bin/sql_db.py (+187/-39)
bin/tools/amount_to_text.py (+118/-137)
bin/tools/amount_to_text_en.py (+61/-78)
bin/tools/config.py (+11/-6)
bin/tools/convert.py (+42/-10)
bin/tools/graph.py (+1/-1)
bin/tools/maintenance.py (+3/-0)
bin/tools/misc.py (+75/-44)
bin/tools/translate.py (+169/-22)
bin/workflow/instance.py (+1/-0)
bin/workflow/wkf_service.py (+1/-1)
bin/workflow/workitem.py (+5/-1)
doc/Changelog (+1068/-0)
doc/tests/check_profile_l10n_all.py (+1/-1)
man/openerp-server.1 (+165/-69)
man/openerp_serverrc.5 (+3/-1)
setup.py (+44/-14)
To merge this branch: bzr merge lp://staging/~nch-openerp/openobject-server/stable_report
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+6466@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

Bugfixes: Bugfix for setTag.

lp://staging/~nch-openerp/openobject-server/stable_report updated
1783. By Naresh(OpenERP)

merge

1784. By Naresh(OpenERP)

merge

1785. By Naresh(OpenERP)

merge

1786. By Naresh(OpenERP)

merge

1787. By Naresh(OpenERP)

support for font tag and its attributes:

1788. By Naresh(OpenERP)

added functionality to handle comment Node

1789. By Naresh(OpenERP)

merge

1790. By Naresh(OpenERP)

merge

1791. By Naresh(OpenERP)

[FIX] Report Engine regression

1792. By Naresh(OpenERP)

merge

1793. By Naresh(OpenERP)

merge

1794. By Naresh(OpenERP)

[IMP]:Added new function called get_environment which will return the current environment of the System on which user is using OpenERP

1795. By Naresh(OpenERP)

[IMP]:called get_environment when a report crashes

1796. By Naresh(OpenERP)

[IMP]:closed file pointer

1797. By Naresh(OpenERP)

[REF]:coverted parsing of xml reports to etree

1798. By Naresh(OpenERP)

merge

1799. By Naresh(OpenERP)

[REF,merge]:modifis in getting environment function

1800. By Naresh(OpenERP)

merge

1801. By Naresh(OpenERP)

[MERGE]

1802. By Naresh(OpenERP)

[MERGE]

1803. By Naresh(OpenERP)

[FIX]:Fixed odt2odt reports printing

1804. By Naresh(OpenERP)

[FIX]:sxw and odt reports

1805. By Naresh(OpenERP)

[MERGE]

1806. By Naresh(OpenERP)

[MERGE]

1807. By Naresh(OpenERP)

[IMP]:Environment Information

1808. By Naresh(OpenERP)

[MERGE]

1809. By Naresh(OpenERP)

[IMP]:Environment:INFO

1810. By Naresh(OpenERP)

[IMP]

1811. By Naresh(OpenERP)

[MERGE]

1812. By Naresh(OpenERP)

[IMP]:ENvironment INFO

1813. By Naresh(OpenERP)

[IMP]:OS Locale for environment Info

1814. By Naresh(OpenERP)

[FIX]:missing Import

1815. By Naresh(OpenERP)

[MERGE]

1816. By Naresh(OpenERP)

[FIX]:Bug:403652

1817. By Naresh(OpenERP)

[MERGE]

1818. By sme

[IMP]:Environment info

1819. By Naresh(OpenERP)

[MERGE]

1820. By Naresh(OpenERP)

[MERGE]

1821. By Naresh(OpenERP)

[MERGE]

1822. By Naresh(OpenERP)

[Fix,IMP]:xsl:sml reports for comment node and when there is no type attribute in the node also improved the header for the xsl:xml reports

1823. By Naresh(OpenERP)

[MERGE]

1824. By Naresh(OpenERP)

[MERGE]

1825. By Naresh(OpenERP)

[MERGE]

1826. By Naresh(OpenERP)

[FIX]:<seq> problem Report Engine

1827. By Naresh(OpenERP)

[REF]:notified channel when there is an exception in eval()

1828. By Naresh(OpenERP)

[MERGE]

1829. By Naresh(OpenERP)

[MERGE]

1830. By Naresh(OpenERP)

[FIX,IMP]:xsl->raw,html

Unmerged revisions

1830. By Naresh(OpenERP)

[FIX,IMP]:xsl->raw,html

1829. By Naresh(OpenERP)

[MERGE]

1828. By Naresh(OpenERP)

[MERGE]

1827. By Naresh(OpenERP)

[REF]:notified channel when there is an exception in eval()

1826. By Naresh(OpenERP)

[FIX]:<seq> problem Report Engine

1825. By Naresh(OpenERP)

[MERGE]

1824. By Naresh(OpenERP)

[MERGE]

1823. By Naresh(OpenERP)

[MERGE]

1822. By Naresh(OpenERP)

[Fix,IMP]:xsl:sml reports for comment node and when there is no type attribute in the node also improved the header for the xsl:xml reports

1821. By Naresh(OpenERP)

[MERGE]

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'Makefile'
2--- Makefile 1970-01-01 00:00:00 +0000
3+++ Makefile 2009-12-04 08:51:10 +0000
4@@ -0,0 +1,43 @@
5+# -*- makefile -*-
6+
7+addons-path := bin/addons/
8+extra-addons:= ''
9+root-path := bin/
10+port := 8069
11+net_port := 8070
12+module := base
13+database := terp
14+language := fr_FR
15+i18n-import := bin/addons/base/i18n/fr_FR.po
16+interrogation_file := bin/addons/quality_integration_server/base_quality_interrogation.py
17+login := admin
18+password := admin
19+
20+start:
21+ python $(interrogation_file) start-server --root-path=$(root-path) --addons-path=$(addons-path) --port=$(port) --net_port=$(net_port)
22+
23+create-db:
24+ python $(interrogation_file) create-db --database=$(database) --root-path=$(root-path) --addons-path=$(addons-path) --port=$(port) --net_port=$(net_port) --login=$(login) --password=$(password)
25+
26+drop-db:
27+ python $(interrogation_file) drop-db --database=$(database) --root-path=$(root-path) --addons-path=$(addons-path) --port=$(port) --net_port=$(net_port)
28+
29+install-module:
30+ python $(interrogation_file) install-module --modules=$(module) --database=$(database) --root-path=$(root-path) --addons-path=$(addons-path) --extra-addons=$(extra-addons) --net_port=$(net_port) --port=$(port) --login=$(login) --password=$(password)
31+
32+upgrade-module:
33+ python $(interrogation_file) upgrade-module --modules=$(module) --database=$(database) --root-path=$(root-path) --addons-path=$(addons-path) --port=$(port) --net_port=$(net_port) --login=$(login) --password=$(password)
34+
35+
36+install-translation:
37+ python $(interrogation_file) install-translation --database=$(database) --translate-in=$(i18n-import) --net_port=$(net_port) --port=$(port) --login=$(login) --password=$(password) --root-path=$(root-path) --addons-path=$(addons-path)
38+
39+
40+version:
41+ python bin/openerp-server.py --version
42+
43+check-quality:
44+ python $(interrogation_file) check-quality --database=$(database) --modules=$(module) --net_port=$(net_port) --port=$(port) --login=$(login) --password=$(password) --addons-path=$(addons-path) --root-path=$(root-path)
45+
46+
47+
48
49=== renamed file 'Makefile' => 'Makefile.moved'
50=== modified file 'bin/PKG-INFO'
51--- bin/PKG-INFO 2009-02-06 20:21:44 +0000
52+++ bin/PKG-INFO 2009-12-04 08:51:10 +0000
53@@ -1,6 +1,6 @@
54 Metadata-Version: 1.1
55 Name: OpenERP
56-Version: 5.0.0
57+Version: 5.0.7
58 Author: Tiny.be
59 Author-email: fp at tiny be
60 Maintainer: Tiny.be
61
62=== modified file 'bin/addons/__init__.py'
63--- bin/addons/__init__.py 2009-06-26 11:00:04 +0000
64+++ bin/addons/__init__.py 2009-12-04 08:51:12 +0000
65@@ -68,7 +68,7 @@
66 father.addChild(name)
67 else:
68 Node(name, self)
69-
70+
71 def update_from_db(self, cr):
72 # update the graph with values from the database (if exist)
73 ## First, we set the default values for each package in graph
74@@ -82,7 +82,7 @@
75
76 ## and we update the default values with values from the database
77 additional_data.update(dict([(x.pop('name'), x) for x in cr.dictfetchall()]))
78-
79+
80 for package in self.values():
81 for k, v in additional_data[package.name].items():
82 setattr(package, k, v)
83@@ -141,7 +141,7 @@
84
85 def __iter__(self):
86 return itertools.chain(iter(self.children), *map(iter, self.children))
87-
88+
89 def __str__(self):
90 return self._pprint()
91
92@@ -323,6 +323,7 @@
93 if info.get('installable', True):
94 packages.append((module, info.get('depends', []), info))
95
96+
97 dependencies = dict([(p, deps) for p, deps, data in packages])
98 current, later = set([p for p, dep, data in packages]), set()
99 while packages and current > later:
100@@ -351,7 +352,7 @@
101 for package in later:
102 unmet_deps = filter(lambda p: p not in graph, dependencies[package])
103 logger.notifyChannel('init', netsvc.LOG_ERROR, 'module %s: Unmet dependencies: %s' % (package, ', '.join(unmet_deps)))
104-
105+
106 result = len(graph) - len_graph
107 if result != len(module_list):
108 logger.notifyChannel('init', netsvc.LOG_WARNING, 'Not all modules have loaded.')
109@@ -512,7 +513,7 @@
110
111 parsed_installed_version = parse_version(pkg.installed_version or '')
112 current_version = parse_version(convert_version(pkg.data.get('version', '0')))
113-
114+
115 versions = _get_migration_versions(pkg)
116
117 for version in versions:
118@@ -572,16 +573,19 @@
119 modobj = None
120
121 for package in graph:
122+ logger.notifyChannel('init', netsvc.LOG_INFO, 'module %s: loading objects' % package.name)
123+ migrations.migrate_module(package, 'pre')
124+ register_class(package.name)
125+ modules = pool.instanciate(package.name, cr)
126+ if hasattr(package, 'init') or hasattr(package, 'update') or package.state in ('to install', 'to upgrade'):
127+ init_module_objects(cr, package.name, modules)
128+ cr.commit()
129+
130+ for package in graph:
131 status['progress'] = (float(statusi)+0.1) / len(graph)
132 m = package.name
133 mid = package.id
134
135- migrations.migrate_module(package, 'pre')
136-
137- register_class(m)
138- logger.notifyChannel('init', netsvc.LOG_INFO, 'module %s: loading objects' % m)
139- modules = pool.instanciate(m, cr)
140-
141 if modobj is None:
142 modobj = pool.get('ir.module.module')
143
144@@ -590,15 +594,24 @@
145
146 idref = {}
147 status['progress'] = (float(statusi)+0.4) / len(graph)
148-
149+
150 mode = 'update'
151 if hasattr(package, 'init') or package.state == 'to install':
152 mode = 'init'
153-
154+
155 if hasattr(package, 'init') or hasattr(package, 'update') or package.state in ('to install', 'to upgrade'):
156 has_updates = True
157- init_module_objects(cr, m, modules)
158 for kind in ('init', 'update'):
159+ if package.state=='to upgrade':
160+ # upgrading the module information
161+ modobj.write(cr, 1, [mid], {
162+ 'description': package.data.get('description', ''),
163+ 'shortdesc': package.data.get('name', ''),
164+ 'author': package.data.get('author', 'Unknown'),
165+ 'website': package.data.get('website', ''),
166+ 'license': package.data.get('license', 'GPL-2'),
167+ 'certificate': package.data.get('certificate') or None,
168+ })
169 for filename in package.data.get('%s_xml' % kind, []):
170 logger.notifyChannel('init', netsvc.LOG_INFO, 'module %s: loading %s' % (m, filename))
171 name, ext = os.path.splitext(filename)
172@@ -629,7 +642,7 @@
173 package_todo.append(package.name)
174
175 migrations.migrate_module(package, 'post')
176-
177+
178 if modobj:
179 ver = release.major_version + '.' + package.data.get('version', '1.0')
180 # Set new modules and dependencies
181@@ -638,21 +651,21 @@
182 # Update translations for all installed languages
183 modobj.update_translations(cr, 1, [mid], None)
184 cr.commit()
185-
186+
187 package.state = 'installed'
188 for kind in ('init', 'demo', 'update'):
189 if hasattr(package, kind):
190 delattr(package, kind)
191
192 statusi += 1
193-
194+
195 cr.execute('select model from ir_model where state=%s', ('manual',))
196 for model in cr.dictfetchall():
197 pool.get('ir.model').instanciate(cr, 1, model['model'], {})
198
199 pool.get('ir.model.data')._process_end(cr, 1, package_todo)
200 cr.commit()
201-
202+
203 return has_updates
204
205 def load_modules(db, force_demo=False, status=None, update_module=False):
206@@ -677,13 +690,21 @@
207 pool = pooler.get_pool(cr.dbname)
208 try:
209 report = tools.assertion_report()
210- STATES_TO_LOAD = ['installed', 'to upgrade']
211+ # NOTE: Try to also load the modules that have been marked as uninstallable previously...
212+ STATES_TO_LOAD = ['installed', 'to upgrade', 'uninstallable']
213 graph = create_graph(cr, ['base'], force)
214+<<<<<<< TREE
215 has_updates = load_module_graph(cr, graph, status, perform_checks=False, report=report)
216+=======
217+
218+ has_updates = load_module_graph(cr, graph, status, perform_checks=(not update_module), report=report)
219+
220+>>>>>>> MERGE-SOURCE
221 if update_module:
222 modobj = pool.get('ir.module.module')
223 logger.notifyChannel('init', netsvc.LOG_INFO, 'updating modules list')
224- modobj.update_list(cr, 1)
225+ if ('base' in tools.config['init']) or ('base' in tools.config['update']):
226+ modobj.update_list(cr, 1)
227
228 mods = [k for k in tools.config['init'] if tools.config['init'][k]]
229 if mods:
230@@ -698,9 +719,9 @@
231 modobj.button_upgrade(cr, 1, ids)
232
233 cr.execute("update ir_module_module set state=%s where name=%s", ('installed', 'base'))
234-
235+
236 STATES_TO_LOAD += ['to install']
237-
238+
239 loop_guardrail = 0
240 while True:
241 loop_guardrail += 1
242@@ -716,7 +737,7 @@
243 if new_modules_in_graph == 0:
244 # nothing to load
245 break
246-
247+
248 logger.notifyChannel('init', netsvc.LOG_DEBUG, 'Updating graph with %d more modules' % (len(module_list)))
249 r = load_module_graph(cr, graph, status, report=report)
250 has_updates = has_updates or r
251
252=== modified file 'bin/addons/base/base.sql'
253--- bin/addons/base/base.sql 2009-02-19 11:24:00 +0000
254+++ bin/addons/base/base.sql 2009-12-04 08:51:12 +0000
255@@ -144,6 +144,7 @@
256 context_tz varchar(64) default null,
257 signature text,
258 -- action_id int references ir_act_window on delete set null,
259+ context_lang varchar(64) default '',
260 action_id int,
261 primary key(id)
262 );
263@@ -166,12 +167,18 @@
264 uid integer NOT NULL references res_users on delete cascade,
265 rid integer NOT NULL references res_roles on delete cascade
266 );
267+create index res_roles_users_rel_uid_idx on res_roles_users_rel (uid);
268+create index res_roles_users_rel_rid_idx on res_roles_users_rel (rid);
269
270 CREATE TABLE res_groups_users_rel (
271 uid integer NOT NULL references res_users on delete cascade,
272 gid integer NOT NULL references res_groups on delete cascade
273 );
274
275+create index res_groups_users_rel_uid_idx on res_groups_users_rel (uid);
276+create index res_groups_users_rel_gid_idx on res_groups_users_rel (gid);
277+
278+
279 ---------------------------------
280 -- Workflows
281 ---------------------------------
282@@ -244,6 +251,8 @@
283 inst_id int not null references wkf_instance on delete cascade
284 );
285
286+create index wkf_witm_trans_inst_idx on wkf_witm_trans (inst_id);
287+
288 create table wkf_logs
289 (
290 id serial,
291@@ -286,6 +295,7 @@
292 latest_version character varying(64),
293 shortdesc character varying(256),
294 category_id integer REFERENCES ir_module_category ON DELETE SET NULL,
295+ certificate character varying(64),
296 description text,
297 demo boolean default False,
298 primary key(id)
299@@ -318,7 +328,7 @@
300 write_date timestamp without time zone,
301 write_uid integer,
302 noupdate boolean,
303- name character varying(64) NOT NULL,
304+ name character varying(128) NOT NULL,
305 date_init timestamp without time zone,
306 date_update timestamp without time zone,
307 module character varying(64) NOT NULL,
308
309=== modified file 'bin/addons/base/base_data.xml'
310--- bin/addons/base/base_data.xml 2009-05-26 06:04:57 +0000
311+++ bin/addons/base/base_data.xml 2009-12-04 08:51:12 +0000
312@@ -998,1649 +998,6 @@
313 <field name="name">Zimbabwe</field>
314 <field name="code">zw</field>
315 </record>
316-
317- <!-- USA States -->
318- <record id="us-al" model="res.country.state">
319- <field name="name">Alabama</field>
320- <field name="code">al</field>
321- <field model="res.country" name="country_id" ref="us"/>
322- </record>
323- <record id="us-ak" model="res.country.state">
324- <field name="name">Alaska</field>
325- <field name="code">ak</field>
326- <field model="res.country" name="country_id" ref="us"/>
327- </record>
328- <record id="us-az" model="res.country.state">
329- <field name="name">Arizona</field>
330- <field name="code">az</field>
331- <field model="res.country" name="country_id" ref="us"/>
332- </record>
333- <record id="us-ar" model="res.country.state">
334- <field name="name">Arkansas</field>
335- <field name="code">ar</field>
336- <field model="res.country" name="country_id" ref="us"/>
337- </record>
338- <record id="us-ca" model="res.country.state">
339- <field name="name">California</field>
340- <field name="code">ca</field>
341- <field model="res.country" name="country_id" ref="us"/>
342- </record>
343- <record id="us-co" model="res.country.state">
344- <field name="name">Colorado</field>
345- <field name="code">co</field>
346- <field model="res.country" name="country_id" ref="us"/>
347- </record>
348- <record id="us-ct" model="res.country.state">
349- <field name="name">Connecticut</field>
350- <field name="code">ct</field>
351- <field model="res.country" name="country_id" ref="us"/>
352- </record>
353- <record id="us-dc" model="res.country.state">
354- <field name="name">District of Columbia</field>
355- <field name="code">dc</field>
356- <field model="res.country" name="country_id" ref="us"/>
357- </record>
358- <record id="us-de" model="res.country.state">
359- <field name="name">Delaware</field>
360- <field name="code">de</field>
361- <field model="res.country" name="country_id" ref="us"/>
362- </record>
363- <record id="us-fl" model="res.country.state">
364- <field name="name">Florida</field>
365- <field name="code">fl</field>
366- <field model="res.country" name="country_id" ref="us"/>
367- </record>
368- <record id="us-ga" model="res.country.state">
369- <field name="name">Georgia</field>
370- <field name="code">ga</field>
371- <field model="res.country" name="country_id" ref="us"/>
372- </record>
373- <record id="us-hi" model="res.country.state">
374- <field name="name">Hawaii</field>
375- <field name="code">hi</field>
376- <field model="res.country" name="country_id" ref="us"/>
377- </record>
378- <record id="us-id" model="res.country.state">
379- <field name="name">Idaho</field>
380- <field name="code">id</field>
381- <field model="res.country" name="country_id" ref="us"/>
382- </record>
383- <record id="us-il" model="res.country.state">
384- <field name="name">Illinois</field>
385- <field name="code">il</field>
386- <field model="res.country" name="country_id" ref="us"/>
387- </record>
388- <record id="us-in" model="res.country.state">
389- <field name="name">Indiana</field>
390- <field name="code">in</field>
391- <field model="res.country" name="country_id" ref="us"/>
392- </record>
393- <record id="us-ia" model="res.country.state">
394- <field name="name">Iowa</field>
395- <field name="code">ia</field>
396- <field model="res.country" name="country_id" ref="us"/>
397- </record>
398- <record id="us-ks" model="res.country.state">
399- <field name="name">Kansas</field>
400- <field name="code">ks</field>
401- <field model="res.country" name="country_id" ref="us"/>
402- </record>
403- <record id="us-ky" model="res.country.state">
404- <field name="name">Kentucky</field>
405- <field name="code">ky</field>
406- <field model="res.country" name="country_id" ref="us"/>
407- </record>
408- <record id="us-la" model="res.country.state">
409- <field name="name">Louisiana</field>
410- <field name="code">la</field>
411- <field model="res.country" name="country_id" ref="us"/>
412- </record>
413- <record id="us-me" model="res.country.state">
414- <field name="name">Maine</field>
415- <field name="code">me</field>
416- <field model="res.country" name="country_id" ref="us"/>
417- </record>
418- <record id="us-md" model="res.country.state">
419- <field name="name">Maryland</field>
420- <field name="code">md</field>
421- <field model="res.country" name="country_id" ref="us"/>
422- </record>
423- <record id="us-ma" model="res.country.state">
424- <field name="name">Massachusetts</field>
425- <field name="code">ma</field>
426- <field model="res.country" name="country_id" ref="us"/>
427- </record>
428- <record id="us-mi" model="res.country.state">
429- <field name="name">Michigan</field>
430- <field name="code">mi</field>
431- <field model="res.country" name="country_id" ref="us"/>
432- </record>
433- <record id="us-mn" model="res.country.state">
434- <field name="name">Minnesota</field>
435- <field name="code">mn</field>
436- <field model="res.country" name="country_id" ref="us"/>
437- </record>
438- <record id="us-ms" model="res.country.state">
439- <field name="name">Mississippi</field>
440- <field name="code">ms</field>
441- <field model="res.country" name="country_id" ref="us"/>
442- </record>
443- <record id="us-mo" model="res.country.state">
444- <field name="name">Missouri</field>
445- <field name="code">mo</field>
446- <field model="res.country" name="country_id" ref="us"/>
447- </record>
448- <record id="us-mt" model="res.country.state">
449- <field name="name">Montana</field>
450- <field name="code">mt</field>
451- <field model="res.country" name="country_id" ref="us"/>
452- </record>
453- <record id="us-ne" model="res.country.state">
454- <field name="name">Nebraska</field>
455- <field name="code">ne</field>
456- <field model="res.country" name="country_id" ref="us"/>
457- </record>
458- <record id="us-nv" model="res.country.state">
459- <field name="name">Nevada</field>
460- <field name="code">nv</field>
461- <field model="res.country" name="country_id" ref="us"/>
462- </record>
463- <record id="us-nh" model="res.country.state">
464- <field name="name">New Hampshire</field>
465- <field name="code">nh</field>
466- <field model="res.country" name="country_id" ref="us"/>
467- </record>
468- <record id="us-nj" model="res.country.state">
469- <field name="name">New Jersey</field>
470- <field name="code">nj</field>
471- <field model="res.country" name="country_id" ref="us"/>
472- </record>
473- <record id="us-nm" model="res.country.state">
474- <field name="name">New Mexico</field>
475- <field name="code">nm</field>
476- <field model="res.country" name="country_id" ref="us"/>
477- </record>
478- <record id="us-ny" model="res.country.state">
479- <field name="name">New York</field>
480- <field name="code">ny</field>
481- <field model="res.country" name="country_id" ref="us"/>
482- </record>
483- <record id="us-nc" model="res.country.state">
484- <field name="name">North Carolina</field>
485- <field name="code">nc</field>
486- <field model="res.country" name="country_id" ref="us"/>
487- </record>
488- <record id="us-nd" model="res.country.state">
489- <field name="name">North Dakota</field>
490- <field name="code">nd</field>
491- <field model="res.country" name="country_id" ref="us"/>
492- </record>
493- <record id="us-oh" model="res.country.state">
494- <field name="name">Ohio</field>
495- <field name="code">oh</field>
496- <field model="res.country" name="country_id" ref="us"/>
497- </record>
498- <record id="us-ok" model="res.country.state">
499- <field name="name">Oklahoma</field>
500- <field name="code">ok</field>
501- <field model="res.country" name="country_id" ref="us"/>
502- </record>
503- <record id="us-or" model="res.country.state">
504- <field name="name">Oregon</field>
505- <field name="code">or</field>
506- <field model="res.country" name="country_id" ref="us"/>
507- </record>
508- <record id="us-pa" model="res.country.state">
509- <field name="name">Pennsylvania</field>
510- <field name="code">pa</field>
511- <field model="res.country" name="country_id" ref="us"/>
512- </record>
513- <record id="us-ri" model="res.country.state">
514- <field name="name">Rhode Island</field>
515- <field name="code">ri</field>
516- <field model="res.country" name="country_id" ref="us"/>
517- </record>
518- <record id="us-sc" model="res.country.state">
519- <field name="name">South Carolina</field>
520- <field name="code">sc</field>
521- <field model="res.country" name="country_id" ref="us"/>
522- </record>
523- <record id="us-sd" model="res.country.state">
524- <field name="name">South Dakota</field>
525- <field name="code">sd</field>
526- <field model="res.country" name="country_id" ref="us"/>
527- </record>
528- <record id="us-tn" model="res.country.state">
529- <field name="name">Tennessee</field>
530- <field name="code">tn</field>
531- <field model="res.country" name="country_id" ref="us"/>
532- </record>
533- <record id="us-tx" model="res.country.state">
534- <field name="name">Texas</field>
535- <field name="code">tx</field>
536- <field model="res.country" name="country_id" ref="us"/>
537- </record>
538- <record id="us-ut" model="res.country.state">
539- <field name="name">Utah</field>
540- <field name="code">ut</field>
541- <field model="res.country" name="country_id" ref="us"/>
542- </record>
543- <record id="us-vt" model="res.country.state">
544- <field name="name">Vermont</field>
545- <field name="code">vt</field>
546- <field model="res.country" name="country_id" ref="us"/>
547- </record>
548- <record id="us-va" model="res.country.state">
549- <field name="name">Virginia</field>
550- <field name="code">va</field>
551- <field model="res.country" name="country_id" ref="us"/>
552- </record>
553- <record id="us-wa" model="res.country.state">
554- <field name="name">Washington</field>
555- <field name="code">wa</field>
556- <field model="res.country" name="country_id" ref="us"/>
557- </record>
558- <record id="us-wv" model="res.country.state">
559- <field name="name">West Virginia</field>
560- <field name="code">wv</field>
561- <field model="res.country" name="country_id" ref="us"/>
562- </record>
563- <record id="us-wi" model="res.country.state">
564- <field name="name">Wisconsin</field>
565- <field name="code">wi</field>
566- <field model="res.country" name="country_id" ref="us"/>
567- </record>
568- <record id="us-wy" model="res.country.state">
569- <field name="name">Wyoming</field>
570- <field name="code">wy</field>
571- <field model="res.country" name="country_id" ref="us"/>
572- </record>
573-<!-- states -->
574-
575- <record model="res.country.state" id="sd-26">
576- <field name="name">Al Baḩr al Aḩmar</field>
577- <field name="code">aba</field>
578- <field model="res.country" name="country_id" ref="sd"/>
579- </record>
580-
581- <record model="res.country.state" id="sd-18">
582- <field name="name">Al Buhayrat</field>
583- <field name="code">bu</field>
584- <field model="res.country" name="country_id" ref="sd"/>
585- </record>
586-
587- <record model="res.country.state" id="sd-07">
588- <field name="name">Al Jazirah</field>
589- <field name="code">aj</field>
590- <field model="res.country" name="country_id" ref="sd"/>
591- </record>
592-
593- <record model="res.country.state" id="sd-03">
594- <field name="name">Al Khartum</field>
595- <field name="code">ak</field>
596- <field model="res.country" name="country_id" ref="sd"/>
597- </record>
598-
599- <record model="res.country.state" id="sd-06">
600- <field name="name">Al Qadarif</field>
601- <field name="code">aq</field>
602- <field model="res.country" name="country_id" ref="sd"/>
603- </record>
604-
605- <record model="res.country.state" id="sd-22">
606- <field name="name">Al Wahdah</field>
607- <field name="code">aw</field>
608- <field model="res.country" name="country_id" ref="sd"/>
609- </record>
610-
611- <record model="res.country.state" id="sd-04">
612- <field name="name">An Nil</field>
613- <field name="code">an</field>
614- <field model="res.country" name="country_id" ref="sd"/>
615- </record>
616-
617- <record model="res.country.state" id="sd-08">
618- <field name="name">An Nil al Abyad</field>
619- <field name="code">ana</field>
620- <field model="res.country" name="country_id" ref="sd"/>
621- </record>
622-
623- <record model="res.country.state" id="sd-24">
624- <field name="name">An Nil al Azraq</field>
625- <field name="code">ana</field>
626- <field model="res.country" name="country_id" ref="sd"/>
627- </record>
628-
629- <record model="res.country.state" id="sd-01">
630- <field name="name">Ash Shamaliyah</field>
631- <field name="code">as</field>
632- <field model="res.country" name="country_id" ref="sd"/>
633- </record>
634-
635- <record model="res.country.state" id="sd-23">
636- <field name="name">A ali an Nil</field>
637- <field name="code">aan</field>
638- <field model="res.country" name="country_id" ref="sd"/>
639- </record>
640-
641- <record model="res.country.state" id="sd-17">
642- <field name="name">Baḩr al Jabal</field>
643- <field name="code">baj</field>
644- <field model="res.country" name="country_id" ref="sd"/>
645- </record>
646-
647- <record model="res.country.state" id="sd-16">
648- <field name="name">Gharb al Istiwaiyah</field>
649- <field name="code">gai</field>
650- <field model="res.country" name="country_id" ref="sd"/>
651- </record>
652-
653- <record model="res.country.state" id="sd-14">
654- <field name="name">Gharb Bahr al Ghazal</field>
655- <field name="code">gbg</field>
656- <field model="res.country" name="country_id" ref="sd"/>
657- </record>
658-
659- <record model="res.country.state" id="sd-12">
660- <field name="name">Gharb Darfur</field>
661- <field name="code">gd</field>
662- <field model="res.country" name="country_id" ref="sd"/>
663- </record>
664-
665- <record model="res.country.state" id="sd-11">
666- <field name="name">Janub Darfur</field>
667- <field name="code">jd</field>
668- <field model="res.country" name="country_id" ref="sd"/>
669- </record>
670-
671- <record model="res.country.state" id="sd-13">
672- <field name="name">Janub Kurdufan</field>
673- <field name="code">jk</field>
674- <field model="res.country" name="country_id" ref="sd"/>
675- </record>
676-
677- <record model="res.country.state" id="sd-20">
678- <field name="name">Junqali</field>
679- <field name="code">ju</field>
680- <field model="res.country" name="country_id" ref="sd"/>
681- </record>
682-
683- <record model="res.country.state" id="sd-05">
684- <field name="name">Kassala</field>
685- <field name="code">kas</field>
686- <field model="res.country" name="country_id" ref="sd"/>
687- </record>
688-
689- <record model="res.country.state" id="sd-15">
690- <field name="name">Shamal Bahr al Ghazal</field>
691- <field name="code">sbg</field>
692- <field model="res.country" name="country_id" ref="sd"/>
693- </record>
694-
695- <record model="res.country.state" id="sd-02">
696- <field name="name">Shamal Darfur</field>
697- <field name="code">sd</field>
698- <field model="res.country" name="country_id" ref="sd"/>
699- </record>
700-
701- <record model="res.country.state" id="sd-09">
702- <field name="name">Shamal Kurdufan</field>
703- <field name="code">sk</field>
704- <field model="res.country" name="country_id" ref="sd"/>
705- </record>
706-
707- <record model="res.country.state" id="sd-19">
708- <field name="name">Sharq al Istiwaiyah</field>
709- <field name="code">si</field>
710- <field model="res.country" name="country_id" ref="sd"/>
711- </record>
712-
713- <record model="res.country.state" id="sd-25">
714- <field name="name">Sinnar</field>
715- <field name="code">sn</field>
716- <field model="res.country" name="country_id" ref="sd"/>
717- </record>
718-
719- <record model="res.country.state" id="sd-21">
720- <field name="name">Warab</field>
721- <field name="code">war</field>
722- <field model="res.country" name="country_id" ref="sd"/>
723- </record>
724-
725- <record model="res.country.state" id="pw-002">
726- <field name="name">Aimeliik</field>
727- <field name="code">aim</field>
728- <field model="res.country" name="country_id" ref="pw"/>
729- </record>
730-
731- <record model="res.country.state" id="pw-004">
732- <field name="name">Airai</field>
733- <field name="code">air</field>
734- <field model="res.country" name="country_id" ref="pw"/>
735- </record>
736-
737- <record model="res.country.state" id="pw-010">
738- <field name="name">Angaur</field>
739- <field name="code">ang</field>
740- <field model="res.country" name="country_id" ref="pw"/>
741- </record>
742-
743- <record model="res.country.state" id="pw-050">
744- <field name="name">Hatobohei</field>
745- <field name="code">hat</field>
746- <field model="res.country" name="country_id" ref="pw"/>
747- </record>
748-
749- <record model="res.country.state" id="pw-100">
750- <field name="name">Kayangel</field>
751- <field name="code">kay</field>
752- <field model="res.country" name="country_id" ref="pw"/>
753- </record>
754-
755- <record model="res.country.state" id="pw-150">
756- <field name="name">Koror</field>
757- <field name="code">kor</field>
758- <field model="res.country" name="country_id" ref="pw"/>
759- </record>
760-
761- <record model="res.country.state" id="pw-212">
762- <field name="name">Melekeok</field>
763- <field name="code">mel</field>
764- <field model="res.country" name="country_id" ref="pw"/>
765- </record>
766-
767- <record model="res.country.state" id="pw-214">
768- <field name="name">Ngaraard</field>
769- <field name="code">ng</field>
770- <field model="res.country" name="country_id" ref="pw"/>
771- </record>
772-
773- <record model="res.country.state" id="pw-218">
774- <field name="name">Ngarchelong</field>
775- <field name="code">ngr</field>
776- <field model="res.country" name="country_id" ref="pw"/>
777- </record>
778-
779- <record model="res.country.state" id="pw-222">
780- <field name="name">Ngardmau</field>
781- <field name="code">ngr</field>
782- <field model="res.country" name="country_id" ref="pw"/>
783- </record>
784-
785- <record model="res.country.state" id="pw-224">
786- <field name="name">Ngatpang</field>
787- <field name="code">ngt</field>
788- <field model="res.country" name="country_id" ref="pw"/>
789- </record>
790-
791- <record model="res.country.state" id="pw-226">
792- <field name="name">Ngchesar</field>
793- <field name="code">ngc</field>
794- <field model="res.country" name="country_id" ref="pw"/>
795- </record>
796-
797- <record model="res.country.state" id="pw-227">
798- <field name="name">Ngeremlengui</field>
799- <field name="code">ngr</field>
800- <field model="res.country" name="country_id" ref="pw"/>
801- </record>
802-
803- <record model="res.country.state" id="pw-228">
804- <field name="name">Ngiwal</field>
805- <field name="code">ngi</field>
806- <field model="res.country" name="country_id" ref="pw"/>
807- </record>
808-
809- <record model="res.country.state" id="pw-350">
810- <field name="name">Peleliu</field>
811- <field name="code">pel</field>
812- <field model="res.country" name="country_id" ref="pw"/>
813- </record>
814-
815- <record model="res.country.state" id="pw-370">
816- <field name="name">Sonsorol</field>
817- <field name="code">son</field>
818- <field model="res.country" name="country_id" ref="pw"/>
819- </record>
820-
821- <record model="res.country.state" id="ng-ab">
822- <field name="name">Abia</field>
823- <field name="code">ab</field>
824- <field model="res.country" name="country_id" ref="ng"/>
825- </record>
826-
827- <record model="res.country.state" id="ng-ad">
828- <field name="name">Adamawa</field>
829- <field name="code">ad</field>
830- <field model="res.country" name="country_id" ref="ng"/>
831- </record>
832-
833- <record model="res.country.state" id="ng-ak">
834- <field name="name">Akwa Ibom</field>
835- <field name="code">AK</field>
836- <field model="res.country" name="country_id" ref="ng"/>
837- </record>
838-
839- <record model="res.country.state" id="ng-an">
840- <field name="name">Anambra</field>
841- <field name="code">AN</field>
842- <field model="res.country" name="country_id" ref="ng"/>
843- </record>
844-
845- <record model="res.country.state" id="ng-ba">
846- <field name="name">Bauchi</field>
847- <field name="code">BA</field>
848- <field model="res.country" name="country_id" ref="ng"/>
849- </record>
850-
851- <record model="res.country.state" id="ng-by">
852- <field name="name">Bayelsa</field>
853- <field name="code">BY</field>
854- <field model="res.country" name="country_id" ref="ng"/>
855- </record>
856-
857- <record model="res.country.state" id="ng-be">
858- <field name="name">Benue</field>
859- <field name="code">BE</field>
860- <field model="res.country" name="country_id" ref="ng"/>
861- </record>
862-
863- <record model="res.country.state" id="ng-bo">
864- <field name="name">Borno</field>
865- <field name="code">BO</field>
866- <field model="res.country" name="country_id" ref="ng"/>
867- </record>
868-
869- <record model="res.country.state" id="ng-cr">
870- <field name="name">Cross River</field>
871- <field name="code">CR</field>
872- <field model="res.country" name="country_id" ref="ng"/>
873- </record>
874-
875- <record model="res.country.state" id="ng-de">
876- <field name="name">Delta</field>
877- <field name="code">DE</field>
878- <field model="res.country" name="country_id" ref="ng"/>
879- </record>
880-
881- <record model="res.country.state" id="ng-eb">
882- <field name="name">Ebonyi</field>
883- <field name="code">EB</field>
884- <field model="res.country" name="country_id" ref="ng"/>
885- </record>
886-
887- <record model="res.country.state" id="ng-ed">
888- <field name="name">Edo</field>
889- <field name="code">ED</field>
890- <field model="res.country" name="country_id" ref="ng"/>
891- </record>
892-
893- <record model="res.country.state" id="ng-ek">
894- <field name="name">Ekiti</field>
895- <field name="code">EK</field>
896- <field model="res.country" name="country_id" ref="ng"/>
897- </record>
898-
899- <record model="res.country.state" id="ng-en">
900- <field name="name">Enugu</field>
901- <field name="code">EN</field>
902- <field model="res.country" name="country_id" ref="ng"/>
903- </record>
904-
905- <record model="res.country.state" id="ng-go">
906- <field name="name">Gombe</field>
907- <field name="code">GO</field>
908- <field model="res.country" name="country_id" ref="ng"/>
909- </record>
910-
911- <record model="res.country.state" id="ng-im">
912- <field name="name">Imo</field>
913- <field name="code">IM</field>
914- <field model="res.country" name="country_id" ref="ng"/>
915- </record>
916-
917- <record model="res.country.state" id="ng-ji">
918- <field name="name">Jigawa</field>
919- <field name="code">JI</field>
920- <field model="res.country" name="country_id" ref="ng"/>
921- </record>
922-
923- <record model="res.country.state" id="ng-kd">
924- <field name="name">Kaduna</field>
925- <field name="code">KD</field>
926- <field model="res.country" name="country_id" ref="ng"/>
927- </record>
928-
929- <record model="res.country.state" id="ng-kn">
930- <field name="name">Kano</field>
931- <field name="code">KN</field>
932- <field model="res.country" name="country_id" ref="ng"/>
933- </record>
934-
935- <record model="res.country.state" id="ng-kt">
936- <field name="name">Katsina</field>
937- <field name="code">KT</field>
938- <field model="res.country" name="country_id" ref="ng"/>
939- </record>
940-
941- <record model="res.country.state" id="ng-ke">
942- <field name="name">Kebbi</field>
943- <field name="code">KE</field>
944- <field model="res.country" name="country_id" ref="ng"/>
945- </record>
946-
947- <record model="res.country.state" id="ng-ko">
948- <field name="name">Kogi</field>
949- <field name="code">KO</field>
950- <field model="res.country" name="country_id" ref="ng"/>
951- </record>
952-
953- <record model="res.country.state" id="ng-kw">
954- <field name="name">Kwara</field>
955- <field name="code">KW</field>
956- <field model="res.country" name="country_id" ref="ng"/>
957- </record>
958-
959- <record model="res.country.state" id="ng-la">
960- <field name="name">Lagos</field>
961- <field name="code">LA</field>
962- <field model="res.country" name="country_id" ref="ng"/>
963- </record>
964-
965- <record model="res.country.state" id="ng-na">
966- <field name="name">Nassarawa</field>
967- <field name="code">NA</field>
968- <field model="res.country" name="country_id" ref="ng"/>
969- </record>
970-
971- <record model="res.country.state" id="ng-ni">
972- <field name="name">Niger</field>
973- <field name="code">NI</field>
974- <field model="res.country" name="country_id" ref="ng"/>
975- </record>
976-
977- <record model="res.country.state" id="ng-og">
978- <field name="name">Ogun</field>
979- <field name="code">OG</field>
980- <field model="res.country" name="country_id" ref="ng"/>
981- </record>
982-
983- <record model="res.country.state" id="ng-on">
984- <field name="name">Ondo</field>
985- <field name="code">ON</field>
986- <field model="res.country" name="country_id" ref="ng"/>
987- </record>
988-
989- <record model="res.country.state" id="ng-os">
990- <field name="name">Osun</field>
991- <field name="code">OS</field>
992- <field model="res.country" name="country_id" ref="ng"/>
993- </record>
994-
995- <record model="res.country.state" id="ng-oy">
996- <field name="name">Oyo</field>
997- <field name="code">OY</field>
998- <field model="res.country" name="country_id" ref="ng"/>
999- </record>
1000-
1001- <record model="res.country.state" id="ng-pl">
1002- <field name="name">Plateau</field>
1003- <field name="code">PL</field>
1004- <field model="res.country" name="country_id" ref="ng"/>
1005- </record>
1006-
1007- <record model="res.country.state" id="ng-ri">
1008- <field name="name">Rivers</field>
1009- <field name="code">RI</field>
1010- <field model="res.country" name="country_id" ref="ng"/>
1011- </record>
1012-
1013- <record model="res.country.state" id="ng-so">
1014- <field name="name">Sokoto</field>
1015- <field name="code">SO</field>
1016- <field model="res.country" name="country_id" ref="ng"/>
1017- </record>
1018-
1019- <record model="res.country.state" id="ng-ta">
1020- <field name="name">Taraba</field>
1021- <field name="code">TA</field>
1022- <field model="res.country" name="country_id" ref="ng"/>
1023- </record>
1024-
1025- <record model="res.country.state" id="ng-yo">
1026- <field name="name">Yobe</field>
1027- <field name="code">YO</field>
1028- <field model="res.country" name="country_id" ref="ng"/>
1029- </record>
1030-
1031- <record model="res.country.state" id="ng-za">
1032- <field name="name">Zamfara</field>
1033- <field name="code">ZA</field>
1034- <field model="res.country" name="country_id" ref="ng"/>
1035- </record>
1036-
1037- <record model="res.country.state" id="my-01">
1038- <field name="name">Johor</field>
1039- <field name="code">jo</field>
1040- <field model="res.country" name="country_id" ref="my"/>
1041- </record>
1042-
1043- <record model="res.country.state" id="my-02">
1044- <field name="name">Kedah</field>
1045- <field name="code">ke</field>
1046- <field model="res.country" name="country_id" ref="my"/>
1047- </record>
1048-
1049- <record model="res.country.state" id="my-03">
1050- <field name="name">Kelantan</field>
1051- <field name="code">kel</field>
1052- <field model="res.country" name="country_id" ref="my"/>
1053- </record>
1054-
1055- <record model="res.country.state" id="my-04">
1056- <field name="name">Melaka</field>
1057- <field name="code">mel</field>
1058- <field model="res.country" name="country_id" ref="my"/>
1059- </record>
1060-
1061- <record model="res.country.state" id="my-05">
1062- <field name="name">Negeri Sembilan</field>
1063- <field name="code">ns</field>
1064- <field model="res.country" name="country_id" ref="my"/>
1065- </record>
1066-
1067- <record model="res.country.state" id="my-06">
1068- <field name="name">Pahang</field>
1069- <field name="code">pah</field>
1070- <field model="res.country" name="country_id" ref="my"/>
1071- </record>
1072-
1073- <record model="res.country.state" id="my-08">
1074- <field name="name">Perak</field>
1075- <field name="code">per</field>
1076- <field model="res.country" name="country_id" ref="my"/>
1077- </record>
1078-
1079- <record model="res.country.state" id="my-09">
1080- <field name="name">Perlis</field>
1081- <field name="code">per</field>
1082- <field model="res.country" name="country_id" ref="my"/>
1083- </record>
1084-
1085- <record model="res.country.state" id="my-07">
1086- <field name="name">Pulau Pinang</field>
1087- <field name="code">pp</field>
1088- <field model="res.country" name="country_id" ref="my"/>
1089- </record>
1090-
1091- <record model="res.country.state" id="my-12">
1092- <field name="name">Sabah</field>
1093- <field name="code">sab</field>
1094- <field model="res.country" name="country_id" ref="my"/>
1095- </record>
1096-
1097- <record model="res.country.state" id="my-13">
1098- <field name="name">Sarawak</field>
1099- <field name="code">sar</field>
1100- <field model="res.country" name="country_id" ref="my"/>
1101- </record>
1102-
1103- <record model="res.country.state" id="my-10">
1104- <field name="name">Selangor</field>
1105- <field name="code">sel</field>
1106- <field model="res.country" name="country_id" ref="my"/>
1107- </record>
1108-
1109- <record model="res.country.state" id="my-11">
1110- <field name="name">Terengganu</field>
1111- <field name="code">ter</field>
1112- <field model="res.country" name="country_id" ref="my"/>
1113- </record>
1114-
1115- <record model="res.country.state" id="mx-agu">
1116- <field name="name">Aguascalientes</field>
1117- <field name="code">AGU</field>
1118- <field model="res.country" name="country_id" ref="mx"/>
1119- </record>
1120-
1121- <record model="res.country.state" id="mx-bcn">
1122- <field name="name">Baja California</field>
1123- <field name="code">BCN</field>
1124- <field model="res.country" name="country_id" ref="mx"/>
1125- </record>
1126-
1127- <record model="res.country.state" id="mx-bcs">
1128- <field name="name">Baja California Sur</field>
1129- <field name="code">BCS</field>
1130- <field model="res.country" name="country_id" ref="mx"/>
1131- </record>
1132-
1133- <record model="res.country.state" id="mx-cam">
1134- <field name="name">Campeche</field>
1135- <field name="code">CAM</field>
1136- <field model="res.country" name="country_id" ref="mx"/>
1137- </record>
1138-
1139- <record model="res.country.state" id="mx-coa">
1140- <field name="name">Coahuila</field>
1141- <field name="code">COA</field>
1142- <field model="res.country" name="country_id" ref="mx"/>
1143- </record>
1144-
1145- <record model="res.country.state" id="mx-col">
1146- <field name="name">Colima</field>
1147- <field name="code">COL</field>
1148- <field model="res.country" name="country_id" ref="mx"/>
1149- </record>
1150-
1151- <record model="res.country.state" id="mx-chp">
1152- <field name="name">Chiapas</field>
1153- <field name="code">CHP</field>
1154- <field model="res.country" name="country_id" ref="mx"/>
1155- </record>
1156-
1157- <record model="res.country.state" id="mx-chh">
1158- <field name="name">Chihuahua</field>
1159- <field name="code">CHH</field>
1160- <field model="res.country" name="country_id" ref="mx"/>
1161- </record>
1162-
1163- <record model="res.country.state" id="mx-dur">
1164- <field name="name">Durango</field>
1165- <field name="code">DUR</field>
1166- <field model="res.country" name="country_id" ref="mx"/>
1167- </record>
1168-
1169- <record model="res.country.state" id="mx-gua">
1170- <field name="name">Guanajuato</field>
1171- <field name="code">GUA</field>
1172- <field model="res.country" name="country_id" ref="mx"/>
1173- </record>
1174-
1175- <record model="res.country.state" id="mx-gro">
1176- <field name="name">Guerrero</field>
1177- <field name="code">GRO</field>
1178- <field model="res.country" name="country_id" ref="mx"/>
1179- </record>
1180-
1181- <record model="res.country.state" id="mx-hid">
1182- <field name="name">Hidalgo</field>
1183- <field name="code">HID</field>
1184- <field model="res.country" name="country_id" ref="mx"/>
1185- </record>
1186-
1187- <record model="res.country.state" id="mx-jal">
1188- <field name="name">Jalisco</field>
1189- <field name="code">JAL</field>
1190- <field model="res.country" name="country_id" ref="mx"/>
1191- </record>
1192-
1193- <record model="res.country.state" id="mx-mex">
1194- <field name="name">México</field>
1195- <field name="code">MEX</field>
1196- <field model="res.country" name="country_id" ref="mx"/>
1197- </record>
1198-
1199- <record model="res.country.state" id="mx-mic">
1200- <field name="name">Michoacán</field>
1201- <field name="code">MIC</field>
1202- <field model="res.country" name="country_id" ref="mx"/>
1203- </record>
1204-
1205- <record model="res.country.state" id="mx-mor">
1206- <field name="name">Morelos</field>
1207- <field name="code">MOR</field>
1208- <field model="res.country" name="country_id" ref="mx"/>
1209- </record>
1210-
1211- <record model="res.country.state" id="mx-nay">
1212- <field name="name">Nayarit</field>
1213- <field name="code">NAY</field>
1214- <field model="res.country" name="country_id" ref="mx"/>
1215- </record>
1216-
1217- <record model="res.country.state" id="mx-nle">
1218- <field name="name">Nuevo León</field>
1219- <field name="code">NLE</field>
1220- <field model="res.country" name="country_id" ref="mx"/>
1221- </record>
1222-
1223- <record model="res.country.state" id="mx-oax">
1224- <field name="name">Oaxaca</field>
1225- <field name="code">OAX</field>
1226- <field model="res.country" name="country_id" ref="mx"/>
1227- </record>
1228-
1229- <record model="res.country.state" id="mx-pue">
1230- <field name="name">Puebla</field>
1231- <field name="code">PUE</field>
1232- <field model="res.country" name="country_id" ref="mx"/>
1233- </record>
1234-
1235- <record model="res.country.state" id="mx-que">
1236- <field name="name">Querétaro</field>
1237- <field name="code">QUE</field>
1238- <field model="res.country" name="country_id" ref="mx"/>
1239- </record>
1240-
1241- <record model="res.country.state" id="mx-roo">
1242- <field name="name">Quintana Roo</field>
1243- <field name="code">ROO</field>
1244- <field model="res.country" name="country_id" ref="mx"/>
1245- </record>
1246-
1247- <record model="res.country.state" id="mx-slp">
1248- <field name="name">San Luis Potosí</field>
1249- <field name="code">SLP</field>
1250- <field model="res.country" name="country_id" ref="mx"/>
1251- </record>
1252-
1253- <record model="res.country.state" id="mx-sin">
1254- <field name="name">Sinaloa</field>
1255- <field name="code">SIN</field>
1256- <field model="res.country" name="country_id" ref="mx"/>
1257- </record>
1258-
1259- <record model="res.country.state" id="mx-son">
1260- <field name="name">Sonora</field>
1261- <field name="code">SON</field>
1262- <field model="res.country" name="country_id" ref="mx"/>
1263- </record>
1264-
1265- <record model="res.country.state" id="mx-tab">
1266- <field name="name">Tabasco</field>
1267- <field name="code">TAB</field>
1268- <field model="res.country" name="country_id" ref="mx"/>
1269- </record>
1270-
1271- <record model="res.country.state" id="mx-tam">
1272- <field name="name">Tamaulipas</field>
1273- <field name="code">TAM</field>
1274- <field model="res.country" name="country_id" ref="mx"/>
1275- </record>
1276-
1277- <record model="res.country.state" id="mx-tla">
1278- <field name="name">Tlaxcala</field>
1279- <field name="code">TLA</field>
1280- <field model="res.country" name="country_id" ref="mx"/>
1281- </record>
1282-
1283- <record model="res.country.state" id="mx-ver">
1284- <field name="name">Veracruz</field>
1285- <field name="code">VER</field>
1286- <field model="res.country" name="country_id" ref="mx"/>
1287- </record>
1288-
1289- <record model="res.country.state" id="mx-yuc">
1290- <field name="name">Yucatán</field>
1291- <field name="code">YUC</field>
1292- <field model="res.country" name="country_id" ref="mx"/>
1293- </record>
1294-
1295- <record model="res.country.state" id="mx-zac">
1296- <field name="name">Zacatecas</field>
1297- <field name="code">ZAC</field>
1298- <field model="res.country" name="country_id" ref="mx"/>
1299- </record>
1300-
1301-
1302-
1303- <record model="res.country.state" id="mm-14">
1304- <field name="name">Chin</field>
1305- <field name="code">ch</field>
1306- <field model="res.country" name="country_id" ref="mm"/>
1307- </record>
1308-
1309- <record model="res.country.state" id="mm-11">
1310- <field name="name">Kachin</field>
1311- <field name="code">kc</field>
1312- <field model="res.country" name="country_id" ref="mm"/>
1313- </record>
1314-
1315- <record model="res.country.state" id="mm-12">
1316- <field name="name">Kayah</field>
1317- <field name="code">kh</field>
1318- <field model="res.country" name="country_id" ref="mm"/>
1319- </record>
1320-
1321- <record model="res.country.state" id="mm-13">
1322- <field name="name">Kayin</field>
1323- <field name="code">ky</field>
1324- <field model="res.country" name="country_id" ref="mm"/>
1325- </record>
1326-
1327- <record model="res.country.state" id="mm-15">
1328- <field name="name">Mon</field>
1329- <field name="code">mon</field>
1330- <field model="res.country" name="country_id" ref="mm"/>
1331- </record>
1332-
1333- <record model="res.country.state" id="mm-16">
1334- <field name="name">Rakhine</field>
1335- <field name="code">rk</field>
1336- <field model="res.country" name="country_id" ref="mm"/>
1337- </record>
1338-
1339- <record model="res.country.state" id="mm-17">
1340- <field name="name">Shan</field>
1341- <field name="code">sh</field>
1342- <field model="res.country" name="country_id" ref="mm"/>
1343- </record>
1344-
1345-
1346- <record model="res.country.state" id="kn-k">
1347- <field name="name">Saint Kitts</field>
1348- <field name="code">SK</field>
1349- <field model="res.country" name="country_id" ref="kn"/>
1350- </record>
1351-
1352- <record model="res.country.state" id="kn-n">
1353- <field name="name">Nevis</field>
1354- <field name="code">NE</field>
1355- <field model="res.country" name="country_id" ref="kn"/>
1356- </record>
1357-
1358-
1359- <record model="res.country.state" id="in-ap">
1360- <field name="name">Andhra Pradesh</field>
1361- <field name="code">AP</field>
1362- <field model="res.country" name="country_id" ref="in"/>
1363- </record>
1364-
1365- <record model="res.country.state" id="in-ar">
1366- <field name="name">Arunachal Pradesh</field>
1367- <field name="code">AR</field>
1368- <field model="res.country" name="country_id" ref="in"/>
1369- </record>
1370-
1371- <record model="res.country.state" id="in-as">
1372- <field name="name">Assam</field>
1373- <field name="code">AS</field>
1374- <field model="res.country" name="country_id" ref="in"/>
1375- </record>
1376-
1377- <record model="res.country.state" id="in-br">
1378- <field name="name">Bihar</field>
1379- <field name="code">BR</field>
1380- <field model="res.country" name="country_id" ref="in"/>
1381- </record>
1382-
1383- <record model="res.country.state" id="in-ct">
1384- <field name="name">Chhattasgarh</field>
1385- <field name="code">CT</field>
1386- <field model="res.country" name="country_id" ref="in"/>
1387- </record>
1388-
1389- <record model="res.country.state" id="in-ga">
1390- <field name="name">Goa</field>
1391- <field name="code">GA</field>
1392- <field model="res.country" name="country_id" ref="in"/>
1393- </record>
1394-
1395- <record model="res.country.state" id="in-gj">
1396- <field name="name">Gujarat</field>
1397- <field name="code">GJ</field>
1398- <field model="res.country" name="country_id" ref="in"/>
1399- </record>
1400-
1401- <record model="res.country.state" id="in-hr">
1402- <field name="name">Haryana</field>
1403- <field name="code">HR</field>
1404- <field model="res.country" name="country_id" ref="in"/>
1405- </record>
1406-
1407- <record model="res.country.state" id="in-hp">
1408- <field name="name">Himachal Pradesh</field>
1409- <field name="code">HP</field>
1410- <field model="res.country" name="country_id" ref="in"/>
1411- </record>
1412-
1413- <record model="res.country.state" id="in-jk">
1414- <field name="name">Jammu and Kashmir</field>
1415- <field name="code">JK</field>
1416- <field model="res.country" name="country_id" ref="in"/>
1417- </record>
1418-
1419- <record model="res.country.state" id="in-jh">
1420- <field name="name">Jharkhand</field>
1421- <field name="code">JH</field>
1422- <field model="res.country" name="country_id" ref="in"/>
1423- </record>
1424-
1425- <record model="res.country.state" id="in-ka">
1426- <field name="name">Karnataka</field>
1427- <field name="code">KA</field>
1428- <field model="res.country" name="country_id" ref="in"/>
1429- </record>
1430-
1431- <record model="res.country.state" id="in-kl">
1432- <field name="name">Kerala</field>
1433- <field name="code">KL</field>
1434- <field model="res.country" name="country_id" ref="in"/>
1435- </record>
1436-
1437- <record model="res.country.state" id="in-mp">
1438- <field name="name">Madhya Pradesh</field>
1439- <field name="code">MP</field>
1440- <field model="res.country" name="country_id" ref="in"/>
1441- </record>
1442-
1443- <record model="res.country.state" id="in-mh">
1444- <field name="name">Maharashtra</field>
1445- <field name="code">MH</field>
1446- <field model="res.country" name="country_id" ref="in"/>
1447- </record>
1448-
1449- <record model="res.country.state" id="in-mn">
1450- <field name="name">Manipur</field>
1451- <field name="code">MN</field>
1452- <field model="res.country" name="country_id" ref="in"/>
1453- </record>
1454-
1455- <record model="res.country.state" id="in-ml">
1456- <field name="name">Meghalaya</field>
1457- <field name="code">ML</field>
1458- <field model="res.country" name="country_id" ref="in"/>
1459- </record>
1460-
1461- <record model="res.country.state" id="in-mz">
1462- <field name="name">Mizoram</field>
1463- <field name="code">MZ</field>
1464- <field model="res.country" name="country_id" ref="in"/>
1465- </record>
1466-
1467- <record model="res.country.state" id="in-nl">
1468- <field name="name">Nagaland</field>
1469- <field name="code">NL</field>
1470- <field model="res.country" name="country_id" ref="in"/>
1471- </record>
1472-
1473- <record model="res.country.state" id="in-or">
1474- <field name="name">Orissa</field>
1475- <field name="code">OR</field>
1476- <field model="res.country" name="country_id" ref="in"/>
1477- </record>
1478-
1479- <record model="res.country.state" id="in-pb">
1480- <field name="name">Punjab</field>
1481- <field name="code">PB</field>
1482- <field model="res.country" name="country_id" ref="in"/>
1483- </record>
1484-
1485- <record model="res.country.state" id="in-rj">
1486- <field name="name">Rajasthan</field>
1487- <field name="code">RJ</field>
1488- <field model="res.country" name="country_id" ref="in"/>
1489- </record>
1490-
1491- <record model="res.country.state" id="in-sk">
1492- <field name="name">Sikkim</field>
1493- <field name="code">SK</field>
1494- <field model="res.country" name="country_id" ref="in"/>
1495- </record>
1496-
1497- <record model="res.country.state" id="in-tn">
1498- <field name="name">Tamilnadu</field>
1499- <field name="code">TN</field>
1500- <field model="res.country" name="country_id" ref="in"/>
1501- </record>
1502-
1503- <record model="res.country.state" id="in-tr">
1504- <field name="name">Tripura</field>
1505- <field name="code">TR</field>
1506- <field model="res.country" name="country_id" ref="in"/>
1507- </record>
1508-
1509- <record model="res.country.state" id="in-ul">
1510- <field name="name">Uttaranchal</field>
1511- <field name="code">UL</field>
1512- <field model="res.country" name="country_id" ref="in"/>
1513- </record>
1514-
1515- <record model="res.country.state" id="in-up">
1516- <field name="name">Uttar Pradesh</field>
1517- <field name="code">UP</field>
1518- <field model="res.country" name="country_id" ref="in"/>
1519- </record>
1520-
1521- <record model="res.country.state" id="in-wb">
1522- <field name="name">West Bengal</field>
1523- <field name="code">WB</field>
1524- <field model="res.country" name="country_id" ref="in"/>
1525- </record>
1526-
1527-
1528-
1529- <record model="res.country.state" id="fm-trk">
1530- <field name="name">Chuuk</field>
1531- <field name="code">TRK</field>
1532- <field model="res.country" name="country_id" ref="fm"/>
1533- </record>
1534-
1535- <record model="res.country.state" id="fm-ksa">
1536- <field name="name">Kosrae</field>
1537- <field name="code">KSA</field>
1538- <field model="res.country" name="country_id" ref="fm"/>
1539- </record>
1540-
1541- <record model="res.country.state" id="fm-pni">
1542- <field name="name">Pohnpei</field>
1543- <field name="code">PNI</field>
1544- <field model="res.country" name="country_id" ref="fm"/>
1545- </record>
1546-
1547- <record model="res.country.state" id="fm-yap">
1548- <field name="name">Yap</field>
1549- <field name="code">YAP</field>
1550- <field model="res.country" name="country_id" ref="fm"/>
1551- </record>
1552-
1553-
1554- <record model="res.country.state" id="et-af">
1555- <field name="name">Āfar</field>
1556- <field name="code">AF</field>
1557- <field model="res.country" name="country_id" ref="et"/>
1558- </record>
1559-
1560- <record model="res.country.state" id="et-am">
1561- <field name="name">Āmara</field>
1562- <field name="code">AM</field>
1563- <field model="res.country" name="country_id" ref="et"/>
1564- </record>
1565-
1566- <record model="res.country.state" id="et-be">
1567- <field name="name">Bīnshangul Gumuz</field>
1568- <field name="code">BE</field>
1569- <field model="res.country" name="country_id" ref="et"/>
1570- </record>
1571-
1572- <record model="res.country.state" id="et-ga">
1573- <field name="name">Gambēla Hizboch</field>
1574- <field name="code">GA</field>
1575- <field model="res.country" name="country_id" ref="et"/>
1576- </record>
1577-
1578- <record model="res.country.state" id="et-ha">
1579- <field name="name">Hārerī Hizb</field>
1580- <field name="code">HA</field>
1581- <field model="res.country" name="country_id" ref="et"/>
1582- </record>
1583-
1584- <record model="res.country.state" id="et-or">
1585- <field name="name">Oromīya</field>
1586- <field name="code">OR</field>
1587- <field model="res.country" name="country_id" ref="et"/>
1588- </record>
1589-
1590- <record model="res.country.state" id="et-so">
1591- <field name="name">Sumalē</field>
1592- <field name="code">SO</field>
1593- <field model="res.country" name="country_id" ref="et"/>
1594- </record>
1595-
1596- <record model="res.country.state" id="et-ti">
1597- <field name="name">Tigray</field>
1598- <field name="code">TI</field>
1599- <field model="res.country" name="country_id" ref="et"/>
1600- </record>
1601-
1602- <record model="res.country.state" id="et-sn">
1603- <field name="name">YeDebub Bihēroch Bihēreseboch na Hizboch</field>
1604- <field name="code">SN</field>
1605- <field model="res.country" name="country_id" ref="et"/>
1606- </record>
1607-
1608-
1609- <record model="res.country.state" id="de-bw">
1610- <field name="name">Baden-Württemberg</field>
1611- <field name="code">BW</field>
1612- <field model="res.country" name="country_id" ref="de"/>
1613- </record>
1614-
1615- <record model="res.country.state" id="de-by">
1616- <field name="name">Bayern</field>
1617- <field name="code">BY</field>
1618- <field model="res.country" name="country_id" ref="de"/>
1619- </record>
1620-
1621- <record model="res.country.state" id="de-hb">
1622- <field name="name">Bremen</field>
1623- <field name="code">HB</field>
1624- <field model="res.country" name="country_id" ref="de"/>
1625- </record>
1626-
1627- <record model="res.country.state" id="de-hh">
1628- <field name="name">Hamburg</field>
1629- <field name="code">HH</field>
1630- <field model="res.country" name="country_id" ref="de"/>
1631- </record>
1632-
1633- <record model="res.country.state" id="de-he">
1634- <field name="name">Hessen</field>
1635- <field name="code">HE</field>
1636- <field model="res.country" name="country_id" ref="de"/>
1637- </record>
1638-
1639- <record model="res.country.state" id="de-ni">
1640- <field name="name">Niedersachsen</field>
1641- <field name="code">NI</field>
1642- <field model="res.country" name="country_id" ref="de"/>
1643- </record>
1644-
1645- <record model="res.country.state" id="de-nw">
1646- <field name="name">Nordrhein-Westfalen</field>
1647- <field name="code">NW</field>
1648- <field model="res.country" name="country_id" ref="de"/>
1649- </record>
1650-
1651- <record model="res.country.state" id="de-rp">
1652- <field name="name">Rheinland-Pfalz</field>
1653- <field name="code">RP</field>
1654- <field model="res.country" name="country_id" ref="de"/>
1655- </record>
1656-
1657- <record model="res.country.state" id="de-sl">
1658- <field name="name">Saarland</field>
1659- <field name="code">SL</field>
1660- <field model="res.country" name="country_id" ref="de"/>
1661- </record>
1662-
1663- <record model="res.country.state" id="de-sh">
1664- <field name="name">Schleswig-Holstein</field>
1665- <field name="code">SH</field>
1666- <field model="res.country" name="country_id" ref="de"/>
1667- </record>
1668-
1669- <record model="res.country.state" id="de-be">
1670- <field name="name">Berlin</field>
1671- <field name="code">BE</field>
1672- <field model="res.country" name="country_id" ref="de"/>
1673- </record>
1674-
1675- <record model="res.country.state" id="de-bb">
1676- <field name="name">Brandenburg</field>
1677- <field name="code">BB</field>
1678- <field model="res.country" name="country_id" ref="de"/>
1679- </record>
1680-
1681- <record model="res.country.state" id="de-mv">
1682- <field name="name">Mecklenburg-Vorpommern</field>
1683- <field name="code">MV</field>
1684- <field model="res.country" name="country_id" ref="de"/>
1685- </record>
1686-
1687- <record model="res.country.state" id="de-sn">
1688- <field name="name">Sachsen</field>
1689- <field name="code">SN</field>
1690- <field model="res.country" name="country_id" ref="de"/>
1691- </record>
1692-
1693- <record model="res.country.state" id="de-st">
1694- <field name="name">Sachsen-Anhalt</field>
1695- <field name="code">ST</field>
1696- <field model="res.country" name="country_id" ref="de"/>
1697- </record>
1698-
1699- <record model="res.country.state" id="de-th">
1700- <field name="name">Thüringen</field>
1701- <field name="code">TH</field>
1702- <field model="res.country" name="country_id" ref="de"/>
1703- </record>
1704-
1705-
1706- <record model="res.country.state" id="br-ac">
1707- <field name="name">Acre</field>
1708- <field name="code">AC</field>
1709- <field model="res.country" name="country_id" ref="br"/>
1710- </record>
1711-
1712- <record model="res.country.state" id="br-al">
1713- <field name="name">Alagoas</field>
1714- <field name="code">AL</field>
1715- <field model="res.country" name="country_id" ref="br"/>
1716- </record>
1717-
1718- <record model="res.country.state" id="br-am">
1719- <field name="name">Amazonas</field>
1720- <field name="code">AM</field>
1721- <field model="res.country" name="country_id" ref="br"/>
1722- </record>
1723-
1724- <record model="res.country.state" id="br-ap">
1725- <field name="name">Amapá</field>
1726- <field name="code">AP</field>
1727- <field model="res.country" name="country_id" ref="br"/>
1728- </record>
1729-
1730- <record model="res.country.state" id="br-ba">
1731- <field name="name">Bahia</field>
1732- <field name="code">BA</field>
1733- <field model="res.country" name="country_id" ref="br"/>
1734- </record>
1735-
1736- <record model="res.country.state" id="br-ce">
1737- <field name="name">Ceará</field>
1738- <field name="code">CE</field>
1739- <field model="res.country" name="country_id" ref="br"/>
1740- </record>
1741-
1742- <record model="res.country.state" id="br-es">
1743- <field name="name">Espírito Santo</field>
1744- <field name="code">ES</field>
1745- <field model="res.country" name="country_id" ref="br"/>
1746- </record>
1747-
1748- <record model="res.country.state" id="br-fn">
1749- <field name="name">Fernando de Noronha</field>
1750- <field name="code">FN</field>
1751- <field model="res.country" name="country_id" ref="br"/>
1752- </record>
1753-
1754- <record model="res.country.state" id="br-go">
1755- <field name="name">Goiás</field>
1756- <field name="code">GO</field>
1757- <field model="res.country" name="country_id" ref="br"/>
1758- </record>
1759-
1760- <record model="res.country.state" id="br-ma">
1761- <field name="name">Maranhão</field>
1762- <field name="code">MA</field>
1763- <field model="res.country" name="country_id" ref="br"/>
1764- </record>
1765-
1766- <record model="res.country.state" id="br-mg">
1767- <field name="name">Minas Gerais</field>
1768- <field name="code">MG</field>
1769- <field model="res.country" name="country_id" ref="br"/>
1770- </record>
1771-
1772- <record model="res.country.state" id="br-ms">
1773- <field name="name">Mato Grosso do Sul</field>
1774- <field name="code">MS</field>
1775- <field model="res.country" name="country_id" ref="br"/>
1776- </record>
1777-
1778- <record model="res.country.state" id="br-mt">
1779- <field name="name">Mato Grosso</field>
1780- <field name="code">MT</field>
1781- <field model="res.country" name="country_id" ref="br"/>
1782- </record>
1783-
1784- <record model="res.country.state" id="br-pa">
1785- <field name="name">Pará</field>
1786- <field name="code">PA</field>
1787- <field model="res.country" name="country_id" ref="br"/>
1788- </record>
1789-
1790- <record model="res.country.state" id="br-pb">
1791- <field name="name">Paraíba</field>
1792- <field name="code">PB</field>
1793- <field model="res.country" name="country_id" ref="br"/>
1794- </record>
1795-
1796- <record model="res.country.state" id="br-pe">
1797- <field name="name">Pernambuco</field>
1798- <field name="code">PE</field>
1799- <field model="res.country" name="country_id" ref="br"/>
1800- </record>
1801-
1802- <record model="res.country.state" id="br-pi">
1803- <field name="name">Piauí</field>
1804- <field name="code">PI</field>
1805- <field model="res.country" name="country_id" ref="br"/>
1806- </record>
1807-
1808- <record model="res.country.state" id="br-pr">
1809- <field name="name">Paraná</field>
1810- <field name="code">PR</field>
1811- <field model="res.country" name="country_id" ref="br"/>
1812- </record>
1813-
1814- <record model="res.country.state" id="br-rj">
1815- <field name="name">Rio de Janeiro</field>
1816- <field name="code">RJ</field>
1817- <field model="res.country" name="country_id" ref="br"/>
1818- </record>
1819-
1820- <record model="res.country.state" id="br-rn">
1821- <field name="name">Rio Grande do Norte</field>
1822- <field name="code">RN</field>
1823- <field model="res.country" name="country_id" ref="br"/>
1824- </record>
1825-
1826- <record model="res.country.state" id="br-ro">
1827- <field name="name">Rondonia</field>
1828- <field name="code">RO</field>
1829- <field model="res.country" name="country_id" ref="br"/>
1830- </record>
1831-
1832- <record model="res.country.state" id="br-rr">
1833- <field name="name">Roraima</field>
1834- <field name="code">RR</field>
1835- <field model="res.country" name="country_id" ref="br"/>
1836- </record>
1837-
1838- <record model="res.country.state" id="br-rs">
1839- <field name="name">Rio Grande do Sul</field>
1840- <field name="code">RS</field>
1841- <field model="res.country" name="country_id" ref="br"/>
1842- </record>
1843-
1844- <record model="res.country.state" id="br-sc">
1845- <field name="name">Santa Catarina</field>
1846- <field name="code">SC</field>
1847- <field model="res.country" name="country_id" ref="br"/>
1848- </record>
1849-
1850- <record model="res.country.state" id="br-se">
1851- <field name="name">Sergipe</field>
1852- <field name="code">SE</field>
1853- <field model="res.country" name="country_id" ref="br"/>
1854- </record>
1855-
1856- <record model="res.country.state" id="br-sp">
1857- <field name="name">Sao Paulo</field>
1858- <field name="code">SP</field>
1859- <field model="res.country" name="country_id" ref="br"/>
1860- </record>
1861-
1862- <record model="res.country.state" id="br-to">
1863- <field name="name">Tocantins</field>
1864- <field name="code">TO</field>
1865- <field model="res.country" name="country_id" ref="br"/>
1866- </record>
1867-
1868- <record model="res.country.state" id="at-1">
1869- <field name="name">Burgenland</field>
1870- <field name="code">bl</field>
1871- <field model="res.country" name="country_id" ref="at"/>
1872- </record>
1873-
1874- <record model="res.country.state" id="at-2">
1875- <field name="name">Karnten</field>
1876- <field name="code">ka</field>
1877- <field model="res.country" name="country_id" ref="at"/>
1878- </record>
1879-
1880- <record model="res.country.state" id="at-3">
1881- <field name="name">Niederosterreich</field>
1882- <field name="code">ni</field>
1883- <field model="res.country" name="country_id" ref="at"/>
1884- </record>
1885-
1886- <record model="res.country.state" id="at-4">
1887- <field name="name">Oberosterreich</field>
1888- <field name="code">ob</field>
1889- <field model="res.country" name="country_id" ref="at"/>
1890- </record>
1891-
1892- <record model="res.country.state" id="at-5">
1893- <field name="name">Salzburg</field>
1894- <field name="code">sa</field>
1895- <field model="res.country" name="country_id" ref="at"/>
1896- </record>
1897-
1898- <record model="res.country.state" id="at-6">
1899- <field name="name">Steiermark</field>
1900- <field name="code">st</field>
1901- <field model="res.country" name="country_id" ref="at"/>
1902- </record>
1903-
1904- <record model="res.country.state" id="at-7">
1905- <field name="name">Tirol</field>
1906- <field name="code">ti</field>
1907- <field model="res.country" name="country_id" ref="at"/>
1908- </record>
1909-
1910- <record model="res.country.state" id="at-8">
1911- <field name="name">Vorarlberg</field>
1912- <field name="code">vb</field>
1913- <field model="res.country" name="country_id" ref="at"/>
1914- </record>
1915-
1916- <record model="res.country.state" id="at-9">
1917- <field name="name">Wien</field>
1918- <field name="code">wi</field>
1919- <field model="res.country" name="country_id" ref="at"/>
1920- </record>
1921-
1922- <record model="res.country.state" id="au-nsw">
1923- <field name="name">New South Wales</field>
1924- <field name="code">NSW</field>
1925- <field model="res.country" name="country_id" ref="au"/>
1926- </record>
1927-
1928- <record model="res.country.state" id="au-qld">
1929- <field name="name">Queensland</field>
1930- <field name="code">QLD</field>
1931- <field model="res.country" name="country_id" ref="au"/>
1932- </record>
1933-
1934- <record model="res.country.state" id="au-sa">
1935- <field name="name">South Australia</field>
1936- <field name="code">SA</field>
1937- <field model="res.country" name="country_id" ref="au"/>
1938- </record>
1939-
1940- <record model="res.country.state" id="au-tas">
1941- <field name="name">Tasmania</field>
1942- <field name="code">TAS</field>
1943- <field model="res.country" name="country_id" ref="au"/>
1944- </record>
1945-
1946- <record model="res.country.state" id="au-vic">
1947- <field name="name">Victoria</field>
1948- <field name="code">VIC</field>
1949- <field model="res.country" name="country_id" ref="au"/>
1950- </record>
1951-
1952- <record model="res.country.state" id="au-wa">
1953- <field name="name">Western Australia</field>
1954- <field name="code">WA</field>
1955- <field model="res.country" name="country_id" ref="au"/>
1956- </record>
1957-
1958-
1959
1960 <record id="main_partner" model="res.partner">
1961 <field name="name">Tiny sprl</field>
1962@@ -2855,6 +1212,12 @@
1963 <field name="rounding">0.01</field>
1964 <field name="accuracy">4</field>
1965 </record>
1966+
1967+ <record id="rateARS" model="res.currency.rate">
1968+ <field name="rate">5.6</field>
1969+ <field name="currency_id" ref="ARS"/>
1970+ <field eval="time.strftime('%Y-01-01')" name="name"/>
1971+ </record>
1972
1973 <record id="INR" model="res.currency">
1974 <field name="name">INR</field>
1975
1976=== modified file 'bin/addons/base/i18n/ar_AR.po'
1977--- bin/addons/base/i18n/ar_AR.po 2009-04-10 08:52:25 +0000
1978+++ bin/addons/base/i18n/ar_AR.po 2009-12-04 08:51:12 +0000
1979@@ -4,10 +4,15 @@
1980 #
1981 msgid ""
1982 msgstr ""
1983-"Project-Id-Version: OpenERP Server 5.0.0\n"
1984+"Project-Id-Version: OpenERP Server 5.0.4\n"
1985 "Report-Msgid-Bugs-To: support@openerp.com\n"
1986+<<<<<<< TREE
1987 "POT-Creation-Date: 2009-04-09 16:51:38+0000\n"
1988 "PO-Revision-Date: 2009-04-09 16:51:38+0000\n"
1989+=======
1990+"POT-Creation-Date: 2009-08-28 15:24:54+0000\n"
1991+"PO-Revision-Date: 2009-08-28 15:24:54+0000\n"
1992+>>>>>>> MERGE-SOURCE
1993 "Last-Translator: <>\n"
1994 "Language-Team: \n"
1995 "MIME-Version: 1.0\n"
1996@@ -26,11 +31,23 @@
1997 msgstr ""
1998
1999 #. module: base
2000+#: code:addons/addons/account/wizard/wizard_open_closed_fiscalyear.py:0
2001+#, python-format
2002+msgid "No journal for ending writing has been defined for the fiscal year"
2003+msgstr ""
2004+
2005+#. module: base
2006 #: view:res.lang:0
2007 msgid "%j - Day of the year as a decimal number [001,366]."
2008 msgstr ""
2009
2010 #. module: base
2011+#: code:addons/addons/mrp/report/price.py:0
2012+#, python-format
2013+msgid "Product quantity"
2014+msgstr ""
2015+
2016+#. module: base
2017 #: field:ir.values,meta_unpickle:0
2018 msgid "Metadata"
2019 msgstr ""
2020@@ -42,7 +59,7 @@
2021 msgstr ""
2022
2023 #. module: base
2024-#: code:addons/base/ir/ir_model.py:0
2025+#: code:addons/addons/base/ir/ir_model.py:0
2026 #, python-format
2027 msgid "You can not create this kind of document! (%s)"
2028 msgstr ""
2029@@ -60,8 +77,9 @@
2030 msgstr ""
2031
2032 #. module: base
2033-#: view:wizard.module.lang.export:0
2034-msgid "To browse official translations, you can visit this link: "
2035+#: code:addons/addons/account/account_bank_statement.py:0
2036+#, python-format
2037+msgid "Account move line \"%s\" is not valid"
2038 msgstr ""
2039
2040 #. module: base
2041@@ -75,11 +93,37 @@
2042 msgstr ""
2043
2044 #. module: base
2045+#: code:addons/addons/l10n_ch/wizard/dta_wizard.py:0
2046+#, python-format
2047+msgid "The Bank type %s of the bank account: %s is not supported"
2048+msgstr ""
2049+
2050+#. module: base
2051+#: code:addons/addons/base_module_quality/method_test/method_test.py:0
2052+#, python-format
2053+msgid "\"\"\n"
2054+"This test checks if the module classes are raising exception when calling basic methods or not.\n"
2055+"\"\""
2056+msgstr ""
2057+
2058+#. module: base
2059+#: code:addons/addons/base_module_quality/pylint_test/pylint_test.py:0
2060+#, python-format
2061+msgid "Result (/10)"
2062+msgstr ""
2063+
2064+#. module: base
2065 #: view:ir.module.module:0
2066 msgid "Created Views"
2067 msgstr ""
2068
2069 #. module: base
2070+#: code:addons/addons/account/account.py:0
2071+#, python-format
2072+msgid "You can not delete posted movement: \"%s\"!"
2073+msgstr ""
2074+
2075+#. module: base
2076 #: view:workflow.activity:0
2077 msgid "Outgoing transitions"
2078 msgstr ""
2079@@ -90,7 +134,7 @@
2080 msgstr ""
2081
2082 #. module: base
2083-#: code:osv/orm.py:0
2084+#: code:addons/osv/orm.py:0
2085 #, python-format
2086 msgid "The unlink method is not implemented on this object !"
2087 msgstr ""
2088@@ -110,9 +154,8 @@
2089 msgstr ""
2090
2091 #. module: base
2092-#: code:report/custom.py:0
2093-#, python-format
2094-msgid "The sum of the data (2nd field) is null.\nWe can't draw a pie chart !"
2095+#: field:ir.rule,operand:0
2096+msgid "Operand"
2097 msgstr ""
2098
2099 #. module: base
2100@@ -133,6 +176,18 @@
2101 msgstr ""
2102
2103 #. module: base
2104+#: code:addons/addons/sale/sale.py:0
2105+#, python-format
2106+msgid "There is no income account defined ' \\n"
2107+" 'for this product: \"%s\" (id:%d)"
2108+msgstr ""
2109+
2110+#. module: base
2111+#: model:res.country,name:base.sz
2112+msgid "Swaziland"
2113+msgstr ""
2114+
2115+#. module: base
2116 #: model:ir.model,name:base.model_ir_actions_report_custom
2117 #: selection:ir.ui.menu,action:0
2118 msgid "ir.actions.report.custom"
2119@@ -165,7 +220,7 @@
2120 msgstr ""
2121
2122 #. module: base
2123-#: code:addons/base/module/wizard/wizard_export_lang.py:0
2124+#: code:addons/addons/base/module/wizard/wizard_export_lang.py:0
2125 #, python-format
2126 msgid "new"
2127 msgstr ""
2128@@ -192,12 +247,18 @@
2129 msgstr ""
2130
2131 #. module: base
2132+#: code:addons/addons/account/account_move_line.py:0
2133+#, python-format
2134+msgid "You can not use this general account in this journal !"
2135+msgstr ""
2136+
2137+#. module: base
2138 #: field:res.partner.address,name:0
2139 msgid "Contact Name"
2140 msgstr ""
2141
2142 #. module: base
2143-#: code:addons/base/module/wizard/wizard_export_lang.py:0
2144+#: code:addons/addons/base/module/wizard/wizard_export_lang.py:0
2145 #, python-format
2146 msgid "Save this document to a %s file and edit it with a specific software or a text editor. The file encoding is UTF-8."
2147 msgstr ""
2148@@ -208,13 +269,13 @@
2149 msgstr ""
2150
2151 #. module: base
2152-#: code:addons/base/ir/ir_model.py:0
2153+#: code:addons/addons/base/ir/ir_model.py:0
2154 #, python-format
2155 msgid "Password mismatch !"
2156 msgstr ""
2157
2158 #. module: base
2159-#: code:addons/base/module/module.py:0
2160+#: code:addons/addons/base/module/module.py:0
2161 #, python-format
2162 msgid "This url '%s' must provide an html file with links to zip modules"
2163 msgstr ""
2164@@ -235,8 +296,14 @@
2165 msgstr ""
2166
2167 #. module: base
2168-#: selection:ir.ui.menu,icon:0
2169-msgid "STOCK_GOTO_FIRST"
2170+#: code:addons/addons/account/account_move_line.py:0
2171+#, python-format
2172+msgid "You can not add/modify entries in a closed journal."
2173+msgstr ""
2174+
2175+#. module: base
2176+#: selection:maintenance.contract.wizard,state:0
2177+msgid "Validated"
2178 msgstr ""
2179
2180 #. module: base
2181@@ -245,13 +312,19 @@
2182 msgstr ""
2183
2184 #. module: base
2185+#: code:addons/addons/l10n_ch/wizard/dta_wizard.py:0
2186+#, python-format
2187+msgid "No payment mode or payment type code invalid."
2188+msgstr ""
2189+
2190+#. module: base
2191 #: selection:ir.report.custom.fields,operation:0
2192 msgid "Get Max"
2193 msgstr ""
2194
2195 #. module: base
2196-#: help:ir.actions.act_window,limit:0
2197-msgid "Default limit for the list view"
2198+#: field:res.partner,credit_limit:0
2199+msgid "Credit Limit"
2200 msgstr ""
2201
2202 #. module: base
2203@@ -283,6 +356,11 @@
2204 msgstr ""
2205
2206 #. module: base
2207+#: view:wizard.module.lang.export:0
2208+msgid "To browse official translations, you can visit this link: "
2209+msgstr ""
2210+
2211+#. module: base
2212 #: field:ir.exports.line,name:0
2213 #: field:ir.translation,name:0
2214 #: field:res.partner.bank.type.field,name:0
2215@@ -290,18 +368,38 @@
2216 msgstr ""
2217
2218 #. module: base
2219+#: code:addons/addons/purchase/purchase.py:0
2220+#, python-format
2221+msgid "Cannot delete Purchase Order(s) which are in %s State!"
2222+msgstr ""
2223+
2224+#. module: base
2225 #: model:ir.actions.act_window,name:base.open_module_tree_uninstall
2226 #: model:ir.ui.menu,name:base.menu_module_tree_uninstall
2227 msgid "Uninstalled modules"
2228 msgstr ""
2229
2230 #. module: base
2231+#: code:addons/addons/product/pricelist.py:0
2232+#, python-format
2233+msgid "Could not resolve product category, ' \\n"
2234+" 'you have defined cyclic categories ' \\n"
2235+" 'of products!"
2236+msgstr ""
2237+
2238+#. module: base
2239 #: wizard_view:server.action.create,init:0
2240 #: wizard_field:server.action.create,init,type:0
2241 msgid "Select Action Type"
2242 msgstr ""
2243
2244 #. module: base
2245+#: code:addons/addons/mrp_operations/mrp_operations.py:0
2246+#, python-format
2247+msgid " You cannot Resume the operation other then Pause state !"
2248+msgstr ""
2249+
2250+#. module: base
2251 #: selection:ir.actions.todo,type:0
2252 msgid "Configure"
2253 msgstr ""
2254@@ -318,6 +416,13 @@
2255 msgstr ""
2256
2257 #. module: base
2258+#: code:addons/addons/hr_timesheet/report/user_timesheet.py:0
2259+#: code:addons/addons/hr_timesheet/report/users_timesheet.py:0
2260+#, python-format
2261+msgid "June"
2262+msgstr ""
2263+
2264+#. module: base
2265 #: field:res.lang,date_format:0
2266 msgid "Date Format"
2267 msgstr ""
2268@@ -334,7 +439,13 @@
2269 msgstr ""
2270
2271 #. module: base
2272-#: code:addons/base/res/res_user.py:0
2273+#: code:addons/addons/mrp/report/price.py:0
2274+#, python-format
2275+msgid "Workcenter name"
2276+msgstr ""
2277+
2278+#. module: base
2279+#: code:addons/addons/base/res/res_user.py:0
2280 #, python-format
2281 msgid "You can not remove the admin user as it is used internally for resources created by OpenERP (updates, module installation, ...)"
2282 msgstr ""
2283@@ -350,12 +461,18 @@
2284 msgstr ""
2285
2286 #. module: base
2287+#: code:addons/addons/base_module_quality/workflow_test/workflow_test.py:0
2288+#, python-format
2289+msgid "Feed back About Workflow of Module"
2290+msgstr ""
2291+
2292+#. module: base
2293 #: help:ir.actions.report.xml,attachment_use:0
2294 msgid "If you check this, then the second time the user prints with same attachment name, it returns the previous report."
2295 msgstr ""
2296
2297 #. module: base
2298-#: code:osv/orm.py:0
2299+#: code:addons/osv/orm.py:0
2300 #, python-format
2301 msgid "The read method is not implemented on this object !"
2302 msgstr ""
2303@@ -371,6 +488,12 @@
2304 msgstr ""
2305
2306 #. module: base
2307+#: code:addons/addons/mrp/report/price.py:0
2308+#, python-format
2309+msgid "Product Quantity"
2310+msgstr ""
2311+
2312+#. module: base
2313 #: field:res.country,name:0
2314 msgid "Country Name"
2315 msgstr ""
2316@@ -386,8 +509,29 @@
2317 msgstr ""
2318
2319 #. module: base
2320-#: field:ir.actions.report.custom,report_id:0
2321-msgid "Report Ref."
2322+#: code:addons/service/web_services.py:0
2323+#, python-format
2324+msgid "''\n"
2325+"\n"
2326+"OpenERP is an ERP+CRM program for small and medium businesses.\n"
2327+"\n"
2328+"The whole source code is distributed under the terms of the\n"
2329+"GNU Public Licence.\n"
2330+"\n"
2331+"(c) 2003-TODAY, Fabien Pinckaers - Tiny sprl''"
2332+msgstr ""
2333+
2334+#. module: base
2335+#: code:addons/osv/orm.py:0
2336+#, python-format
2337+msgid "Key/value '%s' not found in selection field '%s'"
2338+msgstr ""
2339+
2340+#. module: base
2341+#: code:addons/addons/crm_configuration/wizard/wizard_opportunity_set.py:0
2342+#, python-format
2343+msgid "You must assign a partner to this lead before converting to opportunity.\n' \\n"
2344+" 'You can use the convert to partner button."
2345 msgstr ""
2346
2347 #. module: base
2348@@ -397,9 +541,8 @@
2349 msgstr ""
2350
2351 #. module: base
2352-#: selection:workflow.activity,join_mode:0
2353-#: selection:workflow.activity,split_mode:0
2354-msgid "Xor"
2355+#: model:res.country,name:base.pw
2356+msgid "Palau"
2357 msgstr ""
2358
2359 #. module: base
2360@@ -408,6 +551,12 @@
2361 msgstr ""
2362
2363 #. module: base
2364+#: code:addons/addons/l10n_be/wizard/partner_vat_listing.py:0
2365+#, python-format
2366+msgid "No partner has a VAT Number asociated with him."
2367+msgstr ""
2368+
2369+#. module: base
2370 #: view:ir.actions.wizard:0
2371 #: field:wizard.ir.model.menu.create.line,wizard_id:0
2372 msgid "Wizard"
2373@@ -431,7 +580,7 @@
2374 msgstr ""
2375
2376 #. module: base
2377-#: code:addons/base/ir/ir_model.py:0
2378+#: code:addons/addons/base/ir/ir_model.py:0
2379 #, python-format
2380 msgid "Custom fields must have a name that starts with 'x_' !"
2381 msgstr ""
2382@@ -442,6 +591,12 @@
2383 msgstr ""
2384
2385 #. module: base
2386+#: code:addons/addons/odms/odms.py:0
2387+#, python-format
2388+msgid "Can't connect instance %s"
2389+msgstr ""
2390+
2391+#. module: base
2392 #: view:wizard.module.lang.export:0
2393 msgid "Export done"
2394 msgstr ""
2395@@ -452,6 +607,12 @@
2396 msgstr ""
2397
2398 #. module: base
2399+#: code:addons/addons/odms/odms.py:0
2400+#, python-format
2401+msgid "You need to choose a model"
2402+msgstr ""
2403+
2404+#. module: base
2405 #: field:workflow.transition,trigger_expr_id:0
2406 msgid "Trigger Expression"
2407 msgstr ""
2408@@ -462,7 +623,13 @@
2409 msgstr ""
2410
2411 #. module: base
2412-#: code:addons/base/ir/ir_model.py:0
2413+#: code:addons/addons/base_module_quality/terp_test/terp_test.py:0
2414+#, python-format
2415+msgid "Tag Name"
2416+msgstr ""
2417+
2418+#. module: base
2419+#: code:addons/addons/base/ir/ir_model.py:0
2420 #, python-format
2421 msgid "You can not remove the model '%s' !"
2422 msgstr ""
2423@@ -488,9 +655,27 @@
2424 msgstr ""
2425
2426 #. module: base
2427-#: model:ir.actions.act_window,name:base.action_report_custom
2428-#: view:ir.report.custom:0
2429-msgid "Custom Report"
2430+#: code:addons/addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
2431+#, python-format
2432+msgid "You can not sign in from an other date than today"
2433+msgstr ""
2434+
2435+#. module: base
2436+#: code:addons/addons/mrp/mrp.py:0
2437+#, python-format
2438+msgid "from stock: products assigned."
2439+msgstr ""
2440+
2441+#. module: base
2442+#: code:addons/addons/l10n_ch/wizard/bvr_import.py:0
2443+#, python-format
2444+msgid "Too much total record found!"
2445+msgstr ""
2446+
2447+#. module: base
2448+#: code:addons/addons/account_budget/crossovered_budget.py:0
2449+#, python-format
2450+msgid "The General Budget '%s' has no Accounts!"
2451 msgstr ""
2452
2453 #. module: base
2454@@ -504,11 +689,24 @@
2455 msgstr ""
2456
2457 #. module: base
2458+#: code:addons/addons/stock/wizard/wizard_invoice_onshipping.py:0
2459+#, python-format
2460+msgid "Invoice is not created"
2461+msgstr ""
2462+
2463+#. module: base
2464 #: selection:ir.ui.menu,icon:0
2465 msgid "STOCK_INDEX"
2466 msgstr ""
2467
2468 #. module: base
2469+#: code:addons/addons/base_module_quality/pylint_test/pylint_test.py:0
2470+#: code:addons/addons/base_module_quality/structure_test/structure_test.py:0
2471+#, python-format
2472+msgid "File Name"
2473+msgstr ""
2474+
2475+#. module: base
2476 #: model:res.country,name:base.rs
2477 msgid "Serbia"
2478 msgstr ""
2479@@ -532,6 +730,25 @@
2480 msgstr ""
2481
2482 #. module: base
2483+#: code:addons/addons/crm_configuration/wizard/wizard_opportunity_set.py:0
2484+#, python-format
2485+msgid "You did not installed the opportunities tracking when you configured the crm_configuration module.' \\n"
2486+" '\nI can not convert the lead to an opportunity, you must create a section with the code \'oppor\'."
2487+msgstr ""
2488+
2489+#. module: base
2490+#: code:addons/addons/project_gtd/project_gtd.py:0
2491+#, python-format
2492+msgid "Eff. Hours"
2493+msgstr ""
2494+
2495+#. module: base
2496+#: code:addons/addons/document_ics/document.py:0
2497+#, python-format
2498+msgid "You can not set negative Duration."
2499+msgstr ""
2500+
2501+#. module: base
2502 #: selection:ir.ui.menu,icon:0
2503 msgid "STOCK_DIALOG_QUESTION"
2504 msgstr ""
2505@@ -542,6 +759,18 @@
2506 msgstr ""
2507
2508 #. module: base
2509+#: code:addons/addons/odms/wizard/host_status.py:0
2510+#, python-format
2511+msgid "Created by the synchronization wizard"
2512+msgstr ""
2513+
2514+#. module: base
2515+#: code:addons/addons/account/account.py:0
2516+#, python-format
2517+msgid "SAJ"
2518+msgstr ""
2519+
2520+#. module: base
2521 #: model:res.partner.category,name:base.res_partner_category_4
2522 msgid "Basic Partner"
2523 msgstr ""
2524@@ -563,6 +792,12 @@
2525 msgstr ""
2526
2527 #. module: base
2528+#: code:addons/addons/stock/product.py:0
2529+#, python-format
2530+msgid "Futur Deliveries"
2531+msgstr ""
2532+
2533+#. module: base
2534 #: field:res.partner.address,mobile:0
2535 msgid "Mobile"
2536 msgstr ""
2537@@ -610,6 +845,18 @@
2538 msgstr ""
2539
2540 #. module: base
2541+#: code:addons/addons/base_module_quality/speed_test/speed_test.py:0
2542+#, python-format
2543+msgid "Not Efficient"
2544+msgstr ""
2545+
2546+#. module: base
2547+#: code:addons/addons/mrp/report/price.py:0
2548+#, python-format
2549+msgid "TOTAL"
2550+msgstr ""
2551+
2552+#. module: base
2553 #: view:ir.values:0
2554 msgid "client_action_multi, client_action_relate"
2555 msgstr ""
2556@@ -651,11 +898,28 @@
2557 msgstr ""
2558
2559 #. module: base
2560+#: code:addons/addons/account_analytic_plans/account_analytic_plans.py:0
2561+#, python-format
2562+msgid "A model having this name and code already exists !"
2563+msgstr ""
2564+
2565+#. module: base
2566 #: selection:ir.ui.menu,icon:0
2567 msgid "STOCK_FILE"
2568 msgstr ""
2569
2570 #. module: base
2571+#: code:addons/addons/base_module_quality/speed_test/speed_test.py:0
2572+#, python-format
2573+msgid "No enough data"
2574+msgstr ""
2575+
2576+#. module: base
2577+#: field:ir.report.custom.fields,field_child2:0
2578+msgid "Field child2"
2579+msgstr ""
2580+
2581+#. module: base
2582 #: model:res.country,name:base.gu
2583 msgid "Guam (USA)"
2584 msgstr ""
2585@@ -676,6 +940,28 @@
2586 msgstr ""
2587
2588 #. module: base
2589+#: code:addons/addons/l10n_ch/wizard/bvr_import.py:0
2590+#, python-format
2591+msgid "The properties account payable account receivable"
2592+msgstr ""
2593+
2594+#. module: base
2595+#: code:addons/addons/point_of_sale/pos.py:0
2596+#, python-format
2597+msgid "You have to define a Default Credit Account for your Financial Journals!\n"
2598+msgstr ""
2599+
2600+#. module: base
2601+#: field:ir.actions.act_window.view,act_window_id:0
2602+#: view:ir.actions.actions:0
2603+#: field:ir.actions.todo,action_id:0
2604+#: field:ir.ui.menu,action:0
2605+#: field:ir.values,action_id:0
2606+#: selection:ir.values,key:0
2607+msgid "Action"
2608+msgstr ""
2609+
2610+#. module: base
2611 #: selection:ir.actions.server,state:0
2612 #: selection:workflow.activity,kind:0
2613 msgid "Dummy"
2614@@ -687,7 +973,8 @@
2615 msgstr ""
2616
2617 #. module: base
2618-#: code:osv/orm.py:0
2619+#: code:addons/addons/account_analytic_analysis/account_analytic_analysis.py:0
2620+#: code:addons/osv/orm.py:0
2621 #, python-format
2622 msgid "You try to bypass an access rule (Document type: %s)."
2623 msgstr ""
2624@@ -698,8 +985,21 @@
2625 msgstr ""
2626
2627 #. module: base
2628-#: field:ir.rule,operand:0
2629-msgid "Operand"
2630+#: code:addons/report/custom.py:0
2631+#, python-format
2632+msgid "The sum of the data (2nd field) is null.\nWe can't draw a pie chart !"
2633+msgstr ""
2634+
2635+#. module: base
2636+#: code:addons/addons/base_module_quality/speed_test/speed_test.py:0
2637+#, python-format
2638+msgid "<html>O(1) means that the number of SQL requests to read the object does not depand on the number of objects we are reading. This feature is hardly wished.\n</html>"
2639+msgstr ""
2640+
2641+#. module: base
2642+#: code:addons/addons/sale/sale.py:0
2643+#, python-format
2644+msgid "invalid mode for test_state"
2645 msgstr ""
2646
2647 #. module: base
2648@@ -714,6 +1014,13 @@
2649 msgstr ""
2650
2651 #. module: base
2652+#: code:addons/addons/hr_timesheet/report/user_timesheet.py:0
2653+#: code:addons/addons/hr_timesheet/report/users_timesheet.py:0
2654+#, python-format
2655+msgid "September"
2656+msgstr ""
2657+
2658+#. module: base
2659 #: selection:module.lang.install,init,lang:0
2660 msgid "Spanish (AR) / Español (AR)"
2661 msgstr ""
2662@@ -729,6 +1036,12 @@
2663 msgstr ""
2664
2665 #. module: base
2666+#: code:addons/addons/account/account_move_line.py:0
2667+#, python-format
2668+msgid "You can not do this modification on a confirmed entry ! Please note that you can just change some non important fields !"
2669+msgstr ""
2670+
2671+#. module: base
2672 #: model:res.country,name:base.ba
2673 msgid "Bosnia-Herzegovina"
2674 msgstr ""
2675@@ -744,6 +1057,12 @@
2676 msgstr ""
2677
2678 #. module: base
2679+#: code:addons/addons/account_followup/wizard/wizard_followup_print.py:0
2680+#, python-format
2681+msgid "\n\nMail sent to following Partners successfully, !\n\n"
2682+msgstr ""
2683+
2684+#. module: base
2685 #: view:res.lang:0
2686 msgid "%W - Week number of the year (Monday as the first day of the week) as a decimal number [00,53]. All days in a new year preceding the first Monday are considered to be in week 0."
2687 msgstr ""
2688@@ -785,6 +1104,20 @@
2689 msgstr ""
2690
2691 #. module: base
2692+#: code:addons/addons/account/wizard/wizard_pay_invoice.py:0
2693+#: code:addons/addons/odms/odms_invoice.py:0
2694+#, python-format
2695+msgid "Your journal must have a default credit and debit account."
2696+msgstr ""
2697+
2698+#. module: base
2699+#: code:addons/addons/base_module_quality/structure_test/structure_test.py:0
2700+#: code:addons/addons/base_module_quality/workflow_test/workflow_test.py:0
2701+#, python-format
2702+msgid "Module Name"
2703+msgstr ""
2704+
2705+#. module: base
2706 #: selection:ir.ui.menu,icon:0
2707 msgid "STOCK_JUSTIFY_FILL"
2708 msgstr ""
2709@@ -795,6 +1128,12 @@
2710 msgstr ""
2711
2712 #. module: base
2713+#: code:addons/addons/account/account_move_line.py:0
2714+#, python-format
2715+msgid "Bad account!"
2716+msgstr ""
2717+
2718+#. module: base
2719 #: model:res.country,name:base.ht
2720 msgid "Haiti"
2721 msgstr ""
2722@@ -811,17 +1150,35 @@
2723 msgstr ""
2724
2725 #. module: base
2726-#: code:addons/base/ir/ir_report_custom.py:0
2727+#: code:addons/addons/stock/product.py:0
2728+#, python-format
2729+msgid "Received Qty"
2730+msgstr ""
2731+
2732+#. module: base
2733+#: code:addons/addons/base/ir/ir_report_custom.py:0
2734 #, python-format
2735 msgid "Pie charts need exactly two fields"
2736 msgstr ""
2737
2738 #. module: base
2739+#: code:addons/osv/orm.py:0
2740+#, python-format
2741+msgid "Id is not the same than existing one: %s"
2742+msgstr ""
2743+
2744+#. module: base
2745 #: help:wizard.module.lang.export,lang:0
2746 msgid "To export a new language, do not select a language."
2747 msgstr ""
2748
2749 #. module: base
2750+#: code:addons/addons/project/wizard/close_task.py:0
2751+#, python-format
2752+msgid "Couldn't send mail because your email address is not configured!"
2753+msgstr ""
2754+
2755+#. module: base
2756 #: model:res.country,name:base.md
2757 msgid "Moldavia"
2758 msgstr ""
2759@@ -832,9 +1189,27 @@
2760 msgstr ""
2761
2762 #. module: base
2763+<<<<<<< TREE
2764 #: rml:ir.module.reference:0
2765 #: field:maintenance.contract.module,version:0
2766 msgid "Version"
2767+=======
2768+#: code:addons/addons/account/account_move_line.py:0
2769+#: code:addons/addons/account/invoice.py:0
2770+#, python-format
2771+msgid "No Analytic Journal !"
2772+msgstr ""
2773+
2774+#. module: base
2775+#: code:addons/addons/mrp/report/price.py:0
2776+#, python-format
2777+msgid "Unit Product Price"
2778+msgstr ""
2779+
2780+#. module: base
2781+#: field:ir.report.custom,frequency:0
2782+msgid "Frequency"
2783+>>>>>>> MERGE-SOURCE
2784 msgstr ""
2785
2786 #. module: base
2787@@ -891,14 +1266,21 @@
2788 msgstr ""
2789
2790 #. module: base
2791+#: code:addons/addons/mrp/wizard/wizard_change_production_qty.py:0
2792+#, python-format
2793+msgid "The production is in \"%s\" state. You can not change the production quantity anymore"
2794+msgstr ""
2795+
2796+#. module: base
2797 #: rml:ir.module.reference:0
2798 msgid "-"
2799 msgstr ""
2800
2801 #. module: base
2802-#: code:osv/orm.py:0
2803+#: code:addons/addons/auction/wizard/wizard_aie_send.py:0
2804+#: code:addons/addons/auction/wizard/wizard_aie_send_result.py:0
2805 #, python-format
2806-msgid "The search method is not implemented on this object !"
2807+msgid "Connection to WWW.Auction-in-Europe.com failed !"
2808 msgstr ""
2809
2810 #. module: base
2811@@ -914,8 +1296,14 @@
2812 msgstr ""
2813
2814 #. module: base
2815-#: view:res.lang:0
2816-msgid "Examples"
2817+#: model:ir.model,name:base.model_ir_exports_line
2818+msgid "ir.exports.line"
2819+msgstr ""
2820+
2821+#. module: base
2822+#: code:addons/addons/mrp/mrp.py:0
2823+#, python-format
2824+msgid "Cannot delete Production Order(s) which are in %s State!"
2825 msgstr ""
2826
2827 #. module: base
2828@@ -934,8 +1322,15 @@
2829 msgstr ""
2830
2831 #. module: base
2832-#: field:ir.default,value:0
2833-msgid "Default Value"
2834+#: code:addons/addons/crm/crm.py:0
2835+#, python-format
2836+msgid "No E-Mail ID Found for your Company address or missing reply address in section!"
2837+msgstr ""
2838+
2839+#. module: base
2840+#: code:addons/addons/base_module_quality/speed_test/speed_test.py:0
2841+#, python-format
2842+msgid "O(1)"
2843 msgstr ""
2844
2845 #. module: base
2846@@ -945,6 +1340,11 @@
2847 msgstr ""
2848
2849 #. module: base
2850+#: model:ir.model,name:base.model_ir_sequence_type
2851+msgid "ir.sequence.type"
2852+msgstr ""
2853+
2854+#. module: base
2855 #: view:maintenance.contract:0
2856 #: field:maintenance.contract,module_ids:0
2857 msgid "Covered Modules"
2858@@ -956,6 +1356,18 @@
2859 msgstr ""
2860
2861 #. module: base
2862+#: code:addons/addons/base/ir/ir_model.py:0
2863+#, python-format
2864+msgid "Model %s Does not Exist !"
2865+msgstr ""
2866+
2867+#. module: base
2868+#: code:addons/addons/point_of_sale/wizard/wizard_get_sale.py:0
2869+#, python-format
2870+msgid "You can't modify this order. It has already been paid"
2871+msgstr ""
2872+
2873+#. module: base
2874 #: model:ir.model,name:base.model_res_request_link
2875 msgid "res.request.link"
2876 msgstr ""
2877@@ -988,16 +1400,44 @@
2878 msgstr ""
2879
2880 #. module: base
2881+#: code:addons/addons/base_module_quality/method_test/method_test.py:0
2882+#, python-format
2883+msgid "Method Test"
2884+msgstr ""
2885+
2886+#. module: base
2887 #: field:res.currency,accuracy:0
2888 msgid "Computational Accuracy"
2889 msgstr ""
2890
2891 #. module: base
2892+#: code:addons/addons/account/wizard/wizard_account_balance_report.py:0
2893+#: code:addons/addons/account/wizard/wizard_general_ledger_report.py:0
2894+#: code:addons/addons/account/wizard/wizard_partner_balance_report.py:0
2895+#: code:addons/addons/account/wizard/wizard_third_party_ledger.py:0
2896+#, python-format
2897+msgid "Date to must be set between %s and %s"
2898+msgstr ""
2899+
2900+#. module: base
2901 #: model:res.country,name:base.kg
2902 msgid "Kyrgyz Republic (Kyrgyzstan)"
2903 msgstr ""
2904
2905 #. module: base
2906+#: code:addons/addons/product/product.py:0
2907+#: code:addons/addons/stock/product.py:0
2908+#, python-format
2909+msgid "Products: "
2910+msgstr ""
2911+
2912+#. module: base
2913+#: code:addons/addons/l10n_ch/wizard/dta_wizard.py:0
2914+#, python-format
2915+msgid "No bank account for the company."
2916+msgstr ""
2917+
2918+#. module: base
2919 #: model:ir.model,name:base.model_wizard_ir_model_menu_create_line
2920 msgid "wizard.ir.model.menu.create.line"
2921 msgstr ""
2922@@ -1008,22 +1448,45 @@
2923 msgstr ""
2924
2925 #. module: base
2926+#: code:addons/addons/account/account.py:0
2927+#, python-format
2928+msgid "You can not modify/delete a journal with entries for this period !"
2929+msgstr ""
2930+
2931+#. module: base
2932 #: view:ir.sequence:0
2933 msgid "Day: %(day)s"
2934 msgstr ""
2935
2936 #. module: base
2937-#: code:addons/base/ir/ir_model.py:0
2938+#: code:addons/addons/base/ir/ir_model.py:0
2939 #, python-format
2940 msgid "You can not read this document! (%s)"
2941 msgstr ""
2942
2943 #. module: base
2944+#: code:addons/addons/hr_timesheet/hr_timesheet.py:0
2945+#, python-format
2946+msgid "UnknownError"
2947+msgstr ""
2948+
2949+#. module: base
2950 #: selection:ir.ui.menu,icon:0
2951 msgid "STOCK_FIND_AND_REPLACE"
2952 msgstr ""
2953
2954 #. module: base
2955+#: code:addons/osv/orm.py:0
2956+#, python-format
2957+msgid "Relation not found: %s on '%s'"
2958+msgstr ""
2959+
2960+#. module: base
2961+#: selection:ir.ui.menu,icon:0
2962+msgid "terp-crm"
2963+msgstr ""
2964+
2965+#. module: base
2966 #: model:res.country,name:base.mv
2967 msgid "Maldives"
2968 msgstr ""
2969@@ -1039,8 +1502,17 @@
2970 msgstr ""
2971
2972 #. module: base
2973-#: selection:ir.cron,interval_type:0
2974-msgid "Days"
2975+#: code:addons/addons/odms/odms.py:0
2976+#, python-format
2977+msgid "Invalid Region"
2978+msgstr ""
2979+
2980+#. module: base
2981+#: code:addons/addons/base_module_quality/object_test/object_test.py:0
2982+#, python-format
2983+msgid "\"\"\n"
2984+"Test checks for fields, views, security rules, dependancy level\n"
2985+"\"\""
2986 msgstr ""
2987
2988 #. module: base
2989@@ -1054,25 +1526,25 @@
2990 msgstr ""
2991
2992 #. module: base
2993-#: code:addons/base/module/module.py:0
2994-#, python-format
2995-msgid "Some installed modules depends on the module you plan to desinstall :\n %s"
2996-msgstr ""
2997-
2998-#. module: base
2999 #: selection:ir.ui.menu,icon:0
3000 msgid "STOCK_YES"
3001 msgstr ""
3002
3003 #. module: base
3004+#: code:addons/addons/stock/product.py:0
3005+#, python-format
3006+msgid "P&L Qty"
3007+msgstr ""
3008+
3009+#. module: base
3010 #: model:ir.actions.act_window,name:base.ir_action_report_custom
3011 #: model:ir.ui.menu,name:base.menu_ir_action_report_custom
3012 msgid "Report Custom"
3013 msgstr ""
3014
3015 #. module: base
3016-#: view:ir.sequence:0
3017-msgid "Year without century: %(y)s"
3018+#: model:res.country,name:base.tm
3019+msgid "Turkmenistan"
3020 msgstr ""
3021
3022 #. module: base
3023@@ -1104,6 +1576,12 @@
3024 msgstr ""
3025
3026 #. module: base
3027+#: code:addons/addons/odms/portal.py:0
3028+#, python-format
3029+msgid "unable to find a server"
3030+msgstr ""
3031+
3032+#. module: base
3033 #: model:ir.model,name:base.model_ir_model_access
3034 msgid "ir.model.access"
3035 msgstr ""
3036@@ -1117,6 +1595,12 @@
3037 msgstr ""
3038
3039 #. module: base
3040+#: code:addons/addons/odms/odms.py:0
3041+#, python-format
3042+msgid "Missing info: Subscription"
3043+msgstr ""
3044+
3045+#. module: base
3046 #: field:workflow.transition,act_from:0
3047 msgid "Source Activity"
3048 msgstr ""
3049@@ -1127,12 +1611,12 @@
3050 msgstr ""
3051
3052 #. module: base
3053-#: selection:ir.server.object.lines,type:0
3054-msgid "Formula"
3055+#: view:res.request:0
3056+msgid "Reply"
3057 msgstr ""
3058
3059 #. module: base
3060-#: code:addons/base/res/res_user.py:0
3061+#: code:addons/addons/base/res/res_user.py:0
3062 #, python-format
3063 msgid "Can not remove root user!"
3064 msgstr ""
3065@@ -1163,6 +1647,12 @@
3066 msgstr ""
3067
3068 #. module: base
3069+#: code:addons/addons/stock/wizard/wizard_track_line.py:0
3070+#, python-format
3071+msgid "No production sequence defined"
3072+msgstr ""
3073+
3074+#. module: base
3075 #: view:res.request:0
3076 msgid "References"
3077 msgstr ""
3078@@ -1207,7 +1697,13 @@
3079 msgstr ""
3080
3081 #. module: base
3082-#: code:osv/fields.py:0
3083+#: code:addons/addons/mrp/report/price.py:0
3084+#, python-format
3085+msgid "Product Cost Structure"
3086+msgstr ""
3087+
3088+#. module: base
3089+#: code:addons/osv/fields.py:0
3090 #, python-format
3091 msgid "Not implemented search_memory method !"
3092 msgstr ""
3093@@ -1218,6 +1714,13 @@
3094 msgstr ""
3095
3096 #. module: base
3097+#: code:addons/addons/point_of_sale/pos.py:0
3098+#, python-format
3099+msgid "There is no receivable account defined for this journal:'\\n"
3100+" ' \"%s\" (id:%d)"
3101+msgstr ""
3102+
3103+#. module: base
3104 #: field:res.company,logo:0
3105 msgid "Logo"
3106 msgstr ""
3107@@ -1228,8 +1731,9 @@
3108 msgstr ""
3109
3110 #. module: base
3111-#: view:ir.module.module:0
3112-msgid "Uninstall (beta)"
3113+#: code:addons/addons/account/wizard/wizard_fiscalyear_close.py:0
3114+#, python-format
3115+msgid "The journal must have centralised counterpart"
3116 msgstr ""
3117
3118 #. module: base
3119@@ -1239,6 +1743,12 @@
3120 msgstr ""
3121
3122 #. module: base
3123+#: code:addons/addons/odms/odms.py:0
3124+#, python-format
3125+msgid "Unable to create your control center user"
3126+msgstr ""
3127+
3128+#. module: base
3129 #: model:res.country,name:base.bs
3130 msgid "Bahamas"
3131 msgstr ""
3132@@ -1249,7 +1759,7 @@
3133 msgstr ""
3134
3135 #. module: base
3136-#: code:addons/base/res/partner/partner.py:0
3137+#: code:addons/addons/base/res/partner/partner.py:0
3138 #, python-format
3139 msgid "Couldn't generate the next id because some partners have an alphabetic id !"
3140 msgstr ""
3141@@ -1265,17 +1775,28 @@
3142 msgstr ""
3143
3144 #. module: base
3145+#: view:ir.sequence:0
3146+msgid "Year without century: %(y)s"
3147+msgstr ""
3148+
3149+#. module: base
3150 #: wizard_field:module.module.update,update,update:0
3151 msgid "Number of modules updated"
3152 msgstr ""
3153
3154 #. module: base
3155-#: code:osv/fields.py:0
3156+#: code:addons/osv/fields.py:0
3157 #, python-format
3158 msgid "Not implemented set_memory method !"
3159 msgstr ""
3160
3161 #. module: base
3162+#: code:addons/addons/hr_attendance/wizard/sign_in_out.py:0
3163+#, python-format
3164+msgid "A sign-out must be right after a sign-in !"
3165+msgstr ""
3166+
3167+#. module: base
3168 #: field:ir.actions.act_window,groups_id:0
3169 #: model:ir.actions.act_window,name:base.action_res_groups
3170 #: field:ir.actions.report.xml,groups_id:0
3171@@ -1292,11 +1813,23 @@
3172 msgstr ""
3173
3174 #. module: base
3175+#: code:addons/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
3176+#, python-format
3177+msgid "Please fill in the Address field in the Partner: %s."
3178+msgstr ""
3179+
3180+#. module: base
3181 #: model:res.country,name:base.bz
3182 msgid "Belize"
3183 msgstr ""
3184
3185 #. module: base
3186+#: code:addons/addons/stock/stock.py:0
3187+#, python-format
3188+msgid "Error, no partner !"
3189+msgstr ""
3190+
3191+#. module: base
3192 #: model:res.country,name:base.ge
3193 msgid "Georgia"
3194 msgstr ""
3195@@ -1313,8 +1846,8 @@
3196 msgstr ""
3197
3198 #. module: base
3199-#: field:ir.values,meta:0
3200-msgid "Meta Datas"
3201+#: view:maintenance.contract.wizard:0
3202+msgid "Maintenance contract added !"
3203 msgstr ""
3204
3205 #. module: base
3206@@ -1323,19 +1856,17 @@
3207 msgstr ""
3208
3209 #. module: base
3210+#: code:addons/addons/odms/odms.py:0
3211+#, python-format
3212+msgid "The region should be in "
3213+msgstr ""
3214+
3215+#. module: base
3216 #: help:ir.actions.server,expression:0
3217 msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
3218 msgstr ""
3219
3220 #. module: base
3221-#: field:ir.model,name:0
3222-#: field:ir.model.fields,model:0
3223-#: field:ir.model.grid,name:0
3224-#: field:ir.values,model:0
3225-msgid "Object Name"
3226-msgstr ""
3227-
3228-#. module: base
3229 #: selection:ir.translation,type:0
3230 msgid "Wizard Field"
3231 msgstr ""
3232@@ -1351,6 +1882,12 @@
3233 msgstr ""
3234
3235 #. module: base
3236+#: code:addons/addons/point_of_sale/pos.py:0
3237+#, python-format
3238+msgid "Cannot delete a point of sale which is already confirmed !"
3239+msgstr ""
3240+
3241+#. module: base
3242 #: model:res.country,name:base.st
3243 msgid "Saint Tome (Sao Tome) and Principe"
3244 msgstr ""
3245@@ -1381,8 +1918,8 @@
3246 msgstr ""
3247
3248 #. module: base
3249-#: field:ir.actions.configuration.wizard,name:0
3250-msgid "Next Wizard"
3251+#: help:ir.rule.group,global:0
3252+msgid "Make the rule global, otherwise it needs to be put on a group"
3253 msgstr ""
3254
3255 #. module: base
3256@@ -1409,12 +1946,10 @@
3257 msgstr ""
3258
3259 #. module: base
3260-#: selection:ir.report.custom.fields,fc0_op:0
3261-#: selection:ir.report.custom.fields,fc1_op:0
3262-#: selection:ir.report.custom.fields,fc2_op:0
3263-#: selection:ir.report.custom.fields,fc3_op:0
3264-#: selection:ir.rule,operator:0
3265-msgid "in"
3266+#: code:addons/addons/stock/stock.py:0
3267+#, python-format
3268+msgid "There is no journal defined '\\n"
3269+" 'on the product category: \"%s\" (id: %d)"
3270 msgstr ""
3271
3272 #. module: base
3273@@ -1433,19 +1968,33 @@
3274 msgstr ""
3275
3276 #. module: base
3277-#: code:addons/base/ir/ir_report_custom.py:0
3278+#: code:addons/addons/base/ir/ir_report_custom.py:0
3279 #, python-format
3280 msgid "Enter at least one field !"
3281 msgstr ""
3282
3283 #. module: base
3284+#: code:addons/addons/l10n_ch/wizard/dta_wizard.py:0
3285+#, python-format
3286+msgid "No bank defined\n' \\n"
3287+" 'for the bank account: %s\n' \\n"
3288+" 'on the partner: %s\n' \\n"
3289+" 'on line: %s"
3290+msgstr ""
3291+
3292+#. module: base
3293+#: model:res.country,name:base.ve
3294+msgid "Venezuela"
3295+msgstr ""
3296+
3297+#. module: base
3298 #: field:ir.ui.view_sc,name:0
3299 msgid "Shortcut Name"
3300 msgstr ""
3301
3302 #. module: base
3303-#: field:res.partner,credit_limit:0
3304-msgid "Credit Limit"
3305+#: help:ir.actions.act_window,limit:0
3306+msgid "Default limit for the list view"
3307 msgstr ""
3308
3309 #. module: base
3310@@ -1475,7 +2024,7 @@
3311 msgstr ""
3312
3313 #. module: base
3314-#: code:addons/base/ir/ir_model.py:0
3315+#: code:addons/addons/base/ir/ir_model.py:0
3316 #, python-format
3317 msgid "You can not write in this document! (%s)"
3318 msgstr ""
3319@@ -1487,6 +2036,12 @@
3320 msgstr ""
3321
3322 #. module: base
3323+#: code:addons/addons/account/account_move_line.py:0
3324+#, python-format
3325+msgid "The account is not defined to be reconciled !"
3326+msgstr ""
3327+
3328+#. module: base
3329 #: model:res.country,name:base.tt
3330 msgid "Trinidad and Tobago"
3331 msgstr ""
3332@@ -1507,6 +2062,12 @@
3333 msgstr ""
3334
3335 #. module: base
3336+#: code:addons/addons/product_margin/wizard/wizard_product_margin.py:0
3337+#, python-format
3338+msgid "Product Margins"
3339+msgstr ""
3340+
3341+#. module: base
3342 #: model:ir.ui.menu,name:base.menu_custom
3343 msgid "Customization"
3344 msgstr ""
3345@@ -1517,6 +2078,12 @@
3346 msgstr ""
3347
3348 #. module: base
3349+#: code:addons/addons/account/account_move_line.py:0
3350+#, python-format
3351+msgid "You have to provide an account for the write off entry !"
3352+msgstr ""
3353+
3354+#. module: base
3355 #: selection:ir.report.custom.fields,alignment:0
3356 msgid "left"
3357 msgstr ""
3358@@ -1537,33 +2104,82 @@
3359 msgstr ""
3360
3361 #. module: base
3362+#: code:addons/addons/crm_configuration/wizard/wizard_partner_create.py:0
3363+#, python-format
3364+msgid "A partner is already defined on this lead."
3365+msgstr ""
3366+
3367+#. module: base
3368+#: code:addons/addons/project/wizard/task_delegate.py:0
3369+#, python-format
3370+msgid "CHECK: "
3371+msgstr ""
3372+
3373+#. module: base
3374 #: selection:ir.ui.menu,icon:0
3375 msgid "STOCK_PRINT_PREVIEW"
3376 msgstr ""
3377
3378 #. module: base
3379-#: code:osv/orm.py:0
3380+#: code:addons/osv/orm.py:0
3381 #, python-format
3382 msgid "The perm_read method is not implemented on this object !"
3383 msgstr ""
3384
3385 #. module: base
3386+#: code:addons/addons/stock/wizard/wizard_inventory.py:0
3387+#, python-format
3388+msgid "Message !"
3389+msgstr ""
3390+
3391+#. module: base
3392 #: model:res.country,name:base.si
3393 msgid "Slovenia"
3394 msgstr ""
3395
3396 #. module: base
3397+#: code:addons/addons/project_timesheet/project_timesheet.py:0
3398+#, python-format
3399+msgid "No journal defined on the related employee.\nFill in the timesheet tab of the employee form."
3400+msgstr ""
3401+
3402+#. module: base
3403 #: view:res.partner.canal:0
3404 #: field:res.partner.event,canal_id:0
3405 msgid "Channel"
3406 msgstr ""
3407
3408 #. module: base
3409+#: code:addons/addons/crm/crm.py:0
3410+#, python-format
3411+msgid "You can not escalate this case.\nYou are already at the top level."
3412+msgstr ""
3413+
3414+#. module: base
3415+#: code:addons/addons/account_budget/crossovered_budget.py:0
3416+#: code:addons/addons/crm/crm.py:0
3417+#: code:addons/addons/document/document.py:0
3418+#: code:addons/addons/event/event.py:0
3419+#: code:addons/addons/mrp_operations/mrp_operations.py:0
3420+#: code:addons/addons/odms/odms_invoice.py:0
3421+#: code:addons/addons/stock/stock.py:0
3422+#: code:addons/addons/stock/wizard/wizard_track_line.py:0
3423+#, python-format
3424+msgid "Error!"
3425+msgstr ""
3426+
3427+#. module: base
3428 #: view:res.lang:0
3429 msgid "%p - Equivalent of either AM or PM."
3430 msgstr ""
3431
3432 #. module: base
3433+#: code:addons/addons/base_module_quality/terp_test/terp_test.py:0
3434+#, python-format
3435+msgid "Terp Test"
3436+msgstr ""
3437+
3438+#. module: base
3439 #: view:ir.actions.server:0
3440 msgid "Iteration Actions"
3441 msgstr ""
3442@@ -1584,16 +2200,44 @@
3443 msgstr ""
3444
3445 #. module: base
3446+#: code:addons/addons/account/wizard/wizard_account_balance_report.py:0
3447+#: code:addons/addons/account/wizard/wizard_general_ledger_report.py:0
3448+#: code:addons/addons/account/wizard/wizard_partner_balance_report.py:0
3449+#: code:addons/addons/account/wizard/wizard_third_party_ledger.py:0
3450+#, python-format
3451+msgid "Date not in a defined fiscal year"
3452+msgstr ""
3453+
3454+#. module: base
3455 #: model:res.country,name:base.nf
3456 msgid "Norfolk Island"
3457 msgstr ""
3458
3459 #. module: base
3460+#: code:addons/addons/delivery/delivery.py:0
3461+#, python-format
3462+msgid "No line matched this order in the choosed delivery grids !"
3463+msgstr ""
3464+
3465+#. module: base
3466 #: selection:ir.ui.menu,icon:0
3467 msgid "STOCK_MEDIA_PLAY"
3468 msgstr ""
3469
3470 #. module: base
3471+#: code:addons/addons/odms/odms.py:0
3472+#, python-format
3473+msgid "You can't delete this server because it acts as backup for other servers."
3474+msgstr ""
3475+
3476+#. module: base
3477+#: code:addons/addons/account/account_move_line.py:0
3478+#, python-format
3479+msgid "The account move (%s) for centralisation ' \\n"
3480+" 'has been confirmed!"
3481+msgstr ""
3482+
3483+#. module: base
3484 #: field:ir.rule,operator:0
3485 msgid "Operator"
3486 msgstr ""
3487@@ -1604,6 +2248,12 @@
3488 msgstr ""
3489
3490 #. module: base
3491+#: code:addons/addons/odms/odms.py:0
3492+#, python-format
3493+msgid "Registration of your account"
3494+msgstr ""
3495+
3496+#. module: base
3497 #: selection:ir.ui.menu,icon:0
3498 msgid "STOCK_OPEN"
3499 msgstr ""
3500@@ -1615,6 +2265,12 @@
3501 msgstr ""
3502
3503 #. module: base
3504+#: code:addons/addons/sale/wizard/make_invoice_advance.py:0
3505+#, python-format
3506+msgid "You cannot make an advance on a sale order that is defined as 'Automatic Invoice after delivery'."
3507+msgstr ""
3508+
3509+#. module: base
3510 #: selection:ir.report.custom.fields,alignment:0
3511 msgid "right"
3512 msgstr ""
3513@@ -1630,17 +2286,35 @@
3514 msgstr ""
3515
3516 #. module: base
3517+#: code:addons/addons/account/account_bank_statement.py:0
3518+#, python-format
3519+msgid "Please verify that an account is defined in the journal."
3520+msgstr ""
3521+
3522+#. module: base
3523 #: selection:maintenance.contract,state:0
3524 msgid "Valid"
3525 msgstr ""
3526
3527 #. module: base
3528-#: code:addons/base/ir/ir_model.py:0
3529+#: code:addons/addons/base/ir/ir_model.py:0
3530 #, python-format
3531 msgid "You can not delete this document! (%s)"
3532 msgstr ""
3533
3534 #. module: base
3535+#: code:addons/addons/l10n_ch/wizard/dta_wizard.py:0
3536+#, python-format
3537+msgid "You must provide a Clearing Number for your bank account."
3538+msgstr ""
3539+
3540+#. module: base
3541+#: code:addons/addons/purchase/purchase.py:0
3542+#, python-format
3543+msgid "No Partner!"
3544+msgstr ""
3545+
3546+#. module: base
3547 #: selection:ir.translation,type:0
3548 msgid "XSL"
3549 msgstr ""
3550@@ -1652,7 +2326,7 @@
3551 msgstr ""
3552
3553 #. module: base
3554-#: code:addons/base/module/module.py:0
3555+#: code:addons/addons/base/module/module.py:0
3556 #, python-format
3557 msgid "Can not upgrade module '%s'. It is not installed."
3558 msgstr ""
3559@@ -1673,6 +2347,24 @@
3560 msgstr ""
3561
3562 #. module: base
3563+#: code:addons/addons/odms/odms.py:0
3564+#, python-format
3565+msgid "Missing info: Test Instance"
3566+msgstr ""
3567+
3568+#. module: base
3569+#: code:addons/addons/point_of_sale/pos.py:0
3570+#, python-format
3571+msgid "Unable to create invoice (partner has no address)."
3572+msgstr ""
3573+
3574+#. module: base
3575+#: code:addons/addons/stock/wizard/inventory_merge_zero.py:0
3576+#, python-format
3577+msgid "Please select one and only one inventory !"
3578+msgstr ""
3579+
3580+#. module: base
3581 #: view:ir.sequence:0
3582 msgid "Year with century: %(year)s"
3583 msgstr ""
3584@@ -1711,6 +2403,16 @@
3585 msgstr ""
3586
3587 #. module: base
3588+#: code:addons/addons/account/wizard/wizard_central_journal.py:0
3589+#: code:addons/addons/account/wizard/wizard_general_journal.py:0
3590+#: code:addons/addons/account/wizard/wizard_print_journal.py:0
3591+#: code:addons/addons/account/wizard/wizard_third_party_ledger.py:0
3592+#: code:addons/addons/hr_attendance/wizard/print_attendance_error.py:0
3593+#, python-format
3594+msgid "No Data Available"
3595+msgstr ""
3596+
3597+#. module: base
3598 #: view:ir.actions.server:0
3599 msgid "Iteration Action Configuration"
3600 msgstr ""
3601@@ -1728,6 +2430,18 @@
3602 msgstr ""
3603
3604 #. module: base
3605+#: code:addons/addons/account/account.py:0
3606+#, python-format
3607+msgid "No fiscal year defined for this date !\nPlease create one."
3608+msgstr ""
3609+
3610+#. module: base
3611+#: code:addons/addons/account/wizard/wizard_validate_account_move.py:0
3612+#, python-format
3613+msgid "Selected Move lines does not have any account move enties in draft state"
3614+msgstr ""
3615+
3616+#. module: base
3617 #: field:workflow.activity,signal_send:0
3618 msgid "Signal (subflow.*)"
3619 msgstr ""
3620@@ -1743,7 +2457,9 @@
3621 msgstr ""
3622
3623 #. module: base
3624+#: code:addons/addons/crm/crm.py:0
3625 #: selection:maintenance.contract.wizard,state:0
3626+#, python-format
3627 msgid "Draft"
3628 msgstr ""
3629
3630@@ -1787,6 +2503,12 @@
3631 msgstr ""
3632
3633 #. module: base
3634+#: code:addons/addons/auction/auction.py:0
3635+#, python-format
3636+msgid "Missed Address !"
3637+msgstr ""
3638+
3639+#. module: base
3640 #: field:ir.report.custom.fields,bgcolor:0
3641 msgid "Background Color"
3642 msgstr ""
3643@@ -1797,6 +2519,13 @@
3644 msgstr ""
3645
3646 #. module: base
3647+#: code:addons/addons/hr_timesheet/report/user_timesheet.py:0
3648+#: code:addons/addons/hr_timesheet/report/users_timesheet.py:0
3649+#, python-format
3650+msgid "January"
3651+msgstr ""
3652+
3653+#. module: base
3654 #: field:res.partner.address,birthdate:0
3655 msgid "Birthdate"
3656 msgstr ""
3657@@ -1818,6 +2547,13 @@
3658 msgstr ""
3659
3660 #. module: base
3661+#: code:addons/addons/point_of_sale/report/pos_invoice.py:0
3662+#: code:addons/addons/point_of_sale/wizard/wizard_pos_payment.py:0
3663+#, python-format
3664+msgid "Please create an invoice for this sale."
3665+msgstr ""
3666+
3667+#. module: base
3668 #: field:ir.model.fields,select_level:0
3669 msgid "Searchable"
3670 msgstr ""
3671@@ -1863,11 +2599,23 @@
3672 msgstr ""
3673
3674 #. module: base
3675+#: code:addons/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
3676+#, python-format
3677+msgid "Balance product needed"
3678+msgstr ""
3679+
3680+#. module: base
3681 #: model:res.partner.title,name:base.res_partner_title_sir
3682 msgid "Sir"
3683 msgstr ""
3684
3685 #. module: base
3686+#: code:addons/addons/base_module_quality/object_test/object_test.py:0
3687+#, python-format
3688+msgid "Result of dependancy in %"
3689+msgstr ""
3690+
3691+#. module: base
3692 #: wizard_button:module.upgrade,next,start:0
3693 msgid "Start Upgrade"
3694 msgstr ""
3695@@ -1883,6 +2631,12 @@
3696 msgstr ""
3697
3698 #. module: base
3699+#: code:addons/addons/mrp/report/price.py:0
3700+#, python-format
3701+msgid "Product supplier"
3702+msgstr ""
3703+
3704+#. module: base
3705 #: model:res.country,name:base.mt
3706 msgid "Malta"
3707 msgstr ""
3708@@ -1902,6 +2656,12 @@
3709 msgstr ""
3710
3711 #. module: base
3712+#: code:addons/addons/odms/odms.py:0
3713+#, python-format
3714+msgid "Configuration of the server"
3715+msgstr ""
3716+
3717+#. module: base
3718 #: field:ir.attachment,description:0
3719 #: field:ir.module.module,description:0
3720 #: field:res.partner.bank,name:0
3721@@ -1912,8 +2672,24 @@
3722 msgstr ""
3723
3724 #. module: base
3725-#: model:ir.model,name:base.model_ir_attachment
3726-msgid "ir.attachment"
3727+#: code:addons/addons/l10n_ch/wizard/dta_wizard.py:0
3728+#, python-format
3729+msgid "You must provide ' \\n"
3730+" 'a bank number \n' \\n"
3731+" 'for the partner bank: %s\n' \\n"
3732+" 'on line: %s"
3733+msgstr ""
3734+
3735+#. module: base
3736+#: code:addons/addons/account_analytic_plans/account_analytic_plans.py:0
3737+#, python-format
3738+msgid "Value Error"
3739+msgstr ""
3740+
3741+#. module: base
3742+#: code:addons/addons/use_control/module.py:0
3743+#, python-format
3744+msgid "You are not authorized to copy module repositories"
3745 msgstr ""
3746
3747 #. module: base
3748@@ -1927,6 +2703,12 @@
3749 msgstr ""
3750
3751 #. module: base
3752+#: code:addons/addons/delivery/stock.py:0
3753+#, python-format
3754+msgid "The carrier %s (id: %d) has no delivery grid!"
3755+msgstr ""
3756+
3757+#. module: base
3758 #: view:wizard.module.lang.export:0
3759 msgid "Export language"
3760 msgstr ""
3761@@ -1958,6 +2740,7 @@
3762 msgstr ""
3763
3764 #. module: base
3765+<<<<<<< TREE
3766 #: code:addons/base/maintenance/maintenance.py:0
3767 #, python-format
3768 msgid "Unable to find a valid contract"
3769@@ -1965,6 +2748,15 @@
3770
3771 #. module: base
3772 #: code:addons/base/ir/ir_actions.py:0
3773+=======
3774+#: code:addons/addons/base/maintenance/maintenance.py:0
3775+#, python-format
3776+msgid "Unable to find a valid contract"
3777+msgstr ""
3778+
3779+#. module: base
3780+#: code:addons/addons/base/ir/ir_actions.py:0
3781+>>>>>>> MERGE-SOURCE
3782 #, python-format
3783 msgid "Please specify an action to launch !"
3784 msgstr ""
3785@@ -1986,6 +2778,12 @@
3786 msgstr ""
3787
3788 #. module: base
3789+#: code:addons/addons/document/document.py:0
3790+#, python-format
3791+msgid "File name must be unique!"
3792+msgstr ""
3793+
3794+#. module: base
3795 #: view:res.payterm:0
3796 msgid "Payment Term"
3797 msgstr ""
3798@@ -2001,7 +2799,13 @@
3799 msgstr ""
3800
3801 #. module: base
3802-#: code:osv/orm.py:0
3803+#: code:addons/addons/crm/crm.py:0
3804+#, python-format
3805+msgid "Open"
3806+msgstr ""
3807+
3808+#. module: base
3809+#: code:addons/osv/orm.py:0
3810 #, python-format
3811 msgid "Please check that all your lines have %d columns."
3812 msgstr ""
3813@@ -2012,6 +2816,12 @@
3814 msgstr ""
3815
3816 #. module: base
3817+#: code:addons/addons/mrp_repair/mrp_repair.py:0
3818+#, python-format
3819+msgid "No partner !"
3820+msgstr ""
3821+
3822+#. module: base
3823 #: model:ir.actions.act_window,name:base.ir_cron_act
3824 #: view:ir.cron:0
3825 #: model:ir.ui.menu,name:base.menu_ir_cron_act
3826@@ -2026,9 +2836,21 @@
3827 msgstr ""
3828
3829 #. module: base
3830+<<<<<<< TREE
3831 #: code:osv/orm.py:0
3832 #, python-format
3833 msgid "Recursivity Detected."
3834+=======
3835+#: code:addons/addons/mrp_operations/mrp_operations.py:0
3836+#, python-format
3837+msgid "Production Order Cannot start in [%s] state"
3838+msgstr ""
3839+
3840+#. module: base
3841+#: code:addons/osv/orm.py:0
3842+#, python-format
3843+msgid "Recursivity Detected."
3844+>>>>>>> MERGE-SOURCE
3845 msgstr ""
3846
3847 #. module: base
3848@@ -2037,7 +2859,8 @@
3849 msgstr ""
3850
3851 #. module: base
3852-#: code:addons/base/module/module.py:0
3853+#: code:addons/addons/base/module/module.py:0
3854+#: code:addons/addons/base_module_merge/wizard/base_module_merge.py:0
3855 #, python-format
3856 msgid "Recursion error in modules dependencies !"
3857 msgstr ""
3858@@ -2074,8 +2897,8 @@
3859 msgstr ""
3860
3861 #. module: base
3862-#: model:res.country,name:base.dm
3863-msgid "Dominica"
3864+#: field:res.company,name:0
3865+msgid "Company Name"
3866 msgstr ""
3867
3868 #. module: base
3869@@ -2099,8 +2922,21 @@
3870 msgstr ""
3871
3872 #. module: base
3873-#: field:res.partner,vat:0
3874-msgid "VAT"
3875+#: code:addons/addons/odms/odms.py:0
3876+#, python-format
3877+msgid "Checking your Promotional Code"
3878+msgstr ""
3879+
3880+#. module: base
3881+#: code:addons/addons/hr_attendance/hr_attendance.py:0
3882+#, python-format
3883+msgid "You tried to sign with a date anterior to another event !\nTry to contact the administrator to correct attendances."
3884+msgstr ""
3885+
3886+#. module: base
3887+#: code:addons/addons/purchase/purchase.py:0
3888+#, python-format
3889+msgid "You must first cancel all invoices attached to this purchase order."
3890 msgstr ""
3891
3892 #. module: base
3893@@ -2137,12 +2973,23 @@
3894 msgstr ""
3895
3896 #. module: base
3897+#: help:ir.actions.report.xml,header:0
3898+msgid "Add or not the coporate RML header"
3899+msgstr ""
3900+
3901+#. module: base
3902 #: model:ir.actions.act_window,name:base.act_values_form_action
3903 #: model:ir.ui.menu,name:base.menu_values_form_action
3904 msgid "Connect Actions To Client Events"
3905 msgstr ""
3906
3907 #. module: base
3908+#: code:addons/addons/base_module_quality/workflow_test/workflow_test.py:0
3909+#, python-format
3910+msgid "No Workflow define"
3911+msgstr ""
3912+
3913+#. module: base
3914 #: selection:ir.module.module,license:0
3915 msgid "GPL-2 or later version"
3916 msgstr ""
3917@@ -2153,6 +3000,12 @@
3918 msgstr ""
3919
3920 #. module: base
3921+#: code:addons/addons/subscription/subscription.py:0
3922+#, python-format
3923+msgid "Wrong Source Document !"
3924+msgstr ""
3925+
3926+#. module: base
3927 #: model:ir.model,name:base.model_ir_actions_wizard
3928 #: selection:ir.ui.menu,action:0
3929 msgid "ir.actions.wizard"
3930@@ -2164,6 +3017,12 @@
3931 msgstr ""
3932
3933 #. module: base
3934+#: code:addons/addons/hr_timesheet/hr_timesheet.py:0
3935+#, python-format
3936+msgid "No analytic journal available for this employee.\nDefine an employee for the selected user and assign an analytic journal."
3937+msgstr ""
3938+
3939+#. module: base
3940 #: model:ir.model,name:base.model_ir_property
3941 msgid "ir.property"
3942 msgstr ""
3943@@ -2177,7 +3036,7 @@
3944 msgstr ""
3945
3946 #. module: base
3947-#: code:osv/orm.py:0
3948+#: code:addons/osv/orm.py:0
3949 #, python-format
3950 msgid "Can not define a column %s. Reserved keyword !"
3951 msgstr ""
3952@@ -2193,6 +3052,12 @@
3953 msgstr ""
3954
3955 #. module: base
3956+#: code:addons/addons/stock/wizard/wizard_inventory.py:0
3957+#, python-format
3958+msgid "No product in this location."
3959+msgstr ""
3960+
3961+#. module: base
3962 #: view:ir.cron:0
3963 msgid "Technical Data"
3964 msgstr ""
3965@@ -2204,6 +3069,15 @@
3966 msgstr ""
3967
3968 #. module: base
3969+#: code:addons/addons/l10n_ch/wizard/dta_wizard.py:0
3970+#, python-format
3971+msgid "You must provide ' \\n"
3972+" 'a Clearing Number\n' \\n"
3973+" 'for the partner bank: %s\n' \\n"
3974+" 'on line %s"
3975+msgstr ""
3976+
3977+#. module: base
3978 #: selection:ir.module.module,state:0
3979 #: selection:ir.module.module.dependency,state:0
3980 msgid "To be upgraded"
3981@@ -2235,11 +3109,27 @@
3982 msgstr ""
3983
3984 #. module: base
3985+#: code:addons/addons/odms/odms.py:0
3986+#, python-format
3987+msgid "Configuration of the incremental backup servers"
3988+msgstr ""
3989+
3990+#. module: base
3991 #: model:res.partner.title,name:base.res_partner_title_ltd
3992 msgid "Ltd"
3993 msgstr ""
3994
3995 #. module: base
3996+#: field:ir.actions.server,expression:0
3997+msgid "Loop Expression"
3998+msgstr ""
3999+
4000+#. module: base
4001+#: field:ir.actions.report.custom,report_id:0
4002+msgid "Report Ref."
4003+msgstr ""
4004+
4005+#. module: base
4006 #: field:res.partner,ean13:0
4007 msgid "EAN13"
4008 msgstr ""
4009@@ -2250,6 +3140,12 @@
4010 msgstr ""
4011
4012 #. module: base
4013+#: code:addons/addons/auction/auction.py:0
4014+#, python-format
4015+msgid "The Buyer \"%s\" has no Invoice Address."
4016+msgstr ""
4017+
4018+#. module: base
4019 #: selection:maintenance.contract,state:0
4020 msgid "Unvalid"
4021 msgstr ""
4022@@ -2270,6 +3166,12 @@
4023 msgstr ""
4024
4025 #. module: base
4026+#: code:addons/addons/sale/sale.py:0
4027+#, python-format
4028+msgid "No Customer Defined !"
4029+msgstr ""
4030+
4031+#. module: base
4032 #: model:ir.actions.act_window,name:base.res_lang_act_window
4033 #: model:ir.model,name:base.model_res_lang
4034 #: model:ir.ui.menu,name:base.menu_res_lang_act_window
4035@@ -2278,8 +3180,27 @@
4036 msgstr ""
4037
4038 #. module: base
4039-#: model:res.country,name:base.pw
4040-msgid "Palau"
4041+#: code:addons/addons/base_module_quality/terp_test/terp_test.py:0
4042+#, python-format
4043+msgid "The module does not contain the __terp__.py file"
4044+msgstr ""
4045+
4046+#. module: base
4047+#: code:addons/addons/account/account_move_line.py:0
4048+#, python-format
4049+msgid "You have to define an analytic journal on the '%s' journal!"
4050+msgstr ""
4051+
4052+#. module: base
4053+#: code:addons/addons/odms/odms.py:0
4054+#, python-format
4055+msgid "Configuration of the DNS servers"
4056+msgstr ""
4057+
4058+#. module: base
4059+#: selection:workflow.activity,join_mode:0
4060+#: selection:workflow.activity,split_mode:0
4061+msgid "Xor"
4062 msgstr ""
4063
4064 #. module: base
4065@@ -2288,7 +3209,7 @@
4066 msgstr ""
4067
4068 #. module: base
4069-#: code:addons/base/module/wizard/wizard_export_lang.py:0
4070+#: code:addons/addons/base/module/wizard/wizard_export_lang.py:0
4071 #, python-format
4072 msgid "Save this document to a .CSV file and open it with your favourite spreadsheet software. The file encoding is UTF-8. You have to translate the latest column before reimporting it."
4073 msgstr ""
4074@@ -2299,6 +3220,13 @@
4075 msgstr ""
4076
4077 #. module: base
4078+#: code:addons/addons/hr_timesheet/report/user_timesheet.py:0
4079+#: code:addons/addons/hr_timesheet/report/users_timesheet.py:0
4080+#, python-format
4081+msgid "August"
4082+msgstr ""
4083+
4084+#. module: base
4085 #: help:res.partner,lang:0
4086 msgid "If the selected language is loaded in the system, all documents related to this partner will be printed in this language. If not, it will be english."
4087 msgstr ""
4088@@ -2314,8 +3242,9 @@
4089 msgstr ""
4090
4091 #. module: base
4092-#: wizard_view:module.module.update,update:0
4093-msgid "New modules"
4094+#: code:addons/addons/base_module_quality/speed_test/speed_test.py:0
4095+#, python-format
4096+msgid "N/2"
4097 msgstr ""
4098
4099 #. module: base
4100@@ -2325,11 +3254,23 @@
4101 msgstr ""
4102
4103 #. module: base
4104+#: code:addons/addons/hr_timesheet/report/user_timesheet.py:0
4105+#: code:addons/addons/hr_timesheet/report/users_timesheet.py:0
4106+#, python-format
4107+msgid "October"
4108+msgstr ""
4109+
4110+#. module: base
4111 #: view:ir.cron:0
4112 msgid "Action to Trigger"
4113 msgstr ""
4114
4115 #. module: base
4116+#: model:ir.model,name:base.model_res_currency_rate
4117+msgid "Currency Rate"
4118+msgstr ""
4119+
4120+#. module: base
4121 #: field:ir.report.custom.fields,fc0_operande:0
4122 #: field:ir.report.custom.fields,fc1_operande:0
4123 #: field:ir.report.custom.fields,fc2_operande:0
4124@@ -2363,6 +3304,24 @@
4125 msgstr ""
4126
4127 #. module: base
4128+#: code:addons/addons/account_date_check/account_date_check.py:0
4129+#, python-format
4130+msgid "The date of your account move is not in the defined period !"
4131+msgstr ""
4132+
4133+#. module: base
4134+#: code:addons/addons/wiki/wizard/open_page.py:0
4135+#, python-format
4136+msgid "No action found"
4137+msgstr ""
4138+
4139+#. module: base
4140+#: code:addons/addons/hr_holidays/hr.py:0
4141+#, python-format
4142+msgid "You can not cancel this holiday request. first You have to make its case in draft state."
4143+msgstr ""
4144+
4145+#. module: base
4146 #: help:ir.actions.server,subject:0
4147 msgid "Specify the subject. You can use fields from the object, e.g. `Hello [[ object.partner_id.name ]]`"
4148 msgstr ""
4149@@ -2388,18 +3347,20 @@
4150 msgstr ""
4151
4152 #. module: base
4153-#: help:ir.actions.server,condition:0
4154-msgid "Condition that is to be tested before action is executed, e.g. object.list_price > object.cost_price"
4155-msgstr ""
4156-
4157-#. module: base
4158 #: wizard_field:base.module.import,init,module_file:0
4159 msgid "Module .ZIP file"
4160 msgstr ""
4161
4162 #. module: base
4163-#: model:res.partner.category,name:base.res_partner_category_16
4164-msgid "Telecom sector"
4165+#: code:addons/addons/sale/sale.py:0
4166+#, python-format
4167+msgid "You have to select a customer in the sale form !\nPlease set one customer before choosing a product."
4168+msgstr ""
4169+
4170+#. module: base
4171+#: code:addons/addons/account/project/wizard/wizard_account_analytic_line.py:0
4172+#, python-format
4173+msgid "Analytic Entries"
4174 msgstr ""
4175
4176 #. module: base
4177@@ -2429,6 +3390,12 @@
4178 msgstr ""
4179
4180 #. module: base
4181+#: code:addons/osv/orm.py:0
4182+#, python-format
4183+msgid "The create method is not implemented on this object !"
4184+msgstr ""
4185+
4186+#. module: base
4187 #: field:ir.values,key2:0
4188 #: view:res.partner.event.type:0
4189 #: field:res.partner.event.type,name:0
4190@@ -2442,12 +3409,24 @@
4191 msgstr ""
4192
4193 #. module: base
4194+#: code:addons/addons/base_module_quality/pep8_test/pep8_test.py:0
4195+#, python-format
4196+msgid "PEP-8 Test"
4197+msgstr ""
4198+
4199+#. module: base
4200+#: code:addons/addons/base_module_quality/speed_test/speed_test.py:0
4201+#, python-format
4202+msgid "1"
4203+msgstr ""
4204+
4205+#. module: base
4206 #: view:ir.sequence.type:0
4207 msgid "Sequence Type"
4208 msgstr ""
4209
4210 #. module: base
4211-#: code:addons/base/module/module.py:0
4212+#: code:addons/addons/base/module/module.py:0
4213 #, python-format
4214 msgid "You try to upgrade a module that depends on the module: %s.\nBut this module is not available in your system."
4215 msgstr ""
4216@@ -2463,7 +3442,7 @@
4217 msgstr ""
4218
4219 #. module: base
4220-#: code:addons/base/ir/ir_report_custom.py:0
4221+#: code:addons/addons/base/ir/ir_report_custom.py:0
4222 #, python-format
4223 msgid "Invalid operation"
4224 msgstr ""
4225@@ -2474,12 +3453,18 @@
4226 msgstr ""
4227
4228 #. module: base
4229+#: code:addons/addons/warning/warning.py:0
4230+#, python-format
4231+msgid "Alert for ' + product_info.name +' !"
4232+msgstr ""
4233+
4234+#. module: base
4235 #: field:ir.actions.server,srcmodel_id:0
4236 msgid "Model"
4237 msgstr ""
4238
4239 #. module: base
4240-#: code:addons/base/module/module.py:0
4241+#: code:addons/addons/base/module/module.py:0
4242 #, python-format
4243 msgid "You try to install a module that depends on the module: %s.\nBut this module is not available in your system."
4244 msgstr ""
4245@@ -2493,6 +3478,11 @@
4246 msgstr ""
4247
4248 #. module: base
4249+#: field:ir.actions.server,write_id:0
4250+msgid "Write Id"
4251+msgstr ""
4252+
4253+#. module: base
4254 #: view:ir.actions.act_window:0
4255 msgid "Open a Window"
4256 msgstr ""
4257@@ -2508,16 +3498,15 @@
4258 msgstr ""
4259
4260 #. module: base
4261-#: code:addons/base/ir/ir_model.py:0
4262+#: code:addons/osv/orm.py:0
4263 #, python-format
4264-msgid "You can not remove the field '%s' !"
4265+msgid "Language with code \"%s\" is not defined in your system !\nDefine it through the Administration menu."
4266 msgstr ""
4267
4268 #. module: base
4269-#: field:res.bank,zip:0
4270-#: field:res.partner.address,zip:0
4271-#: field:res.partner.bank,zip:0
4272-msgid "Zip"
4273+#: code:addons/addons/project/wizard/close_task.py:0
4274+#, python-format
4275+msgid "Couldn't send mail because the contact for this task (%s) has no email address!"
4276 msgstr ""
4277
4278 #. module: base
4279@@ -2536,6 +3525,11 @@
4280 msgstr ""
4281
4282 #. module: base
4283+#: selection:module.lang.install,init,lang:0
4284+msgid "Finland / Suomi"
4285+msgstr ""
4286+
4287+#. module: base
4288 #: model:res.country,name:base.bo
4289 msgid "Bolivia"
4290 msgstr ""
4291@@ -2576,7 +3570,7 @@
4292 msgstr ""
4293
4294 #. module: base
4295-#: code:addons/base/module/module.py:0
4296+#: code:addons/addons/base/module/module.py:0
4297 #, python-format
4298 msgid "You try to remove a module that is installed or will be installed"
4299 msgstr ""
4300@@ -2597,18 +3591,43 @@
4301 msgstr ""
4302
4303 #. module: base
4304+#: code:addons/addons/hr_attendance/wizard/sign_in_out.py:0
4305+#, python-format
4306+msgid "The sign-out date must be in the past"
4307+msgstr ""
4308+
4309+#. module: base
4310 #: model:ir.actions.act_window,name:base.action_workflow_form
4311 #: model:ir.ui.menu,name:base.menu_workflow
4312 msgid "Workflows"
4313 msgstr ""
4314
4315 #. module: base
4316+#: code:addons/addons/base_module_publish/wizard/base_module_publish.py:0
4317+#: code:addons/addons/base_module_publish/wizard/base_module_publish_all.py:0
4318+#, python-format
4319+msgid "Login failed!"
4320+msgstr ""
4321+
4322+#. module: base
4323 #: model:ir.actions.act_window,name:base.action_config_wizard_form
4324 #: model:ir.ui.menu,name:base.menu_config_module
4325 msgid "Configuration Wizard"
4326 msgstr ""
4327
4328 #. module: base
4329+#: code:addons/addons/account_report/account.py:0
4330+#, python-format
4331+msgid "You cannot delete an indicator history record. You may have to delete the concerned Indicator!"
4332+msgstr ""
4333+
4334+#. module: base
4335+#: code:addons/addons/account/invoice.py:0
4336+#, python-format
4337+msgid "No Partner Defined !"
4338+msgstr ""
4339+
4340+#. module: base
4341 #: model:ir.model,name:base.model_res_roles
4342 msgid "res.roles"
4343 msgstr ""
4344@@ -2620,6 +3639,19 @@
4345 msgstr ""
4346
4347 #. module: base
4348+#: code:addons/addons/hr_timesheet_invoice/hr_timesheet_invoice.py:0
4349+#, python-format
4350+msgid "You can not modify an invoiced analytic line!"
4351+msgstr ""
4352+
4353+#. module: base
4354+#: code:addons/addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
4355+#, python-format
4356+msgid "You cannot enter an attendance ' \\n"
4357+" 'date outside the current timesheet dates!"
4358+msgstr ""
4359+
4360+#. module: base
4361 #: view:res.users:0
4362 msgid "Skip"
4363 msgstr ""
4364@@ -2631,6 +3663,13 @@
4365 msgstr ""
4366
4367 #. module: base
4368+#: code:addons/addons/analytic_user_function/analytic_user_function.py:0
4369+#, python-format
4370+msgid "There is no expense account define ' \\n"
4371+" 'for this product: \"%s\" (id:%d)"
4372+msgstr ""
4373+
4374+#. module: base
4375 #: model:res.country,name:base.ls
4376 msgid "Lesotho"
4377 msgstr ""
4378@@ -2642,6 +3681,12 @@
4379 msgstr ""
4380
4381 #. module: base
4382+#: code:addons/addons/point_of_sale/pos.py:0
4383+#, python-format
4384+msgid "You have to define a Default Debit Account for your Financial Journals!\n"
4385+msgstr ""
4386+
4387+#. module: base
4388 #: model:res.country,name:base.ke
4389 msgid "Kenya"
4390 msgstr ""
4391@@ -2652,7 +3697,7 @@
4392 msgstr ""
4393
4394 #. module: base
4395-#: code:osv/orm.py:0
4396+#: code:addons/osv/orm.py:0
4397 #, python-format
4398 msgid "Error occurred while validating the field(s) %s: %s"
4399 msgstr ""
4400@@ -2668,6 +3713,12 @@
4401 msgstr ""
4402
4403 #. module: base
4404+#: code:addons/addons/point_of_sale/pos.py:0
4405+#, python-format
4406+msgid "Cannot delete an order line which is %s !"
4407+msgstr ""
4408+
4409+#. module: base
4410 #: model:res.country,name:base.pe
4411 msgid "Peru"
4412 msgstr ""
4413@@ -2678,9 +3729,9 @@
4414 msgstr ""
4415
4416 #. module: base
4417-#: field:res.partner.event,som:0
4418-#: field:res.partner.som,name:0
4419-msgid "State of Mind"
4420+#: code:addons/addons/base_module_quality/object_test/object_test.py:0
4421+#, python-format
4422+msgid "Result of Security in %"
4423 msgstr ""
4424
4425 #. module: base
4426@@ -2689,21 +3740,58 @@
4427 msgstr ""
4428
4429 #. module: base
4430+#: code:addons/addons/account/account_move_line.py:0
4431+#, python-format
4432+msgid "You can not change the tax, you should remove and recreate lines !"
4433+msgstr ""
4434+
4435+#. module: base
4436 #: view:ir.rule.group:0
4437 msgid "The rule is satisfied if all test are True (AND)"
4438 msgstr ""
4439
4440 #. module: base
4441+#: code:addons/addons/proforma_followup/proforma.py:0
4442+#, python-format
4443+msgid "You can not create this kind of document"
4444+msgstr ""
4445+
4446+#. module: base
4447+#: code:addons/addons/base_module_quality/terp_test/terp_test.py:0
4448+#, python-format
4449+msgid "Result (/1)"
4450+msgstr ""
4451+
4452+#. module: base
4453 #: selection:ir.ui.menu,icon:0
4454 msgid "STOCK_CONNECT"
4455 msgstr ""
4456
4457 #. module: base
4458+#: code:addons/addons/account/invoice.py:0
4459+#, python-format
4460+msgid "Cannot delete invoice(s) that are already opened or paid !"
4461+msgstr ""
4462+
4463+#. module: base
4464+#: code:addons/addons/mrp/mrp.py:0
4465+#: code:addons/addons/mrp/wizard/wizard_change_production_qty.py:0
4466+#, python-format
4467+msgid "Couldn't find bill of material for product"
4468+msgstr ""
4469+
4470+#. module: base
4471 #: selection:ir.model.fields,select_level:0
4472 msgid "Not Searchable"
4473 msgstr ""
4474
4475 #. module: base
4476+#: code:addons/addons/point_of_sale/pos.py:0
4477+#, python-format
4478+msgid "Create line failed !"
4479+msgstr ""
4480+
4481+#. module: base
4482 #: field:res.partner.event.type,key:0
4483 msgid "Key"
4484 msgstr ""
4485@@ -2724,6 +3812,12 @@
4486 msgstr ""
4487
4488 #. module: base
4489+#: code:addons/addons/account/account.py:0
4490+#, python-format
4491+msgid "No sequence defined in the journal !"
4492+msgstr ""
4493+
4494+#. module: base
4495 #: model:res.country,name:base.mu
4496 msgid "Mauritius"
4497 msgstr ""
4498@@ -2739,12 +3833,18 @@
4499 msgstr ""
4500
4501 #. module: base
4502+#: code:addons/addons/odms/wizard/host_status.py:0
4503+#, python-format
4504+msgid "This image has been created by the synchronization wizard"
4505+msgstr ""
4506+
4507+#. module: base
4508 #: model:ir.ui.menu,name:base.menu_security
4509 msgid "Security"
4510 msgstr ""
4511
4512 #. module: base
4513-#: code:addons/base/ir/ir_report_custom.py:0
4514+#: code:addons/addons/base/ir/ir_report_custom.py:0
4515 #, python-format
4516 msgid "Using a relation field which uses an unknown object"
4517 msgstr ""
4518@@ -2771,11 +3871,29 @@
4519 msgstr ""
4520
4521 #. module: base
4522+#: code:addons/addons/stock/wizard/wizard_return.py:0
4523+#, python-format
4524+msgid "Invoice state"
4525+msgstr ""
4526+
4527+#. module: base
4528+#: code:addons/addons/crm/crm.py:0
4529+#, python-format
4530+msgid "You can not delete this case. You should better cancel it."
4531+msgstr ""
4532+
4533+#. module: base
4534 #: model:res.country,name:base.hu
4535 msgid "Hungary"
4536 msgstr ""
4537
4538 #. module: base
4539+#: code:addons/addons/use_control/module.py:0
4540+#, python-format
4541+msgid "You are not authorized to write module repositories"
4542+msgstr ""
4543+
4544+#. module: base
4545 #: model:ir.model,name:base.model_res_groups
4546 msgid "res.groups"
4547 msgstr ""
4548@@ -2786,6 +3904,12 @@
4549 msgstr ""
4550
4551 #. module: base
4552+#: code:addons/addons/mrp_repair/mrp_repair.py:0
4553+#, python-format
4554+msgid "You have to select a partner in the repair form !"
4555+msgstr ""
4556+
4557+#. module: base
4558 #: field:ir.sequence,number_next:0
4559 msgid "Next Number"
4560 msgstr ""
4561@@ -2797,6 +3921,11 @@
4562 msgstr ""
4563
4564 #. module: base
4565+#: selection:module.lang.install,init,lang:0
4566+msgid "Albanian / Shqipëri"
4567+msgstr ""
4568+
4569+#. module: base
4570 #: model:res.country,name:base.sy
4571 msgid "Syria"
4572 msgstr ""
4573@@ -2807,8 +3936,9 @@
4574 msgstr ""
4575
4576 #. module: base
4577-#: field:ir.report.custom.fields,field_child2:0
4578-msgid "Field child2"
4579+#: code:addons/addons/mrp/report/price.py:0
4580+#, python-format
4581+msgid "SUBTOTAL"
4582 msgstr ""
4583
4584 #. module: base
4585@@ -2832,7 +3962,27 @@
4586 msgstr ""
4587
4588 #. module: base
4589+#: code:addons/addons/stock/product.py:0
4590+#, python-format
4591+msgid "Delivered Qty"
4592+msgstr ""
4593+
4594+#. module: base
4595+#: code:addons/addons/odms/odms.py:0
4596+#, python-format
4597+msgid "Unable to delete non uninstalled instances"
4598+msgstr ""
4599+
4600+#. module: base
4601+#: code:addons/addons/sale/sale.py:0
4602+#, python-format
4603+msgid "Packing Information !"
4604+msgstr ""
4605+
4606+#. module: base
4607+#: code:addons/addons/crm/crm.py:0
4608 #: selection:res.request,state:0
4609+#, python-format
4610 msgid "draft"
4611 msgstr ""
4612
4613@@ -2850,11 +4000,26 @@
4614 msgstr ""
4615
4616 #. module: base
4617+#: code:addons/addons/account/account.py:0
4618+#, python-format
4619+msgid "No period defined for this date !\nPlease create a fiscal year."
4620+msgstr ""
4621+
4622+#. module: base
4623 #: view:ir.attachment:0
4624 msgid "Data"
4625 msgstr ""
4626
4627 #. module: base
4628+#: field:ir.cron,user_id:0
4629+#: field:ir.ui.view.custom,user_id:0
4630+#: field:ir.values,user_id:0
4631+#: field:res.partner.event,user_id:0
4632+#: view:res.users:0
4633+msgid "User"
4634+msgstr ""
4635+
4636+#. module: base
4637 #: view:res.users:0
4638 msgid "Groups are used to defined access rights on each screen and menu."
4639 msgstr ""
4640@@ -2866,6 +4031,12 @@
4641 msgstr ""
4642
4643 #. module: base
4644+#: code:addons/addons/account/account_move_line.py:0
4645+#, python-format
4646+msgid "Some entries are already reconciled !"
4647+msgstr ""
4648+
4649+#. module: base
4650 #: help:ir.actions.act_window.view,multi:0
4651 #: help:ir.actions.report.custom,multi:0
4652 #: help:ir.actions.report.xml,multi:0
4653@@ -2873,6 +4044,12 @@
4654 msgstr ""
4655
4656 #. module: base
4657+#: code:addons/addons/stock/wizard/inventory_merge.py:0
4658+#, python-format
4659+msgid "Merging is only allowed on draft inventories."
4660+msgstr ""
4661+
4662+#. module: base
4663 #: view:ir.attachment:0
4664 msgid "Attached To"
4665 msgstr ""
4666@@ -2883,6 +4060,12 @@
4667 msgstr ""
4668
4669 #. module: base
4670+#: code:addons/addons/base_module_quality/structure_test/structure_test.py:0
4671+#, python-format
4672+msgid "Feedback about structure of module"
4673+msgstr ""
4674+
4675+#. module: base
4676 #: view:res.partner:0
4677 #: view:res.request:0
4678 #: field:res.request,history:0
4679@@ -2890,6 +4073,20 @@
4680 msgstr ""
4681
4682 #. module: base
4683+#: code:addons/addons/account/account_bank_statement.py:0
4684+#, python-format
4685+msgid "Unable to reconcile entry \"%s\": %.2f"
4686+msgstr ""
4687+
4688+#. module: base
4689+#: code:addons/addons/l10n_ch/wizard/wizard_bvr.py:0
4690+#, python-format
4691+msgid "Your bank BVR adherent number must contain exactly seven' \\n"
4692+" 'digits!\nPlease check your company ' \\n"
4693+" 'information for the invoice:\n%s"
4694+msgstr ""
4695+
4696+#. module: base
4697 #: field:ir.attachment,create_uid:0
4698 msgid "Creator"
4699 msgstr ""
4700@@ -2900,6 +4097,12 @@
4701 msgstr ""
4702
4703 #. module: base
4704+#: code:addons/addons/stock/stock.py:0
4705+#, python-format
4706+msgid "You can not remove a lot line !"
4707+msgstr ""
4708+
4709+#. module: base
4710 #: selection:module.lang.install,init,lang:0
4711 msgid "Swedish / svenska"
4712 msgstr ""
4713@@ -2915,12 +4118,18 @@
4714 msgstr ""
4715
4716 #. module: base
4717+#: code:addons/addons/account_followup/wizard/wizard_followup_print.py:0
4718+#, python-format
4719+msgid "All emails have been successfully sent to Partners:.\n\n"
4720+msgstr ""
4721+
4722+#. module: base
4723 #: model:res.country,name:base.ni
4724 msgid "Nicaragua"
4725 msgstr ""
4726
4727 #. module: base
4728-#: code:osv/orm.py:0
4729+#: code:addons/osv/orm.py:0
4730 #, python-format
4731 msgid "The write method is not implemented on this object !"
4732 msgstr ""
4733@@ -2936,8 +4145,8 @@
4734 msgstr ""
4735
4736 #. module: base
4737-#: view:maintenance.contract.wizard:0
4738-msgid "Maintenance contract added !"
4739+#: field:ir.values,meta:0
4740+msgid "Meta Datas"
4741 msgstr ""
4742
4743 #. module: base
4744@@ -2947,8 +4156,9 @@
4745 msgstr ""
4746
4747 #. module: base
4748-#: model:res.country,name:base.ve
4749-msgid "Venezuela"
4750+#: code:addons/addons/account/account_move_line.py:0
4751+#, python-format
4752+msgid "Unable to change tax !"
4753 msgstr ""
4754
4755 #. module: base
4756@@ -2957,6 +4167,12 @@
4757 msgstr ""
4758
4759 #. module: base
4760+#: code:addons/addons/odms/odms.py:0
4761+#, python-format
4762+msgid "Activation of your subscription"
4763+msgstr ""
4764+
4765+#. module: base
4766 #: model:res.country,name:base.zm
4767 msgid "Zambia"
4768 msgstr ""
4769@@ -2968,16 +4184,36 @@
4770 msgstr ""
4771
4772 #. module: base
4773+#: code:addons/addons/delivery/wizard/delivery_sale_order.py:0
4774+#, python-format
4775+msgid "No grid matching for this carrier !"
4776+msgstr ""
4777+
4778+#. module: base
4779 #: help:res.partner,user_id:0
4780 msgid "The internal user that is in charge of communicating with this partner if any."
4781 msgstr ""
4782
4783 #. module: base
4784+#: code:addons/addons/base_module_quality/structure_test/structure_test.py:0
4785+#, python-format
4786+msgid "\"\"\n"
4787+"This test checks if the module satisfy tiny structure\n"
4788+"\"\""
4789+msgstr ""
4790+
4791+#. module: base
4792 #: view:ir.module.module:0
4793 msgid "Cancel Upgrade"
4794 msgstr ""
4795
4796 #. module: base
4797+#: code:addons/addons/odms/odms.py:0
4798+#, python-format
4799+msgid "This feature is only available for location of type \"Amazon\""
4800+msgstr ""
4801+
4802+#. module: base
4803 #: model:res.country,name:base.ci
4804 msgid "Ivory Coast (Cote D'Ivoire)"
4805 msgstr ""
4806@@ -3021,6 +4257,18 @@
4807 msgstr ""
4808
4809 #. module: base
4810+#: code:addons/addons/mrp/report/price.py:0
4811+#, python-format
4812+msgid "Product uom"
4813+msgstr ""
4814+
4815+#. module: base
4816+#: code:addons/addons/account/wizard/wizard_bank_reconcile.py:0
4817+#, python-format
4818+msgid "Standard Encoding"
4819+msgstr ""
4820+
4821+#. module: base
4822 #: model:ir.ui.menu,name:base.menu_translation_app
4823 msgid "Application Terms"
4824 msgstr ""
4825@@ -3036,6 +4284,12 @@
4826 msgstr ""
4827
4828 #. module: base
4829+#: code:addons/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
4830+#, python-format
4831+msgid "Please fill a Balance product in the wizard"
4832+msgstr ""
4833+
4834+#. module: base
4835 #: model:ir.actions.act_window,name:base.action_workflow_instance_form
4836 #: model:ir.ui.menu,name:base.menu_workflow_instance
4837 msgid "Instances"
4838@@ -3047,6 +4301,12 @@
4839 msgstr ""
4840
4841 #. module: base
4842+#: code:addons/addons/base_module_quality/structure_test/structure_test.py:0
4843+#, python-format
4844+msgid "Structure Test"
4845+msgstr ""
4846+
4847+#. module: base
4848 #: model:res.partner.category,name:base.res_partner_category_3
4849 msgid "Starter Partner"
4850 msgstr ""
4851@@ -3062,11 +4322,44 @@
4852 msgstr ""
4853
4854 #. module: base
4855+#: code:addons/addons/hr_timesheet/report/user_timesheet.py:0
4856+#: code:addons/addons/hr_timesheet/report/users_timesheet.py:0
4857+#, python-format
4858+msgid "Wed"
4859+msgstr ""
4860+
4861+#. module: base
4862+#: code:addons/osv/orm.py:0
4863+#, python-format
4864+msgid "You try to write on an record that doesn\'t exist ' \\n"
4865+" '(Document type: %s)."
4866+msgstr ""
4867+
4868+#. module: base
4869+#: field:res.bank,zip:0
4870+#: field:res.partner.address,zip:0
4871+#: field:res.partner.bank,zip:0
4872+msgid "Zip"
4873+msgstr ""
4874+
4875+#. module: base
4876+#: code:addons/addons/stock/wizard/wizard_invoice_onshipping.py:0
4877+#, python-format
4878+msgid "Invoice is already created."
4879+msgstr ""
4880+
4881+#. module: base
4882 #: field:res.partner.event,planned_revenue:0
4883 msgid "Planned Revenue"
4884 msgstr ""
4885
4886 #. module: base
4887+#: code:addons/addons/account_budget/wizard/wizard_budget_report.py:0
4888+#, python-format
4889+msgid "Insufficient Data!"
4890+msgstr ""
4891+
4892+#. module: base
4893 #: wizard_view:module.lang.import,init:0
4894 msgid "You have to import a .CSV file wich is encoded in UTF-8. Please check that the first line of your file is one of the following:"
4895 msgstr ""
4896@@ -3087,9 +4380,15 @@
4897 msgstr ""
4898
4899 #. module: base
4900-#: help:res.country.state,code:0
4901-msgid "The state code in three chars.\n"
4902-""
4903+#: code:addons/addons/account/wizard/wizard_aged_trial_balance.py:0
4904+#, python-format
4905+msgid "You must enter a period length that cannot be 0 or below !"
4906+msgstr ""
4907+
4908+#. module: base
4909+#: code:addons/addons/mrp/report/price.py:0
4910+#, python-format
4911+msgid "Product name"
4912 msgstr ""
4913
4914 #. module: base
4915@@ -3103,11 +4402,35 @@
4916 msgstr ""
4917
4918 #. module: base
4919+#: code:addons/addons/document/document.py:0
4920+#, python-format
4921+msgid "Permission Denied !"
4922+msgstr ""
4923+
4924+#. module: base
4925 #: field:ir.report.custom.fields,groupby:0
4926 msgid "Group By"
4927 msgstr ""
4928
4929 #. module: base
4930+#: code:addons/addons/l10n_ch/wizard/bvr_import.py:0
4931+#, python-format
4932+msgid "Record found after total record!"
4933+msgstr ""
4934+
4935+#. module: base
4936+#: code:addons/addons/base/ir/ir_model.py:0
4937+#, python-format
4938+msgid "\"%s\" contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
4939+msgstr ""
4940+
4941+#. module: base
4942+#: code:addons/addons/use_control/module.py:0
4943+#, python-format
4944+msgid "The \"use_control\" module is not uninstallable"
4945+msgstr ""
4946+
4947+#. module: base
4948 #: selection:ir.ui.menu,icon:0
4949 msgid "STOCK_DIALOG_WARNING"
4950 msgstr ""
4951@@ -3133,8 +4456,14 @@
4952 msgstr ""
4953
4954 #. module: base
4955-#: field:ir.actions.server,write_id:0
4956-msgid "Write Id"
4957+#: code:addons/addons/account/account.py:0
4958+#, python-format
4959+msgid "BNK"
4960+msgstr ""
4961+
4962+#. module: base
4963+#: model:res.country,name:base.do
4964+msgid "Dominican Republic"
4965 msgstr ""
4966
4967 #. module: base
4968@@ -3148,6 +4477,12 @@
4969 msgstr ""
4970
4971 #. module: base
4972+#: code:addons/addons/hr_timesheet/wizard/sign_in_out.py:0
4973+#, python-format
4974+msgid "No cost unit defined for this employee !"
4975+msgstr ""
4976+
4977+#. module: base
4978 #: view:ir.actions.server:0
4979 msgid "SMS Configuration"
4980 msgstr ""
4981@@ -3170,7 +4505,7 @@
4982 msgstr ""
4983
4984 #. module: base
4985-#: code:addons/base/res/res_user.py:0
4986+#: code:addons/addons/base/res/res_user.py:0
4987 #, python-format
4988 msgid "The name of the group can not start with \"-\""
4989 msgstr ""
4990@@ -3193,6 +4528,14 @@
4991 msgstr ""
4992
4993 #. module: base
4994+#: code:addons/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py:0
4995+#: code:addons/addons/l10n_be/wizard/partner_vat_listing.py:0
4996+#: code:addons/addons/sale_crm/wizard/makesale.py:0
4997+#, python-format
4998+msgid "Data Insufficient!"
4999+msgstr ""
5000+
The diff has been truncated for viewing.