pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]

Browse Source 
bzr revid: uco@tinyerp.com-20100825055527-y927q6jxau2whptl
This commit is contained in:
uco (Open ERP)
2010-08-25 11:25:27 +05:30
parent b7183b5725 13b7b49d30
commit 9fdae47333
15 changed files with 86 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/addons/base/base_update.xml
+5 -2
View File
@@ -179,7 +179,7 @@
<form string="Company">
<group colspan="4" col="6">
<field colspan="4" name="name" select="1"/>
<field name="partner_id" select="1"/>
<field name="partner_id" readonly="1" select="1" required="0"/>
<field name="parent_id" select="1" groups="base.group_multi_company"/>
</group>
<notebook colspan="4">
@@ -195,7 +195,10 @@
<field colspan="4" name="rml_header" nolabel="1"/>
</page>
<page string="Internal Header/Footer" groups="base.group_extended">
<field colspan="4" name="rml_header2" nolabel="1"/>
<separator string="Portrait" colspan="2"/>
<separator string="Landscape" colspan="2"/>
<field colspan="2" name="rml_header2" nolabel="1"/>
<field colspan="2" name="rml_header3" nolabel="1"/>
</page>
<page string="Configuration">
</page>
bin/addons/base/i18n/de.po
+19 -13
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2009-12-15 06:37+0000\n"
"Last-Translator: Ferdinand-chricar <Unknown>\n"
"PO-Revision-Date: 2010-08-24 04:52+0000\n"
"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-07-13 03:45+0000\n"
"X-Launchpad-Export-Date: 2010-08-25 03:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
@@ -744,7 +744,7 @@ msgstr "Iran"
#: model:ir.actions.act_window,name:base.res_request-act
#: model:ir.ui.menu,name:base.menu_res_request_act
msgid "My Requests"
msgstr ""
msgstr "Meine Anfragen"
#. module: base
#: field:ir.sequence,name:0
@@ -1007,7 +1007,7 @@ msgstr "STOCK_COPY"
#: code:addons/base/ir/ir_model.py:0
#, python-format
msgid "Model %s Does not Exist !"
msgstr ""
msgstr "Modell %s existiert nicht!"
#. module: base
#: code:addons/base/module/module.py:0
@@ -1115,6 +1115,10 @@ msgid ""
"consider the present one as void. Do not hesitate to contact our accounting "
"department at (+32).81.81.37.00."
msgstr ""
"Sollte sich Ihre Zahlung mit dem Versand dieser Nachricht überschnitten "
"haben betrachten Sie diese bitte als erledigt. Bitte scheuen Sie sich nicht, "
"Kontakt mit der Buchhaltung de Firma Tiny unter der Rufnummer "
"(+32).81.81.37.00 aufzunehmen."
#. module: base
#: selection:ir.ui.menu,icon:0
@@ -1153,7 +1157,7 @@ msgstr "7. %H:%M:%S ==> 18:25:20"
#. module: base
#: help:res.users,company_id:0
msgid "The company this user is currently working on."
msgstr ""
msgstr "Die Firma, für die dieser User aktuell tätig ist."
#. module: base
#: help:ir.actions.server,message:0
@@ -1376,6 +1380,8 @@ msgstr "Gruppen"
#: constraint:res.users:0
msgid "This user can not connect using this company !"
msgstr ""
"Dieser Benutzer kann sich nicht in Verbindung mit der gewählten Firma "
"anmelden."
#. module: base
#: model:res.country,name:base.bz
@@ -1613,7 +1619,7 @@ msgstr "Felder Zuordnungen"
#: model:ir.actions.act_window,name:base.res_request-closed
#: model:ir.ui.menu,name:base.next_id_12_close
msgid "My Closed Requests"
msgstr ""
msgstr "Meine abgeschlossenen Anfragen"
#. module: base
#: model:ir.ui.menu,name:base.menu_custom
@@ -1996,7 +2002,7 @@ msgstr "Module"
#: model:ir.actions.act_window,name:base.action_res_bank_form
#: model:ir.ui.menu,name:base.menu_action_res_bank_form
msgid "Bank List"
msgstr ""
msgstr "Bankenliste"
#. module: base
#: field:ir.attachment,description:0
@@ -4476,7 +4482,7 @@ msgstr "res.partner.event"
#. module: base
#: field:res.company,user_ids:0
msgid "Accepted Users"
msgstr ""
msgstr "Zugelassene Benutzer"
#. module: base
#: selection:ir.ui.menu,icon:0
@@ -5420,7 +5426,7 @@ msgstr "Partner Ereignisse"
#: model:ir.ui.menu,name:base.menu_partner_function_form
#: view:res.partner.function:0
msgid "Contact Functions"
msgstr ""
msgstr "Kontaktfunktionen"
#. module: base
#: view:multi_company.default:0
@@ -6073,7 +6079,7 @@ msgstr "Stunde 00->24: %(h24)s"
#. module: base
#: help:multi_company.default,field_id:0
msgid "Select field property"
msgstr ""
msgstr "Wähle Feldmerkmal"
#. module: base
#: field:res.request.history,date_sent:0
@@ -6164,7 +6170,7 @@ msgstr "(Ober-) Konto"
#. module: base
#: view:multi_company.default:0
msgid "Returning"
msgstr ""
msgstr "Rückgabe"
#. module: base
#: field:ir.actions.act_window,res_model:0
@@ -7435,7 +7441,7 @@ msgstr "Lösche Rechte"
#. module: base
#: model:ir.model,name:base.model_multi_company_default
msgid "multi_company.default"
msgstr ""
msgstr "Standard (bei mehreren Mandanten)"
#. module: base
#: selection:workflow.activity,join_mode:0
bin/addons/base/i18n/hr.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-08-22 05:34+0000\n"
"PO-Revision-Date: 2010-08-24 05:46+0000\n"
"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
"Language-Team: openerp-translators\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-23 03:58+0000\n"
"X-Launchpad-Export-Date: 2010-08-25 03:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
bin/addons/base/i18n/it.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-08-22 05:31+0000\n"
"PO-Revision-Date: 2010-08-24 05:43+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-23 03:58+0000\n"
"X-Launchpad-Export-Date: 2010-08-25 03:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
bin/addons/base/i18n/ja.po
+2 -2
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-08-22 05:23+0000\n"
"PO-Revision-Date: 2010-08-24 05:38+0000\n"
"Last-Translator: Harry (Open ERP) <hmo@tinyerp.com>\n"
"Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-23 03:58+0000\n"
"X-Launchpad-Export-Date: 2010-08-25 03:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
bin/addons/base/i18n/pt_BR.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-08-22 05:37+0000\n"
"PO-Revision-Date: 2010-08-24 05:48+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: <pt@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-23 03:58+0000\n"
"X-Launchpad-Export-Date: 2010-08-25 03:52+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
bin/addons/base/i18n/sv.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-08-22 05:19+0000\n"
"PO-Revision-Date: 2010-08-24 05:34+0000\n"
"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
"Language-Team: <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-23 03:58+0000\n"
"X-Launchpad-Export-Date: 2010-08-25 03:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
bin/addons/base/i18n/uk.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-08-22 05:26+0000\n"
"PO-Revision-Date: 2010-08-24 05:41+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-23 03:58+0000\n"
"X-Launchpad-Export-Date: 2010-08-25 03:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
bin/addons/base/i18n/zh_CN.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-08-22 05:32+0000\n"
"PO-Revision-Date: 2010-08-24 05:44+0000\n"
"Last-Translator: Eleanor Chen <chenyueg@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-23 03:58+0000\n"
"X-Launchpad-Export-Date: 2010-08-25 03:52+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
bin/addons/base/i18n/zh_TW.po
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-21 03:55+0000\n"
"X-Launchpad-Export-Date: 2010-08-25 03:52+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
bin/addons/base/module/wizard/wizard_import_lang.py
+1 -1
View File
@@ -33,7 +33,7 @@ view_form="""<?xml version="1.0"?>
<field name="name" width="200"/>
<field name="code"/>
<field name="data" colspan="4"/>
<label string="You have to import a .CSV file wich is encoded in UTF-8.\n
<label string="You have to import a .CSV file which is encoded in UTF-8.\n
Please check that the first line of your file is one of the following:" colspan="4" align="0.0"/>
<label string="type,name,res_id,src,value" colspan="4"/>
<label string="module,type,name,res_id,src,value" colspan="4"/>
bin/addons/base/res/res_company.py
+33 -4
View File
@@ -42,7 +42,7 @@ class multi_company_default(osv.osv):
'company_dest_id': fields.many2one('res.company', 'Default Company', required=True,
help='Company to store the current record'),
'object_id': fields.many2one('ir.model', 'Object', required=True,
help='Object affect by this rules'),
help='Object affected by this rule'),
'expression': fields.char('Expression', size=256, required=True,
help='Expression, must be True to match\nuse context.get or user (browse)'),
'field_id': fields.many2one('ir.model.fields', 'Field', help='Select field property'),
@@ -82,6 +82,7 @@ class res_company(osv.osv):
'rml_footer2': fields.char('Report Footer 2', size=200),
'rml_header' : fields.text('RML Header'),
'rml_header2' : fields.text('RML Internal Header'),
'rml_header3' : fields.text('RML Internal Header'),
'logo' : fields.binary('Logo'),
'currency_id': fields.many2one('res.currency', 'Currency', required=True),
'currency_ids': fields.one2many('res.currency', 'company_id', 'Currency'),
@@ -161,9 +162,17 @@ class res_company(osv.osv):
def cache_restart(self, cr):
self._get_company_children.clear_cache(cr.dbname)
def create(self, cr, *args, **argv):
def create(self, cr, uid, vals, context=None):
if not vals.get('name', False) or vals.get('partner_id', False):
self.cache_restart(cr)
return super(res_company, self).create(cr, uid, vals, context=context)
obj_partner = self.pool.get('res.partner')
partner_id = obj_partner.create(cr, uid, {'name': vals['name']}, context=context)
vals.update({'partner_id': partner_id})
self.cache_restart(cr)
return super(res_company, self).create(cr, *args, **argv)
company_id = super(res_company, self).create(cr, uid, vals, context=context)
obj_partner.write(cr, uid, partner_id, {'company_id': company_id}, context=context)
return company_id
def write(self, cr, *args, **argv):
self.cache_restart(cr)
@@ -190,7 +199,26 @@ class res_company(osv.osv):
tools.config['root_path'], '..', 'pixmaps', 'openerp-header.png'),
'rb') .read().encode('base64')
def _get_header3(self,cr,uid,ids):
return """
<header>
<pageTemplate>
<frame id="first" x1="25" y1="25" width="1070" height="717"/>
<pageGraphics>
<fill color="black"/>
<stroke color="black"/>
<setFont name="DejaVu Sans" size="8"/>
<drawString x="25" y="725"> [[ formatLang(time.strftime("%Y-%m-%d"), date=True) ]] [[ time.strftime("%H:%M") ]]</drawString>
<setFont name="DejaVu Sans Bold" size="10"/>
<drawString x="490" y="725">[[ company.partner_id.name ]]</drawString>
<setFont name="DejaVu Sans" size="8"/>
<drawRightString x="1065" y="725"><pageNumber/>/ </drawRightString>
<drawString x="1065" y="725"><pageCount/></drawString>
<stroke color="#000000"/>
<lines>25 720 1085 720</lines>
</pageGraphics>
</pageTemplate>
</header>"""
def _get_header2(self,cr,uid,ids):
return """
<header>
@@ -253,6 +281,7 @@ class res_company(osv.osv):
'currency_id': _get_euro,
'rml_header':_get_header,
'rml_header2': _get_header2,
'rml_header3': _get_header3,
'logo':_get_logo
}
bin/netsvc.py
+2
View File
@@ -103,10 +103,12 @@ class ExportService(object):
_services = {}
_groups = {}
_logger = logging.getLogger('web-services')
def __init__(self, name, audience=''):
ExportService._services[name] = self
self.__name = name
self._logger.info("Exported service registered: %s" % name)
def joinGroup(self, name):
ExportService._groups.setdefault(name, {})[self.__name] = self
bin/osv/osv.py
+3 -1
View File
@@ -66,7 +66,9 @@ class osv_pool(netsvc.Service):
if key in inst[0]:
self.abortResponse(1, 'Constraint Error', 'warning', self._sql_error[key])
if inst.pgcode == errorcodes.NOT_NULL_VIOLATION:
msg = 'Sorry, this record cannot be deleted at the moment because other records still reference it.'
msg = 'The operation cannot be completed, probably due to the following:\n' \
'- deletion: you may be trying to delete a record while other records still reference it\n' \
'- creation/update: a mandatory field is not correctly set'
self.logger.debug("IntegrityError", exc_info=True)
try:
context = inst.pgerror.split('"public".')[1]
bin/report/report_sxw.py
+8 -4
View File
@@ -174,6 +174,7 @@ class rml_parse(object):
self.localcontext.update(context)
self.rml_header = user.company_id.rml_header
self.rml_header2 = user.company_id.rml_header2
self.rml_header3 = user.company_id.rml_header3
self.logo = user.company_id.logo
self.name = name
self._node = None
@@ -293,10 +294,12 @@ class rml_parse(object):
return text
def _add_header(self, rml_dom, header='external'):
if header=='external':
rml_head = self.rml_header
else:
if header=='internal':
rml_head = self.rml_header2
elif header=='internal landscape':
rml_head = self.rml_header3
else:
rml_head = self.rml_header
head_dom = etree.XML(rml_head)
for tag in head_dom:
@@ -321,7 +324,7 @@ class rml_parse(object):
self.localcontext.update({'name_space' :common.sxw_namespace})
class report_sxw(report_rml, preprocess.report):
def __init__(self, name, table, rml=False, parser=rml_parse, header=True, store=False):
def __init__(self, name, table, rml=False, parser=rml_parse, header='external', store=False):
report_rml.__init__(self, name, table, rml, '')
self.name = name
self.parser = parser
@@ -348,6 +351,7 @@ class report_sxw(report_rml, preprocess.report):
for key,arg in argv.items():
setattr(self, key, arg)
report_xml = a(title=title, report_type=report_type, report_rml_content=rml, name=title, attachment=False, header=self.header)
report_xml.header = self.header
report_type = report_xml.report_type
if report_type in ['sxw','odt']:
fnct = self.create_source_odt