diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 8be310245ac..709009f8481 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -873,7 +873,7 @@ - +
diff --git a/addons/account_analytic_analysis/i18n/nl.po b/addons/account_analytic_analysis/i18n/nl.po index bfff9f3ec71..c3f12aef08c 100644 --- a/addons/account_analytic_analysis/i18n/nl.po +++ b/addons/account_analytic_analysis/i18n/nl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-12-11 12:37+0000\n" -"Last-Translator: Pieter J. Kersten (EduSense BV) \n" +"PO-Revision-Date: 2010-02-01 15:46+0000\n" +"Last-Translator: Jan Verlaan (Veritos) \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: 2009-12-16 05:16+0000\n" +"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_analysis @@ -191,7 +191,7 @@ msgstr "Berekend met de formule: gefactureerd bedrag - totale kosten." #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed msgid "My Accounts" -msgstr "Mijn rekeningen" +msgstr "Mijn kostenplaatsen" #. module: account_analytic_analysis #: model:ir.module.module,description:account_analytic_analysis.module_meta_information @@ -335,7 +335,7 @@ msgstr "Kostenplaats" #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed msgid "Overpassed Accounts" -msgstr "Overbrugde Kostenplaatsen" +msgstr "Overgehevelde kostenplaatsen" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all diff --git a/addons/account_anglo_saxon/__init__.py b/addons/account_anglo_saxon/__init__.py new file mode 100644 index 00000000000..dd9a9262710 --- /dev/null +++ b/addons/account_anglo_saxon/__init__.py @@ -0,0 +1,25 @@ +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +import product +import stock +import purchase +import invoice +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/account_anglo_saxon/__terp__.py b/addons/account_anglo_saxon/__terp__.py new file mode 100644 index 00000000000..31818e213ef --- /dev/null +++ b/addons/account_anglo_saxon/__terp__.py @@ -0,0 +1,39 @@ +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## +{ + "name" : "Stock Account", + "version" : "1.1", + "author" : "Tiny", + "website" : "http://tinyerp.com", + "description" : """This module will support the Anglo-Saxons accounting methodology by + changing the accounting logic with stock transactions. The difference between the Anglo-Saxon accounting countries + and the Rhine or also called Continental accounting countries is the moment of taking the Cost of Goods Sold versus Cost of Sales. + Anglo-Saxons accounting does take the cost when sales invoice is created, Continental accounting will take the cost at he moment the goods are shipped. + This module will add this functionality by using a interim account, to store the value of shipped goods and will contra book this interim account + when the invoice is created to transfer this amount to the debtor or creditor account.""", + "depends" : ["product", "account", "sale", "purchase"], + "category" : "Generic Modules/Inventory Control", + "init_xml" : [], + "demo_xml" : [], + "update_xml" : ["product_view.xml",], + "active": False, + "installable": True +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot b/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot new file mode 100644 index 00000000000..a2d316633a4 --- /dev/null +++ b/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot @@ -0,0 +1,54 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * account_anglo_saxon +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 5.0.6\n" +"Report-Msgid-Bugs-To: support@openerp.com\n" +"POT-Creation-Date: 2009-11-24 12:50:50+0000\n" +"PO-Revision-Date: 2009-11-24 12:50:50+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_anglo_saxon +#: view:product.category:0 +msgid " Accounting Property" +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.module.module,description:account_anglo_saxon.module_meta_information +msgid "This module will support the Anglo-Saxons accounting methodology by \n" +" changing the accounting logic with stock transactions. The difference between the Anglo-Saxon accounting countries \n" +" and the Rhine or also called Continental accounting countries is the moment of taking the Cost of Goods Sold versus Cost of Sales. \n" +" Anglo-Saxons accounting does take the cost when sales invoice is created, Continental accounting will take the cost at he moment the goods are shipped.\n" +" This module will add this functionality by using a interim account, to store the value of shipped goods and will contra book this interim account \n" +" when the invoice is created to transfer this amount to the debtor or creditor account." +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information +msgid "Stock Account" +msgstr "" + +#. module: account_anglo_saxon +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "" + +#. module: account_anglo_saxon +#: field:product.category,property_account_creditor_price_difference_categ:0 +#: field:product.template,property_account_creditor_price_difference:0 +msgid "Price Difference Account" +msgstr "" + +#. module: account_anglo_saxon +#: help:product.category,property_account_creditor_price_difference_categ:0 +#: help:product.template,property_account_creditor_price_difference:0 +msgid "This account will be used to value price difference between purchase price and cost price." +msgstr "" + diff --git a/addons/account_anglo_saxon/i18n/fr_BE.po b/addons/account_anglo_saxon/i18n/fr_BE.po new file mode 100644 index 00000000000..a2d316633a4 --- /dev/null +++ b/addons/account_anglo_saxon/i18n/fr_BE.po @@ -0,0 +1,54 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * account_anglo_saxon +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 5.0.6\n" +"Report-Msgid-Bugs-To: support@openerp.com\n" +"POT-Creation-Date: 2009-11-24 12:50:50+0000\n" +"PO-Revision-Date: 2009-11-24 12:50:50+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_anglo_saxon +#: view:product.category:0 +msgid " Accounting Property" +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.module.module,description:account_anglo_saxon.module_meta_information +msgid "This module will support the Anglo-Saxons accounting methodology by \n" +" changing the accounting logic with stock transactions. The difference between the Anglo-Saxon accounting countries \n" +" and the Rhine or also called Continental accounting countries is the moment of taking the Cost of Goods Sold versus Cost of Sales. \n" +" Anglo-Saxons accounting does take the cost when sales invoice is created, Continental accounting will take the cost at he moment the goods are shipped.\n" +" This module will add this functionality by using a interim account, to store the value of shipped goods and will contra book this interim account \n" +" when the invoice is created to transfer this amount to the debtor or creditor account." +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information +msgid "Stock Account" +msgstr "" + +#. module: account_anglo_saxon +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "" + +#. module: account_anglo_saxon +#: field:product.category,property_account_creditor_price_difference_categ:0 +#: field:product.template,property_account_creditor_price_difference:0 +msgid "Price Difference Account" +msgstr "" + +#. module: account_anglo_saxon +#: help:product.category,property_account_creditor_price_difference_categ:0 +#: help:product.template,property_account_creditor_price_difference:0 +msgid "This account will be used to value price difference between purchase price and cost price." +msgstr "" + diff --git a/addons/account_anglo_saxon/i18n/pl.po b/addons/account_anglo_saxon/i18n/pl.po new file mode 100644 index 00000000000..aab9ded1466 --- /dev/null +++ b/addons/account_anglo_saxon/i18n/pl.po @@ -0,0 +1,66 @@ +# Polish translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2009-11-24 12:50+0000\n" +"PO-Revision-Date: 2010-02-02 06:30+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_anglo_saxon +#: view:product.category:0 +msgid " Accounting Property" +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.module.module,description:account_anglo_saxon.module_meta_information +msgid "" +"This module will support the Anglo-Saxons accounting methodology by \n" +" changing the accounting logic with stock transactions. The difference " +"between the Anglo-Saxon accounting countries \n" +" and the Rhine or also called Continental accounting countries is the " +"moment of taking the Cost of Goods Sold versus Cost of Sales. \n" +" Anglo-Saxons accounting does take the cost when sales invoice is " +"created, Continental accounting will take the cost at he moment the goods " +"are shipped.\n" +" This module will add this functionality by using a interim account, to " +"store the value of shipped goods and will contra book this interim account \n" +" when the invoice is created to transfer this amount to the debtor or " +"creditor account." +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information +msgid "Stock Account" +msgstr "" + +#. module: account_anglo_saxon +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "XML niewłaściwy dla tej architektury wyświetlania!" + +#. module: account_anglo_saxon +#: field:product.category,property_account_creditor_price_difference_categ:0 +#: field:product.template,property_account_creditor_price_difference:0 +msgid "Price Difference Account" +msgstr "Konto różnic cenowych" + +#. module: account_anglo_saxon +#: help:product.category,property_account_creditor_price_difference_categ:0 +#: help:product.template,property_account_creditor_price_difference:0 +msgid "" +"This account will be used to value price difference between purchase price " +"and cost price." +msgstr "" +"To konto będzie stosowane do rejestrowania różnic cenowych między ceną " +"zakupu a kosztem." diff --git a/addons/account_anglo_saxon/invoice.py b/addons/account_anglo_saxon/invoice.py new file mode 100644 index 00000000000..3904cd6b01e --- /dev/null +++ b/addons/account_anglo_saxon/invoice.py @@ -0,0 +1,158 @@ +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from osv import fields, osv + +class account_invoice_line(osv.osv): + _inherit = "account.invoice.line" + + def move_line_get(self, cr, uid, invoice_id, context=None): + res = super(account_invoice_line,self).move_line_get(cr, uid, invoice_id, context) + inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id) + if inv.type in ('out_invoice','out_refund'): + for i_line in inv.invoice_line: + if i_line.product_id: + if inv.type == 'out_invoice': + dacc = i_line.product_id.product_tmpl_id.property_stock_account_output and i_line.product_id.product_tmpl_id.property_stock_account_output.id + if not dacc: + dacc = i_line.product_id.categ_id.property_stock_account_output_categ and i_line.product_id.categ_id.property_stock_account_output_categ.id + else: + dacc = i_line.product_id.product_tmpl_id.property_stock_account_input and i_line.product_id.product_tmpl_id.property_stock_account_input.id + if not dacc: + dacc = i_line.product_id.categ_id.property_stock_account_input_categ and i_line.product_id.categ_id.property_stock_account_input_categ.id + + cacc = i_line.product_id.product_tmpl_id.property_account_expense and i_line.product_id.product_tmpl_id.property_account_expense.id + if not cacc: + cacc = i_line.product_id.categ_id.property_account_expense_categ and i_line.product_id.categ_id.property_account_expense_categ.id + if dacc and cacc: + res.append({ + 'type':'src', + 'name': i_line.name[:64], + 'price_unit':i_line.product_id.product_tmpl_id.standard_price, + 'quantity':i_line.quantity, + 'price':i_line.product_id.product_tmpl_id.standard_price * i_line.quantity, + 'account_id':dacc, + 'product_id':i_line.product_id.id, + 'uos_id':i_line.uos_id.id, + 'account_analytic_id':i_line.account_analytic_id.id, + 'taxes':i_line.invoice_line_tax_id, + }) + + res.append({ + 'type':'src', + 'name': i_line.name[:64], + 'price_unit':i_line.product_id.product_tmpl_id.standard_price, + 'quantity':i_line.quantity, + 'price': -1 * i_line.product_id.product_tmpl_id.standard_price * i_line.quantity, + 'account_id':cacc, + 'product_id':i_line.product_id.id, + 'uos_id':i_line.uos_id.id, + 'account_analytic_id':i_line.account_analytic_id.id, + 'taxes':i_line.invoice_line_tax_id, + }) + elif inv.type in ('in_invoice','in_refund'): + for i_line in inv.invoice_line: + if i_line.product_id: + if i_line.product_id.product_tmpl_id.type != 'service': + acc = i_line.product_id.product_tmpl_id.property_account_creditor_price_difference and i_line.product_id.product_tmpl_id.property_account_creditor_price_difference.id + if not acc: + acc = i_line.product_id.categ_id.property_account_creditor_price_difference_categ and i_line.product_id.categ_id.property_account_creditor_price_difference_categ.id + a = None + if inv.type == 'in_invoice': + oa = i_line.product_id.product_tmpl_id.property_stock_account_input and i_line.product_id.product_tmpl_id.property_stock_account_input.id + if not oa: + oa = i_line.product_id.categ_id.property_stock_account_input_categ and i_line.product_id.categ_id.property_stock_account_input_categ.id + else: + oa = i_line.product_id.product_tmpl_id.property_stock_account_output and i_line.product_id.product_tmpl_id.property_stock_account_output.id + if not oa: + oa = i_line.product_id.categ_id.property_stock_account_output_categ and i_line.product_id.categ_id.property_stock_account_output_categ.id + if oa: + fpos = i_line.invoice_id.fiscal_position or False + a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa) + diff_res = [] + for line in res: + if a == line['account_id'] and i_line.product_id.id == line['product_id']: + uom = i_line.product_id.uos_id or i_line.product_id.uom_id + standard_price = self.pool.get('product.uom')._compute_price(cr, uid, uom.id, i_line.product_id.product_tmpl_id.standard_price, i_line.uos_id.id) + if standard_price != i_line.price_unit and line['price'] == i_line.price_unit and acc: + price_diff = i_line.price_unit - standard_price + line.update({'price':standard_price * line['quantity']}) + diff_res.append({ + 'type':'src', + 'name': i_line.name[:64], + 'price_unit':price_diff, + 'quantity':line['quantity'], + 'price': price_diff * line['quantity'], + 'account_id':acc, + 'product_id':line['product_id'], + 'uos_id':line['uos_id'], + 'account_analytic_id':line['account_analytic_id'], + 'taxes':line.get('taxes',[]), + }) + res += diff_res + return res + + def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, context=None): + if not product: + return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, context) + else: + res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, context) + + if type in ('in_invoice','in_refund'): + product_obj = self.pool.get('product.product').browse(cr, uid, product, context=context) + if type == 'in_invoice': + oa = product_obj.product_tmpl_id.property_stock_account_input and product_obj.product_tmpl_id.property_stock_account_input.id + if not oa: + oa = product_obj.categ_id.property_stock_account_input_categ and product_obj.categ_id.property_stock_account_input_categ.id + else: + oa = product_obj.product_tmpl_id.property_stock_account_output and product_obj.product_tmpl_id.property_stock_account_output.id + if not oa: + oa = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id + if oa: + fpos = fposition_id and self.pool.get('account.fiscal.position').browse(cr, uid, fposition_id) or False + a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa) + res['value'].update({'account_id':a}) + return res + +account_invoice_line() + +class account_invoice(osv.osv): + _inherit = "account.invoice" + + def _refund_cleanup_lines(self, cr, uid, lines): + for line in lines: + inv_id = line['invoice_id'] + inv_obj = self.browse(cr,uid,inv_id[0]) + if inv_obj.type == 'in_invoice': + if line.get('product_id',False): + product_obj = self.pool.get('product.product').browse(cr,uid,line['product_id'][0]) + oa = product_obj.product_tmpl_id.property_stock_account_output and product_obj.product_tmpl_id.property_stock_account_output.id + if not oa: + oa = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id + if oa: + fpos = inv_obj.fiscal_position or False + a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa) + account_data = self.pool.get('account.account').read(cr,uid,[a],['name'])[0] + line.update({'account_id': (account_data['id'],account_data['name'])}) + res = super(account_invoice,self)._refund_cleanup_lines(cr, uid, lines) + return res + +account_invoice() +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/account_anglo_saxon/product.py b/addons/account_anglo_saxon/product.py new file mode 100644 index 00000000000..acd6577fbb7 --- /dev/null +++ b/addons/account_anglo_saxon/product.py @@ -0,0 +1,55 @@ +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from osv import fields, osv + +class product_category(osv.osv): + _inherit = "product.category" + _columns = { + 'property_account_creditor_price_difference_categ': fields.property( + 'account.account', + type='many2one', + relation='account.account', + string="Price Difference Account", + method=True, + view_load=True, + help="This account will be used to value price difference between purchase price and cost price."), + + } +product_category() + +class product_template(osv.osv): + _inherit = "product.template" + _columns = { + 'property_account_creditor_price_difference': fields.property( + 'account.account', + type='many2one', + relation='account.account', + string="Price Difference Account", + method=True, + view_load=True, + help="This account will be used to value price difference between purchase price and cost price."), + + } +product_template() + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/account_anglo_saxon/product_view.xml b/addons/account_anglo_saxon/product_view.xml new file mode 100644 index 00000000000..78e51374128 --- /dev/null +++ b/addons/account_anglo_saxon/product_view.xml @@ -0,0 +1,53 @@ + + + + + product.normal.form.inherit.stock + product.product + form + + + + + + + + + + + + + product.template.product.form.inherit + product.template + form + + + + + + + + + + + + + product.category.property.form.inherit.stock + product.category + form + + + + + + + + + + + + + + + + diff --git a/addons/account_anglo_saxon/purchase.py b/addons/account_anglo_saxon/purchase.py new file mode 100644 index 00000000000..98694a3d5dd --- /dev/null +++ b/addons/account_anglo_saxon/purchase.py @@ -0,0 +1,41 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from osv import fields, osv + +class purchase_order(osv.osv): + _name = "purchase.order" + _inherit = "purchase.order" + _description = "Purchase order" + + def inv_line_create(self, cr, uid, a, ol): + line = super(purchase_order, self).inv_line_create(cr, uid, a, ol) + if ol.product_id: + oa = ol.product_id.product_tmpl_id.property_stock_account_input and ol.product_id.product_tmpl_id.property_stock_account_input.id + if not oa: + oa = ol.product_id.categ_id.property_stock_account_input_categ and ol.product_id.categ_id.property_stock_account_input_categ.id + if oa: + fpos = ol.order_id.fiscal_position or False + a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa) + line[2].update({'account_id': a}) + return line +purchase_order() +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/account_anglo_saxon/sale.py b/addons/account_anglo_saxon/sale.py new file mode 100644 index 00000000000..e2cfa7bbb3b --- /dev/null +++ b/addons/account_anglo_saxon/sale.py @@ -0,0 +1,43 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from osv import fields, osv + +#class sale_order_line(osv.osv): +# _name = 'sale.order.line' +# _description = 'Sale Order line' +# _inherit = 'sale.order.line' +# +# def invoice_line_create(self, cr, uid, ids, context={}): +# line_ids = super('sale_order_line',self).invoice_line_create(cr, uid, ids, context) +# invoice_line_obj = self.pool.get('account.invoice.line') +# for line in invoice_line_obj.browse(cr, uid, line_ids): +# if line.product_id: +# a = line.product_id.product_tmpl_id.property_stock_account_output and line.product_id.product_tmpl_id.property_stock_account_output.id +# if not a: +# a = line.product_id.categ_id.property_stock_account_output_categ and line.product_id.categ_id.property_stock_account_output_categ.id +# if a: +# a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, a) +# invoice_line_obj.write(cr, uid, line.id, {'account_id':a}) +# +#sale_order_line() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_anglo_saxon/stock.py b/addons/account_anglo_saxon/stock.py new file mode 100644 index 00000000000..ad091364fd8 --- /dev/null +++ b/addons/account_anglo_saxon/stock.py @@ -0,0 +1,51 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from osv import fields,osv + +#---------------------------------------------------------- +# Stock Picking +#---------------------------------------------------------- +class stock_picking(osv.osv): + _inherit = "stock.picking" + _description = "Packing List" + + def action_invoice_create(self, cr, uid, ids, journal_id=False, + group=False, type='out_invoice', context=None): + '''Return ids of created invoices for the pickings''' + res = super(stock_picking,self).action_invoice_create(cr, uid, ids, journal_id, group, type, context) + if type == 'in_refund': + for inv in self.pool.get('account.invoice').browse(cr, uid, res.values(), context=context): + for ol in inv.invoice_line: + if ol.product_id: + oa = ol.product_id.product_tmpl_id.property_stock_account_output and ol.product_id.product_tmpl_id.property_stock_account_output.id + if not oa: + oa = ol.product_id.categ_id.property_stock_account_output_categ and ol.product_id.categ_id.property_stock_account_output_categ.id + if oa: + fpos = ol.invoice_id.fiscal_position or False + a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa) + self.pool.get('account.invoice.line').write(cr, uid, [ol.id], {'account_id': a}) + return res + +stock_picking() + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_followup/i18n/nl.po b/addons/account_followup/i18n/nl.po index 13782599c02..d756121ab3b 100644 --- a/addons/account_followup/i18n/nl.po +++ b/addons/account_followup/i18n/nl.po @@ -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-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-12-11 13:00+0000\n" -"Last-Translator: Pieter J. Kersten (EduSense BV) \n" +"PO-Revision-Date: 2010-02-01 15:48+0000\n" +"Last-Translator: Jan Verlaan (Veritos) \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: 2009-12-16 05:10+0000\n" +"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_followup @@ -55,7 +55,7 @@ msgstr "Bedrag in valuta" #. module: account_followup #: rml:account_followup.followup.print:0 msgid "Due" -msgstr "Tot" +msgstr "Bedrag" #. module: account_followup #: view:account.move.line:0 @@ -97,7 +97,7 @@ msgstr "Soort rekening" #. module: account_followup #: rml:account_followup.followup.print:0 msgid "Ref" -msgstr "Ref" +msgstr "Factuur" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 @@ -253,7 +253,7 @@ msgstr "" msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" -"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !" +"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !" #. module: account_followup #: wizard_button:account_followup.followup.print.all,summary,end:0 diff --git a/addons/account_reporting/i18n/ru.po b/addons/account_reporting/i18n/ru.po index 0395309484f..0fac8e23859 100644 --- a/addons/account_reporting/i18n/ru.po +++ b/addons/account_reporting/i18n/ru.po @@ -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-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-09 16:28+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-02-02 17:25+0000\n" +"Last-Translator: Nikolay Chesnokov \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: 2009-12-16 05:20+0000\n" +"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_reporting @@ -58,7 +58,7 @@ msgstr "Балансовый отчет" #. module: account_reporting #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: account_reporting #: selection:account.report.bs,font_style:0 @@ -78,7 +78,7 @@ msgstr "Распечатать балансовый отчет" #. module: account_reporting #: help:account.account.balancesheet.report,init,periods:0 msgid "All periods if empty" -msgstr "" +msgstr "Если не заполнены все периоды" #. module: account_reporting #: field:account.report.bs,color_font:0 @@ -95,7 +95,7 @@ msgstr "Отчет с объектами, счетами и потомками msgid "" "Financial and accounting reporting\n" " Balance Sheet Report" -msgstr "" +msgstr "Финансовые и аналитические отчеты" #. module: account_reporting #: selection:account.report.bs,report_type:0 @@ -126,7 +126,7 @@ msgstr "Отчетность по счету" #. module: account_reporting #: model:ir.ui.menu,name:account_reporting.bs_report_action_form msgid "Balance Sheet Report Form" -msgstr "" +msgstr "Отчет главной книги (Форма)" #. module: account_reporting #: view:account.report.bs:0 @@ -166,7 +166,7 @@ msgstr "Цвета RML" #. module: account_reporting #: model:ir.module.module,shortdesc:account_reporting.module_meta_information msgid "Reporting of Balancesheet for accounting" -msgstr "" +msgstr "Отчет главной книги по счетам" #. module: account_reporting #: field:account.report.bs,code:0 @@ -207,7 +207,7 @@ msgstr "Учётные записи" #. module: account_reporting #: wizard_field:account.account.balancesheet.report,init,periods:0 msgid "Periods" -msgstr "" +msgstr "Периоды" #. module: account_reporting #: field:account.report.bs,color_back:0 diff --git a/addons/auction/i18n/pt_BR.po b/addons/auction/i18n/pt_BR.po index 9cd95c4bc2e..c6a12f8f1aa 100644 --- a/addons/auction/i18n/pt_BR.po +++ b/addons/auction/i18n/pt_BR.po @@ -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-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-01-23 02:16+0000\n" +"PO-Revision-Date: 2010-02-01 18:21+0000\n" "Last-Translator: Holverat Bortolossi \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-01-24 04:50+0000\n" +"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: auction @@ -150,74 +150,74 @@ msgstr "Antigo/pequeno produto de cobre ou estanho" #. module: auction #: field:auction.lots,paid_ach:0 msgid "Buyer invoice reconciled" -msgstr "" +msgstr "Fatura do comprador foi reconciliada" #. module: auction #: model:ir.actions.wizard,name:auction.auction_wizard_able_taken msgid "Mark as taken away" -msgstr "" +msgstr "Marcar como retirado" #. module: auction #: xsl:report.auction.seller.list:0 msgid "Inv." -msgstr "" +msgstr "Inv." #. module: auction #: field:auction.deposit.cost,amount:0 msgid "Amount" -msgstr "" +msgstr "Valor" #. module: auction #: model:ir.actions.act_window,name:auction.action_deposit_border #: model:ir.ui.menu,name:auction.menu_auction_deposit_border msgid "Deposit border" -msgstr "" +msgstr "Limite de Depósito" #. module: auction #: xsl:report.auction.deposit:0 msgid "VAT" -msgstr "" +msgstr "Imposto sobre Valor Agregado" #. module: auction #: view:auction.lots:0 msgid "Statements" -msgstr "" +msgstr "Demonstrações" #. module: auction #: xsl:flagey.huissier:0 msgid "Adjudication" -msgstr "" +msgstr "Conceder" #. module: auction #: field:auction.dates,account_analytic_id:0 msgid "Analytic Account" -msgstr "" +msgstr "Conta analítica" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Unclassifieds" -msgstr "" +msgstr "Não classificados" #. module: auction #: model:ir.ui.menu,name:auction.menu_auction_dates_next_by_auction msgid "Objects by Auction" -msgstr "" +msgstr "Objetos em leilão" #. module: auction #: field:auction.lots,lot_num:0 #: field:report.unclassified.objects,lot_num:0 msgid "List Number" -msgstr "" +msgstr "Número de lista" #. module: auction #: field:auction.deposit.cost,name:0 msgid "Cost Name" -msgstr "" +msgstr "Nome do custo" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antiques" -msgstr "" +msgstr "Antiguidades" #. module: auction #: view:auction.dates:0 @@ -227,17 +227,17 @@ msgstr "" #. module: auction #: field:report.auction.estimation.adj.category,lot_type:0 msgid "Object Type" -msgstr "" +msgstr "Tipo de objeto" #. module: auction #: wizard_field:auction.lots.sms_send,init,text:0 msgid "SMS Message" -msgstr "" +msgstr "Mensagem SMS" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Contemporary Art" -msgstr "" +msgstr "Arte contemporânea" #. module: auction #: view:auction.lots:0 @@ -248,7 +248,7 @@ msgstr "" #. module: auction #: field:report.auction.view,nseller:0 msgid "No of sellers" -msgstr "" +msgstr "Nenhum vendedor" #. module: auction #: selection:auction.lots.send.aie,date_ask,lang:0 @@ -269,7 +269,7 @@ msgstr "" #. module: auction #: field:report.auction.view2,obj_margin_procent:0 msgid "Net margin (%)" -msgstr "" +msgstr "Margem líquida (%)" #. module: auction #: selection:auction.lots,state:0 @@ -277,12 +277,12 @@ msgstr "" #: selection:report.seller.auction,state:0 #: selection:report.unclassified.objects,state:0 msgid "Unsold" -msgstr "" +msgstr "Não vendidos" #. module: auction #: view:auction.dates:0 msgid "Dates" -msgstr "" +msgstr "Datas" #. module: auction #: constraint:product.template:0 @@ -294,13 +294,13 @@ msgstr "" #. module: auction #: rml:auction.total.rml:0 msgid "Items" -msgstr "" +msgstr "Itens" #. module: auction #: model:account.tax,name:auction.auction_tax5 #: field:auction.dates,seller_costs:0 msgid "Seller Costs" -msgstr "" +msgstr "Custos do Vendedor" #. module: auction #: view:auction.bid:0 @@ -310,22 +310,22 @@ msgstr "" #: model:ir.actions.report.xml,name:auction.bid_auction #: model:ir.ui.menu,name:auction.menu_action_bid_open msgid "Bids" -msgstr "" +msgstr "Lances" #. module: auction #: model:ir.ui.menu,name:auction.auction_all_objects_menu msgid "All objects" -msgstr "" +msgstr "Todos Objetos" #. module: auction #: model:ir.actions.act_window,name:auction.action_auction_buyer_reporting_all2 msgid "Buyer's auction for all months" -msgstr "" +msgstr "Leilão do comprador para todos os meses" #. module: auction #: field:auction.bid,contact_tel:0 msgid "Contact" -msgstr "" +msgstr "Contato" #. module: auction #: field:report.auction.view,obj_ret:0 @@ -337,7 +337,7 @@ msgstr "" #. module: auction #: wizard_button:auction.lots.sms_send,init,send:0 msgid "Send SMS" -msgstr "" +msgstr "Enviar SMS" #. module: auction #: selection:auction.lot.category,aie_categ:0 @@ -347,38 +347,38 @@ msgstr "" #. module: auction #: field:auction.lots,sel_inv_id:0 msgid "Seller Invoice" -msgstr "" +msgstr "Fatura do Vendedor" #. module: auction #: view:auction.dates:0 msgid "Commissions" -msgstr "" +msgstr "Comissões" #. module: auction #: wizard_button:auction.lots.numerotate,search,init:0 msgid "Back" -msgstr "" +msgstr "Voltar" #. module: auction #: model:ir.actions.act_window,name:auction.action_all_objects_unsold msgid "Unsold objects" -msgstr "" +msgstr "Objetos não vendidos" #. module: auction #: model:ir.ui.menu,name:auction.menu_all_objects_sold1 msgid "Sold Objects" -msgstr "" +msgstr "Objetos vendidos" #. module: auction #: view:report.buyer.auction2:0 #: view:report.seller.auction2:0 msgid "Sum net margin" -msgstr "" +msgstr "Somar margem líquida" #. module: auction #: view:auction.deposit:0 msgid "Deposit Border Form" -msgstr "" +msgstr "Formuálio de Limite de Depósito" #. module: auction #: field:auction.bid,bid_lines:0 @@ -386,12 +386,12 @@ msgstr "" #: rml:bids.lots:0 #: model:ir.model,name:auction.model_auction_bid_line msgid "Bid" -msgstr "" +msgstr "Lance" #. module: auction #: wizard_field:auction.lots.send.aie,date_ask,lang:0 msgid "Langage" -msgstr "" +msgstr "Idioma" #. module: auction #: field:auction.bid_line,lot_id:0 @@ -399,7 +399,7 @@ msgstr "" #: view:auction.lots:0 #: model:ir.model,name:auction.model_auction_lots msgid "Object" -msgstr "" +msgstr "Objeto" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_map_user @@ -409,7 +409,7 @@ msgstr "" #. module: auction #: wizard_field:auction.lots.numerotate,search,lot_num:0 msgid "Inventory Number" -msgstr "" +msgstr "Número de inventário" #. module: auction #: wizard_button:auction.lots.buyer_map,check,end:0 @@ -417,12 +417,12 @@ msgstr "" #: wizard_button:auction.lots.numerotate,search,end:0 #: wizard_button:auction.lots.numerotate_cont,init,end:0 msgid "Exit" -msgstr "" +msgstr "Sair" #. module: auction #: field:report.buyer.auction2,net_revenue:0 msgid "Net Revenue" -msgstr "" +msgstr "Receita Líquida" #. module: auction #: view:report.buyer.auction:0 @@ -437,17 +437,17 @@ msgstr "" #: field:report.seller.auction,state:0 #: field:report.unclassified.objects,state:0 msgid "Status" -msgstr "" +msgstr "Situação" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_sms msgid "SMS Send" -msgstr "" +msgstr "Enviar SMS" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Cartoons" -msgstr "" +msgstr "Antigo/Desenhos" #. module: auction #: view:auction.lots:0 @@ -455,42 +455,42 @@ msgstr "" #: selection:report.seller.auction,state:0 #: selection:report.unclassified.objects,state:0 msgid "Sold" -msgstr "" +msgstr "Vendido" #. module: auction #: constraint:hr.employee:0 msgid "Error ! You cannot create recursive Hierarchy of Employees." -msgstr "" +msgstr "Erro! Você não pode criar hierarquia recursiva de funcionários." #. module: auction #: field:auction.bid_line,name:0 msgid "Bid date" -msgstr "" +msgstr "Data do lance" #. module: auction #: field:auction.dates,acc_expense:0 msgid "Expense Account" -msgstr "" +msgstr "Conta de despesas" #. module: auction #: model:ir.ui.menu,name:auction.menu_wizard_emporte msgid "Deliveries Management" -msgstr "" +msgstr "Gerenciamento de entregas" #. module: auction #: field:auction.lots,obj_desc:0 msgid "Object Description" -msgstr "" +msgstr "Descrição do objeto" #. module: auction #: selection:auction.deposit,method:0 msgid "Contact the Seller" -msgstr "" +msgstr "Entre em contato com o vendedor" #. module: auction #: view:auction.lots:0 msgid "Auction Objects" -msgstr "" +msgstr "Leilão de Objetos" #. module: auction #: field:auction.lots,gross_revenue:0 @@ -498,12 +498,12 @@ msgstr "" #: field:report.object.encoded.manager,gross_revenue:0 #: field:report.seller.auction2,gross_revenue:0 msgid "Gross revenue" -msgstr "" +msgstr "Receita bruta" #. module: auction #: view:report.seller.auction2:0 msgid "Auction reporting2 form view" -msgstr "" +msgstr "Relatório2 de formulário de Leilão" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_pay @@ -513,45 +513,45 @@ msgstr "" #. module: auction #: view:report.deposit.border:0 msgid "Depositer's statistics" -msgstr "" +msgstr "Estatísticas dos Depositantes" #. module: auction #: view:auction.lots:0 msgid "Buyer information" -msgstr "" +msgstr "Informações do Comprador" #. module: auction #: model:ir.model,name:auction.model_report_seller_auction msgid "Auction Reporting on seller view" -msgstr "" +msgstr "Relatório Leilão na visão do Vendedor" #. module: auction #: field:auction.lots,name2:0 msgid "Short Description (2)" -msgstr "" +msgstr "Descrição resumida (2)" #. module: auction #: model:ir.model,name:auction.model_auction_dates msgid "auction.dates" -msgstr "" +msgstr "leilão.datas" #. module: auction #: rml:auction.total.rml:0 #: model:ir.ui.menu,name:auction.auction_buyers_menu msgid "Buyers" -msgstr "" +msgstr "Vendedores" #. module: auction #: wizard_field:auction.pay.buy,init,amount:0 #: wizard_field:auction.pay.buy,init,amount2:0 #: wizard_field:auction.pay.buy,init,amount3:0 msgid "Amount paid" -msgstr "" +msgstr "Valor pago" #. module: auction #: model:ir.ui.menu,name:auction.menu_report_latest_doposit_tree msgid "My Latest Deposits" -msgstr "" +msgstr "Meus Últimos Depósitos" #. module: auction #: field:auction.lots,lot_est1:0 @@ -560,32 +560,32 @@ msgstr "" #: field:report.auction.view,min_est:0 #: field:report.unclassified.objects,lot_est1:0 msgid "Minimum Estimation" -msgstr "" +msgstr "Estimativa mínima" #. module: auction #: view:auction.dates:0 msgid "Accounting" -msgstr "" +msgstr "Contabilidade" #. module: auction #: model:ir.ui.menu,name:auction.menu_buyer_allmonth_view2 msgid "Buyer's Revenues" -msgstr "" +msgstr "Receitas do comprador" #. module: auction #: model:ir.model,name:auction.model_report_auction_adjudication msgid "report_auction_adjudication" -msgstr "" +msgstr "relatório_leilão_concedido" #. module: auction #: field:auction.bid_line,price:0 msgid "Maximum Price" -msgstr "" +msgstr "Preço máximo" #. module: auction #: selection:auction.lots.send.aie,date_ask,lang:0 msgid "eng" -msgstr "" +msgstr "Inglês" #. module: auction #: view:report.buyer.auction2:0 @@ -595,17 +595,17 @@ msgstr "" #. module: auction #: wizard_view:auction.lots.sms_send,init:0 msgid "Bulk SMS send" -msgstr "" +msgstr "Enviar SMS em massa" #. module: auction #: wizard_view:auction.taken,init:0 msgid "Select lots which are Sold" -msgstr "" +msgstr "Selecione lotes que são vendidos" #. module: auction #: field:auction.lots,statement_id:0 msgid "Payment" -msgstr "" +msgstr "Pagamento" #. module: auction #: selection:auction.lots.send.aie,date_ask,lang:0 @@ -615,50 +615,50 @@ msgstr "" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Old weapons and militaria" -msgstr "" +msgstr "Antiguidade/Armas antigas e militares" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Oriental Arts/Chineese furnitures" -msgstr "" +msgstr "Antiguidade/Arte Orientas/Mobiliário Chinês" #. module: auction #: selection:auction.deposit,method:0 msgid "Keep until sold" -msgstr "" +msgstr "Manter até vender" #. module: auction #: wizard_button:auction.lots.numerotate,init,choice:0 #: wizard_button:auction.lots.send.aie,init,date_ask:0 #: wizard_button:auction.lots.send.aie.results,init,date_ask:0 msgid "Continue" -msgstr "" +msgstr "Continuar" #. module: auction #: field:report.object.encoded,obj_num:0 #: field:report.object.encoded.manager,obj_num:0 msgid "# of Encoded obj." -msgstr "" +msgstr "# do Objeto Codificado" #. module: auction #: xsl:report.auction.vnd_bordereau:0 msgid "List N." -msgstr "" +msgstr "Lista N." #. module: auction #: field:report.deposit.border,moy_est:0 msgid "Avg. Est" -msgstr "" +msgstr "Média Estimada" #. module: auction #: rml:auction.total.rml:0 msgid "# of sellers:" -msgstr "" +msgstr "# dos vendedores:" #. module: auction #: constraint:product.product:0 msgid "Error: Invalid ean code" -msgstr "Error: código EAN invalido" +msgstr "Erro: Código EAN inválido" #. module: auction #: model:ir.module.module,description:auction.module_meta_information @@ -669,26 +669,31 @@ msgid "" " Delivery Management. \n" " " msgstr "" +"Este módulo fornece funcionalidade para \n" +" gerenciar artistas, artigos, vendedores, compradores e leilão.\n" +" Gerenciar ofertas, registro de objetos vendidos, pagos e não pagos.\n" +" A administração das entregas. \n" +" " #. module: auction #: rml:auction.total.rml:0 msgid "# of items taken away:" -msgstr "" +msgstr "# de itens retirados:" #. module: auction #: model:ir.ui.menu,name:auction.menu_auction_allmonth_view1 msgid "Auction's Summary" -msgstr "" +msgstr "Resumo do Leilão" #. module: auction #: rml:buyer.list:0 msgid "%)" -msgstr "" +msgstr "%)" #. module: auction #: wizard_view:auction.lots.able,init:0 msgid "Confirmation set taken away" -msgstr "" +msgstr "Confirmação marcada como retirada" #. module: auction #: wizard_field:auction.lots.make_invoice,init,objects:0 @@ -697,7 +702,7 @@ msgstr "" #: wizard_field:auction.lots.send.aie.results,date_ask,objects:0 #: field:report.deposit.border,nb_obj:0 msgid "# of objects" -msgstr "" +msgstr "# dos Objetos" #. module: auction #: field:auction.lots,lot_est2:0 @@ -706,12 +711,12 @@ msgstr "" #: field:report.auction.view,max_est:0 #: field:report.unclassified.objects,lot_est2:0 msgid "Maximum Estimation" -msgstr "" +msgstr "Estimativa Máxima" #. module: auction #: field:auction.lots,buyer_price:0 msgid "Buyer price" -msgstr "" +msgstr "Preço Comprador" #. module: auction #: model:ir.actions.wizard,name:auction.auction_wizard_payer_sel @@ -721,17 +726,17 @@ msgstr "" #. module: auction #: model:ir.actions.report.xml,name:auction.seller_form_id msgid "Seller List" -msgstr "" +msgstr "Lista de Vendedor" #. module: auction #: field:auction.lots,is_ok:0 msgid "Buyer's payment" -msgstr "" +msgstr "Pagamento do Comprador" #. module: auction #: view:auction.dates:0 msgid "Close + Create all invoices" -msgstr "" +msgstr "Fechar + Criar todas as Faturas" #. module: auction #: model:ir.actions.wizard,name:auction.auction_catalog_flagy @@ -741,48 +746,48 @@ msgstr "" #. module: auction #: field:auction.lot.history,price:0 msgid "Withdrawn price" -msgstr "" +msgstr "Preço de retirada" #. module: auction #: model:account.tax,name:auction.auction_tax4 msgid "Seller Costs1" -msgstr "" +msgstr "Custo1 do Venderor" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Verreries" -msgstr "" +msgstr "Antiguidade/Cristais" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Toys" -msgstr "" +msgstr "Antiguidade/Briquedos" #. module: auction #: field:auction.deposit,create_uid:0 #: field:auction.lots,create_uid:0 msgid "Created by" -msgstr "" +msgstr "Criado por" #. module: auction #: xsl:report.auction.ach_bordereau:0 msgid "Buyer form" -msgstr "" +msgstr "Formulário do comprador" #. module: auction #: xsl:report.auction.deposit:0 msgid "Estimate" -msgstr "" +msgstr "Estimativa" #. module: auction #: rml:auction.total.rml:0 msgid "# of buyers:" -msgstr "" +msgstr "# dos compradores:" #. module: auction #: field:auction.lots,costs:0 msgid "Indirect costs" -msgstr "" +msgstr "Custos indiretos" #. module: auction #: xsl:report.auction.ach_bordereau:0 @@ -792,12 +797,12 @@ msgstr "" #. module: auction #: constraint:account.tax.code:0 msgid "Error ! You can not create recursive accounts." -msgstr "" +msgstr "Erro ! Você não pode criar contas repetidas." #. module: auction #: model:ir.ui.menu,name:auction.auction_menu_root msgid "Auction Management" -msgstr "" +msgstr "Gerenciamento de leilão" #. module: auction #: field:auction.dates,journal_seller_id:0 @@ -807,23 +812,23 @@ msgstr "" #. module: auction #: view:report.buyer.auction:0 msgid "Auction buyer reporting tree view" -msgstr "" +msgstr "Relatório de compra do leilão exibição em árvore" #. module: auction #: model:ir.ui.menu,name:auction.menu_auction_artist msgid "Define Artists" -msgstr "" +msgstr "Definir artistas" #. module: auction #: field:auction.lot.category,name:0 msgid "Category Name" -msgstr "" +msgstr "Nome da Categoria" #. module: auction #: model:ir.ui.menu,name:auction.menu_report_auction_estimation_adj_category_manager #: model:ir.ui.menu,name:auction.menu_report_auction_estimation_adj_category_member msgid "Comparison of estimations" -msgstr "" +msgstr "Comparação das estimativas" #. module: auction #: model:ir.actions.report.xml,name:auction.v_report_barcode_lot @@ -833,34 +838,34 @@ msgstr "" #. module: auction #: wizard_button:auction.lots.numerotate,not_exist,init:0 msgid "Retry" -msgstr "" +msgstr "Repetir" #. module: auction #: field:auction.artists,birth_death_dates:0 msgid "Birth / Death dates" -msgstr "" +msgstr "Datas de Nascimento / Morte" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Jewelry" -msgstr "" +msgstr "Antiguidade/Jóias" #. module: auction #: model:ir.model,name:auction.model_report_unclassified_objects msgid "Unclassified objects " -msgstr "" +msgstr "objetos não classificados " #. module: auction #: wizard_button:auction.lots.numerotate_cont,init,set_number:0 #: wizard_field:auction.lots.send.aie,date_ask,numerotation:0 #: wizard_field:auction.lots.send.aie,init,numerotation:0 msgid "Numerotation" -msgstr "" +msgstr "Numerotation" #. module: auction #: model:ir.actions.act_window,name:auction.act_auction_lot_open_deposit msgid "Bordereau de dépôt" -msgstr "" +msgstr "Comprovante de depósito" #. module: auction #: xsl:report.auction.deposit:0 diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 3fb557a86b6..31b2d7f7cc8 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -71,7 +71,10 @@ def get_attribute_mapping(cr, uid, calname, context={}): pool = pooler.get_pool(cr.dbname) field_obj = pool.get('basic.calendar.fields') type_obj = pool.get('basic.calendar.lines') - type_id = type_obj.search(cr, uid, [('object_id.model', '=', context.get('model'))]) + domain = [('object_id.model', '=', context.get('model'))] + if context.get('calendar_id'): + domain.append(('calendar_id', '=', context.get('calendar_id'))) + type_id = type_obj.search(cr, uid, domain) fids = field_obj.search(cr, uid, [('type_id', '=', type_id[0])]) res = {} for field in field_obj.browse(cr, uid, fids): @@ -194,6 +197,8 @@ class CalDAV(object): self.ical_set(cal_data.name.lower(), vals, 'value') continue if cal_data.name.lower() in self.__attribute__: + if cal_data.params.get('X-VOBJ-ORIGINAL-TZID'): + self.ical_set('vtimezone', cal_data.params.get('X-VOBJ-ORIGINAL-TZID'), 'value') self.ical_set(cal_data.name.lower(), cal_data.value, 'value') vals = map_data(cr, uid, self) return vals @@ -255,7 +260,7 @@ class CalDAV(object): dtfield = vevent.add(field) dtfield.value = parser.parse(data[map_field]) if tzval: - dtfield.params['TZID'] = [tzval] + dtfield.params['TZID'] = [tzval.title()] elif map_type == "timedelta": vevent.add(field).value = timedelta(hours=data[map_field]) elif map_type == "many2one": @@ -312,9 +317,6 @@ class CalDAV(object): for child in parsedCal.getChildren(): if child.name.lower() in ('vevent', 'vtodo'): vals = self.parse_ics(cr, uid, child, context=context) - elif child.name.lower() == 'vtimezone': - tz_obj = self.pool.get('basic.calendar.timezone') - tz_obj.import_cal(cr, uid, child, context=context) else: vals = {} continue @@ -361,7 +363,9 @@ class Calendar(CalDAV, osv.osv): mod_obj = self.pool.get(line.object_id.model) data_ids = mod_obj.search(cr, uid, eval(line.domain), context=context) datas = mod_obj.read(cr, uid, data_ids, context=context) - context.update({'model': line.object_id.model}) + context.update({'model': line.object_id.model, + 'calendar_id': cal.id + }) self.__attribute__ = get_attribute_mapping(cr, uid, line.name, context) self.create_ics(cr, uid, datas, line.name, ical, context=context) return ical.serialize() @@ -380,7 +384,9 @@ class Calendar(CalDAV, osv.osv): cal_children[line.name] = line.object_id.model for child in parsedCal.getChildren(): if child.name.lower() in cal_children: - context.update({'model': cal_children[child.name.lower()]}) + context.update({'model': cal_children[child.name.lower()], + 'calendar_id': cal.id + }) self.__attribute__ = get_attribute_mapping(cr, uid, child.name.lower(), context=context) val = self.parse_ics(cr, uid, child, cal_children=cal_children, context=context) obj = self.pool.get(cal_children[child.name.lower()]) @@ -616,7 +622,7 @@ class Timezone(CalDAV, osv.osv_memory): } def get_name_offset(self, cr, uid, tzid, context={}): - mytz = pytz.timezone(tzid) + mytz = pytz.timezone(tzid.title()) mydt = datetime.now(tz=mytz) offset = mydt.utcoffset() val = offset.days * 24 + float(offset.seconds) / 3600 @@ -629,7 +635,7 @@ class Timezone(CalDAV, osv.osv_memory): ctx = context.copy() ctx.update({'model': model}) cal_tz = ical.add('vtimezone') - cal_tz.add('TZID').value = tzid + cal_tz.add('TZID').value = tzid.title() tz_std = cal_tz.add('STANDARD') tzname, offset = self.get_name_offset(cr, uid, tzid) tz_std.add("TZOFFSETFROM").value = offset @@ -769,14 +775,15 @@ class Attendee(CalDAV, osv.osv_memory): cn_val = '' for a_key, a_val in self.__attribute__.items(): if attendee[a_val['field']] and a_val['field'] != 'cn': - if a_val['type'] == 'text': + if a_val['type'] in ('text', 'char', 'selection'): attendee_add.params[a_key] = [str(attendee[a_val['field']])] elif a_val['type'] == 'boolean': attendee_add.params[a_key] = [str(attendee[a_val['field']])] if a_val['field'] == 'cn' and attendee[a_val['field']]: cn_val = [str(attendee[a_val['field']])] - if cn_val: - attendee_add.params['CN'] = cn_val + if cn_val: + attendee_add.params['CN'] = cn_val + attendee_add.value = 'MAILTO:' + attendee['email'] return vevent Attendee() diff --git a/addons/base_contact/i18n/nl.po b/addons/base_contact/i18n/nl.po index 31eb515e773..21dacd2804b 100644 --- a/addons/base_contact/i18n/nl.po +++ b/addons/base_contact/i18n/nl.po @@ -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-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-12-11 22:28+0000\n" -"Last-Translator: Pieter J. Kersten (EduSense BV) \n" +"PO-Revision-Date: 2010-02-01 15:47+0000\n" +"Last-Translator: Jan Verlaan (Veritos) \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: 2009-12-16 05:08+0000\n" +"X-Launchpad-Export-Date: 2010-02-02 04:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_contact @@ -36,7 +36,7 @@ msgstr "res.partner.contact" msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" -"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !" +"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !" #. module: base_contact #: field:res.partner.job,function_id:0 diff --git a/addons/base_module_quality/i18n/ru.po b/addons/base_module_quality/i18n/ru.po index eb6a90f89b5..bd6fee8b068 100644 --- a/addons/base_module_quality/i18n/ru.po +++ b/addons/base_module_quality/i18n/ru.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-17 08:55+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-02-02 17:45+0000\n" +"Last-Translator: Nikolay Chesnokov \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: 2009-12-16 05:26+0000\n" +"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_module_quality #: field:module.quality.check,final_score:0 msgid "Final Score (%)" -msgstr "" +msgstr "% выполнения" #. module: base_module_quality #: constraint:ir.model:0 @@ -32,12 +32,12 @@ msgstr "" #. module: base_module_quality #: model:ir.module.module,shortdesc:base_module_quality.module_meta_information msgid "Base module quality" -msgstr "" +msgstr "Базисный модуль контроля качества" #. module: base_module_quality #: field:module.quality.check,name:0 msgid "Rated Module" -msgstr "" +msgstr "Оценка модуля" #. module: base_module_quality #: view:module.quality.detail:0 @@ -47,17 +47,17 @@ msgstr "Подробности" #. module: base_module_quality #: field:module.quality.detail,note:0 msgid "Note" -msgstr "" +msgstr "Заметка" #. module: base_module_quality #: field:module.quality.detail,state:0 msgid "State" -msgstr "" +msgstr "Область/штат" #. module: base_module_quality #: field:module.quality.detail,detail:0 msgid "Details" -msgstr "" +msgstr "Подробно" #. module: base_module_quality #: field:module.quality.detail,ponderation:0 @@ -75,12 +75,12 @@ msgstr "" #: view:module.quality.check:0 #: field:module.quality.check,check_detail_ids:0 msgid "Tests" -msgstr "" +msgstr "Тесты" #. module: base_module_quality #: selection:module.quality.detail,state:0 msgid "Skipped" -msgstr "" +msgstr "Пропущено" #. module: base_module_quality #: help:module.quality.detail,state:0 @@ -88,6 +88,7 @@ msgid "" "The test will be completed only if the module is installed or if the test " "may be processed on uninstalled module." msgstr "" +"Тест проводится только для установленных или помеченных для деинсталяции." #. module: base_module_quality #: constraint:ir.ui.view:0 @@ -102,27 +103,27 @@ msgstr "" #. module: base_module_quality #: field:module.quality.detail,name:0 msgid "Name" -msgstr "" +msgstr "Имя" #. module: base_module_quality #: wizard_field:quality_detail_save,init,module_file:0 msgid "Save report" -msgstr "" +msgstr "Сохранить отчет" #. module: base_module_quality #: wizard_field:quality_detail_save,init,name:0 msgid "File name" -msgstr "" +msgstr "Имя файла" #. module: base_module_quality #: field:module.quality.detail,score:0 msgid "Score (%)" -msgstr "" +msgstr "% выполнения" #. module: base_module_quality #: help:quality_detail_save,init,name:0 msgid "Save report as .html format" -msgstr "" +msgstr "Сохранить отчет в формате HTML" #. module: base_module_quality #: view:module.quality.detail:0 @@ -133,22 +134,22 @@ msgstr "Аннотация" #. module: base_module_quality #: model:ir.actions.wizard,name:base_module_quality.quality_detail_save msgid "Report Save" -msgstr "" +msgstr "Сохранить отчет" #. module: base_module_quality #: wizard_view:quality_detail_save,init:0 msgid "Standard entries" -msgstr "" +msgstr "Стандартные точки входа" #. module: base_module_quality #: view:module.quality.detail:0 msgid "Save Report" -msgstr "" +msgstr "Сохранить отчет" #. module: base_module_quality #: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id msgid "Quality Check" -msgstr "" +msgstr "Проверка качества" #. module: base_module_quality #: model:ir.model,name:base_module_quality.model_module_quality_detail @@ -158,23 +159,23 @@ msgstr "" #. module: base_module_quality #: selection:module.quality.detail,state:0 msgid "Done" -msgstr "" +msgstr "Завершено" #. module: base_module_quality #: view:module.quality.check:0 #: view:module.quality.detail:0 msgid "Result" -msgstr "" +msgstr "Результат" #. module: base_module_quality #: wizard_button:quality_detail_save,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Отмена" #. module: base_module_quality #: field:module.quality.detail,message:0 msgid "Message" -msgstr "" +msgstr "Сообщение" #. module: base_module_quality #: field:module.quality.detail,quality_check_id:0 diff --git a/addons/base_report_creator/i18n/zh_CN.po b/addons/base_report_creator/i18n/zh_CN.po index 69e7da8c2f5..6b64eeb3280 100644 --- a/addons/base_report_creator/i18n/zh_CN.po +++ b/addons/base_report_creator/i18n/zh_CN.po @@ -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-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-12-01 15:37+0000\n" -"Last-Translator: Wei \"oldrev\" Li \n" +"PO-Revision-Date: 2010-02-01 23:39+0000\n" +"Last-Translator: mrshelly \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: 2009-12-16 05:21+0000\n" +"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_report_creator @@ -22,7 +22,7 @@ msgid "" "Provide an expression for the field based on which you want to filter the " "records.\n" " e.g. res_partner.id=3" -msgstr "" +msgstr "可以使用基于字段的Python条件表达式做为过滤条件.(如 res_partner.id=3)" #. module: base_report_creator #: field:base_report_creator.report,view_graph_type:0 @@ -406,6 +406,8 @@ msgid "" "After installing the module, it adds a menu to define custom report in\n" "the \"Dashboard\" menu.\n" msgstr "" +"本模块可以让您使用SQL查询器新建很灵活的对象统计报表.\n" +"安装此模块后, \"Dashboard(系统面板)\" 上会添加对应的菜单入口.\n" #. module: base_report_creator #: selection:base_report_creator.report.fields,calendar_mode:0 diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po index 9000fd7722e..853d609b31b 100644 --- a/addons/base_setup/i18n/ru.po +++ b/addons/base_setup/i18n/ru.po @@ -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-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-17 08:51+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-02-02 17:28+0000\n" +"Last-Translator: Nikolay Chesnokov \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: 2009-12-16 05:10+0000\n" +"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_setup @@ -134,7 +134,7 @@ msgstr "Улица (2-я строка)" #. module: base_setup #: wizard_view:base_setup.base_setup,company:0 msgid "Report Information" -msgstr "" +msgstr "Информация об отчетах" #. module: base_setup #: wizard_field:base_setup.base_setup,company,phone:0 @@ -194,6 +194,9 @@ msgid "" "We suggest you to write legal sentences here:\n" "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07" msgstr "" +"Это предложение появится внизу ваших отчетов.\n" +"Рекомендуем поместить здесь юридическую информацию:\n" +"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07" #. module: base_setup #: wizard_view:base_setup.base_setup,update:0 @@ -219,6 +222,9 @@ msgid "" "We suggest you to put a slogan here:\n" "\"Open Source Business Solutions\"." msgstr "" +"Это предложение появится в правом верхнем углу ваших отчетов.\n" +"Рекомендуем поместить здесь слоган:\n" +"\"Решения для бизнеса с открытым исходным кодом\"." #. module: base_setup #: wizard_field:base_setup.base_setup,company,rml_header1:0 diff --git a/addons/base_vat/i18n/ru.po b/addons/base_vat/i18n/ru.po index 3d8e316e279..fc16d1b23f8 100644 --- a/addons/base_vat/i18n/ru.po +++ b/addons/base_vat/i18n/ru.po @@ -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-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-17 08:49+0000\n" -"Last-Translator: Sergei Kostigoff \n" +"PO-Revision-Date: 2010-02-02 17:36+0000\n" +"Last-Translator: Nikolay Chesnokov \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: 2009-12-16 05:09+0000\n" +"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_vat @@ -21,18 +21,20 @@ msgstr "" msgid "" "Enable the VAT Number for the partner. Check the validity of that VAT Number." msgstr "" +"Разрешить использование кода налога для партнера. Проверьте правильность " +"кода налога." #. module: base_vat #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "Неправильный XML для просмотра архитектуры!" +msgstr "Некорректный формат XML структуры для просмотра." #. module: base_vat #: field:res.partner,vat_subjected:0 msgid "VAT Legal Statement" -msgstr "Официальное положение по НДС" +msgstr "Действующий код налога" #. module: base_vat #: model:ir.module.module,shortdesc:base_vat.module_meta_information msgid "VAT" -msgstr "НДС" +msgstr "Код налога" diff --git a/addons/board_crm_configuration/i18n/it.po b/addons/board_crm_configuration/i18n/it.po index c662003bda4..dad58efb8b1 100644 --- a/addons/board_crm_configuration/i18n/it.po +++ b/addons/board_crm_configuration/i18n/it.po @@ -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-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-17 07:58+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-02-02 09:39+0000\n" +"Last-Translator: Carlo Vettore \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: 2009-12-16 05:10+0000\n" +"X-Launchpad-Export-Date: 2010-02-03 04:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: board_crm_configuration @@ -86,7 +86,7 @@ msgstr "Richieste di Lavoro del Mese per Personale Assunto" #. module: board_crm_configuration #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Nome del modulo non valido nella definizione dell'azione." #. module: board_crm_configuration #: view:board.board:0 diff --git a/addons/document_caldav/__init__.py b/addons/board_hr/__init__.py similarity index 97% rename from addons/document_caldav/__init__.py rename to addons/board_hr/__init__.py index d764dfca72d..e68279cad8d 100644 --- a/addons/document_caldav/__init__.py +++ b/addons/board_hr/__init__.py @@ -19,5 +19,6 @@ # ############################################################################## -import document_caldav + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/document_caldav/__terp__.py b/addons/board_hr/__terp__.py similarity index 73% rename from addons/document_caldav/__terp__.py rename to addons/board_hr/__terp__.py index d7480c734bd..182cd36e1ec 100644 --- a/addons/document_caldav/__terp__.py +++ b/addons/board_hr/__terp__.py @@ -21,16 +21,20 @@ { - 'name': 'Support for caldav based on Document Management System', + 'name': 'Board for Human Reasources Management', 'version': '1.0', - 'category': 'Generic Modules/Others', - 'description': """Allows to synchronise calendars with others applications.""", + 'category': '', + 'description': """ +This module implements a dashboard for human resource management that includes: + * My Current Timesheet + * My Leaves + * My Expenses + """, 'author': 'Tiny', - 'website': 'http://www.openerp.com', - 'depends': ['caldav','document_webdav', 'crm'], - 'init_xml': ['document_data.xml'], - 'update_xml': ['document_view.xml'], - 'demo_xml': ['document_demo.xml'], + 'depends': [ 'crm_project','board','hr_expense','hr_timesheet_sheet','hr_holidays' + ], + 'update_xml': ['board_hr_view.xml'], + 'demo_xml': [], 'installable': True, 'active': False, } diff --git a/addons/board_hr/board_hr_view.xml b/addons/board_hr/board_hr_view.xml new file mode 100644 index 00000000000..2e84eff0749 --- /dev/null +++ b/addons/board_hr/board_hr_view.xml @@ -0,0 +1,72 @@ + + + + + + + + My Expenses + hr.expense.expense + form + [('state','=','draft'),('user_id','=',uid)] + + + + + Timesheets + ir.actions.act_window + hr_timesheet_sheet.sheet + form + + [('date_to','>=',time.strftime('%Y-%m-01')),('date_from','<=',time.strftime('%Y-%m-01'))] + + + + + My Leaves + ir.actions.act_window + hr.holidays.per.user + form + tree,form + + + + + board.hr.form + board.board + form + +
+ + + + + + + + + +
+ + + + + Human Resources Dashboard + board.board + form + form + menu + + + + + + diff --git a/addons/board_project/__terp__.py b/addons/board_project/__terp__.py index e32ae9a789b..558b633d36e 100644 --- a/addons/board_project/__terp__.py +++ b/addons/board_project/__terp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -27,10 +27,9 @@ 'description': """ This module implements a dashboard for project member that includes: * List of my open tasks - * List of my next deadlines - * List of public notes - * Graph of my timesheet - * Graph of my work analysis + * List of messages + * Members list of project + * Issues """, 'author': 'Tiny', 'depends': [ @@ -40,7 +39,9 @@ This module implements a dashboard for project member that includes: 'report_analytic_planning', 'report_analytic_line', 'report_task', - 'hr_timesheet_sheet' + 'hr_timesheet_sheet', + 'crm_project', + 'resource' ], 'update_xml': ['board_project_view.xml', 'board_project_manager_view.xml'], 'demo_xml': ['board_project_demo.xml'], diff --git a/addons/board_project/board_project_manager_view.xml b/addons/board_project/board_project_manager_view.xml index a45857af033..3baca91bce6 100644 --- a/addons/board_project/board_project_manager_view.xml +++ b/addons/board_project/board_project_manager_view.xml @@ -1,18 +1,18 @@ - + Project managers - + - + - + Pipeline of tasks report.task.user.pipeline.open @@ -20,7 +20,7 @@ graph,tree [('user_id','in',department_users_get())] - + hr.timesheet.sheet.tree.simplified.board hr_timesheet_sheet.sheet @@ -43,8 +43,8 @@ form - - + + board.project.manager.form board.board @@ -53,27 +53,27 @@
- - - - - - + + + + + + -